generic algorithm updated with feedback and documented.

DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation/examples/algorithm.c

@@ -1,8 +1,33 @@
 code AdaptedFMU:
 	
-	var in_condition_executed;
-	var out_condition_executed;
-	in_condition_executed = empty map;
+	/*
+	These maps will keep track of which rules execute and which don't
+	*/
+	var out_condition_executed = empty map
+	var in_condition_executed = empty map
+	
+	var fmu1 //FMU fmu1 ref
+	var fmu2 //FMU fmu2 ref
+	...
+	
+	/*
+	Keeps track of the last time that the FMU window did a step.
+	*/
+	var time_last_fmu1
+	var time_last_fmu2
+	...
+	
+	// parameters
+	var param_p1 = c1
+	...
+	
+	// in vars
+	var cv1 = init_cv1
+	...
+	
+	// out vars
+	var ov1 = init_ov1
+	...
 	
 	function instantiate()
 		fmu1.instantiate()
@@ -10,6 +35,13 @@ code AdaptedFMU:
 		return
 	end function
 	
+	function setup_experiment(t,...) 
+		window.setup_experiment(t,...)
+		time_last_fmu1 = t
+		...
+		return
+	end function
+	
 	function enter_init() 
 		fmu1.enter_init()
 		...
@@ -23,12 +55,22 @@ code AdaptedFMU:
 	end function
 	
 	function setValues(ports, values) 
+		/*
+		Evaluates each condition (and sa_in rule) in order.
+		*/
 		
 		if (in_condition_1) then
-			in_condition_executed[cond1] = true
-			sa_in_1
+			in_condition_executed[IN_COND_1] = true
+			<sa_in_1>
 			<if AdaptedFMU is mealy then>	
-				update_sa_in_1
+			{// new scope
+				/*
+				These variables are available in the scope of the update_in block.
+				*/
+				var h = 0
+				var dt = 0
+				<update_sa_in_1>
+			}
 			<end if>
 		end if
 		...
@@ -38,34 +80,72 @@ code AdaptedFMU:
 	
 	function doStep(t, H)
 		
-		control_block // or generic algorithm cosim step
-		/* 
-		In the midst of the control block code,
-		before any setValues is called on an inner FMU,
-		the following code will be injected:
-			if in_condition_executed[cond1] then
-				update_in_1
-			end if
-			...
+		/*
+		A new doStep means that a new set of conditions will be triggered.
+		*/
+		out_condition_executed = empty map
+		
+		/*
+		Calculate the elapsed time since the last transition
 		*/
+		var elapsed_fmu1 = t - time_last_fmu1
+		...
+		var e = min(elapsed_fmu1, ...)
+		
+		<control_block_part_1>
+		
+		/*
+		Evaluate each update_in block of the rules that were successfully evaluated before the doStep was called.
+		This is because the window.doStep will be called immediately afterward.
+		*/
+		if (in_condition_executed[IN_COND_1]) then
+			/*
+			These variables are available in the scope of the update_in block.
+				It's not a good idea to have t also in that scope, because it is not available when getValues is called.
+			*/
+			var h = h
+			var dt = inner_t - t
+			<update_in_1>
+		end if
+		if (in_condition_executed[IN_COND_2]) then
+			var h = h
+			var dt = inner_t - t
+			<update_in_2>
+		end if
+		...
+		do_step(fmu1, inner_t, h)
+		/*
+		Executes the update_out blocks.
+		These always execute after a doStep is called on an internal FMU.
+		*/
+		if (<out_condition_1>) then
+			out_condition_executed[OUT_COND_1] = true
+			var h = h
+			var dt = inner_t - t
+			<update_out_1>
+		end if
+		...
 		
 		in_condition_executed = empty map;
-		out_condition_executed := empty map // force output computation.
 		
 	end function
 	
 	function getValues(ports)
-		
 		if out_condition_executed == empty map then
-			if (out_condition_1) then
-				out_condition_executed[cond1] = true
-				update_out_1
+			// This can happen since the adapted unit is a mealy machine
+			// So execute the update_out blocks
+			if (<out_condition_1>) then
+				out_condition_executed[OUT_COND_1] = true
+				var h = 0
+				var dt = 0
+				<update_out_1>
 			end if
 			...
 		end if
 		
-		if out_condition_executed[cond1] then
-			sa_out_1
+		// Execute the sa_out blocks
+		if out_condition_executed[OUT_COND_1] then
+			<sa_out_1>
 		end if
 		...
 	end function

DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation/examples/sketch.BASE.sa

@@ -1,7 +1,7 @@
 import ExternalModule
 module LocalModule
 semantic adaptation Adapted_FMU_Name
-for fmu fmu1, fmu2, fmu3, fmu4, ... ; \\ Kenneth> how does it know where the FMU fils are_):?
+for fmu fmu1, fmu2, fmu3, fmu4, ... ;
 
 input ports in_port_1, 
 				...
@@ -37,7 +37,10 @@ in rules {
 }
 
 control rules {
-	control_block
+	control_block_part_1
+	do_step(fmu1, inner_t, h)
+	control_block_part_2
+	
 	return step_size;
 }
 

DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation/examples/window_sa_canonical_generated_algorithm.c

@@ -60,7 +60,6 @@ code window_sa:
 				/*
 				These 3 variables are available in the scope of the update_in block.
 				*/
-				var t = 0
 				var h = 0
 				var dt = 0
 				window.setValues("reaction_force", stored_windowsa_reaction_force)