no pre-calculation of weight, for graphhopper#111 and more compact edges if two weights per edges

Author: Peter

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

@@ -102,7 +102,7 @@ protected Path setFromNode( int from )
      */
     private int getFromNode()
     {
-        if (!EdgeIterator.Edge.isValid(fromNode))
+        if (fromNode < 0)
             throw new IllegalStateException("Call extract() before retrieving fromNode");
 
         return fromNode;
@@ -196,20 +196,12 @@ public String getDebugInfo()
     protected void processEdge( int edgeId, int endNode )
     {
         EdgeIteratorState iter = graph.getEdgeProps(edgeId, endNode);
-        double dist = calcDistance(iter);
+        double dist = iter.getDistance();
         distance += dist;
         millis += calcMillis(dist, iter.getFlags());
         addEdge(edgeId);
     }
 
-    /**
-     * This method returns the distance in meter for the specified edge.
-     */
-    protected double calcDistance( EdgeIteratorState iter )
-    {
-        return iter.getDistance();
-    }
-
     /**
      * Calculates the time in millis for the specified distance in meter and speed (in km/h) via
      * flags.
@@ -486,7 +478,7 @@ private void updatePointsAndInstruction( EdgeIteratorState edge, PointList pl )
                     double lon = pl.getLongitude(i);
                     points.add(lat, lon);
                 }
-                double dist = calcDistance(edge);
+                double dist = edge.getDistance();
                 prevInstruction.setDistance(dist + prevInstruction.getDistance());
                 prevInstruction.setMillis(calcMillis(dist, flags) + prevInstruction.getMillis());
             }

core/src/main/java/com/graphhopper/routing/QueryGraph.java

@@ -19,9 +19,7 @@
 
 import com.graphhopper.routing.PathBidirRef;
 import com.graphhopper.routing.util.FlagEncoder;
-import com.graphhopper.routing.util.Weighting;
 import com.graphhopper.storage.Graph;
-import com.graphhopper.util.EdgeIteratorState;
 import com.graphhopper.util.EdgeSkipIterState;
 
 /**
@@ -32,12 +30,9 @@
  */
 public class Path4CH extends PathBidirRef
 {
-    private final Weighting calc;
-
-    public Path4CH( Graph g, FlagEncoder encoder, Weighting calc )
+    public Path4CH( Graph g, FlagEncoder encoder )
     {
         super(g, encoder);
-        this.calc = calc;
     }
 
     @Override
@@ -48,17 +43,11 @@ protected void processEdge( int tmpEdge, int endNode )
         expandEdge((EdgeSkipIterState) graph.getEdgeProps(tmpEdge, endNode), false);
     }
 
-    @Override
-    public double calcDistance( EdgeIteratorState mainIter )
-    {
-        return calc.revertWeight(mainIter, mainIter.getDistance());
-    }
-
     private void expandEdge( EdgeSkipIterState mainEdgeState, boolean revert )
     {
         if (!mainEdgeState.isShortcut())
         {
-            double dist = calcDistance(mainEdgeState);
+            double dist = mainEdgeState.getDistance();
             distance += dist;
             long flags = mainEdgeState.getFlags();
             millis += calcMillis(dist, flags);

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

@@ -0,0 +1,67 @@
+/*
+ *  Licensed to Peter Karich under one or more contributor license
+ *  agreements. See the NOTICE file distributed with this work for
+ *  additional information regarding copyright ownership.
+ *
+ *  Peter Karich licenses this file to you under the Apache License,
+ *  Version 2.0 (the "License"); you may not use this file except
+ *  in compliance with the License. You may obtain a copy of the
+ *  License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package com.graphhopper.routing.ch;
+
+import com.graphhopper.routing.util.Weighting;
+import com.graphhopper.util.EdgeIteratorState;
+import com.graphhopper.util.EdgeSkipIterState;
+
+/**
+ * Used in CH preparation and therefor assumed that all edges are of type EdgeSkipIterState
+ * <p>
+ * @author Peter Karich
+ */
+public class PreparationWeighting implements Weighting
+{
+    private final Weighting userWeighting;
+
+    public PreparationWeighting( Weighting userWeighting )
+    {
+        this.userWeighting = userWeighting;
+    }
+
+    @Override
+    public double getMinWeight( double distance )
+    {
+        return userWeighting.getMinWeight(distance);
+    }
+
+    @Override
+    public double calcWeight( EdgeIteratorState edge )
+    {
+        if (edge instanceof EdgeSkipIterState)
+        {
+            EdgeSkipIterState tmp = (EdgeSkipIterState) edge;
+            if (tmp.isShortcut())
+                return tmp.getWeight();
+        }
+        return userWeighting.calcWeight(edge);
+    }
+
+    @Override
+    public String toString()
+    {
+        return "PREPARE+" + userWeighting.toString();
+    }
+
+    Weighting getUserWeighting()
+    {
+        return userWeighting;
+    }
+}