From d9be1204d64ddd6e0fb77bf7308f5316fe6fe7e3 Mon Sep 17 00:00:00 2001 From: Kai Martins-Turner Date: Wed, 11 Oct 2023 14:03:43 +0200 Subject: [PATCH] move carrier analysis in vsp contrib accordingly --- .../{ => carriers}/analysis/CarrierLoadAnalysis.java | 9 ++++++--- .../{ => carriers}/analysis/CarrierPlanAnalysis.java | 2 +- .../analysis/FreightAnalysisEventHandler.java | 2 +- .../analysis/FreightAnalysisServiceTracking.java | 5 ++++- .../analysis/FreightAnalysisShipmentTracking.java | 2 +- .../analysis/FreightAnalysisVehicleTracking.java | 2 +- .../FreightTimeAndDistanceAnalysisEventsHandler.java | 5 ++++- .../contrib/freight/{ => carriers}/analysis/Readme.md | 0 .../{ => carriers}/analysis/RunFreightAnalysis.java | 2 +- .../analysis/RunFreightAnalysisEventBased.java | 4 +++- .../analysis/FreightAnalysisEventBasedTest.java | 2 +- .../analysis/MyFreightVehicleTrackerEventHandler.java | 3 ++- .../analysis/MyServiceTrackerEventHandler.java | 7 ++++++- .../analysis/MyShipmentTrackerEventHandler.java | 7 ++++++- .../{ => carriers}/analysis/RunFreightAnalysisIT.java | 9 ++++++--- .../analysis/RunFreightAnalysisWithShipmentTest.java | 7 +++++-- 16 files changed, 48 insertions(+), 20 deletions(-) rename contribs/vsp/src/main/java/org/matsim/contrib/freight/{ => carriers}/analysis/CarrierLoadAnalysis.java (84%) rename contribs/vsp/src/main/java/org/matsim/contrib/freight/{ => carriers}/analysis/CarrierPlanAnalysis.java (97%) rename contribs/vsp/src/main/java/org/matsim/contrib/freight/{ => carriers}/analysis/FreightAnalysisEventHandler.java (99%) rename contribs/vsp/src/main/java/org/matsim/contrib/freight/{ => carriers}/analysis/FreightAnalysisServiceTracking.java (97%) rename contribs/vsp/src/main/java/org/matsim/contrib/freight/{ => carriers}/analysis/FreightAnalysisShipmentTracking.java (99%) rename contribs/vsp/src/main/java/org/matsim/contrib/freight/{ => carriers}/analysis/FreightAnalysisVehicleTracking.java (99%) rename contribs/vsp/src/main/java/org/matsim/contrib/freight/{ => carriers}/analysis/FreightTimeAndDistanceAnalysisEventsHandler.java (96%) rename contribs/vsp/src/main/java/org/matsim/contrib/freight/{ => carriers}/analysis/Readme.md (100%) rename contribs/vsp/src/main/java/org/matsim/contrib/freight/{ => carriers}/analysis/RunFreightAnalysis.java (98%) rename contribs/vsp/src/main/java/org/matsim/contrib/freight/{ => carriers}/analysis/RunFreightAnalysisEventBased.java (96%) rename contribs/vsp/src/test/java/org/matsim/contrib/freight/{ => carriers}/analysis/FreightAnalysisEventBasedTest.java (95%) rename contribs/vsp/src/test/java/org/matsim/contrib/freight/{ => carriers}/analysis/MyFreightVehicleTrackerEventHandler.java (96%) rename contribs/vsp/src/test/java/org/matsim/contrib/freight/{ => carriers}/analysis/MyServiceTrackerEventHandler.java (79%) rename contribs/vsp/src/test/java/org/matsim/contrib/freight/{ => carriers}/analysis/MyShipmentTrackerEventHandler.java (81%) rename contribs/vsp/src/test/java/org/matsim/contrib/freight/{ => carriers}/analysis/RunFreightAnalysisIT.java (99%) rename contribs/vsp/src/test/java/org/matsim/contrib/freight/{ => carriers}/analysis/RunFreightAnalysisWithShipmentTest.java (95%) diff --git a/contribs/vsp/src/main/java/org/matsim/contrib/freight/analysis/CarrierLoadAnalysis.java b/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/CarrierLoadAnalysis.java similarity index 84% rename from contribs/vsp/src/main/java/org/matsim/contrib/freight/analysis/CarrierLoadAnalysis.java rename to contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/CarrierLoadAnalysis.java index b7ac7d2906c..2c9299c8034 100644 --- a/contribs/vsp/src/main/java/org/matsim/contrib/freight/analysis/CarrierLoadAnalysis.java +++ b/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/CarrierLoadAnalysis.java @@ -1,4 +1,4 @@ -package org.matsim.contrib.freight.analysis; +package org.matsim.contrib.freight.carriers.analysis; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -6,6 +6,9 @@ import org.matsim.api.core.v01.Scenario; import org.matsim.api.core.v01.events.Event; import org.matsim.contrib.freight.carriers.carrier.Carriers; +import org.matsim.contrib.freight.carriers.events.CarrierEventAttributes; +import org.matsim.contrib.freight.carriers.events.CarrierShipmentDeliveryStartEvent; +import org.matsim.contrib.freight.carriers.events.CarrierShipmentPickupStartEvent; import org.matsim.core.events.handler.BasicEventHandler; import org.matsim.vehicles.Vehicle; import org.matsim.vehicles.VehicleType; @@ -44,7 +47,7 @@ public CarrierLoadAnalysis(Carriers carriers) { private void handlePickup(Event event) { Id vehicleId = Id.createVehicleId(event.getAttributes().get("vehicle")); - Integer demand = Integer.valueOf(event.getAttributes().get(ATTRIBUTE_CAPACITYDEMAND)); + Integer demand = Integer.valueOf(event.getAttributes().get(CarrierEventAttributes.ATTRIBUTE_CAPACITYDEMAND)); LinkedList list; if (! vehicle2Load.containsKey(vehicleId)){ @@ -60,7 +63,7 @@ private void handlePickup(Event event) { private void handleDelivery(Event event) { Id vehicleId = Id.createVehicleId(event.getAttributes().get("vehicle")); - Integer demand = Integer.valueOf(event.getAttributes().get(ATTRIBUTE_CAPACITYDEMAND)); + Integer demand = Integer.valueOf(event.getAttributes().get(CarrierEventAttributes.ATTRIBUTE_CAPACITYDEMAND)); var list = vehicle2Load.get(vehicleId); list.add(list.getLast() - demand); diff --git a/contribs/vsp/src/main/java/org/matsim/contrib/freight/analysis/CarrierPlanAnalysis.java b/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/CarrierPlanAnalysis.java similarity index 97% rename from contribs/vsp/src/main/java/org/matsim/contrib/freight/analysis/CarrierPlanAnalysis.java rename to contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/CarrierPlanAnalysis.java index 20505f626d4..f6e026b83b7 100644 --- a/contribs/vsp/src/main/java/org/matsim/contrib/freight/analysis/CarrierPlanAnalysis.java +++ b/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/CarrierPlanAnalysis.java @@ -1,4 +1,4 @@ -package org.matsim.contrib.freight.analysis; +package org.matsim.contrib.freight.carriers.analysis; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/contribs/vsp/src/main/java/org/matsim/contrib/freight/analysis/FreightAnalysisEventHandler.java b/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/FreightAnalysisEventHandler.java similarity index 99% rename from contribs/vsp/src/main/java/org/matsim/contrib/freight/analysis/FreightAnalysisEventHandler.java rename to contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/FreightAnalysisEventHandler.java index 956a9fecbe4..e083c827beb 100644 --- a/contribs/vsp/src/main/java/org/matsim/contrib/freight/analysis/FreightAnalysisEventHandler.java +++ b/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/FreightAnalysisEventHandler.java @@ -19,7 +19,7 @@ * */ -package org.matsim.contrib.freight.analysis; +package org.matsim.contrib.freight.carriers.analysis; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/contribs/vsp/src/main/java/org/matsim/contrib/freight/analysis/FreightAnalysisServiceTracking.java b/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/FreightAnalysisServiceTracking.java similarity index 97% rename from contribs/vsp/src/main/java/org/matsim/contrib/freight/analysis/FreightAnalysisServiceTracking.java rename to contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/FreightAnalysisServiceTracking.java index 1249b59a0e3..032a30cb546 100644 --- a/contribs/vsp/src/main/java/org/matsim/contrib/freight/analysis/FreightAnalysisServiceTracking.java +++ b/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/FreightAnalysisServiceTracking.java @@ -19,11 +19,14 @@ * */ -package org.matsim.contrib.freight.analysis; +package org.matsim.contrib.freight.carriers.analysis; + import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.events.ActivityStartEvent; import org.matsim.api.core.v01.population.Person; import org.matsim.contrib.freight.carriers.carrier.*; +import org.matsim.contrib.freight.carriers.events.CarrierServiceEndEvent; +import org.matsim.contrib.freight.carriers.events.CarrierServiceStartEvent; import java.util.LinkedHashMap; diff --git a/contribs/vsp/src/main/java/org/matsim/contrib/freight/analysis/FreightAnalysisShipmentTracking.java b/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/FreightAnalysisShipmentTracking.java similarity index 99% rename from contribs/vsp/src/main/java/org/matsim/contrib/freight/analysis/FreightAnalysisShipmentTracking.java rename to contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/FreightAnalysisShipmentTracking.java index b1a1c1fd454..827f6d1cf10 100644 --- a/contribs/vsp/src/main/java/org/matsim/contrib/freight/analysis/FreightAnalysisShipmentTracking.java +++ b/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/FreightAnalysisShipmentTracking.java @@ -19,7 +19,7 @@ * */ -package org.matsim.contrib.freight.analysis; +package org.matsim.contrib.freight.carriers.analysis; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.events.ActivityStartEvent; import org.matsim.api.core.v01.network.Link; diff --git a/contribs/vsp/src/main/java/org/matsim/contrib/freight/analysis/FreightAnalysisVehicleTracking.java b/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/FreightAnalysisVehicleTracking.java similarity index 99% rename from contribs/vsp/src/main/java/org/matsim/contrib/freight/analysis/FreightAnalysisVehicleTracking.java rename to contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/FreightAnalysisVehicleTracking.java index 104c55ae6a8..b38dd8cdcf2 100644 --- a/contribs/vsp/src/main/java/org/matsim/contrib/freight/analysis/FreightAnalysisVehicleTracking.java +++ b/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/FreightAnalysisVehicleTracking.java @@ -19,7 +19,7 @@ * */ -package org.matsim.contrib.freight.analysis; +package org.matsim.contrib.freight.carriers.analysis; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/contribs/vsp/src/main/java/org/matsim/contrib/freight/analysis/FreightTimeAndDistanceAnalysisEventsHandler.java b/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/FreightTimeAndDistanceAnalysisEventsHandler.java similarity index 96% rename from contribs/vsp/src/main/java/org/matsim/contrib/freight/analysis/FreightTimeAndDistanceAnalysisEventsHandler.java rename to contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/FreightTimeAndDistanceAnalysisEventsHandler.java index 0a7e47b82a8..d75f0866a33 100644 --- a/contribs/vsp/src/main/java/org/matsim/contrib/freight/analysis/FreightTimeAndDistanceAnalysisEventsHandler.java +++ b/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/FreightTimeAndDistanceAnalysisEventsHandler.java @@ -1,4 +1,4 @@ -package org.matsim.contrib.freight.analysis; +package org.matsim.contrib.freight.carriers.analysis; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -8,6 +8,9 @@ import org.matsim.api.core.v01.events.LinkEnterEvent; import org.matsim.contrib.freight.carriers.carrier.Carrier; import org.matsim.contrib.freight.carriers.carrier.Tour; +import org.matsim.contrib.freight.carriers.controler.FreightUtils; +import org.matsim.contrib.freight.carriers.events.CarrierTourEndEvent; +import org.matsim.contrib.freight.carriers.events.CarrierTourStartEvent; import org.matsim.core.events.handler.BasicEventHandler; import org.matsim.vehicles.Vehicle; import org.matsim.vehicles.VehicleType; diff --git a/contribs/vsp/src/main/java/org/matsim/contrib/freight/analysis/Readme.md b/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/Readme.md similarity index 100% rename from contribs/vsp/src/main/java/org/matsim/contrib/freight/analysis/Readme.md rename to contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/Readme.md diff --git a/contribs/vsp/src/main/java/org/matsim/contrib/freight/analysis/RunFreightAnalysis.java b/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/RunFreightAnalysis.java similarity index 98% rename from contribs/vsp/src/main/java/org/matsim/contrib/freight/analysis/RunFreightAnalysis.java rename to contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/RunFreightAnalysis.java index c77a45f8f60..680c02a7c4f 100644 --- a/contribs/vsp/src/main/java/org/matsim/contrib/freight/analysis/RunFreightAnalysis.java +++ b/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/RunFreightAnalysis.java @@ -19,7 +19,7 @@ * */ -package org.matsim.contrib.freight.analysis; +package org.matsim.contrib.freight.carriers.analysis; import org.matsim.api.core.v01.network.Network; import org.matsim.contrib.freight.carriers.carrier.CarrierPlanXmlReader; diff --git a/contribs/vsp/src/main/java/org/matsim/contrib/freight/analysis/RunFreightAnalysisEventBased.java b/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/RunFreightAnalysisEventBased.java similarity index 96% rename from contribs/vsp/src/main/java/org/matsim/contrib/freight/analysis/RunFreightAnalysisEventBased.java rename to contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/RunFreightAnalysisEventBased.java index 6ccc2d7ddfb..12d1fa6a47c 100644 --- a/contribs/vsp/src/main/java/org/matsim/contrib/freight/analysis/RunFreightAnalysisEventBased.java +++ b/contribs/vsp/src/main/java/org/matsim/contrib/freight/carriers/analysis/RunFreightAnalysisEventBased.java @@ -19,18 +19,20 @@ * */ -package org.matsim.contrib.freight.analysis; +package org.matsim.contrib.freight.carriers.analysis; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.matsim.api.core.v01.Scenario; import org.matsim.contrib.freight.carriers.FreightConfigGroup; +import org.matsim.contrib.freight.carriers.controler.FreightUtils; import org.matsim.core.api.experimental.events.EventsManager; import org.matsim.core.config.Config; import org.matsim.core.config.ConfigUtils; import org.matsim.core.events.EventsUtils; import org.matsim.core.events.MatsimEventsReader; import org.matsim.core.scenario.ScenarioUtils; +import org.matsim.contrib.freight.carriers.events.CarrierEventsReaders; import java.io.File; import java.io.IOException; diff --git a/contribs/vsp/src/test/java/org/matsim/contrib/freight/analysis/FreightAnalysisEventBasedTest.java b/contribs/vsp/src/test/java/org/matsim/contrib/freight/carriers/analysis/FreightAnalysisEventBasedTest.java similarity index 95% rename from contribs/vsp/src/test/java/org/matsim/contrib/freight/analysis/FreightAnalysisEventBasedTest.java rename to contribs/vsp/src/test/java/org/matsim/contrib/freight/carriers/analysis/FreightAnalysisEventBasedTest.java index 4974a90d130..1e6856dfaa5 100644 --- a/contribs/vsp/src/test/java/org/matsim/contrib/freight/analysis/FreightAnalysisEventBasedTest.java +++ b/contribs/vsp/src/test/java/org/matsim/contrib/freight/carriers/analysis/FreightAnalysisEventBasedTest.java @@ -1,4 +1,4 @@ -package org.matsim.contrib.freight.analysis; +package org.matsim.contrib.freight.carriers.analysis; import org.junit.Rule; import org.junit.Test; diff --git a/contribs/vsp/src/test/java/org/matsim/contrib/freight/analysis/MyFreightVehicleTrackerEventHandler.java b/contribs/vsp/src/test/java/org/matsim/contrib/freight/carriers/analysis/MyFreightVehicleTrackerEventHandler.java similarity index 96% rename from contribs/vsp/src/test/java/org/matsim/contrib/freight/analysis/MyFreightVehicleTrackerEventHandler.java rename to contribs/vsp/src/test/java/org/matsim/contrib/freight/carriers/analysis/MyFreightVehicleTrackerEventHandler.java index fe1e29df91d..016794b1d67 100644 --- a/contribs/vsp/src/test/java/org/matsim/contrib/freight/analysis/MyFreightVehicleTrackerEventHandler.java +++ b/contribs/vsp/src/test/java/org/matsim/contrib/freight/carriers/analysis/MyFreightVehicleTrackerEventHandler.java @@ -19,11 +19,12 @@ * */ -package org.matsim.contrib.freight.analysis; +package org.matsim.contrib.freight.carriers.analysis; import org.matsim.api.core.v01.events.*; import org.matsim.api.core.v01.events.handler.*; import org.matsim.api.core.v01.network.Network; +import org.matsim.contrib.freight.carriers.analysis.FreightAnalysisVehicleTracking; import org.matsim.contrib.freight.carriers.carrier.Carriers; import org.matsim.vehicles.Vehicle; import org.matsim.vehicles.Vehicles; diff --git a/contribs/vsp/src/test/java/org/matsim/contrib/freight/analysis/MyServiceTrackerEventHandler.java b/contribs/vsp/src/test/java/org/matsim/contrib/freight/carriers/analysis/MyServiceTrackerEventHandler.java similarity index 79% rename from contribs/vsp/src/test/java/org/matsim/contrib/freight/analysis/MyServiceTrackerEventHandler.java rename to contribs/vsp/src/test/java/org/matsim/contrib/freight/carriers/analysis/MyServiceTrackerEventHandler.java index e401d463a07..56eddcb1c28 100644 --- a/contribs/vsp/src/test/java/org/matsim/contrib/freight/analysis/MyServiceTrackerEventHandler.java +++ b/contribs/vsp/src/test/java/org/matsim/contrib/freight/carriers/analysis/MyServiceTrackerEventHandler.java @@ -1,11 +1,16 @@ -package org.matsim.contrib.freight.analysis; +package org.matsim.contrib.freight.carriers.analysis; import org.matsim.api.core.v01.events.ActivityStartEvent; import org.matsim.api.core.v01.events.handler.ActivityStartEventHandler; import org.matsim.api.core.v01.network.Network; +import org.matsim.contrib.freight.carriers.analysis.FreightAnalysisServiceTracking; import org.matsim.contrib.freight.carriers.carrier.Carrier; import org.matsim.contrib.freight.carriers.carrier.CarrierService; import org.matsim.contrib.freight.carriers.carrier.Carriers; +import org.matsim.contrib.freight.carriers.events.CarrierServiceEndEvent; +import org.matsim.contrib.freight.carriers.events.CarrierServiceStartEvent; +import org.matsim.contrib.freight.carriers.events.eventhandler.FreightServiceEndEventHandler; +import org.matsim.contrib.freight.carriers.events.eventhandler.FreightServiceStartEventHandler; import org.matsim.vehicles.Vehicles; class MyServiceTrackerEventHandler implements ActivityStartEventHandler, FreightServiceStartEventHandler, FreightServiceEndEventHandler { diff --git a/contribs/vsp/src/test/java/org/matsim/contrib/freight/analysis/MyShipmentTrackerEventHandler.java b/contribs/vsp/src/test/java/org/matsim/contrib/freight/carriers/analysis/MyShipmentTrackerEventHandler.java similarity index 81% rename from contribs/vsp/src/test/java/org/matsim/contrib/freight/analysis/MyShipmentTrackerEventHandler.java rename to contribs/vsp/src/test/java/org/matsim/contrib/freight/carriers/analysis/MyShipmentTrackerEventHandler.java index 155239c15e6..06156b10c8a 100644 --- a/contribs/vsp/src/test/java/org/matsim/contrib/freight/analysis/MyShipmentTrackerEventHandler.java +++ b/contribs/vsp/src/test/java/org/matsim/contrib/freight/carriers/analysis/MyShipmentTrackerEventHandler.java @@ -1,11 +1,16 @@ -package org.matsim.contrib.freight.analysis; +package org.matsim.contrib.freight.carriers.analysis; import org.matsim.api.core.v01.events.ActivityStartEvent; import org.matsim.api.core.v01.events.handler.ActivityStartEventHandler; import org.matsim.api.core.v01.network.Network; +import org.matsim.contrib.freight.carriers.analysis.FreightAnalysisShipmentTracking; import org.matsim.contrib.freight.carriers.carrier.Carrier; import org.matsim.contrib.freight.carriers.carrier.CarrierShipment; import org.matsim.contrib.freight.carriers.carrier.Carriers; +import org.matsim.contrib.freight.carriers.events.CarrierShipmentDeliveryEndEvent; +import org.matsim.contrib.freight.carriers.events.CarrierShipmentPickupEndEvent; +import org.matsim.contrib.freight.carriers.events.eventhandler.FreightShipmentDeliveryEventHandler; +import org.matsim.contrib.freight.carriers.events.eventhandler.FreightShipmentPickupEventHandler; import org.matsim.vehicles.Vehicles; public class MyShipmentTrackerEventHandler implements ActivityStartEventHandler, FreightShipmentPickupEventHandler, FreightShipmentDeliveryEventHandler { diff --git a/contribs/vsp/src/test/java/org/matsim/contrib/freight/analysis/RunFreightAnalysisIT.java b/contribs/vsp/src/test/java/org/matsim/contrib/freight/carriers/analysis/RunFreightAnalysisIT.java similarity index 99% rename from contribs/vsp/src/test/java/org/matsim/contrib/freight/analysis/RunFreightAnalysisIT.java rename to contribs/vsp/src/test/java/org/matsim/contrib/freight/carriers/analysis/RunFreightAnalysisIT.java index 08f88989c7a..597cd778391 100644 --- a/contribs/vsp/src/test/java/org/matsim/contrib/freight/analysis/RunFreightAnalysisIT.java +++ b/contribs/vsp/src/test/java/org/matsim/contrib/freight/carriers/analysis/RunFreightAnalysisIT.java @@ -19,9 +19,12 @@ * */ -package org.matsim.contrib.freight.analysis; +package org.matsim.contrib.freight.carriers.analysis; -import org.junit.*; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.network.Network; import org.matsim.api.core.v01.population.Person; @@ -33,7 +36,7 @@ import org.matsim.testcases.MatsimTestUtils; import org.matsim.vehicles.*; -import java.io.*; +import java.io.File; import java.util.*; public class RunFreightAnalysisIT { diff --git a/contribs/vsp/src/test/java/org/matsim/contrib/freight/analysis/RunFreightAnalysisWithShipmentTest.java b/contribs/vsp/src/test/java/org/matsim/contrib/freight/carriers/analysis/RunFreightAnalysisWithShipmentTest.java similarity index 95% rename from contribs/vsp/src/test/java/org/matsim/contrib/freight/analysis/RunFreightAnalysisWithShipmentTest.java rename to contribs/vsp/src/test/java/org/matsim/contrib/freight/carriers/analysis/RunFreightAnalysisWithShipmentTest.java index 9e699c27368..f69b55e8fce 100644 --- a/contribs/vsp/src/test/java/org/matsim/contrib/freight/analysis/RunFreightAnalysisWithShipmentTest.java +++ b/contribs/vsp/src/test/java/org/matsim/contrib/freight/carriers/analysis/RunFreightAnalysisWithShipmentTest.java @@ -1,4 +1,4 @@ -package org.matsim.contrib.freight.analysis; +package org.matsim.contrib.freight.carriers.analysis; import org.junit.Assert; import org.junit.Rule; @@ -15,7 +15,10 @@ import org.matsim.core.events.MatsimEventsReader; import org.matsim.core.network.NetworkUtils; import org.matsim.testcases.MatsimTestUtils; -import org.matsim.vehicles.*; +import org.matsim.vehicles.MatsimVehicleReader; +import org.matsim.vehicles.VehicleType; +import org.matsim.vehicles.VehicleUtils; +import org.matsim.vehicles.Vehicles; import java.io.File; import java.util.Iterator;