X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.interop%2Fsrc%2Forg%2Fsimantics%2Finterop%2Ftest%2FGraphComparator.java;h=6f8c4d1b15e13d10a652dac5551abbb7d0a329e1;hb=7bd962c96d0a43bbc0fca67e87a1bc877a451fe0;hp=b000c58f191624df7d138a73580c183ad94df34c;hpb=10192b156dc9192b3751f87175e212f5659fb14e;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 b000c58..6f8c4d1 100644
--- a/org.simantics.interop/src/org/simantics/interop/test/GraphComparator.java
+++ b/org.simantics.interop/src/org/simantics/interop/test/GraphComparator.java
@@ -152,10 +152,16 @@ public class GraphComparator {
 	}
 	
 	public void addComparableResources(Resource r1, Resource r2) {
+		if (DEBUG)
+			System.out.println("Preset " + r1 + " = " + r2);
 		comparableResources.map(r1, r2);
 	}
 	
 	public void addComparableResources(BijectionMap<Resource, Resource> matching) {
+		if (DEBUG) {
+			for (Entry<Resource, Resource> entry : matching.getEntries())
+				System.out.println("Preset " + entry.getKey() + " = " + entry.getValue());
+		}
 		comparableResources.addAll(matching);
 	}
 	
@@ -179,6 +185,7 @@ public class GraphComparator {
 		this.g = g;
 		this.b = Layer0.getInstance(g);
 		comparator.setComparator(this);
+		comparator.initialize(g, r1, r2);
 		
 		Stack<Resource> objectsLeft = new Stack<Resource>();
 		Stack<Resource> objectsRight = new Stack<Resource>();
@@ -268,6 +275,11 @@ public class GraphComparator {
 						// These cases have longer path than one to identified objects.
 						processUnreliableDeep(unreliableLeft, unreliableRight, objectsLeft, objectsRight);
 					}
+					if (objectsLeft.isEmpty() && unreliableLeft.size() > 0 && unreliableRight.size() > 0) {
+						// comparison is ending, but we have still unprocessed unidentified resources left.
+						// These cases have longer path than one to identified objects.
+						processUnreliableDeep(unreliableLeft, unreliableRight, objectsLeft, objectsRight);
+					}
 				}
 			});
 			
@@ -276,8 +288,6 @@ public class GraphComparator {
 		}
 		for (Statement s : unreliableLeft) {
 			if (!comparableStatements.containsLeft(s))
-				if (s.getObject().getResourceId() == 303248)
-					System.out.println();
 				addDeletion(s);
 		}
 		for (Statement s : unreliableRight) {
@@ -298,7 +308,6 @@ public class GraphComparator {
 			
 			if (r1.equals(r2))
 				continue;
-			
 			if (processedResources.contains(r1))
 				continue;
 			processedResources.add(r1);
@@ -702,8 +711,19 @@ public class GraphComparator {
 				if (leftPath.getLength() != rightPath.getLength())
 					continue;
 				if (comparableResources.contains(leftPath.getEnd(), rightPath.getEnd())) {
-					map.map(leftPath, rightPath);
-					break;
+					boolean preds = true;
+					for (int i = 0; i < leftPath.getLength(); i++) {
+						Statement sl = leftPath.getStatements().get(i);
+						Statement sr = rightPath.getStatements().get(i);
+						if (!sl.getPredicate().equals(sr.getPredicate()) && !comparableResources.contains(sl.getPredicate(), sr.getPredicate())) {
+							preds = false;
+							break;
+						}
+					}
+					if (preds) {
+						map.map(leftPath, rightPath);
+						break;
+					}
 				}
 			}
 		}
@@ -778,7 +798,7 @@ public class GraphComparator {
 				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.");
 			} else {
 				if (DEBUG) System.out.println(left + " = " + right);
-				comparableResources.map(left, right);	
+				comparableResources.map(left, right);
 			}
 		}
 		
@@ -794,6 +814,31 @@ public class GraphComparator {
 		return out;
 	}
 	
+	public List<Statement> filterAssertedDuplicates(Resource r, List<Statement> in) throws DatabaseException {
+		List<Statement> out = new ArrayList<Statement>();
+		for (int i = 0; i < in.size(); i++) {
+			Statement s = in.get(i);
+			if (!s.isAsserted(r))
+				out.add(s);
+			else {
+				boolean has = false;
+				if (i > 1 && in.get(i-1).getPredicate().equals(s.getPredicate()))
+					has = true;
+				else if (i < in.size()-1 && in.get(i+1).getPredicate().equals(s.getPredicate()))
+					has = true;
+				if (!has)
+					out.add(s);
+			}
+			
+		}
+		for (Statement s : in) {
+			if (!s.isAsserted(r))
+				out.add(s);
+			
+		}
+		return out;
+	}
+	
 	
 
 	private String printStatement(ReadGraph graph, Statement s) throws DatabaseException {
@@ -1160,6 +1205,9 @@ public class GraphComparator {
 		ss1 = filterNonTested(ss1);
 		ss2 = filterNonTested(ss2);
 		sortStatement(ss1, ss2);
+		// getStatements(r1, b.HasProperty) returns both instance and asserted statements for the same property relation. 
+		ss1 = filterAssertedDuplicates(r1, ss1);
+		ss2 = filterAssertedDuplicates(r2, ss2);
 		
 		int i1 = 0; 
 		int i2 = 0;
@@ -1170,16 +1218,20 @@ public class GraphComparator {
 					break;
 				else {
 					while (i2 < ss2.size()) {
-						if (DEBUG) System.out.println("Compare Prop diff2 " + printStatement(g,ss2.get(i2)));
-						addAddition(ss2.get(i2));
+						Statement s = ss2.get(i2);
+						if (DEBUG) System.out.println("Compare Prop diff2 " + printStatement(g,s));
+						if (!s.isAsserted(r2))
+							addAddition(s);
 						i2++;
 					}
 					break;
 				}
 			} else if (i2 >= ss2.size()) {
 				while (i1 < ss1.size()) {
-					if (DEBUG) System.out.println("Compare Prop diff1 " + printStatement(g,ss1.get(i1)));
-					addDeletion(ss1.get(i1));
+					Statement s = ss1.get(i1);
+					if (DEBUG) System.out.println("Compare Prop diff1 " + printStatement(g,s));
+					if (!s.isAsserted(r1))
+						addDeletion(s);
 					i1++;
 				}
 				break;