1 files changed, 38 insertions, 32 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 8e992741..a6fa627d 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
@@ -9,6 +9,7 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem
 import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicproblemPackage

 import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicresultFactory

 import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.ModelResult

+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.ScopePropagator

 import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.ScopePropagatorStrategy

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.PartialInterpretationInitialiser

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation

@@ -18,7 +19,7 @@ import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.sta
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.statecoder.NeighbourhoodBasedHashStateCoderFactory

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.statecoder.PairwiseNeighbourhoodBasedStateCoderFactory

 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse.BasicScopeGlobalConstraint

-import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse.BestFirstStrategyForModelGeneration

+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse.HillClimbingOnRealisticMetricStrategyForModelGeneration

 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse.InconsistentScopeGlobalConstraint

 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse.LoggerSolutionFoundHandler

 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse.ModelGenerationCompositeObjective

@@ -34,6 +35,7 @@ import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace
 import java.util.List

 import java.util.Map

 import org.eclipse.emf.ecore.EObject

+import org.eclipse.emf.ecore.util.EcoreUtil

 import org.eclipse.viatra.dse.api.DesignSpaceExplorer

 import org.eclipse.viatra.dse.api.DesignSpaceExplorer.DseLoggingLevel

 import org.eclipse.viatra.dse.solutionstore.SolutionStore

@@ -69,6 +71,11 @@ class ViatraReasoner extends LogicReasoner {
                 }

 

                 emptySolution.problemConainer = problem

+                val emptySolutionCopy = EcoreUtil.copy(emptySolution)

+                

+                val ScopePropagator scopePropagator = new ScopePropagator(emptySolution)

+                scopePropagator.propagateAllScopeConstraints            

+                

                 var BasicScopeGlobalConstraint basicScopeGlobalConstraint = null

                 if (viatraConfig.scopePropagatorStrategy == ScopePropagatorStrategy.None) {

                         basicScopeGlobalConstraint = new BasicScopeGlobalConstraint(emptySolution)

@@ -147,9 +154,8 @@ class ViatraReasoner extends LogicReasoner {
                 for (rule : method.objectRefinementRules) {

                         dse.addTransformationRule(rule)

                 }

-

-                val strategy = new BestFirstStrategyForModelGeneration(workspace, viatraConfig, method, solutionSaver,

-                        numericSolver)

+                

+                val strategy = new HillClimbingOnRealisticMetricStrategyForModelGeneration(workspace,viatraConfig,method)

                 viatraConfig.progressMonitor.workedForwardTransformation

                 val transformationFinished = System.nanoTime

                 val transformationTime = transformationFinished - transformationStartTime

@@ -257,34 +263,34 @@ class ViatraReasoner extends LogicReasoner {
                                 it.name = "ScopePropagationsSolverCalls"

                                 it.value = method.statistics.scopePropagatorSolverInvocations

                         ]

-                        it.entries += createIntStatisticEntry => [

-                                it.name = "NumericalSolverSumTime"

-                                it.value = (strategy.numericSolver.runtime / 1000000) as int

-                        ]

-                        it.entries += createIntStatisticEntry => [

-                                it.name = "NumericalSolverProblemFormingTime"

-                                it.value = (strategy.numericSolver.solverFormingProblem / 1000000) as int

-                        ]

-                        it.entries += createIntStatisticEntry => [

-                                it.name = "NumericalSolverSolvingTime"

-                                it.value = (strategy.numericSolver.solverSolvingProblem / 1000000) as int

-                        ]

-                        it.entries += createIntStatisticEntry => [

-                                it.name = "NumericalSolverInterpretingSolution"

-                                it.value = (strategy.numericSolver.solverSolution / 1000000) as int

-                        ]

-                        it.entries += createIntStatisticEntry => [

-                                it.name = "NumericalSolverCachingTime"

-                                it.value = (strategy.numericSolver.cachingTime / 1000000) as int

-                        ]

-                        it.entries += createIntStatisticEntry => [

-                                it.name = "NumericalSolverCallNumber"

-                                it.value = strategy.numericSolver.numberOfSolverCalls

-                        ]

-                        it.entries += createIntStatisticEntry => [

-                                it.name = "NumericalSolverCachedAnswerNumber"

-                                it.value = strategy.numericSolver.numberOfCachedSolverCalls

-                        ]

+//                      it.entries += createIntStatisticEntry => [

+//                              it.name = "NumericalSolverSumTime"

+//                              it.value = (strategy.numericSolver.runtime / 1000000) as int

+//                      ]

+//                      it.entries += createIntStatisticEntry => [

+//                              it.name = "NumericalSolverProblemFormingTime"

+//                              it.value = (strategy.numericSolver.solverFormingProblem / 1000000) as int

+//                      ]

+//                      it.entries += createIntStatisticEntry => [

+//                              it.name = "NumericalSolverSolvingTime"

+//                              it.value = (strategy.numericSolver.solverSolvingProblem / 1000000) as int

+//                      ]

+//                      it.entries += createIntStatisticEntry => [

+//                              it.name = "NumericalSolverInterpretingSolution"

+//                              it.value = (strategy.numericSolver.solverSolution / 1000000) as int

+//                      ]

+//                      it.entries += createIntStatisticEntry => [

+//                              it.name = "NumericalSolverCachingTime"

+//                              it.value = (strategy.numericSolver.cachingTime / 1000000) as int

+//                      ]

+//                      it.entries += createIntStatisticEntry => [

+//                              it.name = "NumericalSolverCallNumber"

+//                              it.value = strategy.numericSolver.numberOfSolverCalls

+//                      ]

+//                      it.entries += createIntStatisticEntry => [

+//                              it.name = "NumericalSolverCachedAnswerNumber"

+//                              it.value = strategy.numericSolver.numberOfCachedSolverCalls

+//                      ]

                         if (diversityChecker.active) {

                                 it.entries += createIntStatisticEntry => [

                                         it.name = "SolutionDiversityCheckTime"