diff options
author | 2020-08-28 18:58:37 +0200 | |
---|---|---|
committer | 2020-08-28 18:58:37 +0200 | |
commit | 4fe7fce97aedbd516109ef81afc33e00112b7b68 (patch) | |
tree | 7eaa7c4e9b31b2a1488e49de48721b4dbad31fae /Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme | |
parent | MoDeS3 unit propagation WIP (diff) | |
download | VIATRA-Generator-4fe7fce97aedbd516109ef81afc33e00112b7b68.tar.gz VIATRA-Generator-4fe7fce97aedbd516109ef81afc33e00112b7b68.tar.zst VIATRA-Generator-4fe7fce97aedbd516109ef81afc33e00112b7b68.zip |
Must unit propagation
Diffstat (limited to 'Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme')
2 files changed, 5 insertions, 3 deletions
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 67d25208..8e05665c 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 | |||
@@ -229,6 +229,10 @@ class ViatraReasoner extends LogicReasoner { | |||
229 | it.value = (method.statistics.scopePropagationTime / 1000000) as int | 229 | it.value = (method.statistics.scopePropagationTime / 1000000) as int |
230 | ] | 230 | ] |
231 | it.entries += createIntStatisticEntry => [ | 231 | it.entries += createIntStatisticEntry => [ |
232 | it.name = "MustRelationPropagationTime" | ||
233 | it.value = (method.statistics.mustRelationPropagationTime / 1000000) as int | ||
234 | ] | ||
235 | it.entries += createIntStatisticEntry => [ | ||
232 | it.name = "TypeAnalysisTime" | 236 | it.name = "TypeAnalysisTime" |
233 | it.value = (method.statistics.preliminaryTypeAnalisisTime / 1000000) as int | 237 | it.value = (method.statistics.preliminaryTypeAnalisisTime / 1000000) as int |
234 | ] | 238 | ] |
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 a2de1abc..4800f71d 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 | |||
@@ -307,7 +307,6 @@ public class BestFirstStrategyForModelGeneration implements IStrategy { | |||
307 | 307 | ||
308 | public List<String> times = new LinkedList<String>(); | 308 | public List<String> times = new LinkedList<String>(); |
309 | private void saveTimes() { | 309 | private void saveTimes() { |
310 | long statecoderTime = ((NeighbourhoodBasedPartialInterpretationStateCoder<?, ?>)this.context.getStateCoder()).getStatecoderRuntime()/1000000; | ||
311 | long forwardTime = context.getDesignSpaceManager().getForwardTime()/1000000; | 310 | long forwardTime = context.getDesignSpaceManager().getForwardTime()/1000000; |
312 | long backtrackingTime = context.getDesignSpaceManager().getBacktrackingTime()/1000000; | 311 | long backtrackingTime = context.getDesignSpaceManager().getBacktrackingTime()/1000000; |
313 | long activationSelection = this.activationSelector.getRuntime()/1000000; | 312 | long activationSelection = this.activationSelector.getRuntime()/1000000; |
@@ -317,8 +316,7 @@ public class BestFirstStrategyForModelGeneration implements IStrategy { | |||
317 | long numericalSolverSolving = this.numericSolver.getSolverSolvingProblem()/1000000; | 316 | long numericalSolverSolving = this.numericSolver.getSolverSolvingProblem()/1000000; |
318 | long numericalSolverInterpreting = this.numericSolver.getSolverSolution()/1000000; | 317 | long numericalSolverInterpreting = this.numericSolver.getSolverSolution()/1000000; |
319 | this.times.add( | 318 | this.times.add( |
320 | "(TransformationExecutionTime"+method.getStatistics().transformationExecutionTime/1000000+ | 319 | "(TransformationExecutionTime"+method.getStatistics().transformationExecutionTime/1000000+ |
321 | "|StateCoderTime:"+statecoderTime+ | ||
322 | "|ForwardTime:"+forwardTime+ | 320 | "|ForwardTime:"+forwardTime+ |
323 | "|Backtrackingtime:"+backtrackingTime+ | 321 | "|Backtrackingtime:"+backtrackingTime+ |
324 | "|GlobalConstraintEvaluationTime:"+(globalConstraintEvaluationTime/1000000)+ | 322 | "|GlobalConstraintEvaluationTime:"+(globalConstraintEvaluationTime/1000000)+ |