diff --git a/src/main/java/example/lsp/initialPlans/ExampleSchedulingOfInitialPlan.java b/src/main/java/example/lsp/initialPlans/ExampleSchedulingOfInitialPlan.java index 6a4e14d6..5cc54def 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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 4443f532..cf73c19f 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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 4acff269..5f41890e 100644 --- a/src/main/java/example/lsp/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirect.java +++ b/src/main/java/example/lsp/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirect.java @@ -34,14 +34,14 @@ 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.*; -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; -import org.matsim.contrib.freight.carriers.events.CarrierTourEndEvent; -import org.matsim.contrib.freight.carriers.events.eventhandler.FreightServiceEndEventHandler; -import org.matsim.contrib.freight.carriers.events.eventhandler.FreightTourEndEventHandler; +import org.matsim.freight.carriers.*; +import org.matsim.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.controler.CarrierControlerUtils; +import org.matsim.freight.carriers.controler.CarrierStrategyManager; +import org.matsim.freight.carriers.events.CarrierServiceEndEvent; +import org.matsim.freight.carriers.events.CarrierTourEndEvent; +import org.matsim.freight.carriers.events.eventhandler.FreightServiceEndEventHandler; +import org.matsim.freight.carriers.events.eventhandler.FreightTourEndEventHandler; import org.matsim.core.config.CommandLine; import org.matsim.core.config.Config; import org.matsim.core.config.ConfigUtils; diff --git a/src/main/java/example/lsp/initialPlans/ExampleTwoEchelonGrid.java b/src/main/java/example/lsp/initialPlans/ExampleTwoEchelonGrid.java index 86c59f31..0c610a89 100644 --- a/src/main/java/example/lsp/initialPlans/ExampleTwoEchelonGrid.java +++ b/src/main/java/example/lsp/initialPlans/ExampleTwoEchelonGrid.java @@ -33,10 +33,10 @@ 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.*; -import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory; -import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager; -import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils; +import org.matsim.freight.carriers.*; +import org.matsim.freight.carriers.controler.CarrierScoringFunctionFactory; +import org.matsim.freight.carriers.controler.CarrierStrategyManager; +import org.matsim.freight.carriers.controler.CarrierControlerUtils; import org.matsim.core.config.CommandLine; import org.matsim.core.config.Config; import org.matsim.core.config.ConfigUtils; diff --git a/src/main/java/example/lsp/initialPlans/ExampleTwoEchelonGrid_NR.java b/src/main/java/example/lsp/initialPlans/ExampleTwoEchelonGrid_NR.java index 24e6bec9..62679cce 100644 --- a/src/main/java/example/lsp/initialPlans/ExampleTwoEchelonGrid_NR.java +++ b/src/main/java/example/lsp/initialPlans/ExampleTwoEchelonGrid_NR.java @@ -35,10 +35,10 @@ 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.*; -import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory; -import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager; -import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils; +import org.matsim.freight.carriers.*; +import org.matsim.freight.carriers.controler.CarrierScoringFunctionFactory; +import org.matsim.freight.carriers.controler.CarrierStrategyManager; +import org.matsim.freight.carriers.controler.CarrierControlerUtils; import org.matsim.core.config.CommandLine; import org.matsim.core.config.Config; import org.matsim.core.config.ConfigUtils; diff --git a/src/main/java/example/lsp/initialPlans/MyCarrierScorer.java b/src/main/java/example/lsp/initialPlans/MyCarrierScorer.java index 23eb5382..2fd87584 100644 --- a/src/main/java/example/lsp/initialPlans/MyCarrierScorer.java +++ b/src/main/java/example/lsp/initialPlans/MyCarrierScorer.java @@ -1,7 +1,7 @@ package example.lsp.initialPlans; -import org.matsim.contrib.freight.carriers.Carrier; -import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory; +import org.matsim.freight.carriers.Carrier; +import org.matsim.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 78b7d6bc..79a17626 100644 --- a/src/main/java/example/lsp/initialPlans/MyEventBasedCarrierScorer.java +++ b/src/main/java/example/lsp/initialPlans/MyEventBasedCarrierScorer.java @@ -8,11 +8,11 @@ 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; -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; +import org.matsim.freight.carriers.Carrier; +import org.matsim.freight.carriers.Tour; +import org.matsim.freight.carriers.controler.CarrierScoringFunctionFactory; +import org.matsim.freight.carriers.events.CarrierTourEndEvent; +import org.matsim.freight.carriers.events.CarrierTourStartEvent; import org.matsim.core.scoring.ScoringFunction; import org.matsim.core.scoring.SumScoringFunction; import org.matsim.vehicles.Vehicle; diff --git a/src/main/java/example/lsp/lspReplanning/ExampleLSPReplanning.java b/src/main/java/example/lsp/lspReplanning/ExampleLSPReplanning.java index aab57541..075513a9 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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 ff50c9c7..ec0c2bea 100644 --- a/src/main/java/example/lsp/lspScoring/ExampleLSPScoring.java +++ b/src/main/java/example/lsp/lspScoring/ExampleLSPScoring.java @@ -31,10 +31,10 @@ 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.*; -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.freight.carriers.*; +import org.matsim.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.events.CarrierServiceEndEvent; +import org.matsim.freight.carriers.events.eventhandler.FreightServiceEndEventHandler; 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/ExampleMobsimOfSimpleLSP.java b/src/main/java/example/lsp/mobsimExamples/ExampleMobsimOfSimpleLSP.java index 12ce78e6..ac1a10de 100644 --- a/src/main/java/example/lsp/mobsimExamples/ExampleMobsimOfSimpleLSP.java +++ b/src/main/java/example/lsp/mobsimExamples/ExampleMobsimOfSimpleLSP.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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 5a042dc4..3a51cc27 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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 cbb00670..468a3857 100644 --- a/src/main/java/example/lsp/multipleChains/EventBasedCarrierScorer_MultipleChains.java +++ b/src/main/java/example/lsp/multipleChains/EventBasedCarrierScorer_MultipleChains.java @@ -8,11 +8,11 @@ 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; -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; +import org.matsim.freight.carriers.Carrier; +import org.matsim.freight.carriers.Tour; +import org.matsim.freight.carriers.controler.CarrierScoringFunctionFactory; +import org.matsim.freight.carriers.events.CarrierTourEndEvent; +import org.matsim.freight.carriers.events.CarrierTourStartEvent; import org.matsim.core.scoring.ScoringFunction; import org.matsim.core.scoring.SumScoringFunction; import org.matsim.vehicles.Vehicle; diff --git a/src/main/java/example/lsp/multipleChains/ExampleGroceryDeliveryMultipleChains.java b/src/main/java/example/lsp/multipleChains/ExampleGroceryDeliveryMultipleChains.java index 37156bc8..53fa6275 100644 --- a/src/main/java/example/lsp/multipleChains/ExampleGroceryDeliveryMultipleChains.java +++ b/src/main/java/example/lsp/multipleChains/ExampleGroceryDeliveryMultipleChains.java @@ -11,10 +11,10 @@ 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.*; -import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory; -import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager; -import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils; +import org.matsim.freight.carriers.*; +import org.matsim.freight.carriers.controler.CarrierScoringFunctionFactory; +import org.matsim.freight.carriers.controler.CarrierStrategyManager; +import org.matsim.freight.carriers.controler.CarrierControlerUtils; import org.matsim.core.config.Config; import org.matsim.core.config.ConfigUtils; import org.matsim.core.config.groups.PlanCalcScoreConfigGroup; diff --git a/src/main/java/example/lsp/multipleChains/ExampleMultipleMixedEchelonChains.java b/src/main/java/example/lsp/multipleChains/ExampleMultipleMixedEchelonChains.java index 4d0995d2..2a209534 100644 --- a/src/main/java/example/lsp/multipleChains/ExampleMultipleMixedEchelonChains.java +++ b/src/main/java/example/lsp/multipleChains/ExampleMultipleMixedEchelonChains.java @@ -13,10 +13,10 @@ 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.*; -import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils; -import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory; -import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager; +import org.matsim.freight.carriers.*; +import org.matsim.freight.carriers.controler.CarrierControlerUtils; +import org.matsim.freight.carriers.controler.CarrierScoringFunctionFactory; +import org.matsim.freight.carriers.controler.CarrierStrategyManager; 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/multipleChains/ExampleMultipleOneEchelonChains.java b/src/main/java/example/lsp/multipleChains/ExampleMultipleOneEchelonChains.java index 1c45212e..c9d06861 100644 --- a/src/main/java/example/lsp/multipleChains/ExampleMultipleOneEchelonChains.java +++ b/src/main/java/example/lsp/multipleChains/ExampleMultipleOneEchelonChains.java @@ -11,10 +11,10 @@ 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.*; -import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory; -import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager; -import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils; +import org.matsim.freight.carriers.*; +import org.matsim.freight.carriers.controler.CarrierScoringFunctionFactory; +import org.matsim.freight.carriers.controler.CarrierStrategyManager; +import org.matsim.freight.carriers.controler.CarrierControlerUtils; 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/multipleChains/ExampleMultipleOneEchelonChainsReplanning.java b/src/main/java/example/lsp/multipleChains/ExampleMultipleOneEchelonChainsReplanning.java index e9736fa8..df3d39a9 100644 --- a/src/main/java/example/lsp/multipleChains/ExampleMultipleOneEchelonChainsReplanning.java +++ b/src/main/java/example/lsp/multipleChains/ExampleMultipleOneEchelonChainsReplanning.java @@ -11,10 +11,10 @@ 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.*; -import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils; -import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory; -import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager; +import org.matsim.freight.carriers.*; +import org.matsim.freight.carriers.controler.CarrierControlerUtils; +import org.matsim.freight.carriers.controler.CarrierScoringFunctionFactory; +import org.matsim.freight.carriers.controler.CarrierStrategyManager; import org.matsim.core.config.Config; import org.matsim.core.config.ConfigUtils; import org.matsim.core.config.groups.PlanCalcScoreConfigGroup; diff --git a/src/main/java/example/lsp/multipleChains/ExampleMultipleTwoEchelonChainsReplanning.java b/src/main/java/example/lsp/multipleChains/ExampleMultipleTwoEchelonChainsReplanning.java index 426c16c3..689ad582 100644 --- a/src/main/java/example/lsp/multipleChains/ExampleMultipleTwoEchelonChainsReplanning.java +++ b/src/main/java/example/lsp/multipleChains/ExampleMultipleTwoEchelonChainsReplanning.java @@ -13,10 +13,10 @@ 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.*; -import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory; -import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager; -import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils; +import org.matsim.freight.carriers.*; +import org.matsim.freight.carriers.controler.CarrierScoringFunctionFactory; +import org.matsim.freight.carriers.controler.CarrierStrategyManager; +import org.matsim.freight.carriers.controler.CarrierControlerUtils; import org.matsim.core.config.Config; import org.matsim.core.config.ConfigUtils; import org.matsim.core.config.groups.PlanCalcScoreConfigGroup; diff --git a/src/main/java/example/lsp/multipleChains/MultipleChainsUtils.java b/src/main/java/example/lsp/multipleChains/MultipleChainsUtils.java index 6744f14a..cde81034 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; -import org.matsim.contrib.freight.carriers.CarrierShipment; +import org.matsim.freight.carriers.Carrier; +import org.matsim.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 f337423f..96e1f061 100644 --- a/src/main/java/example/lsp/simulationTrackers/CollectionServiceHandler.java +++ b/src/main/java/example/lsp/simulationTrackers/CollectionServiceHandler.java @@ -22,11 +22,11 @@ import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.Scenario; -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; -import org.matsim.contrib.freight.carriers.events.eventhandler.FreightServiceStartEventHandler; +import org.matsim.freight.carriers.CarrierService; +import org.matsim.freight.carriers.events.CarrierServiceEndEvent; +import org.matsim.freight.carriers.events.CarrierServiceStartEvent; +import org.matsim.freight.carriers.events.eventhandler.FreightServiceEndEventHandler; +import org.matsim.freight.carriers.events.eventhandler.FreightServiceStartEventHandler; import org.matsim.vehicles.Vehicle; import org.matsim.vehicles.VehicleUtils; import org.matsim.vehicles.Vehicles; diff --git a/src/main/java/example/lsp/simulationTrackers/ExampleSimulationTrackers.java b/src/main/java/example/lsp/simulationTrackers/ExampleSimulationTrackers.java index 1f28f236..4ea5bf97 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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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/LinearCostTracker.java b/src/main/java/example/lsp/simulationTrackers/LinearCostTracker.java index d6a47b12..f91b9995 100644 --- a/src/main/java/example/lsp/simulationTrackers/LinearCostTracker.java +++ b/src/main/java/example/lsp/simulationTrackers/LinearCostTracker.java @@ -29,12 +29,12 @@ import org.matsim.api.core.v01.events.handler.LinkEnterEventHandler; import org.matsim.api.core.v01.events.handler.LinkLeaveEventHandler; import org.matsim.api.core.v01.events.handler.VehicleLeavesTrafficEventHandler; -import org.matsim.contrib.freight.carriers.events.CarrierServiceEndEvent; -import org.matsim.contrib.freight.carriers.events.CarrierServiceStartEvent; -import org.matsim.contrib.freight.carriers.events.CarrierTourStartEvent; -import org.matsim.contrib.freight.carriers.events.eventhandler.FreightServiceEndEventHandler; -import org.matsim.contrib.freight.carriers.events.eventhandler.FreightServiceStartEventHandler; -import org.matsim.contrib.freight.carriers.events.eventhandler.FreightTourStartEventHandler; +import org.matsim.freight.carriers.events.CarrierServiceEndEvent; +import org.matsim.freight.carriers.events.CarrierServiceStartEvent; +import org.matsim.freight.carriers.events.CarrierTourStartEvent; +import org.matsim.freight.carriers.events.eventhandler.FreightServiceEndEventHandler; +import org.matsim.freight.carriers.events.eventhandler.FreightServiceStartEventHandler; +import org.matsim.freight.carriers.events.eventhandler.FreightTourStartEventHandler; import org.matsim.core.controler.events.AfterMobsimEvent; import org.matsim.core.controler.listener.AfterMobsimListener; import org.matsim.core.events.handler.EventHandler; diff --git a/src/main/java/example/lsp/simulationTrackers/TourStartHandler.java b/src/main/java/example/lsp/simulationTrackers/TourStartHandler.java index d2a6ae99..e60cf015 100644 --- a/src/main/java/example/lsp/simulationTrackers/TourStartHandler.java +++ b/src/main/java/example/lsp/simulationTrackers/TourStartHandler.java @@ -23,9 +23,9 @@ 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.*; -import org.matsim.contrib.freight.carriers.events.CarrierTourStartEvent; -import org.matsim.contrib.freight.carriers.events.eventhandler.FreightTourStartEventHandler; +import org.matsim.freight.carriers.*; +import org.matsim.freight.carriers.events.CarrierTourStartEvent; +import org.matsim.freight.carriers.events.eventhandler.FreightTourStartEventHandler; import java.util.Collection; diff --git a/src/main/java/example/lspAndDemand/requirementsChecking/ExampleCheckRequirementsOfAssigner.java b/src/main/java/example/lspAndDemand/requirementsChecking/ExampleCheckRequirementsOfAssigner.java index 717b8704..27c18ff9 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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 6cc7a983..79b9a6e4 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; +import org.matsim.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 b2f0dda1..f1e0d954 100644 --- a/src/main/java/lsp/LSPControlerListener.java +++ b/src/main/java/lsp/LSPControlerListener.java @@ -27,11 +27,11 @@ 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.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.freight.carriers.Carrier; +import org.matsim.freight.carriers.CarrierPlanWriter; +import org.matsim.freight.carriers.CarrierUtils; +import org.matsim.freight.carriers.Carriers; +import org.matsim.freight.carriers.controler.CarrierAgentTracker; import org.matsim.core.api.experimental.events.EventsManager; import org.matsim.core.controler.MatsimServices; import org.matsim.core.controler.OutputDirectoryHierarchy; diff --git a/src/main/java/lsp/LSPModule.java b/src/main/java/lsp/LSPModule.java index d18e0ea1..d408614f 100644 --- a/src/main/java/lsp/LSPModule.java +++ b/src/main/java/lsp/LSPModule.java @@ -30,10 +30,9 @@ import org.matsim.api.core.v01.population.Activity; import org.matsim.api.core.v01.population.HasPlansAndId; import org.matsim.api.core.v01.population.Leg; -import org.matsim.contrib.freight.carriers.FreightCarriersConfigGroup; -import org.matsim.contrib.freight.carriers.Carrier; -import org.matsim.contrib.freight.carriers.Carriers; -import org.matsim.contrib.freight.carriers.controler.*; +import org.matsim.freight.carriers.FreightCarriersConfigGroup; +import org.matsim.freight.carriers.Carrier; +import org.matsim.freight.carriers.Carriers; import org.matsim.core.config.ConfigUtils; import org.matsim.core.controler.AbstractModule; import org.matsim.core.controler.events.BeforeMobsimEvent; @@ -44,6 +43,7 @@ import org.matsim.core.replanning.ReplanningContext; import org.matsim.core.replanning.selectors.PlanSelector; import org.matsim.core.scoring.ScoringFunction; +import org.matsim.freight.carriers.controler.*; import java.util.List; diff --git a/src/main/java/lsp/LSPScorer.java b/src/main/java/lsp/LSPScorer.java index bde14824..8b5fdf00 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; +import org.matsim.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 874754ea..a236abf8 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.CarrierUtils; -import org.matsim.contrib.freight.carriers.Carriers; +import org.matsim.freight.carriers.CarrierUtils; +import org.matsim.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 eb25f4ab..bb38bb44 100644 --- a/src/main/java/lsp/io/LSPPlanXmlParserV1.java +++ b/src/main/java/lsp/io/LSPPlanXmlParserV1.java @@ -35,10 +35,10 @@ 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.*; import org.matsim.core.gbl.Gbl; import org.matsim.core.utils.io.MatsimXmlParser; import org.matsim.core.utils.misc.Time; +import org.matsim.freight.carriers.*; import org.matsim.utils.objectattributes.attributable.AttributesXmlReaderDelegate; import org.matsim.vehicles.Vehicle; import org.matsim.vehicles.VehicleType; diff --git a/src/main/java/lsp/io/LSPPlanXmlReader.java b/src/main/java/lsp/io/LSPPlanXmlReader.java index 299b1515..cfdaf5ed 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.Carriers; +import org.matsim.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 9685757a..3f660bf2 100644 --- a/src/main/java/lsp/resourceImplementations/CarrierSchedulerUtils.java +++ b/src/main/java/lsp/resourceImplementations/CarrierSchedulerUtils.java @@ -6,11 +6,11 @@ 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; -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; +import org.matsim.freight.carriers.Carrier; +import org.matsim.freight.carriers.CarrierPlan; +import org.matsim.freight.carriers.jsprit.MatsimJspritFactory; +import org.matsim.freight.carriers.jsprit.NetworkBasedTransportCosts; +import org.matsim.freight.carriers.jsprit.NetworkRouter; import java.util.Collection; import java.util.List; diff --git a/src/main/java/lsp/resourceImplementations/ResourceImplementationUtils.java b/src/main/java/lsp/resourceImplementations/ResourceImplementationUtils.java index ad2f40c4..a178d70c 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; -import org.matsim.contrib.freight.carriers.CarrierVehicle; +import org.matsim.freight.carriers.Carrier; +import org.matsim.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 0d7ceae3..945a4421 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; -import org.matsim.contrib.freight.carriers.CarrierVehicle; +import org.matsim.freight.carriers.Carrier; +import org.matsim.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 dd126e39..9f1c5d25 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; -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 org.matsim.freight.carriers.Carrier; +import org.matsim.freight.carriers.CarrierService; +import org.matsim.freight.carriers.ScheduledTour; +import org.matsim.freight.carriers.Tour; +import org.matsim.freight.carriers.Tour.Leg; +import org.matsim.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 17ba3403..7d28f463 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; +import org.matsim.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 9a4f949b..ce3e7217 100644 --- a/src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionServiceEndEventHandler.java +++ b/src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionServiceEndEventHandler.java @@ -29,9 +29,9 @@ import lsp.shipment.ShipmentPlanElement; import lsp.shipment.ShipmentUtils; import org.matsim.api.core.v01.Id; -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.freight.carriers.CarrierService; +import org.matsim.freight.carriers.events.CarrierServiceEndEvent; +import org.matsim.freight.carriers.events.eventhandler.FreightServiceEndEventHandler; import org.matsim.core.controler.events.AfterMobsimEvent; import org.matsim.core.controler.listener.AfterMobsimListener; diff --git a/src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionTourEndEventHandler.java b/src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionTourEndEventHandler.java index 7bbb2f27..74963d2d 100644 --- a/src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionTourEndEventHandler.java +++ b/src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionTourEndEventHandler.java @@ -29,12 +29,12 @@ import lsp.shipment.ShipmentPlanElement; import lsp.shipment.ShipmentUtils; import org.matsim.api.core.v01.Id; -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.freight.carriers.CarrierService; +import org.matsim.freight.carriers.Tour; +import org.matsim.freight.carriers.Tour.ServiceActivity; +import org.matsim.freight.carriers.Tour.TourElement; +import org.matsim.freight.carriers.events.CarrierTourEndEvent; +import org.matsim.freight.carriers.events.eventhandler.FreightTourEndEventHandler; import org.matsim.core.controler.events.AfterMobsimEvent; import org.matsim.core.controler.listener.AfterMobsimListener; diff --git a/src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionCarrierResource.java b/src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionCarrierResource.java index 7f7c7072..ffc7b59a 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; -import org.matsim.contrib.freight.carriers.CarrierVehicle; +import org.matsim.freight.carriers.Carrier; +import org.matsim.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 9e0b964a..6c0dfb2a 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.*; -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.freight.carriers.*; +import org.matsim.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.Tour.Leg; +import org.matsim.freight.carriers.Tour.ServiceActivity; +import org.matsim.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 b03f2f5b..3107d137 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; +import org.matsim.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 d93c405a..b7c1dcba 100644 --- a/src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionServiceStartEventHandler.java +++ b/src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionServiceStartEventHandler.java @@ -28,9 +28,9 @@ import lsp.shipment.ShipmentPlanElement; import lsp.shipment.ShipmentUtils; import org.matsim.api.core.v01.Id; -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.freight.carriers.CarrierService; +import org.matsim.freight.carriers.events.CarrierServiceStartEvent; +import org.matsim.freight.carriers.events.eventhandler.FreightServiceStartEventHandler; import org.matsim.core.controler.events.AfterMobsimEvent; import org.matsim.core.controler.listener.AfterMobsimListener; diff --git a/src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionTourStartEventHandler.java b/src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionTourStartEventHandler.java index a6f2203f..1c2e899a 100644 --- a/src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionTourStartEventHandler.java +++ b/src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionTourStartEventHandler.java @@ -27,12 +27,12 @@ import lsp.shipment.ShipmentPlanElement; import lsp.shipment.ShipmentUtils; import org.matsim.api.core.v01.Id; -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.freight.carriers.CarrierService; +import org.matsim.freight.carriers.Tour; +import org.matsim.freight.carriers.Tour.ServiceActivity; +import org.matsim.freight.carriers.Tour.TourElement; +import org.matsim.freight.carriers.events.CarrierTourStartEvent; +import org.matsim.freight.carriers.events.eventhandler.FreightTourStartEventHandler; public class DistributionTourStartEventHandler implements FreightTourStartEventHandler, LSPSimulationTracker { // Todo: I have made it (temporarily) public because of junit tests :( -- need to find another way to do the junit testing. kmt jun'23 diff --git a/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunCarrierResource.java b/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunCarrierResource.java index deed4c47..b76f595b 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; +import org.matsim.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 556115d7..5d2c0cb3 100644 --- a/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunCarrierScheduler.java +++ b/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunCarrierScheduler.java @@ -27,11 +27,11 @@ 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.*; -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.freight.carriers.*; +import org.matsim.freight.carriers.Tour.Leg; +import org.matsim.freight.carriers.Tour.TourElement; +import org.matsim.freight.carriers.jsprit.NetworkBasedTransportCosts; +import org.matsim.freight.carriers.jsprit.NetworkRouter; import org.matsim.core.population.routes.NetworkRoute; import org.matsim.vehicles.VehicleType; diff --git a/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunCarrierUtils.java b/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunCarrierUtils.java index 65adf24a..6a5961ca 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; +import org.matsim.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 5edbad0f..67b64d66 100644 --- a/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunTourEndEventHandler.java +++ b/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunTourEndEventHandler.java @@ -28,12 +28,12 @@ import lsp.shipment.ShipmentPlanElement; import lsp.shipment.ShipmentUtils; import org.matsim.api.core.v01.Id; -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.freight.carriers.CarrierService; +import org.matsim.freight.carriers.Tour; +import org.matsim.freight.carriers.Tour.ServiceActivity; +import org.matsim.freight.carriers.Tour.TourElement; +import org.matsim.freight.carriers.events.CarrierTourEndEvent; +import org.matsim.freight.carriers.events.eventhandler.FreightTourEndEventHandler; import org.matsim.core.controler.events.AfterMobsimEvent; import org.matsim.core.controler.listener.AfterMobsimListener; diff --git a/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunTourStartEventHandler.java b/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunTourStartEventHandler.java index 3a7e2701..10b8f7c1 100644 --- a/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunTourStartEventHandler.java +++ b/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunTourStartEventHandler.java @@ -28,12 +28,12 @@ import lsp.shipment.ShipmentPlanElement; import lsp.shipment.ShipmentUtils; import org.matsim.api.core.v01.Id; -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.freight.carriers.CarrierService; +import org.matsim.freight.carriers.Tour; +import org.matsim.freight.carriers.Tour.ServiceActivity; +import org.matsim.freight.carriers.Tour.TourElement; +import org.matsim.freight.carriers.events.CarrierTourStartEvent; +import org.matsim.freight.carriers.events.eventhandler.FreightTourStartEventHandler; import org.matsim.core.controler.events.AfterMobsimEvent; import org.matsim.core.controler.listener.AfterMobsimListener; diff --git a/src/main/java/lsp/resourceImplementations/transshipmentHub/TransshipmentHubTourEndEventHandler.java b/src/main/java/lsp/resourceImplementations/transshipmentHub/TransshipmentHubTourEndEventHandler.java index f7abc8ee..9539715b 100644 --- a/src/main/java/lsp/resourceImplementations/transshipmentHub/TransshipmentHubTourEndEventHandler.java +++ b/src/main/java/lsp/resourceImplementations/transshipmentHub/TransshipmentHubTourEndEventHandler.java @@ -27,11 +27,11 @@ 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.*; -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.freight.carriers.*; +import org.matsim.freight.carriers.Tour.ServiceActivity; +import org.matsim.freight.carriers.Tour.TourElement; +import org.matsim.freight.carriers.events.CarrierTourEndEvent; +import org.matsim.freight.carriers.events.eventhandler.FreightTourEndEventHandler; import org.matsim.core.controler.events.AfterMobsimEvent; import org.matsim.core.controler.listener.AfterMobsimListener; diff --git a/src/main/java/lsp/shipment/LSPShipment.java b/src/main/java/lsp/shipment/LSPShipment.java index 6068d85d..c0ce5fc4 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.TimeWindow; +import org.matsim.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 f707afc0..852fe254 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.TimeWindow; +import org.matsim.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 451678c3..21ea4652 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; -import org.matsim.contrib.freight.carriers.CarrierService; +import org.matsim.freight.carriers.Carrier; +import org.matsim.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 536863f8..2d1acff5 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; -import org.matsim.contrib.freight.carriers.CarrierService; +import org.matsim.freight.carriers.Carrier; +import org.matsim.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 d2528676..95632b74 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; -import org.matsim.contrib.freight.carriers.CarrierService; +import org.matsim.freight.carriers.Carrier; +import org.matsim.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 370e9d7b..e26c4b3d 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; -import org.matsim.contrib.freight.carriers.CarrierService; +import org.matsim.freight.carriers.Carrier; +import org.matsim.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 bb4e17c0..e7a7da44 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; -import org.matsim.contrib.freight.carriers.CarrierService; +import org.matsim.freight.carriers.Carrier; +import org.matsim.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 2aca57ab..cf2ab8df 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; -import org.matsim.contrib.freight.carriers.CarrierService; -import org.matsim.contrib.freight.carriers.TimeWindow; +import org.matsim.freight.carriers.Carrier; +import org.matsim.freight.carriers.CarrierService; +import org.matsim.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 d6f7a546..4103223c 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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 da3c1464..caaf727f 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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 e0b51d5f..70f140df 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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 39d2c2ea..b41bd393 100644 --- a/src/test/java/example/lsp/lspReplanning/CollectionLSPReplanningTest.java +++ b/src/test/java/example/lsp/lspReplanning/CollectionLSPReplanningTest.java @@ -32,10 +32,10 @@ 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.*; -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.freight.carriers.*; +import org.matsim.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.controler.CarrierControlerUtils; +import org.matsim.freight.carriers.controler.CarrierStrategyManager; 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/CollectionLSPScoringTest.java b/src/test/java/example/lsp/lspScoring/CollectionLSPScoringTest.java index cd06842a..b57eb06c 100644 --- a/src/test/java/example/lsp/lspScoring/CollectionLSPScoringTest.java +++ b/src/test/java/example/lsp/lspScoring/CollectionLSPScoringTest.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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 0c7c7184..aa2c4666 100644 --- a/src/test/java/example/lsp/lspScoring/MultipleIterationsCollectionLSPScoringTest.java +++ b/src/test/java/example/lsp/lspScoring/MultipleIterationsCollectionLSPScoringTest.java @@ -32,10 +32,10 @@ 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.*; -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.freight.carriers.*; +import org.matsim.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.controler.CarrierStrategyManager; +import org.matsim.freight.carriers.controler.CarrierControlerUtils; 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/multipleChains/MultipleChainsReplanningTest.java b/src/test/java/example/lsp/multipleChains/MultipleChainsReplanningTest.java index c9477773..6583b41d 100644 --- a/src/test/java/example/lsp/multipleChains/MultipleChainsReplanningTest.java +++ b/src/test/java/example/lsp/multipleChains/MultipleChainsReplanningTest.java @@ -13,10 +13,10 @@ 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.*; -import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory; -import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager; -import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils; +import org.matsim.freight.carriers.*; +import org.matsim.freight.carriers.controler.CarrierScoringFunctionFactory; +import org.matsim.freight.carriers.controler.CarrierStrategyManager; +import org.matsim.freight.carriers.controler.CarrierControlerUtils; 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/multipleChains/WorstPlanSelectorTest.java b/src/test/java/example/lsp/multipleChains/WorstPlanSelectorTest.java index 15c9bbea..f7de291c 100644 --- a/src/test/java/example/lsp/multipleChains/WorstPlanSelectorTest.java +++ b/src/test/java/example/lsp/multipleChains/WorstPlanSelectorTest.java @@ -12,10 +12,10 @@ 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.*; -import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory; -import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager; -import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils; +import org.matsim.freight.carriers.*; +import org.matsim.freight.carriers.controler.CarrierScoringFunctionFactory; +import org.matsim.freight.carriers.controler.CarrierStrategyManager; +import org.matsim.freight.carriers.controler.CarrierControlerUtils; import org.matsim.core.config.Config; import org.matsim.core.config.ConfigUtils; import org.matsim.core.config.groups.PlanCalcScoreConfigGroup; diff --git a/src/test/java/example/lsp/simulationTrackers/CollectionTrackerTest.java b/src/test/java/example/lsp/simulationTrackers/CollectionTrackerTest.java index 2ead1223..90814dff 100644 --- a/src/test/java/example/lsp/simulationTrackers/CollectionTrackerTest.java +++ b/src/test/java/example/lsp/simulationTrackers/CollectionTrackerTest.java @@ -34,11 +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.*; -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.freight.carriers.*; +import org.matsim.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.Tour.Leg; +import org.matsim.freight.carriers.Tour.ServiceActivity; +import org.matsim.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 c5a186c5..c5f26b68 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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 457f6522..3c81bbf6 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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 5956baa8..f76415c0 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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 76345543..50dc2646 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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 b72df4c5..37bfdd84 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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 cfed40ce..68f98f50 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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 4ed1b914..0ffbd41c 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.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.freight.carriers.CarrierPlanXmlReader; +import org.matsim.freight.carriers.CarrierVehicleTypeReader; +import org.matsim.freight.carriers.CarrierVehicleTypes; +import org.matsim.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 067f4537..a3f36def 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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 f24a2cfb..edbab451 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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 1886219c..20488ac1 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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 21dff944..02a42d7e 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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 29175b26..1b3317c4 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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 8b6dcab0..11338435 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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 d46f65b9..8b07417c 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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 73a62cc3..5f8913d7 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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 eee1fe98..af77a32c 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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 e1e799c4..6870fa8b 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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 1db0b98f..a3a4ac5a 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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 1fea8ef7..c9c21a75 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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 d36739b2..366928f9 100644 --- a/src/test/java/lspMobsimTests/CollectionLSPMobsimTest.java +++ b/src/test/java/lspMobsimTests/CollectionLSPMobsimTest.java @@ -34,8 +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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 0bdd3454..a2ba6e01 100644 --- a/src/test/java/lspMobsimTests/CompleteLSPMobsimTest.java +++ b/src/test/java/lspMobsimTests/CompleteLSPMobsimTest.java @@ -36,8 +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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 ba79ba84..a155358c 100644 --- a/src/test/java/lspMobsimTests/FirstReloadLSPMobsimTest.java +++ b/src/test/java/lspMobsimTests/FirstReloadLSPMobsimTest.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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 cad95a93..5a11931a 100644 --- a/src/test/java/lspMobsimTests/MainRunLSPMobsimTest.java +++ b/src/test/java/lspMobsimTests/MainRunLSPMobsimTest.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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 1d7a2e3e..36f82904 100644 --- a/src/test/java/lspMobsimTests/MainRunOnlyLSPMobsimTest.java +++ b/src/test/java/lspMobsimTests/MainRunOnlyLSPMobsimTest.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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 3de1e75f..88148b25 100644 --- a/src/test/java/lspMobsimTests/MultipleIterationsCollectionLSPMobsimTest.java +++ b/src/test/java/lspMobsimTests/MultipleIterationsCollectionLSPMobsimTest.java @@ -33,10 +33,10 @@ 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.*; -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.freight.carriers.*; +import org.matsim.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.controler.CarrierStrategyManager; +import org.matsim.freight.carriers.controler.CarrierControlerUtils; 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/MultipleIterationsCompleteLSPMobsimTest.java b/src/test/java/lspMobsimTests/MultipleIterationsCompleteLSPMobsimTest.java index 015754d9..b3f23a4e 100644 --- a/src/test/java/lspMobsimTests/MultipleIterationsCompleteLSPMobsimTest.java +++ b/src/test/java/lspMobsimTests/MultipleIterationsCompleteLSPMobsimTest.java @@ -37,10 +37,10 @@ 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.*; -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.freight.carriers.*; +import org.matsim.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.controler.CarrierControlerUtils; +import org.matsim.freight.carriers.controler.CarrierStrategyManager; 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/MultipleIterationsFirstReloadLSPMobsimTest.java b/src/test/java/lspMobsimTests/MultipleIterationsFirstReloadLSPMobsimTest.java index 3b7664dc..b4558e73 100644 --- a/src/test/java/lspMobsimTests/MultipleIterationsFirstReloadLSPMobsimTest.java +++ b/src/test/java/lspMobsimTests/MultipleIterationsFirstReloadLSPMobsimTest.java @@ -35,10 +35,10 @@ 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.*; -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.freight.carriers.*; +import org.matsim.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.controler.CarrierStrategyManager; +import org.matsim.freight.carriers.controler.CarrierControlerUtils; 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/MultipleIterationsMainRunLSPMobsimTest.java b/src/test/java/lspMobsimTests/MultipleIterationsMainRunLSPMobsimTest.java index 55193332..d29412d3 100644 --- a/src/test/java/lspMobsimTests/MultipleIterationsMainRunLSPMobsimTest.java +++ b/src/test/java/lspMobsimTests/MultipleIterationsMainRunLSPMobsimTest.java @@ -36,10 +36,10 @@ 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.*; -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.freight.carriers.*; +import org.matsim.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.controler.CarrierStrategyManager; +import org.matsim.freight.carriers.controler.CarrierControlerUtils; 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/MultipleIterationsSecondReloadLSPMobsimTest.java b/src/test/java/lspMobsimTests/MultipleIterationsSecondReloadLSPMobsimTest.java index 7188afe0..f4bb5bf4 100644 --- a/src/test/java/lspMobsimTests/MultipleIterationsSecondReloadLSPMobsimTest.java +++ b/src/test/java/lspMobsimTests/MultipleIterationsSecondReloadLSPMobsimTest.java @@ -36,10 +36,10 @@ 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.*; -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.freight.carriers.*; +import org.matsim.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.controler.CarrierControlerUtils; +import org.matsim.freight.carriers.controler.CarrierStrategyManager; 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/MultipleShipmentsCollectionLSPMobsimTest.java b/src/test/java/lspMobsimTests/MultipleShipmentsCollectionLSPMobsimTest.java index 7904760b..11317bfb 100644 --- a/src/test/java/lspMobsimTests/MultipleShipmentsCollectionLSPMobsimTest.java +++ b/src/test/java/lspMobsimTests/MultipleShipmentsCollectionLSPMobsimTest.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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 87921022..7a976910 100644 --- a/src/test/java/lspMobsimTests/MultipleShipmentsCompleteLSPMobsimTest.java +++ b/src/test/java/lspMobsimTests/MultipleShipmentsCompleteLSPMobsimTest.java @@ -39,10 +39,10 @@ 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.*; -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.freight.carriers.*; +import org.matsim.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.controler.CarrierControlerUtils; +import org.matsim.freight.carriers.controler.CarrierStrategyManager; 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/MultipleShipmentsFirstReloadLSPMobsimTest.java b/src/test/java/lspMobsimTests/MultipleShipmentsFirstReloadLSPMobsimTest.java index 55c82cac..c99b2891 100644 --- a/src/test/java/lspMobsimTests/MultipleShipmentsFirstReloadLSPMobsimTest.java +++ b/src/test/java/lspMobsimTests/MultipleShipmentsFirstReloadLSPMobsimTest.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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 f6d55f09..dc879d1a 100644 --- a/src/test/java/lspMobsimTests/MultipleShipmentsMainRunLSPMobsimTest.java +++ b/src/test/java/lspMobsimTests/MultipleShipmentsMainRunLSPMobsimTest.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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 97706eb4..7b31435e 100644 --- a/src/test/java/lspMobsimTests/MultipleShipmentsSecondReloadLSPMobsimTest.java +++ b/src/test/java/lspMobsimTests/MultipleShipmentsSecondReloadLSPMobsimTest.java @@ -36,10 +36,10 @@ 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.*; -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.freight.carriers.*; +import org.matsim.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.controler.CarrierStrategyManager; +import org.matsim.freight.carriers.controler.CarrierControlerUtils; 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/RepeatedMultipleShipmentsCompleteLSPMobsimTest.java b/src/test/java/lspMobsimTests/RepeatedMultipleShipmentsCompleteLSPMobsimTest.java index a5cff45b..06f8a5f8 100644 --- a/src/test/java/lspMobsimTests/RepeatedMultipleShipmentsCompleteLSPMobsimTest.java +++ b/src/test/java/lspMobsimTests/RepeatedMultipleShipmentsCompleteLSPMobsimTest.java @@ -36,8 +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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 99aff54a..7f149c99 100644 --- a/src/test/java/lspMobsimTests/SecondReloadLSPMobsimTest.java +++ b/src/test/java/lspMobsimTests/SecondReloadLSPMobsimTest.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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 9a65f825..a5e89858 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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 8fd1dbaa..6d3b2216 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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 d8fc3f36..023daabf 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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 75d0ccf8..bd1837a4 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.*; -import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize; +import org.matsim.freight.carriers.*; +import org.matsim.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 3e73cd64..3334a5af 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.TimeWindow; +import org.matsim.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 dcafdc6b..cde4bab8 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.TimeWindow; +import org.matsim.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 34ef3509..0989eb6c 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.TimeWindow; +import org.matsim.freight.carriers.TimeWindow; import org.matsim.core.config.Config; import org.matsim.core.gbl.MatsimRandom; import org.matsim.core.network.io.MatsimNetworkReader;