X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.interop%2Fsrc%2Forg%2Fsimantics%2Finterop%2Ftest%2FGraphComparator.java;h=82b7bfbb2a136177db43fcc08a5dbb3faf20b817;hb=a51a513af1e519f4317b425529e8fb9bb35e3935;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..82b7bfb 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,26 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; import java.util.List; +import java.util.Map; +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,28 +51,66 @@ import org.simantics.utils.datastructures.MapList; */ public class GraphComparator { - + private Resource r1; + private Resource r2; + private Set strong = new HashSet(); // List of relations that identify object, if subject is already identified. private List traversed = new ArrayList(); // list of relations that are traversed (and tested) private List tested = new ArrayList(); // list of relations that are tested, but not traversed - + private List nonTraversed = new ArrayList(); // list of relations that are not traversed + private List nonTested = new ArrayList(); // list of relations that are not tested private List changes1 = new ArrayList(); private List changes2 = new ArrayList(); - private BijectionMap comparable = new BijectionMap(); + private List> modifications = new ArrayList>(); + private Set changes1Set = new HashSet(); + private Set changes2Set = new HashSet(); + private Set> modificationsSet = new HashSet>(); + + private BijectionMap comparableStatements = new BijectionMap(); + private BijectionMap comparableResources = new BijectionMap(); + private ResourceComparator comparator; + + private Comparator scomp = new PredicateComparator(); + private Comparator rcomp = new ResComparator(); + // runtime attributes private ReadGraph g; private Layer0 b; - ArrayList rs1 = new ArrayList(); - ArrayList rs2 = new ArrayList(); + public GraphComparator(Resource r1, Resource r2) { + this.r1 = r1; + this.r2 = r2; + comparator = new TypeComparator(); + } + + public GraphComparator(Resource r1, Resource r2, ResourceComparator comparator) { + this.r1 = r1; + this.r2 = r2; + this.comparator = comparator; + } + ArrayList ss1 = new ArrayList(); ArrayList ss2 = new ArrayList(); - Comparator scomp = new StatementComparator(); - Comparator rcomp = new ResourceComparator(); - + + + public Comparator getResourceComparator() { + return rcomp; + } + + public Comparator getStatementComparator() { + return scomp; + } + + public Resource getR1() { + return r1; + } + + public Resource getR2() { + return r2; + } public void addTraversed(Resource rel) { traversed.add(rel); @@ -76,6 +120,14 @@ public class GraphComparator { traversed.addAll(rels); } + public void addNonTraversed(Resource rel) { + nonTraversed.add(rel); + } + + public void addNonTraversed(Collection rels) { + nonTraversed.addAll(rels); + } + public void addTested(Resource rel) { tested.add(rel); } @@ -84,38 +136,117 @@ public class GraphComparator { tested.addAll(rels); } + public void addNonTested(Resource rel) { + nonTested.add(rel); + } + + public void addNonTested(Collection rels) { + nonTested.addAll(rels); + } + + public void addComparableResources(Resource r1, Resource r2) { + comparableResources.map(r1, r2); + } + + public void addComparableResources(BijectionMap matching) { + comparableResources.addAll(matching); + } + + public void addStrong(Resource r) { + strong.add(r); + } + + public void addStrong(Collection rels) { + strong.addAll(rels); + } + 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); + comparator.setComparator(this); - changes1.clear(); - changes2.clear(); + Stack objectsLeft = new Stack(); + Stack objectsRight = new Stack(); + objectsLeft.push(r1); + objectsRight.push(r2); - Stack stack1 = new Stack(); - Stack stack2 = new Stack(); - stack1.push(r1); - stack2.push(r2); - ArrayList ss1 = new ArrayList(); - ArrayList ss2 = new ArrayList(); - while (!stack1.isEmpty()) { - r1 = stack1.pop(); - r2 = stack2.pop(); + + Set unreliableLeft = new HashSet(); + Set unreliableRight = new HashSet(); + + while (true) { + if (objectsLeft.isEmpty()) + break; + + + // process compares objects that are identified and searches for more resources to process. + process(objectsLeft, objectsRight, unreliableLeft, unreliableRight); + // process unreliable handles cases where unidentified statements subject and object have been identified + processUnreliable(unreliableLeft, unreliableRight); + // process unreliable handles cases where unidentified resources have path of length one to identified resource + processUnreliable(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); + } + + } + for (Statement s : unreliableLeft) { + if (!comparableStatements.containsLeft(s)) + addDeletion(s); + } + for (Statement s : unreliableRight) { + if (!comparableStatements.containsRight(s)) + addAddition(s); + } + + + } + + private void process(Stack objectsLeft, Stack objectsRight, Set unreliableLeft, Set unreliableRight) throws DatabaseException { + List ss1 = new ArrayList(); + List ss2 = new ArrayList(); + + while (!objectsLeft.isEmpty()) { + Resource r1 = objectsLeft.pop(); + Resource r2 = objectsRight.pop(); + + if (r1.equals(r2)) + continue; + + if (comparableResources.contains(r1, r2)) { + //System.out.println("already tested " + NameUtils.getSafeName(g, r1) + " " + NameUtils.getSafeName(g, r2)); + continue; + } + if (comparableResources.containsLeft(r1) || comparableResources.containsRight(r2)) { + 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."); + } + 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,null,null); ss1.clear(); ss2.clear(); } @@ -123,29 +254,333 @@ 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, objectsLeft, objectsRight,unreliableLeft,unreliableRight); ss1.clear(); ss2.clear(); + } } - } + } + + private void processUnreliable(Set unreliableLeft, Set unreliableRight) { + MapList subjectLeft = new MapList(); + MapList subjectRight = new MapList(); + MapList objectLeft = new MapList(); + MapList objectRight = new MapList(); + + for (Statement s : unreliableLeft) { + subjectLeft.add(s.getSubject(),s); + objectLeft.add(s.getObject(),s); + } + for (Statement s : unreliableRight) { + subjectRight.add(s.getSubject(),s); + objectRight.add(s.getObject(),s); + } + + for (Resource left : subjectLeft.getKeys()) { + if (!comparableResources.containsLeft(left)) + continue; + Resource right = comparableResources.getRight(left); + for (Statement leftS : subjectLeft.getValues(left)) { + Resource leftO = leftS.getObject(); + if (!comparableResources.containsLeft(leftO)) + continue; + if (!unreliableLeft.contains(leftS)) + continue; + Resource rightO = comparableResources.getRight(leftO); + for (Statement rightS : subjectRight.getValues(right)) { + if (!rightS.getObject().equals(rightO)) + continue; + if (!unreliableRight.contains(rightS)) + continue; + if (leftS.getPredicate().equals(rightS.getPredicate()) || + comparableResources.contains(leftS.getPredicate(), rightS.getPredicate())) { + unreliableLeft.remove(leftS); + unreliableRight.remove(rightS); + comparableStatements.map(leftS, rightS); + } + } + } + + } + } + + private void processUnreliable(Set unreliableLeft, Set unreliableRight, Stack objectsLeft, Stack objectsRight) { + MapList subjectLeft = new MapList(); + MapList subjectRight = new MapList(); + MapList objectLeft = new MapList(); + MapList objectRight = new MapList(); + + for (Statement s : unreliableLeft) { + subjectLeft.add(s.getSubject(),s); + objectLeft.add(s.getObject(),s); + } + for (Statement s : unreliableRight) { + subjectRight.add(s.getSubject(),s); + objectRight.add(s.getObject(),s); + } + + for (Resource ol : objectLeft.getKeys()) { + + // all statements to the left side object + List left = objectLeft.getValues(ol); + // all subjects that have statements to the left side object (ol) + Set sLeft = new HashSet(); + // all matching subjects on the right side + Set sRight = new HashSet(); + for (Statement s : left) { + sLeft.add(s.getSubject()); + sRight.add(comparableResources.getRight(s.getSubject())); + } + // all objects that subjects on the right side point to. Object left has its matching resource among these, if it has matching resource + MapList possibleOR = new MapList(); + for (Resource sr : sRight) { + for (Statement s : subjectRight.getValues(sr)) + possibleOR.add(s.getObject(),s); + } + + // filter possible right side objects to those that have same amount of statements as the left side object + for (Resource or : possibleOR.getKeys().toArray(new Resource[possibleOR.getKeys().size()])) { + List right = possibleOR.getValues(or); + if (right.size() != left.size()) + possibleOR.remove(or); + + } + + // check for matching statements (comparable subjects, matching predicates) + MapList matchingOR = new MapList(); // list of objects that have matching statements + Map> matchingStatements = new HashMap>(); // matching statements + for (Resource or : possibleOR.getKeys()) { + List right = possibleOR.getValues(or); + int iLeft[] = new int[left.size()]; + int iRight[] = new int[right.size()]; + + for (int i = 0; i < left.size(); i++) { + iLeft[i] = -1; + iRight[i] = -1; + } + + for (int l = 0; l < left.size(); l++) { + Statement ls = left.get(l); + for (int r = 0; r < right.size(); r++) { + if (iRight[r] >= 0) + continue; + Statement rs = right.get(r); + if (!comparableResources.contains(ls.getSubject(), rs.getSubject())) + continue; + if (rcomp.compare(ls.getPredicate(),rs.getPredicate()) == 0) { + iLeft[l] = r; + iRight[r] = l; + break; + } + } + + } + boolean success = true; + for (int i = 0; i < left.size(); i++) { + if (iLeft[i] < 0) { + success = false; + break; + } + if (iRight[i] < 0) { + success = false; + break; + } + + } + if (success) { + for (Statement s : right) + matchingOR.add(or,s); + matchingStatements.put(or, new Pair(iLeft, iRight)); + } + } + // if there is only one matching right side object, we have found a match + if (matchingOR.getKeySize() == 1) { + Resource or = matchingOR.getKeys().iterator().next(); + List right = matchingOR.getValues(or); + Pair indices = matchingStatements.get(or); + + //comparableResources.map(ol, or); + objectsLeft.add(ol); + objectsRight.add(or); + for (int l = 0; l < left.size(); l++) { + int r = indices.first[l]; + Statement sl = left.get(l); + Statement sr = right.get(r); + addComparable(sl, sr, true); + unreliableLeft.remove(sl); + unreliableRight.remove(sr); + } + + } + + } + + + } + + private void processUnreliableDeep(Set unreliableLeft, Set unreliableRight, Stack objectsLeft, Stack objectsRight) throws ManyObjectsForFunctionalRelationException, ServiceException { + MapList subjectLeft = new MapList(); + MapList subjectRight = new MapList(); + MapList objectLeft = new MapList(); + MapList objectRight = new MapList(); + + for (Statement s : unreliableLeft) { + subjectLeft.add(s.getSubject(),s); + objectLeft.add(s.getObject(),s); + } + for (Statement s : unreliableRight) { + subjectRight.add(s.getSubject(),s); + objectRight.add(s.getObject(),s); + } + for (Resource ol : objectLeft.getKeys()) { + Set pathsLeft = new HashSet(); + for (Resource rel : traversed) { + pathsLeft.addAll(Path.create(g.getStatements(ol, rel))); + } + while (true) { + expand(pathsLeft); + if (pathsLeft.size() == 0) + break; + Collection endPaths = new ArrayList(1); + for (Path p : pathsLeft) { + if (comparableResources.containsLeft(p.getEnd())) { + endPaths.add(p); + } + } + if (endPaths.size() > 0) { + pathsLeft.clear(); + pathsLeft.addAll(endPaths); + break; + } + } + if (pathsLeft.size() > 0) { + Resource sl = objectLeft.getValues(ol).get(0).getSubject(); + Resource sr = comparableResources.getRight(sl); + Collection possibleOR = new ArrayList(); + for (Statement s : subjectRight.getValues(sr)) { + possibleOR.add(s.getObject()); + } + Map> matchingPaths = new HashMap>(); + for (Resource or : possibleOR) { + Set possiblePathsRight = new HashSet(); + for (Path leftPath : pathsLeft) { + possiblePathsRight.addAll(findComparableRight(leftPath, or)); + } + if (possiblePathsRight.size() == pathsLeft.size()) { + matchingPaths.put(or, possiblePathsRight); + } + } + if (matchingPaths.size() > 0) { + if (matchingPaths.size() == 1) { + Resource or = matchingPaths.keySet().iterator().next(); + objectsLeft.add(ol); + objectsRight.add(or); + Collection statementsLeft = objectLeft.getValues(ol); + Collection statementsRight = objectRight.getValues(or); + unreliableLeft.removeAll(statementsLeft); + unreliableRight.removeAll(statementsRight); + System.out.println(); + } else { + System.out.println(); + } + } + } + + } + + } - public Collection getChanges1() { - return changes1; + private void expand(Set paths) throws ManyObjectsForFunctionalRelationException, ServiceException { + Set stepPathsLeft = new HashSet(); + if (paths.size() == 0) + return; + int length = paths.iterator().next().getLength() + 1; + for (Path p : paths) { + for (Resource rel : traversed) { + stepPathsLeft.addAll(Path.expand(p,g.getStatements(p.getEnd(), rel))); + } + } + paths.clear(); + for (Path p : stepPathsLeft) { + if (p.getLength() == length) + paths.add(p); + } + } + + private Collection findComparableRight(Path leftPath, Resource beginRight) throws ManyObjectsForFunctionalRelationException, ServiceException { + Set rightPaths = new HashSet(); + rightPaths.addAll(Path.create(g.getStatements(beginRight, getRight(leftPath.getStatements().get(0).getPredicate())))); + for (int i = 1; i < leftPath.getLength(); i++) { + if (rightPaths.size() == 0) + return rightPaths; + Set stepPaths = new HashSet(); + for (Path p : rightPaths) { + stepPaths.addAll(Path.expand(p, g.getStatements(p.getEnd(), getRight(leftPath.getStatements().get(i).getPredicate())))); + } + rightPaths.clear(); + for (Path p : stepPaths) + if (p.getLength() == i+1) + rightPaths.add(p); + } + return rightPaths; + } - public Collection getChanges2() { - return changes2; + private Resource getRight(Resource r) { + if (comparableResources.containsLeft(r)) + return comparableResources.getRight(r); + return r; } - public BijectionMap getComparable() { - return comparable; + + + public BijectionMap getComparableStatements() { + return comparableStatements; } - private void filterTraversed(Collection in, Collection out) throws ServiceException { + public GraphChanges getChanges() { + return new GraphChanges(r1,r2,changes1,changes2,modifications,comparableResources); + } + + private void addComparable(Statement left, Statement right, boolean process) { + comparableStatements.map(left, right); + if (!process) { + comparableResources.map(left.getObject(), right.getObject()); + } + } + + public List filterAsserted(Resource r, Collection in) throws ServiceException { + List out = new ArrayList(); + 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()); + } + + private List filterTraversed(List in) throws ServiceException { + return filter(traversed, in); + } + + private List filterNonTested(List in) throws ServiceException { + return filter(nonTested, in); + } + + private List filter(Collection toFilter, List in) throws ServiceException { + if (toFilter.size() == 0) + return in; + List out = new ArrayList(); 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,11 +591,112 @@ public class GraphComparator { } } + return out; + } + + + 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 compareStatement(List ss1, List ss2, Stack stack1, Stack stack2) throws ServiceException, DoesNotContainValueException, ValidationException { - Collections.sort(ss1, scomp); - Collections.sort(ss2, scomp); + private void addModification(Statement s1, Statement s2) { + Pair mod = new Pair(s1,s2); + if (!modificationsSet.contains(mod)) { + modificationsSet.add(mod); + modifications.add(mod); + } + } + + public void sortStatement(List list1, List list2) { + sortStatement(list1, list2, scomp); + } + + public void sortStatement(List list1, List list2, Comparator scomp) { + Collections.sort(list1,scomp); + Collections.sort(list2,scomp); + + List sorted1 = new ArrayList(list1.size()); + List sorted2 = new ArrayList(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.set(ss1,s); + ss1++; + } + } + } + if (ss2 < sorted2.size()) { + for (Statement s : list2) { + if (!sorted2.contains(s)) { + sorted2.set(ss2,s); + ss2++; + } + } + } + + list1.clear(); + list2.clear(); + list1.addAll(sorted1); + list2.addAll(sorted2); + } + + public void copy(List to, int toIndex, List from, int fromIndex, int amount) { + for (int i = 0; i < amount; i++) { + to.set(toIndex + i, from.get(fromIndex+ i)); + } + } + + public void sortResource(List list1, List 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 ss1, List ss2, Stack objectsLeft, Stack objectsRight, Collection unreliableLeft, Collection unreliableRight) throws DatabaseException { + sortStatement(ss1, ss2); int i1 = 0; int i2 = 0; @@ -171,14 +707,17 @@ public class GraphComparator { break; } else { while (i2 < ss2.size()) { - changes2.add(ss2.get(i2)); + System.out.println("Compare Statements 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 Statements diff1 " + printStatement(g,ss1.get(i1))); + addDeletion(ss1.get(i1)); i1++; } break; @@ -187,24 +726,28 @@ 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,objectsLeft,objectsRight,unreliableLeft,unreliableRight); 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 Statements 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 Statements diff2 " + printStatement(g,ss2.get(i+i2))); + addAddition(ss2.get(i+i2)); } + i2 += same2; } - } } + + private int sameRel(List statements, int off) { if (statements.size() <= off) return 0; @@ -220,8 +763,19 @@ public class GraphComparator { } + private int compareObject(Resource o1, Resource o2) throws DatabaseException { + if (o1.equals(o2)) + return -1; + if (comparableResources.contains(o1, o2)) + return (-1); + if (comparableResources.containsLeft(o1)) + return Integer.MAX_VALUE; + if (comparableResources.containsRight(o2)) + return Integer.MAX_VALUE; + return comparator.compare(g, o1, o2); + } - private void compareObject(List ss1, int off1, int len1, List ss2, int off2, int len2, Stack stack1, Stack stack2) throws ServiceException, DoesNotContainValueException, ValidationException { + private void compareStatements(List ss1, int off1, int len1, List ss2, int off2, int len2, Collection objectsLeft, Collection objectsRight, Collection unreliableLeft, Collection unreliableRight) throws DatabaseException { boolean[] used1 = new boolean[len1]; for (int i = 0; i < used1.length; i++) { used1[i] = false; @@ -236,15 +790,19 @@ public class GraphComparator { List> differences = new ArrayList>(); for (int i1 = off1; i1 < off1 + len1; i1++) { Statement s1 = ss1.get(i1); - //Map differences = new HashMap(); List diff = new ArrayList(); 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; + int d = compareObject(s1.getObject(), s2.getObject()); + if (d == 0) { + for (Resource t : strong) { + if (s1.getPredicate().equals(t) || g.isSubrelationOf(s1.getPredicate(), t)) { + d = 1; + break; + } + } } - diff.add(propsDiffCount(s1.getObject(), s2.getObject())); + diff.add(d); } differences.add(diff); } @@ -261,8 +819,44 @@ public class GraphComparator { Arrays.sort(pris); for (Integer pri : pris) { - if (pri == Integer.MAX_VALUE) + if (pri == Integer.MAX_VALUE) { + + } else if (pri == 0) { + + } else { + List i1s = priorities.getValues(pri); + for (Integer i1 : i1s) { + if (used1[i1]) + continue; + List i2diff = differences.get(i1); + for (int i2 = 0; i2 < i2diff.size(); i2++) { + if (i2diff.get(i2) == pri) { + if (used2[i2]) + continue; + used1[i1] = true; + used2[i2] = true; + Statement s1 = ss1.get(i1+off1); + Statement s2 = ss2.get(i2+off2); + + if (objectsLeft != null) { + objectsLeft.add(s1.getObject()); + objectsRight.add(s2.getObject()); + } + addComparable(s1, s2, true); + break; + } + } + } + } + } + + for (Integer pri : pris) { + if (pri != 0) continue; + Set s1s = new HashSet(); + Set s2s = new HashSet(); + Set s1i = new HashSet(); + Set s2i = new HashSet(); List i1s = priorities.getValues(pri); for (Integer i1 : i1s) { if (used1[i1]) @@ -271,78 +865,56 @@ public class GraphComparator { for (int i2 = 0; i2 < i2diff.size(); i2++) { if (i2diff.get(i2) == pri) { if (used2[i2]) - break; - used1[i1] = true; - used2[i2] = true; - if (stack1 != null) { - stack1.add(ss1.get(i1+off1).getObject()); - stack2.add(ss2.get(i2+off2).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)); - } - } + continue; + Statement s1 = ss1.get(i1+off1); + Statement s2 = ss2.get(i2+off2); + s1s.add(s1); + s2s.add(s2); + s1i.add(i1); + s2i.add(i2); } } } + if (unreliableLeft != null) { + unreliableLeft.addAll(s1s); + unreliableRight.addAll(s2s); + } + for (Integer i : s1i) + used1[i] = true; + for (Integer i : s2i) + used2[i] = true; + } 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 ss1 = new ArrayList(); ArrayList ss2 = new ArrayList(); 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); int i1 = 0; int i2 = 0; @@ -353,14 +925,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; @@ -369,145 +943,76 @@ public class GraphComparator { 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) { - changes1.add(s1); - changes2.add(s2); - comparable.map(s1, s2); + 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 = compareValue(v1, v2); + if (!eq) { + addModification(s1, s2); + addComparable(s1, s2, false); + } + } else { + compareProps(s1.getObject(), s2.getObject()); } } else { - compareProps(s1.getObject(), s2.getObject()); - } - } else { - changes1.add(s1); - changes2.add(s2); - comparable.map(s1, s2); - } - i1++; - i2++; - break; - } - case -1:{ - changes1.add(s1); - i1++; - break; - } - - case 1:{ - changes2.add(s2); - i2++; - break; - } - } - - - } - - ss1.clear(); - ss2.clear(); - - } - - private int propsDiffCount(Resource r1, Resource r2) throws ServiceException, DoesNotContainValueException, ValidationException { - ArrayList ss1 = new ArrayList(); - ArrayList ss2 = new ArrayList(); - 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++; + addModification(s1, s2); + addComparable(s1, s2, false); } + i1++; + i2++; break; } - } else if (i2 >= ss2.size()) { - while (i1 < ss1.size()) { - count++; + case -1:{ + System.out.println("Compare Prop diff1s " + printStatement(g,s1)); + addDeletion(s1); i1++; + break; } - 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++; + + case 1:{ + System.out.println("Compare Prop diff2s " + printStatement(g,s2)); + addAddition(s2); + i2++; + break; } - 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 { + public class PredicateComparator implements Comparator { @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()) @@ -516,16 +1021,62 @@ public class GraphComparator { } } - + public class SubjectComparator implements Comparator { + @Override + public int compare(Statement o1, Statement o2) { + if (comparableResources.contains(o1.getSubject(), o2.getSubject())) + return 0; + if (o1.getSubject().getResourceId() < o2.getSubject().getResourceId()) + return -1; + if (o1.getSubject().getResourceId() > o2.getSubject().getResourceId()) + return 1; + return 0; + } + } - public class ResourceComparator implements Comparator { + public class ObjectComparator implements Comparator { + @Override + public int compare(Statement o1, Statement o2) { + if (comparableResources.contains(o1.getObject(), o2.getObject())) + return 0; + if (o1.getObject().getResourceId() < o2.getObject().getResourceId()) + return -1; + if (o1.getObject().getResourceId() > o2.getObject().getResourceId()) + return 1; + return 0; + } + } + + public static class FullStatementComparator implements Comparator { + @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 ResComparator implements Comparator { @Override public int compare(Resource o1, Resource o2) { + if (comparableResources.contains(o1, o2)) + return 0; if (o1.getResourceId() < o2.getResourceId()) return -1; - if (o2.getResourceId() > o2.getResourceId()) + if (o1.getResourceId() > o2.getResourceId()) return 1; return 0; } } + }