1 files changed, 19 insertions, 3 deletions

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)

+                }

+        }

+}

+