Merge remote-tracking branch 'upstream/master'

4 files changed, 58 insertions, 4 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 1f52c4b3..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
@@ -184,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)

                                         

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 91d3d286..cfb1f09b 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
@@ -39,7 +39,7 @@ class ScriptConsole {
         val statisticsHeaderBuffer = new LinkedHashSet<String>

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

         

-        static val delimier = ';'

+        static val delimier = ','

         static val empty = ""

         

         public new(

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 c9ec68bb..04449a74 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
@@ -4,6 +4,7 @@ import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ConfigRef
 import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ConfigSpecification

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

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

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

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

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

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

@@ -24,11 +25,10 @@ import hu.bme.mit.inf.dslreasoner.application.execution.util.ApplicationConfigur
 import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel

 import java.util.LinkedHashMap

 import java.util.Optional

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

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

-import org.eclipse.core.runtime.jobs.Job

 import org.eclipse.core.runtime.IProgressMonitor

 import org.eclipse.core.runtime.Status

+import org.eclipse.core.runtime.jobs.Job

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

 

 class ScriptExecutor {

         val parser = new ApplicationConfigurationParser

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

                 script.activateAllEPackageReferences

                 val tasks = script.commands.filter(Task)

+                val intermediateScriptConsole = new ScriptConsole(true,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)

@@ -234,4 +238,14 @@ 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)

+                }

+        }

 }
\ No newline at end of file
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 3f0ba03f..e1d01cb5 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
@@ -87,6 +87,43 @@ class SolverLoader {
                                                 ]

                                         } catch (NumberFormatException e) {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) {}

+                                }

                         ]

                 } else {

                         throw new UnsupportedOperationException('''Unknown solver: «solver»''')