3 files changed, 54 insertions, 21 deletions

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/src/hu/bme/mit/inf/dslreasoner/visualisation/pi2graphviz/GraphvizV8WithMemory.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/src/hu/bme/mit/inf/dslreasoner/visualisation/pi2graphviz/GraphvizV8WithMemory.xtend
new file mode 100644
index 00000000..542289d4
--- /dev/null
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/src/hu/bme/mit/inf/dslreasoner/visualisation/pi2graphviz/GraphvizV8WithMemory.xtend
@@ -0,0 +1,16 @@
+package hu.bme.mit.inf.dslreasoner.visualisation.pi2graphviz

+

+import guru.nidi.graphviz.engine.GraphvizV8Engine

+

+class GraphvizV8WithMemory extends GraphvizV8Engine {

+        val int memory;

+        new(int memory) {

+                this.memory = memory

+                //this.

+        }

+        

+        override protected jsInitEnv() {

+                println super.jsInitEnv()

+                super.jsInitEnv()

+        }

+}

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 78326207..cd0b3e00 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
@@ -30,6 +30,7 @@ import org.eclipse.xtext.xbase.lib.Functions.Function1
 import static guru.nidi.graphviz.model.Factory.*

 

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

+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PrimitiveElement

 

 class GraphvizVisualiser implements PartialInterpretationVisualiser {

         

@@ -106,10 +107,10 @@ class GraphvizVisualiser implements PartialInterpretationVisualiser {
 //                      elements2Node.put(newElement,image)

 //              }

                 

-                partialInterpretation.newElements.filter(BooleanElement).drawDataTypes([it.value.toString],elements2Node,elements2ID)

-                partialInterpretation.newElements.filter(IntegerElement).drawDataTypes([it.value.toString],elements2Node,elements2ID)

-                partialInterpretation.newElements.filter(StringElement).drawDataTypes(['''"«it.value.toString»"'''],elements2Node,elements2ID)

-                partialInterpretation.newElements.filter(RealElement).drawDataTypes([it.value.toString],elements2Node,elements2ID)

+                //partialInterpretation.newElements.filter(BooleanElement).drawDataTypes([it.value.toString],elements2Node,elements2ID)

+                //partialInterpretation.newElements.filter(IntegerElement).drawDataTypes([it.value.toString],elements2Node,elements2ID)

+                //partialInterpretation.newElements.filter(StringElement).drawDataTypes(['''"«it.value.toString»"'''],elements2Node,elements2ID)

+                //partialInterpretation.newElements.filter(RealElement).drawDataTypes([it.value.toString],elements2Node,elements2ID)

                 

                 // Drawing the edges

                 val edges = new HashMap

@@ -135,35 +136,51 @@ class GraphvizVisualiser implements PartialInterpretationVisualiser {
                 return new GraphvizVisualisation(graph)

         }

         

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

-                for(booleanElementIndex: 0..<collection.size) {

-                        val newElement = collection.get(booleanElementIndex)

-                        val id = namer.apply(newElement)

-                        val image = drawElement(newElement,id,false,emptySet,emptySet)

-                        elements2ID.put(newElement,id)

-                        elements2Node.put(newElement,image)

-                }

-        }

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

+//              for(booleanElementIndex: 0..<collection.size) {

+//                      val newElement = collection.get(booleanElementIndex)

+//                      val name = namer.apply(newElement)

+//                      val image = drawElement(newElement,name,newElement.lookup(elements2ID),false,emptySet,emptySet)

+//                      elements2Node.put(newElement,image)

+//              }

+//      }

         

         def protected drawElement(DefinedElement element, String ID, boolean old, Set<Type> mustTypes, Set<Type> mayTypes) {

                 var tableStyle =  ''' CELLSPACING="0" BORDER="2" CELLBORDER="0" CELLPADDING="1" STYLE="ROUNDED"'''

                 if(typeColoringStyle==TypeColoringStyle::AVERAGE) {

                         tableStyle += ''' BGCOLOR="#«typePredicateColor(mustTypes).toBackgroundColorString»"'''

                 }

-                val mainLabel = if(element.name !== null) {

+                val mainLabel = if(element instanceof PrimitiveElement) {

+                        if(element.isValueSet) {

+                                if(element instanceof BooleanElement) { element.value.toString }

+                                else if(element instanceof IntegerElement) { element.value.toString }

+                                else if(element instanceof RealElement) { element.value.toString }

+                                else if(element instanceof StringElement) { "\""+element.value.toString+"\"" }

+                        } else {

+                                "?"

+                        }

+                 }else if(element.name !== null) {

                         val parts = element.name.split("\\s+")

                         textWithSubSup(parts.getOrNull(0),parts.getOrNull(1),parts.getOrNull(2),null)

                 } else {

                         val parts = ID.split("\\s+")

-                        textWithSubSup(parts.get(0),parts.get(1),parts.getOrNull(2),null)

+                        textWithSubSup(parts.getOrNull(0),parts.getOrNull(1),parts.getOrNull(2),null)

                 }

-                val label = Label.html(

+                val hasNoCompexType = (mustTypes.empty) && (mayTypes.empty)

+                

+                val label = if(hasNoCompexType) {

+                        Label.html(

+                                '''<TABLE«tableStyle»>'''+

+                                '''<TR><TD COLSPAN="2">    «mainLabel»  </TD></TR>'''+

+                                '''</TABLE>''')

+                } else {

+                        Label.html(

                         '''<TABLE«tableStyle»>'''+

                         '''<TR><TD COLSPAN="2" BORDER="2" SIDES="B">«mainLabel»</TD></TR>'''+

                         '''«FOR mustTypeName : mustTypes.map[it.name].sort»«typePredicateDescription(mustTypeName,true)»«ENDFOR»'''+

                         '''«FOR mayTypeName : mayTypes.map[it.name].sort»«typePredicateDescription(mayTypeName,false)»«ENDFOR»'''+

                         '''</TABLE>''')

-                        

+                }

                 val node = node(ID).with(label).with(

                         Shape.NONE

                         //,

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/src/hu/bme/mit/inf/dslreasoner/visualisation/pi2graphviz/VisualisationQueque.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/src/hu/bme/mit/inf/dslreasoner/visualisation/pi2graphviz/VisualisationQueque.xtend
index b067ba7d..6f003f80 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/src/hu/bme/mit/inf/dslreasoner/visualisation/pi2graphviz/VisualisationQueque.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/src/hu/bme/mit/inf/dslreasoner/visualisation/pi2graphviz/VisualisationQueque.xtend
@@ -3,15 +3,15 @@ package hu.bme.mit.inf.dslreasoner.visualisation.pi2graphviz
 import guru.nidi.graphviz.engine.Format

 import guru.nidi.graphviz.engine.Graphviz

 import guru.nidi.graphviz.engine.GraphvizEngine

-import guru.nidi.graphviz.engine.GraphvizV8Engine

 import guru.nidi.graphviz.model.Graph

 import java.io.File

 import java.io.IOException

 import java.util.concurrent.BlockingQueue

 import java.util.concurrent.CompletableFuture

 import java.util.concurrent.LinkedBlockingQueue

-import org.eclipse.xtend.lib.annotations.Data

 import java.util.function.Consumer

+import org.eclipse.xtend.lib.annotations.Data

+import guru.nidi.graphviz.engine.GraphvizV8Engine

 

 class VisualisationQueque {

         val BlockingQueue<VisualisationQueueEntry> taskQueue = new LinkedBlockingQueue

@@ -45,7 +45,7 @@ class VisualisationQueque {
                 } else {

                         runnerThread = new Thread(new Runnable() {

                                 override run() {

-                                        val engine = new GraphvizV8Engine()

+                                        val engine = new GraphvizV8Engine

                                         val nullConsumer = new Consumer<GraphvizEngine>() {

                                                 override accept(GraphvizEngine t) {}

                                         }

@@ -69,7 +69,7 @@ class VisualisationQueque {
         private def execute(GraphvizEngine engine, Graph document, File targetFile, Format format) {

                 Graphviz.useEngine(engine);

                 try {

-                        Graphviz.fromGraph(document).render(format).toFile(targetFile)

+                        Graphviz.fromGraph(document).totalMemory(536870912).render(format).toFile(targetFile)

                         return null

                 } catch(IOException e){

                         return e.message