Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
ttc18
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
stgroup
ttc18
Commits
12dee016
Commit
12dee016
authored
6 years ago
by
Johannes Mey
Browse files
Options
Downloads
Patches
Plain Diff
remove 'legacy' grouped mode, simplify single mode
parent
be8c7d06
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
jastadd-mquat-eris/build.gradle
+0
-11
0 additions, 11 deletions
jastadd-mquat-eris/build.gradle
jastadd-mquat-eris/src/main/java/de/tudresden/inf/st/mquat/eris/Main.java
+2
-30
2 additions, 30 deletions
...is/src/main/java/de/tudresden/inf/st/mquat/eris/Main.java
with
2 additions
and
41 deletions
jastadd-mquat-eris/build.gradle
+
0
−
11
View file @
12dee016
...
...
@@ -46,14 +46,3 @@ task eris(type: JavaExec, dependsOn: assemble) {
args
(
scenario
.
split
(
','
))
}
}
\ No newline at end of file
task
erisGrouped
(
type:
JavaExec
,
dependsOn:
assemble
)
{
group
"application"
classpath
=
sourceSets
.
test
.
runtimeClasspath
main
=
'de.tudresden.inf.st.mquat.eris.Main'
args
=
[
'incremental'
]
systemProperty
"java.library.path"
,
project
.
glpkPath
if
(
project
.
hasProperty
(
"scenario"
))
{
args
(
scenario
.
split
(
','
))
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
jastadd-mquat-eris/src/main/java/de/tudresden/inf/st/mquat/eris/Main.java
+
2
−
30
View file @
12dee016
package
de.tudresden.inf.st.mquat.eris
;
import
de.tudresden.inf.st.mquat.benchmark.SolverFactory
;
import
de.tudresden.inf.st.mquat.eris.coupling.ERISConnector
;
import
de.tudresden.inf.st.mquat.jastadd.model.MquatWriteSettings
;
import
de.tudresden.inf.st.mquat.jastadd.model.Root
;
import
de.tudresden.inf.st.mquat.jastadd.model.Solution
;
import
de.tudresden.inf.st.mquat.solving.SolvingException
;
import
de.tudresden.inf.st.mquat.solving.ilp.ILPExternalSolver
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.Logger
;
...
...
@@ -18,12 +11,9 @@ public class Main {
public
static
void
main
(
String
[]
args
)
{
boolean
useCurrentConfig
=
false
;
boolean
continuous
=
false
;
if
(
args
.
length
>
0
&
args
[
0
].
equals
(
"incremental"
))
{
useCurrentConfig
=
true
;
}
else
if
(
args
.
length
>
0
&
args
[
0
].
equals
(
"continuous"
))
{
if
(
args
.
length
>
0
&
args
[
0
].
equals
(
"continuous"
))
{
continuous
=
true
;
}
...
...
@@ -32,26 +22,8 @@ public class Main {
logger
.
info
(
"Running MQuAT"
);
timer
.
schedule
(
new
ErisTask
(),
0
,
5000
);
}
else
{
ERISConnector
erisConnector
=
new
ERISConnector
();
erisConnector
.
read
();
Root
model
=
ErisMQuATBuilder
.
createModel
(
erisConnector
.
getErisModel
(),
useCurrentConfig
);
logger
.
info
(
model
.
print
(
new
MquatWriteSettings
(
" "
)));
ILPExternalSolver
solver
=
(
ILPExternalSolver
)
SolverFactory
.
getSolverByName
(
"ilp-scip"
);
solver
.
setDeleteFilesOnExit
(
false
);
try
{
Solution
solution
=
solver
.
solve
(
model
);
logger
.
info
(
solution
.
print
(
new
MquatWriteSettings
(
" "
)));
erisConnector
.
write
(
solution
);
}
catch
(
SolvingException
e
)
{
e
.
printStackTrace
();
}
new
ErisTask
().
run
();
}
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment