Divers Generation times are added to statisticsexample scenario

3 files changed, 15 insertions, 2 deletions

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternProvider.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternProvider.xtend
index dac5630b..cac614ad 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternProvider.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternProvider.xtend
@@ -30,7 +30,7 @@ import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.*
 }

 

 class PatternProvider {

-        val ParseUtil parseUtil = new ParseUtil

+        

         val TypeAnalysis typeAnalysis = new TypeAnalysis

         

         public def generateQueries(

@@ -54,6 +54,7 @@ class PatternProvider {
                 }

                 val baseIndexerFile = patternGenerator.transformBaseProperties(problem,emptySolution,fqn2Query,typeAnalysisResult)

                 writeQueries(baseIndexerFile,"GeneratedQueries",workspace)

+                val ParseUtil parseUtil = new ParseUtil

                 val generatedQueries = parseUtil.parse(baseIndexerFile)

                 val runtimeQueries = calclulateRuntimeQueries(patternGenerator,problem,emptySolution,typeAnalysisResult,generatedQueries);

                 return runtimeQueries

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 38cc9459..5d8859bd 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
@@ -128,6 +128,12 @@ class ViatraReasoner extends LogicReasoner{
                         //it.solverTime = viatraConfig.runtimeLimit

                         it.solverTime = (solverTime/1000000) as int

                         it.transformationTime = (transformationTime/1000000) as int

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

+                                it.entries += createIntStatisticEntry => [

+                                        it.name = '''_Sulution«x»FoundAt'''

+                                        it.value = strategy.solutionStoreWithCopy.allRuntimes.get(x).intValue

+                                ]

+                        }

                         it.entries += createIntStatisticEntry => [

                                 it.name = "TransformationExecutionTime" it.value = (method.statistics.transformationExecutionTime/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/SolutionStoreWithCopy.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/SolutionStoreWithCopy.xtend
index 2892723b..679b9600 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/SolutionStoreWithCopy.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/SolutionStoreWithCopy.xtend
@@ -9,11 +9,13 @@ import org.eclipse.emf.ecore.util.EcoreUtil
 import org.eclipse.viatra.dse.base.ThreadContext

 

 class SolutionStoreWithCopy {

+        

         long runtime = 0

         List<PartialInterpretation> solutions = new LinkedList

         List<Map<EObject,EObject>> copyTraces = new LinkedList

         

-        long initTime = System.nanoTime

+        long sartTime = System.nanoTime

+        List<Long> solutionTimes = new LinkedList

         

         def newSolution(ThreadContext context) {

                 //print(System.nanoTime-initTime + ";")

@@ -25,10 +27,14 @@ class SolutionStoreWithCopy {
                 solutions.add(solutionCopy)

                 copyTraces.add(copier)

                 runtime += System.nanoTime - copyStart

+                solutionTimes.add(System.nanoTime-sartTime)

         }

         def getSumRuntime() {

                 return runtime

         }

+        def getAllRuntimes() {

+                return solutionTimes

+        }

         def getSolutions() {

                 solutions

         }