From 2bd106f80bbf387ff9afdf54e4ddf9802ac7f1c6 Mon Sep 17 00:00:00 2001 From: nkuehnel Date: Tue, 30 Apr 2024 14:22:10 +0200 Subject: [PATCH] fix compilation issue --- .../freight/carriers/usecases/chessboard/RunChessboardIT.java | 2 +- .../java/org/matsim/contrib/pseudosimulation/RunPSimTest.java | 2 +- .../java/org/matsim/contrib/etaxi/run/RunETaxiScenarioIT.java | 3 +-- .../org/matsim/contrib/taxi/optimizer/TaxiOptimizerTests.java | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/contribs/freight/src/test/java/org/matsim/freight/carriers/usecases/chessboard/RunChessboardIT.java b/contribs/freight/src/test/java/org/matsim/freight/carriers/usecases/chessboard/RunChessboardIT.java index b195b3b89d7..37f4b4ca96c 100644 --- a/contribs/freight/src/test/java/org/matsim/freight/carriers/usecases/chessboard/RunChessboardIT.java +++ b/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); } { diff --git a/contribs/pseudosimulation/src/test/java/org/matsim/contrib/pseudosimulation/RunPSimTest.java b/contribs/pseudosimulation/src/test/java/org/matsim/contrib/pseudosimulation/RunPSimTest.java index bd9e68ada04..40545474438 100644 --- a/contribs/pseudosimulation/src/test/java/org/matsim/contrib/pseudosimulation/RunPSimTest.java +++ b/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."); } diff --git a/contribs/taxi/src/test/java/org/matsim/contrib/etaxi/run/RunETaxiScenarioIT.java b/contribs/taxi/src/test/java/org/matsim/contrib/etaxi/run/RunETaxiScenarioIT.java index 7138bf21c82..ed4f6a55e6f 100644 --- a/contribs/taxi/src/test/java/org/matsim/contrib/etaxi/run/RunETaxiScenarioIT.java +++ b/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); } { diff --git a/contribs/taxi/src/test/java/org/matsim/contrib/taxi/optimizer/TaxiOptimizerTests.java b/contribs/taxi/src/test/java/org/matsim/contrib/taxi/optimizer/TaxiOptimizerTests.java index 28dd7087e40..be3f77e3bd9 100644 --- a/contribs/taxi/src/test/java/org/matsim/contrib/taxi/optimizer/TaxiOptimizerTests.java +++ b/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); } {