fix test failures in contribs and add config parameter so relevant fu…

…nctions
matsim-org · Jul 4, 2024 · 506ed28 · 506ed28
1 parent d647a6b
commit 506ed28
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 4 deletions.
diff --git a/...ht/src/test/java/org/matsim/freight/carriers/controler/EquilWithCarrierWithPersonsIT.java b/...ht/src/test/java/org/matsim/freight/carriers/controler/EquilWithCarrierWithPersonsIT.java
@@ -30,6 +30,7 @@
 import org.matsim.core.config.Config;
 import org.matsim.core.config.ConfigUtils;
 import org.matsim.core.config.groups.ReplanningConfigGroup.StrategySettings;
+import org.matsim.core.config.groups.RoutingConfigGroup;
 import org.matsim.core.config.groups.ScoringConfigGroup.ActivityParams;
 import org.matsim.core.controler.AbstractModule;
 import org.matsim.core.controler.Controler;
@@ -57,6 +58,8 @@ static Config commonConfig( MatsimTestUtils testUtils ) {
 		config.controller().setOutputDirectory(testUtils.getOutputDirectory());
 		config.network().setInputFile( testUtils.getClassInputDirectory() + "network.xml" );
 
+		config.routing().setNetworkRouteConsistencyCheck(RoutingConfigGroup.NetworkRouteConsistencyCheck.disable);
+
 		return config;
 	}
 

diff --git a/...src/test/java/org/matsim/freight/carriers/controler/EquilWithCarrierWithoutPersonsIT.java b/...src/test/java/org/matsim/freight/carriers/controler/EquilWithCarrierWithoutPersonsIT.java
@@ -30,6 +30,7 @@
 import org.matsim.api.core.v01.Scenario;
 import org.matsim.core.config.Config;
 import org.matsim.core.config.ConfigUtils;
+import org.matsim.core.config.groups.RoutingConfigGroup;
 import org.matsim.core.controler.AbstractModule;
 import org.matsim.core.controler.Controler;
 import org.matsim.freight.carriers.FreightCarriersConfigGroup;
@@ -50,6 +51,7 @@ public class EquilWithCarrierWithoutPersonsIT {
 
 	public void setUp() {
 		Config config = EquilWithCarrierWithPersonsIT.commonConfig( testUtils );
+		config.routing().setNetworkRouteConsistencyCheck(RoutingConfigGroup.NetworkRouteConsistencyCheck.disable);
 		Scenario scenario = EquilWithCarrierWithPersonsIT.commonScenario( config, testUtils );
 		controler = new Controler(scenario);
 	}

diff --git a/...ribs/multimodal/src/test/java/org/matsim/contrib/multimodal/RunMultimodalExampleTest.java b/...ribs/multimodal/src/test/java/org/matsim/contrib/multimodal/RunMultimodalExampleTest.java
@@ -20,8 +20,9 @@ void main(){
 		URL url = IOUtils.extendUrl( ExamplesUtils.getTestScenarioURL( "berlin" ), "config_multimodal.xml" );;
 
 		String [] args = { url.toString(),
-				"--config:controler.outputDirectory" , utils.getOutputDirectory()
-		} ;
+				"--config:controler.outputDirectory" , utils.getOutputDirectory(),
+				"--config:routing.networkRouteConsistencyCheck", "disable"
+		} ;;
 
 		try{
 			RunMultimodalExample.main( args );

diff --git a/...pricing/src/test/java/org/matsim/contrib/roadpricing/PlansCalcRouteWithTollOrNotTest.java b/...pricing/src/test/java/org/matsim/contrib/roadpricing/PlansCalcRouteWithTollOrNotTest.java
@@ -75,6 +75,7 @@ public class PlansCalcRouteWithTollOrNotTest {
 	@Test
 	void testBestAlternatives() {
 		Config config = matsimTestUtils.createConfig();
+		config.routing().setNetworkRouteConsistencyCheck(RoutingConfigGroup.NetworkRouteConsistencyCheck.disable);
 		config.controller().setOverwriteFileSetting(OutputDirectoryHierarchy.OverwriteFileSetting.overwriteExistingFiles);
 		MutableScenario scenario = (MutableScenario) ScenarioUtils.createScenario(config);
 		RoadPricingTestUtils.createNetwork2(scenario);

diff --git a/...oadpricing/src/test/java/org/matsim/contrib/roadpricing/TollTravelCostCalculatorTest.java b/...oadpricing/src/test/java/org/matsim/contrib/roadpricing/TollTravelCostCalculatorTest.java
@@ -212,11 +212,11 @@ void testDistanceTollRouter() {
 	void testLinkTollRouter() {
 		Config config = utils.createConfig();
 		config.routing().setNetworkRouteConsistencyCheck(RoutingConfigGroup.NetworkRouteConsistencyCheck.disable);
-		MutableScenario scenario = (MutableScenario) ScenarioUtils.createScenario(ConfigUtils.createConfig());
+		MutableScenario scenario = (MutableScenario) ScenarioUtils.createScenario(config);
 		RoadPricingTestUtils.createNetwork2(scenario);
 		Network network = scenario.getNetwork();
 		// a basic toll where only the morning hours are tolled
-		RoadPricingSchemeImpl toll = RoadPricingUtils.addOrGetMutableRoadPricingScheme(ScenarioUtils.createScenario( ConfigUtils.createConfig() ) );
+		RoadPricingSchemeImpl toll = RoadPricingUtils.addOrGetMutableRoadPricingScheme(ScenarioUtils.createScenario( config ) );
 		toll.setType(RoadPricingScheme.TOLL_TYPE_LINK);
 		toll.addLink(Id.create("5", Link.class));
 		toll.addLink(Id.create("11", Link.class));

diff --git a/matsim/src/main/java/org/matsim/core/config/groups/RoutingConfigGroup.java b/matsim/src/main/java/org/matsim/core/config/groups/RoutingConfigGroup.java
@@ -526,6 +526,8 @@ public void addParam(final String key, final String value) {
 		}
 		else if (ACCESSEGRESSTYPE.equals( key ) ) {
 			this.setAccessEgressType(AccessEgressType.valueOf(value));
+		} else if (NETWORK_ROUTE_CONSISTENCY_CHECK.equals(key)){
+			this.setNetworkRouteConsistencyCheck(NetworkRouteConsistencyCheck.valueOf(value));
 		}
 		else {
 			throw new IllegalArgumentException(key);
@@ -539,6 +541,7 @@ public final Map<String, String> getParams() {
 		map.put(  CLEAR_MODE_ROUTING_PARAMS, Boolean.toString( this.clearingDefaultModeRoutingParams ) ) ;
 		map.put(  RANDOMNESS, Double.toString( this.routingRandomness ) ) ;
 		map.put(  ACCESSEGRESSTYPE, getAccessEgressType().toString()) ;
+		map.put(NETWORK_ROUTE_CONSISTENCY_CHECK, NetworkRouteConsistencyCheck.abortOnInconsistency.toString());
 		return map;
 	}