build: move to MATSim 2024.0

agentsoz · May 25, 2024 · 9bccca2 · 9bccca2
1 parent d3b1911
commit 9bccca2
Show file tree

Hide file tree

Showing 17 changed files with 80 additions and 75 deletions.
diff --git a/ees/pom.xml b/ees/pom.xml
@@ -74,13 +74,29 @@
     </profile>
   </profiles>
 
+  <!-- DS 24/05/24: All these repositories are required for finding MATSim dependencies -->
   <repositories>
     <repository>
-      <!-- Geotools is not on Maven central -->
       <id>osgeo</id>
       <name>Geotools repository</name>
       <url>https://repo.osgeo.org/repository/release</url>
     </repository>
+    <repository>
+      <id>matsim</id>
+      <url>https://repo.matsim.org/repository/matsim</url>
+    </repository>
+    <repository>
+      <id>jogl</id>
+      <url>https://jogamp.org/deployment/maven/</url>
+    </repository>
+    <repository>
+      <id>topobyte</id>
+      <url>https://mvn.topobyte.de</url>
+    </repository>
+    <repository>
+      <id>slimjars</id>
+      <url>https://mvn.slimjars.com</url>
+    </repository>
   </repositories>
 
   <dependencies>
@@ -98,6 +114,12 @@
       <groupId>io.github.agentsoz</groupId>
       <artifactId>bdi-matsim</artifactId>
       <version>3.0.1-SNAPSHOT</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>slf4j-api</artifactId>
+          <groupId>org.slf4j</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>io.github.agentsoz</groupId>
@@ -133,17 +155,6 @@
       <version>4.13.1</version> 
       <!--<scope>test</scope>-->
     </dependency>
-    <dependency>
-      <groupId>com.google.inject</groupId>
-      <artifactId>guice</artifactId>
-      <version>5.1.0</version>
-    </dependency>
-    <!-- for easy CSV parsing -->
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-csv</artifactId>
-      <version>1.6</version>
-    </dependency>
     <!-- for easy EPSG transforms -->
     <dependency>
       <groupId>org.geotools</groupId>

diff --git a/ees/scenarios/grid/ar-1a-mat.xml b/ees/scenarios/grid/ar-1a-mat.xml
@@ -39,16 +39,16 @@
 		<param name="inputPlansFile" value="ar-1a-pop.xml" />
 	</module>
 
-	<module name="controler">
+	<module name="controller">
 		<param name="outputDirectory" value="output" />
 		<param name="firstIteration" value="0" />
 		<param name="lastIteration" value="0" />
 		<param name="mobsim" value="qsim" />
 		<param name = "snapshotFormat" value="googleearth"/> <!-- enable KML output; also must enable snapshotperiod -->
 	</module>
 
-	<module name="controler">
-		<param name= "routingAlgorithmType" value="FastAStarLandmarks" />
+	<module name="controller">
+		<param name= "routingAlgorithmType" value="AStarLandmarks" />
 	</module>
 
 	<module name="qsim">
@@ -63,9 +63,9 @@
 
 	</module>
 
-	<module name="planCalcScore">
+	<module name="scoring">
 		<param name="learningRate" value="1.0" />
-		<param name="BrainExpBeta" value="2.0" />
+		<param name="brainExpBeta" value="2.0" />
 
 		<parameterset type="scoringParameters">
 			<param name="lateArrival" value="-18" />
@@ -100,7 +100,7 @@
 		</parameterset>
 	</module>
 
-	<module name="strategy">
+	<module name="replanning">
 		<param name="maxAgentPlanMemorySize" value="5" /> <!-- 0 means unlimited -->
 
 		<parameterset type="strategysettings">

diff --git a/ees/scenarios/grid/ar-2a-mat.xml b/ees/scenarios/grid/ar-2a-mat.xml
@@ -39,16 +39,16 @@
 		<param name="inputPlansFile" value="ar-2a-pop.xml" />
 	</module>
 
-	<module name="controler">
+	<module name="controller">
 		<param name="outputDirectory" value="output" />
 		<param name="firstIteration" value="0" />
 		<param name="lastIteration" value="0" />
 		<param name="mobsim" value="qsim" />
 		<param name = "snapshotFormat" value="googleearth"/> <!-- enable KML output; also must enable snapshotperiod -->
 	</module>
 
-	<module name="controler">
-		<param name= "routingAlgorithmType" value="FastAStarLandmarks" />
+	<module name="controller">
+		<param name= "routingAlgorithmType" value="AStarLandmarks" />
 	</module>
 
 	<module name="qsim">
@@ -63,9 +63,9 @@
 
 	</module>
 
-	<module name="planCalcScore">
+	<module name="scoring">
 		<param name="learningRate" value="1.0" />
-		<param name="BrainExpBeta" value="2.0" />
+		<param name="brainExpBeta" value="2.0" />
 
 		<parameterset type="scoringParameters">
 			<param name="lateArrival" value="-18" />
@@ -100,7 +100,7 @@
 		</parameterset>
 	</module>
 
-	<module name="strategy">
+	<module name="replanning">
 		<param name="maxAgentPlanMemorySize" value="5" /> <!-- 0 means unlimited -->
 
 		<parameterset type="strategysettings">

diff --git a/ees/scenarios/grid/ar-2a-pop.xml b/ees/scenarios/grid/ar-2a-pop.xml
@@ -3,11 +3,6 @@
 
 <population>
 
-	<attributes>
-		<attribute name="coordinateReferenceSystem" class="java.lang.String">Atlantis</attribute>
-	</attributes>
-
-
 <!-- ====================================================================== -->
 
 	<person id="0">

diff --git a/ees/scenarios/grid/ar-congestion-mat.xml b/ees/scenarios/grid/ar-congestion-mat.xml
@@ -40,16 +40,16 @@
 		<param name="inputPlansFile" value="ar-20a-pop.xml" />
 	</module>
 
-	<module name="controler">
+	<module name="controller">
 		<param name="outputDirectory" value="output" />
 		<param name="firstIteration" value="0" />
 		<param name="lastIteration" value="0" />
 		<param name="mobsim" value="qsim" />
 		<param name = "snapshotFormat" value="googleearth"/> <!-- enable KML output; also must enable snapshotperiod -->
 	</module>
 
-	<module name="controler">
-		<param name= "routingAlgorithmType" value="FastAStarLandmarks" />
+	<module name="controller">
+		<param name= "routingAlgorithmType" value="AStarLandmarks" />
 	</module>
 
 	<module name="qsim">
@@ -65,17 +65,17 @@
 		<param name = "numberOfThreads" value="4"/>
 	</module>
 
-	<module name="parallelEventHandling">
+	<module name="eventsManager">
 		<param name="estimatedNumberOfEvents" value="null" />
 		<!-- Null means let matsim decide -->
 		<param name="numberOfThreads" value="null" />
 		<!-- each handler will be assigned to a thread if enabled -->
 		<param name="oneThreadPerHandler" value="false" />
 	 </module>
 
-	<module name="planCalcScore">
+	<module name="scoring">
 		<param name="learningRate" value="1.0" />
-		<param name="BrainExpBeta" value="2.0" />
+		<param name="brainExpBeta" value="2.0" />
 
 		<parameterset type="scoringParameters">
 			<param name="lateArrival" value="-18" />
@@ -110,7 +110,7 @@
 		</parameterset>
 	</module>
 
-	<module name="strategy">
+	<module name="replanning">
 		<param name="maxAgentPlanMemorySize" value="5" /> <!-- 0 means unlimited -->
 
 		<parameterset type="strategysettings">

diff --git a/ees/scenarios/mount-alexander-shire/bradford-newstead-fire-crossing-400/matsim_config.xml b/ees/scenarios/mount-alexander-shire/bradford-newstead-fire-crossing-400/matsim_config.xml
@@ -41,16 +41,16 @@
 		<param name="inputPlansFile" value="matsim_plans.xml" />
 	</module>
 
-	<module name="controler">
+	<module name="controller">
 		<param name="outputDirectory" value="output" />
 		<param name="firstIteration" value="0" />
 		<param name="lastIteration" value="0" />
 		<param name="mobsim" value="qsim" />
 		<param name = "snapshotFormat" value="googleearth"/> <!-- enable KML output; also must enable snapshotperiod -->
 	</module>
 
-	<module name="controler">
-		<param name= "routingAlgorithmType" value="FastAStarLandmarks" />
+	<module name="controller">
+		<param name= "routingAlgorithmType" value="AStarLandmarks" />
 	</module>
 
 	<module name="qsim">
@@ -68,9 +68,9 @@
 
 	</module>
 
-	<module name="planCalcScore">
+	<module name="scoring">
 		<param name="learningRate" value="1.0" />
-		<param name="BrainExpBeta" value="2.0" />
+		<param name="brainExpBeta" value="2.0" />
 
 		<parameterset type="scoringParameters">
 			<param name="lateArrival" value="-18" />
@@ -105,7 +105,7 @@
 		</parameterset>
 	</module>
 
-	<module name="strategy">
+	<module name="replanning">
 		<param name="maxAgentPlanMemorySize" value="5" /> <!-- 0 means unlimited -->
 
 		<parameterset type="strategysettings">

diff --git a/ees/scenarios/mount-alexander-shire/campbells-creek-1/matsim_config.xml b/ees/scenarios/mount-alexander-shire/campbells-creek-1/matsim_config.xml
@@ -39,16 +39,16 @@
 		<param name="inputPlansFile" value="matsim_plans.xml" />
 	</module>
 
-	<module name="controler">
+	<module name="controller">
 		<param name="outputDirectory" value="output" />
 		<param name="firstIteration" value="0" />
 		<param name="lastIteration" value="0" />
 		<param name="mobsim" value="qsim" />
 		<param name = "snapshotFormat" value="googleearth"/> <!-- enable KML output; also must enable snapshotperiod -->
 	</module>
 
-	<module name="controler">
-		<param name= "routingAlgorithmType" value="FastAStarLandmarks" />
+	<module name="controller">
+		<param name= "routingAlgorithmType" value="AStarLandmarks" />
 	</module>
 
 	<module name="qsim">
@@ -63,9 +63,9 @@
 
 	</module>
 
-	<module name="planCalcScore">
+	<module name="scoring">
 		<param name="learningRate" value="1.0" />
-		<param name="BrainExpBeta" value="2.0" />
+		<param name="brainExpBeta" value="2.0" />
 
 		<parameterset type="scoringParameters">
 			<param name="lateArrival" value="-18" />
@@ -100,7 +100,7 @@
 		</parameterset>
 	</module>
 
-	<module name="strategy">
+	<module name="replanning">
 		<param name="maxAgentPlanMemorySize" value="5" /> <!-- 0 means unlimited -->
 
 		<parameterset type="strategysettings">

diff --git a/ees/scenarios/mount-alexander-shire/castlemaine-1000/scenario_matsim_main_reduced.xml b/ees/scenarios/mount-alexander-shire/castlemaine-1000/scenario_matsim_main_reduced.xml
@@ -39,16 +39,16 @@
 		<param name="inputPlansFile" value="scenario_matsim_plans_reduced.xml" />
 	</module>
 
-	<module name="controler">
+	<module name="controller">
 		<param name="outputDirectory" value="scenario_matsim_output" />
 		<param name="firstIteration" value="0" />
 		<param name="lastIteration" value="0" />
 		<param name="mobsim" value="qsim" />
 		<param name = "snapshotFormat" value="googleearth"/> <!-- enable KML output; also must enable snapshotperiod -->
 	</module>
 
-	<module name="controler">
-		<param name= "routingAlgorithmType" value="FastAStarLandmarks" />
+	<module name="controller">
+		<param name= "routingAlgorithmType" value="AStarLandmarks" />
 	</module>
 
 	<module name="qsim">
@@ -63,9 +63,9 @@
 
 	</module>
 
-	<module name="planCalcScore">
+	<module name="scoring">
 		<param name="learningRate" value="1.0" />
-		<param name="BrainExpBeta" value="2.0" />
+		<param name="brainExpBeta" value="2.0" />
 
 		<parameterset type="scoringParameters">
 			<param name="lateArrival" value="-18" />
@@ -100,7 +100,7 @@
 		</parameterset>
 	</module>
 
-	<module name="strategy">
+	<module name="replanning">
 		<param name="maxAgentPlanMemorySize" value="5" /> <!-- 0 means unlimited -->
 
 		<parameterset type="strategysettings">

diff --git a/...enarios/mount-alexander-shire/maldon-100-with-emergency-vehicles/scenario_matsim_main.xml b/...enarios/mount-alexander-shire/maldon-100-with-emergency-vehicles/scenario_matsim_main.xml
@@ -39,16 +39,16 @@
 		<param name="inputPlansFile" value="scenario_matsim_plans_10.xml" />
 	</module>
 
-	<module name="controler">
+	<module name="controller">
 		<param name="outputDirectory" value="output" />
 		<param name="firstIteration" value="0" />
 		<param name="lastIteration" value="0" />
 		<param name="mobsim" value="qsim" />
 		<param name = "snapshotFormat" value="googleearth"/> <!-- enable KML output; also must enable snapshotperiod -->
 	</module>
 
-	<module name="controler">
-		<param name= "routingAlgorithmType" value="FastAStarLandmarks" />
+	<module name="controller">
+		<param name= "routingAlgorithmType" value="AStarLandmarks" />
 	</module>
 
 	<module name="qsim">
@@ -63,9 +63,9 @@
 
 	</module>
 
-	<module name="planCalcScore">
+	<module name="scoring">
 		<param name="learningRate" value="1.0" />
-		<param name="BrainExpBeta" value="2.0" />
+		<param name="brainExpBeta" value="2.0" />
 
 		<parameterset type="scoringParameters">
 			<param name="lateArrival" value="-18" />
@@ -101,7 +101,7 @@
 	</module>
 
 
-	<module name="strategy">
+	<module name="replanning">
 		<param name="maxAgentPlanMemorySize" value="5" /> <!-- 0 means unlimited -->
 
 		<parameterset type="strategysettings">

diff --git a/ees/src/main/java/io/github/agentsoz/ees/matsim/DisruptionWriter.java b/ees/src/main/java/io/github/agentsoz/ees/matsim/DisruptionWriter.java
@@ -50,7 +50,7 @@ class DisruptionWriter {
 	}
 	void write(double time, Id<Link> linkId, Coord coord, double speed ) {
 		if (writer == null) {
-			final String filename = config.controler().getOutputDirectory() + "/output_disruptionCoords.txt.gz";
+			final String filename = config.controller().getOutputDirectory() + "/output_disruptionCoords.txt.gz";
 			log.warn("writing disruption data to " + filename);
 			try {
 				writer = IOUtils.getPrintStream(new File(filename).toURI().toURL());

diff --git a/ees/src/main/java/io/github/agentsoz/ees/matsim/EvacAgent.java b/ees/src/main/java/io/github/agentsoz/ees/matsim/EvacAgent.java
@@ -70,8 +70,7 @@
 import org.matsim.withinday.utils.EditTrips;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
-import javax.inject.Inject;
+import com.google.inject.Inject;
 
 class EvacAgent implements MobsimDriverAgent, HasPerson, PlanAgent, HasModifiablePlan {