Merge branch 'Haller' into 'master'

Haller

See merge request !25

pom.xml

@@ -18,7 +18,7 @@
 
     <groupId>de.monticore.lang.monticar</groupId>
     <artifactId>embedded-montiarc-deeplearning</artifactId>
-    <version>0.4.4-SNAPSHOT</version>
+    <version>0.4.5-SNAPSHOT</version>
 
     <!-- == PROJECT DEPENDENCIES ============================================= -->
 
@@ -27,11 +27,11 @@
         <!-- .. EMA-Libraries ................................................. -->
         <Common-MontiCar.version>0.4.4-SNAPSHOT</Common-MontiCar.version>
         <Embedded-MontiArc.version>0.4.4-SNAPSHOT</Embedded-MontiArc.version>
-        <Embedded-MontiArc-Math.version>0.4.4-SNAPSHOT</Embedded-MontiArc-Math.version>
+        <Embedded-MontiArc-Math.version>0.4.5-SNAPSHOT</Embedded-MontiArc-Math.version>
         <Embedded-MontiArc-Dynamics.version>0.4.4-SNAPSHOT</Embedded-MontiArc-Dynamics.version>
         <Embedded-MontiArc-Behaviour.version>0.4.4-SNAPSHOT</Embedded-MontiArc-Behaviour.version>
         <Math.version>0.4.4-SNAPSHOT</Math.version>
-        <MathOpt.version>0.4.4-SNAPSHOT</MathOpt.version>
+        <MathOpt.version>0.4.6-SNAPSHOT</MathOpt.version>
         <CNNArch.version>0.4.4-SNAPSHOT</CNNArch.version>
 
         <!-- .. SE-Libraries .................................................. -->

src/main/java/de/monticore/lang/monticar/emadl/_cocos/EMADLCocos.java

@@ -11,6 +11,9 @@ import de.monticore.lang.embeddedmontiarc.cocos.*;
 import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.instanceStructure.EMAComponentInstanceSymbol;
 import de.monticore.lang.embeddedmontiarc.embeddedmontiarcmath.cocos.AtomicComponentCoCo;
 import de.monticore.lang.math._cocos.MatrixAssignmentDeclarationCheck;
+import de.monticore.lang.mathopt._cocos.MathOptCocos;
+import de.monticore.lang.mathopt._cocos.OptimizationConditionCheck;
+import de.monticore.lang.mathopt._cocos.OptimizationStatementCheck;
 import de.monticore.lang.monticar.cnnarch._cocos.CNNArchCocos;
 import de.monticore.lang.monticar.cnnarch._symboltable.ArchitectureSymbol;
 
@@ -48,7 +51,10 @@ public class EMADLCocos {
                 .addCoCo((EMADLASTBehaviorNameCoCo) behaviorCoco)
                 .addCoCo(new AtomicComponentCoCo())
                 //Math cocos
-                .addCoCo(new MatrixAssignmentDeclarationCheck());
+                .addCoCo(new MatrixAssignmentDeclarationCheck())
                 //.addCoCo(new MatrixAssignmentCheck())
+                //MathOpt Cocos
+                .addCoCo(new OptimizationStatementCheck())
+                .addCoCo(new OptimizationConditionCheck());
     }
 }

src/main/java/de/monticore/lang/monticar/emadl/_symboltable/ModifiedExpandedComponentInstanceBuilder.java

+/**
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 /* (c) https://github.com/MontiCore/monticore */
 package de.monticore.lang.monticar.emadl._symboltable;
 

src/test/resources/models/MinimizePortsTest.emadl

@@ -5,10 +5,12 @@ component MinimizePortsTest{
           out Q y;
 
     implementation Math{
-        Q y1 = minimize(u)
-            (u*u) - 2 * u + 1;
+        minimize
+            Q x;
+        in
+            Q y1 = (x*x) - 2 * x + 1;
         subject to
-            u >= 0;
+            x >= 0;
         end
     }
 }

src/test/resources/models/optimization/HS71.emam

@@ -13,8 +13,10 @@ component HS71{
           out Q yOut;
 
     implementation Math{
-        Q y = minimize(Q^{4} x)
-            x(1) * x(4) * (x(1) + x(2) + x(3)) + x(3);
+        minimize
+            Q^{4} x;
+        in
+            Q y = x(1) * x(4) * (x(1) + x(2) + x(3)) + x(3);
         subject to
             x(1) * x(2) * x(3) * x(4) >= 25;
             x(1) * x(1) + x(2) * x(2) + x(3) * x(3) + x(4) * x(4) == 40;

src/test/resources/models/optimization/ScalarMinimizationTest.emam

@@ -7,8 +7,10 @@ component ScalarMinimizationTest{
           out Q yOut;
 
     implementation Math{
-        Q y = minimize(Q x)
-            (x*x) - 2 * x + 1;
+        minimize
+            Q x;
+        in
+            Q y = (x*x) - 2 * x + 1;
         subject to
             x >= 0;
         end

src/test/resources/models/optimization/TransportationProblem.emam

@@ -23,8 +23,10 @@ component TransportationProblem{
         Q ^{m, n} c = [2.5, 1.7, 1.8; 2.5, 1.8, 1.4];
 
         // minimization problem
-        Q y = minimize(Q^{2, 3} x)
-            sum(c .* x);
+        minimize
+            Q^{2, 3} x;
+        in
+            Q y = sum(c .* x);
         subject to
             sum(x, 2) == A;
             sum(x, 1) == b;