5 files changed, 63 insertions, 14 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)

                                         

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScriptConsole.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScriptConsole.xtend
index 2ce86a78..d49a0f2a 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScriptConsole.xtend
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScriptConsole.xtend
@@ -23,9 +23,9 @@ abstract class ScriptConsole {
         val List<String> errorMessagesDuringInitialisation = new LinkedList;

 

         val statisticsHeaderBuffer = new LinkedHashSet<String>

-        val statisticsDataBuffer = new LinkedList<Map<String, ? extends Object>>

-

-        static val delimier = ';'

+        val statisticsDataBuffer = new LinkedList<Map<String,? extends Object>>

+        

+        static val delimier = ','

         static val empty = ""

 

         new(boolean printToConsole, boolean cleanFiles, URI messageConsoleURI, URI errorConsoleURI,

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScriptExecutor.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScriptExecutor.xtend
index 3941179a..3dea677f 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScriptExecutor.xtend
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScriptExecutor.xtend
@@ -14,6 +14,8 @@ import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.GraphPatt
 import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.MemoryEntry

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

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

+import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ObjectiveReference

+import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ObjectiveSpecification

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

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

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

@@ -30,8 +32,6 @@ import org.eclipse.core.runtime.Status
 import org.eclipse.core.runtime.jobs.Job

 import org.eclipse.emf.common.util.URI

 import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor

-import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ObjectiveSpecification

-import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ObjectiveReference

 

 @FinalFieldsConstructor

 class ScriptExecutor {

@@ -62,8 +62,12 @@ class ScriptExecutor {
         def executeScript(ConfigurationScript script, IProgressMonitor monitor) {

                 script.activateAllEPackageReferences

                 val tasks = script.commands.filter(Task)

+                val intermediateScriptConsole = scriptConsoleFactory.createScriptConsole(false, null, null, null)

                 

                 for(taskIndex : 0..<tasks.size) {

+                        if(taskIndex>0) {

+                                restForMeasurements(intermediateScriptConsole)

+                        }

                         val task = tasks.get(taskIndex)

                         monitor.beginTask('''Executing task«IF tasks.size>1» «taskIndex+1»«ENDIF»: «task.name»''',task.totalWork)

                         task.execute(monitor)

@@ -250,4 +254,16 @@ class ScriptExecutor {
                         }

                 }

         }

-}
+

+        static val boolean measuring = true

+        static def restForMeasurements(ScriptConsole console) {

+                if(measuring) {

+                        if(console !== null) {

+                                console.writeMessage('''Cleaning memory.''')

+                        }

+                        System.gc System.gc System.gc

+                        Thread.sleep(2500)

+                }

+        }

+}

+

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/SolverLoader.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/SolverLoader.xtend
index 1139080b..b1be56cb 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/SolverLoader.xtend
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/SolverLoader.xtend
@@ -98,6 +98,43 @@ class SolverLoader {
                                                 console.writeError('''Malformed number format: «e.message»''')

                                         }

                                 }

+                                if(config.containsKey("numeric-solver-at-end")) {

+                                        val stringValue = config.get("numeric-solver-at-end")

+                                        if(stringValue.equals("true")) {

+                                                println("numeric-solver-at-end")

+                                                c.runIntermediateNumericalConsistencyChecks = false

+                                        }

+                                }

+                                if(config.containsKey("fitness-punishSize")) {

+                                        val stringValue = config.get("fitness-punishSize")

+                                        try {

+                                                c.punishSize = Boolean.parseBoolean(stringValue)

+                                        } catch(Exception e) {}

+                                }

+                                if(config.containsKey("fitness-scope")) {

+                                        val stringValue = config.get("fitness-scope")

+                                        try {

+                                                c.scopeWeight = Integer.parseInt(stringValue)

+                                        } catch(Exception e) {}

+                                }

+                                if(config.containsKey("fitness-missing-containent")) {

+                                        val stringValue = config.get("fitness-missing-containent")

+                                        try {

+                                                c.conaintmentWeight = Integer.parseInt(stringValue)

+                                        } catch(Exception e) {}

+                                }

+                                if(config.containsKey("fitness-missing-noncontainent")) {

+                                        val stringValue = config.get("fitness-missing-noncontainent")

+                                        try {

+                                                c.nonContainmentWeight = Integer.parseInt(stringValue)

+                                        } catch(Exception e) {}

+                                }

+                                if(config.containsKey("fitness-missing-wf")) {

+                                        val stringValue = config.get("fitness-missing-wf")

+                                        try {

+                                                c.unfinishedWFWeight = Integer.parseInt(stringValue)

+                                        } catch(Exception e) {}

+                                }

                                 for (objectiveEntry : objectiveEntries) {

                                         val costObjectiveConfig = new CostObjectiveConfiguration

                                         switch (objectiveEntry) {

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/validation/QueryAndMetamodelValidator.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/validation/QueryAndMetamodelValidator.xtend
index 7d79bbbb..b378ec0c 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/validation/QueryAndMetamodelValidator.xtend
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/validation/QueryAndMetamodelValidator.xtend
@@ -10,7 +10,7 @@ import org.eclipse.viatra.query.patternlanguage.emf.vql.Pattern
 

 class QueryAndMetamodelValidator {

         

-        def public validateQueryAndMetamodel(

+        def validateQueryAndMetamodel(

                 EcoreMetamodelDescriptor metamodel,

                 Pair<ViatraQuerySetDescriptor, Set<Pattern>> viatra)

         {