changes in settings of measurements

4 files changed, 15 insertions, 1 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..8b866d54 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
@@ -185,6 +185,11 @@ class GenerationTaskExecutor {
                                 

                                 console.writeMessage("Model generation started")

                                 for(run : 1..runs) {

+                                        //For the runtime measurement

+                                        System.gc();

+                                        System.gc();

+                                        System.gc();

+                                        Thread.sleep(1000);

                                         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/MetamodelLoader.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/MetamodelLoader.xtend
index 5e7f84f0..f4be1761 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/MetamodelLoader.xtend
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/MetamodelLoader.xtend
@@ -44,6 +44,9 @@ class MetamodelLoader {
                         attributes+=entry.attributes

                 }

                 

+                // TODO: Delete this code after generation for ecore

+        

+                

                 return new EcoreMetamodelDescriptor(classes.toList, emptySet, false, enums.toList, literals.toList, references.toList, attributes.toList)

         }

         

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..5bafd10f 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
@@ -58,6 +58,12 @@ class ScriptExecutor {
                 val tasks = script.commands.filter(Task)

                 

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

+                        

+                        // for the runtime measurements

+                        System.gc();

+                        System.gc();

+                        System.gc();

+                        Thread.sleep(1000);

                         val task = tasks.get(taskIndex)

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

                         task.execute(monitor)