use timedependetNetwork if it is set in the config (#4895)

Author: rewertvsp

contribs/freight/src/main/java/org/matsim/freight/carriers/CarriersUtils.java

@@ -55,6 +55,7 @@
 import org.matsim.api.core.v01.population.Plan;
 import org.matsim.contrib.roadpricing.*;
 import org.matsim.core.config.ConfigUtils;
+import org.matsim.core.network.TimeDependentNetwork;
 import org.matsim.core.utils.io.IOUtils;
 import org.matsim.core.utils.misc.Time;
 import org.matsim.freight.carriers.analysis.CarriersAnalysis;
@@ -276,7 +277,7 @@ public static void runJsprit(Scenario scenario, CarrierSelectionForSolution carr
 		else
 			log.warn("Jsprit analysis per carrier CSV file already exists at {}. Will append results to this file. If you want to start with a new file, please delete or move the existing file.", jspritAnalysisPerCarrierCSVPath);
 		// necessary to create FreightCarriersConfigGroup before submitting to ThreadPoolExecutor
-		ConfigUtils.addOrGetModule(scenario.getConfig(), FreightCarriersConfigGroup.class);
+		FreightCarriersConfigGroup freightConfigGroup = ConfigUtils.addOrGetModule(scenario.getConfig(), FreightCarriersConfigGroup.class);
 
 		// Create the NetBasedCosts based on the network and the vehicle types
 		//Consider tolls if a RoadPricingScheme is available in the scenario.
@@ -287,9 +288,14 @@ public static void runJsprit(Scenario scenario, CarrierSelectionForSolution carr
 			log.debug("Was not able to get a RoadPricingScheme from scenario. Tolls cannot be considered.", e);
 		}
 
-		final NetworkBasedTransportCosts netBasedCosts = NetworkBasedTransportCosts.Builder.newInstance(scenario.getNetwork(), getOrAddCarrierVehicleTypes(scenario).getVehicleTypes().values())
-			.setRoadPricingScheme(roadPricingScheme)
-			.build();
+		NetworkBasedTransportCosts.Builder netBasedCostsBuilder = NetworkBasedTransportCosts.Builder.newInstance(scenario.getNetwork(), getOrAddCarrierVehicleTypes(scenario).getVehicleTypes().values())
+			.setRoadPricingScheme(roadPricingScheme);
+
+		if (scenario.getNetwork() instanceof TimeDependentNetwork timeDependentNetwork && !timeDependentNetwork.getNetworkChangeEvents().isEmpty()) {
+			netBasedCostsBuilder.setTimeSliceWidth(freightConfigGroup.getTravelTimeSliceWidth());
+		}
+
+		final NetworkBasedTransportCosts netBasedCosts = netBasedCostsBuilder.build();
 
 		//Check if the inputs of the carrier(s) are consistent before starting the planning
 		CarrierConsistencyCheckers.checkBeforePlanning(carriers, Level.ERROR);

contribs/freight/src/test/java/org/matsim/freight/carriers/jsprit/NetworkBasedTransportCostsTest.java

@@ -34,10 +34,13 @@
 import org.matsim.api.core.v01.Coord;
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.Scenario;
+import org.matsim.api.core.v01.network.Link;
 import org.matsim.api.core.v01.network.Network;
 import org.matsim.contrib.roadpricing.*;
 import org.matsim.core.config.Config;
 import org.matsim.core.config.ConfigUtils;
+import org.matsim.core.network.NetworkChangeEvent;
+import org.matsim.core.network.TimeDependentNetwork;
 import org.matsim.core.network.io.MatsimNetworkReader;
 import org.matsim.core.scenario.ScenarioUtils;
 import org.matsim.core.utils.misc.Time;
@@ -162,6 +165,45 @@ void test_whenAddingTwoVehicleTypesViaConstructor_itMustAccountForThat(){
 		Assertions.assertEquals(20000.0, networkBasedTransportCosts.getDistance(Location.newInstance("6"), Location.newInstance("21"), 0.0, vehicle2), 0.01);
 	}
 
+	@Test
+	void test_whenNetworkChangeEventsArePresent_itUsesTimeDependentFreespeed() {
+		Config config = ConfigUtils.createConfig();
+		config.network().setTimeVariantNetwork(true);
+		Scenario scenario = ScenarioUtils.createScenario(config);
+		String NETWORK_FILENAME = utils.getClassInputDirectory() + "network.xml";
+		new MatsimNetworkReader(scenario.getNetwork()).readFile(NETWORK_FILENAME);
+		Network network = scenario.getNetwork();
+
+		Id<Link> fromLinkId = Id.createLinkId("20");
+		Id<Link> toLinkId = Id.createLinkId("21");
+		Link toLink = network.getLinks().get(toLinkId);
+		double originalFreespeed = toLink.getFreespeed();
+
+		NetworkChangeEvent changeEvent = new NetworkChangeEvent(3600.0);
+		changeEvent.addLink(toLink);
+		changeEvent.setFreespeedChange(new NetworkChangeEvent.ChangeValue(NetworkChangeEvent.ChangeType.ABSOLUTE_IN_SI_UNITS, 1.0));
+		((TimeDependentNetwork) network).addNetworkChangeEvent(changeEvent);
+
+		NetworkBasedTransportCosts.Builder builder = NetworkBasedTransportCosts.Builder.newInstance(network);
+		builder.addVehicleTypeSpecificCosts(TYPE_1, 0.0, 1.0, 0.0);
+		NetworkBasedTransportCosts c = builder
+			.setTimeSliceWidth(900)
+			.build();
+
+		Vehicle vehicle = mock(Vehicle.class);
+		com.graphhopper.jsprit.core.problem.vehicle.VehicleType type = mock(com.graphhopper.jsprit.core.problem.vehicle.VehicleType.class);
+		when(type.getMaxVelocity()).thenReturn(100.0);
+		when(type.getTypeId()).thenReturn(TYPE_1);
+		when(vehicle.getType()).thenReturn(type);
+		when(vehicle.getId()).thenReturn("vehicle1");
+
+		double beforeChange = c.getTransportTime(Location.newInstance(fromLinkId.toString()), Location.newInstance(toLinkId.toString()), 0.0, mock(Driver.class), vehicle);
+		double afterChange = c.getTransportTime(Location.newInstance(fromLinkId.toString()), Location.newInstance(toLinkId.toString()), 3600.0, mock(Driver.class), vehicle);
+
+		Assertions.assertEquals(toLink.getLength() / originalFreespeed, beforeChange, 0.01);
+		Assertions.assertEquals(toLink.getLength(), afterChange, 0.01);
+	}
+
 
 	/**
 	 *  This test is a modified version of {@link #test_whenAddingTwoDifferentVehicleTypes_itMustAccountForThem}