1 files changed, 9 insertions, 6 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..1ee69827 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
@@ -41,6 +41,7 @@ class GenerationTaskExecutor {
         def executeGenerationTask(

                 GenerationTask task,

                 ScriptExecutor scriptExecutor,

+                ScriptConsole.Factory scriptConsoleFactory,

                 IProgressMonitor monitor)

         {               

                 monitor.subTask('''Collecting all resources''')

@@ -62,7 +63,7 @@ class GenerationTaskExecutor {
                 val memoryLimit = scriptExecutor.getMemoryLimit(configSpecification)

                 

                 // 2. create console

-                val console = new ScriptConsole(true,false,

+                val console = scriptConsoleFactory.createScriptConsole(false,

                         if(messageFile!==null) URI.createURI(messageFile.path) else null,

                         if(debugFolder!==null) URI.createURI('''«debugFolder.path»/errors.txt''') else null,

                         if(statisticsFile!==null) URI.createURI(statisticsFile.path) else null

@@ -132,12 +133,14 @@ 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 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.numberOfRequiredSolution = if(task.numberSpecified) {

+                                it.numberOfRequiredSolutions = if(task.numberSpecified) {

                                         task.number

                                 } else {

                                         1

@@ -290,7 +293,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))

                                         }

@@ -301,7 +304,7 @@ class GenerationTaskExecutor {
                         console.flushStatistics

                         console.writeMessage("Model generation finished")

                 } catch(Exception e) {

-                        console.writeError('''

+                        console.writeError('''
                         Error occured («e.class.simpleName»): «e.message»

                         «FOR s : e.stackTrace SEPARATOR "\n"»    «s»«ENDFOR»''')

                 }

@@ -347,4 +350,4 @@ class GenerationTaskExecutor {
                         return false

                 }

         }

-}
\ No newline at end of file
+}