Update to Java 21 + MATSim 2025 + Health Extension + Determinism

.github/workflows/ci.yml

@@ -13,10 +13,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 11
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          distribution: 'adopt' # See 'Supported distributions' for available options
-          java-version: '11'
+          distribution: 'temurin' # See 'Supported distributions' for available options
+          java-version: '21'
       - name: Build with Maven
         run: mvn test --fail-at-end --batch-mode -Dmatsim.preferLocalDtds=true

.github/workflows/deployment.yml

@@ -2,37 +2,36 @@ name: Cloudsmith Deployment
 
 on:
   schedule:
-    - cron: '0 1 * * 1' 
-
-
+    - cron: '0 1 * * 1'
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+
+      - name: Set up JDK 21 for build
+        uses: actions/setup-java@v4
         with:
-          distribution: 'adopt' # See 'Supported distributions' for available options
-          java-version: '11'
+          distribution: 'temurin'
+          java-version: '21'
           cache: 'maven'
+
       - name: Build with Maven
         run: mvn test -DforkMode=always --fail-at-end --batch-mode -Dmatsim.preferLocalDtds=true
-      
-      - name: Set up Cloudsmith
-        uses: actions/setup-java@v2
-        with: # running setup-java again overwrites the settings.xml
-          distribution: 'adopt' # See 'Supported distributions' for available options
-          java-version: '11'
-          server-id: msm # Value of the distributionManagement/repository/id field of the pom.xml
-          server-username: CLOUDSMITH_USERNAME # env variable for username in deploy
-          server-password: CLOUDSMITH_TOKEN # env variable for token in deploy       
+
+      - name: Set up JDK 21 for Cloudsmith (and configure server credentials)
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+          server-id: msm
+          server-username: CLOUDSMITH_USERNAME
+          server-password: CLOUDSMITH_TOKEN
 
       - name: Publish to Cloudsmith
         run: mvn deploy -DskipTests=true --fail-at-end --batch-mode -Dmatsim.preferLocalDtds=true
         env:
           CLOUDSMITH_USERNAME: carlos-llorca
           CLOUDSMITH_TOKEN: ${{ secrets.cloudsmithToken }}
-

.gitignore

@@ -6,7 +6,7 @@ out
 *.project
 /bin/
 *.settings/
-/target/
+**/target/
 .idea/
 *.iml
 /Makefile
@@ -16,7 +16,8 @@ out
 /timeTracker.csv
 scenOutput
 status.csv
-test/output/*
+**/test/output/*
+**/test/scenarios/*
 test/scenarios/annapolis/null_t.csv
 *.DS_Store
 

analysis/pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>silo-parent</artifactId>
-        <groupId>de.tum.bgu.msm</groupId>
+        <groupId>de.tum.bgu.msm.silo</groupId>
         <version>0.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -17,26 +17,25 @@
 
     <dependencies>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13.1</version>
-            <type>jar</type>
-            <scope>provided</scope>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>de.tum.bgu.msm</groupId>
+            <groupId>de.tum.bgu.msm.silo</groupId>
             <artifactId>siloCore</artifactId>
             <version>0.1.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>de.tum.bgu.msm</groupId>
+            <groupId>de.tum.bgu.msm.silo</groupId>
             <artifactId>munich</artifactId>
             <version>0.1.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>de.tum.bgu.msm</groupId>
+            <groupId>de.tum.bgu.msm.silo</groupId>
             <artifactId>kagawa</artifactId>
             <version>0.1.0-SNAPSHOT</version>
             <scope>compile</scope>

analysis/src/main/java/sdg/SDGCalculator.java

@@ -12,7 +12,8 @@
 import de.tum.bgu.msm.data.person.*;
 import de.tum.bgu.msm.properties.Properties;
 import de.tum.bgu.msm.util.MitoUtil;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.locationtech.jts.geom.Coordinate;
 import sdg.data.AnalyzedPerson;
 import sdg.data.DataContainerSdg;
@@ -25,7 +26,7 @@
 
 public class SDGCalculator {
 
-    private static Logger logger = Logger.getLogger(SDGCalculator.class);
+    private static Logger logger = LogManager.getLogger(SDGCalculator.class);
     private Collection<Household> households = new ArrayList<>();
     private Collection<Dwelling> dwellings = new ArrayList<>();
     private Collection<Person> persons = new ArrayList<>();

analysis/src/main/java/sdg/TransitStopBufferTak.java

@@ -5,6 +5,11 @@
 import de.tum.bgu.msm.data.geo.DefaultGeoData;
 import de.tum.bgu.msm.io.DwellingReaderTak;
 import de.tum.bgu.msm.io.GeoDataReaderTak;
+import org.geotools.api.feature.simple.SimpleFeature;
+import org.geotools.api.referencing.FactoryException;
+import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
+import org.geotools.api.referencing.operation.MathTransform;
+import org.geotools.api.referencing.operation.TransformException;
 import org.geotools.geometry.jts.JTS;
 import org.geotools.referencing.CRS;
 import org.locationtech.jts.geom.Coordinate;
@@ -18,11 +23,6 @@
 import org.matsim.core.utils.gis.ShapeFileReader;
 import org.matsim.pt.transitSchedule.TransitScheduleFactoryImpl;
 import org.matsim.pt.transitSchedule.api.TransitStopFacility;
-import org.opengis.feature.simple.SimpleFeature;
-import org.opengis.referencing.FactoryException;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.referencing.operation.MathTransform;
-import org.opengis.referencing.operation.TransformException;
 
 import java.util.HashSet;
 import java.util.Set;

analysis/src/main/java/sdg/reader/EventAnalysis.java

@@ -24,7 +24,6 @@ public Map<Integer, AnalyzedPerson> runEventAnalysis(String networkFileName, Str
         CongestionEventHandler congestionEventHandler = new CongestionEventHandler(scenario.getNetwork());
         eventsManager.addHandler(congestionEventHandler);
         EventsUtils.readEvents(eventsManager,eventFileName);
-        System.out.println("1");
         //new MatsimEventsReader(eventsManager).readFile(eventFileName);
         return congestionEventHandler.getPersons();
     }

analysis/src/main/java/sdg/reader/TripReader.java

@@ -5,7 +5,8 @@
 import de.tum.bgu.msm.data.Purpose;
 import de.tum.bgu.msm.data.person.Person;
 import de.tum.bgu.msm.utils.SiloUtil;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import sdg.SDGCalculator;
 import sdg.data.Trip;
 
@@ -17,7 +18,7 @@
 
 public class TripReader {
 
-    private final static Logger logger = Logger.getLogger(TripReader.class);
+    private final static Logger logger = LogManager.getLogger(TripReader.class);
 
     public void readData(String path, DataContainer dataContainer) {
         logger.info("Reading trip data from mito trip csv");

extensions/health/pom.xml

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>de.tum.bgu.msm.silo</groupId>
+        <artifactId>extensions</artifactId>
+        <version>0.1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>health</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>org.matsim.contrib</groupId>
+            <artifactId>accidents</artifactId>
+            <version>${matsimVersion}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.media</groupId>
+                    <artifactId>jai_core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>jgridshift</groupId>
+                    <artifactId>jgridshift</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.matsim.contrib</groupId>
+            <artifactId>analysis</artifactId>
+            <version>${matsimVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.matsim.contrib</groupId>
+            <artifactId>emissions</artifactId>
+            <version>${matsimVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.matsim.contrib</groupId>
+            <artifactId>noise</artifactId>
+            <version>${matsimVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.matsim.contrib</groupId>
+            <artifactId>dvrp</artifactId>
+            <version>${matsimVersion}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>de.tum.bgu.msm.silo</groupId>
+            <artifactId>schools</artifactId>
+            <version>0.1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>de.tum.bgu.msm.silo</groupId>
+            <artifactId>matsim2silo</artifactId>
+            <version>0.1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+</project>