]> gerrit.simantics Code Review - simantics/interop.git/blobdiff - org.simantics.interop/src/org/simantics/interop/test/GraphComparator.java
Comparator failed to process some of the statements when subject and object were...
[simantics/interop.git] / org.simantics.interop / src / org / simantics / interop / test / GraphComparator.java
index c84a8f9f540449f91f8a7ab7de50e86542499227..82b7bfbb2a136177db43fcc08a5dbb3faf20b817 100644 (file)
@@ -11,7 +11,6 @@
  *******************************************************************************/\r
 package org.simantics.interop.test;\r
 \r
-import java.math.MathContext;\r
 import java.util.ArrayList;\r
 import java.util.Arrays;\r
 import java.util.Collection;\r
@@ -30,6 +29,7 @@ import org.simantics.db.Statement;
 import org.simantics.db.common.utils.NameUtils;\r
 import org.simantics.db.exception.DatabaseException;\r
 import org.simantics.db.exception.DoesNotContainValueException;\r
+import org.simantics.db.exception.ManyObjectsForFunctionalRelationException;\r
 import org.simantics.db.exception.ServiceException;\r
 import org.simantics.db.exception.ValidationException;\r
 import org.simantics.layer0.Layer0;\r
@@ -53,6 +53,7 @@ public class GraphComparator {
 \r
        private Resource r1;\r
        private Resource r2;\r
+       private Set<Resource> strong = new HashSet<Resource>();       // List of relations that identify object, if subject is already identified. \r
        private List<Resource> traversed = new ArrayList<Resource>(); // list of relations that are traversed (and tested)\r
        private List<Resource> tested = new ArrayList<Resource>();    // list of relations that are tested, but not traversed\r
        private List<Resource> nonTraversed = new ArrayList<Resource>(); // list of relations that are not traversed\r
@@ -151,6 +152,14 @@ public class GraphComparator {
                comparableResources.addAll(matching);\r
        }\r
        \r
+       public void addStrong(Resource r) {\r
+               strong.add(r);\r
+       }\r
+       \r
+       public void addStrong(Collection<Resource> rels) {\r
+               strong.addAll(rels);\r
+       }\r
+       \r
        public void clearRels() {\r
                traversed.clear();\r
                tested.clear();\r
@@ -169,20 +178,59 @@ public class GraphComparator {
                objectsRight.push(r2);\r
                \r
                \r
+               \r
+               \r
+               Set<Statement> unreliableLeft = new HashSet<Statement>();\r
+               Set<Statement> unreliableRight = new HashSet<Statement>();\r
+               \r
+               while (true) {\r
+                       if (objectsLeft.isEmpty())\r
+                               break;\r
+                       \r
+                       \r
+                       // process compares objects that are identified and searches for more resources to process. \r
+                       process(objectsLeft, objectsRight, unreliableLeft, unreliableRight);\r
+                       // process unreliable handles cases where unidentified statements subject and object have been identified \r
+                       processUnreliable(unreliableLeft, unreliableRight);\r
+                       // process unreliable handles cases where unidentified resources have path of length one to identified resource\r
+                       processUnreliable(unreliableLeft, unreliableRight,objectsLeft,objectsRight);\r
+                       if (objectsLeft.isEmpty() && unreliableLeft.size() > 0 && unreliableRight.size() > 0) {\r
+                               // comparison is ending, but we have still unprocessed unidentified resources left.\r
+                               // These cases have longer path than one to identified objects.\r
+                               processUnreliableDeep(unreliableLeft, unreliableRight, objectsLeft, objectsRight);\r
+                       }\r
+                       \r
+               }\r
+               for (Statement s : unreliableLeft) {\r
+                       if (!comparableStatements.containsLeft(s))\r
+                               addDeletion(s);\r
+               }\r
+               for (Statement s : unreliableRight) {\r
+                       if (!comparableStatements.containsRight(s))\r
+                               addAddition(s);\r
+               }\r
+               \r
+               \r
+       }\r
+       \r
+       private void process(Stack<Resource> objectsLeft, Stack<Resource> objectsRight, Set<Statement> unreliableLeft, Set<Statement> unreliableRight) throws DatabaseException {\r
                List<Statement> ss1 = new ArrayList<Statement>();\r
                List<Statement> ss2 = new ArrayList<Statement>();\r
                \r
-               Stack<Statement> unreliableLeft = new Stack<Statement>();\r
-               Stack<Statement> unreliableRight = new Stack<Statement>();\r
-               \r
                while (!objectsLeft.isEmpty()) {\r
                        Resource r1 = objectsLeft.pop();\r
                        Resource r2 = objectsRight.pop();\r
+                       \r
+                       if (r1.equals(r2))\r
+                               continue;\r
                \r
                        if (comparableResources.contains(r1, r2)) {\r
                                //System.out.println("already tested " + NameUtils.getSafeName(g, r1) + " " + NameUtils.getSafeName(g, r2));\r
                                continue;\r
                        }\r
+                       if (comparableResources.containsLeft(r1) || comparableResources.containsRight(r2)) {\r
+                               throw new DatabaseException("Comparator error: Trying to map " + r1 + " to " + r2 + " while mappings " + r1 + " to " + comparableResources.getRight(r1) + " and " + comparableResources.getLeft(r2) + " to " + r2 + " exist.");\r
+                       }\r
                        comparableResources.map(r1, r2);\r
                        \r
                        //System.out.println("test " + NameUtils.getSafeName(g, r1) + " " + NameUtils.getSafeName(g, r2));\r
@@ -214,6 +262,52 @@ public class GraphComparator {
                                \r
                        }\r
                }\r
+       }\r
+       \r
+       private void processUnreliable(Set<Statement> unreliableLeft, Set<Statement> unreliableRight) {\r
+               MapList<Resource,Statement> subjectLeft = new MapList<Resource, Statement>();\r
+               MapList<Resource,Statement> subjectRight = new MapList<Resource, Statement>();\r
+               MapList<Resource,Statement> objectLeft = new MapList<Resource, Statement>();\r
+               MapList<Resource,Statement> objectRight = new MapList<Resource, Statement>();\r
+               \r
+               for (Statement s : unreliableLeft) {\r
+                       subjectLeft.add(s.getSubject(),s);\r
+                       objectLeft.add(s.getObject(),s);\r
+               }\r
+               for (Statement s : unreliableRight) {\r
+                       subjectRight.add(s.getSubject(),s);\r
+                       objectRight.add(s.getObject(),s);\r
+               }\r
+               \r
+               for (Resource left : subjectLeft.getKeys()) {\r
+                       if (!comparableResources.containsLeft(left))\r
+                               continue;\r
+                       Resource right = comparableResources.getRight(left);\r
+                       for (Statement leftS : subjectLeft.getValues(left)) {\r
+                               Resource leftO = leftS.getObject();\r
+                               if (!comparableResources.containsLeft(leftO)) \r
+                                       continue;\r
+                               if (!unreliableLeft.contains(leftS))\r
+                                       continue;\r
+                               Resource rightO = comparableResources.getRight(leftO);\r
+                               for (Statement rightS : subjectRight.getValues(right)) {\r
+                                       if (!rightS.getObject().equals(rightO))\r
+                                               continue;\r
+                                       if (!unreliableRight.contains(rightS))\r
+                                               continue;\r
+                                       if (leftS.getPredicate().equals(rightS.getPredicate()) ||\r
+                                               comparableResources.contains(leftS.getPredicate(), rightS.getPredicate())) {\r
+                                               unreliableLeft.remove(leftS);\r
+                                               unreliableRight.remove(rightS);\r
+                                               comparableStatements.map(leftS, rightS);\r
+                                       }\r
+                               }\r
+                       }\r
+                       \r
+               }\r
+       }\r
+       \r
+       private void processUnreliable(Set<Statement> unreliableLeft, Set<Statement> unreliableRight, Stack<Resource> objectsLeft, Stack<Resource> objectsRight) {\r
                MapList<Resource,Statement> subjectLeft = new MapList<Resource, Statement>();\r
                MapList<Resource,Statement> subjectRight = new MapList<Resource, Statement>();\r
                MapList<Resource,Statement> objectLeft = new MapList<Resource, Statement>();\r
@@ -308,29 +402,140 @@ public class GraphComparator {
                                List<Statement> right = matchingOR.getValues(or);\r
                                Pair<int[], int[]> indices = matchingStatements.get(or);\r
                                \r
-                               comparableResources.map(ol, or);\r
+                               //comparableResources.map(ol, or);\r
+                               objectsLeft.add(ol);\r
+                               objectsRight.add(or);\r
                                for (int l = 0; l < left.size(); l++) {\r
                                        int r = indices.first[l];\r
-                                       comparableStatements.map(left.get(l), right.get(r));\r
+                                       Statement sl = left.get(l);\r
+                                       Statement sr = right.get(r);\r
+                                       addComparable(sl, sr, true);\r
+                                       unreliableLeft.remove(sl);\r
+                                       unreliableRight.remove(sr);\r
                                }\r
                                \r
                        }\r
 \r
                }\r
                \r
+               \r
+       }\r
+       \r
+       private void processUnreliableDeep(Set<Statement> unreliableLeft, Set<Statement> unreliableRight, Stack<Resource> objectsLeft, Stack<Resource> objectsRight) throws ManyObjectsForFunctionalRelationException, ServiceException {\r
+               MapList<Resource,Statement> subjectLeft = new MapList<Resource, Statement>();\r
+               MapList<Resource,Statement> subjectRight = new MapList<Resource, Statement>();\r
+               MapList<Resource,Statement> objectLeft = new MapList<Resource, Statement>();\r
+               MapList<Resource,Statement> objectRight = new MapList<Resource, Statement>();\r
+               \r
                for (Statement s : unreliableLeft) {\r
-                       if (!comparableStatements.containsLeft(s))\r
-                               addDeletion(s);\r
+                       subjectLeft.add(s.getSubject(),s);\r
+                       objectLeft.add(s.getObject(),s);\r
                }\r
                for (Statement s : unreliableRight) {\r
-                       if (!comparableStatements.containsRight(s))\r
-                               addAddition(s);\r
+                       subjectRight.add(s.getSubject(),s);\r
+                       objectRight.add(s.getObject(),s);\r
+               }\r
+               for (Resource ol : objectLeft.getKeys()) {\r
+                       Set<Path> pathsLeft = new HashSet<Path>();\r
+                       for (Resource rel : traversed) {\r
+                               pathsLeft.addAll(Path.create(g.getStatements(ol, rel)));\r
+                       }\r
+                       while (true) {\r
+                               expand(pathsLeft);\r
+                               if (pathsLeft.size() == 0)\r
+                                       break;\r
+                               Collection<Path> endPaths = new ArrayList<Path>(1);\r
+                               for (Path p : pathsLeft) {\r
+                                       if (comparableResources.containsLeft(p.getEnd())) {\r
+                                               endPaths.add(p);\r
+                                       }\r
+                               }\r
+                               if (endPaths.size() > 0) {\r
+                                       pathsLeft.clear();\r
+                                       pathsLeft.addAll(endPaths);\r
+                                       break;\r
+                               }       \r
+                       }\r
+                       if (pathsLeft.size() > 0) {\r
+                               Resource sl = objectLeft.getValues(ol).get(0).getSubject();\r
+                               Resource sr = comparableResources.getRight(sl);\r
+                               Collection<Resource> possibleOR = new ArrayList<Resource>();\r
+                               for (Statement s : subjectRight.getValues(sr)) {\r
+                                       possibleOR.add(s.getObject());\r
+                               }\r
+                               Map<Resource,Set<Path>> matchingPaths = new HashMap<Resource, Set<Path>>();\r
+                               for (Resource or : possibleOR) {\r
+                                       Set<Path> possiblePathsRight = new HashSet<Path>();\r
+                                       for (Path leftPath : pathsLeft) {\r
+                                               possiblePathsRight.addAll(findComparableRight(leftPath, or));\r
+                                       }\r
+                                       if (possiblePathsRight.size() == pathsLeft.size()) {\r
+                                               matchingPaths.put(or, possiblePathsRight);\r
+                                       }\r
+                               }\r
+                               if (matchingPaths.size() > 0) {\r
+                                       if (matchingPaths.size() == 1) {\r
+                                               Resource or = matchingPaths.keySet().iterator().next();\r
+                                               objectsLeft.add(ol);\r
+                                               objectsRight.add(or);\r
+                                               Collection<Statement> statementsLeft = objectLeft.getValues(ol);\r
+                                               Collection<Statement> statementsRight = objectRight.getValues(or);\r
+                                               unreliableLeft.removeAll(statementsLeft);\r
+                                               unreliableRight.removeAll(statementsRight);\r
+                                               System.out.println();\r
+                                       } else {\r
+                                               System.out.println();\r
+                                       }\r
+                               }\r
+                       }\r
+                       \r
                }\r
                \r
+       }\r
+       \r
+       private void expand(Set<Path> paths) throws ManyObjectsForFunctionalRelationException, ServiceException {\r
+               Set<Path> stepPathsLeft = new HashSet<Path>();\r
+               if (paths.size() == 0)\r
+                       return;\r
+               int length = paths.iterator().next().getLength() + 1;\r
+               for (Path p : paths) {\r
+                       for (Resource rel : traversed) {\r
+                               stepPathsLeft.addAll(Path.expand(p,g.getStatements(p.getEnd(), rel)));\r
+                       }\r
+               }\r
+               paths.clear();\r
+               for (Path p : stepPathsLeft) {\r
+                       if (p.getLength() == length)\r
+                               paths.add(p);\r
+               }\r
+       }\r
+       \r
+       private Collection<Path> findComparableRight(Path leftPath, Resource beginRight) throws ManyObjectsForFunctionalRelationException, ServiceException {\r
+               Set<Path> rightPaths = new HashSet<Path>();\r
+               rightPaths.addAll(Path.create(g.getStatements(beginRight, getRight(leftPath.getStatements().get(0).getPredicate()))));\r
+               for (int i = 1; i < leftPath.getLength(); i++) {\r
+                       if (rightPaths.size() == 0)\r
+                               return rightPaths;\r
+                       Set<Path> stepPaths = new HashSet<Path>();\r
+                       for (Path p : rightPaths) {\r
+                               stepPaths.addAll(Path.expand(p, g.getStatements(p.getEnd(), getRight(leftPath.getStatements().get(i).getPredicate()))));\r
+                       }\r
+                       rightPaths.clear();\r
+                       for (Path p : stepPaths)\r
+                               if (p.getLength() == i+1) \r
+                                       rightPaths.add(p);\r
+               }\r
+               return rightPaths;\r
                \r
-       }\r
+       }\r
        \r
+       private Resource getRight(Resource r) {\r
+               if (comparableResources.containsLeft(r))\r
+                       return comparableResources.getRight(r);\r
+               return r;\r
+       }\r
        \r
+\r
        \r
        public BijectionMap<Statement, Statement> getComparableStatements() {\r
                return comparableStatements;\r
@@ -340,7 +545,14 @@ public class GraphComparator {
                return new GraphChanges(r1,r2,changes1,changes2,modifications,comparableResources);\r
        }\r
        \r
-       private List<Statement> filterAsserted(Resource r, Collection<Statement> in) throws ServiceException {\r
+       private void addComparable(Statement left, Statement right, boolean process) {\r
+               comparableStatements.map(left, right);\r
+               if (!process) {\r
+                       comparableResources.map(left.getObject(), right.getObject());\r
+               }\r
+       }\r
+       \r
+       public List<Statement> filterAsserted(Resource r, Collection<Statement> in) throws ServiceException {\r
                List<Statement> out = new ArrayList<Statement>();\r
                for (Statement s : in) {\r
                        if (!s.isAsserted(r))\r
@@ -349,7 +561,7 @@ public class GraphComparator {
                }\r
                return out;\r
        }\r
-       \r
+\r
        private String printStatement(ReadGraph graph, Statement s) throws ValidationException, ServiceException {\r
                return NameUtils.getSafeName(graph, s.getSubject()) + " " + NameUtils.getSafeName(graph, s.getPredicate()) + " " + NameUtils.getSafeName(graph, s.getObject());\r
        }\r
@@ -480,11 +692,10 @@ public class GraphComparator {
                                }\r
                        }\r
                        js++;\r
-                       \r
                }\r
        }\r
        \r
-       private void compareStatements(List<Statement> ss1, List<Statement> ss2, Stack<Resource> objectsLeft, Stack<Resource> objectsRight,Stack<Statement> unreliableLeft, Stack<Statement> unreliableRight) throws DatabaseException {\r
+       private void compareStatements(List<Statement> ss1, List<Statement> ss2, Stack<Resource> objectsLeft, Stack<Resource> objectsRight, Collection<Statement> unreliableLeft, Collection<Statement> unreliableRight) throws DatabaseException {\r
                sortStatement(ss1, ss2);\r
                \r
                int i1 = 0;\r
@@ -532,61 +743,10 @@ public class GraphComparator {
                                \r
                                i2 += same2;\r
                        }\r
-                       \r
                }\r
        }\r
        \r
-       private void compareUnreliableStatements(List<Statement> ss1, List<Statement> ss2) throws DatabaseException {\r
-               sortStatement(ss1, ss2);\r
-               \r
-               int i1 = 0;\r
-               int i2 = 0;\r
-               \r
-               while (true) {\r
-                       if (i1 >= ss1.size()) {\r
-                               if (i2 >= ss2.size()) {\r
-                                       break;\r
-                               } else {\r
-                                       while (i2 < ss2.size()) {\r
-                                               System.out.println("Compare Statements diff2 " + printStatement(g,ss2.get(i2)));\r
-                                               \r
-                                               addAddition(ss2.get(i2));\r
-                                               i2++;\r
-                                       }\r
-                                       break;\r
-                               }\r
-                       } else if (i2 >= ss2.size()) {\r
-                               while (i1 < ss1.size()) {\r
-                                       System.out.println("Compare Statements diff1 " + printStatement(g,ss1.get(i1)));\r
-                                       addDeletion(ss1.get(i1));\r
-                                       i1++;\r
-                               }\r
-                               break;\r
-                       }\r
-                       int same1 = sameRel(ss1, i1);\r
-                       int same2 = sameRel(ss2, i2);\r
-                       int c = rcomp.compare(ss1.get(i1).getPredicate(),ss2.get(i2).getPredicate());\r
-                       if (c == 0) {\r
-                               compareStatements(ss1, i1, same1, ss2, i2, same2,null, null, null, null);\r
-                               i1+=same1;\r
-                               i2+=same2;\r
-                       } else if (c < 0) {\r
-                               for (int i = 0; i < same1; i++) {\r
-                                       System.out.println("Compare Statements diff1 " + printStatement(g,ss1.get(i+i1)));\r
-                                       addDeletion(ss1.get(i+i1));\r
-                               }\r
-                               i1 += same1;\r
-                       } else {\r
-                               for (int i = 0; i < same2; i++) {\r
-                                       System.out.println("Compare Statements diff2 " + printStatement(g,ss2.get(i+i2)));\r
-                                       addAddition(ss2.get(i+i2));\r
-                               }\r
-                               \r
-                               i2 += same2;\r
-                       }\r
-                       \r
-               }\r
-       }\r
+\r
        \r
        private int sameRel(List<Statement> statements, int off) {\r
                if (statements.size() <= off)\r
@@ -604,6 +764,8 @@ public class GraphComparator {
        }\r
 \r
        private int compareObject(Resource o1, Resource o2) throws DatabaseException {\r
+               if (o1.equals(o2))\r
+                       return -1;\r
                if (comparableResources.contains(o1, o2))\r
                        return (-1);\r
                if (comparableResources.containsLeft(o1))\r
@@ -613,7 +775,7 @@ public class GraphComparator {
                return comparator.compare(g, o1, o2);\r
        }\r
        \r
-       private void compareStatements(List<Statement> ss1, int off1, int len1, List<Statement> ss2, int off2, int len2, Stack<Resource> objectsLeft, Stack<Resource> objectsRight, Stack<Statement> unreliableLeft, Stack<Statement> unreliableRight) throws DatabaseException {\r
+       private void compareStatements(List<Statement> ss1, int off1, int len1, List<Statement> ss2, int off2, int len2, Collection<Resource> objectsLeft, Collection<Resource> objectsRight, Collection<Statement> unreliableLeft, Collection<Statement> unreliableRight) throws DatabaseException {\r
                boolean[] used1 = new boolean[len1];\r
                for (int i = 0; i < used1.length; i++) {\r
                        used1[i] = false;\r
@@ -632,6 +794,14 @@ public class GraphComparator {
                        for (int i2 = off2; i2 < off2 + len2; i2++) {\r
                                Statement s2 = ss2.get(i2);\r
                                int d = compareObject(s1.getObject(), s2.getObject());\r
+                               if (d == 0) {\r
+                                       for (Resource t : strong) {\r
+                                                if (s1.getPredicate().equals(t) || g.isSubrelationOf(s1.getPredicate(), t)) {\r
+                                                        d = 1;\r
+                                                        break;\r
+                                                }\r
+                                       }\r
+                               }\r
                                diff.add(d);\r
                        }\r
                        differences.add(diff);\r
@@ -652,28 +822,7 @@ public class GraphComparator {
                        if (pri == Integer.MAX_VALUE) {\r
 \r
                        } else if (pri == 0) {\r
-                               Set<Statement> s1s = new HashSet<Statement>();\r
-                               Set<Statement> s2s = new HashSet<Statement>();\r
-                               List<Integer> i1s = priorities.getValues(pri);\r
-                               for (Integer i1 : i1s) {\r
-\r
-                                       List<Integer> i2diff = differences.get(i1);\r
-                                       for (int i2 = 0; i2 < i2diff.size(); i2++) {\r
-                                               if (i2diff.get(i2) == pri) {\r
-                                                       used1[i1] = true;\r
-                                                       used2[i2] = true;\r
-                                                       Statement s1  = ss1.get(i1+off1);\r
-                                                       Statement s2  = ss2.get(i2+off2);\r
-                                                       s1s.add(s1);\r
-                                                       s2s.add(s2);\r
-                                               }\r
-                                       }\r
-                               }\r
-                               if (unreliableLeft != null) {\r
-                                       unreliableLeft.addAll(s1s);\r
-                                       unreliableRight.addAll(s2s);\r
-                               }\r
-                               continue;\r
+                               \r
                        } else {\r
                                List<Integer> i1s = priorities.getValues(pri);\r
                                for (Integer i1 : i1s) {\r
@@ -690,19 +839,52 @@ public class GraphComparator {
                                                        Statement s2  = ss2.get(i2+off2);\r
                                                        \r
                                                        if (objectsLeft != null) {\r
-                                                               \r
-                                                                       objectsLeft.add(s1.getObject());\r
-                                                                       objectsRight.add(s2.getObject());\r
-                                                               \r
+                                                               objectsLeft.add(s1.getObject());\r
+                                                               objectsRight.add(s2.getObject());\r
                                                        } \r
-                                                       comparableStatements.map(s1, s2);\r
-                                                       //comparableResources.map(s1.getObject(), s2.getObject());\r
+                                                       addComparable(s1, s2, true);\r
                                                        break;\r
                                                }\r
                                        }\r
                                }\r
                        }\r
                }\r
+               \r
+               for (Integer pri : pris) {\r
+                       if (pri != 0)\r
+                               continue;\r
+                       Set<Statement> s1s = new HashSet<Statement>();\r
+                       Set<Statement> s2s = new HashSet<Statement>();\r
+                       Set<Integer> s1i = new HashSet<Integer>();\r
+                       Set<Integer> s2i = new HashSet<Integer>();\r
+                       List<Integer> i1s = priorities.getValues(pri);\r
+                       for (Integer i1 : i1s) {\r
+                               if (used1[i1])\r
+                                       continue;\r
+                               List<Integer> i2diff = differences.get(i1);\r
+                               for (int i2 = 0; i2 < i2diff.size(); i2++) {\r
+                                       if (i2diff.get(i2) == pri) {\r
+                                               if (used2[i2])\r
+                                                       continue;\r
+                                               Statement s1  = ss1.get(i1+off1);\r
+                                               Statement s2  = ss2.get(i2+off2);\r
+                                               s1s.add(s1);\r
+                                               s2s.add(s2);\r
+                                               s1i.add(i1);\r
+                                               s2i.add(i2);\r
+                                       }\r
+                               }\r
+                       }\r
+                       if (unreliableLeft != null) {\r
+                               unreliableLeft.addAll(s1s);\r
+                               unreliableRight.addAll(s2s);\r
+                       }\r
+                       for (Integer i : s1i)\r
+                               used1[i] = true;\r
+                       for (Integer i : s2i)\r
+                               used2[i] = true;\r
+\r
+               }\r
                for (int i1 = off1; i1 < off1 + len1; i1++) {\r
                        if (!used1[i1-off1]) {\r
                                System.out.println("Compare Object diff1 " + printStatement(g,ss1.get(i1)));\r
@@ -733,8 +915,6 @@ public class GraphComparator {
                ss1.addAll(g.getStatements(r1, b.HasProperty));\r
                ss2.addAll(g.getStatements(r2, b.HasProperty));\r
                sortStatement(ss1, ss2);\r
-//             Collections.sort(ss1, scomp);\r
-//             Collections.sort(ss2, scomp);\r
                \r
                int i1 = 0; \r
                int i2 = 0;\r
@@ -763,47 +943,44 @@ public class GraphComparator {
                        Statement s2 = ss2.get(i2);\r
                        int c = scomp.compare(s1, s2);\r
                        switch (c) {\r
-                       case 0:{\r
-                               boolean b1 = g.hasValue(s1.getObject());\r
-                               boolean b2 = g.hasValue(s2.getObject());\r
-                               if (b1 == b2) {\r
-                                       if (b1) {\r
-                                               Object v1 = g.getValue(s1.getObject());\r
-                                               Object v2 = g.getValue(s2.getObject());\r
-                                               boolean eq = compareValue(v1, v2);\r
-                                               if (!eq) {\r
-                                                       addModification(s1, s2);\r
-                                                       comparableStatements.map(s1, s2);\r
-                                                       comparableResources.map(s1.getObject(),s2.getObject());\r
+                               case 0:{\r
+                                       boolean b1 = g.hasValue(s1.getObject());\r
+                                       boolean b2 = g.hasValue(s2.getObject());\r
+                                       if (b1 == b2) {\r
+                                               if (b1) {\r
+                                                       Object v1 = g.getValue(s1.getObject());\r
+                                                       Object v2 = g.getValue(s2.getObject());\r
+                                                       boolean eq = compareValue(v1, v2);\r
+                                                       if (!eq) {\r
+                                                               addModification(s1, s2);\r
+                                                               addComparable(s1, s2, false);\r
+                                                       }\r
+                                               } else {\r
+                                                       compareProps(s1.getObject(), s2.getObject());\r
                                                }\r
                                        } else {\r
-                                               compareProps(s1.getObject(), s2.getObject());\r
+                                               addModification(s1, s2);\r
+                                               addComparable(s1, s2, false);\r
                                        }\r
-                               } else {\r
-                                       addModification(s1, s2);\r
-                                       comparableStatements.map(s1, s2);\r
-                                       comparableResources.map(s1.getObject(),s2.getObject());\r
+                                       i1++;\r
+                                       i2++;\r
+                                       break;\r
+                               }\r
+                               case -1:{\r
+                                       System.out.println("Compare Prop diff1s " + printStatement(g,s1));\r
+                                       addDeletion(s1);\r
+                                       i1++;\r
+                                       break;\r
+                               }\r
+                                       \r
+                               case 1:{\r
+                                       System.out.println("Compare Prop diff2s " + printStatement(g,s2));\r
+                                       addAddition(s2);\r
+                                       i2++;\r
+                                       break;\r
                                }\r
-                               i1++;\r
-                               i2++;\r
-                               break;\r
-                       }\r
-                       case -1:{\r
-                               System.out.println("Compare Prop diff1s " + printStatement(g,s1));\r
-                               addDeletion(s1);\r
-                               i1++;\r
-                               break;\r
-                       }\r
-                               \r
-                       case 1:{\r
-                               System.out.println("Compare Prop diff2s " + printStatement(g,s2));\r
-                               addAddition(s2);\r
-                               i2++;\r
-                               break;\r
-                       }\r
                        }\r
-                       \r
-                       \r
+\r
                }\r
                \r
                ss1.clear();\r
@@ -811,7 +988,6 @@ public class GraphComparator {
                \r
        }\r
        \r
-       \r
        public static boolean compareValue(Object v1, Object v2) {\r
                if (v1 instanceof Object[] && v2 instanceof Object[])\r
                        return Arrays.deepEquals((Object[])v1, (Object[])v2);\r
@@ -832,7 +1008,6 @@ public class GraphComparator {
        }\r
 \r
        \r
-       \r
        public class PredicateComparator implements Comparator<Statement> {\r
                @Override\r
                public int compare(Statement o1, Statement o2) {\r
@@ -891,8 +1066,6 @@ public class GraphComparator {
                }\r
        }\r
        \r
-\r
-       \r
        public class ResComparator implements Comparator<Resource> {\r
                @Override\r
                public int compare(Resource o1, Resource o2) {\r
@@ -905,6 +1078,5 @@ public class GraphComparator {
                        return 0;\r
                }\r
        }\r
-       \r
-       \r
+\r
 }\r