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

Jump to bottom

rename a method from add... to set... since that is what is does. #3099

Merged
merged 3 commits into from
Jun 25, 2024
Merged

rename a method from add... to set... since that is what is does. #3099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec75934
rename a method from add... to set... since that is what is does.
kainagel Feb 8, 2024
5a28bad
Merge branch 'master' into drtMaintenance
kainagel Feb 8, 2024
3194e9d
Merge branch 'master' into drtMaintenance
jfbischoff Jun 25, 2024
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
9 changes: 9 additions & 0 deletions contribs/drt/src/main/java/org/matsim/contrib/drt/run/DrtConfigGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,8 +369,17 @@ public Optional<DrtEstimatorParams> getDrtEstimatorParams() {

/**
* Convenience method that brings syntax closer to syntax in, e.g., {@link RoutingConfigGroup} or {@link ScoringConfigGroup}
*
* @deprecated -- use {@link #setDrtInsertionSearchParams(DrtInsertionSearchParams) instead}
*/
@Deprecated
public final void addDrtInsertionSearchParams(final DrtInsertionSearchParams pars) {
addParameterSet(pars);
}
/**
* Convenience method that brings syntax closer to syntax in, e.g., {@link RoutingConfigGroup} or {@link ScoringConfigGroup}
*/
public final void setDrtInsertionSearchParams(final DrtInsertionSearchParams pars) {
addParameterSet(pars);
}
}
5 changes: 3 additions & 2 deletions contribs/drt/src/main/java/org/matsim/contrib/drt/run/DrtConfigs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,19 @@ public class DrtConfigs {
private static final Logger LOGGER = LogManager.getLogger(DrtControlerCreator.class);

public static void adjustMultiModeDrtConfig(MultiModeDrtConfigGroup multiModeDrtCfg,
ScoringConfigGroup planCalcScoreCfg, RoutingConfigGroup plansCalcRouteCfg) {
ScoringConfigGroup planCalcScoreCfg, RoutingConfigGroup plansCalcRouteCfg) {
for (DrtConfigGroup drtCfg : multiModeDrtCfg.getModalElements()) {
DrtConfigs.adjustDrtConfig(drtCfg, planCalcScoreCfg, plansCalcRouteCfg);
}
}

public static void adjustDrtConfig(DrtConfigGroup drtCfg, ScoringConfigGroup planCalcScoreCfg,
RoutingConfigGroup plansCalcRouteCfg) {
RoutingConfigGroup plansCalcRouteCfg) {
String drtStageActivityType = ScoringConfigGroup.createStageActivityType(drtCfg.getMode());
if (planCalcScoreCfg.getActivityParams(drtStageActivityType) == null) {
addDrtStageActivityParams(planCalcScoreCfg, drtStageActivityType);
}
// yyyy I think that the above functionality could/should be moved into the config consistency checker. kai, feb'24
}

private static void addDrtStageActivityParams(ScoringConfigGroup planCalcScoreCfg, String stageActivityType) {
Expand Down
Loading