X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.graph%2Fsrc%2Forg%2Fsimantics%2Fgraph%2Fstore%2FStatementStore.java;h=ae00f9d984907ce68addc54f2c1b8f6b91e269e9;hb=HEAD;hp=02dfddde81085d06727089863185c4e10345d54f;hpb=36282d240b9ac295894a6705672efa11eb26e4d2;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.graph/src/org/simantics/graph/store/StatementStore.java b/bundles/org.simantics.graph/src/org/simantics/graph/store/StatementStore.java
index 02dfddde8..ae00f9d98 100644
--- a/bundles/org.simantics.graph/src/org/simantics/graph/store/StatementStore.java
+++ b/bundles/org.simantics.graph/src/org/simantics/graph/store/StatementStore.java
@@ -1,352 +1,352 @@
-package org.simantics.graph.store;
-
-import java.util.ArrayList;
-
-import gnu.trove.list.array.TIntArrayList;
-import gnu.trove.map.hash.TIntIntHashMap;
-import gnu.trove.map.hash.TIntObjectHashMap;
-import gnu.trove.procedure.TIntObjectProcedure;
-import gnu.trove.procedure.TIntProcedure;
-import gnu.trove.procedure.TObjectProcedure;
-import gnu.trove.set.hash.TIntHashSet;
-
-/**
- * Statement store indexes a set of statements. 
- * @author Hannu Niemist�
- */
-public class StatementStore implements IStore {
-	
-	static private final TIntArrayList EMPTY_INT_LIST = new TIntArrayList(0);	
-	
-	TIntObjectHashMap<TIntObjectHashMap<TIntArrayList>> statements =
-		new TIntObjectHashMap<TIntObjectHashMap<TIntArrayList>>();
-	
-	/**
-	 * Adds a statement to the store.
-	 * @param subject
-	 * @param predicate
-	 * @param object
-	 */
-	public void add(int subject, int predicate, int object) {
-		assert(subject >= 0);
-		assert(predicate >= 0);
-		assert(object >= 0);
-		TIntObjectHashMap<TIntArrayList> localStatements = 
-			statements.get(subject);
-		if(localStatements == null) {
-			localStatements = new TIntObjectHashMap<TIntArrayList>(3);
-			statements.put(subject, localStatements);
-		}
-		TIntArrayList objects = localStatements.get(predicate);
-		if(objects == null) {
-			objects = new TIntArrayList(2);
-			localStatements.put(predicate, objects);
-		}
-		objects.add(object);
-	}
-	
-	public void map(final TIntIntHashMap map) {
-		final TIntObjectHashMap<TIntObjectHashMap<TIntArrayList>> newStatements = 
-			new TIntObjectHashMap<TIntObjectHashMap<TIntArrayList>>(statements.size()*2+1);
-		statements.forEachEntry(new TIntObjectProcedure<TIntObjectHashMap<TIntArrayList>>() {
-			
-			TIntObjectHashMap<TIntArrayList> newLocalStatements;
-			TIntArrayList newObjects;
-			
-			TIntProcedure objectProcedure = new TIntProcedure() {								
-				@Override
-				public boolean execute(int o) {
-					if(map.contains(o))
-						o = map.get(o);
-					newObjects.add(o);
-					return true;
-				}
-			};
-			
-			TIntObjectProcedure<TIntArrayList> predicateProcedure = new TIntObjectProcedure<TIntArrayList>() {
-				@Override
-				public boolean execute(int p, TIntArrayList objects) {
-					if(map.contains(p))
-						p = map.get(p);
-					TIntArrayList exObjects = newLocalStatements.get(p);
-					if(exObjects == null) {
-						IndexMappingUtils.map(map, objects);
-						newLocalStatements.put(p, objects);
-					}
-					else {
-						newObjects = exObjects;
-						objects.forEach(objectProcedure);
-					}
-					return true;
-				}
-			};
-			
-			@Override
-			public boolean execute(int s, TIntObjectHashMap<TIntArrayList> localStatements) {
-				if(map.contains(s))
-					s = map.get(s);
-				TIntObjectHashMap<TIntArrayList> exLocalStatements = newStatements.get(s);				
-				if(exLocalStatements == null) {
-					exLocalStatements = new TIntObjectHashMap<TIntArrayList>(localStatements.size()*2 + 1);
-					newStatements.put(s, exLocalStatements);
-				}
-				newLocalStatements = exLocalStatements;
-				localStatements.forEachEntry(predicateProcedure);
-				return true;
-			}
-		});
-		statements = newStatements;
-	}
-	
-	public void forStatements(final IStatementProcedure proc) {
-		statements.forEachEntry(new TIntObjectProcedure<TIntObjectHashMap<TIntArrayList>>() {
-			@Override
-			public boolean execute(final int s, TIntObjectHashMap<TIntArrayList> localStatements) {
-				localStatements.forEachEntry(new TIntObjectProcedure<TIntArrayList>() {
-					@Override
-					public boolean execute(final int p, TIntArrayList objects) {
-						objects.forEach(new TIntProcedure() {							
-							@Override
-							public boolean execute(int o) {
-								proc.execute(s, p, o);
-								return true;
-							}
-						});
-						return true;
-					}
-				});
-				return true;
-			}
-		});
-	}
-	
-	private static class ForStatementsWithSubjectProc implements TIntObjectProcedure<TIntArrayList>, TIntProcedure {
-		int s;
-		int p;
-		IStatementProcedure proc;
-		
-		public ForStatementsWithSubjectProc(int s, IStatementProcedure proc) {
-			this.s = s;
-			this.proc = proc;
-		}
-
-		@Override
-		public boolean execute(int o) {
-			proc.execute(s, p, o);
-			return true;
-		}
-
-		@Override
-		public boolean execute(int p, TIntArrayList b) {
-			this.p = p;
-			b.forEach(this);
-			return true;
-		}		
-	}
-	
-	public void forStatementsWithSubject(int s, IStatementProcedure proc) {
-		TIntObjectHashMap<TIntArrayList> localStatements = statements.get(s);
-		if(localStatements == null)
-			return;
-		localStatements.forEachEntry(new ForStatementsWithSubjectProc(s, proc));
-	}
-	
-	public void forStatements(final int predicate, final IStatementProcedure proc) {
-		statements.forEachEntry(new TIntObjectProcedure<TIntObjectHashMap<TIntArrayList>>() {
-			@Override
-			public boolean execute(final int s, TIntObjectHashMap<TIntArrayList> localStatements) {
-				TIntArrayList objects = localStatements.get(predicate);
-				if(objects != null)
-					objects.forEach(new TIntProcedure() {							
-							@Override
-							public boolean execute(int o) {
-								proc.execute(s, predicate, o);
-								return true;
-							}
-						});						
-				return true;
-			}
-		});
-	}
-	
-	public TIntArrayList getRelation(int predicate) {
-		final TIntArrayList result = new TIntArrayList();
-		forStatements(predicate, new IStatementProcedure() {			
-			@Override
-			public void execute(int s, int p, int o) {
-				result.add(s);
-				result.add(o);
-			}
-		});
-		return result;
-	}
-	
-	public TIntHashSet getRelationDomain(final int predicate) {
-		final TIntHashSet result = new TIntHashSet();
-		statements.forEachEntry(new TIntObjectProcedure<TIntObjectHashMap<TIntArrayList>>() {
-			@Override
-			public boolean execute(int s, TIntObjectHashMap<TIntArrayList> localStatements) {
-				if(localStatements.containsKey(predicate))
-					result.add(s);
-				return true;
-			}
-		});
-		return result;
-	}
-	
-	public TIntArrayList extractRelation(final int predicate) {
-		final TIntArrayList result = new TIntArrayList();
-		final TIntArrayList removals = new TIntArrayList();
-		statements.forEachEntry(new TIntObjectProcedure<TIntObjectHashMap<TIntArrayList>>() {
-			@Override
-			public boolean execute(int s, TIntObjectHashMap<TIntArrayList> localStatements) {
-				TIntArrayList objects = localStatements.remove(predicate);
-				if(objects != null) {
-					for(int o : objects.toArray()) {
-						result.add(s);
-						result.add(o);
-					}
-				}
-				if(localStatements.isEmpty())
-					removals.add(s);
-				return true;
-			}
-		});
-		for(int s : removals.toArray())
-			statements.remove(s);
-		return result;
-	}
-	
-	public TIntArrayList getObjects(int subject, int predicate) {
-		TIntObjectHashMap<TIntArrayList> localStatements = statements.get(subject);
-		if(localStatements == null)
-			return EMPTY_INT_LIST;
-		TIntArrayList objects = localStatements.get(predicate);
-		if(objects == null)
-			return EMPTY_INT_LIST;
-		return objects;
-	}
-
-	public int[] toArray(final TIntIntHashMap inverseMap) {
-		final TIntArrayList statements = new TIntArrayList();
-		forStatements(new IStatementProcedure() {			
-			@Override
-			public void execute(int s, int p, int o) {
-				statements.add(s);
-				statements.add(p);
-				int inverse = -1;
-				if(inverseMap.contains(p)) {
-					inverse = inverseMap.get(p);
-					if(p==inverse && s == o)
-						inverse = -1;
-				}
-				statements.add(inverse);
-				statements.add(o);				
-			}
-		});
-		return statements.toArray();
-	}
-	
-	public void collectReferences(final boolean[] set) {
-		forStatements(new IStatementProcedure() {			
-			@Override
-			public void execute(int s, int p, int o) {
-				set[s] = true;
-				set[p] = true;
-				set[o] = true;		
-			}
-		});
-	}
-
-	public TIntHashSet getPredicates() {
-		final TIntHashSet result = new TIntHashSet();
-		statements.forEachValue(new TObjectProcedure<TIntObjectHashMap<TIntArrayList>>() {			
-			TIntProcedure proc = new TIntProcedure() {				
-				@Override
-				public boolean execute(int value) {
-					result.add(value);
-					return true;
-				}
-			};			
-			@Override
-			public boolean execute(TIntObjectHashMap<TIntArrayList> localStatements) {
-				localStatements.forEachKey(proc);
-				return true;
-			}
-		});
-		return result;
-	}
-
-	public int[] toArray() {
-		final TIntArrayList statements = new TIntArrayList();
-		forStatements(new IStatementProcedure() {			
-			@Override
-			public void execute(int s, int p, int o) {
-				statements.add(s);
-				statements.add(p);
-				statements.add(-1);
-				statements.add(o);				
-			}
-		});
-		return statements.toArray();
-	}
-
-	private static class CollisionSubjectProcedure implements TIntObjectProcedure<TIntObjectHashMap<TIntArrayList>> {
-	    CollisionPredicateProcedure predicateProcedure;
-
-	    public CollisionSubjectProcedure(CollisionPredicateProcedure predicateProcedure) {
-	        this.predicateProcedure = predicateProcedure;
-	    }
-
-	    @Override
-	    public boolean execute(int subject, TIntObjectHashMap<TIntArrayList> predicateObjectMap) {
-	        predicateProcedure.subject = subject;
-	        predicateObjectMap.forEachEntry(predicateProcedure);
-	        return true;
-	    }
-
-	}
-
-	private static class CollisionPredicateProcedure implements TIntObjectProcedure<TIntArrayList> {
-        ArrayList<StatementCollision> collisions;
-	    int subject;
-	    
-	    public CollisionPredicateProcedure(ArrayList<StatementCollision> collisions) {
-            this.collisions = collisions;
-        }
-	    
-        @Override
-	    public boolean execute(int predicate, TIntArrayList objects) {
-	        if(objects.size() > 1) {
-	            objects.sort();
-	            int oldObject = objects.get(0);
-	            int collisionCount = 1;
-	            for(int i=1;i<objects.size();++i) {
-	                int curObject = objects.get(i);
-	                if(curObject == oldObject) {
-	                    ++collisionCount;
-	                }
-	                else {
-	                    if(collisionCount > 1) {
-	                        collisions.add(new StatementCollision(subject, predicate, oldObject, collisionCount));
-	                        collisionCount = 1;
-	                    }
-	                    oldObject = curObject;
-	                }
-	            }
-                if(collisionCount > 1)
-                    collisions.add(new StatementCollision(subject, predicate, oldObject, collisionCount));
-	        }
-	        return true;
-	    }
-
-	}
-
-	public ArrayList<StatementCollision> getCollisions() {
-	    ArrayList<StatementCollision> collisions = new ArrayList<StatementCollision>();
-	    CollisionPredicateProcedure predicateProcedure = new CollisionPredicateProcedure(collisions);
-	    CollisionSubjectProcedure subjectProcedure = new CollisionSubjectProcedure(predicateProcedure);
-	    statements.forEachEntry(subjectProcedure);
-	    return collisions;
-	}	
-}
+package org.simantics.graph.store;
+
+import java.util.ArrayList;
+
+import gnu.trove.list.array.TIntArrayList;
+import gnu.trove.map.hash.TIntIntHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
+import gnu.trove.procedure.TIntObjectProcedure;
+import gnu.trove.procedure.TIntProcedure;
+import gnu.trove.procedure.TObjectProcedure;
+import gnu.trove.set.hash.TIntHashSet;
+
+/**
+ * Statement store indexes a set of statements. 
+ * @author Hannu Niemist�
+ */
+public class StatementStore implements IStore {
+	
+	static private final TIntArrayList EMPTY_INT_LIST = new TIntArrayList(0);	
+	
+	TIntObjectHashMap<TIntObjectHashMap<TIntArrayList>> statements =
+		new TIntObjectHashMap<TIntObjectHashMap<TIntArrayList>>();
+	
+	/**
+	 * Adds a statement to the store.
+	 * @param subject
+	 * @param predicate
+	 * @param object
+	 */
+	public void add(int subject, int predicate, int object) {
+		assert(subject >= 0);
+		assert(predicate >= 0);
+		assert(object >= 0);
+		TIntObjectHashMap<TIntArrayList> localStatements = 
+			statements.get(subject);
+		if(localStatements == null) {
+			localStatements = new TIntObjectHashMap<TIntArrayList>(3);
+			statements.put(subject, localStatements);
+		}
+		TIntArrayList objects = localStatements.get(predicate);
+		if(objects == null) {
+			objects = new TIntArrayList(2);
+			localStatements.put(predicate, objects);
+		}
+		objects.add(object);
+	}
+	
+	public void map(final TIntIntHashMap map) {
+		final TIntObjectHashMap<TIntObjectHashMap<TIntArrayList>> newStatements = 
+			new TIntObjectHashMap<TIntObjectHashMap<TIntArrayList>>(statements.size()*2+1);
+		statements.forEachEntry(new TIntObjectProcedure<TIntObjectHashMap<TIntArrayList>>() {
+			
+			TIntObjectHashMap<TIntArrayList> newLocalStatements;
+			TIntArrayList newObjects;
+			
+			TIntProcedure objectProcedure = new TIntProcedure() {								
+				@Override
+				public boolean execute(int o) {
+					if(map.contains(o))
+						o = map.get(o);
+					newObjects.add(o);
+					return true;
+				}
+			};
+			
+			TIntObjectProcedure<TIntArrayList> predicateProcedure = new TIntObjectProcedure<TIntArrayList>() {
+				@Override
+				public boolean execute(int p, TIntArrayList objects) {
+					if(map.contains(p))
+						p = map.get(p);
+					TIntArrayList exObjects = newLocalStatements.get(p);
+					if(exObjects == null) {
+						IndexMappingUtils.map(map, objects);
+						newLocalStatements.put(p, objects);
+					}
+					else {
+						newObjects = exObjects;
+						objects.forEach(objectProcedure);
+					}
+					return true;
+				}
+			};
+			
+			@Override
+			public boolean execute(int s, TIntObjectHashMap<TIntArrayList> localStatements) {
+				if(map.contains(s))
+					s = map.get(s);
+				TIntObjectHashMap<TIntArrayList> exLocalStatements = newStatements.get(s);				
+				if(exLocalStatements == null) {
+					exLocalStatements = new TIntObjectHashMap<TIntArrayList>(localStatements.size()*2 + 1);
+					newStatements.put(s, exLocalStatements);
+				}
+				newLocalStatements = exLocalStatements;
+				localStatements.forEachEntry(predicateProcedure);
+				return true;
+			}
+		});
+		statements = newStatements;
+	}
+	
+	public void forStatements(final IStatementProcedure proc) {
+		statements.forEachEntry(new TIntObjectProcedure<TIntObjectHashMap<TIntArrayList>>() {
+			@Override
+			public boolean execute(final int s, TIntObjectHashMap<TIntArrayList> localStatements) {
+				localStatements.forEachEntry(new TIntObjectProcedure<TIntArrayList>() {
+					@Override
+					public boolean execute(final int p, TIntArrayList objects) {
+						objects.forEach(new TIntProcedure() {							
+							@Override
+							public boolean execute(int o) {
+								proc.execute(s, p, o);
+								return true;
+							}
+						});
+						return true;
+					}
+				});
+				return true;
+			}
+		});
+	}
+	
+	private static class ForStatementsWithSubjectProc implements TIntObjectProcedure<TIntArrayList>, TIntProcedure {
+		int s;
+		int p;
+		IStatementProcedure proc;
+		
+		public ForStatementsWithSubjectProc(int s, IStatementProcedure proc) {
+			this.s = s;
+			this.proc = proc;
+		}
+
+		@Override
+		public boolean execute(int o) {
+			proc.execute(s, p, o);
+			return true;
+		}
+
+		@Override
+		public boolean execute(int p, TIntArrayList b) {
+			this.p = p;
+			b.forEach(this);
+			return true;
+		}		
+	}
+	
+	public void forStatementsWithSubject(int s, IStatementProcedure proc) {
+		TIntObjectHashMap<TIntArrayList> localStatements = statements.get(s);
+		if(localStatements == null)
+			return;
+		localStatements.forEachEntry(new ForStatementsWithSubjectProc(s, proc));
+	}
+	
+	public void forStatements(final int predicate, final IStatementProcedure proc) {
+		statements.forEachEntry(new TIntObjectProcedure<TIntObjectHashMap<TIntArrayList>>() {
+			@Override
+			public boolean execute(final int s, TIntObjectHashMap<TIntArrayList> localStatements) {
+				TIntArrayList objects = localStatements.get(predicate);
+				if(objects != null)
+					objects.forEach(new TIntProcedure() {							
+							@Override
+							public boolean execute(int o) {
+								proc.execute(s, predicate, o);
+								return true;
+							}
+						});						
+				return true;
+			}
+		});
+	}
+	
+	public TIntArrayList getRelation(int predicate) {
+		final TIntArrayList result = new TIntArrayList();
+		forStatements(predicate, new IStatementProcedure() {			
+			@Override
+			public void execute(int s, int p, int o) {
+				result.add(s);
+				result.add(o);
+			}
+		});
+		return result;
+	}
+	
+	public TIntHashSet getRelationDomain(final int predicate) {
+		final TIntHashSet result = new TIntHashSet();
+		statements.forEachEntry(new TIntObjectProcedure<TIntObjectHashMap<TIntArrayList>>() {
+			@Override
+			public boolean execute(int s, TIntObjectHashMap<TIntArrayList> localStatements) {
+				if(localStatements.containsKey(predicate))
+					result.add(s);
+				return true;
+			}
+		});
+		return result;
+	}
+	
+	public TIntArrayList extractRelation(final int predicate) {
+		final TIntArrayList result = new TIntArrayList();
+		final TIntArrayList removals = new TIntArrayList();
+		statements.forEachEntry(new TIntObjectProcedure<TIntObjectHashMap<TIntArrayList>>() {
+			@Override
+			public boolean execute(int s, TIntObjectHashMap<TIntArrayList> localStatements) {
+				TIntArrayList objects = localStatements.remove(predicate);
+				if(objects != null) {
+					for(int o : objects.toArray()) {
+						result.add(s);
+						result.add(o);
+					}
+				}
+				if(localStatements.isEmpty())
+					removals.add(s);
+				return true;
+			}
+		});
+		for(int s : removals.toArray())
+			statements.remove(s);
+		return result;
+	}
+	
+	public TIntArrayList getObjects(int subject, int predicate) {
+		TIntObjectHashMap<TIntArrayList> localStatements = statements.get(subject);
+		if(localStatements == null)
+			return EMPTY_INT_LIST;
+		TIntArrayList objects = localStatements.get(predicate);
+		if(objects == null)
+			return EMPTY_INT_LIST;
+		return objects;
+	}
+
+	public int[] toArray(final TIntIntHashMap inverseMap) {
+		final TIntArrayList statements = new TIntArrayList();
+		forStatements(new IStatementProcedure() {			
+			@Override
+			public void execute(int s, int p, int o) {
+				statements.add(s);
+				statements.add(p);
+				int inverse = -1;
+				if(inverseMap.contains(p)) {
+					inverse = inverseMap.get(p);
+					if(p==inverse && s == o)
+						inverse = -1;
+				}
+				statements.add(inverse);
+				statements.add(o);				
+			}
+		});
+		return statements.toArray();
+	}
+	
+	public void collectReferences(final boolean[] set) {
+		forStatements(new IStatementProcedure() {			
+			@Override
+			public void execute(int s, int p, int o) {
+				set[s] = true;
+				set[p] = true;
+				set[o] = true;		
+			}
+		});
+	}
+
+	public TIntHashSet getPredicates() {
+		final TIntHashSet result = new TIntHashSet();
+		statements.forEachValue(new TObjectProcedure<TIntObjectHashMap<TIntArrayList>>() {			
+			TIntProcedure proc = new TIntProcedure() {				
+				@Override
+				public boolean execute(int value) {
+					result.add(value);
+					return true;
+				}
+			};			
+			@Override
+			public boolean execute(TIntObjectHashMap<TIntArrayList> localStatements) {
+				localStatements.forEachKey(proc);
+				return true;
+			}
+		});
+		return result;
+	}
+
+	public int[] toArray() {
+		final TIntArrayList statements = new TIntArrayList();
+		forStatements(new IStatementProcedure() {			
+			@Override
+			public void execute(int s, int p, int o) {
+				statements.add(s);
+				statements.add(p);
+				statements.add(-1);
+				statements.add(o);				
+			}
+		});
+		return statements.toArray();
+	}
+
+	private static class CollisionSubjectProcedure implements TIntObjectProcedure<TIntObjectHashMap<TIntArrayList>> {
+	    CollisionPredicateProcedure predicateProcedure;
+
+	    public CollisionSubjectProcedure(CollisionPredicateProcedure predicateProcedure) {
+	        this.predicateProcedure = predicateProcedure;
+	    }
+
+	    @Override
+	    public boolean execute(int subject, TIntObjectHashMap<TIntArrayList> predicateObjectMap) {
+	        predicateProcedure.subject = subject;
+	        predicateObjectMap.forEachEntry(predicateProcedure);
+	        return true;
+	    }
+
+	}
+
+	private static class CollisionPredicateProcedure implements TIntObjectProcedure<TIntArrayList> {
+        ArrayList<StatementCollision> collisions;
+	    int subject;
+	    
+	    public CollisionPredicateProcedure(ArrayList<StatementCollision> collisions) {
+            this.collisions = collisions;
+        }
+	    
+        @Override
+	    public boolean execute(int predicate, TIntArrayList objects) {
+	        if(objects.size() > 1) {
+	            objects.sort();
+	            int oldObject = objects.get(0);
+	            int collisionCount = 1;
+	            for(int i=1;i<objects.size();++i) {
+	                int curObject = objects.get(i);
+	                if(curObject == oldObject) {
+	                    ++collisionCount;
+	                }
+	                else {
+	                    if(collisionCount > 1) {
+	                        collisions.add(new StatementCollision(subject, predicate, oldObject, collisionCount));
+	                        collisionCount = 1;
+	                    }
+	                    oldObject = curObject;
+	                }
+	            }
+                if(collisionCount > 1)
+                    collisions.add(new StatementCollision(subject, predicate, oldObject, collisionCount));
+	        }
+	        return true;
+	    }
+
+	}
+
+	public ArrayList<StatementCollision> getCollisions() {
+	    ArrayList<StatementCollision> collisions = new ArrayList<StatementCollision>();
+	    CollisionPredicateProcedure predicateProcedure = new CollisionPredicateProcedure(collisions);
+	    CollisionSubjectProcedure subjectProcedure = new CollisionSubjectProcedure(predicateProcedure);
+	    statements.forEachEntry(subjectProcedure);
+	    return collisions;
+	}	
+}