1 files changed, 3 insertions, 7 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 1ee69827..c3ba9f81 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
@@ -2,8 +2,6 @@ package hu.bme.mit.inf.dslreasoner.application.execution
 

 import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ConfigurationScript

 import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.GenerationTask

-import hu.bme.mit.inf.dslreasoner.application.validation.MetamodelValidator

-import hu.bme.mit.inf.dslreasoner.application.validation.QueryAndMetamodelValidator

 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic

 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration

 import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel

@@ -35,9 +33,6 @@ class GenerationTaskExecutor {
         val scopeLoader = new ScopeLoader

         val statisticsUtil = new StatisticSections2CSV

         

-        val metamodelValidator = new MetamodelValidator

-        val queryAndMetamodelValidator = new QueryAndMetamodelValidator

-        

         def executeGenerationTask(

                 GenerationTask task,

                 ScriptExecutor scriptExecutor,

@@ -136,8 +131,6 @@ class GenerationTaskExecutor {
                         val objectiveSpecification = scriptExecutor.getObjectiveSpecification(task.objectives)

                         val objectiveEntries = objectiveSpecification?.entries ?: emptyList

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

-                        

-                        

                         // 5.2 set values that defined directly 

                         solverConfig.solutionScope = new SolutionScope => [

                                 it.numberOfRequiredSolutions = if(task.numberSpecified) {

@@ -188,6 +181,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)