diff options
5 files changed, 15 insertions, 16 deletions
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 48d4fbb4..2fe69a47 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 | |||
@@ -91,7 +91,7 @@ class SolverLoader { | |||
91 | val stringValue = config.get("numeric-solver-at-end") | 91 | val stringValue = config.get("numeric-solver-at-end") |
92 | if(stringValue.equals("true")) { | 92 | if(stringValue.equals("true")) { |
93 | println("numeric-solver-at-end") | 93 | println("numeric-solver-at-end") |
94 | c.runIntermediateNumericalConsistencyChecks= false | 94 | c.runIntermediateNumericalConsistencyChecks = false |
95 | } | 95 | } |
96 | } | 96 | } |
97 | if(config.containsKey("fitness-punishSize")) { | 97 | if(config.containsKey("fitness-punishSize")) { |
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/start-standalone.launch b/Application/hu.bme.mit.inf.dslreasoner.application/start-standalone.launch index 8c00c9af..1f3744a7 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/start-standalone.launch +++ b/Application/hu.bme.mit.inf.dslreasoner.application/start-standalone.launch | |||
@@ -1,11 +1,12 @@ | |||
1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?> | 1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?> |
2 | <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication"> | 2 | <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication"> |
3 | <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> | 3 | <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> |
4 | <listEntry value="/hu.bme.mit.inf.dslreasoner.application/xtend-gen/hu/bme/mit/inf/dslreasoner/application/execution/StandaloneScriptExecutor.java"/> | 4 | <listEntry value="/hu.bme.mit.inf.dslreasoner.application/xtend-gen/hu/bme/mit/inf/dslreasoner/application/execution/StandaloneScriptExecutor.java"/> |
5 | </listAttribute> | 5 | </listAttribute> |
6 | <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> | 6 | <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> |
7 | <listEntry value="1"/> | 7 | <listEntry value="1"/> |
8 | </listAttribute> | 8 | </listAttribute> |
9 | <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="hu.bme.mit.inf.dslreasoner.application.execution.StandaloneScriptExecutor"/> | 9 | <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="hu.bme.mit.inf.dslreasoner.application.execution.StandaloneScriptExecutor"/> |
10 | <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="hu.bme.mit.inf.dslreasoner.application"/> | 10 | <stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="hu.bme.mit.inf.dslreasoner.application"/> |
11 | </launchConfiguration> | 11 | <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="hu.bme.mit.inf.dslreasoner.application"/> |
12 | </launchConfiguration> | ||
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java index 8035c947..e0f838a6 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java | |||
@@ -142,7 +142,7 @@ public class BestFirstStrategyForModelGeneration implements IStrategy { | |||
142 | } | 142 | } |
143 | }; | 143 | }; |
144 | 144 | ||
145 | this.numericSolver = new NumericSolver(context, method, false,this.configuration.runIntermediateNumericalConsistencyChecks); | 145 | this.numericSolver = new NumericSolver(context, method, this.configuration.runIntermediateNumericalConsistencyChecks, false); |
146 | 146 | ||
147 | trajectoiresToExplore = new PriorityQueue<TrajectoryWithFitness>(11, comparator); | 147 | trajectoiresToExplore = new PriorityQueue<TrajectoryWithFitness>(11, comparator); |
148 | } | 148 | } |
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/NumericSolver.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/NumericSolver.xtend index ed8bdae3..0b0feb1a 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/NumericSolver.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/NumericSolver.xtend | |||
@@ -50,8 +50,7 @@ class NumericSolver { | |||
50 | val matcher = querySpec.getMatcher(engine); | 50 | val matcher = querySpec.getMatcher(engine); |
51 | constraint2CurrentUnitPropagationPrecondition.put(constraint,matcher) | 51 | constraint2CurrentUnitPropagationPrecondition.put(constraint,matcher) |
52 | } | 52 | } |
53 | this.intermediateConsistencyCheck = true | 53 | this.intermediateConsistencyCheck = intermediateConsistencyCheck |
54 | println() | ||
55 | this.caching = caching | 54 | this.caching = caching |
56 | } | 55 | } |
57 | 56 | ||
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/PartialModelAsLogicInterpretation.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/PartialModelAsLogicInterpretation.xtend index 48922f5d..efc2ef36 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/PartialModelAsLogicInterpretation.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/PartialModelAsLogicInterpretation.xtend | |||
@@ -1,6 +1,5 @@ | |||
1 | package hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse | 1 | package hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse |
2 | 2 | ||
3 | import com.google.common.collect.ImmutableMap | ||
4 | import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicModelInterpretation | 3 | import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicModelInterpretation |
5 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.ConstantDeclaration | 4 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.ConstantDeclaration |
6 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.DefinedElement | 5 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.DefinedElement |