From b8694fcd581b19161f72f0da288bf72e922455a8 Mon Sep 17 00:00:00 2001
From: OszkarSemerath <oszka@SEMERATH-LAPTOP>
Date: Thu, 13 Jul 2017 14:16:59 +0200
Subject: Repaired dependency

---
 .../hu.bme.mit.inf.dslreasoner.visualisation/.classpath   |  2 +-
 .../hu.bme.mit.inf.dslreasoner.visualisation/pom.xml      | 15 +++++++++++++++
 .../pi2graphviz/PartialInterpretation2Graphviz.xtend      |  5 ++++-
 .../inf/dslreasoner/visualisation/pi2graphviz/Test.xtend  |  3 ++-
 4 files changed, 22 insertions(+), 3 deletions(-)

(limited to 'Solvers')

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/.classpath b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/.classpath
index a49f7d1e..0a5954ed 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/.classpath
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/.classpath
@@ -9,7 +9,7 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/pom.xml b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/pom.xml
index ac745ad3..11262177 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/pom.xml
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/pom.xml
@@ -9,7 +9,22 @@
 			<groupId>guru.nidi</groupId>
 			<artifactId>graphviz-java</artifactId>
 			<version>0.2.1</version>
+			<exclusions>
+				<exclusion>
+					<groupId>com.eclipsesource.j2v8</groupId>
+					<artifactId>j2v8_macosx_x86_64</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.eclipsesource.j2v8</groupId>
+					<artifactId>j2v8_linux_x86_64</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>com.eclipsesource.j2v8</groupId> -->
+<!-- 			<artifactId>j2v8_win32_x86_64</artifactId> -->
+<!-- 			<version>4.6.0</version> -->
+<!-- 		</dependency> -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-nop</artifactId>
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 a4baeadb..81dd97b1 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
@@ -33,6 +33,8 @@ import guru.nidi.graphviz.engine.Engine
 import guru.nidi.graphviz.attribute.Records
 import guru.nidi.graphviz.attribute.Attributes
 import java.util.List
+import guru.nidi.graphviz.engine.GraphvizEngine
+import guru.nidi.graphviz.engine.GraphvizV8Engine
 
 class GraphvizVisualisation implements PartialInterpretationVisualiser {
 	
@@ -196,7 +198,7 @@ class GraphvizVisualisation implements PartialInterpretationVisualiser {
 	}
 	protected def typePredicateColor(Set<Type> types) { types.averageColor }
 	protected def typePredicateColor(String name) {
-		val Random random = new Random(name.hashCode+1)
+		val Random random = new Random(name.hashCode)
 		val rangePicker = [|random.nextInt(128)+128]
 		return #[rangePicker.apply(), rangePicker.apply(), rangePicker.apply()]
 	}
@@ -232,6 +234,7 @@ class GraphvisVisualisation implements PartialInterpretationVisualisation {
 	
 	override writeToFile(ReasonerWorkspace workspace, String name) {
 		val path = '''«workspace.workspaceURI.toFileString»/«name».png'''
+		Graphviz.useEngine(new GraphvizV8Engine());
 		Graphviz.fromGraph(graph)//.engine(Engine::NEATO)
 		.render(Format.PNG).toFile(new File(path));
 	}
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 75187c26..428973a4 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
@@ -7,7 +7,8 @@ import org.eclipse.emf.ecore.resource.Resource
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl
 
 class Test {
-	def static void main(String[] args) {
+	def static void main(String[] args) {
+		println("xxx")
 		val workspace = new FileSystemWorkspace("input/","")
 		
 		PartialinterpretationPackage.eINSTANCE.eClass
-- 
cgit v1.2.3-54-g00ecf