23 roll back jaakkola congestion timings (#24)

* save shapes of GTFS patterns

* Roll back Jaakkola congestion penalties

Author: christophfink

src/main/java/com/conveyal/r5/streets/BasicTraversalTimeCalculator.java

@@ -46,36 +46,23 @@ public int traversalTimeSeconds (EdgeStore.Edge currentEdge, StreetMode streetMo
      * TODO pull this out into an interface to allow generalization to data from generalized cost tags
      */
     @Override
-    public int turnTimeSeconds (int fromEdge, int toEdge, StreetMode streetMode, CongestionLevel congestionLevel) {
+    public int turnTimeSeconds (int fromEdge, int toEdge, StreetMode streetMode) {
         if (streetMode == StreetMode.CAR) {
             double angle = calculateNewTurnAngle(fromEdge, toEdge);
             if (angle < 27)
-                return straightOnDelay(fromEdge, congestionLevel);
+                return STRAIGHT_ON;
             else if (angle < 153)
                 return driveOnRight ? LEFT_TURN : RIGHT_TURN;
             else if (angle < 207)
                 return U_TURN;
             else if (angle < 333)
                 return driveOnRight ? RIGHT_TURN : LEFT_TURN;
             else
-                return straightOnDelay(fromEdge, congestionLevel);
+                return STRAIGHT_ON;
         }
         return 0;
     }
 
-    /**
-     * Get the delay for driving straight over a crossing, depending on fromEdge’s StreetClass, and the time of the day
-     * Based on Jaakkonen (2013)
-     */
-    private int straightOnDelay(int fromEdge, CongestionLevel congestionLevel){
-        EdgeStore.Edge e = layer.edgeStore.getCursor(fromEdge);
-        Byte streetClassCode = e.getStreetClassCode();
-        return CrossingPenalty.getDelay(
-                congestionLevel,
-                JaakkonenStreetClass.fromR5StreetClassCode(streetClassCode)
-        );
-    }
-
     /**
      * Gets in/out angles from edges and calculates angle between them
      * @return angle in degrees from 0-360

src/main/java/com/conveyal/r5/streets/CongestionLevel.java

@@ -729,15 +729,13 @@ public StreetRouter.State traverse (
             // This was rounding up, now truncating ... maybe change back for consistency?
             // int roundedTime = (int) Math.ceil(time);
 
-            CongestionLevel congestionLevel = CongestionLevel.fromProfileRequest(req);
-
             int turnTimeSeconds = 0;
             // Negative backEdge means this state is not the result of traversing an edge (it's the start of a search).
             if (s0.backEdge >= 0) {
                 if (req.reverseSearch) {
-                    turnTimeSeconds = timeCalculator.turnTimeSeconds(getEdgeIndex(), s0.backEdge, streetMode, congestionLevel);
+                    turnTimeSeconds = timeCalculator.turnTimeSeconds(getEdgeIndex(), s0.backEdge, streetMode);
                 } else {
-                    turnTimeSeconds = timeCalculator.turnTimeSeconds(s0.backEdge, getEdgeIndex(), streetMode, congestionLevel);
+                    turnTimeSeconds = timeCalculator.turnTimeSeconds(s0.backEdge, getEdgeIndex(), streetMode);
                 }
             }
             // TODO add checks for negative increment values to these functions.

src/main/java/com/conveyal/r5/streets/CrossingPenalty.java

@@ -39,7 +39,7 @@ public int traversalTimeSeconds (EdgeStore.Edge currentEdge, StreetMode streetMo
     }
 
     @Override
-    public int turnTimeSeconds (int fromEdge, int toEdge, StreetMode streetMode, CongestionLevel congestionLevel) {
+    public int turnTimeSeconds (int fromEdge, int toEdge, StreetMode streetMode) {
         if (streetMode == StreetMode.WALK) {
             return walkTraversalTimes.turnTimeSeconds(fromEdge, toEdge);
         } else if (streetMode == StreetMode.BICYCLE) {

src/main/java/com/conveyal/r5/streets/EdgeStore.java

@@ -51,8 +51,8 @@ public int traversalTimeSeconds (EdgeStore.Edge currentEdge, StreetMode streetMo
     }
 
     @Override
-    public int turnTimeSeconds (int fromEdge, int toEdge, StreetMode streetMode, CongestionLevel congestionLevel) {
-        return base.turnTimeSeconds(fromEdge, toEdge, streetMode, congestionLevel);
+    public int turnTimeSeconds (int fromEdge, int toEdge, StreetMode streetMode) {
+        return base.turnTimeSeconds(fromEdge, toEdge, streetMode);
     }
 
 }

src/main/java/com/conveyal/r5/streets/EdgeTraversalTimes.java

@@ -752,8 +752,6 @@ public State getState (Split split) {
         // Start on the forward edge of the pair that was split
         EdgeStore.Edge e = streetLayer.edgeStore.getCursor(split.edge);
 
-        CongestionLevel congestionLevel = CongestionLevel.fromProfileRequest(profileRequest);
-
         TIntList edgeList;
         if (profileRequest.reverseSearch) {
             edgeList = streetLayer.outgoingEdges.get(split.vertex1);
@@ -771,7 +769,7 @@ public State getState (Split split) {
                         ret.streetMode = s.streetMode;
 
                         // figure out the turn cost
-                        int turnCost = this.timeCalculator.turnTimeSeconds(s.backEdge, split.edge, s.streetMode, congestionLevel);
+                        int turnCost = this.timeCalculator.turnTimeSeconds(s.backEdge, split.edge, s.streetMode);
                         int traversalCost = (int) Math.round(split.distance0_mm / 1000d / e.calculateSpeed(profileRequest, s.streetMode));
 
                         // TODO length of perpendicular
@@ -800,7 +798,7 @@ public State getState (Split split) {
                 }
                 State ret = new State(-1, split.edge + 1, state);
                 ret.streetMode = state.streetMode;
-                int turnCost = this.timeCalculator.turnTimeSeconds(state.backEdge, split.edge + 1, state.streetMode, congestionLevel);
+                int turnCost = this.timeCalculator.turnTimeSeconds(state.backEdge, split.edge + 1, state.streetMode);
                 int traversalCost = (int) Math.round(split.distance1_mm / 1000d / e.calculateSpeed(profileRequest, state.streetMode));
                 ret.distance += split.distance1_mm;
                 // TODO length of perpendicular

src/main/java/com/conveyal/r5/streets/JaakkonenStreetClass.java

@@ -39,7 +39,7 @@ public interface TraversalTimeCalculator extends Serializable {
      *
      * @return the expected value of the time in seconds to make the turn.
      */
-    public int turnTimeSeconds (int fromEdge, int toEdge, StreetMode streetMode, CongestionLevel congestionLevel);
+    public int turnTimeSeconds (int fromEdge, int toEdge, StreetMode streetMode);
 
 
 }

src/main/java/com/conveyal/r5/streets/MultistageTraversalTimeCalculator.java

@@ -43,7 +43,7 @@ public void testAngleSouthernHemisphere() throws Exception {
     public void testCost () throws Exception {
         setUp(false);
         BasicTraversalTimeCalculator calculator = new BasicTraversalTimeCalculator(streetLayer, true);
-        assertEquals(calculator.LEFT_TURN, calculator.turnTimeSeconds(ee + 1, es, StreetMode.CAR, CongestionLevel.OFF_PEAK));
+        assertEquals(calculator.LEFT_TURN, calculator.turnTimeSeconds(ee + 1, es, StreetMode.CAR));
     }
 
     /**
@@ -58,4 +58,4 @@ public void testJtsAngle () {
         double a1 = Angle.angle(new Coordinate(10, 10), new Coordinate(9, 9));
         assertTrue(a1 < a0);
     }
-}
+}