logging detailed measurement data for the numerical solver

2 files changed, 13 insertions, 1 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 bafe78f6..293df935 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
@@ -159,7 +159,16 @@ class ViatraReasoner extends LogicReasoner{
                                 it.name = "ActivationSelectionTime" it.value = (strategy.activationSelector.runtime/1000000) as int

                         ]

                         it.entries += createIntStatisticEntry => [

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

+                                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

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/NumericSolver.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/NumericSolver.xtend
index 9da97d30..0fb5d702 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/NumericSolver.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/NumericSolver.xtend
@@ -56,6 +56,9 @@ class NumericSolver {
         def getCachingTime(){cachingTime}

         def getNumberOfSolverCalls(){numberOfSolverCalls}

         def getNumberOfCachedSolverCalls(){numberOfCachedSolverCalls}

+        def getSolverFormingProblem(){this.t.formingProblemTime}

+        def getSolverSolvingProblem(){this.t.solvingProblemTime}

+        def getSolverSolution(){this.t.formingSolutionTime}

         

         def boolean maySatisfiable() {

                 isSatisfiable(this.constraint2MustUnitPropagationPrecondition)