X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.interop%2Fsrc%2Forg%2Fsimantics%2Finterop%2Ftest%2FGraphComparator.java;h=e529fbbed7cc50481dae1771fc54b0731f001f05;hb=65dc4008773b79bd9672956204512fb87edb4f23;hp=d9d26579899e8f3b9fe8e865c25b82a1880cafa2;hpb=7f68ba3a14669671b3fc6f79f4c190d467dd1413;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 d9d2657..e529fbb 100644
--- a/org.simantics.interop/src/org/simantics/interop/test/GraphComparator.java
+++ b/org.simantics.interop/src/org/simantics/interop/test/GraphComparator.java
@@ -16,20 +16,23 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.Stack;
 
 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;
-import org.simantics.layer0.utils.direct.GraphUtils;
 import org.simantics.utils.datastructures.BijectionMap;
 import org.simantics.utils.datastructures.MapList;
+import org.simantics.utils.datastructures.Pair;
 
 /**
  * Compares two subgraphs and reports differences.
@@ -45,26 +48,43 @@ import org.simantics.utils.datastructures.MapList;
  */
 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>();
-	private BijectionMap<Statement, Statement> comparable = new BijectionMap<Statement, Statement>();
+	private List<Pair<Statement,Statement>> modifications = new ArrayList<Pair<Statement,Statement>>();
+	private Set<Statement> changes1Set = new HashSet<Statement>();
+	private Set<Statement> changes2Set = new HashSet<Statement>();
+	private Set<Pair<Statement,Statement>> modificationsSet = new HashSet<Pair<Statement,Statement>>();
+
+	private BijectionMap<Statement, Statement> comparableStatements = new BijectionMap<Statement, Statement>();
+	private BijectionMap<Resource, Resource> comparableResources = new BijectionMap<Resource, Resource>();
 	
 	
+	private ObjectComparator comparator;
+	
 	// runtime attributes
 	
 	private ReadGraph g;
 	private Layer0 b;
 	
-	ArrayList<Resource> rs1 = new ArrayList<Resource>();
-	ArrayList<Resource> rs2 = new ArrayList<Resource>();
+	public GraphComparator() {
+		 comparator = new TypeComparator();
+	}
+	
+	public GraphComparator(ObjectComparator comparator) {
+		 this.comparator = comparator;
+	}
+	
 	ArrayList<Statement> ss1 = new ArrayList<Statement>();
 	ArrayList<Statement> ss2 = new ArrayList<Statement>();
-	Comparator<Statement> scomp = new StatementComparator();
+	
+	Comparator<Statement> scomp = new PredicateComparator();
 	Comparator<Resource> rcomp = new ResourceComparator();
 
 	
@@ -76,6 +96,14 @@ public class GraphComparator {
 		traversed.addAll(rels);
 	}
 	
+	public void addNonTraversed(Resource rel) {
+		nonTraversed.add(rel);
+	}
+	
+	public void addNonTraversed(Collection<Resource> rels) {
+		nonTraversed.addAll(rels);
+	}
+	
 	public void addTested(Resource rel) {
 		tested.add(rel);
 	}
@@ -84,38 +112,66 @@ 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 clearRels() {
 		traversed.clear();
 		tested.clear();
 	}
 	
-	public void test(ReadGraph g, Resource r1, Resource r2) throws ServiceException, DoesNotContainValueException, ValidationException {
+	public void test(ReadGraph g, Resource r1, Resource r2) throws DatabaseException {
 		this.g = g;
 		this.b = Layer0.getInstance(g);
 		
+		this.r1 = r1;
+		this.r2 = r2;
+		changes1Set.clear();
+		changes2Set.clear();
+		modificationsSet.clear();
 		changes1.clear();
 		changes2.clear();
+		modifications.clear();
+		comparableResources.clear();
 		
 		Stack<Resource> stack1 = new Stack<Resource>();
 		Stack<Resource> stack2 = new Stack<Resource>();
 		stack1.push(r1);
 		stack2.push(r2);
 		
-		ArrayList<Statement> ss1 = new ArrayList<Statement>();
-		ArrayList<Statement> ss2 = new ArrayList<Statement>();
+		
+		List<Statement> ss1 = new ArrayList<Statement>();
+		List<Statement> ss2 = new ArrayList<Statement>();
 		
 		while (!stack1.isEmpty()) {
 			r1 = stack1.pop();
 			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 " + GraphUtils.getReadableName(g, r1) + " " + GraphUtils.getReadableName(g, r2));
+			System.out.println("test " + NameUtils.getSafeName(g, r1) + " " + NameUtils.getSafeName(g, r2));
 			compareProps(r1, r2);
 			
 			for (Resource rel : tested) {
-				filterTraversed(g.getStatements(r1, rel), ss1);
-				filterTraversed(g.getStatements(r2, rel), ss2);
+				ss1.addAll(g.getStatements(r1, rel));
+				ss2.addAll(g.getStatements(r2, rel));
+				ss1 = filterAsserted(r1, ss1);
+				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();
 			}
@@ -123,29 +179,54 @@ public class GraphComparator {
 			for (Resource rel : traversed) {
 				ss1.addAll(g.getStatements(r1, rel));
 				ss2.addAll(g.getStatements(r2, rel));
-				compareStatement(ss1, ss2, stack1, stack2);
+				ss1 = filterAsserted(r1, ss1);
+				ss2 = filterAsserted(r2, ss2);
+				compareStatements(ss1, ss2, stack1, stack2);
 				ss1.clear();
 				ss2.clear();
 			}
 		}
  	}
 	
-	public Collection<Statement> getChanges1() {
-		return changes1;
+	
+	
+	public BijectionMap<Statement, Statement> getComparableStatements() {
+		return comparableStatements;
+	}
+	
+	public GraphChanges getChanges() {
+		return new GraphChanges(r1,r2,changes1,changes2,modifications);
+	}
+	
+	private List<Statement> filterAsserted(Resource r, Collection<Statement> in) throws ServiceException {
+		List<Statement> out = new ArrayList<Statement>();
+		for (Statement s : in) {
+			if (!s.isAsserted(r))
+				out.add(s);
+			
+		}
+		return out;
+	}
+	
+	private String printStatement(ReadGraph graph, Statement s) throws ValidationException, ServiceException {
+		return NameUtils.getSafeName(graph, s.getSubject()) + " " + NameUtils.getSafeName(graph, s.getPredicate()) + " " + NameUtils.getSafeName(graph, s.getObject());
 	}
 	
-	public Collection<Statement> getChanges2() {
-		return changes2;
+	private List<Statement> filterTraversed(List<Statement> in) throws ServiceException {
+		return filter(traversed, in);
 	}
 	
-	public BijectionMap<Statement, Statement> getComparable() {
-		return comparable;
+	private List<Statement> filterNonTested(List<Statement> in) throws ServiceException {
+		return filter(nonTested, in);
 	}
 	
-	private void filterTraversed(Collection<Statement> in, Collection<Statement> out) throws ServiceException {
+	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;
@@ -156,9 +237,33 @@ public class GraphComparator {
 			}
 			
 		}
+		return out;
 	}
 	
-	private void compareStatement(List<Statement> ss1, List<Statement> ss2, Stack<Resource> stack1, Stack<Resource> stack2) throws ServiceException, DoesNotContainValueException, ValidationException {
+	
+	private void addDeletion(Statement s) {
+		if (!changes1Set.contains(s)) {
+			changes1Set.add(s);
+			changes1.add(s);
+		}
+	}
+	
+	private void addAddition(Statement s) {
+		if (!changes2Set.contains(s)) {
+			changes2Set.add(s);
+			changes2.add(s);
+		}
+	}
+	
+	private void addModification(Statement s1, Statement s2) {
+		Pair<Statement, Statement> mod = new Pair<Statement, Statement>(s1,s2);
+		if (!modificationsSet.contains(mod)) {
+			modificationsSet.add(mod);
+			modifications.add(mod);
+		}
+	}
+	
+	private void compareStatements(List<Statement> ss1, List<Statement> ss2, Stack<Resource> stack1, Stack<Resource> stack2) throws DatabaseException {
 		Collections.sort(ss1, scomp);
 		Collections.sort(ss2, scomp);
 		
@@ -171,14 +276,17 @@ public class GraphComparator {
 					break;
 				} else {
 					while (i2 < ss2.size()) {
-						changes2.add(ss2.get(i2));
+						System.out.println("Compare Statement diff2 " + printStatement(g,ss2.get(i2)));
+						
+						addAddition(ss2.get(i2));
 						i2++;
 					}
 					break;
 				}
 			} else if (i2 >= ss2.size()) {
 				while (i1 < ss1.size()) {
-					changes1.add(ss1.get(i1));
+					System.out.println("Compare Statement diff1 " + printStatement(g,ss1.get(i1)));
+					addDeletion(ss1.get(i1));
 					i1++;
 				}
 				break;
@@ -187,18 +295,21 @@ 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++) {
-					changes1.add(ss1.get(i+i1));
+					System.out.println("Compare Statement diff1 " + printStatement(g,ss1.get(i+i1)));
+					addDeletion(ss1.get(i+i1));
 				}
 				i1 += same1;
-				} else {
-					for (int i = 0; i < same2; i++) {
-					changes2.add(ss2.get(i+i2));
+			} else {
+				for (int i = 0; i < same2; i++) {
+					System.out.println("Compare Statement diff2 " + printStatement(g,ss2.get(i+i2)));
+					addAddition(ss2.get(i+i2));
 				}
+				
 				i2 += same2;
 			}
 			
@@ -220,8 +331,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;
@@ -236,15 +352,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);
 		}
@@ -271,72 +382,62 @@ public class GraphComparator {
 				for (int i2 = 0; i2 < i2diff.size(); i2++) {
 					if (i2diff.get(i2) == pri) {
 						if (used2[i2])
-							break;
+							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)
 							// using propsDiffCount assumes that objects are different, and cannot report changes in referred object.
 							
-							//compareProps(ss1.get(i1+off1).getObject(), ss2.get(i2+off2).getObject());
-							int diff = propsDiffCount(ss1.get(i1+off1).getObject(), ss2.get(i2+off2).getObject());
-							if (diff != 0) {
-								changes1.add(ss1.get(i1+off1));
-								changes2.add(ss2.get(i2+off2));
-							}
+							
+//							int diff = propsDiffCount(ss1.get(i1+off1).getObject(), ss2.get(i2+off2).getObject());
+//							if (diff != 0) {
+//								//changes1.add(ss1.get(i1+off1));
+//								//changes2.add(ss2.get(i2+off2));
+//								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;
 					}
 				}
 			}
 		}
 		for (int i1 = off1; i1 < off1 + len1; i1++) {
-			if (!used1[i1-off1])
-				changes1.add(ss1.get(i1));
+			if (!used1[i1-off1]) {
+				System.out.println("Compare Object diff1 " + printStatement(g,ss1.get(i1)));
+				addDeletion(ss1.get(i1));
+			}
 		}
 		for (int i2 = off2; i2 < off2 + len2; i2++) {
-			if (!used2[i2-off2])
-				changes2.add(ss2.get(i2));
-		}
-	}
-	
-	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;
+			if (!used2[i2-off2]) {
+				System.out.println("Compare Object diff2 " + printStatement(g,ss2.get(i2)));
+				addAddition(ss2.get(i2));
 			}
 		}
-		
-		rs1.clear();
-		rs2.clear();
-		
-		return true;
 	}
 	
+	
+	
 	/**
 	 * compares properties, assumes functional relations
 	 * @param r1
 	 * @param r2
-	 * @throws ManyObjectsForFunctionalRelationException
 	 * @throws ServiceException
 	 * @throws DoesNotContainValueException
+	 * @throws ValidationException 
 	 */
-	private void compareProps(Resource r1, Resource r2) throws ManyObjectsForFunctionalRelationException, ServiceException, DoesNotContainValueException {
+	private void compareProps(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));
@@ -353,14 +454,16 @@ public class GraphComparator {
 					break;
 				else {
 					while (i2 < ss2.size()) {
-						changes2.add(ss2.get(i2));
+						System.out.println("Compare Prop diff2 " + printStatement(g,ss2.get(i2)));
+						addAddition(ss2.get(i2));
 						i2++;
 					}
 					break;
 				}
 			} else if (i2 >= ss2.size()) {
 				while (i1 < ss1.size()) {
-					changes1.add(ss1.get(i1));
+					System.out.println("Compare Prop diff1 " + printStatement(g,ss1.get(i1)));
+					addDeletion(ss1.get(i1));
 					i1++;
 				}
 				break;
@@ -376,36 +479,34 @@ 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
-							eq = v1.equals(v2);
+						boolean eq = compareValue(v1, v2);
 						if (!eq) {
-							changes1.add(s1);
-							changes2.add(s2);
-							comparable.map(s1, s2);
+							addModification(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);
-					comparable.map(s1, s2);
+					addModification(s1, s2);
+					comparableStatements.map(s1, s2);
+					comparableResources.map(s1.getObject(),s2.getObject());
 				}
 				i1++;
 				i2++;
 				break;
 			}
 			case -1:{
-				changes1.add(s1);
+				System.out.println("Compare Prop diff1s " + printStatement(g,s1));
+				addDeletion(s1);
 				i1++;
 				break;
 			}
 				
 			case 1:{
-				changes2.add(s2);
+				System.out.println("Compare Prop diff2s " + printStatement(g,s2));
+				addAddition(s2);
 				i2++;
 				break;
 			}
@@ -419,113 +520,70 @@ 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
-							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);
 	}
 
 	
 	
-	public class StatementComparator implements Comparator<Statement> {
+	public static class PredicateComparator implements Comparator<Statement> {
+		@Override
+		public int compare(Statement o1, Statement o2) {
+			if (o1.getPredicate().getResourceId() < o2.getPredicate().getResourceId())
+				return -1;
+			if (o1.getPredicate().getResourceId() > o2.getPredicate().getResourceId())
+				return 1;
+			return 0;
+		}
+	}
+	
+	public static class FullStatementComparator implements Comparator<Statement> {
 		@Override
 		public int compare(Statement o1, Statement o2) {
+			if (o1.getSubject().getResourceId() < o2.getSubject().getResourceId())
+				return -1;
+			if (o1.getSubject().getResourceId() > o2.getSubject().getResourceId())
+				return 1;
 			if (o1.getPredicate().getResourceId() < o2.getPredicate().getResourceId())
 				return -1;
 			if (o1.getPredicate().getResourceId() > o2.getPredicate().getResourceId())
 				return 1;
+			if (o1.getObject().getResourceId() < o2.getObject().getResourceId())
+				return -1;
+			if (o1.getObject().getResourceId() > o2.getObject().getResourceId())
+				return 1;
 			return 0;
 		}
 	}
 	
 
 	
-	public class ResourceComparator implements Comparator<Resource> {
+	public static class ResourceComparator implements Comparator<Resource> {
 		@Override
 		public int compare(Resource o1, Resource o2) {
 			if (o1.getResourceId() < o2.getResourceId())
 				return -1;
-			if (o2.getResourceId() > o2.getResourceId())
+			if (o1.getResourceId() > o2.getResourceId())
 				return 1;
 			return 0;
 		}
 	}
+	
+	
 }