From 18767ac9962932a496833c5971d3157e468c172e Mon Sep 17 00:00:00 2001 From: 20001LastOrder Date: Mon, 27 May 2019 16:41:23 -0400 Subject: fix the null pointer error when trying reproducing the generation procedure --- .../dslreasoner/viatrasolver/logic2viatra/ScopePropagator.xtend | 9 ++++++--- .../inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend | 2 +- .../reasoner/dse/BestFirstStrategyForModelGeneration.java | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) (limited to 'Solvers') 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 { def public propagateAdditionToType(PartialTypeInterpratation t) { // println('''Adding to «(t as PartialComplexTypeInterpretation).interpretationOf.name»''') val targetScope = type2Scope.get(t) - targetScope.removeOne - val sups = superScopes.get(targetScope) - sups.forEach[removeOne] + if(targetScope != null){ + targetScope.removeOne + val sups = superScopes.get(targetScope) + sups.forEach[removeOne] + } + if(this.partialInterpretation.minNewElements > 0) { this.partialInterpretation.minNewElements = this.partialInterpretation.minNewElements-1 } 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{ viatraConfig.progressMonitor.workedSearchFinished //find trajectory to each solution - if(viatraConfig.documentationLevel == DocumentationLevel.METRICS){ + if(viatraConfig.documentationLevel == DocumentationLevel.NONE){ PartialInterpretationMetric.outputTrajectories(emptySolutionCopy, dse.solutions.toList()); } 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 { } private void logCurrentStateMetric() { - if(this.configuration.documentationLevel != DocumentationLevel.METRICS || workspace == null) { + if(this.configuration.documentationLevel != DocumentationLevel.NONE || workspace == null) { return; } -- cgit v1.2.3-54-g00ecf