modeReluctanceMapper
+ ) {
+ this.boardCostOnly = original.boardCostOnly;
+ this.boardAndTransferCost = original.boardAndTransferCost;
+ this.waitFactor = original.waitFactor;
+ this.transferCostOnly = original.transferCostOnly;
+ this.transitFactors = modeReluctanceMapper.apply(original.transitFactors);
+ this.stopTransferCost = original.stopTransferCost;
+ }
+ /*-- HACK SØRLANDSBANEN :: END --*/
}
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/FactorStrategy.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/FactorStrategy.java
index fba2a7cfe38..8a14c27566d 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/FactorStrategy.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/FactorStrategy.java
@@ -6,7 +6,7 @@
*
* The class and methods are {@code final} to help the JIT compiler optimize the use of this class.
*/
-interface FactorStrategy {
+public interface FactorStrategy {
/**
* Return the factor for the given index.
*/
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/IndexBasedFactorStrategy.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/IndexBasedFactorStrategy.java
index 152f199248c..4c66b5b452e 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/IndexBasedFactorStrategy.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/IndexBasedFactorStrategy.java
@@ -6,12 +6,12 @@
* This class keep a facto for each index and the minimum factor for fast retrieval during Raptor
* search.
*/
-final class IndexBasedFactorStrategy implements FactorStrategy {
+public final class IndexBasedFactorStrategy implements FactorStrategy {
private final int[] factors;
private final int minFactor;
- private IndexBasedFactorStrategy(int[] factors) {
+ public IndexBasedFactorStrategy(int[] factors) {
this.factors = factors;
this.minFactor = findMinimumFactor(factors);
}
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java
index 91547b1f62f..6a784bd8080 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java
@@ -8,6 +8,7 @@
import java.time.ZonedDateTime;
import java.util.Collection;
import java.util.List;
+import org.opentripplanner.ext.sorlandsbanen.EnturHackSorlandsBanen;
import org.opentripplanner.framework.application.OTPFeature;
import org.opentripplanner.raptor.api.model.GeneralizedCostRelaxFunction;
import org.opentripplanner.raptor.api.model.RaptorAccessEgress;
@@ -21,6 +22,7 @@
import org.opentripplanner.raptor.api.request.RaptorRequestBuilder;
import org.opentripplanner.raptor.rangeraptor.SystemErrDebugLogger;
import org.opentripplanner.routing.algorithm.raptoradapter.router.performance.PerformanceTimersForRaptor;
+import org.opentripplanner.routing.algorithm.raptoradapter.transit.TransitLayer;
import org.opentripplanner.routing.algorithm.raptoradapter.transit.TripSchedule;
import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.RaptorCostConverter;
import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.grouppriority.TransitGroupPriority32n;
@@ -39,6 +41,8 @@ public class RaptorRequestMapper {
private final boolean isMultiThreadedEnbled;
private final MeterRegistry meterRegistry;
+ private final TransitLayer transitLayer;
+
private RaptorRequestMapper(
RouteRequest request,
boolean isMultiThreaded,
@@ -46,13 +50,15 @@ private RaptorRequestMapper(
Collection egressPaths,
Duration searchWindowAccessSlack,
long transitSearchTimeZeroEpocSecond,
- MeterRegistry meterRegistry
+ MeterRegistry meterRegistry,
+ TransitLayer transitLayer
) {
this.request = request;
this.isMultiThreadedEnbled = isMultiThreaded;
this.accessPaths = accessPaths;
this.egressPaths = egressPaths;
this.searchWindowAccessSlack = searchWindowAccessSlack;
+ this.transitLayer = transitLayer;
this.transitSearchTimeZeroEpocSecond = transitSearchTimeZeroEpocSecond;
this.meterRegistry = meterRegistry;
}
@@ -64,7 +70,8 @@ public static RaptorRequest mapRequest(
Collection accessPaths,
Collection egressPaths,
Duration searchWindowAccessSlack,
- MeterRegistry meterRegistry
+ MeterRegistry meterRegistry,
+ TransitLayer transitLayer
) {
return new RaptorRequestMapper(
request,
@@ -73,7 +80,8 @@ public static RaptorRequest mapRequest(
egressPaths,
searchWindowAccessSlack,
transitSearchTimeZero.toEpochSecond(),
- meterRegistry
+ meterRegistry,
+ transitLayer
)
.doMap();
}
@@ -187,7 +195,7 @@ private RaptorRequest doMap() {
);
}
- return builder.build();
+ return EnturHackSorlandsBanen.enableHack(builder.build(), request, transitLayer);
}
private List mapPassThroughPoints() {
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitData.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitData.java
index 4338593d59d..0d6b4497c1b 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitData.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitData.java
@@ -4,6 +4,7 @@
import java.util.BitSet;
import java.util.Iterator;
import java.util.List;
+import java.util.function.Function;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.opentripplanner.framework.application.OTPFeature;
@@ -27,6 +28,8 @@
import org.opentripplanner.routing.algorithm.raptoradapter.transit.constrainedtransfer.ConstrainedBoardingSearch;
import org.opentripplanner.routing.algorithm.raptoradapter.transit.constrainedtransfer.ConstrainedTransfersForPatterns;
import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.CostCalculatorFactory;
+import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.DefaultCostCalculator;
+import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.FactorStrategy;
import org.opentripplanner.routing.algorithm.raptoradapter.transit.mappers.GeneralizedCostParametersMapper;
import org.opentripplanner.routing.api.request.RouteRequest;
import org.opentripplanner.transit.model.network.RoutingTripPattern;
@@ -253,4 +256,34 @@ private PriorityGroupConfigurator createTransitGroupPriorityConfigurator(RouteRe
transitRequest.priorityGroupsGlobal()
);
}
+
+ /*-- HACK SØRLANDSBANEN :: BEGIN --*/
+
+ private RaptorRoutingRequestTransitData(
+ RaptorRoutingRequestTransitData original,
+ Function mapFactors
+ ) {
+ this.transitLayer = original.transitLayer;
+ this.transitSearchTimeZero = original.transitSearchTimeZero;
+ this.activeTripPatternsPerStop = original.activeTripPatternsPerStop;
+ this.patternIndex = original.patternIndex;
+ this.transferIndex = original.transferIndex;
+ this.transferService = original.transferService;
+ this.constrainedTransfers = original.constrainedTransfers;
+ this.validTransitDataStartTime = original.validTransitDataStartTime;
+ this.validTransitDataEndTime = original.validTransitDataEndTime;
+ this.generalizedCostCalculator =
+ new DefaultCostCalculator<>(
+ (DefaultCostCalculator) original.generalizedCostCalculator,
+ mapFactors
+ );
+ this.slackProvider = original.slackProvider();
+ }
+
+ public RaptorTransitDataProvider enturHackSorlandsbanen(
+ Function mapFactors
+ ) {
+ return new RaptorRoutingRequestTransitData(this, mapFactors);
+ }
+ /*-- HACK SØRLANDSBANEN :: END --*/
}
diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/TransitPreferences.java b/src/main/java/org/opentripplanner/routing/api/request/preference/TransitPreferences.java
index 78f30277e72..94a4a458915 100644
--- a/src/main/java/org/opentripplanner/routing/api/request/preference/TransitPreferences.java
+++ b/src/main/java/org/opentripplanner/routing/api/request/preference/TransitPreferences.java
@@ -31,6 +31,7 @@ public final class TransitPreferences implements Serializable {
private final boolean includePlannedCancellations;
private final boolean includeRealtimeCancellations;
private final RaptorPreferences raptor;
+ private final double extraSearchCoachReluctance;
private TransitPreferences() {
this.boardSlack = this.alightSlack = DurationForEnum.of(TransitMode.class).build();
@@ -42,6 +43,7 @@ private TransitPreferences() {
this.includePlannedCancellations = false;
this.includeRealtimeCancellations = false;
this.raptor = RaptorPreferences.DEFAULT;
+ this.extraSearchCoachReluctance = 0.0;
}
private TransitPreferences(Builder builder) {
@@ -55,6 +57,7 @@ private TransitPreferences(Builder builder) {
this.includePlannedCancellations = builder.includePlannedCancellations;
this.includeRealtimeCancellations = builder.includeRealtimeCancellations;
this.raptor = requireNonNull(builder.raptor);
+ this.extraSearchCoachReluctance = builder.extraSearchCoachReluctance;
}
public static Builder of() {
@@ -165,6 +168,11 @@ public RaptorPreferences raptor() {
return raptor;
}
+ /** Zero means turned off. HACK SØRLANDSBANEN */
+ public double extraSearchCoachReluctance() {
+ return extraSearchCoachReluctance;
+ }
+
@Override
public boolean equals(Object o) {
if (this == o) return true;
@@ -180,6 +188,7 @@ public boolean equals(Object o) {
ignoreRealtimeUpdates == that.ignoreRealtimeUpdates &&
includePlannedCancellations == that.includePlannedCancellations &&
includeRealtimeCancellations == that.includeRealtimeCancellations &&
+ extraSearchCoachReluctance == that.extraSearchCoachReluctance &&
raptor.equals(that.raptor)
);
}
@@ -196,6 +205,7 @@ public int hashCode() {
ignoreRealtimeUpdates,
includePlannedCancellations,
includeRealtimeCancellations,
+ extraSearchCoachReluctance,
raptor
);
}
@@ -245,6 +255,7 @@ public static class Builder {
private boolean includePlannedCancellations;
private boolean includeRealtimeCancellations;
private RaptorPreferences raptor;
+ private double extraSearchCoachReluctance;
public Builder(TransitPreferences original) {
this.original = original;
@@ -258,6 +269,7 @@ public Builder(TransitPreferences original) {
this.includePlannedCancellations = original.includePlannedCancellations;
this.includeRealtimeCancellations = original.includeRealtimeCancellations;
this.raptor = original.raptor;
+ this.extraSearchCoachReluctance = original.extraSearchCoachReluctance;
}
public TransitPreferences original() {
@@ -327,6 +339,11 @@ public Builder withRaptor(Consumer body) {
return this;
}
+ public Builder setExtraSearchCoachReluctance(double extraSearchCoachReluctance) {
+ this.extraSearchCoachReluctance = extraSearchCoachReluctance;
+ return this;
+ }
+
public Builder apply(Consumer body) {
body.accept(this);
return this;
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java
index c4b0b0bd8cb..5ceb2bc8f63 100644
--- a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java
+++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java
@@ -315,13 +315,14 @@ The board time is added to the time when going from the stop (offboard) to onboa
}
// TODO REMOVE THIS
- builder.withRaptor(it ->
- c
- .of("relaxTransitSearchGeneralizedCostAtDestination")
- .since(V2_3)
- .summary("Whether non-optimal transit paths at the destination should be returned")
- .description(
- """
+ builder
+ .withRaptor(it ->
+ c
+ .of("relaxTransitSearchGeneralizedCostAtDestination")
+ .since(V2_3)
+ .summary("Whether non-optimal transit paths at the destination should be returned")
+ .description(
+ """
Let c be the existing minimum pareto optimal generalized cost to beat. Then a trip
with cost c' is accepted if the following is true:
`c' < Math.round(c * relaxRaptorCostCriteria)`.
@@ -331,10 +332,17 @@ The board time is added to the time when going from the stop (offboard) to onboa
Values equals or less than zero is not allowed. Values greater than 2.0 are not
supported, due to performance reasons.
"""
- )
- .asDoubleOptional()
- .ifPresent(it::withRelaxGeneralizedCostAtDestination)
- );
+ )
+ .asDoubleOptional()
+ .ifPresent(it::withRelaxGeneralizedCostAtDestination)
+ )
+ .setExtraSearchCoachReluctance(
+ c
+ .of("extraSearchCoachReluctance")
+ .since(V2_1)
+ .summary("TODO")
+ .asDouble(dft.extraSearchCoachReluctance())
+ );
}
private static void mapBikePreferences(NodeAdapter root, BikePreferences.Builder builder) {
diff --git a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql
index dad106418fe..0baa44636b9 100644
--- a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql
+++ b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql
@@ -795,6 +795,8 @@ type QueryType {
dateTime: DateTime,
"Debug the itinerary-filter-chain. OTP will attach a system notice to itineraries instead of removing them. This is very convenient when tuning the filters."
debugItineraryFilter: Boolean = false @deprecated(reason : "Use `itineraryFilter.debug` instead."),
+ "FOR TESTING ONLY"
+ extraSearchCoachReluctance: Float,
"A list of filters for which trips should be included. A trip will be included if it matches with at least one filter. An empty list of filters means that all trips should be included. If a search include this parameter, \"whiteListed\", \"banned\" & \"modes.transportModes\" filters will be ignored."
filters: [TripFilterInput!],
"The start location"
diff --git a/src/test/java/org/opentripplanner/raptor/RaptorArchitectureTest.java b/src/test/java/org/opentripplanner/raptor/RaptorArchitectureTest.java
index 39022da42ca..aeca5a36ebf 100644
--- a/src/test/java/org/opentripplanner/raptor/RaptorArchitectureTest.java
+++ b/src/test/java/org/opentripplanner/raptor/RaptorArchitectureTest.java
@@ -39,6 +39,9 @@ public class RaptorArchitectureTest {
private static final Package RR_STANDARD = RANGE_RAPTOR.subPackage("standard");
private static final Package RR_STD_CONFIGURE = RR_STANDARD.subPackage("configure");
private static final Package RR_CONTEXT = RANGE_RAPTOR.subPackage("context");
+ private static final Package EXT_SORLANDSBANAN_HACK = Package.of(
+ "org.opentripplanner.ext.sorlandsbanen"
+ );
/**
* Packages used by standard-range-raptor and multi-criteria-range-raptor.
@@ -200,7 +203,8 @@ void enforcePackageDependenciesInRaptorService() {
RAPTOR_UTIL,
CONFIGURE,
RR_INTERNAL_API,
- RR_TRANSIT
+ RR_TRANSIT,
+ EXT_SORLANDSBANAN_HACK
)
.verify();
}
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapperTest.java b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapperTest.java
index 89348be5c89..af60b461f40 100644
--- a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapperTest.java
+++ b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapperTest.java
@@ -91,6 +91,7 @@ private static RaptorRequest map(RouteRequest request) {
ACCESS,
EGRESS,
D0s,
+ null,
null
);
}