X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=bundles%2Forg.simantics.graph%2Fsrc%2Forg%2Fsimantics%2Fgraph%2Fdiff%2FDiff.java;h=f677531a59db54dfc703186ec66d16ffcb2a8292;hb=refs%2Fchanges%2F38%2F238%2F2;hp=6f2add88a7fe2f650d6585dfa03dbc38a8569db2;hpb=24e2b34260f219f0d1644ca7a138894980e25b14;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.graph/src/org/simantics/graph/diff/Diff.java b/bundles/org.simantics.graph/src/org/simantics/graph/diff/Diff.java
index 6f2add88a..f677531a5 100644
--- a/bundles/org.simantics.graph/src/org/simantics/graph/diff/Diff.java
+++ b/bundles/org.simantics.graph/src/org/simantics/graph/diff/Diff.java
@@ -1,206 +1,206 @@
-package org.simantics.graph.diff;
-
-import gnu.trove.map.hash.TIntObjectHashMap;
-import gnu.trove.procedure.TIntObjectProcedure;
-import gnu.trove.set.hash.THashSet;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.simantics.databoard.binding.mutable.Variant;
-import org.simantics.graph.matching.GraphMatching;
-import org.simantics.graph.representation.External;
-import org.simantics.graph.representation.Identity;
-import org.simantics.graph.representation.IdentityDefinition;
-import org.simantics.graph.representation.Internal;
-import org.simantics.graph.representation.Optional;
-import org.simantics.graph.representation.Root;
-import org.simantics.graph.representation.TransferableGraph1;
-import org.simantics.graph.representation.Value;
-
-public class Diff extends GraphMatching {
-
-	TransferableGraph1 a;
-	TransferableGraph1 b;
-	
-	public Diff(TransferableGraph1 a, TransferableGraph1 b) {
-		super(a, b);
-		this.a = a;
-		this.b = b;
-	}	
-	
-	static THashSet<Statement> createStatementSet(int[] statements) {
-		THashSet<Statement> result = new THashSet<Statement>();
-		for(int i=0;i<statements.length;i+=4)
-			result.add(new Statement(
-					statements[i],
-					statements[i+1],
-					statements[i+2],
-					statements[i+3]
-			));
-		return result;
-	}
-	
-	public TransferableGraphDelta1 diff() {
-		match();
-		
-		long begin = System.nanoTime();
-		
-		// Statement diff;
-		THashSet<Statement> aStatements = createStatementSet(a.statements);
-		ArrayList<Statement> bStatements = new ArrayList<Statement>();
-		
-		int[] statements = b.statements;
-		for(int i=0;i<statements.length;i+=4) {
-			Statement statement = new Statement(
-					statements[i],
-					statements[i+1],
-					statements[i+2],
-					statements[i+3]
-			);
-			Statement mappedStatement = statement.map(bToA);
-			if(mappedStatement == null || !aStatements.remove(mappedStatement))
-				bStatements.add(statement);
-		}		
-	
-		// Identity diff
-		TIntObjectHashMap<IdentityDefinition> aIdentities = new TIntObjectHashMap<IdentityDefinition>();
-		ArrayList<Identity> bIdentities = new ArrayList<Identity>();
-		for(Identity id : a.identities)
-			aIdentities.put(id.resource, id.definition);
-		for(Identity id : b.identities) {
-			int a = bToA[id.resource];
-			IdentityDefinition def = aIdentities.get(a);
-			if(def != null && identityDefinitionEquals(bToA, def, id.definition))
-				aIdentities.remove(a);
-			else
-				bIdentities.add(id);
-		}
-		
-		// Value diff
-		TIntObjectHashMap<Variant> aValues = new TIntObjectHashMap<Variant>();
-		ArrayList<Value> bValues = new ArrayList<Value>();
-		for(Value value : a.values)
-			aValues.put(value.resource, value.value);
-		
-		for(Value value : b.values) {
-			int a = bToA[value.resource]; // a may be -1
-			Variant aValue = aValues.get(a);
-			if(aValue != null && aValue.equals(value.value))
-				aValues.remove(a);
-			else
-				bValues.add(value);
-		}
-				
-		// Create result
-		TransferableGraphDelta1 result = new TransferableGraphDelta1(
-				aToB,
-				new TransferableGraph1(
-					a.resourceCount,
-					toIdentityArray(aIdentities),
-					toStatementArray(aStatements),
-					toValueArray(aValues)
-				),
-				new TransferableGraph1(
-					b.resourceCount,
-					bIdentities.toArray(new Identity[bIdentities.size()]),
-					toStatementArray(bStatements),
-					bValues.toArray(new Value[bValues.size()])
-				)
-			);
-		if(GraphMatching.TIMING) {
-			long end = System.nanoTime();
-			System.out.println("Diffing: " + (end-begin)*1e-6 + "ms");
-		}
-		return result;
-	}
-	
-	private static boolean identityDefinitionEquals(int[] bToA,
-			IdentityDefinition a, IdentityDefinition b) {		
-		if(a instanceof Root)
-			return b instanceof Root && ((Root)a).name.equals(((Root)b).name);
-		if(b instanceof Root)
-			return false;
-		int aParent, bParent;
-		String aName, bName;
-		
-		if(b instanceof External) {
-			External def = (External)b;
-			bParent = def.parent;
-			bName = def.name;
-		}
-		else if(b instanceof Internal) {
-			Internal def = (Internal)b;
-			bParent = def.parent;
-			bName = def.name;
-		}
-		else if(b instanceof Optional) {
-			Optional def = (Optional)b;
-			bParent = def.parent;
-			bName = def.name;
-		}
-		else
-			return false;
-		bParent = bToA[bParent];
-		if(bParent < 0)
-			return false;
-		
-		if(a instanceof External) {
-			External def = (External)a;
-			aParent = def.parent;
-			aName = def.name;
-		}
-		else if(a instanceof Internal) {
-			Internal def = (Internal)a;
-			aParent = def.parent;
-			aName = def.name;
-		}
-		else if(a instanceof Optional) {
-			Optional def = (Optional)a;
-			aParent = def.parent;
-			aName = def.name;
-		}
-		else
-			return false;
-		return aParent == bParent && aName.equals(bName);
-	}
-
-	static int[] toStatementArray(Collection<Statement> statements) {
-		int[] result = new int[4*statements.size()];
-		int i=0;
-		for(Statement statement : statements) {
-			result[i++] = statement.subject;
-			result[i++] = statement.predicate;
-			result[i++] = statement.inverse;
-			result[i++] = statement.object;
-		}
-		return result;
-	}
-	
-	static Value[] toValueArray(TIntObjectHashMap<Variant> values) {
-		final Value[] result = new Value[values.size()];
-		values.forEachEntry(new TIntObjectProcedure<Variant>() {
-			int i=0;
-			@Override
-			public boolean execute(int a, Variant b) {
-				result[i++] = new Value(a, b);
-				return true;
-			}
-		});
-		return result;
-	}
-	
-	static Identity[] toIdentityArray(TIntObjectHashMap<IdentityDefinition> identities) {
-		final Identity[] result = new Identity[identities.size()];
-		identities.forEachEntry(new TIntObjectProcedure<IdentityDefinition>() {
-			int i=0;
-			@Override
-			public boolean execute(int a, IdentityDefinition b) {
-				result[i++] = new Identity(a, b);
-				return true;
-			}
-		});
-		return result;
-	}
-	
+package org.simantics.graph.diff;
+
+import gnu.trove.map.hash.TIntObjectHashMap;
+import gnu.trove.procedure.TIntObjectProcedure;
+import gnu.trove.set.hash.THashSet;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.simantics.databoard.binding.mutable.Variant;
+import org.simantics.graph.matching.GraphMatching;
+import org.simantics.graph.representation.External;
+import org.simantics.graph.representation.Identity;
+import org.simantics.graph.representation.IdentityDefinition;
+import org.simantics.graph.representation.Internal;
+import org.simantics.graph.representation.Optional;
+import org.simantics.graph.representation.Root;
+import org.simantics.graph.representation.TransferableGraph1;
+import org.simantics.graph.representation.Value;
+
+public class Diff extends GraphMatching {
+
+	TransferableGraph1 a;
+	TransferableGraph1 b;
+	
+	public Diff(TransferableGraph1 a, TransferableGraph1 b) {
+		super(a, b);
+		this.a = a;
+		this.b = b;
+	}	
+	
+	static THashSet<Statement> createStatementSet(int[] statements) {
+		THashSet<Statement> result = new THashSet<Statement>();
+		for(int i=0;i<statements.length;i+=4)
+			result.add(new Statement(
+					statements[i],
+					statements[i+1],
+					statements[i+2],
+					statements[i+3]
+			));
+		return result;
+	}
+	
+	public TransferableGraphDelta1 diff() {
+		match();
+		
+		long begin = System.nanoTime();
+		
+		// Statement diff;
+		THashSet<Statement> aStatements = createStatementSet(a.statements);
+		ArrayList<Statement> bStatements = new ArrayList<Statement>();
+		
+		int[] statements = b.statements;
+		for(int i=0;i<statements.length;i+=4) {
+			Statement statement = new Statement(
+					statements[i],
+					statements[i+1],
+					statements[i+2],
+					statements[i+3]
+			);
+			Statement mappedStatement = statement.map(bToA);
+			if(mappedStatement == null || !aStatements.remove(mappedStatement))
+				bStatements.add(statement);
+		}		
+	
+		// Identity diff
+		TIntObjectHashMap<IdentityDefinition> aIdentities = new TIntObjectHashMap<IdentityDefinition>();
+		ArrayList<Identity> bIdentities = new ArrayList<Identity>();
+		for(Identity id : a.identities)
+			aIdentities.put(id.resource, id.definition);
+		for(Identity id : b.identities) {
+			int a = bToA[id.resource];
+			IdentityDefinition def = aIdentities.get(a);
+			if(def != null && identityDefinitionEquals(bToA, def, id.definition))
+				aIdentities.remove(a);
+			else
+				bIdentities.add(id);
+		}
+		
+		// Value diff
+		TIntObjectHashMap<Variant> aValues = new TIntObjectHashMap<Variant>();
+		ArrayList<Value> bValues = new ArrayList<Value>();
+		for(Value value : a.values)
+			aValues.put(value.resource, value.value);
+		
+		for(Value value : b.values) {
+			int a = bToA[value.resource]; // a may be -1
+			Variant aValue = aValues.get(a);
+			if(aValue != null && aValue.equals(value.value))
+				aValues.remove(a);
+			else
+				bValues.add(value);
+		}
+				
+		// Create result
+		TransferableGraphDelta1 result = new TransferableGraphDelta1(
+				aToB,
+				new TransferableGraph1(
+					a.resourceCount,
+					toIdentityArray(aIdentities),
+					toStatementArray(aStatements),
+					toValueArray(aValues)
+				),
+				new TransferableGraph1(
+					b.resourceCount,
+					bIdentities.toArray(new Identity[bIdentities.size()]),
+					toStatementArray(bStatements),
+					bValues.toArray(new Value[bValues.size()])
+				)
+			);
+		if(GraphMatching.TIMING) {
+			long end = System.nanoTime();
+			System.out.println("Diffing: " + (end-begin)*1e-6 + "ms");
+		}
+		return result;
+	}
+	
+	private static boolean identityDefinitionEquals(int[] bToA,
+			IdentityDefinition a, IdentityDefinition b) {		
+		if(a instanceof Root)
+			return b instanceof Root && ((Root)a).name.equals(((Root)b).name);
+		if(b instanceof Root)
+			return false;
+		int aParent, bParent;
+		String aName, bName;
+		
+		if(b instanceof External) {
+			External def = (External)b;
+			bParent = def.parent;
+			bName = def.name;
+		}
+		else if(b instanceof Internal) {
+			Internal def = (Internal)b;
+			bParent = def.parent;
+			bName = def.name;
+		}
+		else if(b instanceof Optional) {
+			Optional def = (Optional)b;
+			bParent = def.parent;
+			bName = def.name;
+		}
+		else
+			return false;
+		bParent = bToA[bParent];
+		if(bParent < 0)
+			return false;
+		
+		if(a instanceof External) {
+			External def = (External)a;
+			aParent = def.parent;
+			aName = def.name;
+		}
+		else if(a instanceof Internal) {
+			Internal def = (Internal)a;
+			aParent = def.parent;
+			aName = def.name;
+		}
+		else if(a instanceof Optional) {
+			Optional def = (Optional)a;
+			aParent = def.parent;
+			aName = def.name;
+		}
+		else
+			return false;
+		return aParent == bParent && aName.equals(bName);
+	}
+
+	static int[] toStatementArray(Collection<Statement> statements) {
+		int[] result = new int[4*statements.size()];
+		int i=0;
+		for(Statement statement : statements) {
+			result[i++] = statement.subject;
+			result[i++] = statement.predicate;
+			result[i++] = statement.inverse;
+			result[i++] = statement.object;
+		}
+		return result;
+	}
+	
+	static Value[] toValueArray(TIntObjectHashMap<Variant> values) {
+		final Value[] result = new Value[values.size()];
+		values.forEachEntry(new TIntObjectProcedure<Variant>() {
+			int i=0;
+			@Override
+			public boolean execute(int a, Variant b) {
+				result[i++] = new Value(a, b);
+				return true;
+			}
+		});
+		return result;
+	}
+	
+	static Identity[] toIdentityArray(TIntObjectHashMap<IdentityDefinition> identities) {
+		final Identity[] result = new Identity[identities.size()];
+		identities.forEachEntry(new TIntObjectProcedure<IdentityDefinition>() {
+			int i=0;
+			@Override
+			public boolean execute(int a, IdentityDefinition b) {
+				result[i++] = new Identity(a, b);
+				return true;
+			}
+		});
+		return result;
+	}
+	
 }
\ No newline at end of file