diff --git a/src/main/java/example/lsp/initialPlans/ExampleSchedulingOfInitialPlan.java b/src/main/java/example/lsp/initialPlans/ExampleSchedulingOfInitialPlan.java index aeb67a82..6a4e14d6 100644 --- a/src/main/java/example/lsp/initialPlans/ExampleSchedulingOfInitialPlan.java +++ b/src/main/java/example/lsp/initialPlans/ExampleSchedulingOfInitialPlan.java @@ -30,8 +30,8 @@ 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.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.network.io.MatsimNetworkReader; import org.matsim.core.scenario.ScenarioUtils; diff --git a/src/main/java/example/lsp/initialPlans/ExampleSchedulingOfTransportChain.java b/src/main/java/example/lsp/initialPlans/ExampleSchedulingOfTransportChain.java index eee90f40..4443f532 100644 --- a/src/main/java/example/lsp/initialPlans/ExampleSchedulingOfTransportChain.java +++ b/src/main/java/example/lsp/initialPlans/ExampleSchedulingOfTransportChain.java @@ -33,8 +33,8 @@ 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.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.network.io.MatsimNetworkReader; import org.matsim.core.scenario.ScenarioUtils; diff --git a/src/main/java/example/lsp/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirect.java b/src/main/java/example/lsp/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirect.java index 3288bf10..d5af4e3a 100644 --- a/src/main/java/example/lsp/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirect.java +++ b/src/main/java/example/lsp/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirect.java @@ -34,9 +34,8 @@ 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.freight.carriers.FreightConfigGroup; -import org.matsim.contrib.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils; import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager; import org.matsim.contrib.freight.carriers.events.CarrierServiceEndEvent; diff --git a/src/main/java/example/lsp/initialPlans/ExampleTwoEchelonGrid.java b/src/main/java/example/lsp/initialPlans/ExampleTwoEchelonGrid.java index 8011791f..68c95532 100644 --- a/src/main/java/example/lsp/initialPlans/ExampleTwoEchelonGrid.java +++ b/src/main/java/example/lsp/initialPlans/ExampleTwoEchelonGrid.java @@ -33,8 +33,7 @@ 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.freight.carriers.FreightConfigGroup; -import org.matsim.contrib.freight.carriers.carrier.*; +import org.matsim.contrib.freight.carriers.*; import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory; import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager; import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils; diff --git a/src/main/java/example/lsp/initialPlans/ExampleTwoEchelonGrid_NR.java b/src/main/java/example/lsp/initialPlans/ExampleTwoEchelonGrid_NR.java index 3added82..67a5bc59 100644 --- a/src/main/java/example/lsp/initialPlans/ExampleTwoEchelonGrid_NR.java +++ b/src/main/java/example/lsp/initialPlans/ExampleTwoEchelonGrid_NR.java @@ -35,8 +35,7 @@ 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.freight.carriers.FreightConfigGroup; -import org.matsim.contrib.freight.carriers.carrier.*; +import org.matsim.contrib.freight.carriers.*; import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory; import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager; import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils; diff --git a/src/main/java/example/lsp/initialPlans/MyCarrierScorer.java b/src/main/java/example/lsp/initialPlans/MyCarrierScorer.java index e973925e..23eb5382 100644 --- a/src/main/java/example/lsp/initialPlans/MyCarrierScorer.java +++ b/src/main/java/example/lsp/initialPlans/MyCarrierScorer.java @@ -1,6 +1,6 @@ package example.lsp.initialPlans; -import org.matsim.contrib.freight.carriers.carrier.Carrier; +import org.matsim.contrib.freight.carriers.Carrier; import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory; import org.matsim.core.scoring.ScoringFunction; import org.matsim.core.scoring.SumScoringFunction; diff --git a/src/main/java/example/lsp/initialPlans/MyEventBasedCarrierScorer.java b/src/main/java/example/lsp/initialPlans/MyEventBasedCarrierScorer.java index 6d71bb25..78b7d6bc 100644 --- a/src/main/java/example/lsp/initialPlans/MyEventBasedCarrierScorer.java +++ b/src/main/java/example/lsp/initialPlans/MyEventBasedCarrierScorer.java @@ -8,8 +8,8 @@ import org.matsim.api.core.v01.events.Event; import org.matsim.api.core.v01.events.LinkEnterEvent; import org.matsim.api.core.v01.network.Network; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.Tour; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.Tour; import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory; import org.matsim.contrib.freight.carriers.events.CarrierTourEndEvent; import org.matsim.contrib.freight.carriers.events.CarrierTourStartEvent; diff --git a/src/main/java/example/lsp/lspReplanning/ExampleLSPReplanning.java b/src/main/java/example/lsp/lspReplanning/ExampleLSPReplanning.java index 8729d775..aab57541 100644 --- a/src/main/java/example/lsp/lspReplanning/ExampleLSPReplanning.java +++ b/src/main/java/example/lsp/lspReplanning/ExampleLSPReplanning.java @@ -30,8 +30,8 @@ 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.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.config.groups.VspExperimentalConfigGroup; import org.matsim.core.controler.AbstractModule; diff --git a/src/main/java/example/lsp/lspScoring/ExampleLSPScoring.java b/src/main/java/example/lsp/lspScoring/ExampleLSPScoring.java index a8d8c1ce..e8420645 100644 --- a/src/main/java/example/lsp/lspScoring/ExampleLSPScoring.java +++ b/src/main/java/example/lsp/lspScoring/ExampleLSPScoring.java @@ -31,9 +31,8 @@ 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.freight.carriers.FreightConfigGroup; -import org.matsim.contrib.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.contrib.freight.carriers.events.CarrierServiceEndEvent; import org.matsim.contrib.freight.carriers.events.eventhandler.FreightServiceEndEventHandler; import org.matsim.core.config.Config; diff --git a/src/main/java/example/lsp/mobsimExamples/ExampleMobsimOfSimpleLSP.java b/src/main/java/example/lsp/mobsimExamples/ExampleMobsimOfSimpleLSP.java index 0c7668b9..4e7c0987 100644 --- a/src/main/java/example/lsp/mobsimExamples/ExampleMobsimOfSimpleLSP.java +++ b/src/main/java/example/lsp/mobsimExamples/ExampleMobsimOfSimpleLSP.java @@ -30,9 +30,8 @@ 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.freight.carriers.FreightConfigGroup; -import org.matsim.contrib.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.config.ConfigUtils; import org.matsim.core.config.groups.VspExperimentalConfigGroup; diff --git a/src/main/java/example/lsp/mobsimExamples/ExampleMobsimOfTransportChain.java b/src/main/java/example/lsp/mobsimExamples/ExampleMobsimOfTransportChain.java index d1b695ce..5a042dc4 100644 --- a/src/main/java/example/lsp/mobsimExamples/ExampleMobsimOfTransportChain.java +++ b/src/main/java/example/lsp/mobsimExamples/ExampleMobsimOfTransportChain.java @@ -33,8 +33,8 @@ 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.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.config.groups.VspExperimentalConfigGroup; import org.matsim.core.controler.AbstractModule; diff --git a/src/main/java/example/lsp/multipleChains/EventBasedCarrierScorer_MultipleChains.java b/src/main/java/example/lsp/multipleChains/EventBasedCarrierScorer_MultipleChains.java index bc96909e..cbb00670 100644 --- a/src/main/java/example/lsp/multipleChains/EventBasedCarrierScorer_MultipleChains.java +++ b/src/main/java/example/lsp/multipleChains/EventBasedCarrierScorer_MultipleChains.java @@ -8,8 +8,8 @@ import org.matsim.api.core.v01.events.Event; import org.matsim.api.core.v01.events.LinkEnterEvent; import org.matsim.api.core.v01.network.Network; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.Tour; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.Tour; import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory; import org.matsim.contrib.freight.carriers.events.CarrierTourEndEvent; import org.matsim.contrib.freight.carriers.events.CarrierTourStartEvent; diff --git a/src/main/java/example/lsp/multipleChains/ExampleGroceryDeliveryMultipleChains.java b/src/main/java/example/lsp/multipleChains/ExampleGroceryDeliveryMultipleChains.java index 1ed48a63..cf2afd6a 100644 --- a/src/main/java/example/lsp/multipleChains/ExampleGroceryDeliveryMultipleChains.java +++ b/src/main/java/example/lsp/multipleChains/ExampleGroceryDeliveryMultipleChains.java @@ -11,8 +11,7 @@ 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.contrib.freight.carriers.FreightConfigGroup; -import org.matsim.contrib.freight.carriers.carrier.*; +import org.matsim.contrib.freight.carriers.*; import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory; import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager; import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils; diff --git a/src/main/java/example/lsp/multipleChains/ExampleMultipleMixedEchelonChains.java b/src/main/java/example/lsp/multipleChains/ExampleMultipleMixedEchelonChains.java index 1b1579cd..e286719c 100644 --- a/src/main/java/example/lsp/multipleChains/ExampleMultipleMixedEchelonChains.java +++ b/src/main/java/example/lsp/multipleChains/ExampleMultipleMixedEchelonChains.java @@ -13,8 +13,7 @@ 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.freight.carriers.FreightConfigGroup; -import org.matsim.contrib.freight.carriers.carrier.*; +import org.matsim.contrib.freight.carriers.*; import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils; import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory; import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager; diff --git a/src/main/java/example/lsp/multipleChains/ExampleMultipleOneEchelonChains.java b/src/main/java/example/lsp/multipleChains/ExampleMultipleOneEchelonChains.java index 89414140..6ee30496 100644 --- a/src/main/java/example/lsp/multipleChains/ExampleMultipleOneEchelonChains.java +++ b/src/main/java/example/lsp/multipleChains/ExampleMultipleOneEchelonChains.java @@ -11,8 +11,7 @@ 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.freight.carriers.FreightConfigGroup; -import org.matsim.contrib.freight.carriers.carrier.*; +import org.matsim.contrib.freight.carriers.*; import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory; import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager; import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils; diff --git a/src/main/java/example/lsp/multipleChains/ExampleMultipleOneEchelonChainsReplanning.java b/src/main/java/example/lsp/multipleChains/ExampleMultipleOneEchelonChainsReplanning.java index a784dea0..10f02f41 100644 --- a/src/main/java/example/lsp/multipleChains/ExampleMultipleOneEchelonChainsReplanning.java +++ b/src/main/java/example/lsp/multipleChains/ExampleMultipleOneEchelonChainsReplanning.java @@ -11,8 +11,7 @@ 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.freight.carriers.FreightConfigGroup; -import org.matsim.contrib.freight.carriers.carrier.*; +import org.matsim.contrib.freight.carriers.*; import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils; import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory; import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager; diff --git a/src/main/java/example/lsp/multipleChains/ExampleMultipleTwoEchelonChainsReplanning.java b/src/main/java/example/lsp/multipleChains/ExampleMultipleTwoEchelonChainsReplanning.java index e42b113b..b111912a 100644 --- a/src/main/java/example/lsp/multipleChains/ExampleMultipleTwoEchelonChainsReplanning.java +++ b/src/main/java/example/lsp/multipleChains/ExampleMultipleTwoEchelonChainsReplanning.java @@ -13,8 +13,7 @@ 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.freight.carriers.FreightConfigGroup; -import org.matsim.contrib.freight.carriers.carrier.*; +import org.matsim.contrib.freight.carriers.*; import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory; import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager; import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils; diff --git a/src/main/java/example/lsp/multipleChains/MultipleChainsUtils.java b/src/main/java/example/lsp/multipleChains/MultipleChainsUtils.java index 81cf7295..6744f14a 100644 --- a/src/main/java/example/lsp/multipleChains/MultipleChainsUtils.java +++ b/src/main/java/example/lsp/multipleChains/MultipleChainsUtils.java @@ -3,8 +3,8 @@ import lsp.shipment.LSPShipment; import lsp.shipment.ShipmentUtils; import org.matsim.api.core.v01.Id; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierShipment; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierShipment; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/example/lsp/simulationTrackers/CollectionServiceHandler.java b/src/main/java/example/lsp/simulationTrackers/CollectionServiceHandler.java index 71be1a97..f337423f 100644 --- a/src/main/java/example/lsp/simulationTrackers/CollectionServiceHandler.java +++ b/src/main/java/example/lsp/simulationTrackers/CollectionServiceHandler.java @@ -22,7 +22,7 @@ import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.Scenario; -import org.matsim.contrib.freight.carriers.carrier.CarrierService; +import org.matsim.contrib.freight.carriers.CarrierService; 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; diff --git a/src/main/java/example/lsp/simulationTrackers/ExampleSimulationTrackers.java b/src/main/java/example/lsp/simulationTrackers/ExampleSimulationTrackers.java index 8d12b435..1f28f236 100644 --- a/src/main/java/example/lsp/simulationTrackers/ExampleSimulationTrackers.java +++ b/src/main/java/example/lsp/simulationTrackers/ExampleSimulationTrackers.java @@ -29,8 +29,8 @@ 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.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.config.groups.VspExperimentalConfigGroup; import org.matsim.core.controler.Controler; diff --git a/src/main/java/example/lsp/simulationTrackers/TourStartHandler.java b/src/main/java/example/lsp/simulationTrackers/TourStartHandler.java index cca3b876..d2a6ae99 100644 --- a/src/main/java/example/lsp/simulationTrackers/TourStartHandler.java +++ b/src/main/java/example/lsp/simulationTrackers/TourStartHandler.java @@ -23,7 +23,7 @@ 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.carrier.*; +import org.matsim.contrib.freight.carriers.*; import org.matsim.contrib.freight.carriers.events.CarrierTourStartEvent; import org.matsim.contrib.freight.carriers.events.eventhandler.FreightTourStartEventHandler; diff --git a/src/main/java/example/lspAndDemand/requirementsChecking/ExampleCheckRequirementsOfAssigner.java b/src/main/java/example/lspAndDemand/requirementsChecking/ExampleCheckRequirementsOfAssigner.java index cc3356ef..717b8704 100644 --- a/src/main/java/example/lspAndDemand/requirementsChecking/ExampleCheckRequirementsOfAssigner.java +++ b/src/main/java/example/lspAndDemand/requirementsChecking/ExampleCheckRequirementsOfAssigner.java @@ -29,8 +29,8 @@ 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.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.network.io.MatsimNetworkReader; import org.matsim.core.scenario.ScenarioUtils; diff --git a/src/main/java/lsp/LSPCarrierResource.java b/src/main/java/lsp/LSPCarrierResource.java index e1136ed2..6cc7a983 100644 --- a/src/main/java/lsp/LSPCarrierResource.java +++ b/src/main/java/lsp/LSPCarrierResource.java @@ -20,7 +20,7 @@ package lsp; -import org.matsim.contrib.freight.carriers.carrier.Carrier; +import org.matsim.contrib.freight.carriers.Carrier; public interface LSPCarrierResource extends LSPResource { diff --git a/src/main/java/lsp/LSPControlerListener.java b/src/main/java/lsp/LSPControlerListener.java index 4d117e45..b2f0dda1 100644 --- a/src/main/java/lsp/LSPControlerListener.java +++ b/src/main/java/lsp/LSPControlerListener.java @@ -27,10 +27,10 @@ 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.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierPlanWriter; -import org.matsim.contrib.freight.carriers.carrier.CarrierUtils; -import org.matsim.contrib.freight.carriers.carrier.Carriers; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierPlanWriter; +import org.matsim.contrib.freight.carriers.CarrierUtils; +import org.matsim.contrib.freight.carriers.Carriers; import org.matsim.contrib.freight.carriers.controler.CarrierAgentTracker; import org.matsim.core.api.experimental.events.EventsManager; import org.matsim.core.controler.MatsimServices; diff --git a/src/main/java/lsp/LSPModule.java b/src/main/java/lsp/LSPModule.java index bcfebee9..367e3af7 100644 --- a/src/main/java/lsp/LSPModule.java +++ b/src/main/java/lsp/LSPModule.java @@ -31,8 +31,8 @@ import org.matsim.api.core.v01.population.HasPlansAndId; import org.matsim.api.core.v01.population.Leg; import org.matsim.contrib.freight.carriers.FreightConfigGroup; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.Carriers; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.Carriers; import org.matsim.contrib.freight.carriers.controler.*; import org.matsim.core.config.ConfigUtils; import org.matsim.core.controler.AbstractModule; diff --git a/src/main/java/lsp/LSPScorer.java b/src/main/java/lsp/LSPScorer.java index cb547551..bde14824 100644 --- a/src/main/java/lsp/LSPScorer.java +++ b/src/main/java/lsp/LSPScorer.java @@ -21,7 +21,7 @@ package lsp; import org.matsim.api.core.v01.population.Activity; -import org.matsim.contrib.freight.carriers.carrier.Carrier; +import org.matsim.contrib.freight.carriers.Carrier; import org.matsim.core.controler.listener.ControlerListener; import org.matsim.core.events.handler.EventHandler; import org.matsim.core.scoring.ScoringFunction; diff --git a/src/main/java/lsp/LSPUtils.java b/src/main/java/lsp/LSPUtils.java index 4f58bff0..874754ea 100644 --- a/src/main/java/lsp/LSPUtils.java +++ b/src/main/java/lsp/LSPUtils.java @@ -24,8 +24,8 @@ import lsp.shipment.ShipmentPlan; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.Scenario; -import org.matsim.contrib.freight.carriers.carrier.CarrierUtils; -import org.matsim.contrib.freight.carriers.carrier.Carriers; +import org.matsim.contrib.freight.carriers.CarrierUtils; +import org.matsim.contrib.freight.carriers.Carriers; import org.matsim.utils.objectattributes.attributable.Attributable; import java.util.ArrayList; diff --git a/src/main/java/lsp/io/LSPPlanXmlParserV1.java b/src/main/java/lsp/io/LSPPlanXmlParserV1.java index f706fb61..eb25f4ab 100644 --- a/src/main/java/lsp/io/LSPPlanXmlParserV1.java +++ b/src/main/java/lsp/io/LSPPlanXmlParserV1.java @@ -35,7 +35,7 @@ import org.apache.logging.log4j.Logger; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.network.Link; -import org.matsim.contrib.freight.carriers.carrier.*; +import org.matsim.contrib.freight.carriers.*; import org.matsim.core.gbl.Gbl; import org.matsim.core.utils.io.MatsimXmlParser; import org.matsim.core.utils.misc.Time; diff --git a/src/main/java/lsp/io/LSPPlanXmlReader.java b/src/main/java/lsp/io/LSPPlanXmlReader.java index 0d1845a1..299b1515 100644 --- a/src/main/java/lsp/io/LSPPlanXmlReader.java +++ b/src/main/java/lsp/io/LSPPlanXmlReader.java @@ -24,7 +24,7 @@ import lsp.LSPs; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.matsim.contrib.freight.carriers.carrier.Carriers; +import org.matsim.contrib.freight.carriers.Carriers; import org.matsim.core.api.internal.MatsimReader; import org.matsim.core.utils.io.MatsimXmlParser; import org.xml.sax.Attributes; diff --git a/src/main/java/lsp/resourceImplementations/CarrierSchedulerUtils.java b/src/main/java/lsp/resourceImplementations/CarrierSchedulerUtils.java index 91844516..9685757a 100644 --- a/src/main/java/lsp/resourceImplementations/CarrierSchedulerUtils.java +++ b/src/main/java/lsp/resourceImplementations/CarrierSchedulerUtils.java @@ -6,8 +6,8 @@ import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; import com.graphhopper.jsprit.core.util.Solutions; import org.matsim.api.core.v01.network.Network; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierPlan; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierPlan; import org.matsim.contrib.freight.carriers.jsprit.MatsimJspritFactory; import org.matsim.contrib.freight.carriers.jsprit.NetworkBasedTransportCosts; import org.matsim.contrib.freight.carriers.jsprit.NetworkRouter; diff --git a/src/main/java/lsp/resourceImplementations/ResourceImplementationUtils.java b/src/main/java/lsp/resourceImplementations/ResourceImplementationUtils.java index a0acf81e..ad2f40c4 100644 --- a/src/main/java/lsp/resourceImplementations/ResourceImplementationUtils.java +++ b/src/main/java/lsp/resourceImplementations/ResourceImplementationUtils.java @@ -28,8 +28,8 @@ import lsp.shipment.ShipmentUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierVehicle; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierVehicle; import org.matsim.core.utils.io.IOUtils; import org.matsim.vehicles.VehicleType; diff --git a/src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionCarrierResource.java b/src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionCarrierResource.java index 4f7a09d7..0d7ceae3 100644 --- a/src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionCarrierResource.java +++ b/src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionCarrierResource.java @@ -24,8 +24,8 @@ import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.network.Link; import org.matsim.api.core.v01.network.Network; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierVehicle; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierVehicle; import java.util.Collection; import java.util.List; diff --git a/src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionCarrierScheduler.java b/src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionCarrierScheduler.java index af440194..dd126e39 100644 --- a/src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionCarrierScheduler.java +++ b/src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionCarrierScheduler.java @@ -26,12 +26,12 @@ import lsp.shipment.ShipmentPlanElement; import lsp.shipment.ShipmentUtils; import org.matsim.api.core.v01.Id; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierService; -import org.matsim.contrib.freight.carriers.carrier.ScheduledTour; -import org.matsim.contrib.freight.carriers.carrier.Tour; -import org.matsim.contrib.freight.carriers.carrier.Tour.Leg; -import org.matsim.contrib.freight.carriers.carrier.Tour.TourElement; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierService; +import org.matsim.contrib.freight.carriers.ScheduledTour; +import org.matsim.contrib.freight.carriers.Tour; +import org.matsim.contrib.freight.carriers.Tour.Leg; +import org.matsim.contrib.freight.carriers.Tour.TourElement; import java.util.ArrayList; diff --git a/src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionCarrierUtils.java b/src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionCarrierUtils.java index 1db6f9fc..17ba3403 100644 --- a/src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionCarrierUtils.java +++ b/src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionCarrierUtils.java @@ -6,7 +6,7 @@ import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.network.Link; import org.matsim.api.core.v01.network.Network; -import org.matsim.contrib.freight.carriers.carrier.Carrier; +import org.matsim.contrib.freight.carriers.Carrier; import java.util.ArrayList; diff --git a/src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionServiceEndEventHandler.java b/src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionServiceEndEventHandler.java index 046fffc4..9a4f949b 100644 --- a/src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionServiceEndEventHandler.java +++ b/src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionServiceEndEventHandler.java @@ -29,7 +29,7 @@ import lsp.shipment.ShipmentPlanElement; import lsp.shipment.ShipmentUtils; import org.matsim.api.core.v01.Id; -import org.matsim.contrib.freight.carriers.carrier.CarrierService; +import org.matsim.contrib.freight.carriers.CarrierService; import org.matsim.contrib.freight.carriers.events.CarrierServiceEndEvent; import org.matsim.contrib.freight.carriers.events.eventhandler.FreightServiceEndEventHandler; import org.matsim.core.controler.events.AfterMobsimEvent; diff --git a/src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionTourEndEventHandler.java b/src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionTourEndEventHandler.java index 71482223..7bbb2f27 100644 --- a/src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionTourEndEventHandler.java +++ b/src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionTourEndEventHandler.java @@ -29,10 +29,10 @@ import lsp.shipment.ShipmentPlanElement; import lsp.shipment.ShipmentUtils; import org.matsim.api.core.v01.Id; -import org.matsim.contrib.freight.carriers.carrier.CarrierService; -import org.matsim.contrib.freight.carriers.carrier.Tour; -import org.matsim.contrib.freight.carriers.carrier.Tour.ServiceActivity; -import org.matsim.contrib.freight.carriers.carrier.Tour.TourElement; +import org.matsim.contrib.freight.carriers.CarrierService; +import org.matsim.contrib.freight.carriers.Tour; +import org.matsim.contrib.freight.carriers.Tour.ServiceActivity; +import org.matsim.contrib.freight.carriers.Tour.TourElement; import org.matsim.contrib.freight.carriers.events.CarrierTourEndEvent; import org.matsim.contrib.freight.carriers.events.eventhandler.FreightTourEndEventHandler; import org.matsim.core.controler.events.AfterMobsimEvent; diff --git a/src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionCarrierResource.java b/src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionCarrierResource.java index da0cdb1c..7f7c7072 100644 --- a/src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionCarrierResource.java +++ b/src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionCarrierResource.java @@ -24,8 +24,8 @@ import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.network.Link; import org.matsim.api.core.v01.network.Network; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierVehicle; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierVehicle; import java.util.Collection; diff --git a/src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionCarrierScheduler.java b/src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionCarrierScheduler.java index ec0b7ab7..9e0b964a 100644 --- a/src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionCarrierScheduler.java +++ b/src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionCarrierScheduler.java @@ -27,11 +27,11 @@ import lsp.shipment.ShipmentUtils; import org.locationtech.jts.util.Assert; import org.matsim.api.core.v01.Id; -import org.matsim.contrib.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; -import org.matsim.contrib.freight.carriers.carrier.Tour.Leg; -import org.matsim.contrib.freight.carriers.carrier.Tour.ServiceActivity; -import org.matsim.contrib.freight.carriers.carrier.Tour.TourElement; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.Tour.Leg; +import org.matsim.contrib.freight.carriers.Tour.ServiceActivity; +import org.matsim.contrib.freight.carriers.Tour.TourElement; import org.matsim.vehicles.VehicleType; import java.util.ArrayList; diff --git a/src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionCarrierUtils.java b/src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionCarrierUtils.java index 22aa60a5..b03f2f5b 100644 --- a/src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionCarrierUtils.java +++ b/src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionCarrierUtils.java @@ -6,7 +6,7 @@ import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.network.Link; import org.matsim.api.core.v01.network.Network; -import org.matsim.contrib.freight.carriers.carrier.Carrier; +import org.matsim.contrib.freight.carriers.Carrier; import java.util.ArrayList; diff --git a/src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionServiceStartEventHandler.java b/src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionServiceStartEventHandler.java index 7f5220d9..d93c405a 100644 --- a/src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionServiceStartEventHandler.java +++ b/src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionServiceStartEventHandler.java @@ -28,7 +28,7 @@ import lsp.shipment.ShipmentPlanElement; import lsp.shipment.ShipmentUtils; import org.matsim.api.core.v01.Id; -import org.matsim.contrib.freight.carriers.carrier.CarrierService; +import org.matsim.contrib.freight.carriers.CarrierService; import org.matsim.contrib.freight.carriers.events.CarrierServiceStartEvent; import org.matsim.contrib.freight.carriers.events.eventhandler.FreightServiceStartEventHandler; import org.matsim.core.controler.events.AfterMobsimEvent; diff --git a/src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionTourStartEventHandler.java b/src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionTourStartEventHandler.java index fdced282..a6f2203f 100644 --- a/src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionTourStartEventHandler.java +++ b/src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionTourStartEventHandler.java @@ -27,10 +27,10 @@ import lsp.shipment.ShipmentPlanElement; import lsp.shipment.ShipmentUtils; import org.matsim.api.core.v01.Id; -import org.matsim.contrib.freight.carriers.carrier.CarrierService; -import org.matsim.contrib.freight.carriers.carrier.Tour; -import org.matsim.contrib.freight.carriers.carrier.Tour.ServiceActivity; -import org.matsim.contrib.freight.carriers.carrier.Tour.TourElement; +import org.matsim.contrib.freight.carriers.CarrierService; +import org.matsim.contrib.freight.carriers.Tour; +import org.matsim.contrib.freight.carriers.Tour.ServiceActivity; +import org.matsim.contrib.freight.carriers.Tour.TourElement; import org.matsim.contrib.freight.carriers.events.CarrierTourStartEvent; import org.matsim.contrib.freight.carriers.events.eventhandler.FreightTourStartEventHandler; diff --git a/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunCarrierResource.java b/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunCarrierResource.java index 985fcf88..deed4c47 100644 --- a/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunCarrierResource.java +++ b/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunCarrierResource.java @@ -27,7 +27,7 @@ import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.network.Link; import org.matsim.api.core.v01.network.Network; -import org.matsim.contrib.freight.carriers.carrier.Carrier; +import org.matsim.contrib.freight.carriers.Carrier; import java.util.Collection; diff --git a/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunCarrierScheduler.java b/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunCarrierScheduler.java index 14673f9d..556115d7 100644 --- a/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunCarrierScheduler.java +++ b/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunCarrierScheduler.java @@ -27,9 +27,9 @@ import lsp.shipment.ShipmentUtils; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.network.Link; -import org.matsim.contrib.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.Tour.Leg; -import org.matsim.contrib.freight.carriers.carrier.Tour.TourElement; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.Tour.Leg; +import org.matsim.contrib.freight.carriers.Tour.TourElement; import org.matsim.contrib.freight.carriers.jsprit.NetworkBasedTransportCosts; import org.matsim.contrib.freight.carriers.jsprit.NetworkRouter; import org.matsim.core.population.routes.NetworkRoute; diff --git a/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunCarrierUtils.java b/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunCarrierUtils.java index bf22c2f4..65adf24a 100644 --- a/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunCarrierUtils.java +++ b/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunCarrierUtils.java @@ -6,7 +6,7 @@ import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.network.Link; import org.matsim.api.core.v01.network.Network; -import org.matsim.contrib.freight.carriers.carrier.Carrier; +import org.matsim.contrib.freight.carriers.Carrier; import java.util.ArrayList; diff --git a/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunTourEndEventHandler.java b/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunTourEndEventHandler.java index 08a79aa3..5edbad0f 100644 --- a/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunTourEndEventHandler.java +++ b/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunTourEndEventHandler.java @@ -28,10 +28,10 @@ import lsp.shipment.ShipmentPlanElement; import lsp.shipment.ShipmentUtils; import org.matsim.api.core.v01.Id; -import org.matsim.contrib.freight.carriers.carrier.CarrierService; -import org.matsim.contrib.freight.carriers.carrier.Tour; -import org.matsim.contrib.freight.carriers.carrier.Tour.ServiceActivity; -import org.matsim.contrib.freight.carriers.carrier.Tour.TourElement; +import org.matsim.contrib.freight.carriers.CarrierService; +import org.matsim.contrib.freight.carriers.Tour; +import org.matsim.contrib.freight.carriers.Tour.ServiceActivity; +import org.matsim.contrib.freight.carriers.Tour.TourElement; import org.matsim.contrib.freight.carriers.events.CarrierTourEndEvent; import org.matsim.contrib.freight.carriers.events.eventhandler.FreightTourEndEventHandler; import org.matsim.core.controler.events.AfterMobsimEvent; diff --git a/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunTourStartEventHandler.java b/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunTourStartEventHandler.java index 571dd928..3a7e2701 100644 --- a/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunTourStartEventHandler.java +++ b/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunTourStartEventHandler.java @@ -28,10 +28,10 @@ import lsp.shipment.ShipmentPlanElement; import lsp.shipment.ShipmentUtils; import org.matsim.api.core.v01.Id; -import org.matsim.contrib.freight.carriers.carrier.CarrierService; -import org.matsim.contrib.freight.carriers.carrier.Tour; -import org.matsim.contrib.freight.carriers.carrier.Tour.ServiceActivity; -import org.matsim.contrib.freight.carriers.carrier.Tour.TourElement; +import org.matsim.contrib.freight.carriers.CarrierService; +import org.matsim.contrib.freight.carriers.Tour; +import org.matsim.contrib.freight.carriers.Tour.ServiceActivity; +import org.matsim.contrib.freight.carriers.Tour.TourElement; import org.matsim.contrib.freight.carriers.events.CarrierTourStartEvent; import org.matsim.contrib.freight.carriers.events.eventhandler.FreightTourStartEventHandler; import org.matsim.core.controler.events.AfterMobsimEvent; diff --git a/src/main/java/lsp/resourceImplementations/transshipmentHub/TransshipmentHubTourEndEventHandler.java b/src/main/java/lsp/resourceImplementations/transshipmentHub/TransshipmentHubTourEndEventHandler.java index e319a699..f7abc8ee 100644 --- a/src/main/java/lsp/resourceImplementations/transshipmentHub/TransshipmentHubTourEndEventHandler.java +++ b/src/main/java/lsp/resourceImplementations/transshipmentHub/TransshipmentHubTourEndEventHandler.java @@ -27,9 +27,9 @@ 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.contrib.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.Tour.ServiceActivity; -import org.matsim.contrib.freight.carriers.carrier.Tour.TourElement; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.Tour.ServiceActivity; +import org.matsim.contrib.freight.carriers.Tour.TourElement; import org.matsim.contrib.freight.carriers.events.CarrierTourEndEvent; import org.matsim.contrib.freight.carriers.events.eventhandler.FreightTourEndEventHandler; import org.matsim.core.controler.events.AfterMobsimEvent; diff --git a/src/main/java/lsp/shipment/LSPShipment.java b/src/main/java/lsp/shipment/LSPShipment.java index 3deb7809..6068d85d 100644 --- a/src/main/java/lsp/shipment/LSPShipment.java +++ b/src/main/java/lsp/shipment/LSPShipment.java @@ -24,7 +24,7 @@ import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.Identifiable; import org.matsim.api.core.v01.network.Link; -import org.matsim.contrib.freight.carriers.carrier.TimeWindow; +import org.matsim.contrib.freight.carriers.TimeWindow; import org.matsim.utils.objectattributes.attributable.Attributable; import java.util.Collection; diff --git a/src/main/java/lsp/shipment/LSPShipmentImpl.java b/src/main/java/lsp/shipment/LSPShipmentImpl.java index feec95a3..f707afc0 100644 --- a/src/main/java/lsp/shipment/LSPShipmentImpl.java +++ b/src/main/java/lsp/shipment/LSPShipmentImpl.java @@ -23,7 +23,7 @@ import lsp.LSPDataObject; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.network.Link; -import org.matsim.contrib.freight.carriers.carrier.TimeWindow; +import org.matsim.contrib.freight.carriers.TimeWindow; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/lsp/shipment/LoggedShipmentTransport.java b/src/main/java/lsp/shipment/LoggedShipmentTransport.java index b2430609..451678c3 100644 --- a/src/main/java/lsp/shipment/LoggedShipmentTransport.java +++ b/src/main/java/lsp/shipment/LoggedShipmentTransport.java @@ -24,8 +24,8 @@ import lsp.LogisticChainElement; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.network.Link; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierService; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierService; final class LoggedShipmentTransport implements ShipmentLeg { diff --git a/src/main/java/lsp/shipment/ScheduledShipmentLoad.java b/src/main/java/lsp/shipment/ScheduledShipmentLoad.java index 39f69827..536863f8 100644 --- a/src/main/java/lsp/shipment/ScheduledShipmentLoad.java +++ b/src/main/java/lsp/shipment/ScheduledShipmentLoad.java @@ -23,8 +23,8 @@ import lsp.LSPResource; import lsp.LogisticChainElement; import org.matsim.api.core.v01.Id; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierService; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierService; class ScheduledShipmentLoad implements ShipmentPlanElement { diff --git a/src/main/java/lsp/shipment/ScheduledShipmentTransport.java b/src/main/java/lsp/shipment/ScheduledShipmentTransport.java index bcec421f..d2528676 100644 --- a/src/main/java/lsp/shipment/ScheduledShipmentTransport.java +++ b/src/main/java/lsp/shipment/ScheduledShipmentTransport.java @@ -24,8 +24,8 @@ import lsp.LogisticChainElement; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.network.Link; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierService; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierService; final class ScheduledShipmentTransport implements ShipmentLeg { diff --git a/src/main/java/lsp/shipment/ScheduledShipmentUnload.java b/src/main/java/lsp/shipment/ScheduledShipmentUnload.java index ac226f53..370e9d7b 100644 --- a/src/main/java/lsp/shipment/ScheduledShipmentUnload.java +++ b/src/main/java/lsp/shipment/ScheduledShipmentUnload.java @@ -23,8 +23,8 @@ import lsp.LSPResource; import lsp.LogisticChainElement; import org.matsim.api.core.v01.Id; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierService; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierService; class ScheduledShipmentUnload implements ShipmentPlanElement { diff --git a/src/main/java/lsp/shipment/ShipmentLeg.java b/src/main/java/lsp/shipment/ShipmentLeg.java index 4fc0f6e8..bb4e17c0 100644 --- a/src/main/java/lsp/shipment/ShipmentLeg.java +++ b/src/main/java/lsp/shipment/ShipmentLeg.java @@ -2,8 +2,8 @@ import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.network.Link; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierService; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierService; public interface ShipmentLeg extends ShipmentPlanElement { Id getToLinkId(); diff --git a/src/main/java/lsp/shipment/ShipmentUtils.java b/src/main/java/lsp/shipment/ShipmentUtils.java index 30ada92e..2aca57ab 100644 --- a/src/main/java/lsp/shipment/ShipmentUtils.java +++ b/src/main/java/lsp/shipment/ShipmentUtils.java @@ -25,9 +25,9 @@ import lsp.LogisticChainElement; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.network.Link; -import org.matsim.contrib.freight.carriers.carrier.Carrier; -import org.matsim.contrib.freight.carriers.carrier.CarrierService; -import org.matsim.contrib.freight.carriers.carrier.TimeWindow; +import org.matsim.contrib.freight.carriers.Carrier; +import org.matsim.contrib.freight.carriers.CarrierService; +import org.matsim.contrib.freight.carriers.TimeWindow; import java.util.ArrayList; import java.util.Comparator; diff --git a/src/test/java/adapterTests/CollectionResourceTest.java b/src/test/java/adapterTests/CollectionResourceTest.java index 0183e8bc..d6f7a546 100644 --- a/src/test/java/adapterTests/CollectionResourceTest.java +++ b/src/test/java/adapterTests/CollectionResourceTest.java @@ -28,8 +28,8 @@ 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.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.network.io.MatsimNetworkReader; import org.matsim.core.scenario.ScenarioUtils; diff --git a/src/test/java/adapterTests/DistributionResourceTest.java b/src/test/java/adapterTests/DistributionResourceTest.java index 3e5998bf..da3c1464 100644 --- a/src/test/java/adapterTests/DistributionResourceTest.java +++ b/src/test/java/adapterTests/DistributionResourceTest.java @@ -28,8 +28,8 @@ 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.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.network.io.MatsimNetworkReader; import org.matsim.core.scenario.ScenarioUtils; diff --git a/src/test/java/adapterTests/MainRunResourceTest.java b/src/test/java/adapterTests/MainRunResourceTest.java index 01699f79..e0b51d5f 100644 --- a/src/test/java/adapterTests/MainRunResourceTest.java +++ b/src/test/java/adapterTests/MainRunResourceTest.java @@ -28,8 +28,8 @@ 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.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.network.io.MatsimNetworkReader; import org.matsim.core.scenario.ScenarioUtils; diff --git a/src/test/java/example/lsp/lspReplanning/CollectionLSPReplanningTest.java b/src/test/java/example/lsp/lspReplanning/CollectionLSPReplanningTest.java index d0159258..b2bfdf51 100644 --- a/src/test/java/example/lsp/lspReplanning/CollectionLSPReplanningTest.java +++ b/src/test/java/example/lsp/lspReplanning/CollectionLSPReplanningTest.java @@ -32,9 +32,8 @@ 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.freight.carriers.FreightConfigGroup; -import org.matsim.contrib.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils; import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager; import org.matsim.core.config.Config; diff --git a/src/test/java/example/lsp/lspScoring/CollectionLSPScoringTest.java b/src/test/java/example/lsp/lspScoring/CollectionLSPScoringTest.java index a85ac2e2..a58d5a55 100644 --- a/src/test/java/example/lsp/lspScoring/CollectionLSPScoringTest.java +++ b/src/test/java/example/lsp/lspScoring/CollectionLSPScoringTest.java @@ -31,9 +31,8 @@ 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.freight.carriers.FreightConfigGroup; -import org.matsim.contrib.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.config.ConfigUtils; import org.matsim.core.config.groups.VspExperimentalConfigGroup; diff --git a/src/test/java/example/lsp/lspScoring/MultipleIterationsCollectionLSPScoringTest.java b/src/test/java/example/lsp/lspScoring/MultipleIterationsCollectionLSPScoringTest.java index 918ca476..4925f7a9 100644 --- a/src/test/java/example/lsp/lspScoring/MultipleIterationsCollectionLSPScoringTest.java +++ b/src/test/java/example/lsp/lspScoring/MultipleIterationsCollectionLSPScoringTest.java @@ -32,9 +32,8 @@ 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.freight.carriers.FreightConfigGroup; -import org.matsim.contrib.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager; import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils; import org.matsim.core.config.Config; diff --git a/src/test/java/example/lsp/multipleChains/MultipleChainsReplanningTest.java b/src/test/java/example/lsp/multipleChains/MultipleChainsReplanningTest.java index 6fc584a8..6ee5b0ee 100644 --- a/src/test/java/example/lsp/multipleChains/MultipleChainsReplanningTest.java +++ b/src/test/java/example/lsp/multipleChains/MultipleChainsReplanningTest.java @@ -13,8 +13,7 @@ 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.freight.carriers.FreightConfigGroup; -import org.matsim.contrib.freight.carriers.carrier.*; +import org.matsim.contrib.freight.carriers.*; import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory; import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager; import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils; diff --git a/src/test/java/example/lsp/multipleChains/WorstPlanSelectorTest.java b/src/test/java/example/lsp/multipleChains/WorstPlanSelectorTest.java index 04d99f10..cb0d3bf9 100644 --- a/src/test/java/example/lsp/multipleChains/WorstPlanSelectorTest.java +++ b/src/test/java/example/lsp/multipleChains/WorstPlanSelectorTest.java @@ -12,8 +12,7 @@ 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.freight.carriers.FreightConfigGroup; -import org.matsim.contrib.freight.carriers.carrier.*; +import org.matsim.contrib.freight.carriers.*; import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory; import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager; import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils; diff --git a/src/test/java/example/lsp/simulationTrackers/CollectionTrackerTest.java b/src/test/java/example/lsp/simulationTrackers/CollectionTrackerTest.java index 34a6e97a..4c78d807 100644 --- a/src/test/java/example/lsp/simulationTrackers/CollectionTrackerTest.java +++ b/src/test/java/example/lsp/simulationTrackers/CollectionTrackerTest.java @@ -34,12 +34,11 @@ 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.freight.carriers.FreightConfigGroup; -import org.matsim.contrib.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; -import org.matsim.contrib.freight.carriers.carrier.Tour.Leg; -import org.matsim.contrib.freight.carriers.carrier.Tour.ServiceActivity; -import org.matsim.contrib.freight.carriers.carrier.Tour.TourElement; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.Tour.Leg; +import org.matsim.contrib.freight.carriers.Tour.ServiceActivity; +import org.matsim.contrib.freight.carriers.Tour.TourElement; import org.matsim.core.config.Config; import org.matsim.core.config.ConfigUtils; import org.matsim.core.config.groups.VspExperimentalConfigGroup; diff --git a/src/test/java/example/lspAndDemand/requirementsChecking/AssignerRequirementsTest.java b/src/test/java/example/lspAndDemand/requirementsChecking/AssignerRequirementsTest.java index 0773188b..c5a186c5 100644 --- a/src/test/java/example/lspAndDemand/requirementsChecking/AssignerRequirementsTest.java +++ b/src/test/java/example/lspAndDemand/requirementsChecking/AssignerRequirementsTest.java @@ -31,8 +31,8 @@ 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.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.network.io.MatsimNetworkReader; import org.matsim.core.scenario.ScenarioUtils; diff --git a/src/test/java/logisticChainElementTests/CollectionElementTest.java b/src/test/java/logisticChainElementTests/CollectionElementTest.java index f13fe804..457f6522 100644 --- a/src/test/java/logisticChainElementTests/CollectionElementTest.java +++ b/src/test/java/logisticChainElementTests/CollectionElementTest.java @@ -30,8 +30,8 @@ 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.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.network.io.MatsimNetworkReader; import org.matsim.core.scenario.ScenarioUtils; diff --git a/src/test/java/logisticChainElementTests/DistributionElementTest.java b/src/test/java/logisticChainElementTests/DistributionElementTest.java index bc1d50ae..5956baa8 100644 --- a/src/test/java/logisticChainElementTests/DistributionElementTest.java +++ b/src/test/java/logisticChainElementTests/DistributionElementTest.java @@ -31,8 +31,8 @@ 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.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.network.io.MatsimNetworkReader; import org.matsim.core.scenario.ScenarioUtils; diff --git a/src/test/java/logisticChainElementTests/MainRunElementTest.java b/src/test/java/logisticChainElementTests/MainRunElementTest.java index 25dcc2db..76345543 100644 --- a/src/test/java/logisticChainElementTests/MainRunElementTest.java +++ b/src/test/java/logisticChainElementTests/MainRunElementTest.java @@ -30,8 +30,8 @@ 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.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.network.io.MatsimNetworkReader; import org.matsim.core.scenario.ScenarioUtils; diff --git a/src/test/java/logisticChainTests/CollectionChainTest.java b/src/test/java/logisticChainTests/CollectionChainTest.java index 19834bdb..b72df4c5 100644 --- a/src/test/java/logisticChainTests/CollectionChainTest.java +++ b/src/test/java/logisticChainTests/CollectionChainTest.java @@ -31,8 +31,8 @@ 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.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.network.io.MatsimNetworkReader; import org.matsim.core.scenario.ScenarioUtils; diff --git a/src/test/java/logisticChainTests/CompleteLogisticChainTest.java b/src/test/java/logisticChainTests/CompleteLogisticChainTest.java index 8e2f2530..cfed40ce 100644 --- a/src/test/java/logisticChainTests/CompleteLogisticChainTest.java +++ b/src/test/java/logisticChainTests/CompleteLogisticChainTest.java @@ -34,8 +34,8 @@ 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.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.network.io.MatsimNetworkReader; import org.matsim.core.scenario.ScenarioUtils; diff --git a/src/test/java/lsp/io/LSPReadWriteTest.java b/src/test/java/lsp/io/LSPReadWriteTest.java index 12087f25..4ed1b914 100644 --- a/src/test/java/lsp/io/LSPReadWriteTest.java +++ b/src/test/java/lsp/io/LSPReadWriteTest.java @@ -3,10 +3,10 @@ import lsp.LSPs; import org.junit.Rule; import org.junit.Test; -import org.matsim.contrib.freight.carriers.carrier.CarrierPlanXmlReader; -import org.matsim.contrib.freight.carriers.carrier.CarrierVehicleTypeReader; -import org.matsim.contrib.freight.carriers.carrier.CarrierVehicleTypes; -import org.matsim.contrib.freight.carriers.carrier.Carriers; +import org.matsim.contrib.freight.carriers.CarrierPlanXmlReader; +import org.matsim.contrib.freight.carriers.CarrierVehicleTypeReader; +import org.matsim.contrib.freight.carriers.CarrierVehicleTypes; +import org.matsim.contrib.freight.carriers.Carriers; import org.matsim.testcases.MatsimTestUtils; import java.util.Collections; diff --git a/src/test/java/lsp/resourceImplementations/CollectionLSPSchedulingTest.java b/src/test/java/lsp/resourceImplementations/CollectionLSPSchedulingTest.java index 2627c78a..067f4537 100644 --- a/src/test/java/lsp/resourceImplementations/CollectionLSPSchedulingTest.java +++ b/src/test/java/lsp/resourceImplementations/CollectionLSPSchedulingTest.java @@ -33,8 +33,8 @@ 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.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.events.handler.EventHandler; import org.matsim.core.network.io.MatsimNetworkReader; diff --git a/src/test/java/lsp/resourceImplementations/CompleteLSPSchedulingTest.java b/src/test/java/lsp/resourceImplementations/CompleteLSPSchedulingTest.java index b8699a5c..f24a2cfb 100644 --- a/src/test/java/lsp/resourceImplementations/CompleteLSPSchedulingTest.java +++ b/src/test/java/lsp/resourceImplementations/CompleteLSPSchedulingTest.java @@ -41,8 +41,8 @@ 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.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.events.handler.EventHandler; import org.matsim.core.network.io.MatsimNetworkReader; diff --git a/src/test/java/lsp/resourceImplementations/FirstReloadLSPSchedulingTest.java b/src/test/java/lsp/resourceImplementations/FirstReloadLSPSchedulingTest.java index 877957b3..1886219c 100644 --- a/src/test/java/lsp/resourceImplementations/FirstReloadLSPSchedulingTest.java +++ b/src/test/java/lsp/resourceImplementations/FirstReloadLSPSchedulingTest.java @@ -35,8 +35,8 @@ 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.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.events.handler.EventHandler; import org.matsim.core.gbl.MatsimRandom; diff --git a/src/test/java/lsp/resourceImplementations/MainRunLSPSchedulingTest.java b/src/test/java/lsp/resourceImplementations/MainRunLSPSchedulingTest.java index 70e4d27d..21dff944 100644 --- a/src/test/java/lsp/resourceImplementations/MainRunLSPSchedulingTest.java +++ b/src/test/java/lsp/resourceImplementations/MainRunLSPSchedulingTest.java @@ -38,8 +38,8 @@ 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.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.events.handler.EventHandler; import org.matsim.core.gbl.MatsimRandom; diff --git a/src/test/java/lsp/resourceImplementations/MultipleShipmentsCollectionLSPSchedulingTest.java b/src/test/java/lsp/resourceImplementations/MultipleShipmentsCollectionLSPSchedulingTest.java index 2d0385cd..29175b26 100644 --- a/src/test/java/lsp/resourceImplementations/MultipleShipmentsCollectionLSPSchedulingTest.java +++ b/src/test/java/lsp/resourceImplementations/MultipleShipmentsCollectionLSPSchedulingTest.java @@ -33,8 +33,8 @@ 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.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.events.handler.EventHandler; import org.matsim.core.network.io.MatsimNetworkReader; diff --git a/src/test/java/lsp/resourceImplementations/MultipleShipmentsCompleteLSPSchedulingTest.java b/src/test/java/lsp/resourceImplementations/MultipleShipmentsCompleteLSPSchedulingTest.java index 00fcd7fb..8b6dcab0 100644 --- a/src/test/java/lsp/resourceImplementations/MultipleShipmentsCompleteLSPSchedulingTest.java +++ b/src/test/java/lsp/resourceImplementations/MultipleShipmentsCompleteLSPSchedulingTest.java @@ -41,8 +41,8 @@ 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.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.events.handler.EventHandler; import org.matsim.core.network.io.MatsimNetworkReader; diff --git a/src/test/java/lsp/resourceImplementations/MultipleShipmentsFirstReloadLSPSchedulingTest.java b/src/test/java/lsp/resourceImplementations/MultipleShipmentsFirstReloadLSPSchedulingTest.java index 05a23c26..d46f65b9 100644 --- a/src/test/java/lsp/resourceImplementations/MultipleShipmentsFirstReloadLSPSchedulingTest.java +++ b/src/test/java/lsp/resourceImplementations/MultipleShipmentsFirstReloadLSPSchedulingTest.java @@ -35,8 +35,8 @@ 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.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.events.handler.EventHandler; import org.matsim.core.gbl.MatsimRandom; diff --git a/src/test/java/lsp/resourceImplementations/MultipleShipmentsMainRunLSPSchedulingTest.java b/src/test/java/lsp/resourceImplementations/MultipleShipmentsMainRunLSPSchedulingTest.java index 20e15893..73a62cc3 100644 --- a/src/test/java/lsp/resourceImplementations/MultipleShipmentsMainRunLSPSchedulingTest.java +++ b/src/test/java/lsp/resourceImplementations/MultipleShipmentsMainRunLSPSchedulingTest.java @@ -38,8 +38,8 @@ 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.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.events.handler.EventHandler; import org.matsim.core.gbl.MatsimRandom; diff --git a/src/test/java/lsp/resourceImplementations/MultipleShipmentsSecondReloadLSPSchedulingTest.java b/src/test/java/lsp/resourceImplementations/MultipleShipmentsSecondReloadLSPSchedulingTest.java index 0b9672ef..eee1fe98 100644 --- a/src/test/java/lsp/resourceImplementations/MultipleShipmentsSecondReloadLSPSchedulingTest.java +++ b/src/test/java/lsp/resourceImplementations/MultipleShipmentsSecondReloadLSPSchedulingTest.java @@ -38,8 +38,8 @@ 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.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.events.handler.EventHandler; import org.matsim.core.gbl.MatsimRandom; diff --git a/src/test/java/lsp/resourceImplementations/SecondReloadLSPSchedulingTest.java b/src/test/java/lsp/resourceImplementations/SecondReloadLSPSchedulingTest.java index 5020ffd0..e1e799c4 100644 --- a/src/test/java/lsp/resourceImplementations/SecondReloadLSPSchedulingTest.java +++ b/src/test/java/lsp/resourceImplementations/SecondReloadLSPSchedulingTest.java @@ -38,8 +38,8 @@ 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.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.events.handler.EventHandler; import org.matsim.core.gbl.MatsimRandom; diff --git a/src/test/java/lspCreationTests/CollectionLSPCreationTest.java b/src/test/java/lspCreationTests/CollectionLSPCreationTest.java index 1b4c2f7f..1db0b98f 100644 --- a/src/test/java/lspCreationTests/CollectionLSPCreationTest.java +++ b/src/test/java/lspCreationTests/CollectionLSPCreationTest.java @@ -29,8 +29,8 @@ 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.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.network.io.MatsimNetworkReader; import org.matsim.core.scenario.ScenarioUtils; diff --git a/src/test/java/lspCreationTests/CompleteLSPCreationTest.java b/src/test/java/lspCreationTests/CompleteLSPCreationTest.java index f2f4ce0f..1fea8ef7 100644 --- a/src/test/java/lspCreationTests/CompleteLSPCreationTest.java +++ b/src/test/java/lspCreationTests/CompleteLSPCreationTest.java @@ -32,8 +32,8 @@ 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.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.network.io.MatsimNetworkReader; import org.matsim.core.scenario.ScenarioUtils; diff --git a/src/test/java/lspMobsimTests/CollectionLSPMobsimTest.java b/src/test/java/lspMobsimTests/CollectionLSPMobsimTest.java index 4cbace15..40e93e3b 100644 --- a/src/test/java/lspMobsimTests/CollectionLSPMobsimTest.java +++ b/src/test/java/lspMobsimTests/CollectionLSPMobsimTest.java @@ -34,9 +34,8 @@ import org.matsim.api.core.v01.Scenario; import org.matsim.api.core.v01.events.Event; import org.matsim.api.core.v01.network.Link; -import org.matsim.contrib.freight.carriers.FreightConfigGroup; -import org.matsim.contrib.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.config.ConfigUtils; import org.matsim.core.config.groups.VspExperimentalConfigGroup; diff --git a/src/test/java/lspMobsimTests/CompleteLSPMobsimTest.java b/src/test/java/lspMobsimTests/CompleteLSPMobsimTest.java index 1530efbc..cfe8e3e7 100644 --- a/src/test/java/lspMobsimTests/CompleteLSPMobsimTest.java +++ b/src/test/java/lspMobsimTests/CompleteLSPMobsimTest.java @@ -36,9 +36,8 @@ 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.freight.carriers.FreightConfigGroup; -import org.matsim.contrib.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.config.ConfigUtils; import org.matsim.core.config.groups.VspExperimentalConfigGroup; diff --git a/src/test/java/lspMobsimTests/FirstReloadLSPMobsimTest.java b/src/test/java/lspMobsimTests/FirstReloadLSPMobsimTest.java index b5a3742c..ea5292d5 100644 --- a/src/test/java/lspMobsimTests/FirstReloadLSPMobsimTest.java +++ b/src/test/java/lspMobsimTests/FirstReloadLSPMobsimTest.java @@ -34,9 +34,8 @@ 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.freight.carriers.FreightConfigGroup; -import org.matsim.contrib.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.config.ConfigUtils; import org.matsim.core.config.groups.VspExperimentalConfigGroup; diff --git a/src/test/java/lspMobsimTests/MainRunLSPMobsimTest.java b/src/test/java/lspMobsimTests/MainRunLSPMobsimTest.java index 800b46b0..cc790d4d 100644 --- a/src/test/java/lspMobsimTests/MainRunLSPMobsimTest.java +++ b/src/test/java/lspMobsimTests/MainRunLSPMobsimTest.java @@ -35,9 +35,8 @@ 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.freight.carriers.FreightConfigGroup; -import org.matsim.contrib.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.config.ConfigUtils; import org.matsim.core.config.groups.VspExperimentalConfigGroup; diff --git a/src/test/java/lspMobsimTests/MainRunOnlyLSPMobsimTest.java b/src/test/java/lspMobsimTests/MainRunOnlyLSPMobsimTest.java index a0e2f2e0..1a86c964 100644 --- a/src/test/java/lspMobsimTests/MainRunOnlyLSPMobsimTest.java +++ b/src/test/java/lspMobsimTests/MainRunOnlyLSPMobsimTest.java @@ -33,9 +33,8 @@ 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.freight.carriers.FreightConfigGroup; -import org.matsim.contrib.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.config.ConfigUtils; import org.matsim.core.config.groups.VspExperimentalConfigGroup; diff --git a/src/test/java/lspMobsimTests/MultipleIterationsCollectionLSPMobsimTest.java b/src/test/java/lspMobsimTests/MultipleIterationsCollectionLSPMobsimTest.java index fb5d85f9..7902a780 100644 --- a/src/test/java/lspMobsimTests/MultipleIterationsCollectionLSPMobsimTest.java +++ b/src/test/java/lspMobsimTests/MultipleIterationsCollectionLSPMobsimTest.java @@ -33,9 +33,8 @@ 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.freight.carriers.FreightConfigGroup; -import org.matsim.contrib.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager; import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils; import org.matsim.core.config.Config; diff --git a/src/test/java/lspMobsimTests/MultipleIterationsCompleteLSPMobsimTest.java b/src/test/java/lspMobsimTests/MultipleIterationsCompleteLSPMobsimTest.java index b7775426..9a6bb945 100644 --- a/src/test/java/lspMobsimTests/MultipleIterationsCompleteLSPMobsimTest.java +++ b/src/test/java/lspMobsimTests/MultipleIterationsCompleteLSPMobsimTest.java @@ -37,9 +37,8 @@ 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.freight.carriers.FreightConfigGroup; -import org.matsim.contrib.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils; import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager; import org.matsim.core.config.Config; diff --git a/src/test/java/lspMobsimTests/MultipleIterationsFirstReloadLSPMobsimTest.java b/src/test/java/lspMobsimTests/MultipleIterationsFirstReloadLSPMobsimTest.java index fc1d26df..0da08330 100644 --- a/src/test/java/lspMobsimTests/MultipleIterationsFirstReloadLSPMobsimTest.java +++ b/src/test/java/lspMobsimTests/MultipleIterationsFirstReloadLSPMobsimTest.java @@ -35,9 +35,8 @@ 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.freight.carriers.FreightConfigGroup; -import org.matsim.contrib.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager; import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils; import org.matsim.core.config.Config; diff --git a/src/test/java/lspMobsimTests/MultipleIterationsMainRunLSPMobsimTest.java b/src/test/java/lspMobsimTests/MultipleIterationsMainRunLSPMobsimTest.java index 4ae0354e..5f91a776 100644 --- a/src/test/java/lspMobsimTests/MultipleIterationsMainRunLSPMobsimTest.java +++ b/src/test/java/lspMobsimTests/MultipleIterationsMainRunLSPMobsimTest.java @@ -36,9 +36,8 @@ 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.freight.carriers.FreightConfigGroup; -import org.matsim.contrib.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager; import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils; import org.matsim.core.config.Config; diff --git a/src/test/java/lspMobsimTests/MultipleIterationsSecondReloadLSPMobsimTest.java b/src/test/java/lspMobsimTests/MultipleIterationsSecondReloadLSPMobsimTest.java index ded0f315..b01d49d7 100644 --- a/src/test/java/lspMobsimTests/MultipleIterationsSecondReloadLSPMobsimTest.java +++ b/src/test/java/lspMobsimTests/MultipleIterationsSecondReloadLSPMobsimTest.java @@ -36,9 +36,8 @@ 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.freight.carriers.FreightConfigGroup; -import org.matsim.contrib.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils; import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager; import org.matsim.core.config.Config; diff --git a/src/test/java/lspMobsimTests/MultipleShipmentsCollectionLSPMobsimTest.java b/src/test/java/lspMobsimTests/MultipleShipmentsCollectionLSPMobsimTest.java index c9c0eb4a..d7485004 100644 --- a/src/test/java/lspMobsimTests/MultipleShipmentsCollectionLSPMobsimTest.java +++ b/src/test/java/lspMobsimTests/MultipleShipmentsCollectionLSPMobsimTest.java @@ -33,9 +33,8 @@ 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.freight.carriers.FreightConfigGroup; -import org.matsim.contrib.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.config.ConfigUtils; import org.matsim.core.config.groups.VspExperimentalConfigGroup; diff --git a/src/test/java/lspMobsimTests/MultipleShipmentsCompleteLSPMobsimTest.java b/src/test/java/lspMobsimTests/MultipleShipmentsCompleteLSPMobsimTest.java index ea8673e5..b9363456 100644 --- a/src/test/java/lspMobsimTests/MultipleShipmentsCompleteLSPMobsimTest.java +++ b/src/test/java/lspMobsimTests/MultipleShipmentsCompleteLSPMobsimTest.java @@ -39,9 +39,8 @@ 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.freight.carriers.FreightConfigGroup; -import org.matsim.contrib.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils; import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager; import org.matsim.core.config.Config; diff --git a/src/test/java/lspMobsimTests/MultipleShipmentsFirstReloadLSPMobsimTest.java b/src/test/java/lspMobsimTests/MultipleShipmentsFirstReloadLSPMobsimTest.java index d85e4bbc..58d44cb7 100644 --- a/src/test/java/lspMobsimTests/MultipleShipmentsFirstReloadLSPMobsimTest.java +++ b/src/test/java/lspMobsimTests/MultipleShipmentsFirstReloadLSPMobsimTest.java @@ -34,9 +34,8 @@ 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.freight.carriers.FreightConfigGroup; -import org.matsim.contrib.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.config.ConfigUtils; import org.matsim.core.config.groups.VspExperimentalConfigGroup; diff --git a/src/test/java/lspMobsimTests/MultipleShipmentsMainRunLSPMobsimTest.java b/src/test/java/lspMobsimTests/MultipleShipmentsMainRunLSPMobsimTest.java index c648dc6d..079c8101 100644 --- a/src/test/java/lspMobsimTests/MultipleShipmentsMainRunLSPMobsimTest.java +++ b/src/test/java/lspMobsimTests/MultipleShipmentsMainRunLSPMobsimTest.java @@ -35,9 +35,8 @@ 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.freight.carriers.FreightConfigGroup; -import org.matsim.contrib.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.config.ConfigUtils; import org.matsim.core.config.groups.VspExperimentalConfigGroup; diff --git a/src/test/java/lspMobsimTests/MultipleShipmentsSecondReloadLSPMobsimTest.java b/src/test/java/lspMobsimTests/MultipleShipmentsSecondReloadLSPMobsimTest.java index 837e90d3..5a6c0ecf 100644 --- a/src/test/java/lspMobsimTests/MultipleShipmentsSecondReloadLSPMobsimTest.java +++ b/src/test/java/lspMobsimTests/MultipleShipmentsSecondReloadLSPMobsimTest.java @@ -36,9 +36,8 @@ 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.freight.carriers.FreightConfigGroup; -import org.matsim.contrib.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager; import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils; import org.matsim.core.config.Config; diff --git a/src/test/java/lspMobsimTests/RepeatedMultipleShipmentsCompleteLSPMobsimTest.java b/src/test/java/lspMobsimTests/RepeatedMultipleShipmentsCompleteLSPMobsimTest.java index 5937b707..091960f3 100644 --- a/src/test/java/lspMobsimTests/RepeatedMultipleShipmentsCompleteLSPMobsimTest.java +++ b/src/test/java/lspMobsimTests/RepeatedMultipleShipmentsCompleteLSPMobsimTest.java @@ -36,9 +36,8 @@ 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.freight.carriers.FreightConfigGroup; -import org.matsim.contrib.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.config.ConfigUtils; import org.matsim.core.config.groups.VspExperimentalConfigGroup; diff --git a/src/test/java/lspMobsimTests/SecondReloadLSPMobsimTest.java b/src/test/java/lspMobsimTests/SecondReloadLSPMobsimTest.java index 858451f1..5bd09bb8 100644 --- a/src/test/java/lspMobsimTests/SecondReloadLSPMobsimTest.java +++ b/src/test/java/lspMobsimTests/SecondReloadLSPMobsimTest.java @@ -35,9 +35,8 @@ 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.freight.carriers.FreightConfigGroup; -import org.matsim.contrib.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.config.ConfigUtils; import org.matsim.core.config.groups.VspExperimentalConfigGroup; diff --git a/src/test/java/lspPlanTests/CollectionLSPPlanTest.java b/src/test/java/lspPlanTests/CollectionLSPPlanTest.java index 392bf1c1..9a65f825 100644 --- a/src/test/java/lspPlanTests/CollectionLSPPlanTest.java +++ b/src/test/java/lspPlanTests/CollectionLSPPlanTest.java @@ -29,8 +29,8 @@ 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.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.network.io.MatsimNetworkReader; import org.matsim.core.scenario.ScenarioUtils; diff --git a/src/test/java/lspPlanTests/CompleteLSPPlanTest.java b/src/test/java/lspPlanTests/CompleteLSPPlanTest.java index c8914567..8fd1dbaa 100644 --- a/src/test/java/lspPlanTests/CompleteLSPPlanTest.java +++ b/src/test/java/lspPlanTests/CompleteLSPPlanTest.java @@ -32,8 +32,8 @@ 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.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.network.io.MatsimNetworkReader; import org.matsim.core.scenario.ScenarioUtils; diff --git a/src/test/java/lspShipmentAssignmentTests/CollectionLSPShipmentAssigmentTest.java b/src/test/java/lspShipmentAssignmentTests/CollectionLSPShipmentAssigmentTest.java index 20fe8fb8..d8fc3f36 100644 --- a/src/test/java/lspShipmentAssignmentTests/CollectionLSPShipmentAssigmentTest.java +++ b/src/test/java/lspShipmentAssignmentTests/CollectionLSPShipmentAssigmentTest.java @@ -31,8 +31,8 @@ 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.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.gbl.MatsimRandom; import org.matsim.core.network.io.MatsimNetworkReader; diff --git a/src/test/java/lspShipmentAssignmentTests/CompleteLSPShipmentAssignerTest.java b/src/test/java/lspShipmentAssignmentTests/CompleteLSPShipmentAssignerTest.java index f976ac99..75d0ccf8 100644 --- a/src/test/java/lspShipmentAssignmentTests/CompleteLSPShipmentAssignerTest.java +++ b/src/test/java/lspShipmentAssignmentTests/CompleteLSPShipmentAssignerTest.java @@ -34,8 +34,8 @@ 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.freight.carriers.carrier.*; -import org.matsim.contrib.freight.carriers.carrier.CarrierCapabilities.FleetSize; +import org.matsim.contrib.freight.carriers.*; +import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; import org.matsim.core.config.Config; import org.matsim.core.gbl.MatsimRandom; import org.matsim.core.network.io.MatsimNetworkReader; diff --git a/src/test/java/lspShipmentTest/CollectionShipmentBuilderTest.java b/src/test/java/lspShipmentTest/CollectionShipmentBuilderTest.java index fcc33bea..3e73cd64 100644 --- a/src/test/java/lspShipmentTest/CollectionShipmentBuilderTest.java +++ b/src/test/java/lspShipmentTest/CollectionShipmentBuilderTest.java @@ -28,7 +28,7 @@ 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.freight.carriers.carrier.TimeWindow; +import org.matsim.contrib.freight.carriers.TimeWindow; import org.matsim.core.config.Config; import org.matsim.core.gbl.MatsimRandom; import org.matsim.core.network.io.MatsimNetworkReader; diff --git a/src/test/java/lspShipmentTest/CompleteShipmentBuilderTest.java b/src/test/java/lspShipmentTest/CompleteShipmentBuilderTest.java index 518238cb..dcafdc6b 100644 --- a/src/test/java/lspShipmentTest/CompleteShipmentBuilderTest.java +++ b/src/test/java/lspShipmentTest/CompleteShipmentBuilderTest.java @@ -28,7 +28,7 @@ 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.freight.carriers.carrier.TimeWindow; +import org.matsim.contrib.freight.carriers.TimeWindow; import org.matsim.core.config.Config; import org.matsim.core.gbl.MatsimRandom; import org.matsim.core.network.io.MatsimNetworkReader; diff --git a/src/test/java/lspShipmentTest/DistributionShipmentBuilderTest.java b/src/test/java/lspShipmentTest/DistributionShipmentBuilderTest.java index 555a5299..34ef3509 100644 --- a/src/test/java/lspShipmentTest/DistributionShipmentBuilderTest.java +++ b/src/test/java/lspShipmentTest/DistributionShipmentBuilderTest.java @@ -28,7 +28,7 @@ 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.freight.carriers.carrier.TimeWindow; +import org.matsim.contrib.freight.carriers.TimeWindow; import org.matsim.core.config.Config; import org.matsim.core.gbl.MatsimRandom; import org.matsim.core.network.io.MatsimNetworkReader;