Layer0 + Apros changes

[simantics/interop.git] / org.simantics.interop / src / org / simantics / interop / test / GraphComparatorViewer.java

diff --git a/org.simantics.interop/src/org/simantics/interop/test/GraphComparatorViewer.java b/org.simantics.interop/src/org/simantics/interop/test/GraphComparatorViewer.java
index 0f8dce07a7280865854510a1d9ead858bd503c45..fdf1c81448cb7597c91a346b1a562e16d54792ef 100644 (file)
--- a/org.simantics.interop/src/org/simantics/interop/test/GraphComparatorViewer.java
+++ b/org.simantics.interop/src/org/simantics/interop/test/GraphComparatorViewer.java
@@ -124,7 +124,7 @@ public class GraphComparatorViewer extends ViewPart{
                        public void run(final ReadGraph graph) throws DatabaseException {\r
                                comparator.clearRels();\r
                                comparator.addTraversed(graph.getBuiltins().ConsistsOf);\r
-//                             comparator.addTested(graph.getBuiltins().IsWeaklyRelatedTo);\r
+                               comparator.addTested(graph.getBuiltins().IsWeaklyRelatedTo);\r
                                comparator.test(graph, r1, r2);\r
                                BijectionMap<Statement, Statement> map = comparator.getComparable();\r
                                Map<Statement, Integer> indices = new HashMap<Statement, Integer>();\r
@@ -142,7 +142,9 @@ public class GraphComparatorViewer extends ViewPart{
                                                        indices.put(s, index);\r
                                                        sb1.append("["+index + "] ");\r
                                                }\r
-                                               sb1.append(sub + " - " + pre + " - " + obj + "\n");\r
+                                               sb1.append(sub + " - " + pre + " - " + obj);\r
+                                               sb1.append(" ["+s.getSubject().getResourceId() + " " + s.getPredicate().getResourceId() + " " + s.getObject().getResourceId()+"]");\r
+                                               sb1.append("\n");\r
                                        } catch (ValidationException e) {\r
                                                e.printStackTrace();\r
                                        } catch (ServiceException e) {\r
@@ -161,7 +163,9 @@ public class GraphComparatorViewer extends ViewPart{
                                                        index = indices.get(map.getLeft(s));\r
                                                        sb2.append("["+index + "] ");\r
                                                }\r
-                                               sb2.append(sub + " - " + pre + " - " + obj + "\n");\r
+                                               sb2.append(sub + " - " + pre + " - " + obj);\r
+                                               sb2.append(" ["+s.getSubject().getResourceId() + " " + s.getPredicate().getResourceId() + " " + s.getObject().getResourceId()+"]");\r
+                                               sb2.append("\n");\r
                                        } catch (ValidationException e) {\r
                                                e.printStackTrace();\r
                                        } catch (ServiceException e) {\r