Browse Source

fixed one of the tests. Several problems were found: test files were not being copied to the right dir, for example.

Claudio Gomes 2 years ago
parent
commit
cdcaf99011
56 changed files with 142 additions and 141 deletions
  1. 1 1
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical.tests/input/canonical_generation/sample1.sa
  2. 1 1
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical.tests/input/canonical_generation/sample2.sa
  3. 1 1
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical.tests/input/power_window_case_study/controller.sa
  4. 1 1
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical.tests/input/power_window_case_study/controller_sa_allInOne.sa
  5. 1 1
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical.tests/input/power_window_case_study/controller_sa_commented.sa
  6. 15 15
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical.tests/input/power_window_case_study/lazy.sa
  7. 1 1
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical.tests/input/power_window_case_study/lazy_sa_commented.sa
  8. 1 1
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical.tests/input/power_window_case_study/loop.sa
  9. 1 1
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical.tests/input/power_window_case_study/loop_canonical.sa
  10. 1 1
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical.tests/input/power_window_case_study/power.BASE.sa
  11. 1 1
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical.tests/input/power_window_case_study/rate.sa
  12. 1 1
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical.tests/input/power_window_case_study/window_obstacle_sa_flat.BASE.sa
  13. 2 2
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical.tests/input/power_window_case_study/window_sa.BASE.sa
  14. 1 1
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical.tests/input/power_window_case_study/window_sa_canonical.BASE.sa
  15. 1 1
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical.tests/input/power_window_case_study/window_sa_canonical_commented.BASE.sa
  16. 1 1
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical.tests/input/power_window_case_study/window_sa_canonical_types.BASE.sa
  17. 1 1
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical.tests/input/power_window_case_study/window_sa_commented.BASE.sa
  18. 1 1
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical.tests/input/power_window_case_study/window_sa_comp_units.sa
  19. 0 2
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical.tests/src/be/uantwerpen/ansymo/semanticadaptation/cg/canonical/tests/SemanticAdaptationGeneratorTest.xtend
  20. 5 5
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical/src/be/uantwerpen/ansymo/semanticadaptation/cg/canonical/SemanticAdaptationCanonicalGenerator.xtend
  21. 5 1
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp.tests/pom.xml
  22. 1 2
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp.tests/src/be/uantwerpen/ansymo/semanticadaptation/cg/cpp/tests/CgCppAutoTest.xtend
  23. 39 43
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp.tests/src/be/uantwerpen/ansymo/semanticadaptation/cg/cpp/tests/CgCppBasicTest.xtend
  24. 2 2
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp.tests/test_input/single_folder_spec/controller/controller.sa
  25. 2 2
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp.tests/test_input/single_folder_spec/getsetstate/GetSetState.sa
  26. 2 2
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp.tests/test_input/single_folder_spec/lazy/lazy.sa
  27. 2 2
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp.tests/test_input/single_folder_spec/lazy/lazy_canonical.sa
  28. 3 3
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp.tests/test_input/single_folder_spec/loop/loop_canonical.sa
  29. 2 2
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp.tests/test_input/single_folder_spec/power/power.BASE.sa
  30. 2 2
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp.tests/test_input/single_folder_spec/rate/rate.sa
  31. 2 2
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp.tests/test_input/single_folder_spec/rate/rate_canonical.sa
  32. 2 2
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp.tests/test_input/single_folder_spec/rollback_test/rollback_test.sa
  33. 2 2
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp.tests/test_input/single_folder_spec/window/window_sa_canonical_new.BASE.sa
  34. 15 11
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp/src/be/uantwerpen/ansymo/semanticadaptation/cg/cpp/generation/CppGenerator.xtend
  35. 1 1
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/input/canonical_generation/sample1.sa
  36. 1 1
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/input/canonical_generation/sample2.sa
  37. 1 1
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/input/power_window_case_study/controller.sa
  38. 1 1
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/input/power_window_case_study/controller_sa_allInOne.sa
  39. 1 1
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/input/power_window_case_study/controller_sa_commented.sa
  40. 1 1
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/input/power_window_case_study/lazy.sa
  41. 1 1
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/input/power_window_case_study/lazy_sa_commented.sa
  42. 1 1
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/input/power_window_case_study/loop.sa
  43. 1 1
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/input/power_window_case_study/loop_canonical.sa
  44. 1 1
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/input/power_window_case_study/power.BASE.sa
  45. 1 1
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/input/power_window_case_study/rate.sa
  46. 1 1
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/input/power_window_case_study/window_sa.BASE.sa
  47. 1 1
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/input/power_window_case_study/window_sa_canonical.BASE.sa
  48. 1 1
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/input/power_window_case_study/window_sa_canonical_commented.BASE.sa
  49. 1 1
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/input/power_window_case_study/window_sa_canonical_types.BASE.sa
  50. 1 1
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/input/power_window_case_study/window_sa_commented.BASE.sa
  51. 1 1
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/input/power_window_case_study/window_sa_comp_units.sa
  52. 1 1
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/input/single_folder_spec/window/powerwindow_algebraic_loop_delay.sa
  53. 2 2
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/input/single_folder_spec/window/powerwindow_controller_delay.sa
  54. 1 1
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/input/single_folder_spec/window2/window_sa_canonical.BASE.sa
  55. 1 1
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/oracles/power_window_case_study/lazy.BASE.sa
  56. 1 1
      DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/src/be/uantwerpen/ansymo/semanticadaptation/tests/AbstractSemanticAdaptationTest.xtend

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical.tests/input/canonical_generation/sample1.sa

@@ -1,4 +1,4 @@
-semantic adaptation reactive mealy OuterFMU outerFMU
+semantic adaptation reactive mealy OuterFMU
 at "./path/to/FMU.fmu"
 
 	for inner fmu InnerFMU innerFMU1

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical.tests/input/canonical_generation/sample2.sa

@@ -1,4 +1,4 @@
-semantic adaptation reactive mealy OuterFMU outerFMU
+semantic adaptation reactive mealy OuterFMU
 at "./path/to/FMU.fmu"
 
 	for inner fmu reactive moore NA n1

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical.tests/input/power_window_case_study/controller.sa

@@ -1,4 +1,4 @@
-semantic adaptation reactive moore ControllerSA controller_sa
+semantic adaptation reactive moore controller_sa
 at "./path/to/ControllerSA.fmu"
 
 	for inner fmu LazySA lazy

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical.tests/input/power_window_case_study/controller_sa_allInOne.sa

@@ -5,7 +5,7 @@ module Controller_SA
  * The adaptations it does have been split.
  */
 
-semantic adaptation reactive moore ControllerSA controller_sa
+semantic adaptation reactive moore controller_sa
 at "./path/to/ControllerSA.fmu"
 
 	for inner fmu Controller controller

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical.tests/input/power_window_case_study/controller_sa_commented.sa

@@ -1,6 +1,6 @@
 module Controller_SA
 
-semantic adaptation reactive moore ControllerSA controller_sa
+semantic adaptation reactive moore controller_sa
 at "./path/to/ControllerSA.fmu"
 
 	for inner fmu LazySA lazy

+ 15 - 15
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical.tests/input/power_window_case_study/lazy.sa

@@ -1,4 +1,4 @@
-semantic adaptation reactive moore LazySA lazy_sa
+semantic adaptation reactive moore LazySA
 at "./path/to/LazySA.fmu"
 
 	for inner fmu Controller controller
@@ -38,13 +38,13 @@ control rules {
 	}
 	
 	var step_size := min(H, tn - t); 
-	if (lazy_sa.obj_detected != prev_obj_detected or
-		lazy_sa.passenger_up != prev_passenger_up or
-		lazy_sa.passenger_down != prev_passenger_down or
-		lazy_sa.passenger_stop != prev_passenger_stop or
-		lazy_sa.driver_up != prev_driver_up or
-		lazy_sa.driver_down != prev_driver_down or
-		lazy_sa.driver_stop != prev_driver_stop or
+	if (LazySA.obj_detected != prev_obj_detected or
+		LazySA.passenger_up != prev_passenger_up or
+		LazySA.passenger_down != prev_passenger_down or
+		LazySA.passenger_stop != prev_passenger_stop or
+		LazySA.driver_up != prev_driver_up or
+		LazySA.driver_down != prev_driver_down or
+		LazySA.driver_stop != prev_driver_stop or
 		(t+H) >= tn
 	){
 		var Real step_to_be_done := (t+H-tl);
@@ -54,13 +54,13 @@ control rules {
 		tl := tl + step_done; 
 	}
 	
-	prev_obj_detected := lazy_sa.obj_detected;
-	prev_passenger_up := lazy_sa.passenger_up;
-	prev_passenger_down := lazy_sa.passenger_down;
-	prev_passenger_stop := lazy_sa.passenger_stop;
-	prev_driver_up := lazy_sa.driver_up;
-	prev_driver_down := lazy_sa.driver_down;
-	prev_driver_stop := lazy_sa.driver_stop;
+	prev_obj_detected := LazySA.obj_detected;
+	prev_passenger_up := LazySA.passenger_up;
+	prev_passenger_down := LazySA.passenger_down;
+	prev_passenger_stop := LazySA.passenger_stop;
+	prev_driver_up := LazySA.driver_up;
+	prev_driver_down := LazySA.driver_down;
+	prev_driver_stop := LazySA.driver_stop;
 	
 	return step_size;
 }

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical.tests/input/power_window_case_study/lazy_sa_commented.sa

@@ -5,7 +5,7 @@ module Lazy_SA
  * 	when any of its inputs changes, or when it requests to be explicitly run.
  */
 
-semantic adaptation reactive moore LazySA lazy_sa
+semantic adaptation reactive moore lazy_sa
 at "./path/to/LazySA.fmu"
 
 	for inner fmu Controller controller

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical.tests/input/power_window_case_study/loop.sa

@@ -1,4 +1,4 @@
-semantic adaptation reactive moore LoopSA loop_sa
+semantic adaptation reactive moore loop_sa
 at "./path/to/LoopSA.fmu"
 
 	for inner fmu WindowSA window_sa

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical.tests/input/power_window_case_study/loop_canonical.sa

@@ -1,4 +1,4 @@
-semantic adaptation reactive moore LoopSA loop_sa
+semantic adaptation reactive moore loop_sa
 at "./path/to/LoopSA.fmu"
 	
 	for inner fmu WindowSA window_sa

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical.tests/input/power_window_case_study/power.BASE.sa

@@ -1,4 +1,4 @@
-semantic adaptation delayed moore PowerSA power_sa
+semantic adaptation delayed moore power_sa
 at "./path/to/PowerSA.fmu"
 
 	for inner fmu Power power

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical.tests/input/power_window_case_study/rate.sa

@@ -1,4 +1,4 @@
-semantic adaptation reactive moore RateSA rate_sa
+semantic adaptation reactive moore rate_sa
 at "./path/to/RateSA.fmu"
 
 	for inner fmu LoopSA loop_sa

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical.tests/input/power_window_case_study/window_obstacle_sa_flat.BASE.sa

@@ -1,6 +1,6 @@
 module WindowObstacleLoop_SA
 
-semantic adaptation reactive mealy WindowObstableLoopSA adaptedFMU
+semantic adaptation reactive mealy WindowObstableLoopSA
 at "./path/to/WindowObstableLoopSA.fmu"
 
 	for inner fmu WindowSA window_sa

+ 2 - 2
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical.tests/input/power_window_case_study/window_sa.BASE.sa

@@ -1,4 +1,4 @@
-semantic adaptation reactive mealy WindowSA windowSA
+semantic adaptation reactive mealy WindowSA
 at "./path/to/WindowSA.fmu"
 
 	for inner fmu Window window
@@ -10,7 +10,7 @@ output ports disp (m)  <- window.height, tau (N)
 
 out rules {
 	true -> {} --> {
-		windowSA.tau := -window.reaction_torque;
+		tau := -window.reaction_torque;
 	};
 }
 

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical.tests/input/power_window_case_study/window_sa_canonical.BASE.sa

@@ -1,4 +1,4 @@
-semantic adaptation reactive mealy WindowSA windowSA
+semantic adaptation reactive mealy windowSA
 at "./path/to/WindowSA.fmu"
 
 	for inner fmu Window window

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical.tests/input/power_window_case_study/window_sa_canonical_commented.BASE.sa

@@ -1,6 +1,6 @@
 module Window_SA
 
-semantic adaptation reactive mealy WindowSA windowSA
+semantic adaptation reactive mealy windowSA
 at "./path/to/WindowSA.fmu"
 
 	for inner fmu Window window

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical.tests/input/power_window_case_study/window_sa_canonical_types.BASE.sa

@@ -1,4 +1,4 @@
-semantic adaptation reactive mealy WindowSA windowSA
+semantic adaptation reactive mealy windowSA
 at "./path/to/WindowSA.fmu"
 
 	for inner fmu Window window

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical.tests/input/power_window_case_study/window_sa_commented.BASE.sa

@@ -1,6 +1,6 @@
 module Window_SA
 
-semantic adaptation reactive mealy WindowSA windowSA
+semantic adaptation reactive mealy windowSA
 at "./path/to/WindowSA.fmu"
 
 /*

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical.tests/input/power_window_case_study/window_sa_comp_units.sa

@@ -1,4 +1,4 @@
-semantic adaptation reactive mealy WindowSA windowSA
+semantic adaptation reactive mealy windowSA
 at "./path/to/WindowSA.fmu"
 
 	for inner fmu Window window

+ 0 - 2
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical.tests/src/be/uantwerpen/ansymo/semanticadaptation/cg/canonical/tests/SemanticAdaptationGeneratorTest.xtend

@@ -63,8 +63,6 @@ class SemanticAdaptationGeneratorTest extends AbstractSemanticAdaptationTest{
 				
 				Assert.assertTrue(sa.inports.filter[p | p.name=="innerFMU1__input_port1"].size == 0)
 				
-				//sa.inports.filter[p | p.name=="innerFMU2__input_port3"].head.targetdependency.owner.name == "innerFMU2"
-				//sa.inports.filter[p | p.name=="innerFMU2__input_port3"].head.targetdependency.port.name == "input_port3"
 			}
 		}) }
 	

+ 5 - 5
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.canonical/src/be/uantwerpen/ansymo/semanticadaptation/cg/canonical/SemanticAdaptationCanonicalGenerator.xtend

@@ -368,8 +368,8 @@ class SemanticAdaptationCanonicalGenerator {
 									.filter[s | s.value instanceof Declaration && 
 												(s.value as Declaration).declarations.size == 1 &&
 												(s.value as Declaration).declarations.head instanceof SingleVarDeclaration &&
-												((s.value as Declaration).declarations.head as SingleVarDeclaration).expr instanceof DoStepFun &&
-												(((s.value as Declaration).declarations.head as SingleVarDeclaration).expr as DoStepFun).fmu == fmu 
+												(s.value as Declaration).declarations.head.expr instanceof DoStepFun &&
+												((s.value as Declaration).declarations.head.expr as DoStepFun).fmu == fmu 
 									]
 		
 		check(doStepAssignments.size <= 1, "Multiple calls to the doStep function for the same FMU are not supported yet. Use a loop with a single call.")
@@ -649,8 +649,8 @@ class SemanticAdaptationCanonicalGenerator {
 		
 		val assignment = SemanticAdaptationFactory.eINSTANCE.createAssignment()
 		assignment.lvalue = SemanticAdaptationFactory.eINSTANCE.createVariable()
-		(assignment.lvalue as Variable).owner = toPort.eContainer as FMU
-		(assignment.lvalue as Variable).ref = toPort
+		assignment.lvalue.owner = toPort.eContainer as FMU
+		assignment.lvalue.ref = toPort
 		val varRef = SemanticAdaptationFactory.eINSTANCE.createVariable()
 		varRef.owner = fromPort.eContainer as FMU
 		varRef.ref = fromPort
@@ -1049,7 +1049,7 @@ class SemanticAdaptationCanonicalGenerator {
 		} else if (expression instanceof StringLiteral){
 			return "String"
 		} else if (expression instanceof Variable){
-			var varRef = expression as Variable
+			var varRef = expression
 			if (varRef.ref instanceof Port){
 				var decl = varRef.ref as Port
 				if (decl.type !== null){

+ 5 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp.tests/pom.xml

@@ -60,9 +60,13 @@
 					<configuration>
 						<!-- the tests use std out a lot so we dont want that in the console -->
 						<redirectTestOutputToFile>true</redirectTestOutputToFile>
-
 					</configuration>
 				</plugin>
 		</plugins>
+		<testResources>
+			<testResource>
+				<directory>${project.basedir}/test_input</directory>
+			</testResource>
+		</testResources>
 	</build>
 </project>

+ 1 - 2
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp.tests/src/be/uantwerpen/ansymo/semanticadaptation/cg/cpp/tests/CgCppAutoTest.xtend

@@ -77,8 +77,7 @@ class CgCppAutoTest extends AbstractSemanticAdaptationTest {
 
 	var List<File> f;
 
-	@Ignore
-	@Test def allSemanticAdaptations() {
+	@Ignore @Test def allSemanticAdaptations() {
 		//assertTrue(false);
 		__parseNoErrors(f);
 	}

+ 39 - 43
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp.tests/src/be/uantwerpen/ansymo/semanticadaptation/cg/cpp/tests/CgCppBasicTest.xtend

@@ -58,50 +58,40 @@ class CgCppBasicTest extends AbstractSemanticAdaptationTest {
 		}
 	}
 
-	@Ignore
 	@Test def window_sa_canonical_new() {
-		__parseNoErrors('test_input/single_folder_spec/window/window_sa_canonical_new.BASE.sa', 'generated',
-			"powerwindow");
+		__parseAndGenerateWithNoErrors('window_sa_canonical_new.BASE.sa', 'test_input/single_folder_spec/window/', 'powerwindow');
 	}
 	
-	@Ignore
-	@Test def getSetState_sa() {
-		__parseNoErrors('test_input/single_folder_spec/getsetstate/GetSetState.sa', 'generated', "getSetState");
+	@Ignore @Test def getSetState_sa() {
+		__parseAndGenerateWithNoErrors('test_input/single_folder_spec/getsetstate/GetSetState.sa', 'generated', "getSetState");
 	}
 
-	@Ignore
-	@Test def lazy_canonical() {
-		__parseNoErrors('test_input/single_folder_spec/lazy/lazy_canonical.sa', 'generated', "lazy");
+	@Ignore @Test def lazy_canonical() {
+		__parseAndGenerateWithNoErrors('test_input/single_folder_spec/lazy/lazy_canonical.sa', 'generated', "lazy");
 	}
 
-	@Ignore
-	@Test def loop() {
-		__parseNoErrors('test_input/single_folder_spec/loop/loop_canonical.sa', 'generated', "LoopSA");
+	@Ignore @Test def loop() {
+		__parseAndGenerateWithNoErrors('test_input/single_folder_spec/loop/loop_canonical.sa', 'generated', "LoopSA");
 	}
 
-	@Ignore
-	@Test def rate() {
-		__parseNoErrors('test_input/single_folder_spec/rate/rate.sa', 'generated', "rate");
+	@Ignore @Test def rate() {
+		__parseAndGenerateWithNoErrors('test_input/single_folder_spec/rate/rate.sa', 'generated', "rate");
 	}
 
-	@Ignore
-	@Test def rate_canonical() {
-		__parseNoErrors('test_input/single_folder_spec/rate/rate_canonical.sa', 'generated', "rate_canonical");
+	@Ignore @Test def rate_canonical() {
+		__parseAndGenerateWithNoErrors('test_input/single_folder_spec/rate/rate_canonical.sa', 'generated', "rate_canonical");
 	}
 
-	@Ignore
-	@Test def power() {
-		__parseNoErrors('test_input/single_folder_spec/power/power.BASE.sa', 'generated', 'power');
+	@Ignore @Test def power() {
+		__parseAndGenerateWithNoErrors('test_input/single_folder_spec/power/power.BASE.sa', 'generated', 'power');
 	}
 
-	@Ignore
-	@Test def rollback_test() {
-		__parseNoErrors('test_input/single_folder_spec/rollback_test/rollback_test.sa', 'generated', 'rollback_test');
+	@Ignore @Test def rollback_test() {
+		__parseAndGenerateWithNoErrors('test_input/single_folder_spec/rollback_test/rollback_test.sa', 'generated', 'rollback_test');
 	}
 
-	@Ignore
-	@Test def controller_test() {
-		__parseNoErrors('test_input/single_folder_spec/controller/controller.sa', 'generated', 'controller');
+	@Ignore @Test def controller_test() {
+		__parseAndGenerateWithNoErrors('test_input/single_folder_spec/controller/controller.sa', 'generated', 'controller');
 	}
 
 	def __parseNoErrorsWithValidation(String directory, String filename) {
@@ -151,23 +141,29 @@ class CgCppBasicTest extends AbstractSemanticAdaptationTest {
 
 	}
 
-	def __parseNoErrors(String filename, String directory, String projectName) {
-		val saRootDir = Paths.get("target", directory, projectName).toFile();
-		val srcGenPath = new File(saRootDir, "sources")
-		val resourcesPath = new File(saRootDir, "resources");
-
-		val model = __parse(filename)
-		__assertNoParseErrors(model, filename)
+	def __parseAndGenerateWithNoErrors(String filename, String directory, String projectName) {
+		val dirTestOutput = directory.replace('test_input/','target/test-classes/')
+		val saRootDir = Paths.get(dirTestOutput).toFile();
+		val saGenRootTempDir = Paths.get(dirTestOutput, projectName).toFile();
+		val absFileName = Paths.get(dirTestOutput, filename).toFile();
+		val srcGenPath = new File(saGenRootTempDir, "sources")
+		val resourcesPath = new File(saGenRootTempDir, "resources");
+		
+		println("saGenRootTempDir="+saGenRootTempDir.absolutePath)
+		println("absFileName="+absFileName.absolutePath)
+		
+		val model = __parse(absFileName.absolutePath)
+		__assertNoParseErrors(model, absFileName.absolutePath)
 
 		val fsa = new InMemoryFileSystemAccess();
 		val cppGen = new CppGenerator();
-		cppGen.doGenerate(model.eResource, fsa);
+		cppGen.doGenerate(model.eResource, fsa, saRootDir.absolutePath);
 
-		if (saRootDir.exists) {
-			BuildUtilities.deleteFolder(saRootDir);
+		if (saGenRootTempDir.exists) {
+			BuildUtilities.deleteFolder(saGenRootTempDir);
 		}
 
-		saRootDir.mkdirs();
+		saGenRootTempDir.mkdirs();
 		srcGenPath.mkdirs();
 		resourcesPath.mkdirs();
 
@@ -176,7 +172,7 @@ class CgCppBasicTest extends AbstractSemanticAdaptationTest {
 
 			var File fp;
 			if (fName.equals("modelDescription.xml") || fName.equals("CMakeLists.txt") || fName.equals("msys-toolchain.cmake")) {
-				fp = new File(saRootDir, fName);
+				fp = new File(saGenRootTempDir, fName);
 			} else {
 				fp = new File(srcGenPath, fName);
 			}
@@ -200,16 +196,16 @@ class CgCppBasicTest extends AbstractSemanticAdaptationTest {
 //		BuildUtilities.writeToFile(new File(saRootDir, "msys-toolchain.cmake"), cMakeToolChain);
 		if (!CMakeUtil.windows) {
 			val cmake = new CMakeUtil(true)
-			FileUtils.copyDirectory(hcfRoot, new File(saRootDir, "hcf"), new FileFilter() {
+			FileUtils.copyDirectory(hcfRoot, new File(saGenRootTempDir, "hcf"), new FileFilter() {
 
 				override accept(File pathname) {
 					return !pathname.name.equals("CMakeCache.txt")
 				}
 
 			})
-			Assert.assertTrue("Expected cmake to parse", cmake.generate(saRootDir));
-			Assert.assertTrue("Expected no make errors", cmake.make(saRootDir));
-			Assert.assertTrue("Failed to pack the FMU", cmake.make(saRootDir, "pack"));
+			Assert.assertTrue("Expected cmake to parse", cmake.generate(saGenRootTempDir));
+			Assert.assertTrue("Expected no make errors", cmake.make(saGenRootTempDir));
+			Assert.assertTrue("Failed to pack the FMU", cmake.make(saGenRootTempDir, "pack"));
 		}
 	}
 

+ 2 - 2
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp.tests/test_input/single_folder_spec/controller/controller.sa

@@ -1,8 +1,8 @@
-semantic adaptation reactive moore ControllerSA controller_sa
+semantic adaptation reactive moore controller_sa
 at "./path/to/ControllerSA.fmu"
 
 	for inner fmu LazySA lazy
-	at "test_input/single_folder_spec/controller/LazySA.fmu"
+	at "./LazySA.fmu"
 	with input ports obj_detected, passenger_up, passenger_down, passenger_stop, driver_up, driver_down, driver_stop
 	with output ports up, down, stop
 

+ 2 - 2
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp.tests/test_input/single_folder_spec/getsetstate/GetSetState.sa

@@ -1,8 +1,8 @@
-semantic adaptation reactive mealy GetSetStateSA getSetStateSA
+semantic adaptation reactive mealy getSetStateSA
 at "./path/to/GetSetStateSA.fmu"
 
 	for inner fmu GetSetState getSetState
-		at "test_input/single_folder_spec/getsetstate/GetSetState.fmu"
+		at "./GetSetState.fmu"
 		with input ports valve
 		with output ports level
 

+ 2 - 2
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp.tests/test_input/single_folder_spec/lazy/lazy.sa

@@ -1,8 +1,8 @@
-semantic adaptation reactive moore LazySA lazy_sa
+semantic adaptation reactive moore lazy_sa
 at "./path/to/LazySA.fmu"
 
 	for inner fmu Controller controller
-	at "test_input/single_folder_spec/lazy/Controller.fmu"
+	at "./Controller.fmu"
 	with input ports obj_detected, passenger_up, passenger_down, passenger_stop, driver_up, driver_down, driver_stop
 	with output ports up, down, stop
 

+ 2 - 2
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp.tests/test_input/single_folder_spec/lazy/lazy_canonical.sa

@@ -1,8 +1,8 @@
-semantic adaptation reactive moore LazySA lazy_sa
+semantic adaptation reactive moore lazy_sa
 at "./path/to/LazySA.fmu"
 
 	for inner fmu Controller controller
-	at "test_input/single_folder_spec/lazy/Controller.fmu"
+	at "./Controller.fmu"
 	with input ports obj_detected, passenger_up, passenger_down, passenger_stop, driver_up, driver_down, driver_stop
 	with output ports up, down, stop
 

+ 3 - 3
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp.tests/test_input/single_folder_spec/loop/loop_canonical.sa

@@ -1,13 +1,13 @@
-semantic adaptation reactive moore LoopSA loop_sa
+semantic adaptation reactive moore loop_sa
 at "./path/to/LoopSA.fmu"
 	
 	for inner fmu WindowSA window_sa
-		at "./test_input/single_folder_spec/loop/WindowSA.fmu"
+		at "./WindowSA.fmu"
 		with input ports displacement (rad), speed (rad/s), reaction_force (N)
 		with output ports disp (m), tau (N.m)
 	
 	for inner fmu Obstacle obstacle
-		at "./test_input/single_folder_spec/loop/Obstacle.fmu"
+		at "./Obstacle.fmu"
 		with input ports disp (m)
 		with output ports reaction_force (m)
 	

+ 2 - 2
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp.tests/test_input/single_folder_spec/power/power.BASE.sa

@@ -1,8 +1,8 @@
-semantic adaptation delayed moore PowerSA power_sa
+semantic adaptation delayed moore power_sa
 at "./path/to/PowerSA.fmu"
 
 	for inner fmu Power power
-	at "test_input/single_folder_spec/power/Power.fmu"
+	at "./Power.fmu"
 	with input ports u, d, tau (N.m)
 	with output ports armature_current (A), speed (rad/s), displacement (rad)
 

+ 2 - 2
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp.tests/test_input/single_folder_spec/rate/rate.sa

@@ -1,8 +1,8 @@
-semantic adaptation reactive moore RateSA rate_sa
+semantic adaptation reactive moore rate_sa
 at "./path/to/RateSA.fmu"
 
 	for inner fmu LoopSA loop_sa
-		at "./test_input/single_folder_spec/rate/LoopSA.fmu"
+		at "./LoopSA.fmu"
 		with input ports displacement (rad), speed (rad/s)
 		with output ports tau (N.m)
 	

+ 2 - 2
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp.tests/test_input/single_folder_spec/rate/rate_canonical.sa

@@ -1,8 +1,8 @@
-semantic adaptation reactive moore RateSA rate_sa
+semantic adaptation reactive moore rate_sa
 at "./path/to/RateSA.fmu"
 
 	for inner fmu LoopSA loop_sa
-		at "./test_input/single_folder_spec/rate/LoopSA.fmu"
+		at "./LoopSA.fmu"
 		with input ports displacement (rad), speed (rad/s)
 		with output ports tau (N.m)
 	

+ 2 - 2
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp.tests/test_input/single_folder_spec/rollback_test/rollback_test.sa

@@ -1,8 +1,8 @@
-semantic adaptation reactive moore RollbackTest rollbackTest_sa
+semantic adaptation reactive moore rollbackTest_sa
 at "./path/to/RollbackTest.fmu"
 
 	for inner fmu rollbackEnd rollbackend
-		at "./test_input/single_folder_spec/rollback_test/rollback-end.fmu"
+		at "./rollback-end.fmu"
 		with input ports level
 
 input ports level -> rollbackend.level

+ 2 - 2
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp.tests/test_input/single_folder_spec/window/window_sa_canonical_new.BASE.sa

@@ -1,8 +1,8 @@
-semantic adaptation reactive mealy WindowSA windowSA
+semantic adaptation reactive mealy windowSA
 at "./path/to/WindowSA.fmu"
 
 	for inner fmu Window window
-		at "test_input/single_folder_spec/window/Window.fmu"
+		at "./Window.fmu"
 		with input ports displacement (rad), speed (rad/s), reaction_force (N)
 		with output ports height (m), reaction_torque (N.m)
 

+ 15 - 11
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp/src/be/uantwerpen/ansymo/semanticadaptation/cg/cpp/generation/CppGenerator.xtend

@@ -38,24 +38,26 @@ class CppGenerator {
 
 	def void doGenerate(Resource resource, IFileSystemAccess2 fsa) {
 		Log.push("CppGenerator.doGenerate")
+		Log.println("Resource URI: " + resource.URI)
 		val adaptationFolderURI = resource.URI.trimSegments(1)
-		Log.println("Adaptation folder URI: " + adaptationFolderURI)
-		doGenerate(resource, fsa, adaptationFolderURI)
+		val resolvedFolderURI = CommonPlugin.resolve(adaptationFolderURI);
+		Log.println("Adaptation folder URI: " + resolvedFolderURI.toFileString)
+		doGenerate(resource, fsa, resolvedFolderURI.toFileString)
 		Log.pop("CppGenerator.doGenerate")
 	}
 	
-	def void doGenerate(Resource resource, IFileSystemAccess2 fsa, URI adaptationFolderURI) {
-		Log.push("CppGenerator.doGenerate " + adaptationFolderURI)
+	def void doGenerate(Resource resource, IFileSystemAccess2 fsa, String resolvedFolderURI) {
+		Log.push("CppGenerator.doGenerate " + resolvedFolderURI)
 		this.fsa = fsa;
 		for (SemanticAdaptation type : resource.allContents.toIterable.filter(SemanticAdaptation)) {
-			type.compile(adaptationFolderURI);
+			type.compile(resolvedFolderURI);
 		}
-		Log.pop("CppGenerator.doGenerate"  + adaptationFolderURI)
+		Log.pop("CppGenerator.doGenerate"  + resolvedFolderURI)
 	}
 	
 
 	// TODO: Verify adaptation.name is not a C++ keyword
-	def void compile(SemanticAdaptation adaptation, URI adaptationFolderURI) {
+	def void compile(SemanticAdaptation adaptation, String resolvedFolderURI) {
 		for (Adaptation adap : adaptation.elements.filter(Adaptation)) {
 			// Value used for scoping variables in the .sa file
 			val adapInteralRefName = adap.name;
@@ -93,7 +95,7 @@ class CppGenerator {
 			var ModelDescription md;
 			for (fmu : adap.inner.eAllContents.toList.filter(InnerFMU)) {
 				Log.push("Loading fmu " + fmu.path)
-				val fmuFile = getFMUFile(fmu.path, adaptationFolderURI)
+				val fmuFile = getFMUFile(fmu.path, resolvedFolderURI)
 				this.resourcePaths.add(fmuFile);
 				md = new ModelDescription(fmu.name, fmuFile);
 	
@@ -354,9 +356,11 @@ class CppGenerator {
 			}
 		}
   		
-  		def getFMUFile(String fmuUnresolvedPath, URI adaptationFolderURI) {
-			var resolvedFolderURI = CommonPlugin.resolve(adaptationFolderURI);
-			val fmuCompleteURI = URI.createFileURI(resolvedFolderURI.toFileString + File.separatorChar + fmuUnresolvedPath.replace('\"', ''))
+  		def getFMUFile(String fmuUnresolvedPath, String resolvedFolderURI) {
+			Log.println("Current working dir: " + resolvedFolderURI)
+			//var resolvedFolderURI = CommonPlugin.resolve(adaptationFolderURI);
+			Log.println("Resolved Current working dir: " + resolvedFolderURI)
+			val fmuCompleteURI = URI.createFileURI(resolvedFolderURI + File.separatorChar + fmuUnresolvedPath.replace('\"', ''))
 			var fmuPath = fmuCompleteURI.toFileString
 			Log.println("Resolved fmu path: " + fmuPath)
 			val fmuFile = new File(fmuPath);

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/input/canonical_generation/sample1.sa

@@ -1,4 +1,4 @@
-semantic adaptation reactive mealy OuterFMU outerFMU
+semantic adaptation reactive mealy outerFMU
 at "./path/to/FMU.fmu"
 
 	for inner fmu InnerFMU innerFMU1

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/input/canonical_generation/sample2.sa

@@ -1,4 +1,4 @@
-semantic adaptation reactive mealy OuterFMU outerFMU
+semantic adaptation reactive mealy outerFMU
 at "./path/to/FMU.fmu"
 
 	for inner fmu reactive moore NA n1

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/input/power_window_case_study/controller.sa

@@ -1,4 +1,4 @@
-semantic adaptation reactive moore ControllerSA controller_sa
+semantic adaptation reactive moore controller_sa
 at "./path/to/ControllerSA.fmu"
 
 	for inner fmu LazySA lazy

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/input/power_window_case_study/controller_sa_allInOne.sa

@@ -5,7 +5,7 @@ module Controller_SA
  * The adaptations it does have been split.
  */
 
-semantic adaptation reactive moore ControllerSA controller_sa
+semantic adaptation reactive moore controller_sa
 at "./path/to/ControllerSA.fmu"
 
 	for inner fmu Controller controller

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/input/power_window_case_study/controller_sa_commented.sa

@@ -1,6 +1,6 @@
 module Controller_SA
 
-semantic adaptation reactive moore ControllerSA controller_sa
+semantic adaptation reactive moore controller_sa
 at "./path/to/ControllerSA.fmu"
 
 	for inner fmu LazySA lazy

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/input/power_window_case_study/lazy.sa

@@ -1,4 +1,4 @@
-semantic adaptation reactive moore LazySA lazy_sa
+semantic adaptation reactive moore lazy_sa
 at "./path/to/LazySA.fmu"
 
 	for inner fmu Controller controller

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/input/power_window_case_study/lazy_sa_commented.sa

@@ -5,7 +5,7 @@ module Lazy_SA
  * 	when any of its inputs changes, or when it requests to be explicitly run.
  */
 
-semantic adaptation reactive moore LazySA lazy_sa
+semantic adaptation reactive moore lazy_sa
 at "./path/to/LazySA.fmu"
 
 	for inner fmu Controller controller

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/input/power_window_case_study/loop.sa

@@ -1,4 +1,4 @@
-semantic adaptation reactive moore LoopSA loop_sa
+semantic adaptation reactive moore loop_sa
 at "./path/to/LoopSA.fmu"
 
 	for inner fmu WindowSA window_sa

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/input/power_window_case_study/loop_canonical.sa

@@ -1,4 +1,4 @@
-semantic adaptation reactive moore LoopSA loop_sa
+semantic adaptation reactive moore loop_sa
 at "./path/to/LoopSA.fmu"
 	
 	for inner fmu WindowSA window_sa

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/input/power_window_case_study/power.BASE.sa

@@ -1,4 +1,4 @@
-semantic adaptation delayed moore PowerSA power_sa
+semantic adaptation delayed moore power_sa
 at "./path/to/PowerSA.fmu"
 
 	for inner fmu Power power

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/input/power_window_case_study/rate.sa

@@ -1,4 +1,4 @@
-semantic adaptation reactive moore RateSA rate_sa
+semantic adaptation reactive moore rate_sa
 at "./path/to/RateSA.fmu"
 
 	for inner fmu LoopSA loop_sa

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/input/power_window_case_study/window_sa.BASE.sa

@@ -1,4 +1,4 @@
-semantic adaptation reactive mealy WindowSA windowSA
+semantic adaptation reactive mealy windowSA
 at "./path/to/WindowSA.fmu"
 
 	for inner fmu Window window

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/input/power_window_case_study/window_sa_canonical.BASE.sa

@@ -1,4 +1,4 @@
-semantic adaptation reactive mealy WindowSA windowSA
+semantic adaptation reactive mealy windowSA
 at "./path/to/WindowSA.fmu"
 
 	for inner fmu Window window

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/input/power_window_case_study/window_sa_canonical_commented.BASE.sa

@@ -1,6 +1,6 @@
 module Window_SA
 
-semantic adaptation reactive mealy WindowSA windowSA
+semantic adaptation reactive mealy windowSA
 at "./path/to/WindowSA.fmu"
 
 	for inner fmu Window window

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/input/power_window_case_study/window_sa_canonical_types.BASE.sa

@@ -1,4 +1,4 @@
-semantic adaptation reactive mealy WindowSA windowSA
+semantic adaptation reactive mealy windowSA
 at "./path/to/WindowSA.fmu"
 
 	for inner fmu Window window

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/input/power_window_case_study/window_sa_commented.BASE.sa

@@ -1,6 +1,6 @@
 module Window_SA
 
-semantic adaptation reactive mealy WindowSA windowSA
+semantic adaptation reactive mealy windowSA
 at "./path/to/WindowSA.fmu"
 
 /*

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/input/power_window_case_study/window_sa_comp_units.sa

@@ -1,4 +1,4 @@
-semantic adaptation reactive mealy WindowSA windowSA
+semantic adaptation reactive mealy windowSA
 at "./path/to/WindowSA.fmu"
 
 	for inner fmu Window window

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/input/single_folder_spec/window/powerwindow_algebraic_loop_delay.sa

@@ -4,7 +4,7 @@ import Controller_SA
 module Algebraic_Loop_SA
 
 // this one could be joined with the one below, if we assume certain priorities in executing the rules
-semantic adaptation WindowSA window_sa
+semantic adaptation window_sa
 at "./path/to/WindowSA.fmu"
 for fmu window
 out rules {

+ 2 - 2
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/input/single_folder_spec/window/powerwindow_controller_delay.sa

@@ -2,7 +2,7 @@ import PowerWindowModel
 
 module Controller_SA
 
-semantic adaptation ArmatureCurrentSA armature_current_sa
+semantic adaptation armature_current_sa
 at "./path/to/ArmatureCurrentSA.fmu"
 for fmu controller
 triggered by signal == true
@@ -11,7 +11,7 @@ in rules with crossing absolute tolerance = 1e-8 and relative tolerance = 0.0001
 	otherwise -> obj_detected := false;
 }
 
-semantic adaptation InOutSA in_out_sa
+semantic adaptation in_out_sa
 at "./path/to/InOutSA.fmu"
 for fmu controller
 out rules with zero order hold {

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/input/single_folder_spec/window2/window_sa_canonical.BASE.sa

@@ -1,6 +1,6 @@
 module Window_SA
 
-semantic adaptation reactive mealy WindowSA windowSA
+semantic adaptation reactive mealy windowSA
 at "./path/to/WindowSA.fmu"
 
 	for inner fmu Window window

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/oracles/power_window_case_study/lazy.BASE.sa

@@ -1,4 +1,4 @@
-semantic adaptation reactive moore LazySA lazy_sa_BASE
+semantic adaptation reactive moore lazy_sa_BASE
 at "./path/to/LazySA.fmu"
 
 	for inner fmu Controller controller

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/src/be/uantwerpen/ansymo/semanticadaptation/tests/AbstractSemanticAdaptationTest.xtend

@@ -79,7 +79,7 @@ abstract class AbstractSemanticAdaptationTest {
 					print(ind(indent+1) + f.name + ": ")
 					if (feature instanceof EObject) {
 						print(feature.class.simpleName.substring(0, feature.class.simpleName.length-4))
-						printObject((feature as EObject), indent+1)
+						printObject(feature, indent+1)
 					} else if (feature instanceof String) {
 						println(feature.class.simpleName + " = '" + feature + "'")
 					} else {