Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
monticore
EmbeddedMontiArc
languages
EmbeddedMontiArcMathOpt
Commits
3456b69e
Commit
3456b69e
authored
Aug 08, 2018
by
Christoph Richter
Browse files
Version 0.0.7-SNAPSHOT
parent
11b1fe46
Pipeline
#67177
passed with stage
in 21 minutes and 26 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
pom.xml
View file @
3456b69e
...
...
@@ -7,7 +7,7 @@
<groupId>
de.monticore.lang.monticar
</groupId>
<artifactId>
embedded-montiarc-math-opt
</artifactId>
<version>
0.0.
6
-SNAPSHOT
</version>
<version>
0.0.
7
-SNAPSHOT
</version>
<!-- == PROJECT DEPENDENCIES ============================================= -->
...
...
@@ -21,8 +21,8 @@
<Embedded-MontiArc.version>
0.0.18-SNAPSHOT
</Embedded-MontiArc.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>
<Math.version>
0.0.1
8
-SNAPSHOT
</Math.version>
<MathOpt.version>
0.0.1
8
-SNAPSHOT
</MathOpt.version>
<Math.version>
0.0.1
9
-SNAPSHOT
</Math.version>
<MathOpt.version>
0.0.1
9
-SNAPSHOT
</MathOpt.version>
<!-- .. Libraries .................................................. -->
<guava.version>
18.0
</guava.version>
<junit.version>
4.12
</junit.version>
...
...
src/main/java/de/monticore/lang/embeddedmontiarcmathopt/_symboltable/EMAMOptSymbolTableHelper.java
View file @
3456b69e
...
...
@@ -3,9 +3,12 @@ package de.monticore.lang.embeddedmontiarcmathopt._symboltable;
import
de.monticore.ModelingLanguageFamily
;
import
de.monticore.io.paths.ModelPath
;
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.monticar.Utils
;
import
de.monticore.lang.monticar.enumlang._symboltable.EnumLangLanguage
;
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.symboltable.GlobalScope
;
import
de.monticore.symboltable.Scope
;
...
...
@@ -46,6 +49,8 @@ public class EMAMOptSymbolTableHelper {
fam
.
addModelingLanguage
(
new
MathOptLanguage
());
fam
.
addModelingLanguage
(
new
StreamLanguage
());
fam
.
addModelingLanguage
(
new
StructLanguage
());
fam
.
addModelingLanguage
(
new
StreamUnitsLanguage
());
fam
.
addModelingLanguage
(
new
EnumLangLanguage
());
return
fam
;
}
...
...
src/test/resources/test/emam/optimization/MinimizePortsTest.emam
View file @
3456b69e
...
...
@@ -6,7 +6,7 @@ component MinimizePortsTest{
out
Q
y
;
implementation
Math
{
y
=
minimize
(
u
)
Q
y1
=
minimize
(
u
)
(
u
*
u
)
-
2
*
u
+
1
;
subject
to
u
>=
0
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment