Commit 3456b69e authored by Christoph Richter's avatar Christoph Richter
Browse files

Version 0.0.7-SNAPSHOT

parent 11b1fe46
Pipeline #67177 passed with stage
in 21 minutes and 26 seconds
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<groupId>de.monticore.lang.monticar</groupId> <groupId>de.monticore.lang.monticar</groupId>
<artifactId>embedded-montiarc-math-opt</artifactId> <artifactId>embedded-montiarc-math-opt</artifactId>
<version>0.0.6-SNAPSHOT</version> <version>0.0.7-SNAPSHOT</version>
<!-- == PROJECT DEPENDENCIES ============================================= --> <!-- == PROJECT DEPENDENCIES ============================================= -->
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
<Embedded-MontiArc.version>0.0.18-SNAPSHOT</Embedded-MontiArc.version> <Embedded-MontiArc.version>0.0.18-SNAPSHOT</Embedded-MontiArc.version>
<Embedded-MontiArc-Behaviour.version>0.0.14-SNAPSHOT</Embedded-MontiArc-Behaviour.version> <Embedded-MontiArc-Behaviour.version>0.0.14-SNAPSHOT</Embedded-MontiArc-Behaviour.version>
<Embedded-MontiArc-Math.version>0.0.19-SNAPSHOT</Embedded-MontiArc-Math.version> <Embedded-MontiArc-Math.version>0.0.19-SNAPSHOT</Embedded-MontiArc-Math.version>
<Math.version>0.0.18-SNAPSHOT</Math.version> <Math.version>0.0.19-SNAPSHOT</Math.version>
<MathOpt.version>0.0.18-SNAPSHOT</MathOpt.version> <MathOpt.version>0.0.19-SNAPSHOT</MathOpt.version>
<!-- .. Libraries .................................................. --> <!-- .. Libraries .................................................. -->
<guava.version>18.0</guava.version> <guava.version>18.0</guava.version>
<junit.version>4.12</junit.version> <junit.version>4.12</junit.version>
......
...@@ -3,9 +3,12 @@ package de.monticore.lang.embeddedmontiarcmathopt._symboltable; ...@@ -3,9 +3,12 @@ package de.monticore.lang.embeddedmontiarcmathopt._symboltable;
import de.monticore.ModelingLanguageFamily; import de.monticore.ModelingLanguageFamily;
import de.monticore.io.paths.ModelPath; import de.monticore.io.paths.ModelPath;
import de.monticore.lang.embeddedmontiarc.LogConfig; import de.monticore.lang.embeddedmontiarc.LogConfig;
import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.ConstantPortSymbol;
import de.monticore.lang.mathopt._symboltable.MathOptLanguage; import de.monticore.lang.mathopt._symboltable.MathOptLanguage;
import de.monticore.lang.monticar.Utils; import de.monticore.lang.monticar.Utils;
import de.monticore.lang.monticar.enumlang._symboltable.EnumLangLanguage;
import de.monticore.lang.monticar.stream._symboltable.StreamLanguage; import de.monticore.lang.monticar.stream._symboltable.StreamLanguage;
import de.monticore.lang.monticar.streamunits._symboltable.StreamUnitsLanguage;
import de.monticore.lang.monticar.struct._symboltable.StructLanguage; import de.monticore.lang.monticar.struct._symboltable.StructLanguage;
import de.monticore.symboltable.GlobalScope; import de.monticore.symboltable.GlobalScope;
import de.monticore.symboltable.Scope; import de.monticore.symboltable.Scope;
...@@ -46,6 +49,8 @@ public class EMAMOptSymbolTableHelper { ...@@ -46,6 +49,8 @@ public class EMAMOptSymbolTableHelper {
fam.addModelingLanguage(new MathOptLanguage()); fam.addModelingLanguage(new MathOptLanguage());
fam.addModelingLanguage(new StreamLanguage()); fam.addModelingLanguage(new StreamLanguage());
fam.addModelingLanguage(new StructLanguage()); fam.addModelingLanguage(new StructLanguage());
fam.addModelingLanguage(new StreamUnitsLanguage());
fam.addModelingLanguage(new EnumLangLanguage());
return fam; return fam;
} }
......
...@@ -6,7 +6,7 @@ component MinimizePortsTest{ ...@@ -6,7 +6,7 @@ component MinimizePortsTest{
out Q y; out Q y;
implementation Math{ implementation Math{
y = minimize(u) Q y1 = minimize(u)
(u*u) - 2 * u + 1; (u*u) - 2 * u + 1;
subject to subject to
u >= 0; u >= 0;
......
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