update FareZoneBasedPtFare configs

pom.xml

@@ -12,7 +12,7 @@
 		<!--<version>14.0-PR1452</version>-->
 
 		<!-- snapshot == not recommended: rather use PR-labelled release!-->
-		<version>2025.0-PR3382</version>
+		<version>2025.0-PR3429</version>
 	</parent>
 
 

src/main/java/org/matsim/run/LausitzScenario.java

@@ -3,6 +3,7 @@
 import com.google.common.collect.Sets;
 import com.google.inject.Key;
 import com.google.inject.name.Names;
+import org.matsim.analysis.personMoney.PersonMoneyEventsAnalysisModule;
 import org.matsim.api.core.v01.Scenario;
 import org.matsim.api.core.v01.TransportMode;
 import org.matsim.application.MATSimApplication;
@@ -18,6 +19,10 @@
 import org.matsim.application.prepare.pt.CreateTransitScheduleFromGtfs;
 import org.matsim.contrib.emissions.HbefaVehicleCategory;
 import org.matsim.contrib.emissions.utils.EmissionsConfigGroup;
+import org.matsim.contrib.vsp.pt.fare.DistanceBasedPtFareParams;
+import org.matsim.contrib.vsp.pt.fare.FareZoneBasedPtFareParams;
+import org.matsim.contrib.vsp.pt.fare.PtFareConfigGroup;
+import org.matsim.contrib.vsp.pt.fare.PtFareModule;
 import org.matsim.contrib.vsp.scenario.SnzActivities;
 import org.matsim.core.config.Config;
 import org.matsim.core.config.ConfigUtils;
@@ -39,9 +44,6 @@
 import org.matsim.vehicles.VehicleType;
 import org.matsim.vehicles.VehicleUtils;
 import picocli.CommandLine;
-import playground.vsp.pt.fare.DistanceBasedPtFareParams;
-import playground.vsp.pt.fare.PtFareConfigGroup;
-import playground.vsp.pt.fare.PtFareModule;
 import playground.vsp.scoring.IncomeDependentUtilityOfMoneyPersonScoringParameters;
 
 import javax.annotation.Nullable;
@@ -143,17 +145,26 @@ protected Config prepareConfig(Config config) {
 
 //		set pt fare calc model to fareZoneBased = fare of vvo tarifzone 20 is paid for trips within fare zone
 //		every other trip: Deutschlandtarif
-//		for more info see FareZoneBasedPtFareHandler class in vsp contrib
+//		for more info see PTFareModule / ChainedPtFareCalculator classes in vsp contrib
 		PtFareConfigGroup ptFareConfigGroup = ConfigUtils.addOrGetModule(config, PtFareConfigGroup.class);
-		ptFareConfigGroup.setPtFareCalculationModel(PtFareConfigGroup.PtFareCalculationModels.fareZoneBased);
 
-		DistanceBasedPtFareParams fareParams = ConfigUtils.addOrGetModule(config, DistanceBasedPtFareParams.class);
+		FareZoneBasedPtFareParams vvo20 = new FareZoneBasedPtFareParams();
+		vvo20.setTransactionPartner("VVO Tarifzone 20");
+		vvo20.setDescription("VVO Tarifzone 20");
+		vvo20.setOrder(1);
 		try {
-			fareParams.setFareZoneShp(Paths.get(config.getContext().toURI()).getParent().toString() + "/vvo_tarifzone20/vvo_tarifzone20_hoyerswerda_utm32n.shp");
+			vvo20.setFareZoneShp(Paths.get(config.getContext().toURI()).getParent().toString() + "/vvo_tarifzone20/vvo_tarifzone20_hoyerswerda_utm32n.shp");
 		} catch (URISyntaxException e) {
 			throw new RuntimeException(e);
 		}
 
+		DistanceBasedPtFareParams germany = DistanceBasedPtFareParams.GERMAN_WIDE_FARE;
+		germany.setTransactionPartner("Deutschlandtarif");
+		germany.setDescription("Deutschlandtarif");
+		germany.setOrder(2);
+
+		ptFareConfigGroup.addParameterSet(vvo20);
+		ptFareConfigGroup.addParameterSet(germany);
 
 		if (emissions == EmissionAnalysisHandling.PERFORM_EMISSIONS_ANALYSIS) {
 //		set hbefa input files for emission analysis
@@ -185,6 +196,9 @@ protected void prepareScenario(Scenario scenario) {
 	@Override
 	protected void prepareControler(Controler controler) {
 
+		//analyse PersonMoneyEvents
+		controler.addOverridingModule(new PersonMoneyEventsAnalysisModule());
+
 		controler.addOverridingModule(new SimWrapperModule());
 
 		controler.addOverridingModule(new AbstractModule() {