Resolve review comments

opentripplanner · Apr 25, 2024 · a5d91fb · a5d91fb
1 parent 5b6cfda
commit a5d91fb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/main/java/org/opentripplanner/raptor/spi/RaptorCostCalculator.java b/src/main/java/org/opentripplanner/raptor/spi/RaptorCostCalculator.java
@@ -53,7 +53,7 @@ int boardingCost(
   /**
    * Used for estimating the remaining value for a criteria at a given stop arrival. The calculated
    * value should be an optimistic estimate for the heuristics to work properly. So, to calculate
-   * the generalized cost for given the {@code minTravelTime} and {@code minNumTransfers} retuning
+   * the generalized cost for given the {@code minTravelTime} and {@code minNumTransfers} returning
    * the greatest value, which is guaranteed to be less than the
    * <em>real value</em> would be correct and a good choice.
    */

diff --git a/...g/opentripplanner/routing/algorithm/raptoradapter/transit/cost/CostCalculatorFactory.java b/...g/opentripplanner/routing/algorithm/raptoradapter/transit/cost/CostCalculatorFactory.java
@@ -6,11 +6,11 @@ public class CostCalculatorFactory {
 
   public static <T extends DefaultTripSchedule> RaptorCostCalculator<T> createCostCalculator(
     GeneralizedCostParameters generalizedCostParameters,
-    int[] stopTransferCosts
+    int[] stopBoardAlightCosts
   ) {
     RaptorCostCalculator<T> calculator = new DefaultCostCalculator<>(
       generalizedCostParameters,
-      stopTransferCosts
+      stopBoardAlightCosts
     );
 
     if (generalizedCostParameters.wheelchairEnabled()) {

diff --git a/...g/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultCostCalculator.java b/...g/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultCostCalculator.java
@@ -130,11 +130,11 @@ public int calculateRemainingMinCost(int minTravelTime, int minNumTransfers, int
         transitFactors.minFactor() *
         minTravelTime
       );
-    } else if (stopTransferCost != null) {
-      // Remove cost that was added during alighting similar as we do in the costEgress() method
-      return (transitFactors.minFactor() * minTravelTime - stopTransferCost[fromStop]);
     } else {
-      return transitFactors.minFactor() * minTravelTime;
+      // Remove cost that was added during alighting similar as we do in the costEgress() method
+      int fixedCost = transitFactors.minFactor() * minTravelTime;
+
+      return stopTransferCost == null ? fixedCost : fixedCost - stopTransferCost[fromStop];
     }
   }