\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
\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
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
for (Resource ol : objectLeft.getKeys()) {\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
sLeft.add(s.getSubject());\r
sRight.add(comparableResources.getRight(s.getSubject()));\r
}\r
+ \r
+ // check if object left can be reliably identified by available statements\r
+ // if there are any objects on the left side with similar statements, object left cannot be mapped.\r
+ boolean hasSimilar = false;\r
+ MapList<Resource, Statement> comparableOLeft = new MapList<Resource, Statement>();\r
+ for (Resource sl : sLeft) {\r
+ for (Statement s : subjectLeft.getValues(sl)) {\r
+ if (!s.getObject().equals(ol)) {\r
+ comparableOLeft.add(s.getObject(),s);\r
+ }\r
+ }\r
+ }\r
+ \r
+ for (Resource similarOl : comparableOLeft.getKeys()) {\r
+ List<Statement> similarLeft = comparableOLeft.getValues(similarOl);\r
+ if (similarLeft.size() == left.size()) {\r
+ boolean useL[] = new boolean[left.size()];\r
+ boolean useSL[] = new boolean[left.size()];\r
+ for (int i = 0; i < left.size(); i++) {\r
+ useL[i] = false;\r
+ useSL[i] = false;\r
+ }\r
+ for (int i = 0; i < left.size(); i++) {\r
+ for (int j = 0; j < left.size(); j++) {\r
+ if (useSL[j])\r
+ continue;\r
+ Resource pl = left.get(i).getPredicate();\r
+ Resource psl = similarLeft.get(j).getPredicate();\r
+ if (pl.equals(psl)) {\r
+ useL[i] = true;\r
+ useSL[j] = true;\r
+ break;\r
+ }\r
+ }\r
+ }\r
+ boolean diff = false;\r
+ for (int i = 0; i < left.size(); i++) {\r
+ if (!useL[i] || !useSL[i]) {\r
+ diff = true;\r
+ }\r
+ }\r
+ if (!diff) {\r
+ hasSimilar = true;\r
+ break;\r
+ }\r
+ }\r
+ }\r
+ \r
+ if (hasSimilar)\r
+ continue;\r
+ \r
+ \r
// all objects that subjects on the right side point to. Object left has its matching resource among these, if it has matching resource\r
MapList<Resource,Statement> possibleOR = new MapList<Resource, Statement>();\r
for (Resource sr : sRight) {\r
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
Resource or = matchingPaths.keySet().iterator().next();\r
objectsLeft.add(ol);\r
objectsRight.add(or);\r
+ comparableResources.map(ol, 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
+ System.out.println("Compare not implemented");\r
} else {\r
- System.out.println();\r
+ System.out.println("Compare not implemented");\r
}\r
}\r
}\r
\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
+ comparableResources.map(left.getObject(), right.getObject());\r
}\r
\r
public List<Statement> filterAsserted(Resource r, Collection<Statement> in) throws ServiceException {\r
* @throws ValidationException \r
*/\r
private void compareProps(Resource r1, Resource r2) throws ServiceException, DoesNotContainValueException, ValidationException {\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