update matsim-libs, compile errors

matsim-scenarios · May 17, 2024 · ffefeec · ffefeec
1 parent a68c05c
commit ffefeec
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,7 @@
 		<!-- <matsim.version>13.0-2020w51-SNAPSHOT</matsim.version>  -->
 
 		<!-- PR release -->
-		<matsim.version>15.0-PR2431</matsim.version>
+		<matsim.version>2025.0-PR3278</matsim.version>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

diff --git a/src/main/java/org/matsim/run/RunMetropoleRuhrScenario.java b/src/main/java/org/matsim/run/RunMetropoleRuhrScenario.java
@@ -43,7 +43,7 @@
 import org.matsim.core.config.Config;
 import org.matsim.core.config.ConfigUtils;
 import org.matsim.core.config.groups.ChangeModeConfigGroup;
-import org.matsim.core.config.groups.PlanCalcScoreConfigGroup;
+import org.matsim.core.config.groups.ScoringConfigGroup;
 import org.matsim.core.config.groups.SubtourModeChoiceConfigGroup;
 import org.matsim.core.controler.AbstractModule;
 import org.matsim.core.controler.Controler;
@@ -73,7 +73,7 @@
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
-import static org.matsim.core.config.groups.PlansCalcRouteConfigGroup.AccessEgressType.accessEgressModeToLinkPlusTimeConstant;
+import static org.matsim.core.config.groups.RoutingConfigGroup.AccessEgressType.accessEgressModeToLinkPlusTimeConstant;
 
 
 @CommandLine.Command(header = ":: Open Metropole Ruhr Scenario ::", version = RunMetropoleRuhrScenario.VERSION, showDefaultValues = true)
@@ -199,14 +199,14 @@ protected Config prepareConfig(Config config) {
 
 		//config.plansCalcRoute().setAccessEgressType(AccessEgressType.accessEgressModeToLink);
 		log.info("using accessEgressModeToLinkPlusTimeConstant");
-		config.plansCalcRoute().setAccessEgressType(accessEgressModeToLinkPlusTimeConstant);
+		config.routing().setAccessEgressType(accessEgressModeToLinkPlusTimeConstant);
 		config.qsim().setUsingTravelTimeCheckInTeleportation(true);
 		config.qsim().setUsePersonIdForMissingVehicleId(false);
 		config.subtourModeChoice().setProbaForRandomSingleTripMode(0.5);
 
 		if (sample.isSet()) {
-			config.controler().setRunId(sample.adjustName(config.controler().getRunId()));
-			config.controler().setOutputDirectory(sample.adjustName(config.controler().getOutputDirectory()));
+			config.controller().setRunId(sample.adjustName(config.controller().getRunId()));
+			config.controller().setOutputDirectory(sample.adjustName(config.controller().getOutputDirectory()));
 			config.plans().setInputFile(sample.adjustName(config.plans().getInputFile()));
 
 			config.qsim().setFlowCapFactor(sample.getSize() / 100.0);
@@ -225,20 +225,20 @@ protected Config prepareConfig(Config config) {
 
 			for (String act : List.of("home", "restaurant", "other", "visit", "errands",
 					"educ_higher", "educ_secondary", "educ_primary", "educ_tertiary", "educ_kiga", "educ_other")) {
-				config.planCalcScore()
-						.addActivityParams(new PlanCalcScoreConfigGroup.ActivityParams(act + "_" + ii).setTypicalDuration(ii));
+				config.scoring()
+						.addActivityParams(new ScoringConfigGroup.ActivityParams(act + "_" + ii).setTypicalDuration(ii));
 			}
 
-			config.planCalcScore().addActivityParams(new PlanCalcScoreConfigGroup.ActivityParams("work_" + ii).setTypicalDuration(ii)
+			config.scoring().addActivityParams(new ScoringConfigGroup.ActivityParams("work_" + ii).setTypicalDuration(ii)
 					.setOpeningTime(6. * 3600.).setClosingTime(20. * 3600.));
-			config.planCalcScore().addActivityParams(new PlanCalcScoreConfigGroup.ActivityParams("business_" + ii).setTypicalDuration(ii)
+			config.scoring().addActivityParams(new ScoringConfigGroup.ActivityParams("business_" + ii).setTypicalDuration(ii)
 					.setOpeningTime(6. * 3600.).setClosingTime(20. * 3600.));
-			config.planCalcScore().addActivityParams(new PlanCalcScoreConfigGroup.ActivityParams("leisure_" + ii).setTypicalDuration(ii)
+			config.scoring().addActivityParams(new ScoringConfigGroup.ActivityParams("leisure_" + ii).setTypicalDuration(ii)
 					.setOpeningTime(9. * 3600.).setClosingTime(27. * 3600.));
 
-			config.planCalcScore().addActivityParams(new PlanCalcScoreConfigGroup.ActivityParams("shop_daily_" + ii).setTypicalDuration(ii)
+			config.scoring().addActivityParams(new ScoringConfigGroup.ActivityParams("shop_daily_" + ii).setTypicalDuration(ii)
 					.setOpeningTime(8. * 3600.).setClosingTime(20. * 3600.));
-			config.planCalcScore().addActivityParams(new PlanCalcScoreConfigGroup.ActivityParams("shop_other_" + ii).setTypicalDuration(ii)
+			config.scoring().addActivityParams(new ScoringConfigGroup.ActivityParams("shop_other_" + ii).setTypicalDuration(ii)
 					.setOpeningTime(8. * 3600.).setClosingTime(20. * 3600.));
 		}
 

diff --git a/src/main/java/org/matsim/run/StrategyWeightFadeout.java b/src/main/java/org/matsim/run/StrategyWeightFadeout.java
@@ -26,7 +26,7 @@
 import org.matsim.api.core.v01.population.Person;
 import org.matsim.api.core.v01.population.Plan;
 import org.matsim.core.config.Config;
-import org.matsim.core.config.groups.StrategyConfigGroup;
+import org.matsim.core.config.groups.ReplanningConfigGroup;
 import org.matsim.core.controler.events.IterationStartsEvent;
 import org.matsim.core.controler.listener.IterationStartsListener;
 import org.matsim.core.replanning.GenericPlanStrategy;
@@ -47,7 +47,7 @@ public final class StrategyWeightFadeout implements IterationStartsListener {
 	private final Logger log = LogManager.getLogger(StrategyWeightFadeout.class);
 
 	@Inject
-	private Map<StrategyConfigGroup.StrategySettings, PlanStrategy> planStrategies;
+	private Map<ReplanningConfigGroup.StrategySettings, PlanStrategy> planStrategies;
 
 	@Inject
 	private Config config;
@@ -63,9 +63,9 @@ public void notifyIterationStarts(IterationStartsEvent iterationStartsEvent) {
 
 		for (Schedule s : schedules) {
 
-			StrategyConfigGroup.StrategySettings settings = null;
+			ReplanningConfigGroup.StrategySettings settings = null;
 
-			for (StrategyConfigGroup.StrategySettings strategySettings : planStrategies.keySet()) {
+			for (ReplanningConfigGroup.StrategySettings strategySettings : planStrategies.keySet()) {
 				if (strategySettings.getStrategyName().equals(s.name) && strategySettings.getSubpopulation().equals(s.subpopulation)) {
 					settings = strategySettings;
 					break;
@@ -81,16 +81,16 @@ public void notifyIterationStarts(IterationStartsEvent iterationStartsEvent) {
 
 			if (Double.isNaN(s.initialWeight)) {
 				s.initialWeight = settings.getWeight();
-				s.startIteration = (int) (config.controler().getLastIteration() * s.startAt);
-				double disable = config.strategy().getFractionOfIterationsToDisableInnovation();
+				s.startIteration = (int) (config.controller().getLastIteration() * s.startAt);
+				double disable = config.replanning().getFractionOfIterationsToDisableInnovation();
 
 				// use disable after if it is set
 				if (!Double.isNaN(s.endAt))
-					s.endIteration = (int) (config.controler().getLastIteration() * s.endAt);
+					s.endIteration = (int) (config.controller().getLastIteration() * s.endAt);
 				else if (settings.getDisableAfter() > 0 && settings.getDisableAfter() < Integer.MAX_VALUE && settings.getDisableAfter() <= disable)
 					s.endIteration = settings.getDisableAfter();
 				else if (Double.isFinite(disable) && disable < Integer.MAX_VALUE)
-					s.endIteration = (int) (config.controler().getLastIteration() * disable);
+					s.endIteration = (int) (config.controller().getLastIteration() * disable);
 				else
 					s.endIteration = settings.getDisableAfter();