diff options
author | Oszkar Semerath <semerath@mit.bme.hu> | 2020-04-15 01:45:13 +0200 |
---|---|---|
committer | Oszkar Semerath <semerath@mit.bme.hu> | 2020-04-15 01:45:13 +0200 |
commit | d25afa235db5ba183229d55da3eb4cf78647553f (patch) | |
tree | 2fe504e021caa126f9f9639d61992b2d5f776172 /Application | |
parent | memory management support for v8 javascript engine added (visualization) (diff) | |
download | VIATRA-Generator-d25afa235db5ba183229d55da3eb4cf78647553f.tar.gz VIATRA-Generator-d25afa235db5ba183229d55da3eb4cf78647553f.tar.zst VIATRA-Generator-d25afa235db5ba183229d55da3eb4cf78647553f.zip |
(lipstick)
Diffstat (limited to 'Application')
3 files changed, 3 insertions, 3 deletions
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/GenerationTaskExecutor.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/GenerationTaskExecutor.xtend index c9d38c7d..790ef76b 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/GenerationTaskExecutor.xtend +++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/GenerationTaskExecutor.xtend | |||
@@ -132,9 +132,8 @@ class GenerationTaskExecutor { | |||
132 | // 5. create a solver and a configuration | 132 | // 5. create a solver and a configuration |
133 | // 5.1 initialize | 133 | // 5.1 initialize |
134 | val solver = solverLoader.loadSolver(task.solver,configurationMap) | 134 | val solver = solverLoader.loadSolver(task.solver,configurationMap) |
135 | val solverConfig = solverLoader.loadSolverConfig(task.solver,configurationMap,console) | ||
136 | |||
137 | 135 | ||
136 | val solverConfig = solverLoader.loadSolverConfig(task.solver,configurationMap,console) | ||
138 | // 5.2 set values that defined directly | 137 | // 5.2 set values that defined directly |
139 | solverConfig.solutionScope = new SolutionScope => [ | 138 | solverConfig.solutionScope = new SolutionScope => [ |
140 | it.numberOfRequiredSolution = if(task.numberSpecified) { | 139 | it.numberOfRequiredSolution = if(task.numberSpecified) { |
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/SolverLoader.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/SolverLoader.xtend index a9573fbf..3f0ba03f 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/SolverLoader.xtend +++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/SolverLoader.xtend | |||
@@ -14,6 +14,7 @@ import java.util.Optional | |||
14 | import org.eclipse.xtext.xbase.lib.Functions.Function1 | 14 | import org.eclipse.xtext.xbase.lib.Functions.Function1 |
15 | import hu.bme.mit.inf.dslreasoner.visualisation.pi2graphviz.GraphvizVisualiser | 15 | import hu.bme.mit.inf.dslreasoner.visualisation.pi2graphviz.GraphvizVisualiser |
16 | import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.DiversityDescriptor | 16 | import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.DiversityDescriptor |
17 | import hu.bme.mit.inf.dlsreasoner.alloy.reasoner.builder.SolverConfiguration | ||
17 | 18 | ||
18 | class SolverLoader { | 19 | class SolverLoader { |
19 | def loadSolver(Solver solver, Map<String, String> config) { | 20 | def loadSolver(Solver solver, Map<String, String> config) { |
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/xtend-gen/hu/bme/mit/inf/dslreasoner/application/validation/QueryAndMetamodelValidator.java b/Application/hu.bme.mit.inf.dslreasoner.application/xtend-gen/hu/bme/mit/inf/dslreasoner/application/validation/QueryAndMetamodelValidator.java index 3ed13964..567551f1 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/xtend-gen/hu/bme/mit/inf/dslreasoner/application/validation/QueryAndMetamodelValidator.java +++ b/Application/hu.bme.mit.inf.dslreasoner.application/xtend-gen/hu/bme/mit/inf/dslreasoner/application/validation/QueryAndMetamodelValidator.java | |||
@@ -79,7 +79,7 @@ public class QueryAndMetamodelValidator { | |||
79 | } | 79 | } |
80 | } | 80 | } |
81 | }; | 81 | }; |
82 | return Iterables.<ENamedElement>filter(Iterables.<ENamedElement>concat(ListExtensions.<EReference, Iterable<ENamedElement>>map(references, _function_1)), ENamedElement.class); | 82 | return Iterables.<ENamedElement>filter((Iterables.<ENamedElement>concat(ListExtensions.<EReference, Iterable<ENamedElement>>map(references, _function_1))), ENamedElement.class); |
83 | }; | 83 | }; |
84 | return Iterables.<ENamedElement>concat(ListExtensions.<EObject, Iterable<ENamedElement>>map(elements, _function)); | 84 | return Iterables.<ENamedElement>concat(ListExtensions.<EObject, Iterable<ENamedElement>>map(elements, _function)); |
85 | } | 85 | } |