Using bindings when comparing literal values (perf optimization)

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

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 11b3d1a3849e0309ab59d6ad271aa2187ce409d2..f5c4dfc8f61e5f1128908e05eef225deeb0df3d4 100644 (file)
--- a/org.simantics.interop/src/org/simantics/interop/test/GraphComparator.java
+++ b/org.simantics.interop/src/org/simantics/interop/test/GraphComparator.java
@@ -24,6 +24,7 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.Stack;
 
+import org.simantics.databoard.Bindings;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.Session;
@@ -769,9 +770,6 @@ public class GraphComparator {
                        } else {
                                if (DEBUG) System.out.println(left + " = " + right);
                                comparableResources.map(left, right);   
-                               //if (left.getResourceId() == 313071 && right.getResourceId() == 325324)
-                               if (left.getResourceId() == 313231 && right.getResourceId() == 337775)
-                                       System.out.println();
                        }
                }
                
@@ -1191,9 +1189,10 @@ public class GraphComparator {
                                        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);
+//                                                     Object v1 = g.getValue(s1.getObject());
+//                                                     Object v2 = g.getValue(s2.getObject());
+//                                                     boolean eq = compareValue(v1, v2);
+                                                       boolean eq = compareValue(g,b,s1.getObject(), s2.getObject());
                                                        if (!eq) {
                                                                addModification(s1, s2);
                                                                addComparable(s1, s2);
@@ -1232,6 +1231,75 @@ public class GraphComparator {
                
        }
        
+       public static boolean compareValue(ReadGraph g, Layer0 b, Resource r1, Resource r2) throws DatabaseException {
+               Resource t1 = g.getSingleType(r1);
+               Resource t2 = g.getSingleType(r2);
+               if (!t1.equals(t2))
+                       return false;
+               if (t1.equals(b.Integer)) {
+                       int v1 = g.getValue(r1, Bindings.INTEGER);
+                       int v2 = g.getValue(r2, Bindings.INTEGER);
+                       return v1 == v2;
+               } else if (t1.equals(b.Float)) {
+                       float v1 = g.getValue(r1, Bindings.FLOAT);
+                       float v2 = g.getValue(r2, Bindings.FLOAT);
+                       return v1 == v2;
+               } else if (t1.equals(b.Double)) {
+                       double v1 = g.getValue(r1, Bindings.DOUBLE);
+                       double v2 = g.getValue(r2, Bindings.DOUBLE);
+                       return v1 == v2;
+               } else if (t1.equals(b.String)) {
+                       String v1 = g.getValue(r1, Bindings.STRING);
+                       String v2 = g.getValue(r2, Bindings.STRING);
+                       return v1.equals(v2);
+               } else if (t1.equals(b.Boolean)) {
+                       boolean v1 = g.getValue(r1, Bindings.BOOLEAN);
+                       boolean v2 = g.getValue(r2, Bindings.BOOLEAN);
+                       return v1 == v2;
+               } else if (t1.equals(b.Byte)) {
+                       byte v1 = g.getValue(r1, Bindings.BYTE);
+                       byte v2 = g.getValue(r2, Bindings.BYTE);
+                       return v1 == v2;
+               } else if (t1.equals(b.Long)) {
+                       long v1 = g.getValue(r1, Bindings.LONG);
+                       long v2 = g.getValue(r2, Bindings.LONG);
+                       return v1 == v2;
+               } else if (t1.equals(b.IntegerArray)) {
+                       int[] v1 = g.getValue(r1, Bindings.INT_ARRAY);
+                       int[] v2 = g.getValue(r2, Bindings.INT_ARRAY);
+                       return Arrays.equals(v1,v2);
+               } else if (t1.equals(b.FloatArray)) {
+                       float[] v1 = g.getValue(r1, Bindings.FLOAT_ARRAY);
+                       float[] v2 = g.getValue(r2, Bindings.FLOAT_ARRAY);
+                       return Arrays.equals(v1,v2);
+               } else if (t1.equals(b.DoubleArray)) {
+                       double[] v1 = g.getValue(r1, Bindings.DOUBLE_ARRAY);
+                       double[] v2 = g.getValue(r2, Bindings.DOUBLE_ARRAY);
+                       return Arrays.equals(v1,v2);
+               } else if (t1.equals(b.StringArray)) {
+                       String[] v1 = g.getValue(r1, Bindings.STRING_ARRAY);
+                       String[] v2 = g.getValue(r2, Bindings.STRING_ARRAY);
+                       return Arrays.equals(v1,v2);
+               } else if (t1.equals(b.BooleanArray)) {
+                       boolean[] v1 = g.getValue(r1, Bindings.BOOLEAN_ARRAY);
+                       boolean[] v2 = g.getValue(r2, Bindings.BOOLEAN_ARRAY);
+                       return Arrays.equals(v1,v2);
+               } else if (t1.equals(b.ByteArray)) {
+                       byte[] v1 = g.getValue(r1, Bindings.BYTE_ARRAY);
+                       byte[] v2 = g.getValue(r2, Bindings.BYTE_ARRAY);
+                       return Arrays.equals(v1,v2);
+               } else if (t1.equals(b.LongArray)) {
+                       long[] v1 = g.getValue(r1, Bindings.LONG_ARRAY);
+                       long[] v2 = g.getValue(r2, Bindings.LONG_ARRAY);
+                       return Arrays.equals(v1,v2);
+               } else {
+                       Object v1 = g.getValue(r1);
+                       Object v2 = g.getValue(r2);
+                       return compareValue(v1, v2);
+               }
+               
+       }
+       
        public static boolean compareValue(Object v1, Object v2) {
                if (v1 instanceof Object[] && v2 instanceof Object[])
                        return Arrays.deepEquals((Object[])v1, (Object[])v2);