Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

consistently return default drt constraints #3709

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

consistently return default drt constraints #3709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0b98b01
consistently return default drt constraints, relates to #3698
nkuehnel Feb 4, 2025
49bfa70
Merge branch 'master' into defaultdrtconstraints
nkuehnel Feb 4, 2025
87b170a
Merge branch 'master' into defaultdrtconstraints
luchengqi7 Feb 6, 2025
fbd8393
Merge remote-tracking branch 'matsim-org/master' into defaultdrtconst…
nkuehnel Feb 17, 2025
d3cee28
Merge remote-tracking branch 'origin/defaultdrtconstraints' into defa…
nkuehnel Feb 17, 2025
1aaf23a
Merge branch 'master' into defaultdrtconstraints
nkuehnel Feb 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../contrib/commercialTrafficApplications/jointDemand/examples/RunJointDemandDRTExample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ private static void loadConfigGroups(Config config) {

DrtConfigGroup drtCfg = new DrtConfigGroup();
DefaultDrtOptimizationConstraintsSet defaultConstraintsSet =
(DefaultDrtOptimizationConstraintsSet) drtCfg.addOrGetDrtOptimizationConstraintsParams()
drtCfg.addOrGetDrtOptimizationConstraintsParams()
.addOrGetDefaultDrtOptimizationConstraintsSet();
defaultConstraintsSet.maxWaitTime = 2 * 3600;
defaultConstraintsSet.maxTravelTimeAlpha = 5;
Expand Down
4 changes: 2 additions & 2 deletions ...-extensions/src/test/java/org/matsim/contrib/drt/extension/fiss/RunFissDrtScenarioIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ public class RunFissDrtScenarioIT {
drtConfigGroup.mode = TransportMode.drt;
drtConfigGroup.stopDuration = 30.;
DefaultDrtOptimizationConstraintsSet defaultConstraintsSet =
(DefaultDrtOptimizationConstraintsSet) drtConfigGroup.addOrGetDrtOptimizationConstraintsParams()
.addOrGetDefaultDrtOptimizationConstraintsSet();
drtConfigGroup.addOrGetDrtOptimizationConstraintsParams()
.addOrGetDefaultDrtOptimizationConstraintsSet();
defaultConstraintsSet.maxTravelTimeAlpha = 1.5;
defaultConstraintsSet.maxTravelTimeBeta = 10. * 60.;
defaultConstraintsSet.maxWaitTime = 600.;
Expand Down
4 changes: 2 additions & 2 deletions .../java/org/matsim/contrib/drt/extension/operations/eshifts/run/RunEShiftDrtScenarioIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ void test() {
DrtConfigGroup drtConfigGroup = drtWithShiftsConfigGroup;
drtConfigGroup.mode = TransportMode.drt;
DefaultDrtOptimizationConstraintsSet constraintsSet =
(DefaultDrtOptimizationConstraintsSet) drtConfigGroup.addOrGetDrtOptimizationConstraintsParams()
.addOrGetDefaultDrtOptimizationConstraintsSet();
drtConfigGroup.addOrGetDrtOptimizationConstraintsParams()
.addOrGetDefaultDrtOptimizationConstraintsSet();
constraintsSet.maxTravelTimeAlpha = 1.5;
constraintsSet.maxTravelTimeBeta = 10. * 60.;
drtConfigGroup.stopDuration = 30.;
Expand Down
4 changes: 2 additions & 2 deletions ...org/matsim/contrib/drt/extension/operations/shifts/run/RunMultiHubShiftDrtScenarioIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ void test() {
DrtConfigGroup drtConfigGroup = drtWithShiftsConfigGroup;
drtConfigGroup.mode = TransportMode.drt;
DefaultDrtOptimizationConstraintsSet defaultConstraintsSet =
(DefaultDrtOptimizationConstraintsSet) drtConfigGroup.addOrGetDrtOptimizationConstraintsParams()
.addOrGetDefaultDrtOptimizationConstraintsSet();
drtConfigGroup.addOrGetDrtOptimizationConstraintsParams()
.addOrGetDefaultDrtOptimizationConstraintsSet();
drtConfigGroup.stopDuration = 30.;
defaultConstraintsSet.maxTravelTimeAlpha = 1.5;
defaultConstraintsSet.maxTravelTimeBeta = 10. * 60.;
Expand Down
2 changes: 1 addition & 1 deletion ...org/matsim/contrib/drt/extension/operations/shifts/run/RunOnTheFlyShiftDrtScenarioIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ void test() {

drtWithShiftsConfigGroup.mode = TransportMode.drt;
DefaultDrtOptimizationConstraintsSet defaultConstraintsSet =
(DefaultDrtOptimizationConstraintsSet) drtWithShiftsConfigGroup.addOrGetDrtOptimizationConstraintsParams()
drtWithShiftsConfigGroup.addOrGetDrtOptimizationConstraintsParams()
.addOrGetDefaultDrtOptimizationConstraintsSet();
drtWithShiftsConfigGroup.stopDuration = 30.;
defaultConstraintsSet.maxTravelTimeAlpha = 1.5;
Expand Down
2 changes: 1 addition & 1 deletion ...g/matsim/contrib/drt/extension/operations/shifts/run/RunPrebookingShiftDrtScenarioIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ public void install() {
private Controler prepare(DrtWithExtensionsConfigGroup drtWithShiftsConfigGroup, MultiModeDrtConfigGroup multiModeDrtConfigGroup, String outputSuffix) {
drtWithShiftsConfigGroup.mode = TransportMode.drt;
DefaultDrtOptimizationConstraintsSet defaultConstraintsSet =
(DefaultDrtOptimizationConstraintsSet) drtWithShiftsConfigGroup.addOrGetDrtOptimizationConstraintsParams()
drtWithShiftsConfigGroup.addOrGetDrtOptimizationConstraintsParams()
.addOrGetDefaultDrtOptimizationConstraintsSet();
drtWithShiftsConfigGroup.stopDuration = 30.;
defaultConstraintsSet.maxTravelTimeAlpha = 1.5;
Expand Down
2 changes: 1 addition & 1 deletion ...st/java/org/matsim/contrib/drt/extension/operations/shifts/run/RunShiftDrtScenarioIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ void test() {

drtWithShiftsConfigGroup.mode = TransportMode.drt;
DefaultDrtOptimizationConstraintsSet defaultConstraintsSet =
(DefaultDrtOptimizationConstraintsSet) drtWithShiftsConfigGroup.addOrGetDrtOptimizationConstraintsParams()
drtWithShiftsConfigGroup.addOrGetDrtOptimizationConstraintsParams()
.addOrGetDefaultDrtOptimizationConstraintsSet();
drtWithShiftsConfigGroup.stopDuration = 30.;
defaultConstraintsSet.maxTravelTimeAlpha = 1.5;
Expand Down
4 changes: 2 additions & 2 deletions ...extensions/src/test/java/org/matsim/contrib/drt/extension/services/ServicesTestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ public static Config configure(String outputDirectory,boolean electrified)

drtConfigGroup.mode = TransportMode.drt;
DefaultDrtOptimizationConstraintsSet defaultConstraintsSet =
(DefaultDrtOptimizationConstraintsSet) drtConfigGroup.addOrGetDrtOptimizationConstraintsParams()
.addOrGetDefaultDrtOptimizationConstraintsSet();
drtConfigGroup.addOrGetDrtOptimizationConstraintsParams()
.addOrGetDefaultDrtOptimizationConstraintsSet();
drtConfigGroup.stopDuration = 30.;
defaultConstraintsSet.maxTravelTimeAlpha = 1.5;
defaultConstraintsSet.maxTravelTimeBeta = 10. * 60.;
Expand Down
8 changes: 5 additions & 3 deletions ...n/java/org/matsim/contrib/drt/optimizer/constraints/DrtOptimizationConstraintsParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,14 @@ public List<DrtOptimizationConstraintsSet> getDrtOptimizationConstraintsSets() {
.toList();
}

public DrtOptimizationConstraintsSet addOrGetDefaultDrtOptimizationConstraintsSet() {
Optional<DrtOptimizationConstraintsSet> drtOptParams = getDrtOptimizationConstraintsSets().stream()
public DefaultDrtOptimizationConstraintsSet addOrGetDefaultDrtOptimizationConstraintsSet() {
Optional<DefaultDrtOptimizationConstraintsSet> drtOptParams = getDrtOptimizationConstraintsSets().stream()
.filter(params -> params.name.equals(defaultConstraintSet))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If someone implements another type of DrtOptimizationConstraintSet and assign "default" as name of this set, then this function would create another optimization constraint set with the name "default" and with the type DefaultDrtOptimizationConstraintSet. Since we at VSP will probably never use other parameter sets than the Default... one, this is okay I guess. But this can be confusing.

.filter(DefaultDrtOptimizationConstraintsSet.class::isInstance)
.map(DefaultDrtOptimizationConstraintsSet.class::cast)
.findAny();
if (drtOptParams.isEmpty()) {
DrtOptimizationConstraintsSet defaultSet = optimizationConstraintsSetSupplier.get();
DefaultDrtOptimizationConstraintsSet defaultSet = new DefaultDrtOptimizationConstraintsSet();
addParameterSet(defaultSet);
return defaultSet;
}
Expand Down
4 changes: 2 additions & 2 deletions contribs/drt/src/test/java/org/matsim/contrib/drt/config/ConfigBehaviorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ final void testMaterializeAfterReadDrtConstraints() {

DrtOptimizationConstraintsParams drtOptimizationConstraintsParams = drtConfigGroup.addOrGetDrtOptimizationConstraintsParams();
DefaultDrtOptimizationConstraintsSet optimizationConstraintsSet =
(DefaultDrtOptimizationConstraintsSet) drtOptimizationConstraintsParams.addOrGetDefaultDrtOptimizationConstraintsSet();
drtOptimizationConstraintsParams.addOrGetDefaultDrtOptimizationConstraintsSet();
optimizationConstraintsSet.maxTravelTimeAlpha = 2.;
optimizationConstraintsSet.maxTravelTimeBeta = 5. * 60;

Expand All @@ -116,7 +116,7 @@ final void testMaterializeAfterReadDrtConstraints() {

// check if you are getting back the values from the config file:
DefaultDrtOptimizationConstraintsSet constraintsSet =
(DefaultDrtOptimizationConstraintsSet) drtConfigGroup.addOrGetDrtOptimizationConstraintsParams().
drtConfigGroup.addOrGetDrtOptimizationConstraintsParams().
addOrGetDefaultDrtOptimizationConstraintsSet();
Assertions.assertEquals( 2., constraintsSet.maxTravelTimeAlpha, Double.MIN_VALUE );
Assertions.assertEquals( 300., constraintsSet.maxTravelTimeBeta, Double.MIN_VALUE );
Expand Down
4 changes: 2 additions & 2 deletions contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/MaxDetourConstraintTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ public void testMaxDetourConstraint() {

// Max wait time
DefaultDrtOptimizationConstraintsSet defaultConstraintsSet =
(DefaultDrtOptimizationConstraintsSet) drtConfigGroup.addOrGetDrtOptimizationConstraintsParams()
.addOrGetDefaultDrtOptimizationConstraintsSet();
drtConfigGroup.addOrGetDrtOptimizationConstraintsParams()
.addOrGetDefaultDrtOptimizationConstraintsSet();
defaultConstraintsSet.maxWaitTime = 300;

// Turn on the max detour constraint
Expand Down
4 changes: 2 additions & 2 deletions ...drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/DrtPoolingParameterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,8 +228,8 @@ private PersonEnterDrtVehicleEventHandler setupAndRunScenario(double maxWaitTime
MultiModeDrtConfigGroup mm = ConfigUtils.addOrGetModule(config, MultiModeDrtConfigGroup.class);
mm.getModalElements().forEach(x -> {
DefaultDrtOptimizationConstraintsSet defaultConstraintsSet =
(DefaultDrtOptimizationConstraintsSet) x.addOrGetDrtOptimizationConstraintsParams()
.addOrGetDefaultDrtOptimizationConstraintsSet();
x.addOrGetDrtOptimizationConstraintsParams()
.addOrGetDefaultDrtOptimizationConstraintsSet();
defaultConstraintsSet.maxWaitTime = maxWaitTime;
defaultConstraintsSet.maxTravelTimeAlpha = maxTravelTimeAlpha;
defaultConstraintsSet.maxTravelTimeBeta = maxTravelTimeBeta;
Expand Down
2 changes: 1 addition & 1 deletion contribs/drt/src/test/java/org/matsim/contrib/drt/prebooking/PrebookingTestEnvironment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ private void buildConfig(Config config) {
DrtConfigGroup modeConfig = new DrtConfigGroup();
drtConfig.addParameterSet(modeConfig);
modeConfig.mode = "drt";
DefaultDrtOptimizationConstraintsSet defaultConstraintsSet = (DefaultDrtOptimizationConstraintsSet) modeConfig
DefaultDrtOptimizationConstraintsSet defaultConstraintsSet = modeConfig
.addOrGetDrtOptimizationConstraintsParams()
.addOrGetDefaultDrtOptimizationConstraintsSet();
defaultConstraintsSet.maxWaitTime = maximumWaitTime;
Expand Down
4 changes: 2 additions & 2 deletions contribs/drt/src/test/java/org/matsim/contrib/drt/routing/DrtRoutingModuleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ void testCottbusClosestAccessEgressStopFinder() {
String drtMode = "DrtX";
drtCfg.mode = drtMode;
DefaultDrtOptimizationConstraintsSet defaultConstraintsSet =
(DefaultDrtOptimizationConstraintsSet) drtCfg.addOrGetDrtOptimizationConstraintsParams()
.addOrGetDefaultDrtOptimizationConstraintsSet();
drtCfg.addOrGetDrtOptimizationConstraintsParams()
.addOrGetDefaultDrtOptimizationConstraintsSet();
defaultConstraintsSet.maxTravelTimeAlpha = 1.5;
defaultConstraintsSet.maxTravelTimeBeta = 5 * 60;
defaultConstraintsSet.maxWaitTime = 5 * 60;
Expand Down
2 changes: 1 addition & 1 deletion contribs/drt/src/test/java/org/matsim/contrib/drt/teleportation/DrtTeleportationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ void testTeleportationEngine() throws IOException {

Controler controler = DrtControlerCreator.createControler(config, false);
DrtConfigGroup drtConfigGroup = DrtConfigGroup.getSingleModeDrtConfig(config);
DefaultDrtOptimizationConstraintsSet defaultConstraintsSet = (DefaultDrtOptimizationConstraintsSet) drtConfigGroup
DefaultDrtOptimizationConstraintsSet defaultConstraintsSet = drtConfigGroup
.addOrGetDrtOptimizationConstraintsParams().addOrGetDefaultDrtOptimizationConstraintsSet();
defaultConstraintsSet.maxTravelTimeAlpha = 1.2;
defaultConstraintsSet.maxTravelTimeBeta = 600;
Expand Down
4 changes: 2 additions & 2 deletions contribs/taxi/src/main/java/org/matsim/contrib/taxi/run/MultiModeTaxiModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ public static DrtConfigGroup convertTaxiToDrtCfg(TaxiConfigGroup taxiCfg) {
// Using some (relatively high) values as we do not know what values should be there. They can be adjusted
// manually after the TaxiAsDrtConfigGroup config is created.
DefaultDrtOptimizationConstraintsSet defaultConstraintsSet =
(DefaultDrtOptimizationConstraintsSet) drtCfg.addOrGetDrtOptimizationConstraintsParams()
.addOrGetDefaultDrtOptimizationConstraintsSet();
drtCfg.addOrGetDrtOptimizationConstraintsParams()
.addOrGetDefaultDrtOptimizationConstraintsSet();
defaultConstraintsSet.maxWaitTime = 3600;
defaultConstraintsSet.maxTravelTimeAlpha = 2;
defaultConstraintsSet.maxTravelTimeBeta = 3600;
Expand Down
12 changes: 6 additions & 6 deletions contribs/vsp/src/test/java/org/matsim/integration/drtAndPt/PtAlongALine2Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,8 @@ void testPtAlongALineWithRaptorAndDrtServiceArea() {
DrtConfigGroup drtConfigGroup = new DrtConfigGroup();
drtConfigGroup.mode = TransportMode.drt;
DefaultDrtOptimizationConstraintsSet defaultConstraintsSet =
(DefaultDrtOptimizationConstraintsSet) drtConfigGroup.addOrGetDrtOptimizationConstraintsParams()
.addOrGetDefaultDrtOptimizationConstraintsSet();
drtConfigGroup.addOrGetDrtOptimizationConstraintsParams()
.addOrGetDefaultDrtOptimizationConstraintsSet();
defaultConstraintsSet.maxTravelTimeAlpha = 2.0;
defaultConstraintsSet.maxTravelTimeBeta = 5. * 60.;
drtConfigGroup.stopDuration = 60.;
Expand All @@ -248,8 +248,8 @@ void testPtAlongALineWithRaptorAndDrtServiceArea() {
DrtConfigGroup drtConfigGroup = new DrtConfigGroup();
drtConfigGroup.mode = "drt2";
DefaultDrtOptimizationConstraintsSet defaultConstraintsSet =
(DefaultDrtOptimizationConstraintsSet) drtConfigGroup.addOrGetDrtOptimizationConstraintsParams()
.addOrGetDefaultDrtOptimizationConstraintsSet();
drtConfigGroup.addOrGetDrtOptimizationConstraintsParams()
.addOrGetDefaultDrtOptimizationConstraintsSet();
defaultConstraintsSet.maxTravelTimeAlpha = 1.3;
defaultConstraintsSet.maxTravelTimeBeta = 5. * 60.;
drtConfigGroup.stopDuration = 60.;
Expand All @@ -264,8 +264,8 @@ void testPtAlongALineWithRaptorAndDrtServiceArea() {
DrtConfigGroup drtConfigGroup = new DrtConfigGroup();
drtConfigGroup.mode = "drt3";
DefaultDrtOptimizationConstraintsSet defaultConstraintsSet =
(DefaultDrtOptimizationConstraintsSet) drtConfigGroup.addOrGetDrtOptimizationConstraintsParams()
.addOrGetDefaultDrtOptimizationConstraintsSet();
drtConfigGroup.addOrGetDrtOptimizationConstraintsParams()
.addOrGetDefaultDrtOptimizationConstraintsSet();
defaultConstraintsSet.maxTravelTimeAlpha = 1.3;
defaultConstraintsSet.maxTravelTimeBeta = 5. * 60.;
drtConfigGroup.stopDuration = 60.;
Expand Down
6 changes: 3 additions & 3 deletions contribs/vsp/src/test/java/org/matsim/integration/drtAndPt/PtAlongALineTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ void testDrtAlongALine() {
drtConfig.mode = "drt_A";
drtConfig.stopDuration = 60.;
DefaultDrtOptimizationConstraintsSet defaultConstraintsSet =
(DefaultDrtOptimizationConstraintsSet) drtConfig.addOrGetDrtOptimizationConstraintsParams()
drtConfig.addOrGetDrtOptimizationConstraintsParams()
.addOrGetDefaultDrtOptimizationConstraintsSet();
defaultConstraintsSet.maxWaitTime = 900.;
defaultConstraintsSet.maxTravelTimeAlpha = 1.3;
Expand Down Expand Up @@ -253,8 +253,8 @@ void testPtAlongALineWithRaptorAndDrtStopFilterAttribute() {
DrtConfigGroup drtConfig = new DrtConfigGroup();
drtConfig.stopDuration = 60.;
DefaultDrtOptimizationConstraintsSet defaultConstraintsSet =
(DefaultDrtOptimizationConstraintsSet) drtConfig.addOrGetDrtOptimizationConstraintsParams()
.addOrGetDefaultDrtOptimizationConstraintsSet();
drtConfig.addOrGetDrtOptimizationConstraintsParams()
.addOrGetDefaultDrtOptimizationConstraintsSet();
defaultConstraintsSet.maxTravelTimeAlpha = 1.3;
defaultConstraintsSet.maxTravelTimeBeta = 5. * 60.;
defaultConstraintsSet.maxWaitTime = Double.MAX_VALUE;
Expand Down