1 files changed, 5 insertions, 3 deletions

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/GenerationTaskExecutor.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/GenerationTaskExecutor.xtend
index c9d38c7d..aa98e268 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/GenerationTaskExecutor.xtend
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/GenerationTaskExecutor.xtend
@@ -132,9 +132,8 @@ class GenerationTaskExecutor {
                         // 5. create a solver and a configuration

                         // 5.1 initialize

                         val solver = solverLoader.loadSolver(task.solver,configurationMap)

-                        val solverConfig = solverLoader.loadSolverConfig(task.solver,configurationMap,console)

-                        

                         

+                        val solverConfig = solverLoader.loadSolverConfig(task.solver,configurationMap,console)

                         // 5.2 set values that defined directly 

                         solverConfig.solutionScope = new SolutionScope => [

                                 it.numberOfRequiredSolution = if(task.numberSpecified) {

@@ -185,6 +184,9 @@ class GenerationTaskExecutor {
                                 

                                 console.writeMessage("Model generation started")

                                 for(run : 1..runs) {

+                                        if(run > 1) {

+                                                ScriptExecutor::restForMeasurements(console)

+                                        }

                                         monitor.subTask('''Solving problem«IF runs>0» «run»/«runs»«ENDIF»''')

                                         val visualisationProgressMonitor= new EclipseBasedProgressMonitor(monitor)

                                         

@@ -290,7 +292,7 @@ class GenerationTaskExecutor {
                                         statistics.put("Domain to logic transformation time",domain2LogicTransformationTime/1000000)

                                         statistics.put("Logic to solver transformation time",solution.statistics.transformationTime)

                                         statistics.put("Solver time",solution.statistics.solverTime)

-                                        statistics.put("Postprocessing time",solutionVisualisationTime)

+                                        statistics.put("Postprocessing time",solutionVisualisationTime/1000000)

                                         for(entry: solution.statistics.entries) {

                                                 statistics.put(entry.name,statisticsUtil.readValue(entry))

                                         }