MAJOR: removed getOutgoing and getIncoming - makes no sense for vehicle neutral Graph; other refactorings

Author: Peter

src/main/java/com/graphhopper/GHRequest.java

@@ -19,7 +19,7 @@
 package com.graphhopper;
 
 import com.graphhopper.routing.util.CarFlagsEncoder;
-import com.graphhopper.routing.util.FlagsEncoder;
+import com.graphhopper.routing.util.VehicleType;
 import com.graphhopper.routing.util.ShortestCalc;
 import com.graphhopper.routing.util.WeightCalculation;
 import com.graphhopper.util.shapes.GHPoint;
@@ -35,7 +35,7 @@ public class GHRequest {
     private GHPoint from;
     private GHPoint to;
     private double precision = 1;
-    private FlagsEncoder encoder = new CarFlagsEncoder();
+    private VehicleType encoder = new CarFlagsEncoder();
     private WeightCalculation weightCalc = new ShortestCalc();
 
     /**
@@ -112,12 +112,12 @@ public WeightCalculation type() {
         return weightCalc;
     }
 
-    public GHRequest vehicle(FlagsEncoder encoder) {
+    public GHRequest vehicle(VehicleType encoder) {
         this.encoder = encoder;
         return this;
     }
 
-    public FlagsEncoder vehicle() {
+    public VehicleType vehicle() {
         return encoder;
     }
 }

src/main/java/com/graphhopper/GraphHopper.java

@@ -26,7 +26,7 @@
 import com.graphhopper.routing.util.AlgorithmPreparation;
 import com.graphhopper.routing.util.CarFlagsEncoder;
 import com.graphhopper.routing.util.FastestCalc;
-import com.graphhopper.routing.util.FlagsEncoder;
+import com.graphhopper.routing.util.VehicleType;
 import com.graphhopper.routing.util.FootFlagsEncoder;
 import com.graphhopper.routing.util.NoOpAlgorithmPreparation;
 import com.graphhopper.routing.util.ShortestCalc;
@@ -173,7 +173,7 @@ else if (new File(graphHopperFile + ".osm").exists())
                 storage = new LevelGraphStorage(dir);
                 PrepareContractionHierarchies tmpPrepareCH = new PrepareContractionHierarchies();
 
-                FlagsEncoder encoder;
+                VehicleType encoder;
                 if (acceptWay.acceptsCar())
                     encoder = new CarFlagsEncoder();
                 else

src/main/java/com/graphhopper/reader/OSMReader.java

@@ -23,7 +23,7 @@
 import com.graphhopper.routing.util.FastestCalc;
 import com.graphhopper.routing.ch.PrepareContractionHierarchies;
 import com.graphhopper.routing.util.CarFlagsEncoder;
-import com.graphhopper.routing.util.FlagsEncoder;
+import com.graphhopper.routing.util.VehicleType;
 import com.graphhopper.routing.util.NoOpAlgorithmPreparation;
 import com.graphhopper.routing.util.PrepareRoutingSubnetworks;
 import com.graphhopper.routing.util.RoutingAlgorithmSpecialAreaTests;
@@ -37,7 +37,7 @@
 import com.graphhopper.storage.Location2IDQuadtree;
 import com.graphhopper.storage.RAMDirectory;
 import com.graphhopper.util.CmdArgs;
-import com.graphhopper.util.GraphUtility;
+import com.graphhopper.util.GHUtility;
 import com.graphhopper.util.Helper;
 import static com.graphhopper.util.Helper.*;
 import com.graphhopper.util.Helper7;
@@ -218,8 +218,8 @@ void optimize() {
         // move this into the GraphStorage.optimize method?
         if (sortGraph) {
             logger.info("sorting ... (" + Helper.getMemInfo() + ")");
-            GraphStorage newGraph = GraphUtility.newStorage(graphStorage);
-            GraphUtility.sortDFS(graphStorage, newGraph);
+            GraphStorage newGraph = GHUtility.newStorage(graphStorage);
+            GHUtility.sortDFS(graphStorage, newGraph);
             graphStorage = newGraph;
         }
 
@@ -376,7 +376,7 @@ public OSMReader setCHShortcuts(String chShortcuts) {
         if (chShortcuts.isEmpty() || "no".equals(chShortcuts) || "false".equals(chShortcuts))
             return this;
 
-        FlagsEncoder encoder = new CarFlagsEncoder();
+        VehicleType encoder = new CarFlagsEncoder();
         int tmpIndex = chShortcuts.indexOf(",");
         if (tmpIndex >= 0)
             encoder = Helper.getEncoder(chShortcuts.substring(tmpIndex + 1).trim());

src/main/java/com/graphhopper/routing/AStarBidirection.java

@@ -27,7 +27,7 @@
 import com.graphhopper.util.DistanceCalc;
 import com.graphhopper.util.DistancePlaneProjection;
 import com.graphhopper.util.EdgeIterator;
-import com.graphhopper.util.GraphUtility;
+import com.graphhopper.util.GHUtility;
 import com.graphhopper.util.shapes.CoordTrig;
 import gnu.trove.map.TIntObjectMap;
 import gnu.trove.map.hash.TIntObjectHashMap;

src/main/java/com/graphhopper/routing/AbstractRoutingAlgorithm.java

@@ -21,7 +21,7 @@
 import com.graphhopper.routing.util.CarFlagsEncoder;
 import com.graphhopper.routing.util.DefaultEdgeFilter;
 import com.graphhopper.routing.util.EdgeFilter;
-import com.graphhopper.routing.util.FlagsEncoder;
+import com.graphhopper.routing.util.VehicleType;
 import com.graphhopper.routing.util.ShortestCalc;
 import com.graphhopper.routing.util.WeightCalculation;
 import com.graphhopper.storage.EdgeEntry;
@@ -36,17 +36,17 @@ public abstract class AbstractRoutingAlgorithm implements RoutingAlgorithm {
     protected WeightCalculation weightCalc;
     protected EdgeFilter outEdgeFilter;
     protected EdgeFilter inEdgeFilter;
-    protected FlagsEncoder flagsEncoder;
+    protected VehicleType flagsEncoder;
 
     public AbstractRoutingAlgorithm(Graph graph) {
         this.graph = graph;
         type(new ShortestCalc()).vehicle(new CarFlagsEncoder());
     }
 
-    @Override public RoutingAlgorithm vehicle(FlagsEncoder encoder) {
+    @Override public RoutingAlgorithm vehicle(VehicleType encoder) {
         this.flagsEncoder = encoder;
-        outEdgeFilter = new DefaultEdgeFilter(encoder).direction(false, true);
-        inEdgeFilter = new DefaultEdgeFilter(encoder).direction(true, false);
+        outEdgeFilter = new DefaultEdgeFilter(encoder, false, true);
+        inEdgeFilter = new DefaultEdgeFilter(encoder, true, false);
         return this;
     }
 

src/main/java/com/graphhopper/routing/Path.java

@@ -18,7 +18,7 @@
  */
 package com.graphhopper.routing;
 
-import com.graphhopper.routing.util.FlagsEncoder;
+import com.graphhopper.routing.util.VehicleType;
 import com.graphhopper.storage.EdgeEntry;
 import com.graphhopper.storage.Graph;
 import com.graphhopper.util.EdgeIterator;
@@ -41,7 +41,7 @@
 public class Path {
 
     protected Graph graph;
-    protected FlagsEncoder encoder;
+    protected VehicleType encoder;
     protected double distance;
     // we go upwards (via EdgeEntry.parent) from the goal node to the origin node
     protected boolean reverseOrder = true;
@@ -54,7 +54,7 @@ public class Path {
     private PointList cachedPoints;
     private double weight;
 
-    public Path(Graph graph, FlagsEncoder encoder) {
+    public Path(Graph graph, VehicleType encoder) {
         this.weight = Double.MAX_VALUE;
         this.graph = graph;
         this.encoder = encoder;

src/main/java/com/graphhopper/routing/PathBidir.java

@@ -18,7 +18,7 @@
  */
 package com.graphhopper.routing;
 
-import com.graphhopper.routing.util.FlagsEncoder;
+import com.graphhopper.routing.util.VehicleType;
 import com.graphhopper.storage.Graph;
 import com.graphhopper.util.EdgeWrapper;
 
@@ -36,7 +36,7 @@ public class PathBidir extends Path {
     private EdgeWrapper edgeWFrom;
     private EdgeWrapper edgeWTo;
 
-    public PathBidir(Graph g, FlagsEncoder encoder,
+    public PathBidir(Graph g, VehicleType encoder,
             EdgeWrapper edgesFrom, EdgeWrapper edgesTo) {
         super(g, encoder);
         this.edgeWFrom = edgesFrom;

src/main/java/com/graphhopper/routing/PathBidirRef.java

@@ -18,11 +18,11 @@
  */
 package com.graphhopper.routing;
 
-import com.graphhopper.routing.util.FlagsEncoder;
+import com.graphhopper.routing.util.VehicleType;
 import com.graphhopper.storage.EdgeEntry;
 import com.graphhopper.storage.Graph;
 import com.graphhopper.util.EdgeIterator;
-import com.graphhopper.util.GraphUtility;
+import com.graphhopper.util.GHUtility;
 
 /**
  * This class creates a DijkstraPath from two Edge's resulting from a
@@ -35,7 +35,7 @@ public class PathBidirRef extends Path {
     protected EdgeEntry edgeTo;
     private boolean switchWrapper = false;
 
-    public PathBidirRef(Graph g, FlagsEncoder encoder) {
+    public PathBidirRef(Graph g, VehicleType encoder) {
         super(g, encoder);
     }
 
@@ -63,8 +63,8 @@ public Path extract() {
         if (edgeEntry == null || edgeTo == null)
             return this;
 
-        int from = GraphUtility.getToNode(graph, edgeEntry.edge, edgeEntry.endNode);
-        int to = GraphUtility.getToNode(graph, edgeTo.edge, edgeTo.endNode);
+        int from = GHUtility.getToNode(graph, edgeEntry.edge, edgeEntry.endNode);
+        int to = GHUtility.getToNode(graph, edgeTo.edge, edgeTo.endNode);
         if (from != to)
             throw new IllegalStateException("Locations of the 'to'- and 'from'-Edge has to be the same." + toString());
 

src/main/java/com/graphhopper/routing/RoutingAlgorithm.java

@@ -18,7 +18,7 @@
  */
 package com.graphhopper.routing;
 
-import com.graphhopper.routing.util.FlagsEncoder;
+import com.graphhopper.routing.util.VehicleType;
 import com.graphhopper.routing.util.WeightCalculation;
 import com.graphhopper.util.NotThreadSafe;
 
@@ -49,7 +49,7 @@ public interface RoutingAlgorithm {
      * Specify which vehicle should be used to calculate the path. Default is
      * car.
      */
-    RoutingAlgorithm vehicle(FlagsEncoder encoder);
+    RoutingAlgorithm vehicle(VehicleType encoder);
 
     /**
      * @return name of this algorithm

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

@@ -19,7 +19,7 @@
 package com.graphhopper.routing.ch;
 
 import com.graphhopper.routing.PathBidirRef;
-import com.graphhopper.routing.util.FlagsEncoder;
+import com.graphhopper.routing.util.VehicleType;
 import com.graphhopper.routing.util.WeightCalculation;
 import com.graphhopper.storage.Graph;
 import com.graphhopper.util.EdgeIterator;
@@ -35,7 +35,7 @@ public class Path4CH extends PathBidirRef {
 
     private WeightCalculation calc;
 
-    public Path4CH(Graph g, FlagsEncoder encoder, WeightCalculation calc) {
+    public Path4CH(Graph g, VehicleType encoder, WeightCalculation calc) {
         super(g, encoder);
         this.calc = calc;
     }

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

@@ -30,7 +30,7 @@
 import com.graphhopper.routing.util.DefaultEdgeFilter;
 import com.graphhopper.routing.util.EdgeFilter;
 import com.graphhopper.routing.util.EdgeLevelFilterOld;
-import com.graphhopper.routing.util.FlagsEncoder;
+import com.graphhopper.routing.util.VehicleType;
 import com.graphhopper.routing.util.ShortestCalc;
 import com.graphhopper.routing.util.WeightCalculation;
 import com.graphhopper.storage.EdgeEntry;
@@ -39,7 +39,7 @@
 import com.graphhopper.storage.LevelGraphStorage;
 import com.graphhopper.util.EdgeIterator;
 import com.graphhopper.util.EdgeSkipIterator;
-import com.graphhopper.util.GraphUtility;
+import com.graphhopper.util.GHUtility;
 import com.graphhopper.util.Helper;
 import com.graphhopper.util.RawEdgeIterator;
 import com.graphhopper.util.StopWatch;
@@ -70,7 +70,7 @@ public class PrepareContractionHierarchies extends AbstractAlgoPreparation<Prepa
     private Logger logger = LoggerFactory.getLogger(getClass());
     private WeightCalculation shortestCalc;
     private WeightCalculation prepareWeightCalc;
-    private FlagsEncoder prepareEncoder;
+    private VehicleType prepareEncoder;
     private EdgeFilter inFilter;
     private EdgeFilter outFilter;
     private LevelGraph g;
@@ -115,10 +115,10 @@ public PrepareContractionHierarchies type(WeightCalculation weightCalc) {
         return this;
     }
 
-    public PrepareContractionHierarchies vehicle(FlagsEncoder encoder) {
+    public PrepareContractionHierarchies vehicle(VehicleType encoder) {
         this.prepareEncoder = encoder;
-        inFilter = new DefaultEdgeFilter(encoder).direction(true, false);
-        outFilter = new DefaultEdgeFilter(encoder).direction(false, true);
+        inFilter = new DefaultEdgeFilter(encoder, true, false);
+        outFilter = new DefaultEdgeFilter(encoder, false, true);
         scOneDir = encoder.flags(0, false);
         scBothDir = encoder.flags(0, true);
         return this;
@@ -158,7 +158,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 extractPath)
         // so calculate the weight and store this as distance, then use only distance instead of getWeight
-        RawEdgeIterator iter = g.allEdges();
+        RawEdgeIterator iter = g.getAllEdges();
         int c = 0;
         while (iter.next()) {
             c++;
@@ -289,7 +289,7 @@ int calculatePriority(int v) {
         // |shortcuts(v)| − |{(u, v) | v uncontracted}| − |{(v, w) | v uncontracted}|        
         // meanDegree is used instead of outDegree+inDegree as if one endNode is in both directions
         // only one bucket memory is used. Additionally one shortcut could also stand for two directions.
-        int degree = GraphUtility.count(g.getEdges(v));
+        int degree = GHUtility.count(g.getEdges(v));
         int edgeDifference = tmpShortcuts.size() - degree;
 
         // # huge influence: the bigger the less shortcuts gets created and the faster is the preparation

src/main/java/com/graphhopper/routing/rideshare/DijkstraWhichToOne.java

@@ -27,7 +27,7 @@
 import com.graphhopper.storage.EdgeEntry;
 import com.graphhopper.storage.Graph;
 import com.graphhopper.util.EdgeIterator;
-import com.graphhopper.util.GraphUtility;
+import com.graphhopper.util.GHUtility;
 import gnu.trove.list.array.TIntArrayList;
 import gnu.trove.map.TIntObjectMap;
 import gnu.trove.map.hash.TIntObjectHashMap;

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

@@ -21,7 +21,7 @@
 /**
  * @author Peter Karich
  */
-public class AbstractFlagEncoder implements FlagsEncoder {
+public class AbstractFlagEncoder implements VehicleType {
 
     /**
      * This variable converts the stored value to the speed in km/h or does the
@@ -68,7 +68,6 @@ public boolean canBeOverwritten(int flags1, int flags2) {
         return isBoth(flags2) || (flags1 & BOTH) == (flags2 & BOTH);
     }
 
-    @Override
     public int swapDirection(int flags) {
         int dir = flags & BOTH;
         if (dir == BOTH || dir == 0)
@@ -85,7 +84,6 @@ public int getSpeed(int flags) {
         return getSpeedPart(flags) * factor;
     }
 
-    @Override
     public int flagsDefault(boolean bothDirections) {
         if (bothDirections)
             return defaultSpeedPart << speedShift | BOTH;

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

@@ -239,29 +239,4 @@ public String toString() {
             str += "FOOT";
         return str;
     }
-
-    public CombinedEncoder createCombination() {
-        return new CombinedEncoder() {
-            @Override public int swapDirection(int flags) {
-                if (foot)
-                    flags = footEncoder.swapDirection(flags);
-                if (bike)
-                    flags = bikeEncoder.swapDirection(flags);
-                if (car)
-                    flags = carEncoder.swapDirection(flags);
-                return flags;
-            }
-
-            @Override public int flagsDefault(boolean bothDirections) {
-                int res = 0;
-                if (foot)
-                    res |= footEncoder.flagsDefault(bothDirections);
-                if (bike)
-                    res |= bikeEncoder.flagsDefault(bothDirections);
-                if (car)
-                    res |= carEncoder.flagsDefault(bothDirections);
-                return res;
-            }
-        };
-    }
 }