moving writing method again up to Graph; introduce pillarNodes methods; new RawEdgeIterator to show the difference between getAllEdges and the other edges methods

Author: Peter

src/main/java/com/graphhopper/routing/ch/PrepareContractionHierarchies.java

@@ -31,10 +31,10 @@
 import com.graphhopper.storage.LevelGraph;
 import com.graphhopper.util.EdgeIterator;
 import com.graphhopper.util.EdgeSkipIterator;
-import com.graphhopper.util.EdgeWriteIterator;
 import com.graphhopper.util.GraphUtility;
 import com.graphhopper.util.Helper;
 import com.graphhopper.util.NumHelper;
+import com.graphhopper.util.RawEdgeIterator;
 import com.graphhopper.util.StopWatch;
 import gnu.trove.list.array.TIntArrayList;
 import java.util.ArrayList;
@@ -107,7 +107,7 @@ boolean prepareEdges() {
         // in CH the flags will be ignored (calculating the new flags for the shortcuts is impossible)
         // also several shortcuts would be necessary with the different modes (e.g. fastest and shortest)
         // so calculate the weight and store this as distance, then use only distance instead of getWeight
-        EdgeWriteIterator iter = g.getAllEdges();
+        RawEdgeIterator iter = g.getAllEdges();
         int c = 0;
         while (iter.next()) {
             c++;
@@ -289,7 +289,7 @@ Collection<Shortcut> findShortcuts(int v) {
         // we can use distance instead of weight, see prepareEdges where distance is overwritten by weight!
         List<NodeCH> goalNodes = new ArrayList<NodeCH>();
         shortcuts.clear();
-        EdgeWriteIterator iter1 = g.getIncoming(v);
+        EdgeIterator iter1 = g.getIncoming(v);
         // TODO PERFORMANCE collect outgoing nodes (goalnodes) only once and just skip u
         while (iter1.next()) {
             int u = iter1.node();
@@ -301,7 +301,7 @@ Collection<Shortcut> findShortcuts(int v) {
 
             // one-to-many shortest path
             goalNodes.clear();
-            EdgeWriteIterator iter2 = g.getOutgoing(v);
+            EdgeIterator iter2 = g.getOutgoing(v);
             double maxWeight = 0;
             while (iter2.next()) {
                 int w = iter2.node();

src/main/java/com/graphhopper/routing/util/EdgeLevelFilter.java

@@ -17,6 +17,8 @@
 
 import com.graphhopper.storage.LevelGraph;
 import com.graphhopper.util.EdgeIterator;
+import gnu.trove.TIntCollection;
+import gnu.trove.iterator.TIntIterator;
 
 /**
  * Only certain nodes are accepted and therefor the others are filtered out.
@@ -73,4 +75,20 @@ public boolean accept() {
     @Override public boolean isEmpty() {
         return false;
     }
+
+    @Override public TIntIterator pillarNodes() {
+        return edgeIter.pillarNodes();
+    }
+
+    @Override public void pillarNodes(TIntCollection pillarNodes) {
+        edgeIter.pillarNodes(pillarNodes);
+    }
+
+    @Override public void distance(double dist) {
+        edgeIter.distance(dist);
+    }
+
+    @Override public void flags(int flags) {
+        edgeIter.flags(flags);
+    }
 }

src/main/java/com/graphhopper/storage/Graph.java

@@ -16,8 +16,8 @@
 package com.graphhopper.storage;
 
 import com.graphhopper.util.EdgeIterator;
+import com.graphhopper.util.RawEdgeIterator;
 import com.graphhopper.util.shapes.BBox;
-import gnu.trove.list.TIntList;
 
 /**
  * An interface to represent a (geo) graph - suited for efficient storage as it can be requested via
@@ -56,14 +56,11 @@ public interface Graph {
      * @param b the index of the ending (tower) node of the edge
      * @param distance necessary if no setNode is called - e.g. if the graph is not a geo-graph
      * @param flags see EdgeFlags - involves velocity and direction
-     * @param nodesOnPath list of nodes between a and b but inclusive the tower nodes a and b. The nodes
-     * between a and b would otherwise have no connection - so called pillar nodes.
+     * @return the created edge
      */
-    void edge(int a, int b, double distance, int flags, TIntList nodesOnPath);
-    
-    void edge(int a, int b, double distance, int flags);
+    EdgeIterator edge(int a, int b, double distance, int flags);
 
-    void edge(int a, int b, double distance, boolean bothDirections);        
+    EdgeIterator edge(int a, int b, double distance, boolean bothDirections);
 
     /**
      * @return an edge iterator over one element where the method next() has no meaning and will
@@ -73,7 +70,10 @@ public interface Graph {
      */
     EdgeIterator getEdgeProps(int edgeId, int endNode);
 
-    EdgeIterator getAllEdges();
+    /**
+     * @return all edges in this graph
+     */
+    RawEdgeIterator getAllEdges();
 
     /**
      * Returns an iterator which makes it possible to traverse all edges of the specified node
@@ -82,8 +82,6 @@ public interface Graph {
      */
     EdgeIterator getEdges(int index);
 
-    EdgeIterator getEdges(int index, EdgeFilter filter);
-
     EdgeIterator getIncoming(int index);
 
     EdgeIterator getOutgoing(int index);