diff options
Diffstat (limited to 'Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java')
-rw-r--r-- | Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java | 11 |
1 files changed, 3 insertions, 8 deletions
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 f7a840f0..63697887 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 | |||
@@ -25,22 +25,16 @@ import org.eclipse.viatra.dse.base.ThreadContext; | |||
25 | import org.eclipse.viatra.dse.objectives.Fitness; | 25 | import org.eclipse.viatra.dse.objectives.Fitness; |
26 | import org.eclipse.viatra.dse.objectives.ObjectiveComparatorHelper; | 26 | import org.eclipse.viatra.dse.objectives.ObjectiveComparatorHelper; |
27 | import org.eclipse.viatra.dse.solutionstore.SolutionStore; | 27 | import org.eclipse.viatra.dse.solutionstore.SolutionStore; |
28 | import org.eclipse.xtend.lib.annotations.AccessorType; | ||
29 | import org.eclipse.xtend.lib.annotations.Accessors; | ||
30 | 28 | ||
31 | import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicReasoner; | 29 | import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicReasoner; |
32 | import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicSolverConfiguration; | ||
33 | import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem; | 30 | import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem; |
34 | import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.InconsistencyResult; | 31 | import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.InconsistencyResult; |
35 | import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult; | 32 | import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult; |
36 | import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.ModelResult; | 33 | import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.ModelResult; |
37 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.PartialInterpretation2Logic; | 34 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.PartialInterpretation2Logic; |
38 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation; | 35 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation; |
39 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.visualisation.PartialInterpretation2Gml; | ||
40 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.visualisation.PartialInterpretationVisualisation; | 36 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.visualisation.PartialInterpretationVisualisation; |
41 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.visualisation.PartialInterpretationVisualiser; | 37 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.visualisation.PartialInterpretationVisualiser; |
42 | import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.DebugConfiguration; | ||
43 | import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.DiversityDescriptor; | ||
44 | import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasonerConfiguration; | 38 | import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasonerConfiguration; |
45 | import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace; | 39 | import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace; |
46 | 40 | ||
@@ -138,7 +132,7 @@ public class BestFirstStrategyForModelGeneration implements IStrategy { | |||
138 | TrajectoryWithFitness currentTrajectoryWithFittness = new TrajectoryWithFitness(firstTrajectory, firstFittness); | 132 | TrajectoryWithFitness currentTrajectoryWithFittness = new TrajectoryWithFitness(firstTrajectory, firstFittness); |
139 | trajectoiresToExplore.add(currentTrajectoryWithFittness); | 133 | trajectoiresToExplore.add(currentTrajectoryWithFittness); |
140 | 134 | ||
141 | mainLoop: while (!isInterrupted) { | 135 | mainLoop: while (!isInterrupted && !configuration.progressMonitor.isCancelled()) { |
142 | 136 | ||
143 | if (currentTrajectoryWithFittness == null) { | 137 | if (currentTrajectoryWithFittness == null) { |
144 | if (trajectoiresToExplore.isEmpty()) { | 138 | if (trajectoiresToExplore.isEmpty()) { |
@@ -163,7 +157,7 @@ public class BestFirstStrategyForModelGeneration implements IStrategy { | |||
163 | List<Object> activationIds = selectActivation(); | 157 | List<Object> activationIds = selectActivation(); |
164 | Iterator<Object> iterator = activationIds.iterator(); | 158 | Iterator<Object> iterator = activationIds.iterator(); |
165 | 159 | ||
166 | while (!isInterrupted && iterator.hasNext()) { | 160 | while (!isInterrupted && !configuration.progressMonitor.isCancelled() && iterator.hasNext()) { |
167 | final Object nextActivation = iterator.next(); | 161 | final Object nextActivation = iterator.next(); |
168 | // if (!iterator.hasNext()) { | 162 | // if (!iterator.hasNext()) { |
169 | // logger.debug("Last untraversed activation of the state."); | 163 | // logger.debug("Last untraversed activation of the state."); |
@@ -239,6 +233,7 @@ public class BestFirstStrategyForModelGeneration implements IStrategy { | |||
239 | solutionStoreWithCopy.newSolution(context); | 233 | solutionStoreWithCopy.newSolution(context); |
240 | solutionStoreWithDiversityDescriptor.newSolution(context); | 234 | solutionStoreWithDiversityDescriptor.newSolution(context); |
241 | solutionStore.newSolution(context); | 235 | solutionStore.newSolution(context); |
236 | configuration.progressMonitor.workedModelFound(configuration.solutionScope.numberOfRequiredSolution); | ||
242 | 237 | ||
243 | logger.debug("Found a solution."); | 238 | logger.debug("Found a solution."); |
244 | } | 239 | } |