Cleared up visualisation thread

3 files changed, 11 insertions, 10 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 @@
 package hu.bme.mit.inf.dslreasoner.application.execution

 

+import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ConfigurationScript

 import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.GenerationTask

 import hu.bme.mit.inf.dslreasoner.application.validation.MetamodelValidator

 import hu.bme.mit.inf.dslreasoner.application.validation.QueryAndMetamodelValidator

@@ -10,20 +11,20 @@ import hu.bme.mit.inf.dslreasoner.logic.model.builder.SolutionScope
 import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.InconsistencyResult

 import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.ModelResult

 import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.UnknownResult

+import hu.bme.mit.inf.dslreasoner.logic.model.statistics.StatisticSections2CSV

 import hu.bme.mit.inf.dslreasoner.logic2ecore.Logic2Ecore

 import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic

 import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2LogicConfiguration

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.visualisation.PartialInterpretation2Gml

-import hu.bme.mit.inf.dslreasoner.visualisation.pi2graphviz.GraphvizVisualisation

+import hu.bme.mit.inf.dslreasoner.visualisation.pi2graphviz.GraphvizVisualiser

 import hu.bme.mit.inf.dslreasoner.workspace.ProjectWorkspace

+import java.util.LinkedHashMap

 import java.util.Optional

+import java.util.Scanner

 import org.eclipse.core.runtime.IProgressMonitor

 import org.eclipse.emf.common.util.URI

-import java.util.LinkedHashMap

-import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ConfigurationScript

-import hu.bme.mit.inf.dslreasoner.logic.model.statistics.StatisticSections2CSV

 

 class GenerationTaskExecutor {

         val metamodelLoader = new MetamodelLoader

@@ -40,7 +41,7 @@ class GenerationTaskExecutor {
                 GenerationTask task,

                 ScriptExecutor scriptExecutor,

                 IProgressMonitor monitor)

-        {

+        {               

                 monitor.subTask('''Collecting all resources''')

                 // 1. Load all resources

                 val metamodelSpecification = scriptExecutor.getMetamodelSpecification(task.metamodel)

@@ -199,7 +200,7 @@ class GenerationTaskExecutor {
                                                         val gml = vis1.transform(representation)

                                                         outputWorkspaceForRun.writeText('''model«IF runs>1»_«run»«ENDIF»_«interpretationIndex+1».gml''',gml)

                                                         if(representation.newElements.size + representation.problem.elements.size < 150) {

-                                                                val vis2 = new GraphvizVisualisation

+                                                                val vis2 = new GraphvizVisualiser

                                                                 val dot = vis2.visualiseConcretization(representation)

                                                                 dot.writeToFile(outputWorkspaceForRun,'''model«IF runs>1»_«run»«ENDIF»_«interpretationIndex+1».png''')

                                                         }

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/src/hu/bme/mit/inf/dslreasoner/visualisation/pi2graphviz/PartialInterpretation2Graphviz.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/src/hu/bme/mit/inf/dslreasoner/visualisation/pi2graphviz/PartialInterpretation2Graphviz.xtend
index b8edb2f5..e30b27ac 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/src/hu/bme/mit/inf/dslreasoner/visualisation/pi2graphviz/PartialInterpretation2Graphviz.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/src/hu/bme/mit/inf/dslreasoner/visualisation/pi2graphviz/PartialInterpretation2Graphviz.xtend
@@ -27,7 +27,7 @@ import static guru.nidi.graphviz.model.Factory.*
 

 import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.*

 

-class GraphvizVisualisation implements PartialInterpretationVisualiser {

+class GraphvizVisualiser implements PartialInterpretationVisualiser {

         

         val TypeColoringStyle typeColoringStyle = TypeColoringStyle::AVERAGE;

         val smallFontSize=9

@@ -131,7 +131,7 @@ class GraphvizVisualisation implements PartialInterpretationVisualiser {
                         edges.entrySet.map[entry | entry.key.link(entry.value)]

                 )

                 

-                return new GraphvisVisualisation(graph)

+                return new GraphvizVisualisation(graph)

         }

         

         def protected <T extends DefinedElement> void drawDataTypes(Collection<T> collection, Function1<T,String> namer, HashMap<DefinedElement, Node> elements2Node, HashMap<DefinedElement, String> elements2ID) {

@@ -245,7 +245,7 @@ enum TypeColoringStyle {
         FLAG, AVERAGE

 }

 

-class GraphvisVisualisation implements PartialInterpretationVisualisation {

+class GraphvizVisualisation implements PartialInterpretationVisualisation {

         private static VisualisationQueque queue = new VisualisationQueque

         

         val private Graph graph

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/src/hu/bme/mit/inf/dslreasoner/visualisation/pi2graphviz/Test.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/src/hu/bme/mit/inf/dslreasoner/visualisation/pi2graphviz/Test.xtend
index 428973a4..6680c780 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/src/hu/bme/mit/inf/dslreasoner/visualisation/pi2graphviz/Test.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/src/hu/bme/mit/inf/dslreasoner/visualisation/pi2graphviz/Test.xtend
@@ -16,7 +16,7 @@ class Test {
                 

                 val model = workspace.readModel(PartialInterpretation,"solution1.partialinterpretation")

                 println("loaded")

-                val translator = new GraphvizVisualisation

+                val translator = new GraphvizVisualiser

                 val visualisation = translator.visualiseConcretization(model)

                 println("visualised")

                 visualisation.writeToFile(workspace,"output")