update matsim

.github/workflows/code-coverage.yaml

@@ -17,7 +17,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'zulu'
           cache: 'maven'
 

.github/workflows/codeql.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'zulu'
           cache: 'maven'
 

.github/workflows/deploy-on-pr-merge.yaml

@@ -22,7 +22,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'zulu'
           cache: 'maven'
           server-id: 'matsim-releases'

.github/workflows/deploy-on-release-created.yaml

@@ -16,7 +16,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'zulu'
           cache: 'maven'
           server-id: matsim-releases

.github/workflows/deploy-weekly.yaml

@@ -17,7 +17,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'zulu'
           cache: 'maven'
           server-id: 'matsim-releases'

.github/workflows/full-integration.yaml

@@ -27,7 +27,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'zulu'
           cache: 'maven'
 

.github/workflows/verify-push.yaml

@@ -87,7 +87,7 @@ jobs:
         if: ${{matrix.module != 'matsim' || steps.detect-changes.outputs.outside-contribs == 'true'}}
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'zulu'
           cache: 'maven'
 

contribs/ev/src/test/java/org/matsim/contrib/ev/example/RunEvExampleTest.java

@@ -9,6 +9,7 @@
 import org.matsim.core.config.ConfigUtils;
 import org.matsim.core.events.EventsUtils;
 import org.matsim.core.population.PopulationUtils;
+import org.matsim.core.population.routes.PopulationComparison;
 import org.matsim.testcases.MatsimTestUtils;
 import org.matsim.utils.eventsfilecomparison.ComparisonResult;
 
@@ -33,8 +34,8 @@ public class RunEvExampleTest{
 				Population actual = PopulationUtils.createPopulation( ConfigUtils.createConfig() ) ;
 				PopulationUtils.readPopulation( actual, utils.getOutputDirectory() + "/output_plans.xml.gz" );
 
-				boolean result = PopulationUtils.comparePopulations( expected, actual );
-				Assertions.assertTrue(result);
+				PopulationComparison.Result result = PopulationComparison.compare(expected, actual);
+				Assertions.assertEquals(PopulationComparison.Result.equal, result);
 			}
 			{
 				String expected = utils.getInputDirectory() + "/output_events.xml.gz" ;
@@ -66,8 +67,8 @@ public class RunEvExampleTest{
 				Population actual = PopulationUtils.createPopulation( ConfigUtils.createConfig() ) ;
 				PopulationUtils.readPopulation( actual, utils.getOutputDirectory() + "/output_plans.xml.gz" );
 
-				boolean result = PopulationUtils.comparePopulations( expected, actual );
-				Assertions.assertTrue(result);
+				PopulationComparison.Result result = PopulationComparison.compare(expected, actual);
+				Assertions.assertEquals(PopulationComparison.Result.equal, result);
 			}
 			{
 				String expected = utils.getInputDirectory() + "/output_events.xml.gz" ;

contribs/ev/src/test/java/org/matsim/contrib/ev/example/RunEvExampleWithLTHConsumptionModelTest.java

@@ -9,6 +9,7 @@
 import org.matsim.core.config.ConfigUtils;
 import org.matsim.core.events.EventsUtils;
 import org.matsim.core.population.PopulationUtils;
+import org.matsim.core.population.routes.PopulationComparison;
 import org.matsim.testcases.MatsimTestUtils;
 import org.matsim.utils.eventsfilecomparison.ComparisonResult;
 
@@ -33,8 +34,8 @@ void runTest(){
 				Population actual = PopulationUtils.createPopulation( ConfigUtils.createConfig() ) ;
 				PopulationUtils.readPopulation( actual, utils.getOutputDirectory() + "/output_plans.xml.gz" );
 
-				boolean result = PopulationUtils.comparePopulations( expected, actual );
-				Assertions.assertTrue( result );
+				PopulationComparison.Result result = PopulationComparison.compare(expected, actual);
+				Assertions.assertEquals(PopulationComparison.Result.equal, result);
 			}
 			{
 				String expected = utils.getInputDirectory() + "/output_events.xml.gz" ;

contribs/freight/src/test/java/org/matsim/freight/carriers/usecases/chessboard/RunChessboardIT.java

@@ -54,7 +54,7 @@ void runChessboard() {
 				Population actual = PopulationUtils.createPopulation( ConfigUtils.createConfig() ) ;
 				PopulationUtils.readPopulation( actual, utils.getOutputDirectory() + "/output_plans.xml.gz" );
 
-				PopulationComparison.Result result = new PopulationComparison().compare(expected, actual);
+				PopulationComparison.Result result = PopulationComparison.compare(expected, actual);
 				Assertions.assertSame(PopulationComparison.Result.equal, result);
 			}
 			{

contribs/parking/src/test/java/org/matsim/contrib/parking/parkingproxy/run/RunWithParkingProxyIT.java

@@ -20,13 +20,15 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.matsim.api.core.v01.population.Population;
 import org.matsim.core.config.ConfigUtils;
 import org.matsim.core.events.EventsUtils;
 import org.matsim.core.population.PopulationUtils;
+import org.matsim.core.population.routes.PopulationComparison;
 import org.matsim.core.utils.io.IOUtils;
 import org.matsim.examples.ExamplesUtils;
 import org.matsim.testcases.MatsimTestUtils;
@@ -60,9 +62,8 @@ void testMain(){
                         PopulationUtils.readPopulation( expected, utils.getInputDirectory() + "/output_experienced_plans.xml.gz" );
                         final Population actual = PopulationUtils.createPopulation( ConfigUtils.createConfig() );
                         PopulationUtils.readPopulation( actual, utils.getOutputDirectory() + "/output_experienced_plans.xml.gz" );
-                        if(!PopulationUtils.comparePopulations( expected, actual )) {
-                        	throw new RuntimeException("Plans file comparison ended with result false");
-                        }
+						PopulationComparison.Result result = PopulationComparison.compare(expected, actual);
+						Assertions.assertEquals(PopulationComparison.Result.equal, result);
                 }
         }
 }

contribs/pseudosimulation/src/test/java/org/matsim/contrib/pseudosimulation/RunPSimTest.java

@@ -102,7 +102,7 @@ public void install() {
 		PopulationUtils.readPopulation( popExpected, utils.getInputDirectory() + "/output_plans.xml.gz" );
 		Population popActual = PopulationUtils.createPopulation( config );
 		PopulationUtils.readPopulation( popActual, outDir + "/output_plans.xml.gz" );
-		new PopulationComparison().compare( popExpected, popActual ) ;
+		PopulationComparison.compare( popExpected, popActual ) ;
 		Assertions.assertEquals(138.86084460860525, psimScore, MatsimTestUtils.EPSILON, "RunPsim score changed.");
 
 	}

contribs/roadpricing/src/test/java/org/matsim/contrib/roadpricing/run/RoadPricingByConfigfileTest.java

@@ -29,6 +29,7 @@
 import org.matsim.core.config.ConfigUtils;
 import org.matsim.core.events.EventsUtils;
 import org.matsim.core.population.PopulationUtils;
+import org.matsim.core.population.routes.PopulationComparison;
 import org.matsim.core.utils.io.IOUtils;
 import org.matsim.examples.ExamplesUtils;
 import org.matsim.testcases.MatsimTestUtils;
@@ -62,7 +63,8 @@ final void testMain() {
 				PopulationUtils.readPopulation( expected, utils.getInputDirectory() + "/output_plans.xml.gz" );
 				final Population actual = PopulationUtils.createPopulation( ConfigUtils.createConfig() );
 				PopulationUtils.readPopulation( actual, utils.getOutputDirectory() + "/output_plans.xml.gz" );
-				Assertions.assertTrue(PopulationUtils.comparePopulations( expected, actual ), "Populations are different");
+				PopulationComparison.Result result = PopulationComparison.compare(expected, actual);
+				Assertions.assertEquals(PopulationComparison.Result.equal, result);
 			}
 
 

contribs/taxi/src/test/java/org/matsim/contrib/etaxi/run/RunETaxiScenarioIT.java

@@ -68,8 +68,7 @@ private void runScenario(String configPath) {
 			Population actual = PopulationUtils.createPopulation(ConfigUtils.createConfig());
 			PopulationUtils.readPopulation(actual, utils.getOutputDirectory() + "/output_plans.xml.gz");
 
-			PopulationComparison populationComparison = new PopulationComparison();
-			PopulationComparison.Result result = populationComparison.compare(expected, actual);
+			PopulationComparison.Result result = PopulationComparison.compare(expected, actual);
 			Assertions.assertEquals(PopulationComparison.Result.equal, result);
 		}
 		{

contribs/taxi/src/test/java/org/matsim/contrib/taxi/optimizer/TaxiOptimizerTests.java

@@ -73,8 +73,7 @@ public static void runBenchmark(boolean vehicleDiversion, AbstractTaxiOptimizerP
 			Population actual = PopulationUtils.createPopulation(ConfigUtils.createConfig());
 			PopulationUtils.readPopulation(actual, utils.getOutputDirectory() + "/output_plans.xml.gz");
 
-			PopulationComparison populationComparison = new PopulationComparison();
-			PopulationComparison.Result result = populationComparison.compare(expected, actual);
+			PopulationComparison.Result result = PopulationComparison.compare(expected, actual);
 			Assertions.assertEquals(PopulationComparison.Result.equal, result);
 		}
 		{

contribs/vsp/src/test/java/playground/vsp/ev/UrbanEVIT.java

@@ -8,6 +8,7 @@
 import org.matsim.core.config.ConfigUtils;
 import org.matsim.core.events.EventsUtils;
 import org.matsim.core.population.PopulationUtils;
+import org.matsim.core.population.routes.PopulationComparison;
 import org.matsim.testcases.MatsimTestUtils;
 import org.matsim.utils.eventsfilecomparison.ComparisonResult;
 
@@ -32,8 +33,8 @@ void run() {
 				Population actual = PopulationUtils.createPopulation( ConfigUtils.createConfig() ) ;
 				PopulationUtils.readPopulation( actual, utils.getOutputDirectory() + "/output_plans.xml.gz" );
 
-				boolean result = PopulationUtils.comparePopulations( expected, actual );
-				Assertions.assertTrue( result );
+				PopulationComparison.Result result = PopulationComparison.compare(expected, actual);
+				Assertions.assertEquals(PopulationComparison.Result.equal, result);
 			}
 			{
 				String expected = utils.getInputDirectory() + "/output_events.xml.gz" ;

matsim/src/main/java/org/matsim/core/population/PopulationUtils.java

@@ -665,7 +665,10 @@ public static double calculateSimilarity(List<Activity> activities1, List<Activi
 	 * this will go unnoticed (this method will just return true or false,
 	 * probably false, except if both Writers have written the exact same text
 	 * until the Exception happens).
+	 *
+	 * @deprecated -- please use {@link org.matsim.core.population.routes.PopulationComparison} instead.  nkuehnel, apr'24
 	 */
+	@Deprecated
 	public static boolean equalPopulation(final Population s1, final Population s2) {
 		try {
 			try( InputStream inputStream1 = openPopulationInputStream( s1 ) ; InputStream inputStream2 = openPopulationInputStream( s2 ) ){
@@ -1186,6 +1189,10 @@ public static Population readPopulation( String filename ) {
 		readPopulation( population, filename );
 		return population ;
 	}
+	/**
+	 * @deprecated -- please use {@link org.matsim.core.population.routes.PopulationComparison} instead.  nkuehnel, apr'24
+	 */
+	@Deprecated
 	public static boolean comparePopulations( Population population1, Population population2 ) {
 		return PopulationUtils.equalPopulation( population1, population2 );
 	}