Merge branch 'updated_emam2middleware' into 'master'

Updated EMAM2Middleware

See merge request !5

EMADL2TORCS/generate2ros_dpnet_variant.sh

@@ -4,7 +4,7 @@ echo "Cleaning target directory..."
 rm -rf target/*
 
 echo "Generating code..."
-java -cp embedded-montiarc-math-middleware-generator-0.0.12-SNAPSHOT-jar-with-dependencies.jar de.monticore.lang.monticar.generator.middleware.DistributedTargetGeneratorCli --models-dir=src/dpnet_variant/ --root-model=dp.mastercomponent --output-dir=target/Mastercomponent --generators=emadlcpp,roscpp --backend=MXNET
+java -jar embedded-montiarc-math-middleware-generator-0.0.18-SNAPSHOT-jar-with-dependencies.jar project_dpnet.json
 
 echo "Copying build and run scripts..."
 cp -rf resources/scripts/* target/

EMADL2TORCS/generate2ros_groundTruthLabels_variant.sh

@@ -4,7 +4,7 @@ echo "Cleaning target directory..."
 rm -rf target/*
 
 echo "Generating code..."
-java -cp embedded-montiarc-math-middleware-generator-0.0.12-SNAPSHOT-jar-with-dependencies.jar de.monticore.lang.monticar.generator.middleware.DistributedTargetGeneratorCli --models-dir=src/groundTruthLabels_variant/ --root-model=dp.mastercomponent --output-dir=target/Mastercomponent --generators=emadlcpp,roscpp --backend=MXNET
+java -jar embedded-montiarc-math-middleware-generator-0.0.18-SNAPSHOT-jar-with-dependencies.jar project_groundTruthLabels.json
 
 echo "Copying build and run scripts..."
 cp -rf resources/scripts/* target/

EMADL2TORCS/project_dpnet.json

+{
+  "modelsDir": "src/dpnet_variant/",
+  "outputDir": "target/Mastercomponent",
+  "rootModel": "dp.mastercomponent",
+  "generators": ["emadlcpp","roscpp"],
+  "emadlBackend": "MXNET"
+}

EMADL2TORCS/project_groundTruthLabels.json

+{
+  "modelsDir": "src/groundTruthLabels_variant/",
+  "outputDir": "target/Mastercomponent",
+  "rootModel": "dp.mastercomponent",
+  "generators": ["emadlcpp","roscpp"],
+  "emadlBackend": "MXNET"
+}

EMADL2TORCS/src/dpnet_variant/dp/subcomponents/Affordance.struct

 package dp.subcomponents;
 
 struct Affordance {
-    Q(-0.5rad:0.001rad:0.5rad)  angle;
+    (-0.5rad:0.001rad:0.5rad)  angle;
 
-    Q(-7m : 0.01m : -2.5m)     toMarkingL;
-    Q(-2m : 0.01m : 3.5m)      toMarkingM;
-    Q(2.5m : 0.01m : 7m)       toMarkingR;
-    Q(0m : 0.1m : 75m)         distL;
-    Q(0m : 0.1m : 75m)         distR;
+    (-7m : 0.01m : -2.5m)     toMarkingL;
+    (-2m : 0.01m : 3.5m)      toMarkingM;
+    (2.5m : 0.01m : 7m)       toMarkingR;
+    (0m : 0.1m : 75m)         distL;
+    (0m : 0.1m : 75m)         distR;
 
-    Q(-9.5m : 0.01m : -4m)     toMarkingLL;
-    Q(-5.5m : 0.01m : -0.5m)   toMarkingML;
-    Q(0.5m : 0.01m : 5.5m)     toMarkingMR;
-    Q(4m : 0.01m : 9.5m)       toMarkingRR;
-    Q(0m : 0.1m : 75m)         distLL;
-    Q(0m : 0.1m : 75m)         distMM;
-    Q(0m : 0.1m : 75m)         distRR;
+    (-9.5m : 0.01m : -4m)     toMarkingLL;
+    (-5.5m : 0.01m : -0.5m)   toMarkingML;
+    (0.5m : 0.01m : 5.5m)     toMarkingMR;
+    (4m : 0.01m : 9.5m)       toMarkingRR;
+    (0m : 0.1m : 75m)         distLL;
+    (0m : 0.1m : 75m)         distMM;
+    (0m : 0.1m : 75m)         distRR;
 
-    Q(0 : 0.1 : 1)             fast;
+    (0 : 0.1 : 1)             fast;
 }

EMADL2TORCS/src/dpnet_variant/dp/subcomponents/ConstantMatrix.emadl

 package dp.subcomponents;
 
-component ConstantMatrix<Z n=1, Z m=1>(Q^{n,m} value) {
+component ConstantMatrix<Z n=1, Z m=1>(Q^{n,m} val) {
 	port
 		out Q^{n,m} out1;
     implementation Math{
-        out1=value;
+        out1=val;
     }
 }

EMADL2TORCS/src/groundTruthLabels_variant/dp/subcomponents/Affordance.struct

 package dp.subcomponents;
 
 struct Affordance {
-    Q(-0.5rad:0.001rad:0.5rad)  angle;
+    (-0.5rad:0.001rad:0.5rad)  angle;
 
-    Q(-7m : 0.01m : -2.5m)     toMarkingL;
-    Q(-2m : 0.01m : 3.5m)      toMarkingM;
-    Q(2.5m : 0.01m : 7m)       toMarkingR;
-    Q(0m : 0.1m : 75m)         distL;
-    Q(0m : 0.1m : 75m)         distR;
+    (-7m : 0.01m : -2.5m)     toMarkingL;
+    (-2m : 0.01m : 3.5m)      toMarkingM;
+    (2.5m : 0.01m : 7m)       toMarkingR;
+    (0m : 0.1m : 75m)         distL;
+    (0m : 0.1m : 75m)         distR;
 
-    Q(-9.5m : 0.01m : -4m)     toMarkingLL;
-    Q(-5.5m : 0.01m : -0.5m)   toMarkingML;
-    Q(0.5m : 0.01m : 5.5m)     toMarkingMR;
-    Q(4m : 0.01m : 9.5m)       toMarkingRR;
-    Q(0m : 0.1m : 75m)         distLL;
-    Q(0m : 0.1m : 75m)         distMM;
-    Q(0m : 0.1m : 75m)         distRR;
+    (-9.5m : 0.01m : -4m)     toMarkingLL;
+    (-5.5m : 0.01m : -0.5m)   toMarkingML;
+    (0.5m : 0.01m : 5.5m)     toMarkingMR;
+    (4m : 0.01m : 9.5m)       toMarkingRR;
+    (0m : 0.1m : 75m)         distLL;
+    (0m : 0.1m : 75m)         distMM;
+    (0m : 0.1m : 75m)         distRR;
 
-    Q(0 : 0.1 : 1)             fast;
+    (0 : 0.1 : 1)             fast;
 }

EMADL2TORCS/src/groundTruthLabels_variant/dp/subcomponents/ConstantMatrix.emadl

 package dp.subcomponents;
 
-component ConstantMatrix<Z n=1, Z m=1>(Q^{n,m} value) {
+component ConstantMatrix<Z n=1, Z m=1>(Q^{n,m} val) {
 	port
 		out Q^{n,m} out1;
     implementation Math{
-        out1=value;
+        out1=val;
     }
 }