X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=org.simantics.interop%2Fsrc%2Forg%2Fsimantics%2Finterop%2Ftest%2FGraphComparator.java;h=3b7bb31d8e4a7fb41ef41950dbdc320ffa88bb7f;hb=refs%2Fchanges%2F21%2F4621%2F1;hp=15b8c2c7e3cb1ef764e8e5915db059d49cabfc90;hpb=b8697e9995610157c2a065ea545d42545b76559d;p=simantics%2Finterop.git

diff --git a/org.simantics.interop/src/org/simantics/interop/test/GraphComparator.java b/org.simantics.interop/src/org/simantics/interop/test/GraphComparator.java
index 15b8c2c..3b7bb31 100644
--- a/org.simantics.interop/src/org/simantics/interop/test/GraphComparator.java
+++ b/org.simantics.interop/src/org/simantics/interop/test/GraphComparator.java
@@ -790,6 +790,14 @@ public class GraphComparator {
 		return new GraphChanges(r1,r2,changes1,changes2,modifications,comparableResources);
 	}
 	
+	public List<Statement> getChanges1() {
+		return changes1;
+	}
+	
+	public List<Statement> getChanges2() {
+		return changes2;
+	}
+	
 	private void addComparable(Statement left, Statement right) throws DatabaseException {
 		addComparable(left.getObject(), right.getObject());
 		comparableStatements.map(left, right);
@@ -797,8 +805,6 @@ public class GraphComparator {
 	}
 	
 	private void addComparable(Resource left, Resource right) throws DatabaseException {
-		if (left.getResourceId() == 225745 || right.getResourceId() == 225745)
-			System.out.println();
 		if(!comparableResources.contains(left, right)) {
 			if (comparableResources.containsLeft(left)||comparableResources.containsRight(right)) {
 				throw new DatabaseException("Comparator error: Trying to map " + left + " to " + right + " while mappings " + left + " to " + comparableResources.getRight(left) + " and " + comparableResources.getLeft(right) + " to " + right + " exist.");
@@ -1254,25 +1260,37 @@ public class GraphComparator {
 				case 0:{
 					boolean b1 = g.hasValue(s1.getObject());
 					boolean b2 = g.hasValue(s2.getObject());
+					boolean a1 = s1.isAsserted(r1);
+					boolean a2 = s2.isAsserted(r2);
 					if (b1 == b2) {
 						if (b1) {
 							// Literals
 							boolean eq = compareValue(g,b,s1.getObject(), s2.getObject());
 							if (!eq) {
 								addModification(r1,s1,r2,s2);
-								if (!s1.isAsserted(r1) && !s2.isAsserted(r2))
+								if (!a1 && !a2)
 									addComparable(s1, s2);
 							}
 						} else {
 							// Non literal properties.
-							if (comparator.compare(g, s1.getObject(), s2.getObject()) != ResourceComparator.NO_MATCH) {
-								if (!s1.getObject().equals(s1.getSubject()) && !s2.getObject().equals(s2.getSubject()))
-									// TODO compare props matches objects, so this is questionable. 
-									compareProps(s1.getObject(), s2.getObject());
-								else
+							int comp = comparator.compare(g, s1.getObject(), s2.getObject());
+							if (comp == ResourceComparator.NO_MATCH) {
+								addModification(r1,s1,r2,s2);
+							} else if (comp != ResourceComparator.EXACT_MATCH) {
+								if (!s1.getObject().equals(s1.getSubject()) && !s2.getObject().equals(s2.getSubject())) {
+									if (!a1 && !a2) {
+										// compare props matches objects, so we can call that only for non asserted statements
+										compareProps(s1.getObject(), s2.getObject());
+									} else if (a1 && a2) {
+										// TODO : compare asserted statements?
+									} else {
+										addModification(r1,s1,r2,s2);
+									}
+								} else {
 									addModification(r1,s1,r2,s2);
+								}
 							} else {
-								addModification(r1,s1,r2,s2);
+								// Exact match, nothing to do.
 							}
 						}
 					} else {
@@ -1284,14 +1302,18 @@ public class GraphComparator {
 				}
 				case -1:{
 					if (DEBUG) System.out.println("Compare Prop diff1s " + printStatement(g,s1));
-					addDeletion(s1);
+					// Use modification, since deletions do not support asserted statements
+					addModification(r1,s1,r2,null);
+					//addDeletion(s1);
 					i1++;
 					break;
 				}
 					
 				case 1:{
 					if (DEBUG) System.out.println("Compare Prop diff2s " + printStatement(g,s2));
-					addAddition(s2);
+					// Use modification, since additions do not support asserted statements
+					addModification(r1,null,r2,s2);
+					//addAddition(s2);
 					i2++;
 					break;
 				}