diff options
author | OszkarSemerath <oszkar.semerath@gmail.com> | 2018-05-22 14:37:45 +0200 |
---|---|---|
committer | OszkarSemerath <oszkar.semerath@gmail.com> | 2018-05-22 14:37:45 +0200 |
commit | 9ce21ae3e01967022051f423e6f54972e17053a2 (patch) | |
tree | df4adb0896a62ef66509bc1dd2daab123f22112c /Application | |
parent | Removed debug logging (diff) | |
download | VIATRA-Generator-9ce21ae3e01967022051f423e6f54972e17053a2.tar.gz VIATRA-Generator-9ce21ae3e01967022051f423e6f54972e17053a2.tar.zst VIATRA-Generator-9ce21ae3e01967022051f423e6f54972e17053a2.zip |
Cleared up visualisation thread
Diffstat (limited to 'Application')
-rw-r--r-- | Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/GenerationTaskExecutor.xtend | 13 |
1 files changed, 7 insertions, 6 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 663c45a4..61526ce6 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 | |||
@@ -1,5 +1,6 @@ | |||
1 | package hu.bme.mit.inf.dslreasoner.application.execution | 1 | package hu.bme.mit.inf.dslreasoner.application.execution |
2 | 2 | ||
3 | import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ConfigurationScript | ||
3 | import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.GenerationTask | 4 | import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.GenerationTask |
4 | import hu.bme.mit.inf.dslreasoner.application.validation.MetamodelValidator | 5 | import hu.bme.mit.inf.dslreasoner.application.validation.MetamodelValidator |
5 | import hu.bme.mit.inf.dslreasoner.application.validation.QueryAndMetamodelValidator | 6 | import hu.bme.mit.inf.dslreasoner.application.validation.QueryAndMetamodelValidator |
@@ -10,20 +11,20 @@ import hu.bme.mit.inf.dslreasoner.logic.model.builder.SolutionScope | |||
10 | import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.InconsistencyResult | 11 | import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.InconsistencyResult |
11 | import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.ModelResult | 12 | import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.ModelResult |
12 | import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.UnknownResult | 13 | import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.UnknownResult |
14 | import hu.bme.mit.inf.dslreasoner.logic.model.statistics.StatisticSections2CSV | ||
13 | import hu.bme.mit.inf.dslreasoner.logic2ecore.Logic2Ecore | 15 | import hu.bme.mit.inf.dslreasoner.logic2ecore.Logic2Ecore |
14 | import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic | 16 | import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic |
15 | import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2LogicConfiguration | 17 | import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2LogicConfiguration |
16 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic | 18 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic |
17 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation | 19 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation |
18 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.visualisation.PartialInterpretation2Gml | 20 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.visualisation.PartialInterpretation2Gml |
19 | import hu.bme.mit.inf.dslreasoner.visualisation.pi2graphviz.GraphvizVisualisation | 21 | import hu.bme.mit.inf.dslreasoner.visualisation.pi2graphviz.GraphvizVisualiser |
20 | import hu.bme.mit.inf.dslreasoner.workspace.ProjectWorkspace | 22 | import hu.bme.mit.inf.dslreasoner.workspace.ProjectWorkspace |
23 | import java.util.LinkedHashMap | ||
21 | import java.util.Optional | 24 | import java.util.Optional |
25 | import java.util.Scanner | ||
22 | import org.eclipse.core.runtime.IProgressMonitor | 26 | import org.eclipse.core.runtime.IProgressMonitor |
23 | import org.eclipse.emf.common.util.URI | 27 | import org.eclipse.emf.common.util.URI |
24 | import java.util.LinkedHashMap | ||
25 | import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ConfigurationScript | ||
26 | import hu.bme.mit.inf.dslreasoner.logic.model.statistics.StatisticSections2CSV | ||
27 | 28 | ||
28 | class GenerationTaskExecutor { | 29 | class GenerationTaskExecutor { |
29 | val metamodelLoader = new MetamodelLoader | 30 | val metamodelLoader = new MetamodelLoader |
@@ -40,7 +41,7 @@ class GenerationTaskExecutor { | |||
40 | GenerationTask task, | 41 | GenerationTask task, |
41 | ScriptExecutor scriptExecutor, | 42 | ScriptExecutor scriptExecutor, |
42 | IProgressMonitor monitor) | 43 | IProgressMonitor monitor) |
43 | { | 44 | { |
44 | monitor.subTask('''Collecting all resources''') | 45 | monitor.subTask('''Collecting all resources''') |
45 | // 1. Load all resources | 46 | // 1. Load all resources |
46 | val metamodelSpecification = scriptExecutor.getMetamodelSpecification(task.metamodel) | 47 | val metamodelSpecification = scriptExecutor.getMetamodelSpecification(task.metamodel) |
@@ -199,7 +200,7 @@ class GenerationTaskExecutor { | |||
199 | val gml = vis1.transform(representation) | 200 | val gml = vis1.transform(representation) |
200 | outputWorkspaceForRun.writeText('''model«IF runs>1»_«run»«ENDIF»_«interpretationIndex+1».gml''',gml) | 201 | outputWorkspaceForRun.writeText('''model«IF runs>1»_«run»«ENDIF»_«interpretationIndex+1».gml''',gml) |
201 | if(representation.newElements.size + representation.problem.elements.size < 150) { | 202 | if(representation.newElements.size + representation.problem.elements.size < 150) { |
202 | val vis2 = new GraphvizVisualisation | 203 | val vis2 = new GraphvizVisualiser |
203 | val dot = vis2.visualiseConcretization(representation) | 204 | val dot = vis2.visualiseConcretization(representation) |
204 | dot.writeToFile(outputWorkspaceForRun,'''model«IF runs>1»_«run»«ENDIF»_«interpretationIndex+1».png''') | 205 | dot.writeToFile(outputWorkspaceForRun,'''model«IF runs>1»_«run»«ENDIF»_«interpretationIndex+1».png''') |
205 | } | 206 | } |