1 files changed, 58 insertions, 7 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 aa02cd30..3033eca7 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
@@ -42,6 +42,7 @@ import org.eclipse.viatra.dse.api.DesignSpaceExplorer
 import org.eclipse.viatra.dse.api.DesignSpaceExplorer.DseLoggingLevel

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

 import org.eclipse.viatra.dse.statecode.IStateCoderFactory

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

 

 class ViatraReasoner extends LogicReasoner {

         val PartialInterpretationInitialiser initialiser = new PartialInterpretationInitialiser()

@@ -66,12 +67,12 @@ class ViatraReasoner extends LogicReasoner {
                 dse.addMetaModelPackage(PartialinterpretationPackage.eINSTANCE)

 

                 val transformationStartTime = System.nanoTime

-

                 val emptySolution = initialiser.initialisePartialInterpretation(problem, viatraConfig.typeScopes).output

                 if ((viatraConfig.documentationLevel == DocumentationLevel::FULL ||

                         viatraConfig.documentationLevel == DocumentationLevel::NORMAL) && workspace !== null) {

                         workspace.writeModel(emptySolution, "init.partialmodel")

                 }

+

                 emptySolution.problemConainer = problem

                 var BasicScopeGlobalConstraint basicScopeGlobalConstraint = null

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

@@ -93,7 +94,8 @@ class ViatraReasoner extends LogicReasoner {
                 dse.addObjective(new ModelGenerationCompositeObjective(

                         basicScopeGlobalConstraint ?: new ScopeObjective,

                         method.unfinishedMultiplicities.map[new UnfinishedMultiplicityObjective(it)],

-                        wf2ObjectiveConverter.createCompletenessObjective(method.unfinishedWF)

+                        wf2ObjectiveConverter.createCompletenessObjective(method.unfinishedWF),

+                        viatraConfig

                 ))

 

                 val extremalObjectives = Lists.newArrayListWithExpectedSize(viatraConfig.costObjectives.size)

@@ -131,8 +133,9 @@ class ViatraReasoner extends LogicReasoner {
                         }

                 solutionStore.registerSolutionFoundHandler(new LoggerSolutionFoundHandler(viatraConfig))

                 val diversityChecker = DiversityChecker.of(viatraConfig.diversityRequirement)

+                val numericSolver = new NumericSolver(method, viatraConfig.runIntermediateNumericalConsistencyChecks, false)

                 val solutionSaver = new ViatraReasonerSolutionSaver(newArrayList(extremalObjectives), numberOfRequiredSolutions,

-                        diversityChecker)

+                        diversityChecker, numericSolver)

                 val solutionCopier = solutionSaver.solutionCopier

                 solutionStore.withSolutionSaver(solutionSaver)

                 dse.solutionStore = solutionStore

@@ -168,10 +171,10 @@ class ViatraReasoner extends LogicReasoner {
                         dse.addTransformationRule(rule)

                 }

 

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

+                val strategy = new BestFirstStrategyForModelGeneration(workspace, viatraConfig, method, solutionSaver, numericSolver)

                 viatraConfig.progressMonitor.workedForwardTransformation

-

-                val transformationTime = System.nanoTime - transformationStartTime

+                val transformationFinished = System.nanoTime

+                val transformationTime = transformationFinished - transformationStartTime

                 val solverStartTime = System.nanoTime

 

                 var boolean stoppedByTimeout

@@ -194,6 +197,15 @@ class ViatraReasoner extends LogicReasoner {
                                         it.value = (pair.value / 1000000) as int

                                 ]

                         }

+                        for(x: 0..<strategy.times.size) {

+                                it.entries += createStringStatisticEntry => [

+                                        it.name = '''Solution«x+1»DetailedStatistics'''

+                                        it.value = strategy.times.get(x)

+                                ]

+                        }

+                        it.entries += createIntStatisticEntry => [

+                                it.name = "ExplorationInitializationTime" it.value = ((strategy.explorationStarted-transformationFinished)/1000000) as int

+                        ]

                         it.entries += createIntStatisticEntry => [

                                 it.name = "TransformationExecutionTime"

                                 it.value = (method.statistics.transformationExecutionTime / 1000000) as int

@@ -223,6 +235,24 @@ class ViatraReasoner extends LogicReasoner {
                                 it.value = dse.numberOfStates as int

                         ]

                         it.entries += createIntStatisticEntry => [

+                                it.name = "ForwardTime" it.value = (strategy.forwardTime/1000000) as int

+                        ]

+                        it.entries += createIntStatisticEntry => [

+                                it.name = "BacktrackingTime" it.value = (strategy.backtrackingTime/1000000) as int

+                        ]

+                        it.entries += createIntStatisticEntry => [

+                                it.name = "GlobalConstraintEvaluationTime" it.value = (strategy.globalConstraintEvaluationTime/1000000) as int

+                        ]

+                        it.entries += createIntStatisticEntry => [

+                                it.name = "FitnessCalculationTime" it.value = (strategy.fitnessCalculationTime/1000000) as int

+                        ]

+                        it.entries += createIntStatisticEntry => [

+                                it.name = "SolutionCopyTime" it.value = (solutionSaver.totalCopierRuntime/1000000) as int

+                        ]

+                        it.entries += createIntStatisticEntry => [

+                                it.name = "ActivationSelectionTime" it.value = (strategy.activationSelector.runtime/1000000) as int

+                        ]

+                        it.entries += createIntStatisticEntry => [

                                 it.name = "Decisions"

                                 it.value = method.statistics.decisionsTried

                         ]

@@ -238,7 +268,28 @@ class ViatraReasoner extends LogicReasoner {
                                 it.name = "ScopePropagationsSolverCalls"

                                 it.value = method.statistics.scopePropagatorSolverInvocations

                         ]

-                        if (diversityChecker.isActive) {

+                        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"

                                         it.value = (diversityChecker.totalRuntime / 1000000) as int