Update to MATSim 14

jibeproject · Jul 18, 2023 · 4380b6b · 4380b6b
1 parent 38bbe26
commit 4380b6b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -15,7 +15,7 @@
 	<name>MATSim JIBE</name>
 	<description>All MATSim-related scripts for JIBE</description>
 	<properties>
-		<matsim.version>13.0</matsim.version>
+		<matsim.version>14.0</matsim.version>
 		<geotools.version>28-SNAPSHOT</geotools.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

diff --git a/src/main/java/network/CreateMatsimNetworkRoad.java b/src/main/java/network/CreateMatsimNetworkRoad.java
@@ -43,6 +43,7 @@ public static void main(String[] args) {
         final File nodesFile = Resources.instance.getFile(Properties.NETWORK_NODES);
         final File edgesFile = Resources.instance.getFile(Properties.NETWORK_LINKS);
         final String networkFile = Resources.instance.getString(Properties.MATSIM_ROAD_NETWORK);
+        final String carNetworkFile = Resources.instance.getString(Properties.MATSIM_CAR_NETWORK);
 
         // Read nodes and edges
         Map<Integer,SimpleFeature> nodes = GpkgReader.readNodes(nodesFile);
@@ -70,6 +71,10 @@ public static void main(String[] args) {
 
         // Write network
         new NetworkWriter(net).write(networkFile);
+
+        // Write Car Network
+        Network carNetwork = NetworkUtils2.extractModeSpecificNetwork(net,"car");
+        new NetworkWriter(carNetwork).write(carNetworkFile);
     }
 
     private static void addNodeToNetwork(int nodeID, SimpleFeature point, Network net, NetworkFactory fac) {

diff --git a/src/main/java/resources/Properties.java b/src/main/java/resources/Properties.java
@@ -11,9 +11,10 @@ public class Properties {
 
     // MATSim data (must be in .xml format)
     public static final String MATSIM_ROAD_NETWORK = "matsim.road.network";
+    public static final String MATSIM_CAR_NETWORK = "matsim.car.network";
     public static final String MATSIM_TRANSIT_NETWORK = "matsim.transit.network";
     public static final String MATSIM_TRANSIT_SCHEDULE = "matsim.transit.schedule";
-    public static final String MATSIM_TFGM_PLANS = "matsim.tgfm.plans";
+    public static final String MATSIM_TFGM_PLANS = "matsim.tfgm.plans";
 
     // Other properties
     public static final String NUMBER_OF_THREADS = "number.of.threads";

diff --git a/src/main/java/resources/example.properties b/src/main/java/resources/example.properties
@@ -9,8 +9,10 @@ network.nodes = network/network_nodes_z.gpkg
 
 # MATSim data (all in .xml format)
 matsim.road.network = network/network.xml
+matsim.car.network = network/network_car.xml
 matsim.transit.network = pt/ptNetwork.xml
 matsim.transit.schedule = pt/scheduleMapped.xml
+matsim.tfgm.plans = demand/tfgmPlans.xml
 
 # Other properties
 coordinate.system = EPSG:27700

diff --git a/src/main/java/trads/calculate/PtIndicatorCalculator.java b/src/main/java/trads/calculate/PtIndicatorCalculator.java
@@ -62,7 +62,7 @@ public void run() {
                 Facility fOrig = activityFacilitiesFactory.createActivityFacility(Id.create(1, ActivityFacility.class), cOrig);
                 Facility fDest = activityFacilitiesFactory.createActivityFacility(Id.create(1, ActivityFacility.class), cDest);
 
-                List<Leg> legs = raptor.calcRoute(fOrig, fDest, earliestDepartureTime, departureTime, latestDepartureTime, null);
+                List<Leg> legs = null;//raptor.calcRoute(fOrig, fDest, earliestDepartureTime, departureTime, latestDepartureTime, null); todo: adapt to MATSim 14.0
 
                 int ptLegs = 0;
                 int walkLegs = 0;