\r
import org.simantics.db.ReadGraph;\r
import org.simantics.db.Resource;\r
+import org.simantics.db.Session;\r
import org.simantics.db.Statement;\r
+import org.simantics.db.common.request.ReadRequest;\r
import org.simantics.db.common.utils.NameUtils;\r
import org.simantics.db.exception.DatabaseException;\r
import org.simantics.db.exception.DoesNotContainValueException;\r
\r
private BijectionMap<Statement, Statement> comparableStatements = new BijectionMap<Statement, Statement>();\r
private BijectionMap<Resource, Resource> comparableResources = new BijectionMap<Resource, Resource>();\r
- \r
+ private Set<Resource> processedResources = new HashSet<Resource>();\r
\r
private ResourceComparator comparator;\r
\r
strong.addAll(rels);\r
}\r
\r
- public void clearRels() {\r
- traversed.clear();\r
- tested.clear();\r
- nonTraversed.clear();\r
- nonTested.clear();\r
- }\r
\r
public void test(ReadGraph g) throws DatabaseException {\r
this.g = g;\r
objectsLeft.push(r1);\r
objectsRight.push(r2);\r
\r
- \r
- \r
- \r
Set<Statement> unreliableLeft = new HashSet<Statement>();\r
Set<Statement> unreliableRight = new HashSet<Statement>();\r
\r
}\r
\r
\r
+ }\r
+ \r
+ public void test(Session session) throws DatabaseException {\r
+ \r
+ comparator.setComparator(this);\r
+ \r
+ comparableResources.map(r1, r2);\r
+ \r
+ final Stack<Resource> objectsLeft = new Stack<Resource>();\r
+ final Stack<Resource> objectsRight = new Stack<Resource>();\r
+ objectsLeft.push(r1);\r
+ objectsRight.push(r2);\r
+ \r
+ final Set<Statement> unreliableLeft = new HashSet<Statement>();\r
+ final Set<Statement> unreliableRight = new HashSet<Statement>();\r
+ \r
+ while (true) {\r
+ if (objectsLeft.isEmpty())\r
+ break;\r
+ session.syncRequest(new ReadRequest() {\r
+ \r
+ @Override\r
+ public void run(ReadGraph graph) throws DatabaseException {\r
+ g = graph;\r
+ b = Layer0.getInstance(graph);\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
+ \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
Resource r1 = objectsLeft.pop();\r
Resource r2 = objectsRight.pop();\r
\r
-// if (r1.getResourceId() == 42543612 ||\r
-// r1.getResourceId() == 42729524 ||\r
-// r1.getResourceId() == 42729506) {\r
-// System.out.println("test " + r1 + " " + r2);\r
-// }\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
+ \r
+ if (processedResources.contains(r1))\r
continue;\r
- }\r
- if (comparableResources.containsLeft(r1) || comparableResources.containsRight(r2)) {\r
+ processedResources.add(r1);\r
+ \r
+ \r
+ if(!comparableResources.contains(r1, r2) && (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
compareProps(r1, r2);\r
}\r
}\r
\r
- private void processUnreliable(Set<Statement> unreliableLeft, Set<Statement> unreliableRight) {\r
+ private void processUnreliable(Set<Statement> unreliableLeft, Set<Statement> unreliableRight) throws DatabaseException {\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
comparableResources.contains(leftS.getPredicate(), rightS.getPredicate())) {\r
unreliableLeft.remove(leftS);\r
unreliableRight.remove(rightS);\r
- comparableStatements.map(leftS, rightS);\r
+ addComparable(leftS, rightS, false);\r
}\r
}\r
}\r
}\r
}\r
\r
- private void processUnreliable(Set<Statement> unreliableLeft, Set<Statement> unreliableRight, Stack<Resource> objectsLeft, Stack<Resource> objectsRight) {\r
+ private void processUnreliable(Set<Statement> unreliableLeft, Set<Statement> unreliableRight, Stack<Resource> objectsLeft, Stack<Resource> objectsRight) throws DatabaseException {\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
}\r
\r
for (Resource ol : objectLeft.getKeys()) {\r
-// if (ol.getResourceId() == 42729506) {\r
-// System.out.println();\r
-// }\r
// all statements to the left side object\r
List<Statement> left = objectLeft.getValues(ol);\r
// all subjects that have statements to the left side object (ol)\r
List<Statement> right = matchingOR.getValues(or);\r
Pair<int[], int[]> indices = matchingStatements.get(or);\r
\r
- //comparableResources.map(ol, or);\r
objectsLeft.add(ol);\r
objectsRight.add(or);\r
+ addComparable(ol, or, false);\r
for (int l = 0; l < left.size(); l++) {\r
int r = indices.first[l];\r
Statement sl = left.get(l);\r
\r
}\r
\r
- private void processUnreliableDeep(Set<Statement> unreliableLeft, Set<Statement> unreliableRight, Stack<Resource> objectsLeft, Stack<Resource> objectsRight) throws ManyObjectsForFunctionalRelationException, ServiceException {\r
+ private void processUnreliableDeep(Set<Statement> unreliableLeft, Set<Statement> unreliableRight, Stack<Resource> objectsLeft, Stack<Resource> objectsRight) throws DatabaseException {\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
for (Path leftPath : pathsLeft) {\r
possiblePathsRight.addAll(findComparableRight(leftPath, or));\r
}\r
- if (possiblePathsRight.size() == pathsLeft.size()) {\r
+ if (hasMatchingPaths(pathsLeft, possiblePathsRight)) {\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
+ \r
objectsLeft.add(ol);\r
objectsRight.add(or);\r
+ addComparable(ol, or, false);\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
+ BijectionMap<Path,Path> map = getMatchingPaths(pathsLeft, matchingPaths.get(or));\r
+ for (Path left : map.getLeftSet()) {\r
+ Path right = map.getRight(left);\r
+ for (int i = 0; i < left.getLength(); i++) {\r
+ addComparable(left.getStatements().get(i),right.getStatements().get(i),false);\r
+ }\r
+ }\r
+ //System.out.println("Compare not implemented");\r
} else {\r
- System.out.println();\r
+ //System.out.println("Compare not implemented");\r
}\r
}\r
}\r
\r
}\r
\r
+ private boolean hasMatchingPaths(Set<Path> leftPaths, Set<Path> rightPaths) {\r
+ if (leftPaths.size() != rightPaths.size())\r
+ return false;\r
+ BijectionMap<Path,Path> map = getMatchingPaths(leftPaths, rightPaths);\r
+ return map.size() == leftPaths.size();\r
+ \r
+ }\r
+ \r
+ private BijectionMap<Path,Path> getMatchingPaths(Set<Path> leftPaths, Set<Path> rightPaths) {\r
+ BijectionMap<Path,Path> map = new BijectionMap<Path, Path>();\r
+ for (Path leftPath : leftPaths) {\r
+ for (Path rightPath : rightPaths) {\r
+ if (map.containsRight(rightPath))\r
+ continue;\r
+ if (leftPath.getLength() != rightPath.getLength())\r
+ continue;\r
+ if (comparableResources.contains(leftPath.getEnd(), rightPath.getEnd())) {\r
+ map.map(leftPath, rightPath);\r
+ break;\r
+ }\r
+ }\r
+ }\r
+ return map;\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 new GraphChanges(r1,r2,changes1,changes2,modifications,comparableResources);\r
}\r
\r
- private void addComparable(Statement left, Statement right, boolean process) {\r
-// if (left.getObject().getResourceId() == 42543612 ||\r
-// left.getObject().getResourceId() == 42729524 ||\r
-// left.getObject().getResourceId() == 42729506) {\r
-// System.out.println("test " + r1 + " " + r2);\r
-// }\r
+ private void addComparable(Statement left, Statement right, boolean process) throws DatabaseException {\r
+ addComparable(left.getObject(), right.getObject(), process);\r
comparableStatements.map(left, right);\r
- if (!process) {\r
- comparableResources.map(left.getObject(), right.getObject());\r
+ comparableResources.map(left.getObject(), right.getObject());\r
+ }\r
+ \r
+ private void addComparable(Resource left, Resource right, boolean process) throws DatabaseException {\r
+ if(!comparableResources.contains(r1, r2)) {\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
+ } else {\r
+ comparableResources.map(left, right); \r
+ }\r
}\r
+ \r
}\r
\r
public List<Statement> filterAsserted(Resource r, Collection<Statement> in) throws ServiceException {\r
Statement s2 = ss2.get(i2+off2);\r
\r
if (objectsLeft != null) {\r
+ if (s1.getObject().getResourceId() == 52825217 || s1.getObject().getResourceId() == 52825127)\r
+ System.out.println();\r
objectsLeft.add(s1.getObject());\r
objectsRight.add(s2.getObject());\r
} \r
* @throws DoesNotContainValueException\r
* @throws ValidationException \r
*/\r
- private void compareProps(Resource r1, Resource r2) throws ServiceException, DoesNotContainValueException, ValidationException {\r
+ private void compareProps(Resource r1, Resource r2) throws DatabaseException {\r
+ System.out.println("compareProps " + r1 + " " + NameUtils.getSafeName(g, r1) + " " + r2 + " " + NameUtils.getSafeName(g, r2));\r
ArrayList<Statement> ss1 = new ArrayList<Statement>();\r
ArrayList<Statement> ss2 = new ArrayList<Statement>();\r
ss1.addAll(g.getStatements(r1, b.HasProperty));\r
}\r
Statement s1 = ss1.get(i1);\r
Statement s2 = ss2.get(i2);\r
+ if (s1.isAsserted(r1) && s2.isAsserted(r2)) {\r
+ i1++;\r
+ i2++;\r
+ continue;\r
+ }\r
int c = scomp.compare(s1, s2);\r
switch (c) {\r
case 0:{\r
addComparable(s1, s2, false);\r
}\r
} else {\r
- compareProps(s1.getObject(), s2.getObject());\r
+ if (!s1.getObject().equals(s1.getSubject()) && !s2.getObject().equals(s2.getSubject()))\r
+ compareProps(s1.getObject(), s2.getObject());\r
}\r
} else {\r
addModification(s1, s2);\r
Code Review / simantics / interop.git / blobdiff