memory cleaning for measurements

2 files changed, 19 insertions, 3 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/ScriptExecutor.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScriptExecutor.xtend
index c9ec68bb..6037cfbf 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

@@ -58,6 +58,9 @@ class ScriptExecutor {
                 val tasks = script.commands.filter(Task)

                 

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

+                        if(taskIndex>0) {

+                                restForMeasurements(null)

+                        }

                         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 +237,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