diff options
Diffstat (limited to 'Solvers/VIATRA-Solver')
3 files changed, 8 insertions, 5 deletions
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/ScopePropagator.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/ScopePropagator.xtend index 38633c07..d1b29f01 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/ScopePropagator.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/ScopePropagator.xtend | |||
@@ -63,9 +63,12 @@ class ScopePropagator { | |||
63 | def public propagateAdditionToType(PartialTypeInterpratation t) { | 63 | def public propagateAdditionToType(PartialTypeInterpratation t) { |
64 | // println('''Adding to «(t as PartialComplexTypeInterpretation).interpretationOf.name»''') | 64 | // println('''Adding to «(t as PartialComplexTypeInterpretation).interpretationOf.name»''') |
65 | val targetScope = type2Scope.get(t) | 65 | val targetScope = type2Scope.get(t) |
66 | targetScope.removeOne | 66 | if(targetScope != null){ |
67 | val sups = superScopes.get(targetScope) | 67 | targetScope.removeOne |
68 | sups.forEach[removeOne] | 68 | val sups = superScopes.get(targetScope) |
69 | sups.forEach[removeOne] | ||
70 | } | ||
71 | |||
69 | if(this.partialInterpretation.minNewElements > 0) { | 72 | if(this.partialInterpretation.minNewElements > 0) { |
70 | this.partialInterpretation.minNewElements = this.partialInterpretation.minNewElements-1 | 73 | this.partialInterpretation.minNewElements = this.partialInterpretation.minNewElements-1 |
71 | } | 74 | } |
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend index 7ef7073a..99da4389 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend | |||
@@ -131,7 +131,7 @@ class ViatraReasoner extends LogicReasoner{ | |||
131 | viatraConfig.progressMonitor.workedSearchFinished | 131 | viatraConfig.progressMonitor.workedSearchFinished |
132 | 132 | ||
133 | //find trajectory to each solution | 133 | //find trajectory to each solution |
134 | if(viatraConfig.documentationLevel == DocumentationLevel.METRICS){ | 134 | if(viatraConfig.documentationLevel == DocumentationLevel.NONE){ |
135 | PartialInterpretationMetric.outputTrajectories(emptySolutionCopy, dse.solutions.toList()); | 135 | PartialInterpretationMetric.outputTrajectories(emptySolutionCopy, dse.solutions.toList()); |
136 | } | 136 | } |
137 | 137 | ||
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 21efd7ba..6f581d34 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 | |||
@@ -315,7 +315,7 @@ public class BestFirstStrategyForModelGeneration implements IStrategy { | |||
315 | } | 315 | } |
316 | 316 | ||
317 | private void logCurrentStateMetric() { | 317 | private void logCurrentStateMetric() { |
318 | if(this.configuration.documentationLevel != DocumentationLevel.METRICS || workspace == null) { | 318 | if(this.configuration.documentationLevel != DocumentationLevel.NONE || workspace == null) { |
319 | return; | 319 | return; |
320 | } | 320 | } |
321 | 321 | ||