diff options
author | OszkarSemerath <oszkar.semerath@gmail.com> | 2018-03-04 15:41:48 -0500 |
---|---|---|
committer | OszkarSemerath <oszkar.semerath@gmail.com> | 2018-03-04 15:41:48 -0500 |
commit | a27df74202568a30fb05fce0afc88bcf4c29c28b (patch) | |
tree | f4b2a53591e752707aa8e6d182997a88a921476b /Application | |
parent | Consoles (diff) | |
download | VIATRA-Generator-a27df74202568a30fb05fce0afc88bcf4c29c28b.tar.gz VIATRA-Generator-a27df74202568a30fb05fce0afc88bcf4c29c28b.tar.zst VIATRA-Generator-a27df74202568a30fb05fce0afc88bcf4c29c28b.zip |
Statistics added
Diffstat (limited to 'Application')
2 files changed, 10 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 05d4e0c0..10d78f3d 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 | |||
@@ -178,6 +178,7 @@ class GenerationTaskExecutor { | |||
178 | // 8. Solution processing | 178 | // 8. Solution processing |
179 | 179 | ||
180 | // 8.1 Visualisation | 180 | // 8.1 Visualisation |
181 | var solutionVisualisationTime = System.nanoTime | ||
181 | if(solution instanceof ModelResult) { | 182 | if(solution instanceof ModelResult) { |
182 | val interpretations = solver.getInterpretations(solution) | 183 | val interpretations = solver.getInterpretations(solution) |
183 | val outputWorkspaceForRun = if(runs > 1) { | 184 | val outputWorkspaceForRun = if(runs > 1) { |
@@ -208,6 +209,7 @@ class GenerationTaskExecutor { | |||
208 | } else { | 209 | } else { |
209 | monitor.worked(solverConfig.solutionScope.numberOfRequiredSolution*100) | 210 | monitor.worked(solverConfig.solutionScope.numberOfRequiredSolution*100) |
210 | } | 211 | } |
212 | solutionVisualisationTime = System.nanoTime - solutionVisualisationTime | ||
211 | 213 | ||
212 | // 8.2 Statistics | 214 | // 8.2 Statistics |
213 | val statistics = new LinkedHashMap | 215 | val statistics = new LinkedHashMap |
@@ -217,6 +219,7 @@ class GenerationTaskExecutor { | |||
217 | statistics.put("Domain to logic transformation time",domain2LogicTransformationTime/1000000) | 219 | statistics.put("Domain to logic transformation time",domain2LogicTransformationTime/1000000) |
218 | statistics.put("Logic to solver transformation time",solution.statistics.transformationTime) | 220 | statistics.put("Logic to solver transformation time",solution.statistics.transformationTime) |
219 | statistics.put("Solver time",solution.statistics.solverTime) | 221 | statistics.put("Solver time",solution.statistics.solverTime) |
222 | statistics.put("Postprocessing time",solutionVisualisationTime) | ||
220 | for(entry: solution.statistics.entries) { | 223 | for(entry: solution.statistics.entries) { |
221 | statistics.put(entry.name,statisticsUtil.readValue(entry)) | 224 | statistics.put(entry.name,statisticsUtil.readValue(entry)) |
222 | } | 225 | } |
@@ -225,7 +228,9 @@ class GenerationTaskExecutor { | |||
225 | console.flushStatistics | 228 | console.flushStatistics |
226 | console.writeMessage("Model generation finished") | 229 | console.writeMessage("Model generation finished") |
227 | } catch(Exception e) { | 230 | } catch(Exception e) { |
228 | console.writeError('''Error occured: «e.message»''') | 231 | console.writeError(''' |
232 | Error occured:«e.message» | ||
233 | «FOR s : e.stackTrace SEPARATOR "\n"» «s»«ENDFOR»''') | ||
229 | } | 234 | } |
230 | } | 235 | } |
231 | 236 | ||
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 4bf58c67..1d8c473f 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 | |||
@@ -105,11 +105,13 @@ class ScriptConsole { | |||
105 | if(statisticsWorkspace!==null) { | 105 | if(statisticsWorkspace!==null) { |
106 | val message = ''' | 106 | val message = ''' |
107 | «FOR key : statisticsHeaderBuffer SEPARATOR delimier»«key»«ENDFOR» | 107 | «FOR key : statisticsHeaderBuffer SEPARATOR delimier»«key»«ENDFOR» |
108 | «FOR line : statisticsDataBuffer » | 108 | «FOR line : statisticsDataBuffer» |
109 | «FOR key : statisticsHeaderBuffer»«IF line.containsKey(key)»«empty»«ELSE»«line.get(key)»«ENDIF»«ENDFOR» | 109 | «FOR key : statisticsHeaderBuffer SEPARATOR delimier»«IF line.containsKey(key)»«line.get(key)»«ELSE»«empty»«ENDIF»«ENDFOR» |
110 | «ENDFOR» | 110 | «ENDFOR» |
111 | ''' | 111 | ''' |
112 | statisticsWorkspace.writeText(statisticsFileName,message); | 112 | statisticsWorkspace.writeText(statisticsFileName,message); |
113 | statisticsHeaderBuffer.clear | ||
114 | statisticsDataBuffer.clear | ||
113 | } | 115 | } |
114 | } | 116 | } |
115 | 117 | ||