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=1ae5ed2450b45e469cd57135140f37bb306bf211;hb=4399a40e11996b9a373f522af995a19a05493dd3;hp=dff6672b86820924f52f0906e6c658498916abb2;hpb=6f66967403916102ef5cb0d564cb357206fb3c69;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 dff6672..1ae5ed2 100644
--- a/org.simantics.interop/src/org/simantics/interop/test/GraphComparator.java
+++ b/org.simantics.interop/src/org/simantics/interop/test/GraphComparator.java
@@ -25,8 +25,8 @@ import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.Statement;
 import org.simantics.db.common.utils.NameUtils;
+import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.exception.DoesNotContainValueException;
-import org.simantics.db.exception.ManyObjectsForFunctionalRelationException;
 import org.simantics.db.exception.ServiceException;
 import org.simantics.db.exception.ValidationException;
 import org.simantics.layer0.Layer0;
@@ -48,10 +48,12 @@ import org.simantics.utils.datastructures.Pair;
  */
 public class GraphComparator {
 
-	
+	private Resource r1;
+	private Resource r2;
 	private List<Resource> traversed = new ArrayList<Resource>(); // list of relations that are traversed (and tested)
 	private List<Resource> tested = new ArrayList<Resource>();    // list of relations that are tested, but not traversed
 	private List<Resource> nonTraversed = new ArrayList<Resource>(); // list of relations that are not traversed
+	private List<Resource> nonTested = new ArrayList<Resource>(); // list of relations that are not tested
 	
 	private List<Statement> changes1 = new ArrayList<Statement>();
 	private List<Statement> changes2 = new ArrayList<Statement>();
@@ -60,21 +62,51 @@ public class GraphComparator {
 	private Set<Statement> changes2Set = new HashSet<Statement>();
 	private Set<Pair<Statement,Statement>> modificationsSet = new HashSet<Pair<Statement,Statement>>();
 
-	private BijectionMap<Statement, Statement> comparable = new BijectionMap<Statement, Statement>();
+	private BijectionMap<Statement, Statement> comparableStatements = new BijectionMap<Statement, Statement>();
+	private BijectionMap<Resource, Resource> comparableResources = new BijectionMap<Resource, Resource>();
+	
 	
+	private ObjectComparator comparator;
+	
+	private Comparator<Statement> scomp = new PredicateComparator();
+	private Comparator<Resource> rcomp = new ResourceComparator();
 	
 	// runtime attributes
 	
 	private ReadGraph g;
 	private Layer0 b;
 	
-	ArrayList<Resource> rs1 = new ArrayList<Resource>();
-	ArrayList<Resource> rs2 = new ArrayList<Resource>();
+	public GraphComparator(Resource r1, Resource r2) {
+		this.r1 = r1;
+		this.r2 = r2;
+		comparator = new TypeComparator();
+	}
+	
+	public GraphComparator(Resource r1, Resource r2, ObjectComparator comparator) {
+		this.r1 = r1;
+		this.r2 = r2;
+		this.comparator = comparator;
+	}
+	
 	ArrayList<Statement> ss1 = new ArrayList<Statement>();
 	ArrayList<Statement> ss2 = new ArrayList<Statement>();
-	Comparator<Statement> scomp = new PredicateComparator();
-	Comparator<Resource> rcomp = new ResourceComparator();
-
+	
+	
+	public Comparator<Resource> getResourceComparator() {
+		return rcomp;
+	}
+	
+	public Comparator<Statement> getStatementComparator() {
+		return scomp;
+	}
+	
+	public Resource getR1() {
+		return r1;
+	}
+	
+	public Resource getR2() {
+		return r2;
+	}
 	
 	public void addTraversed(Resource rel) {
 		traversed.add(rel);
@@ -100,33 +132,52 @@ public class GraphComparator {
 		tested.addAll(rels);
 	}
 	
+	public void addNonTested(Resource rel) {
+		nonTested.add(rel);
+	}
+	
+	public void addNonTested(Collection<Resource> rels) {
+		nonTested.addAll(rels);
+	}
+	
+	public void addComparableResources(Resource r1, Resource r2) {
+		comparableResources.map(r1, r2);
+	}
+	
+	public void addComparableResources(BijectionMap<Resource, Resource> matching) {
+		comparableResources.addAll(matching);
+	}
+	
 	public void clearRels() {
 		traversed.clear();
 		tested.clear();
+		nonTraversed.clear();
+		nonTested.clear();
 	}
 	
-	public void test(ReadGraph g, Resource r1, Resource r2) throws ServiceException, DoesNotContainValueException, ValidationException {
+	public void test(ReadGraph g) throws DatabaseException {
 		this.g = g;
 		this.b = Layer0.getInstance(g);
-		
-		changes1Set.clear();
-		changes2Set.clear();
-		modificationsSet.clear();
-		changes1.clear();
-		changes2.clear();
-		modifications.clear();
+		comparator.setComparator(this);
 		
 		Stack<Resource> stack1 = new Stack<Resource>();
 		Stack<Resource> stack2 = new Stack<Resource>();
 		stack1.push(r1);
 		stack2.push(r2);
 		
+		
 		List<Statement> ss1 = new ArrayList<Statement>();
 		List<Statement> ss2 = new ArrayList<Statement>();
 		
 		while (!stack1.isEmpty()) {
-			r1 = stack1.pop();
-			r2 = stack2.pop();
+			Resource r1 = stack1.pop();
+			Resource r2 = stack2.pop();
+		
+			if (comparableResources.contains(r1, r2)) {
+				System.out.println("already tested " + NameUtils.getSafeName(g, r1) + " " + NameUtils.getSafeName(g, r2));
+				continue;
+			}
+			comparableResources.map(r1, r2);
 			
 			System.out.println("test " + NameUtils.getSafeName(g, r1) + " " + NameUtils.getSafeName(g, r2));
 			compareProps(r1, r2);
@@ -138,8 +189,10 @@ public class GraphComparator {
 				ss2 = filterAsserted(r2, ss2);
 				ss1 = filterTraversed(ss1);
 				ss2 = filterTraversed(ss2);
+				ss1 = filterNonTested(ss1);
+				ss2 = filterNonTested(ss2);
 				
-				compareStatement(ss1, ss2, null, null);
+				compareStatements(ss1, ss2, null, null);
 				ss1.clear();
 				ss2.clear();
 			}
@@ -149,7 +202,7 @@ public class GraphComparator {
 				ss2.addAll(g.getStatements(r2, rel));
 				ss1 = filterAsserted(r1, ss1);
 				ss2 = filterAsserted(r2, ss2);
-				compareStatement(ss1, ss2, stack1, stack2);
+				compareStatements(ss1, ss2, stack1, stack2);
 				ss1.clear();
 				ss2.clear();
 			}
@@ -158,19 +211,12 @@ public class GraphComparator {
 	
 	
 	
-	public BijectionMap<Statement, Statement> getComparable() {
-		return comparable;
+	public BijectionMap<Statement, Statement> getComparableStatements() {
+		return comparableStatements;
 	}
 	
 	public GraphChanges getChanges() {
-//		List<Statement> deletions = new ArrayList<Statement>();
-//		List<Statement> additions = new ArrayList<Statement>();
-//		deletions.addAll(changes1);
-//		additions.addAll(changes2);
-//		Collections.sort(deletions, new FullStatementComparator());
-//		Collections.sort(additions, new FullStatementComparator());
-//		return new GraphChanges(deletions, additions, modifications);
-		return new GraphChanges(changes1,changes2,modifications);
+		return new GraphChanges(r1,r2,changes1,changes2,modifications,comparableResources);
 	}
 	
 	private List<Statement> filterAsserted(Resource r, Collection<Statement> in) throws ServiceException {
@@ -187,11 +233,21 @@ public class GraphComparator {
 		return NameUtils.getSafeName(graph, s.getSubject()) + " " + NameUtils.getSafeName(graph, s.getPredicate()) + " " + NameUtils.getSafeName(graph, s.getObject());
 	}
 	
-	private List<Statement> filterTraversed(Collection<Statement> in) throws ServiceException {
+	private List<Statement> filterTraversed(List<Statement> in) throws ServiceException {
+		return filter(traversed, in);
+	}
+	
+	private List<Statement> filterNonTested(List<Statement> in) throws ServiceException {
+		return filter(nonTested, in);
+	}
+	
+	private List<Statement> filter(Collection<Resource> toFilter, List<Statement> in) throws ServiceException {
+		if (toFilter.size() == 0)
+			return in;
 		List<Statement> out = new ArrayList<Statement>();
 		for (Statement s : in) {
 			boolean usable = true;
-			for (Resource r : traversed) {
+			for (Resource r : toFilter) {
 				if (g.isSubrelationOf(s.getPredicate(),r)) {
 					usable = false;
 					break;
@@ -228,9 +284,81 @@ public class GraphComparator {
 		}
 	}
 	
-	private void compareStatement(List<Statement> ss1, List<Statement> ss2, Stack<Resource> stack1, Stack<Resource> stack2) throws ServiceException, DoesNotContainValueException, ValidationException {
-		Collections.sort(ss1, scomp);
-		Collections.sort(ss2, scomp);
+	public void sortStatement(List<Statement> list1, List<Statement> list2) {
+		Collections.sort(list1,scomp);
+		Collections.sort(list2,scomp);
+		
+		List<Statement> sorted1 = new ArrayList<Statement>(list1.size());
+		List<Statement> sorted2 = new ArrayList<Statement>(list2.size());
+		sorted1.addAll(list1);
+		sorted2.addAll(list2);
+		
+		int ss1 = 0;
+		int ss2 = 0;
+		for (int i = 0; i < list1.size(); ) {
+			Statement s1 = list1.get(i);
+			int same1 = sameRel(list1, i);	
+			for (int j = 0; j < list2.size(); j++) {
+				Statement s2 = list2.get(j);
+				if (scomp.compare(s1, s2) == 0) {
+					int same2 = sameRel(list2, j);
+					copy(sorted1,ss1,list1,i,same1);
+					ss1 += same1;
+					copy(sorted2,ss2,list2,j,same2);
+					ss2 += same2;
+					break;
+				}
+			}
+			i+= same1;
+		}
+		if (ss1 < sorted1.size()) {
+			for (Statement s : list1) {
+				if (!sorted1.contains(s))
+					sorted1.add(s);
+			}
+		}
+		if (ss2 < sorted2.size()) {
+			for (Statement s : list2) {
+				if (!sorted2.contains(s))
+					sorted2.add(s);
+			}
+		}
+		
+		list1.clear();
+		list2.clear();
+		list1.addAll(sorted1);
+		list2.addAll(sorted2);
+	}
+	
+	public <T> void copy(List<T> to, int toIndex, List<T> from, int fromIndex, int amount) {
+		for (int i = 0; i <  amount; i++) {
+			to.set(toIndex + i, from.get(fromIndex+ i));
+		}
+	}
+	
+	public void sortResource(List<Resource> list1, List<Resource> list2) {
+		Collections.sort(list1,rcomp);
+		int js = 0;
+		for (int i = 0; i < list1.size(); i++) {
+			Resource s1 = list1.get(i);
+			for (int j = js; j < list2.size(); j++) {
+				Resource s2 = list2.get(j);
+				if (rcomp.compare(s1, s2) == 0) {
+					Resource t = list2.get(js);
+					list2.set(js, s2);
+					list2.set(j, t);
+					break;
+				}
+			}
+			js++;
+			
+		}
+	}
+	
+	private void compareStatements(List<Statement> ss1, List<Statement> ss2, Stack<Resource> stack1, Stack<Resource> stack2) throws DatabaseException {
+		sortStatement(ss1, ss2);
+//		Collections.sort(ss1, scomp);
+//		Collections.sort(ss2, scomp);
 		
 		int i1 = 0;
 		int i2 = 0;
@@ -241,7 +369,7 @@ public class GraphComparator {
 					break;
 				} else {
 					while (i2 < ss2.size()) {
-						System.out.println("Compare Statement diff2 " + printStatement(g,ss2.get(i2)));
+						System.out.println("Compare Statements diff2 " + printStatement(g,ss2.get(i2)));
 						
 						addAddition(ss2.get(i2));
 						i2++;
@@ -250,7 +378,7 @@ public class GraphComparator {
 				}
 			} else if (i2 >= ss2.size()) {
 				while (i1 < ss1.size()) {
-					System.out.println("Compare Statement diff1 " + printStatement(g,ss1.get(i1)));
+					System.out.println("Compare Statements diff1 " + printStatement(g,ss1.get(i1)));
 					addDeletion(ss1.get(i1));
 					i1++;
 				}
@@ -260,18 +388,18 @@ public class GraphComparator {
 			int same2 = sameRel(ss2, i2);
 			int c = rcomp.compare(ss1.get(i1).getPredicate(),ss2.get(i2).getPredicate());
 			if (c == 0) {
-				compareObject(ss1, i1, same1, ss2, i2, same2,stack1,stack2);
+				compareStatements(ss1, i1, same1, ss2, i2, same2,stack1,stack2);
 				i1+=same1;
 				i2+=same2;
 			} else if (c < 0) {
 				for (int i = 0; i < same1; i++) {
-					System.out.println("Compare Statement diff1 " + printStatement(g,ss1.get(i+i1)));
+					System.out.println("Compare Statements diff1 " + printStatement(g,ss1.get(i+i1)));
 					addDeletion(ss1.get(i+i1));
 				}
 				i1 += same1;
 			} else {
 				for (int i = 0; i < same2; i++) {
-					System.out.println("Compare Statement diff2 " + printStatement(g,ss2.get(i+i2)));
+					System.out.println("Compare Statements diff2 " + printStatement(g,ss2.get(i+i2)));
 					addAddition(ss2.get(i+i2));
 				}
 				
@@ -296,8 +424,13 @@ public class GraphComparator {
 		
 	}
 
+	private int compareObject(Resource o1, Resource o2) throws DatabaseException {
+		if (comparableResources.contains(o1, o2))
+			return (-1);
+		return comparator.compare(g, o1, o2);
+	}
 	
-	private void compareObject(List<Statement> ss1, int off1, int len1, List<Statement> ss2, int off2, int len2, Stack<Resource> stack1, Stack<Resource> stack2) throws ServiceException, DoesNotContainValueException, ValidationException {
+	private void compareStatements(List<Statement> ss1, int off1, int len1, List<Statement> ss2, int off2, int len2, Stack<Resource> stack1, Stack<Resource> stack2) throws DatabaseException {
 		boolean[] used1 = new boolean[len1];
 		for (int i = 0; i < used1.length; i++) {
 			used1[i] = false;
@@ -312,15 +445,10 @@ public class GraphComparator {
 		List<List<Integer>> differences = new ArrayList<List<Integer>>();
 		for (int i1 = off1; i1 < off1 + len1; i1++) {
 			Statement s1 = ss1.get(i1);
-			//Map<Integer,Integer> differences = new HashMap<Integer, Integer>();
 			List<Integer> diff = new ArrayList<Integer>();
 			for (int i2 = off2; i2 < off2 + len2; i2++) {
 				Statement s2 = ss2.get(i2);
-				if (!compareType(s1.getObject(), s2.getObject())) {
-					diff.add(Integer.MAX_VALUE);
-					continue;
-				}
-				diff.add(propsDiffCount(s1.getObject(), s2.getObject()));
+				diff.add(compareObject(s1.getObject(), s2.getObject()));
 			}
 			differences.add(diff);
 		}
@@ -350,9 +478,14 @@ public class GraphComparator {
 							continue;
 						used1[i1] = true;
 						used2[i2] = true;
+						Statement s1  = ss1.get(i1+off1);
+						Statement s2  = ss2.get(i2+off2);
+						
 						if (stack1 != null) {
-							stack1.add(ss1.get(i1+off1).getObject());
-							stack2.add(ss2.get(i2+off2).getObject());
+							
+								stack1.add(s1.getObject());
+								stack2.add(s2.getObject());
+							
 						} else {
 							// TODO : how should we report non traversed differences
 							// using compareProps assumes that referenced objects are the same (references are not different)
@@ -366,6 +499,8 @@ public class GraphComparator {
 //								modifies.add(new Pair<Statement, Statement>(ss1.get(i1+off1), ss2.get(i2+off2)));
 //							}
 						}
+						comparableStatements.map(s1, s2);
+						//comparableResources.map(s1.getObject(), s2.getObject());
 						break;
 					}
 				}
@@ -385,30 +520,7 @@ public class GraphComparator {
 		}
 	}
 	
-	private boolean compareType(Resource r1, Resource r2) throws ServiceException, ManyObjectsForFunctionalRelationException {
-		rs1.addAll(g.getObjects(r1, b.InstanceOf));
-		rs2.addAll(g.getObjects(r2, b.InstanceOf));
-		if (rs1.size() != rs2.size()) {
-			rs1.clear();
-			rs2.clear();
-			return false;
-		}
-		Collections.sort(rs1, rcomp);
-		Collections.sort(rs2, rcomp);
-		for (int i = 0; i < rs1.size(); i++) {
-			int c = rcomp.compare(rs1.get(i), rs2.get(i));
-			if (c != 0) {
-				rs1.clear();
-				rs2.clear();
-				return false;
-			}
-		}
-		
-		rs1.clear();
-		rs2.clear();
-		
-		return true;
-	}
+	
 	
 	/**
 	 * compares properties, assumes functional relations
@@ -423,8 +535,9 @@ public class GraphComparator {
 		ArrayList<Statement> ss2 = new ArrayList<Statement>();
 		ss1.addAll(g.getStatements(r1, b.HasProperty));
 		ss2.addAll(g.getStatements(r2, b.HasProperty));
-		Collections.sort(ss1, scomp);
-		Collections.sort(ss2, scomp);
+		sortStatement(ss1, ss2);
+//		Collections.sort(ss1, scomp);
+//		Collections.sort(ss2, scomp);
 		
 		int i1 = 0; 
 		int i2 = 0;
@@ -460,37 +573,19 @@ public class GraphComparator {
 					if (b1) {
 						Object v1 = g.getValue(s1.getObject());
 						Object v2 = g.getValue(s2.getObject());
-						boolean eq = false;
-						if (v1 instanceof Object[] && v2 instanceof Object[])
-							eq = Arrays.deepEquals((Object[])v1, (Object[])v2);
-						else if (v1 instanceof int[] && v2 instanceof int[]) 
-							eq = Arrays.equals((int[])v1, (int[])v2);
-						else if (v1 instanceof float[] && v2 instanceof float[]) 
-							eq = Arrays.equals((float[])v1, (float[])v2);
-						else if (v1 instanceof double[] && v2 instanceof double[]) 
-							eq = Arrays.equals((double[])v1, (double[])v2);
-						else if (v1 instanceof long[] && v2 instanceof long[]) 
-							eq = Arrays.equals((long[])v1, (long[])v2);
-						else if (v1 instanceof byte[] && v2 instanceof byte[]) 
-							eq = Arrays.equals((byte[])v1, (byte[])v2);
-						else if (v1 instanceof boolean[] && v2 instanceof boolean[]) 
-							eq = Arrays.equals((boolean[])v1, (boolean[])v2);
-						else
-							eq = v1.equals(v2);
+						boolean eq = compareValue(v1, v2);
 						if (!eq) {
-							//changes1.add(s1);
-							//changes2.add(s2);
 							addModification(s1, s2);
-							comparable.map(s1, s2);
+							comparableStatements.map(s1, s2);
+							comparableResources.map(s1.getObject(),s2.getObject());
 						}
 					} else {
 						compareProps(s1.getObject(), s2.getObject());
 					}
 				} else {
-					//changes1.add(s1);
-					//changes2.add(s2);
 					addModification(s1, s2);
-					comparable.map(s1, s2);
+					comparableStatements.map(s1, s2);
+					comparableResources.map(s1.getObject(),s2.getObject());
 				}
 				i1++;
 				i2++;
@@ -519,99 +614,24 @@ public class GraphComparator {
 		
 	}
 	
-	private int propsDiffCount(Resource r1, Resource r2) throws ServiceException, DoesNotContainValueException, ValidationException {
-		ArrayList<Statement> ss1 = new ArrayList<Statement>();
-		ArrayList<Statement> ss2 = new ArrayList<Statement>();
-		ss1.addAll(g.getStatements(r1, b.HasProperty));
-		ss2.addAll(g.getStatements(r2, b.HasProperty));
-		//System.out.println("Props count " + GraphUtils.getReadableName(g, r1) + " " + GraphUtils.getReadableName(g, r2));
-		Collections.sort(ss1, scomp);
-		Collections.sort(ss2, scomp);
-		
-		int count = 0;
-		
-		int i1 = 0; 
-		int i2 = 0;
-		
-		while (true) {
-			if (i1 >= ss1.size()) {
-				if (i2 >= ss2.size())
-					break;
-				else {
-					while (i2 < ss2.size()) {
-						count++;
-						i2++;
-					}
-					break;
-				}
-			} else if (i2 >= ss2.size()) {
-				while (i1 < ss1.size()) {
-					count++;
-					i1++;
-				}
-				break;
-			}
-			Statement s1 = ss1.get(i1);
-			Statement s2 = ss2.get(i2);
-			int c = scomp.compare(s1, s2);
-			switch (c) {
-				case 0:{
-					boolean b1 = g.hasValue(s1.getObject());
-					boolean b2 = g.hasValue(s2.getObject());
-					if (b1 == b2) {
-						if (b1) {
-							Object v1 = g.getValue(s1.getObject());
-							Object v2 = g.getValue(s2.getObject());
-							boolean eq = false;
-							if (v1 instanceof Object[] && v2 instanceof Object[])
-								eq = Arrays.deepEquals((Object[])v1, (Object[])v2);
-							else if (v1 instanceof int[] && v2 instanceof int[]) 
-								eq = Arrays.equals((int[])v1, (int[])v2);
-							else if (v1 instanceof float[] && v2 instanceof float[]) 
-								eq = Arrays.equals((float[])v1, (float[])v2);
-							else if (v1 instanceof double[] && v2 instanceof double[]) 
-								eq = Arrays.equals((double[])v1, (double[])v2);
-							else if (v1 instanceof long[] && v2 instanceof long[]) 
-								eq = Arrays.equals((long[])v1, (long[])v2);
-							else if (v1 instanceof byte[] && v2 instanceof byte[]) 
-								eq = Arrays.equals((byte[])v1, (byte[])v2);
-							else if (v1 instanceof boolean[] && v2 instanceof boolean[]) 
-								eq = Arrays.equals((boolean[])v1, (boolean[])v2);
-							else
-								eq = v1.equals(v2);
-							if (!eq) {
-								count++;
-							}
-							//System.out.println("Prop count values " + v1 + " " + v2);
-						} else {
-							count += propsDiffCount(s1.getObject(), s2.getObject());
-						}
-					} else {
-						//System.out.println("Props count structural vs literal");
-						count++;
-					}
-					i1++;
-					i2++;
-					break;
-				}
-				case -1:{
-					count++;
-					i1++;
-					break;
-				}
-					
-				case 1:{
-					count++;
-					i2++;
-					break;
-				}
-			}
-
-		}
-		
-		ss1.clear();
-		ss2.clear();
-		return count;
+	
+	public static boolean compareValue(Object v1, Object v2) {
+		if (v1 instanceof Object[] && v2 instanceof Object[])
+			return Arrays.deepEquals((Object[])v1, (Object[])v2);
+		else if (v1 instanceof int[] && v2 instanceof int[]) 
+			return Arrays.equals((int[])v1, (int[])v2);
+		else if (v1 instanceof float[] && v2 instanceof float[]) 
+			return Arrays.equals((float[])v1, (float[])v2);
+		else if (v1 instanceof double[] && v2 instanceof double[]) 
+			return Arrays.equals((double[])v1, (double[])v2);
+		else if (v1 instanceof long[] && v2 instanceof long[]) 
+			return  Arrays.equals((long[])v1, (long[])v2);
+		else if (v1 instanceof byte[] && v2 instanceof byte[]) 
+			return Arrays.equals((byte[])v1, (byte[])v2);
+		else if (v1 instanceof boolean[] && v2 instanceof boolean[]) 
+			return Arrays.equals((boolean[])v1, (boolean[])v2);
+		else
+			return v1.equals(v2);
 	}
 
 	
@@ -619,6 +639,8 @@ public class GraphComparator {
 	public class PredicateComparator implements Comparator<Statement> {
 		@Override
 		public int compare(Statement o1, Statement o2) {
+			if (comparableResources.contains(o1.getPredicate(), o2.getPredicate()))
+				return 0;
 			if (o1.getPredicate().getResourceId() < o2.getPredicate().getResourceId())
 				return -1;
 			if (o1.getPredicate().getResourceId() > o2.getPredicate().getResourceId())
@@ -627,7 +649,7 @@ public class GraphComparator {
 		}
 	}
 	
-	public class FullStatementComparator implements Comparator<Statement> {
+	public static class FullStatementComparator implements Comparator<Statement> {
 		@Override
 		public int compare(Statement o1, Statement o2) {
 			if (o1.getSubject().getResourceId() < o2.getSubject().getResourceId())
@@ -651,6 +673,8 @@ public class GraphComparator {
 	public class ResourceComparator implements Comparator<Resource> {
 		@Override
 		public int compare(Resource o1, Resource o2) {
+			if (comparableResources.contains(o1, o2))
+				return 0;
 			if (o1.getResourceId() < o2.getResourceId())
 				return -1;
 			if (o1.getResourceId() > o2.getResourceId())
@@ -658,4 +682,6 @@ public class GraphComparator {
 			return 0;
 		}
 	}
+	
+	
 }