diff options
Diffstat (limited to 'Application')
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 { | |||
185 | 185 | ||
186 | console.writeMessage("Model generation started") | 186 | console.writeMessage("Model generation started") |
187 | for(run : 1..runs) { | 187 | for(run : 1..runs) { |
188 | //For the runtime measurement | ||
189 | System.gc(); | ||
190 | System.gc(); | ||
191 | System.gc(); | ||
192 | Thread.sleep(1000); | ||
188 | monitor.subTask('''Solving problem«IF runs>0» «run»/«runs»«ENDIF»''') | 193 | monitor.subTask('''Solving problem«IF runs>0» «run»/«runs»«ENDIF»''') |
189 | val visualisationProgressMonitor= new EclipseBasedProgressMonitor(monitor) | 194 | val visualisationProgressMonitor= new EclipseBasedProgressMonitor(monitor) |
190 | 195 | ||
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 { | |||
44 | attributes+=entry.attributes | 44 | attributes+=entry.attributes |
45 | } | 45 | } |
46 | 46 | ||
47 | // TODO: Delete this code after generation for ecore | ||
48 | |||
49 | |||
47 | return new EcoreMetamodelDescriptor(classes.toList, emptySet, false, enums.toList, literals.toList, references.toList, attributes.toList) | 50 | return new EcoreMetamodelDescriptor(classes.toList, emptySet, false, enums.toList, literals.toList, references.toList, attributes.toList) |
48 | } | 51 | } |
49 | 52 | ||
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 { | |||
39 | val statisticsHeaderBuffer = new LinkedHashSet<String> | 39 | val statisticsHeaderBuffer = new LinkedHashSet<String> |
40 | val statisticsDataBuffer = new LinkedList<Map<String,? extends Object>> | 40 | val statisticsDataBuffer = new LinkedList<Map<String,? extends Object>> |
41 | 41 | ||
42 | static val delimier = ';' | 42 | static val delimier = ',' |
43 | static val empty = "" | 43 | static val empty = "" |
44 | 44 | ||
45 | public new( | 45 | 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 { | |||
58 | val tasks = script.commands.filter(Task) | 58 | val tasks = script.commands.filter(Task) |
59 | 59 | ||
60 | for(taskIndex : 0..<tasks.size) { | 60 | for(taskIndex : 0..<tasks.size) { |
61 | |||
62 | // for the runtime measurements | ||
63 | System.gc(); | ||
64 | System.gc(); | ||
65 | System.gc(); | ||
66 | Thread.sleep(1000); | ||
61 | val task = tasks.get(taskIndex) | 67 | val task = tasks.get(taskIndex) |
62 | monitor.beginTask('''Executing task«IF tasks.size>1» «taskIndex+1»«ENDIF»: «task.name»''',task.totalWork) | 68 | monitor.beginTask('''Executing task«IF tasks.size>1» «taskIndex+1»«ENDIF»: «task.name»''',task.totalWork) |
63 | task.execute(monitor) | 69 | task.execute(monitor) |