Update to MATSim 15 (#173)

* fixing imports * update IdF emission to matsim 15 (#175) * update workflow version * Matsim 15 (#186) * update IdF emission to matsim 15 * update log4j import * make sure Osm mapping is used on osm:way:highway tag * add matsim-examples to pom to get hbefa-41 sample for emissions tests * make the desired pollutant list defined in the commandline * test the emissions part * fix logger imports * update DrtConfigGroup members accessors * add Matsim 15 and emissions update to CHANGELOG.md * Fix imports for VDF * fix imports for mode choice * fix updated routing mode handling in analysis * adding compatible version of corsica scenario 1pm --------- Co-authored-by: Valentin LE BESCOND <[email protected]> Co-authored-by: Valentin LE BESCOND <[email protected]>
eqasim-org · Mar 7, 2024 · 09c830f · 09c830f
1 parent cb21340
commit 09c830f
Show file tree

Hide file tree

Showing 44 changed files with 412 additions and 409 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -13,9 +13,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v1
       with:
-        java-version: 1.11
+        java-version: 17
     - name: Build with Maven
       run: mvn test -B -Dmatsim.preferLocalDtds=true
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@ included in the (note yet determined) next version number.
 
 **Development version**
 
+- Updated to MATSim 15
+- Improve emissions tools and add tests
 - Add support for multi-stage taxi trips in Sao Paulo
 - fix: make compatible with downstream population pipelines
 - Ensure outside activity id doesn't already exist

diff --git a/core/src/main/java/org/eqasim/core/analysis/run/RunLegAnalysis.java b/core/src/main/java/org/eqasim/core/analysis/run/RunLegAnalysis.java
@@ -6,7 +6,8 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.eqasim.core.analysis.DefaultPersonAnalysisFilter;
 import org.eqasim.core.analysis.DistanceUnit;
 import org.eqasim.core.analysis.PersonAnalysisFilter;
@@ -28,7 +29,7 @@
 import org.matsim.facilities.MatsimFacilitiesReader;
 
 public class RunLegAnalysis {
-	private final static Logger logger = Logger.getLogger(RunLegAnalysis.class);
+	private final static Logger logger = LogManager.getLogger(RunLegAnalysis.class);
 
 	static public void main(String[] args) throws IOException, ConfigurationException {
 		CommandLine cmd = new CommandLine.Builder(args) //

diff --git a/core/src/main/java/org/eqasim/core/analysis/run/RunTripAnalysis.java b/core/src/main/java/org/eqasim/core/analysis/run/RunTripAnalysis.java
@@ -6,7 +6,8 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.eqasim.core.analysis.DefaultPersonAnalysisFilter;
 import org.eqasim.core.analysis.DistanceUnit;
 import org.eqasim.core.analysis.PersonAnalysisFilter;
@@ -30,7 +31,7 @@
 import org.matsim.facilities.MatsimFacilitiesReader;
 
 public class RunTripAnalysis {
-	private final static Logger logger = Logger.getLogger(RunTripAnalysis.class);
+	private final static Logger logger = LogManager.getLogger(RunTripAnalysis.class);
 
 	static public void main(String[] args) throws IOException, ConfigurationException {
 		CommandLine cmd = new CommandLine.Builder(args) //

diff --git a/core/src/main/java/org/eqasim/core/analysis/trips/TripListener.java b/core/src/main/java/org/eqasim/core/analysis/trips/TripListener.java
@@ -94,7 +94,7 @@ public void handleEvent(ActivityEndEvent event) {
 	public void handleEvent(PersonDepartureEvent event) {
 		if (personFilter.analyzePerson(event.getPersonId())) {
 			Leg leg = factory.createLeg(event.getLegMode());
-			leg.getAttributes().putAttribute("routingMode", event.getRoutingMode());
+			leg.setRoutingMode(event.getRoutingMode());
 			ongoing.get(event.getPersonId()).elements.add(leg);
 		}
 	}

diff --git a/core/src/main/java/org/eqasim/core/components/headway/HeadwayCalculator.java b/core/src/main/java/org/eqasim/core/components/headway/HeadwayCalculator.java
@@ -4,6 +4,8 @@
 
 import org.matsim.facilities.Facility;
 import org.matsim.utils.objectattributes.attributable.Attributes;
+import org.matsim.utils.objectattributes.attributable.AttributesImpl;
+import org.matsim.utils.objectattributes.attributable.AttributesUtils;
 
 import ch.sbb.matsim.routing.pt.raptor.RaptorRoute;
 import ch.sbb.matsim.routing.pt.raptor.RaptorRoute.RoutePart;
@@ -26,7 +28,7 @@ public double calculateHeadway_min(Facility originFacility, Facility destination
 		double latestDepartureTime = departureTime + afterDepartureOffset;
 
 		List<RaptorRoute> routes = raptor.calcRoutes(originFacility, destinationFacilty, earliestDepartureTime,
-				departureTime, latestDepartureTime, null, new Attributes());
+				departureTime, latestDepartureTime, null, new AttributesImpl());
 
 		int numberOfPtRoutes = 0;
 

diff --git a/core/src/main/java/org/eqasim/core/components/transit/events/PublicTransitEvent.java b/core/src/main/java/org/eqasim/core/components/transit/events/PublicTransitEvent.java
@@ -4,8 +4,8 @@
 
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.events.GenericEvent;
+import org.matsim.api.core.v01.events.HasPersonId;
 import org.matsim.api.core.v01.population.Person;
-import org.matsim.core.api.internal.HasPersonId;
 import org.matsim.pt.transitSchedule.api.TransitLine;
 import org.matsim.pt.transitSchedule.api.TransitRoute;
 import org.matsim.pt.transitSchedule.api.TransitStopFacility;

diff --git a/core/src/main/java/org/eqasim/core/misc/ParallelProgress.java b/core/src/main/java/org/eqasim/core/misc/ParallelProgress.java
@@ -1,9 +1,10 @@
 package org.eqasim.core.misc;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 public class ParallelProgress {
-	private final Logger logger = Logger.getLogger(ParallelProgress.class);
+	private final Logger logger = LogManager.getLogger(ParallelProgress.class);
 
 	private final Thread thread;
 	private final long totalCount;

diff --git a/core/src/main/java/org/eqasim/core/scenario/cutter/facilities/FacilitiesCutter.java b/core/src/main/java/org/eqasim/core/scenario/cutter/facilities/FacilitiesCutter.java
@@ -4,7 +4,8 @@
 import java.util.HashSet;
 import java.util.Iterator;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.eqasim.core.scenario.cutter.extent.ScenarioExtent;
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.population.Activity;
@@ -16,7 +17,7 @@
 import org.matsim.facilities.ActivityFacility;
 
 public class FacilitiesCutter {
-	private final static Logger log = Logger.getLogger(FacilitiesCutter.class);
+	private final static Logger log = LogManager.getLogger(FacilitiesCutter.class);
 
 	private final ScenarioExtent extent;
 	private final Collection<Id<ActivityFacility>> usedFacilityIds = new HashSet<>();

diff --git a/core/src/main/java/org/eqasim/core/scenario/cutter/network/NetworkCutter.java b/core/src/main/java/org/eqasim/core/scenario/cutter/network/NetworkCutter.java
@@ -8,7 +8,8 @@
 import java.util.Optional;
 import java.util.Set;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.eqasim.core.scenario.cutter.extent.ScenarioExtent;
 import org.eqasim.core.scenario.cutter.extent.ShapeScenarioExtent;
 import org.matsim.api.core.v01.Id;
@@ -36,7 +37,7 @@
 import org.matsim.pt.transitSchedule.api.TransitStopFacility;
 
 public class NetworkCutter {
-	private final static Logger log = Logger.getLogger(NetworkCutter.class);
+	private final static Logger log = LogManager.getLogger(NetworkCutter.class);
 
 	private final ScenarioExtent extent;
 	private final MinimumNetworkFinder minimumNetworkFinder;

diff --git a/core/src/main/java/org/eqasim/core/scenario/cutter/transit/TransitScheduleCutter.java b/core/src/main/java/org/eqasim/core/scenario/cutter/transit/TransitScheduleCutter.java
@@ -7,7 +7,8 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.eqasim.core.scenario.cutter.extent.ScenarioExtent;
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.network.Link;
@@ -25,7 +26,7 @@
 import org.matsim.pt.transitSchedule.api.TransitStopFacility;
 
 public class TransitScheduleCutter {
-	private final static Logger log = Logger.getLogger(TransitScheduleCutter.class);
+	private final static Logger log = LogManager.getLogger(TransitScheduleCutter.class);
 
 	private final ScenarioExtent extent;
 	private final StopSequenceCrossingPointFinder crossingPointFinder;

diff --git a/core/src/main/java/org/eqasim/core/scenario/cutter/transit/TransitVehiclesCutter.java b/core/src/main/java/org/eqasim/core/scenario/cutter/transit/TransitVehiclesCutter.java
@@ -3,7 +3,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.matsim.pt.transitSchedule.api.Departure;
 import org.matsim.pt.transitSchedule.api.TransitLine;
 import org.matsim.pt.transitSchedule.api.TransitRoute;
@@ -12,7 +13,7 @@
 import org.matsim.vehicles.Vehicles;
 
 public class TransitVehiclesCutter {
-	private final static Logger log = Logger.getLogger(TransitVehiclesCutter.class);
+	private final static Logger log = LogManager.getLogger(TransitVehiclesCutter.class);
 
 	private final TransitSchedule schedule;
 

diff --git a/core/src/main/java/org/eqasim/core/scenario/preparation/AdjustLinkLength.java b/core/src/main/java/org/eqasim/core/scenario/preparation/AdjustLinkLength.java
@@ -1,12 +1,13 @@
 package org.eqasim.core.scenario.preparation;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.matsim.api.core.v01.network.Link;
 import org.matsim.api.core.v01.network.Network;
 import org.matsim.core.utils.geometry.CoordUtils;
 
 public class AdjustLinkLength {
-	private final Logger logger = Logger.getLogger(AdjustLinkLength.class);
+	private final Logger logger = LogManager.getLogger(AdjustLinkLength.class);
 
 	public void run(Network network) {
 		int infiniteSpeedCount = 0;

diff --git a/core/src/main/java/org/eqasim/core/scenario/validation/ScenarioValidator.java b/core/src/main/java/org/eqasim/core/scenario/validation/ScenarioValidator.java
@@ -1,6 +1,7 @@
 package org.eqasim.core.scenario.validation;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.matsim.api.core.v01.Coord;
 import org.matsim.api.core.v01.Scenario;
 import org.matsim.api.core.v01.network.Link;
@@ -15,7 +16,7 @@
 import org.matsim.facilities.ActivityFacility;
 
 public class ScenarioValidator {
-	private final static Logger logger = Logger.getLogger(ScenarioValidator.class);
+	private final static Logger logger = LogManager.getLogger(ScenarioValidator.class);
 
 	public boolean checkSpatialConsistency(Scenario scenario) {
 		boolean errorsFound = false;

diff --git a/core/src/main/java/org/eqasim/core/simulation/calibration/CalibrationOutputListener.java b/core/src/main/java/org/eqasim/core/simulation/calibration/CalibrationOutputListener.java
@@ -9,7 +9,8 @@
 import java.io.OutputStreamWriter;
 import java.nio.file.Files;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.eqasim.core.analysis.trips.TripListener;
 import org.eqasim.core.components.config.EqasimConfigGroup;
 import org.matsim.core.config.groups.ControlerConfigGroup;
@@ -25,7 +26,7 @@
 
 @Singleton
 public class CalibrationOutputListener implements IterationEndsListener, ShutdownListener {
-	private final Logger logger = Logger.getLogger(CalibrationOutputListener.class);
+	private final Logger logger = LogManager.getLogger(CalibrationOutputListener.class);
 
 	private static final String OUTPUT_FILE_NAME_JSON = "calibration.json";
 	private static final String OUTPUT_FILE_NAME_HTML = "calibration.html";

diff --git a/core/src/main/java/org/eqasim/core/simulation/mode_choice/ParameterDefinition.java b/core/src/main/java/org/eqasim/core/simulation/mode_choice/ParameterDefinition.java
@@ -6,7 +6,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.matsim.core.config.CommandLine;
 import org.matsim.core.config.CommandLine.ConfigurationException;
 
@@ -16,7 +17,7 @@
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 
 public interface ParameterDefinition {
-	final static Logger logger = Logger.getLogger(ParameterDefinition.class);
+	final static Logger logger = LogManager.getLogger(ParameterDefinition.class);
 
 	static public void applyCommandLine(String prefix, CommandLine cmd, ParameterDefinition parameterDefinition) {
 		Map<String, String> values = new HashMap<>();

diff --git a/core/src/main/java/org/eqasim/core/simulation/mode_choice/epsilon/EpsilonModule.java b/core/src/main/java/org/eqasim/core/simulation/mode_choice/epsilon/EpsilonModule.java
@@ -3,7 +3,8 @@
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 import com.google.inject.Provides;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.eqasim.core.components.config.EqasimConfigGroup;
 import org.eqasim.core.simulation.mode_choice.AbstractEqasimExtension;
 import org.eqasim.core.simulation.mode_choice.utilities.UtilityEstimator;
@@ -15,7 +16,7 @@
 
 public class EpsilonModule extends AbstractEqasimExtension {
 
-	public static final Logger logger = Logger.getLogger(EpsilonModule.class);
+	public static final Logger logger = LogManager.getLogger(EpsilonModule.class);
 
 	public static final String EPSILON_UTILITY_PREFIX = "epsilon_";
 	@Provides

diff --git a/core/src/main/java/org/eqasim/core/simulation/modes/drt/utils/AdaptConfigForDrt.java b/core/src/main/java/org/eqasim/core/simulation/modes/drt/utils/AdaptConfigForDrt.java
@@ -57,29 +57,29 @@ public static void adapt(Config config, Map<String, String> vehiclesPathByDrtMod
 
         for(String drtMode: vehiclesPathByDrtMode.keySet()) {
             DrtConfigGroup drtConfigGroup = new DrtConfigGroup();
-            drtConfigGroup.setMode(drtMode);
-            drtConfigGroup.setOperationalScheme(DrtConfigGroup.OperationalScheme.valueOf(operationalSchemes.get(drtMode)));
-            drtConfigGroup.setStopDuration(15.0);
-            drtConfigGroup.setMaxWaitTime(600);
-            drtConfigGroup.setMaxTravelTimeAlpha(1.5);
-            drtConfigGroup.setMaxTravelTimeBeta(300.0);
-            drtConfigGroup.setVehiclesFile(vehiclesPathByDrtMode.get(drtMode));
+            drtConfigGroup.mode = drtMode;
+            drtConfigGroup.operationalScheme = DrtConfigGroup.OperationalScheme.valueOf(operationalSchemes.get(drtMode));
+            drtConfigGroup.stopDuration = 15.0;
+            drtConfigGroup.maxWaitTime = 600;
+            drtConfigGroup.maxTravelTimeAlpha = 1.5;
+            drtConfigGroup.maxTravelTimeBeta = 300.0;
+            drtConfigGroup.vehiclesFile  = vehiclesPathByDrtMode.get(drtMode);
 
             DrtInsertionSearchParams searchParams = new ExtensiveInsertionSearchParams();
             drtConfigGroup.addDrtInsertionSearchParams(searchParams);
 
             RebalancingParams rebalancingParams = new RebalancingParams();
-            rebalancingParams.setInterval(1800);
+            rebalancingParams.interval  =1800;
             rebalancingParams.addParameterSet(new PlusOneRebalancingStrategyParams());
             drtConfigGroup.addParameterSet(rebalancingParams);
 
             DrtZonalSystemParams drtZonalSystemParams = new DrtZonalSystemParams();
-            drtZonalSystemParams.setZonesGeneration(DrtZonalSystemParams.ZoneGeneration.GridFromNetwork);
-            drtZonalSystemParams.setCellSize(500.0);
-            drtZonalSystemParams.setTargetLinkSelection(DrtZonalSystemParams.TargetLinkSelection.mostCentral);
+            drtZonalSystemParams.zonesGeneration  = DrtZonalSystemParams.ZoneGeneration.GridFromNetwork;
+            drtZonalSystemParams.cellSize = 500.0;
+            drtZonalSystemParams.targetLinkSelection = DrtZonalSystemParams.TargetLinkSelection.mostCentral;
             drtConfigGroup.addParameterSet(drtZonalSystemParams);
 
-            multiModeDrtConfigGroup.addDrtConfig(drtConfigGroup);
+            multiModeDrtConfigGroup.addParameterSet(drtConfigGroup);
 
             // Set up choice model
             EqasimConfigGroup eqasimConfig = EqasimConfigGroup.get(config);

diff --git a/core/src/main/java/org/eqasim/core/simulation/modes/drt/utils/CreateDrtVehicles.java b/core/src/main/java/org/eqasim/core/simulation/modes/drt/utils/CreateDrtVehicles.java
@@ -1,6 +1,7 @@
 package org.eqasim.core.simulation.modes.drt.utils;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.network.Link;
 import org.matsim.api.core.v01.network.Network;
@@ -15,7 +16,7 @@
 import java.util.Random;
 
 public class CreateDrtVehicles {
-    private final static Logger logger = Logger.getLogger(CreateDrtVehicles.class);
+    private final static Logger logger = LogManager.getLogger(CreateDrtVehicles.class);
 
     public final static long DEFAULT_RANDOM_SEED = 1234;
 

diff --git a/core/src/main/java/org/eqasim/core/tools/RemovePersonsWithActivityTypes.java b/core/src/main/java/org/eqasim/core/tools/RemovePersonsWithActivityTypes.java
@@ -1,6 +1,7 @@
 package org.eqasim.core.tools;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.matsim.api.core.v01.Identifiable;
 import org.matsim.api.core.v01.Scenario;
 import org.matsim.api.core.v01.population.Activity;
@@ -16,7 +17,7 @@
 
 public class RemovePersonsWithActivityTypes {
 
-    private static final Logger logger = Logger.getLogger(RemovePersonsWithActivityTypes.class);
+    private static final Logger logger = LogManager.getLogger(RemovePersonsWithActivityTypes.class);
 
     public static void main(String[] args) throws CommandLine.ConfigurationException {
         CommandLine commandLine = new CommandLine.Builder(args).requireOptions("input-path", "output-path", "activity-types").build();

diff --git a/core/src/main/java/org/eqasim/core/tools/routing/RunBatchPublicTransportRouter.java b/core/src/main/java/org/eqasim/core/tools/routing/RunBatchPublicTransportRouter.java
@@ -11,7 +11,8 @@
 import java.util.Set;
 
 import org.apache.commons.lang3.tuple.Pair;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.eqasim.core.components.headway.HeadwayCalculator;
 import org.eqasim.core.components.headway.HeadwayImputerModule;
 import org.eqasim.core.misc.InjectorBuilder;
@@ -50,7 +51,7 @@
 import ch.sbb.matsim.config.SwissRailRaptorConfigGroup;
 
 public class RunBatchPublicTransportRouter {
-	private final static Logger logger = Logger.getLogger(RunBatchPublicTransportRouter.class);
+	private final static Logger logger = LogManager.getLogger(RunBatchPublicTransportRouter.class);
 
 	static public void main(String[] args) throws ConfigurationException, JsonGenerationException, JsonMappingException,
 			IOException, InterruptedException {

diff --git a/core/src/test/java/org/eqasim/mode_choice/TestSpecialModeChoiceCases.java b/core/src/test/java/org/eqasim/mode_choice/TestSpecialModeChoiceCases.java
@@ -45,7 +45,7 @@
 import org.matsim.core.router.RoutingRequest;
 import org.matsim.core.scenario.ScenarioUtils;
 import org.matsim.core.utils.timing.TimeInterpretationModule;
-import org.matsim.utils.objectattributes.attributable.Attributes;
+import org.matsim.utils.objectattributes.attributable.AttributesImpl;
 
 import com.google.inject.Inject;
 import com.google.inject.Injector;
@@ -200,7 +200,7 @@ static private void appendTrip(List<DiscreteModeChoiceTrip> trips, String preced
 		destinationActivity.setMaximumDuration(3600.0);
 
 		DiscreteModeChoiceTrip trip = new DiscreteModeChoiceTrip(originActivity, destinationActivity, "walk",
-				Collections.emptyList(), 0, trips.size(), trips.size(), new Attributes());
+				Collections.emptyList(), 0, trips.size(), trips.size(), new AttributesImpl());
 		trips.add(trip);
 	}