Commit 7cbfc4a8 authored by danielkisov's avatar danielkisov
Browse files

Merge remote-tracking branch 'origin/master' into ba_kisov

parents bd5cbeca 86a80fe3
Pipeline #471790 passed with stage
in 1 minute and 26 seconds
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<groupId>de.monticore.lang.monticar</groupId> <groupId>de.monticore.lang.monticar</groupId>
<artifactId>embedded-montiarc-deeplearning</artifactId> <artifactId>embedded-montiarc-deeplearning</artifactId>
<version>0.5.0-SNAPSHOT</version> <version>0.4.5-SNAPSHOT</version>
<!-- == PROJECT DEPENDENCIES ============================================= --> <!-- == PROJECT DEPENDENCIES ============================================= -->
...@@ -27,12 +27,12 @@ ...@@ -27,12 +27,12 @@
<!-- .. EMA-Libraries ................................................. --> <!-- .. EMA-Libraries ................................................. -->
<Common-MontiCar.version>0.4.4-SNAPSHOT</Common-MontiCar.version> <Common-MontiCar.version>0.4.4-SNAPSHOT</Common-MontiCar.version>
<Embedded-MontiArc.version>0.4.4-SNAPSHOT</Embedded-MontiArc.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-Dynamics.version>0.4.4-SNAPSHOT</Embedded-MontiArc-Dynamics.version>
<Embedded-MontiArc-Behaviour.version>0.4.4-SNAPSHOT</Embedded-MontiArc-Behaviour.version> <Embedded-MontiArc-Behaviour.version>0.4.4-SNAPSHOT</Embedded-MontiArc-Behaviour.version>
<Math.version>0.4.4-SNAPSHOT</Math.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.5.0-SNAPSHOT</CNNArch.version> <CNNArch.version>0.4.6-SNAPSHOT</CNNArch.version>
<!-- .. SE-Libraries .................................................. --> <!-- .. SE-Libraries .................................................. -->
<monticore.version>5.0.1</monticore.version> <monticore.version>5.0.1</monticore.version>
......
...@@ -11,6 +11,9 @@ import de.monticore.lang.embeddedmontiarc.cocos.*; ...@@ -11,6 +11,9 @@ import de.monticore.lang.embeddedmontiarc.cocos.*;
import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.instanceStructure.EMAComponentInstanceSymbol; import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.instanceStructure.EMAComponentInstanceSymbol;
import de.monticore.lang.embeddedmontiarc.embeddedmontiarcmath.cocos.AtomicComponentCoCo; import de.monticore.lang.embeddedmontiarc.embeddedmontiarcmath.cocos.AtomicComponentCoCo;
import de.monticore.lang.math._cocos.MatrixAssignmentDeclarationCheck; 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._cocos.CNNArchCocos;
import de.monticore.lang.monticar.cnnarch._symboltable.ArchitectureSymbol; import de.monticore.lang.monticar.cnnarch._symboltable.ArchitectureSymbol;
...@@ -48,7 +51,10 @@ public class EMADLCocos { ...@@ -48,7 +51,10 @@ public class EMADLCocos {
.addCoCo((EMADLASTBehaviorNameCoCo) behaviorCoco) .addCoCo((EMADLASTBehaviorNameCoCo) behaviorCoco)
.addCoCo(new AtomicComponentCoCo()) .addCoCo(new AtomicComponentCoCo())
//Math cocos //Math cocos
.addCoCo(new MatrixAssignmentDeclarationCheck()); .addCoCo(new MatrixAssignmentDeclarationCheck())
//.addCoCo(new MatrixAssignmentCheck()) //.addCoCo(new MatrixAssignmentCheck())
//MathOpt Cocos
.addCoCo(new OptimizationStatementCheck())
.addCoCo(new OptimizationConditionCheck());
} }
} }
...@@ -5,10 +5,12 @@ component MinimizePortsTest{ ...@@ -5,10 +5,12 @@ component MinimizePortsTest{
out Q y; out Q y;
implementation Math{ implementation Math{
Q y1 = minimize(u) minimize
(u*u) - 2 * u + 1; Q x;
in
Q y1 = (x*x) - 2 * x + 1;
subject to subject to
u >= 0; x >= 0;
end end
} }
} }
...@@ -13,8 +13,10 @@ component HS71{ ...@@ -13,8 +13,10 @@ component HS71{
out Q yOut; out Q yOut;
implementation Math{ implementation Math{
Q y = minimize(Q^{4} x) minimize
x(1) * x(4) * (x(1) + x(2) + x(3)) + x(3); Q^{4} x;
in
Q y = x(1) * x(4) * (x(1) + x(2) + x(3)) + x(3);
subject to subject to
x(1) * x(2) * x(3) * x(4) >= 25; 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; x(1) * x(1) + x(2) * x(2) + x(3) * x(3) + x(4) * x(4) == 40;
......
...@@ -7,8 +7,10 @@ component ScalarMinimizationTest{ ...@@ -7,8 +7,10 @@ component ScalarMinimizationTest{
out Q yOut; out Q yOut;
implementation Math{ implementation Math{
Q y = minimize(Q x) minimize
(x*x) - 2 * x + 1; Q x;
in
Q y = (x*x) - 2 * x + 1;
subject to subject to
x >= 0; x >= 0;
end end
......
...@@ -23,8 +23,10 @@ component TransportationProblem{ ...@@ -23,8 +23,10 @@ component TransportationProblem{
Q ^{m, n} c = [2.5, 1.7, 1.8; 2.5, 1.8, 1.4]; Q ^{m, n} c = [2.5, 1.7, 1.8; 2.5, 1.8, 1.4];
// minimization problem // minimization problem
Q y = minimize(Q^{2, 3} x) minimize
sum(c .* x); Q^{2, 3} x;
in
Q y = sum(c .* x);
subject to subject to
sum(x, 2) == A; sum(x, 2) == A;
sum(x, 1) == b; sum(x, 1) == b;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment