diff --git a/contribs/freight/test/input/org/matsim/contrib/freight/usecases/chessboard/RunChessboardIT/runChessboard/output_events.xml.gz b/contribs/freight/test/input/org/matsim/contrib/freight/usecases/chessboard/RunChessboardIT/runChessboard/output_events.xml.gz index 0a2fb55c999..cd5ffc78e82 100644 Binary files a/contribs/freight/test/input/org/matsim/contrib/freight/usecases/chessboard/RunChessboardIT/runChessboard/output_events.xml.gz and b/contribs/freight/test/input/org/matsim/contrib/freight/usecases/chessboard/RunChessboardIT/runChessboard/output_events.xml.gz differ 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 02d4125191c..994a35e162e 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 @@ -53,7 +53,7 @@ public void testA() { PSimConfigGroup pSimConfigGroup = new PSimConfigGroup(); config.addModule(pSimConfigGroup); pSimConfigGroup.setIterationsPerCycle(20); - + config.plansCalcRoute().setRoutingRandomness(0.); //identify selector strategies @@ -95,12 +95,12 @@ public void testA() { ((Controler) runPSim.getMatsimControler()).addOverridingModule(new AbstractModule() { @Override - public void install() { + public void install() { this.bind(TransitEmulator.class).to(NoTransitEmulator.class); } }); - - + + runPSim.run(); double psimScore = execScoreTracker.executedScore; logger.info("RunPSim score was " + psimScore); @@ -109,7 +109,7 @@ public void install() { Population popActual = PopulationUtils.createPopulation( config ); PopulationUtils.readPopulation( popActual, outDir + "/output_plans.xml.gz" ); new PopulationComparison().compare( popExpected, popActual ) ; - Assert.assertEquals("RunPsim score changed.", 138.90472630897597d, psimScore, MatsimTestUtils.EPSILON); + Assert.assertEquals("RunPsim score changed.", 138.90474624352407, psimScore, MatsimTestUtils.EPSILON); // Assert.assertEquals("RunPsim score changed.", 134.54001491094124d, psimScore, MatsimTestUtils.EPSILON); // Assert.assertEquals("RunPsim score changed.", 134.52369453719413d, psimScore, MatsimTestUtils.EPSILON); // Assert.assertEquals("RunPsim score changed.", 132.73129073101293d, psimScore, MatsimTestUtils.EPSILON); @@ -117,7 +117,7 @@ public void install() { /** * For comparison run 2 normal qsim iterations. Psim score should be slightly higher than default Controler score. - * + * * Prior to implementing routing mode RunPSimTest tested only that psimScore outperformed default Controler on this * test for executed score by a margin > 1%. In the last commit in matsim master where the test ran, the psim score * in testA() was 134.52369453719413 and qsim score in testB was 131.84309487251033). @@ -134,7 +134,7 @@ public void testB() { ExecScoreTracker execScoreTracker = new ExecScoreTracker(controler); controler.addControlerListener(execScoreTracker); controler.run(); - + double qsimScore = execScoreTracker.executedScore; logger.info("Default controler score was " + qsimScore ); // Assert.assertEquals("Default controler score changed.", 131.84309487251033d, qsimScore, MatsimTestUtils.EPSILON); diff --git a/contribs/roadpricing/test/input/org/matsim/contrib/roadpricing/run/RoadPricingByConfigfileTest/testMain/output_events.xml.gz b/contribs/roadpricing/test/input/org/matsim/contrib/roadpricing/run/RoadPricingByConfigfileTest/testMain/output_events.xml.gz index 4be81d33278..cdef4d42023 100644 Binary files a/contribs/roadpricing/test/input/org/matsim/contrib/roadpricing/run/RoadPricingByConfigfileTest/testMain/output_events.xml.gz and b/contribs/roadpricing/test/input/org/matsim/contrib/roadpricing/run/RoadPricingByConfigfileTest/testMain/output_events.xml.gz differ diff --git a/contribs/roadpricing/test/input/org/matsim/contrib/roadpricing/run/RoadPricingByConfigfileTest/testMain/output_plans.xml.gz b/contribs/roadpricing/test/input/org/matsim/contrib/roadpricing/run/RoadPricingByConfigfileTest/testMain/output_plans.xml.gz index da6affd458d..65c83679568 100644 Binary files a/contribs/roadpricing/test/input/org/matsim/contrib/roadpricing/run/RoadPricingByConfigfileTest/testMain/output_plans.xml.gz and b/contribs/roadpricing/test/input/org/matsim/contrib/roadpricing/run/RoadPricingByConfigfileTest/testMain/output_plans.xml.gz differ diff --git a/contribs/vsp/test/input/playground/vsp/ev/UrbanEVIT/run/output_events.xml.gz b/contribs/vsp/test/input/playground/vsp/ev/UrbanEVIT/run/output_events.xml.gz index cde54cca414..e4bd42f3c0f 100644 Binary files a/contribs/vsp/test/input/playground/vsp/ev/UrbanEVIT/run/output_events.xml.gz and b/contribs/vsp/test/input/playground/vsp/ev/UrbanEVIT/run/output_events.xml.gz differ diff --git a/contribs/vsp/test/input/playground/vsp/ev/UrbanEVIT/run/output_plans.xml.gz b/contribs/vsp/test/input/playground/vsp/ev/UrbanEVIT/run/output_plans.xml.gz index 138f52486ac..2aee19d2e77 100644 Binary files a/contribs/vsp/test/input/playground/vsp/ev/UrbanEVIT/run/output_plans.xml.gz and b/contribs/vsp/test/input/playground/vsp/ev/UrbanEVIT/run/output_plans.xml.gz differ diff --git a/matsim/src/main/java/org/matsim/core/config/groups/ControlerConfigGroup.java b/matsim/src/main/java/org/matsim/core/config/groups/ControlerConfigGroup.java index ba4f3122c78..7496f79c6ab 100644 --- a/matsim/src/main/java/org/matsim/core/config/groups/ControlerConfigGroup.java +++ b/matsim/src/main/java/org/matsim/core/config/groups/ControlerConfigGroup.java @@ -87,7 +87,7 @@ public enum MobsimType {qsim, JDEQSim, hermes} private String outputDirectory = "./output"; private int firstIteration = 0; private int lastIteration = 1000; - private RoutingAlgorithmType routingAlgorithmType = RoutingAlgorithmType.AStarLandmarks; + private RoutingAlgorithmType routingAlgorithmType = RoutingAlgorithmType.SpeedyALT; private EventTypeToCreateScoringFunctions eventTypeToCreateScoringFunctions = EventTypeToCreateScoringFunctions.IterationStarts; private boolean linkToLinkRoutingEnabled = false;