From 95c4adcb5c97959f1f74d0ad8394166477a92a68 Mon Sep 17 00:00:00 2001 From: Kai Martins-Turner Date: Fri, 13 Oct 2023 13:12:16 +0200 Subject: [PATCH] reorganize package structure in preparation for own contrib in matsim-libs. Everything should be under org.matsim.freight.logistics.* --- .../ForwardLogisticChainSchedulerImpl.java | 4 +- .../freight/logistics}/HasBackpointer.java | 2 +- .../logistics}/HasSimulationTrackers.java | 2 +- .../matsim/freight/logistics}/KnowsLSP.java | 2 +- .../matsim/freight/logistics}/LSP.java | 4 +- .../logistics}/LSPCarrierResource.java | 2 +- .../freight/logistics}/LSPConstants.java | 2 +- .../logistics}/LSPControlerListener.java | 6 +- .../freight/logistics}/LSPDataObject.java | 2 +- .../matsim/freight/logistics}/LSPImpl.java | 4 +- .../matsim/freight/logistics}/LSPModule.java | 2 +- .../matsim/freight/logistics}/LSPPlan.java | 110 ++++---- .../freight/logistics}/LSPPlanImpl.java | 258 ++++++++--------- .../freight/logistics}/LSPRescheduler.java | 2 +- .../freight/logistics}/LSPResource.java | 2 +- .../logistics}/LSPResourceScheduler.java | 6 +- .../matsim/freight/logistics}/LSPScorer.java | 2 +- .../freight/logistics}/LSPScorerFactory.java | 2 +- .../logistics}/LSPSimulationTracker.java | 2 +- .../logistics}/LSPStrategyManager.java | 2 +- .../logistics}/LSPStrategyManagerImpl.java | 2 +- .../matsim/freight/logistics}/LSPUtils.java | 6 +- .../matsim/freight/logistics}/LSPs.java | 96 +++---- .../freight/logistics}/LogisticChain.java | 4 +- .../logistics}/LogisticChainElement.java | 2 +- .../logistics}/LogisticChainElementImpl.java | 2 +- .../freight/logistics}/LogisticChainImpl.java | 4 +- .../logistics}/LogisticChainScheduler.java | 4 +- .../logistics}/LspShipmentWithTime.java | 4 +- .../freight/logistics}/ShipmentAssigner.java | 82 +++--- .../freight/logistics}/WaitingShipments.java | 106 +++---- .../logistics}/WaitingShipmentsImpl.java | 152 +++++----- .../ExampleSchedulingOfInitialPlan.java | 16 +- .../ExampleSchedulingOfTransportChain.java | 22 +- ...chedulingOfTransportChainHubsVsDirect.java | 20 +- .../lsp/initialPlans/ExampleTestOutput.java | 2 +- .../initialPlans/ExampleTwoEchelonGrid.java | 20 +- .../ExampleTwoEchelonGrid_NR.java | 22 +- .../lsp/initialPlans/MyCarrierScorer.java | 2 +- .../MyEventBasedCarrierScorer.java | 2 +- .../example/lsp/initialPlans/MyLSPScorer.java | 6 +- .../AssignmentStrategyFactory.java | 14 +- .../lspReplanning/ExampleLSPReplanning.java | 12 +- .../lsp/lspReplanning/MaybeTodayAssigner.java | 10 +- ...morrowShipmentAssignerStrategyFactory.java | 8 +- .../lsp/lspScoring/ExampleLSPScoring.java | 12 +- .../ExampleMobsimOfSimpleLSP.java | 16 +- .../ExampleMobsimOfTransportChain.java | 22 +- ...ventBasedCarrierScorer_MultipleChains.java | 2 +- .../ExampleGroceryDeliveryMultipleChains.java | 18 +- .../ExampleMultipleMixedEchelonChains.java | 18 +- .../ExampleMultipleOneEchelonChains.java | 12 +- ...pleMultipleOneEchelonChainsReplanning.java | 12 +- ...pleMultipleTwoEchelonChainsReplanning.java | 18 +- .../multipleChains/MultipleChainsUtils.java | 6 +- .../lsp/multipleChains/MyLSPScorer.java | 6 +- .../PrimaryLogisticChainShipmentAssigner.java | 12 +- .../ProximityStrategyFactory.java | 6 +- ...stributionAllShipmentsStrategyFactory.java | 10 +- .../RandomLogisticChainShipmentAssigner.java | 12 +- .../RandomShiftingStrategyFactory.java | 10 +- .../RebalancingShipmentsStrategyFactory.java | 10 +- ...stributionAllShipmentsStrategyFactory.java | 10 +- ...undRobinLogisticChainShipmentAssigner.java | 12 +- .../WorstPlanForRemovalSelector.java | 6 +- .../CollectionServiceHandler.java | 2 +- .../DistanceAndTimeHandler.java | 2 +- .../ExampleSimulationTrackers.java | 20 +- .../simulationTrackers/LinearCostTracker.java | 8 +- .../simulationTrackers/TourStartHandler.java | 2 +- .../requirementsChecking/BlueRequirement.java | 8 +- .../ExampleCheckRequirementsOfAssigner.java | 12 +- .../requirementsChecking/RedRequirement.java | 10 +- .../RequirementsAssigner.java | 14 +- .../logistics}/io/LSPPlanXmlParserV1.java | 29 +- .../logistics}/io/LSPPlanXmlReader.java | 6 +- .../logistics}/io/LSPPlanXmlWriter.java | 19 +- .../CarrierSchedulerUtils.java | 2 +- .../ResourceImplementationUtils.java | 16 +- .../SimpleForwardLogisticChainScheduler.java | 8 +- .../SingleLogisticChainShipmentAssigner.java | 14 +- .../CollectionCarrierResource.java | 4 +- .../CollectionCarrierScheduler.java | 12 +- .../CollectionCarrierUtils.java | 8 +- .../CollectionServiceEndEventHandler.java | 20 +- .../CollectionTourEndEventHandler.java | 20 +- .../DistributionCarrierResource.java | 4 +- .../DistributionCarrierScheduler.java | 12 +- .../DistributionCarrierUtils.java | 8 +- .../DistributionServiceStartEventHandler.java | 18 +- .../DistributionTourStartEventHandler.java | 16 +- .../MainRunCarrierResource.java | 6 +- .../MainRunCarrierScheduler.java | 12 +- .../mainRunCarrier/MainRunCarrierUtils.java | 8 +- .../MainRunTourEndEventHandler.java | 18 +- .../MainRunTourStartEventHandler.java | 18 +- .../TranshipmentHubUtils.java | 8 +- .../TransshipmentHubResource.java | 12 +- .../TransshipmentHubScheduler.java | 18 +- .../TransshipmentHubTourEndEventHandler.java | 10 +- .../logistics}/shipment/LSPShipment.java | 4 +- .../logistics}/shipment/LSPShipmentImpl.java | 4 +- .../shipment/LoggedShipmentHandle.java | 6 +- .../shipment/LoggedShipmentLoad.java | 6 +- .../shipment/LoggedShipmentTransport.java | 6 +- .../shipment/LoggedShipmentUnload.java | 6 +- .../logistics}/shipment/Requirement.java | 58 ++-- .../shipment/ScheduledShipmentHandle.java | 6 +- .../shipment/ScheduledShipmentLoad.java | 6 +- .../shipment/ScheduledShipmentTransport.java | 6 +- .../shipment/ScheduledShipmentUnload.java | 6 +- .../logistics}/shipment/ShipmentLeg.java | 2 +- .../logistics}/shipment/ShipmentPlan.java | 4 +- .../shipment/ShipmentPlanElement.java | 6 +- .../ShipmentPlanElementComparator.java | 2 +- .../logistics}/shipment/ShipmentPlanImpl.java | 2 +- .../logistics}/shipment/ShipmentUtils.java | 8 +- .../adapterTests/CollectionResourceTest.java | 6 +- .../DistributionResourceTest.java | 6 +- .../adapterTests/MainRunResourceTest.java | 6 +- ...ulingOfTransportChainHubsVsDirectTest.java | 4 +- .../ExampleTwoEchelonGridTest.java | 2 +- .../CollectionLSPReplanningTest.java | 16 +- .../lspScoring/CollectionLSPScoringTest.java | 15 +- .../lsp/lspScoring/ExampleLSPScoringTest.java | 7 +- ...pleIterationsCollectionLSPScoringTest.java | 15 +- .../ExampleMobsimOfSimpleLSPTest.java | 2 +- .../MultipleChainsReplanningTest.java | 20 +- .../multipleChains/WorstPlanSelectorTest.java | 14 +- .../CollectionTrackerTest.java | 12 +- .../AssignerRequirementsTest.java | 17 +- .../logistics}/io/LSPReadWriteTest.java | 4 +- .../CollectionElementTest.java | 10 +- .../DistributionElementTest.java | 12 +- .../MainRunElementTest.java | 10 +- .../SecondHubElementTest.java | 10 +- .../CollectionChainTest.java | 12 +- .../CompleteLogisticChainTest.java | 20 +- .../CollectionLSPCreationTest.java | 8 +- .../CompleteLSPCreationTest.java | 16 +- .../CollectionLSPMobsimTest.java | 16 +- .../lspMobsimTests/CompleteLSPMobsimTest.java | 22 +- .../FirstReloadLSPMobsimTest.java | 18 +- .../lspMobsimTests/MainRunLSPMobsimTest.java | 20 +- .../MainRunOnlyLSPMobsimTest.java | 16 +- ...ipleIterationsCollectionLSPMobsimTest.java | 16 +- ...ltipleIterationsCompleteLSPMobsimTest.java | 24 +- ...pleIterationsFirstReloadLSPMobsimTest.java | 20 +- ...ultipleIterationsMainRunLSPMobsimTest.java | 22 +- ...leIterationsSecondReloadLSPMobsimTest.java | 22 +- ...tipleShipmentsCollectionLSPMobsimTest.java | 16 +- ...ultipleShipmentsCompleteLSPMobsimTest.java | 24 +- ...ipleShipmentsFirstReloadLSPMobsimTest.java | 18 +- ...MultipleShipmentsMainRunLSPMobsimTest.java | 20 +- ...pleShipmentsSecondReloadLSPMobsimTest.java | 22 +- ...ultipleShipmentsCompleteLSPMobsimTest.java | 22 +- .../SecondReloadLSPMobsimTest.java | 20 +- .../lspPlanTests/CollectionLSPPlanTest.java | 8 +- .../lspPlanTests/CompleteLSPPlanTest.java | 16 +- .../CollectionLSPShipmentAssigmentTest.java | 12 +- .../CompleteLSPShipmentAssignerTest.java | 20 +- .../CollectionShipmentBuilderTest.java | 236 ++++++++-------- .../CompleteShipmentBuilderTest.java | 266 +++++++++--------- .../DistributionShipmentBuilderTest.java | 238 ++++++++-------- .../CollectionLSPSchedulingTest.java | 18 +- .../CompleteLSPSchedulingTest.java | 34 +-- .../FirstHubElementTest.java | 12 +- .../FirstReloadLSPSchedulingTest.java | 22 +- .../FirstReloadResourceTest.java | 10 +- .../MainRunLSPSchedulingTest.java | 28 +- ...eShipmentsCollectionLSPSchedulingTest.java | 18 +- ...pleShipmentsCompleteLSPSchedulingTest.java | 34 +-- ...ShipmentsFirstReloadLSPSchedulingTest.java | 22 +- ...ipleShipmentsMainRunLSPSchedulingTest.java | 28 +- ...hipmentsSecondReloadLSPSchedulingTest.java | 28 +- .../SecondReloadLSPSchedulingTest.java | 28 +- .../SecondReloadResourceTest.java | 10 +- .../testMain1/output_events.xml.gz | Bin .../testMain2_direct/output_events.xml.gz | Bin .../output_events.xml.gz | Bin .../output_events.xml.gz | Bin .../output_events.xml.gz | Bin .../output_events.xml.gz | Bin .../output_events.xml.gz | Bin .../matsim/freight/logistics}/io/carriers.xml | 12 +- .../matsim/freight/logistics}/io/lsps.xml | 0 .../matsim/freight/logistics}/io/vehicles.xml | 0 .../output_events.xml.gz | Bin .../output_events.xml.gz | Bin .../output_events.xml.gz | Bin .../MainRunLSPMobsimTest/output_events.xml.gz | Bin .../output_events.xml.gz | Bin .../output_events.xml.gz | Bin .../output_events.xml.gz | Bin .../output_events.xml.gz | Bin .../output_events.xml.gz | Bin .../output_events.xml.gz | Bin .../output_events.xml.gz | Bin .../output_events.xml.gz | Bin .../output_events.xml.gz | Bin .../output_events.xml.gz | Bin .../output_events.xml.gz | Bin .../output_events.xml.gz | Bin .../output_events.xml.gz | Bin 204 files changed, 1750 insertions(+), 1742 deletions(-) rename src/main/java/{lsp => org/matsim/freight/logistics}/ForwardLogisticChainSchedulerImpl.java (98%) rename src/main/java/{lsp => org/matsim/freight/logistics}/HasBackpointer.java (88%) rename src/main/java/{lsp => org/matsim/freight/logistics}/HasSimulationTrackers.java (92%) rename src/main/java/{lsp => org/matsim/freight/logistics}/KnowsLSP.java (62%) rename src/main/java/{lsp => org/matsim/freight/logistics}/LSP.java (96%) rename src/main/java/{lsp => org/matsim/freight/logistics}/LSPCarrierResource.java (97%) rename src/main/java/{lsp => org/matsim/freight/logistics}/LSPConstants.java (98%) rename src/main/java/{lsp => org/matsim/freight/logistics}/LSPControlerListener.java (97%) rename src/main/java/{lsp => org/matsim/freight/logistics}/LSPDataObject.java (97%) rename src/main/java/{lsp => org/matsim/freight/logistics}/LSPImpl.java (98%) rename src/main/java/{lsp => org/matsim/freight/logistics}/LSPModule.java (99%) rename src/main/java/{lsp => org/matsim/freight/logistics}/LSPPlan.java (93%) rename src/main/java/{lsp => org/matsim/freight/logistics}/LSPPlanImpl.java (95%) rename src/main/java/{lsp => org/matsim/freight/logistics}/LSPRescheduler.java (99%) rename src/main/java/{lsp => org/matsim/freight/logistics}/LSPResource.java (97%) rename src/main/java/{lsp => org/matsim/freight/logistics}/LSPResourceScheduler.java (96%) rename src/main/java/{lsp => org/matsim/freight/logistics}/LSPScorer.java (98%) rename src/main/java/{lsp => org/matsim/freight/logistics}/LSPScorerFactory.java (79%) rename src/main/java/{lsp => org/matsim/freight/logistics}/LSPSimulationTracker.java (97%) rename src/main/java/{lsp => org/matsim/freight/logistics}/LSPStrategyManager.java (98%) rename src/main/java/{lsp => org/matsim/freight/logistics}/LSPStrategyManagerImpl.java (98%) rename src/main/java/{lsp => org/matsim/freight/logistics}/LSPUtils.java (98%) rename src/main/java/{lsp => org/matsim/freight/logistics}/LSPs.java (96%) rename src/main/java/{lsp => org/matsim/freight/logistics}/LogisticChain.java (95%) rename src/main/java/{lsp => org/matsim/freight/logistics}/LogisticChainElement.java (98%) rename src/main/java/{lsp => org/matsim/freight/logistics}/LogisticChainElementImpl.java (98%) rename src/main/java/{lsp => org/matsim/freight/logistics}/LogisticChainImpl.java (97%) rename src/main/java/{lsp => org/matsim/freight/logistics}/LogisticChainScheduler.java (91%) rename src/main/java/{lsp => org/matsim/freight/logistics}/LspShipmentWithTime.java (95%) rename src/main/java/{lsp => org/matsim/freight/logistics}/ShipmentAssigner.java (95%) rename src/main/java/{lsp => org/matsim/freight/logistics}/WaitingShipments.java (96%) rename src/main/java/{lsp => org/matsim/freight/logistics}/WaitingShipmentsImpl.java (95%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lsp/initialPlans/ExampleSchedulingOfInitialPlan.java (94%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lsp/initialPlans/ExampleSchedulingOfTransportChain.java (95%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lsp/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirect.java (97%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lsp/initialPlans/ExampleTestOutput.java (94%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lsp/initialPlans/ExampleTwoEchelonGrid.java (96%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lsp/initialPlans/ExampleTwoEchelonGrid_NR.java (96%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lsp/initialPlans/MyCarrierScorer.java (94%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lsp/initialPlans/MyEventBasedCarrierScorer.java (99%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lsp/initialPlans/MyLSPScorer.java (92%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lsp/lspReplanning/AssignmentStrategyFactory.java (85%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lsp/lspReplanning/ExampleLSPReplanning.java (96%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lsp/lspReplanning/MaybeTodayAssigner.java (88%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lsp/lspReplanning/TomorrowShipmentAssignerStrategyFactory.java (93%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lsp/lspScoring/ExampleLSPScoring.java (95%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lsp/mobsimExamples/ExampleMobsimOfSimpleLSP.java (95%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lsp/mobsimExamples/ExampleMobsimOfTransportChain.java (96%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lsp/multipleChains/EventBasedCarrierScorer_MultipleChains.java (99%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lsp/multipleChains/ExampleGroceryDeliveryMultipleChains.java (94%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lsp/multipleChains/ExampleMultipleMixedEchelonChains.java (95%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lsp/multipleChains/ExampleMultipleOneEchelonChains.java (96%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lsp/multipleChains/ExampleMultipleOneEchelonChainsReplanning.java (96%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lsp/multipleChains/ExampleMultipleTwoEchelonChainsReplanning.java (96%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lsp/multipleChains/MultipleChainsUtils.java (93%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lsp/multipleChains/MyLSPScorer.java (92%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lsp/multipleChains/PrimaryLogisticChainShipmentAssigner.java (74%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lsp/multipleChains/ProximityStrategyFactory.java (96%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lsp/multipleChains/RandomDistributionAllShipmentsStrategyFactory.java (86%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lsp/multipleChains/RandomLogisticChainShipmentAssigner.java (78%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lsp/multipleChains/RandomShiftingStrategyFactory.java (90%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lsp/multipleChains/RebalancingShipmentsStrategyFactory.java (91%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lsp/multipleChains/RoundRobinDistributionAllShipmentsStrategyFactory.java (92%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lsp/multipleChains/RoundRobinLogisticChainShipmentAssigner.java (84%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lsp/multipleChains/WorstPlanForRemovalSelector.java (91%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lsp/simulationTrackers/CollectionServiceHandler.java (98%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lsp/simulationTrackers/DistanceAndTimeHandler.java (98%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lsp/simulationTrackers/ExampleSimulationTrackers.java (93%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lsp/simulationTrackers/LinearCostTracker.java (97%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lsp/simulationTrackers/TourStartHandler.java (98%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lspAndDemand/requirementsChecking/BlueRequirement.java (82%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lspAndDemand/requirementsChecking/ExampleCheckRequirementsOfAssigner.java (95%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lspAndDemand/requirementsChecking/RedRequirement.java (83%) rename src/main/java/{ => org/matsim/freight/logistics}/example/lspAndDemand/requirementsChecking/RequirementsAssigner.java (85%) rename src/main/java/{lsp => org/matsim/freight/logistics}/io/LSPPlanXmlParserV1.java (94%) rename src/main/java/{lsp => org/matsim/freight/logistics}/io/LSPPlanXmlReader.java (97%) rename src/main/java/{lsp => org/matsim/freight/logistics}/io/LSPPlanXmlWriter.java (94%) rename src/main/java/{lsp => org/matsim/freight/logistics}/resourceImplementations/CarrierSchedulerUtils.java (97%) rename src/main/java/{lsp => org/matsim/freight/logistics}/resourceImplementations/ResourceImplementationUtils.java (95%) rename src/main/java/{lsp => org/matsim/freight/logistics}/resourceImplementations/SimpleForwardLogisticChainScheduler.java (93%) rename src/main/java/{lsp => org/matsim/freight/logistics}/resourceImplementations/SingleLogisticChainShipmentAssigner.java (84%) rename src/main/java/{lsp => org/matsim/freight/logistics}/resourceImplementations/collectionCarrier/CollectionCarrierResource.java (96%) rename src/main/java/{lsp => org/matsim/freight/logistics}/resourceImplementations/collectionCarrier/CollectionCarrierScheduler.java (96%) rename src/main/java/{lsp => org/matsim/freight/logistics}/resourceImplementations/collectionCarrier/CollectionCarrierUtils.java (87%) rename src/main/java/{lsp => org/matsim/freight/logistics}/resourceImplementations/collectionCarrier/CollectionServiceEndEventHandler.java (89%) rename src/main/java/{lsp => org/matsim/freight/logistics}/resourceImplementations/collectionCarrier/CollectionTourEndEventHandler.java (90%) rename src/main/java/{lsp => org/matsim/freight/logistics}/resourceImplementations/distributionCarrier/DistributionCarrierResource.java (96%) rename src/main/java/{lsp => org/matsim/freight/logistics}/resourceImplementations/distributionCarrier/DistributionCarrierScheduler.java (97%) rename src/main/java/{lsp => org/matsim/freight/logistics}/resourceImplementations/distributionCarrier/DistributionCarrierUtils.java (87%) rename src/main/java/{lsp => org/matsim/freight/logistics}/resourceImplementations/distributionCarrier/DistributionServiceStartEventHandler.java (90%) rename src/main/java/{lsp => org/matsim/freight/logistics}/resourceImplementations/distributionCarrier/DistributionTourStartEventHandler.java (92%) rename src/main/java/{lsp => org/matsim/freight/logistics}/resourceImplementations/mainRunCarrier/MainRunCarrierResource.java (94%) rename src/main/java/{lsp => org/matsim/freight/logistics}/resourceImplementations/mainRunCarrier/MainRunCarrierScheduler.java (97%) rename src/main/java/{lsp => org/matsim/freight/logistics}/resourceImplementations/mainRunCarrier/MainRunCarrierUtils.java (92%) rename src/main/java/{lsp => org/matsim/freight/logistics}/resourceImplementations/mainRunCarrier/MainRunTourEndEventHandler.java (91%) rename src/main/java/{lsp => org/matsim/freight/logistics}/resourceImplementations/mainRunCarrier/MainRunTourStartEventHandler.java (92%) rename src/main/java/{lsp => org/matsim/freight/logistics}/resourceImplementations/transshipmentHub/TranshipmentHubUtils.java (92%) rename src/main/java/{lsp => org/matsim/freight/logistics}/resourceImplementations/transshipmentHub/TransshipmentHubResource.java (92%) rename src/main/java/{lsp => org/matsim/freight/logistics}/resourceImplementations/transshipmentHub/TransshipmentHubScheduler.java (90%) rename src/main/java/{lsp => org/matsim/freight/logistics}/resourceImplementations/transshipmentHub/TransshipmentHubTourEndEventHandler.java (96%) rename src/main/java/{lsp => org/matsim/freight/logistics}/shipment/LSPShipment.java (96%) rename src/main/java/{lsp => org/matsim/freight/logistics}/shipment/LSPShipmentImpl.java (97%) rename src/main/java/{lsp => org/matsim/freight/logistics}/shipment/LoggedShipmentHandle.java (93%) rename src/main/java/{lsp => org/matsim/freight/logistics}/shipment/LoggedShipmentLoad.java (93%) rename src/main/java/{lsp => org/matsim/freight/logistics}/shipment/LoggedShipmentTransport.java (94%) rename src/main/java/{lsp => org/matsim/freight/logistics}/shipment/LoggedShipmentUnload.java (93%) rename src/main/java/{lsp => org/matsim/freight/logistics}/shipment/Requirement.java (93%) rename src/main/java/{lsp => org/matsim/freight/logistics}/shipment/ScheduledShipmentHandle.java (93%) rename src/main/java/{lsp => org/matsim/freight/logistics}/shipment/ScheduledShipmentLoad.java (94%) rename src/main/java/{lsp => org/matsim/freight/logistics}/shipment/ScheduledShipmentTransport.java (95%) rename src/main/java/{lsp => org/matsim/freight/logistics}/shipment/ScheduledShipmentUnload.java (94%) rename src/main/java/{lsp => org/matsim/freight/logistics}/shipment/ShipmentLeg.java (90%) rename src/main/java/{lsp => org/matsim/freight/logistics}/shipment/ShipmentPlan.java (94%) rename src/main/java/{lsp => org/matsim/freight/logistics}/shipment/ShipmentPlanElement.java (91%) rename src/main/java/{lsp => org/matsim/freight/logistics}/shipment/ShipmentPlanElementComparator.java (97%) rename src/main/java/{lsp => org/matsim/freight/logistics}/shipment/ShipmentPlanImpl.java (98%) rename src/main/java/{lsp => org/matsim/freight/logistics}/shipment/ShipmentUtils.java (98%) rename src/test/java/{ => org/matsim/freight/logistics}/adapterTests/CollectionResourceTest.java (96%) rename src/test/java/{ => org/matsim/freight/logistics}/adapterTests/DistributionResourceTest.java (97%) rename src/test/java/{ => org/matsim/freight/logistics}/adapterTests/MainRunResourceTest.java (96%) rename src/test/java/{ => org/matsim/freight/logistics}/example/lsp/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirectTest.java (93%) rename src/test/java/{ => org/matsim/freight/logistics}/example/lsp/initialPlans/ExampleTwoEchelonGridTest.java (96%) rename src/test/java/{ => org/matsim/freight/logistics}/example/lsp/lspReplanning/CollectionLSPReplanningTest.java (94%) rename src/test/java/{ => org/matsim/freight/logistics}/example/lsp/lspScoring/CollectionLSPScoringTest.java (92%) rename src/test/java/{ => org/matsim/freight/logistics}/example/lsp/lspScoring/ExampleLSPScoringTest.java (83%) rename src/test/java/{ => org/matsim/freight/logistics}/example/lsp/lspScoring/MultipleIterationsCollectionLSPScoringTest.java (95%) rename src/test/java/{ => org/matsim/freight/logistics}/example/lsp/mobsimExamples/ExampleMobsimOfSimpleLSPTest.java (93%) rename src/test/java/{ => org/matsim/freight/logistics}/example/lsp/multipleChains/MultipleChainsReplanningTest.java (92%) rename src/test/java/{ => org/matsim/freight/logistics}/example/lsp/multipleChains/WorstPlanSelectorTest.java (95%) rename src/test/java/{ => org/matsim/freight/logistics}/example/lsp/simulationTrackers/CollectionTrackerTest.java (97%) rename src/test/java/{ => org/matsim/freight/logistics}/example/lspAndDemand/requirementsChecking/AssignerRequirementsTest.java (92%) rename src/test/java/{lsp => org/matsim/freight/logistics}/io/LSPReadWriteTest.java (96%) rename src/test/java/{ => org/matsim/freight/logistics}/logisticChainElementTests/CollectionElementTest.java (93%) rename src/test/java/{ => org/matsim/freight/logistics}/logisticChainElementTests/DistributionElementTest.java (93%) rename src/test/java/{ => org/matsim/freight/logistics}/logisticChainElementTests/MainRunElementTest.java (94%) rename src/test/java/{ => org/matsim/freight/logistics}/logisticChainElementTests/SecondHubElementTest.java (90%) rename src/test/java/{ => org/matsim/freight/logistics}/logisticChainTests/CollectionChainTest.java (93%) rename src/test/java/{ => org/matsim/freight/logistics}/logisticChainTests/CompleteLogisticChainTest.java (95%) rename src/test/java/{ => org/matsim/freight/logistics}/lspCreationTests/CollectionLSPCreationTest.java (95%) rename src/test/java/{ => org/matsim/freight/logistics}/lspCreationTests/CompleteLSPCreationTest.java (95%) rename src/test/java/{ => org/matsim/freight/logistics}/lspMobsimTests/CollectionLSPMobsimTest.java (94%) rename src/test/java/{ => org/matsim/freight/logistics}/lspMobsimTests/CompleteLSPMobsimTest.java (95%) rename src/test/java/{ => org/matsim/freight/logistics}/lspMobsimTests/FirstReloadLSPMobsimTest.java (95%) rename src/test/java/{ => org/matsim/freight/logistics}/lspMobsimTests/MainRunLSPMobsimTest.java (95%) rename src/test/java/{ => org/matsim/freight/logistics}/lspMobsimTests/MainRunOnlyLSPMobsimTest.java (95%) rename src/test/java/{ => org/matsim/freight/logistics}/lspMobsimTests/MultipleIterationsCollectionLSPMobsimTest.java (95%) rename src/test/java/{ => org/matsim/freight/logistics}/lspMobsimTests/MultipleIterationsCompleteLSPMobsimTest.java (95%) rename src/test/java/{ => org/matsim/freight/logistics}/lspMobsimTests/MultipleIterationsFirstReloadLSPMobsimTest.java (95%) rename src/test/java/{ => org/matsim/freight/logistics}/lspMobsimTests/MultipleIterationsMainRunLSPMobsimTest.java (95%) rename src/test/java/{ => org/matsim/freight/logistics}/lspMobsimTests/MultipleIterationsSecondReloadLSPMobsimTest.java (95%) rename src/test/java/{ => org/matsim/freight/logistics}/lspMobsimTests/MultipleShipmentsCollectionLSPMobsimTest.java (95%) rename src/test/java/{ => org/matsim/freight/logistics}/lspMobsimTests/MultipleShipmentsCompleteLSPMobsimTest.java (95%) rename src/test/java/{ => org/matsim/freight/logistics}/lspMobsimTests/MultipleShipmentsFirstReloadLSPMobsimTest.java (95%) rename src/test/java/{ => org/matsim/freight/logistics}/lspMobsimTests/MultipleShipmentsMainRunLSPMobsimTest.java (95%) rename src/test/java/{ => org/matsim/freight/logistics}/lspMobsimTests/MultipleShipmentsSecondReloadLSPMobsimTest.java (95%) rename src/test/java/{ => org/matsim/freight/logistics}/lspMobsimTests/RepeatedMultipleShipmentsCompleteLSPMobsimTest.java (96%) rename src/test/java/{ => org/matsim/freight/logistics}/lspMobsimTests/SecondReloadLSPMobsimTest.java (95%) rename src/test/java/{ => org/matsim/freight/logistics}/lspPlanTests/CollectionLSPPlanTest.java (94%) rename src/test/java/{ => org/matsim/freight/logistics}/lspPlanTests/CompleteLSPPlanTest.java (95%) rename src/test/java/{ => org/matsim/freight/logistics}/lspShipmentAssignmentTests/CollectionLSPShipmentAssigmentTest.java (94%) rename src/test/java/{ => org/matsim/freight/logistics}/lspShipmentAssignmentTests/CompleteLSPShipmentAssignerTest.java (95%) rename src/test/java/{ => org/matsim/freight/logistics}/lspShipmentTest/CollectionShipmentBuilderTest.java (95%) rename src/test/java/{ => org/matsim/freight/logistics}/lspShipmentTest/CompleteShipmentBuilderTest.java (95%) rename src/test/java/{ => org/matsim/freight/logistics}/lspShipmentTest/DistributionShipmentBuilderTest.java (95%) rename src/test/java/{lsp => org/matsim/freight/logistics}/resourceImplementations/CollectionLSPSchedulingTest.java (95%) rename src/test/java/{lsp => org/matsim/freight/logistics}/resourceImplementations/CompleteLSPSchedulingTest.java (96%) rename src/test/java/{lsp => org/matsim/freight/logistics}/resourceImplementations/FirstHubElementTest.java (88%) rename src/test/java/{lsp => org/matsim/freight/logistics}/resourceImplementations/FirstReloadLSPSchedulingTest.java (95%) rename src/test/java/{lsp => org/matsim/freight/logistics}/resourceImplementations/FirstReloadResourceTest.java (89%) rename src/test/java/{lsp => org/matsim/freight/logistics}/resourceImplementations/MainRunLSPSchedulingTest.java (95%) rename src/test/java/{lsp => org/matsim/freight/logistics}/resourceImplementations/MultipleShipmentsCollectionLSPSchedulingTest.java (95%) rename src/test/java/{lsp => org/matsim/freight/logistics}/resourceImplementations/MultipleShipmentsCompleteLSPSchedulingTest.java (96%) rename src/test/java/{lsp => org/matsim/freight/logistics}/resourceImplementations/MultipleShipmentsFirstReloadLSPSchedulingTest.java (95%) rename src/test/java/{lsp => org/matsim/freight/logistics}/resourceImplementations/MultipleShipmentsMainRunLSPSchedulingTest.java (95%) rename src/test/java/{lsp => org/matsim/freight/logistics}/resourceImplementations/MultipleShipmentsSecondReloadLSPSchedulingTest.java (96%) rename src/test/java/{lsp => org/matsim/freight/logistics}/resourceImplementations/SecondReloadLSPSchedulingTest.java (96%) rename src/test/java/{lsp => org/matsim/freight/logistics}/resourceImplementations/SecondReloadResourceTest.java (90%) rename test/input/{ => org/matsim/freight/logistics}/example/lsp/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirectTest/testMain1/output_events.xml.gz (100%) rename test/input/{ => org/matsim/freight/logistics}/example/lsp/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirectTest/testMain2_direct/output_events.xml.gz (100%) rename test/input/{ => org/matsim/freight/logistics}/example/lsp/lspReplanning/CollectionLSPReplanningTest/output_events.xml.gz (100%) rename test/input/{ => org/matsim/freight/logistics}/example/lsp/lspScoring/CollectionLSPScoringTest/output_events.xml.gz (100%) rename test/input/{ => org/matsim/freight/logistics}/example/lsp/lspScoring/MultipleIterationsCollectionLSPScoringTest/output_events.xml.gz (100%) rename test/input/{ => org/matsim/freight/logistics}/example/lsp/mobsimExamples/ExampleMobsimOfSimpleLSPTest/output_events.xml.gz (100%) rename test/input/{ => org/matsim/freight/logistics}/example/lsp/simulationTrackers/CollectionTrackerTest/output_events.xml.gz (100%) rename test/input/{lsp => org/matsim/freight/logistics}/io/carriers.xml (93%) rename test/input/{lsp => org/matsim/freight/logistics}/io/lsps.xml (100%) rename test/input/{lsp => org/matsim/freight/logistics}/io/vehicles.xml (100%) rename test/input/{ => org/matsim/freight/logistics}/lspMobsimTests/CollectionLSPMobsimTest/output_events.xml.gz (100%) rename test/input/{ => org/matsim/freight/logistics}/lspMobsimTests/CompleteLSPMobsimTest/output_events.xml.gz (100%) rename test/input/{ => org/matsim/freight/logistics}/lspMobsimTests/FirstReloadLSPMobsimTest/output_events.xml.gz (100%) rename test/input/{ => org/matsim/freight/logistics}/lspMobsimTests/MainRunLSPMobsimTest/output_events.xml.gz (100%) rename test/input/{ => org/matsim/freight/logistics}/lspMobsimTests/MainRunOnlyLSPMobsimTest/output_events.xml.gz (100%) rename test/input/{ => org/matsim/freight/logistics}/lspMobsimTests/MultipleIterationsCollectionLSPMobsimTest/output_events.xml.gz (100%) rename test/input/{ => org/matsim/freight/logistics}/lspMobsimTests/MultipleIterationsCompleteLSPMobsimTest/output_events.xml.gz (100%) rename test/input/{ => org/matsim/freight/logistics}/lspMobsimTests/MultipleIterationsFirstReloadLSPMobsimTest/output_events.xml.gz (100%) rename test/input/{ => org/matsim/freight/logistics}/lspMobsimTests/MultipleIterationsMainRunLSPMobsimTest/output_events.xml.gz (100%) rename test/input/{ => org/matsim/freight/logistics}/lspMobsimTests/MultipleIterationsSecondReloadLSPMobsimTest/output_events.xml.gz (100%) rename test/input/{ => org/matsim/freight/logistics}/lspMobsimTests/MultipleShipmentsCollectionLSPMobsimTest/output_events.xml.gz (100%) rename test/input/{ => org/matsim/freight/logistics}/lspMobsimTests/MultipleShipmentsCompleteLSPMobsimTest/output_events.xml.gz (100%) rename test/input/{ => org/matsim/freight/logistics}/lspMobsimTests/MultipleShipmentsFirstReloadLSPMobsimTest/output_events.xml.gz (100%) rename test/input/{ => org/matsim/freight/logistics}/lspMobsimTests/MultipleShipmentsMainRunLSPMobsimTest/output_events.xml.gz (100%) rename test/input/{ => org/matsim/freight/logistics}/lspMobsimTests/MultipleShipmentsSecondReloadLSPMobsimTest/output_events.xml.gz (100%) rename test/input/{ => org/matsim/freight/logistics}/lspMobsimTests/RepeatedMultipleShipmentsCompleteLSPMobsimTest/output_events.xml.gz (100%) rename test/input/{ => org/matsim/freight/logistics}/lspMobsimTests/SecondReloadLSPMobsimTest/output_events.xml.gz (100%) diff --git a/src/main/java/lsp/ForwardLogisticChainSchedulerImpl.java b/src/main/java/org/matsim/freight/logistics/ForwardLogisticChainSchedulerImpl.java similarity index 98% rename from src/main/java/lsp/ForwardLogisticChainSchedulerImpl.java rename to src/main/java/org/matsim/freight/logistics/ForwardLogisticChainSchedulerImpl.java index 69008596..d5f5b42f 100644 --- a/src/main/java/lsp/ForwardLogisticChainSchedulerImpl.java +++ b/src/main/java/org/matsim/freight/logistics/ForwardLogisticChainSchedulerImpl.java @@ -18,9 +18,9 @@ * * *********************************************************************** */ -package lsp; +package org.matsim.freight.logistics; -import lsp.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.LSPShipment; import org.matsim.api.core.v01.Id; import java.util.ArrayList; diff --git a/src/main/java/lsp/HasBackpointer.java b/src/main/java/org/matsim/freight/logistics/HasBackpointer.java similarity index 88% rename from src/main/java/lsp/HasBackpointer.java rename to src/main/java/org/matsim/freight/logistics/HasBackpointer.java index 991e6b18..a7c98fc4 100644 --- a/src/main/java/lsp/HasBackpointer.java +++ b/src/main/java/org/matsim/freight/logistics/HasBackpointer.java @@ -1,4 +1,4 @@ -package lsp; +package org.matsim.freight.logistics; @SuppressWarnings("InterfaceMayBeAnnotatedFunctional") public interface HasBackpointer { diff --git a/src/main/java/lsp/HasSimulationTrackers.java b/src/main/java/org/matsim/freight/logistics/HasSimulationTrackers.java similarity index 92% rename from src/main/java/lsp/HasSimulationTrackers.java rename to src/main/java/org/matsim/freight/logistics/HasSimulationTrackers.java index d1e672ae..f89dc015 100644 --- a/src/main/java/lsp/HasSimulationTrackers.java +++ b/src/main/java/org/matsim/freight/logistics/HasSimulationTrackers.java @@ -1,4 +1,4 @@ -package lsp; +package org.matsim.freight.logistics; import java.util.Collection; diff --git a/src/main/java/lsp/KnowsLSP.java b/src/main/java/org/matsim/freight/logistics/KnowsLSP.java similarity index 62% rename from src/main/java/lsp/KnowsLSP.java rename to src/main/java/org/matsim/freight/logistics/KnowsLSP.java index 7e574bf4..1f9270ca 100644 --- a/src/main/java/lsp/KnowsLSP.java +++ b/src/main/java/org/matsim/freight/logistics/KnowsLSP.java @@ -1,4 +1,4 @@ -package lsp; +package org.matsim.freight.logistics; interface KnowsLSP { void setLSP(LSP lsp); diff --git a/src/main/java/lsp/LSP.java b/src/main/java/org/matsim/freight/logistics/LSP.java similarity index 96% rename from src/main/java/lsp/LSP.java rename to src/main/java/org/matsim/freight/logistics/LSP.java index cacd92f6..e153a513 100644 --- a/src/main/java/lsp/LSP.java +++ b/src/main/java/org/matsim/freight/logistics/LSP.java @@ -18,9 +18,9 @@ * * *********************************************************************** */ -package lsp; +package org.matsim.freight.logistics; -import lsp.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.LSPShipment; import org.matsim.api.core.v01.population.HasPlansAndId; import java.util.Collection; diff --git a/src/main/java/lsp/LSPCarrierResource.java b/src/main/java/org/matsim/freight/logistics/LSPCarrierResource.java similarity index 97% rename from src/main/java/lsp/LSPCarrierResource.java rename to src/main/java/org/matsim/freight/logistics/LSPCarrierResource.java index 79b9a6e4..1fdbcc63 100644 --- a/src/main/java/lsp/LSPCarrierResource.java +++ b/src/main/java/org/matsim/freight/logistics/LSPCarrierResource.java @@ -18,7 +18,7 @@ * * *********************************************************************** */ -package lsp; +package org.matsim.freight.logistics; import org.matsim.freight.carriers.Carrier; diff --git a/src/main/java/lsp/LSPConstants.java b/src/main/java/org/matsim/freight/logistics/LSPConstants.java similarity index 98% rename from src/main/java/lsp/LSPConstants.java rename to src/main/java/org/matsim/freight/logistics/LSPConstants.java index aa513e99..5e743c78 100644 --- a/src/main/java/lsp/LSPConstants.java +++ b/src/main/java/org/matsim/freight/logistics/LSPConstants.java @@ -1,4 +1,4 @@ -package lsp; +package org.matsim.freight.logistics; public abstract class LSPConstants { diff --git a/src/main/java/lsp/LSPControlerListener.java b/src/main/java/org/matsim/freight/logistics/LSPControlerListener.java similarity index 97% rename from src/main/java/lsp/LSPControlerListener.java rename to src/main/java/org/matsim/freight/logistics/LSPControlerListener.java index 438e3dc8..df1cda2e 100644 --- a/src/main/java/lsp/LSPControlerListener.java +++ b/src/main/java/org/matsim/freight/logistics/LSPControlerListener.java @@ -18,12 +18,12 @@ * * *********************************************************************** */ -package lsp; +package org.matsim.freight.logistics; import jakarta.inject.Inject; -import lsp.io.LSPPlanXmlWriter; -import lsp.shipment.LSPShipment; +import org.matsim.freight.logistics.io.LSPPlanXmlWriter; +import org.matsim.freight.logistics.shipment.LSPShipment; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.matsim.api.core.v01.Scenario; diff --git a/src/main/java/lsp/LSPDataObject.java b/src/main/java/org/matsim/freight/logistics/LSPDataObject.java similarity index 97% rename from src/main/java/lsp/LSPDataObject.java rename to src/main/java/org/matsim/freight/logistics/LSPDataObject.java index 20b5c2f3..85f504d3 100644 --- a/src/main/java/lsp/LSPDataObject.java +++ b/src/main/java/org/matsim/freight/logistics/LSPDataObject.java @@ -1,4 +1,4 @@ -package lsp; +package org.matsim.freight.logistics; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.Identifiable; diff --git a/src/main/java/lsp/LSPImpl.java b/src/main/java/org/matsim/freight/logistics/LSPImpl.java similarity index 98% rename from src/main/java/lsp/LSPImpl.java rename to src/main/java/org/matsim/freight/logistics/LSPImpl.java index 4b1458dc..6293586f 100644 --- a/src/main/java/lsp/LSPImpl.java +++ b/src/main/java/org/matsim/freight/logistics/LSPImpl.java @@ -18,9 +18,9 @@ * * *********************************************************************** */ -package lsp; +package org.matsim.freight.logistics; -import lsp.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.LSPShipment; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/lsp/LSPModule.java b/src/main/java/org/matsim/freight/logistics/LSPModule.java similarity index 99% rename from src/main/java/lsp/LSPModule.java rename to src/main/java/org/matsim/freight/logistics/LSPModule.java index 176d1466..e3d0061d 100644 --- a/src/main/java/lsp/LSPModule.java +++ b/src/main/java/org/matsim/freight/logistics/LSPModule.java @@ -18,7 +18,7 @@ * * *********************************************************************** */ -package lsp; +package org.matsim.freight.logistics; import com.google.inject.Provides; import jakarta.inject.Inject; diff --git a/src/main/java/lsp/LSPPlan.java b/src/main/java/org/matsim/freight/logistics/LSPPlan.java similarity index 93% rename from src/main/java/lsp/LSPPlan.java rename to src/main/java/org/matsim/freight/logistics/LSPPlan.java index 6d716a37..2acdbc0d 100644 --- a/src/main/java/lsp/LSPPlan.java +++ b/src/main/java/org/matsim/freight/logistics/LSPPlan.java @@ -1,55 +1,55 @@ -/* - * *********************************************************************** * - * * project: org.matsim.* - * * *********************************************************************** * - * * * - * * copyright : (C) 2022 by the members listed in the COPYING, * - * * LICENSE and WARRANTY file. * - * * email : info at matsim dot org * - * * * - * * *********************************************************************** * - * * * - * * This program is free software; you can redistribute it and/or modify * - * * it under the terms of the GNU General Public License as published by * - * * the Free Software Foundation; either version 2 of the License, or * - * * (at your option) any later version. * - * * See also COPYING, LICENSE and WARRANTY file * - * * * - * * *********************************************************************** - */ - -package lsp; - -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentPlan; -import org.matsim.api.core.v01.population.BasicPlan; - -import java.util.Collection; - -/** - * This interface has the following properties: - */ -public interface LSPPlan extends BasicPlan, KnowsLSP { - - LSPPlan addLogisticChain(LogisticChain solution); - - Collection getLogisticChains(); - - /** - * yy My intuition would be to replace lspPlan#getAssigner().assignToSolution( shipment ) by lspPlan.addShipment( shipment ). kai, may'22 - */ - ShipmentAssigner getAssigner(); - - LSPPlan setAssigner(ShipmentAssigner assigner); - - Collection getShipmentPlans(); - LSPPlan addShipmentPlan(ShipmentPlan shipmentPlan); - - String getType(); - - void setType(final String type); - -} +/* + * *********************************************************************** * + * * project: org.matsim.* + * * *********************************************************************** * + * * * + * * copyright : (C) 2022 by the members listed in the COPYING, * + * * LICENSE and WARRANTY file. * + * * email : info at matsim dot org * + * * * + * * *********************************************************************** * + * * * + * * This program is free software; you can redistribute it and/or modify * + * * it under the terms of the GNU General Public License as published by * + * * the Free Software Foundation; either version 2 of the License, or * + * * (at your option) any later version. * + * * See also COPYING, LICENSE and WARRANTY file * + * * * + * * *********************************************************************** + */ + +package org.matsim.freight.logistics; + +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentPlan; +import org.matsim.api.core.v01.population.BasicPlan; + +import java.util.Collection; + +/** + * This interface has the following properties:
    + *
  • As a {@link BasicPlan} it has a score, so it can be used for evolutionary learning. kai, may'22
    • + *
  • An {@link LSPShipment} is added via lspPlan#getAssigner().assignToSolution(shipment). The {@link ShipmentAssigner} assigns it deterministically to a {@link LogisticChain}.
    • + *
+ */ +public interface LSPPlan extends BasicPlan, KnowsLSP { + + LSPPlan addLogisticChain(LogisticChain solution); + + Collection getLogisticChains(); + + /** + * yy My intuition would be to replace lspPlan#getAssigner().assignToSolution( shipment ) by lspPlan.addShipment( shipment ). kai, may'22 + */ + ShipmentAssigner getAssigner(); + + LSPPlan setAssigner(ShipmentAssigner assigner); + + Collection getShipmentPlans(); + LSPPlan addShipmentPlan(ShipmentPlan shipmentPlan); + + String getType(); + + void setType(final String type); + +} diff --git a/src/main/java/lsp/LSPPlanImpl.java b/src/main/java/org/matsim/freight/logistics/LSPPlanImpl.java similarity index 95% rename from src/main/java/lsp/LSPPlanImpl.java rename to src/main/java/org/matsim/freight/logistics/LSPPlanImpl.java index 9290b0e0..9af9ae38 100644 --- a/src/main/java/lsp/LSPPlanImpl.java +++ b/src/main/java/org/matsim/freight/logistics/LSPPlanImpl.java @@ -1,129 +1,129 @@ - -/* - * *********************************************************************** * - * * project: org.matsim.* - * * *********************************************************************** * - * * * - * * copyright : (C) 2022 by the members listed in the COPYING, * - * * LICENSE and WARRANTY file. * - * * email : info at matsim dot org * - * * * - * * *********************************************************************** * - * * * - * * This program is free software; you can redistribute it and/or modify * - * * it under the terms of the GNU General Public License as published by * - * * the Free Software Foundation; either version 2 of the License, or * - * * (at your option) any later version. * - * * See also COPYING, LICENSE and WARRANTY file * - * * * - * * *********************************************************************** - */ - -package lsp; - -import lsp.shipment.ShipmentPlan; - -import java.util.ArrayList; -import java.util.Collection; - -public class LSPPlanImpl implements LSPPlan { - - private final Collection logisticChains; - private final Collection shipmentPlans; - private LSP lsp; - private Double score = null; - private ShipmentAssigner assigner; - private String type = null; - - public LSPPlanImpl() { - this.logisticChains = new ArrayList<>(); - this.shipmentPlans = new ArrayList<>(); - } - - @Override - public LSPPlan addLogisticChain(LogisticChain solution) { - this.logisticChains.add(solution); - solution.setLSP(this.lsp); - return this; - } - - @Override - public Collection getLogisticChains() { - return logisticChains; - } - - @Override - public ShipmentAssigner getAssigner() { - return assigner; - } - - @Override - public LSPPlan setAssigner(ShipmentAssigner assigner) { - this.assigner = assigner; - this.assigner.setLSP(this.lsp); - return this; - } - - @Override public Collection getShipmentPlans() { - return this.shipmentPlans; - } - - @Override public LSPPlan addShipmentPlan(ShipmentPlan shipmentPlan) { - this.shipmentPlans.add(shipmentPlan); - return null; - } - - @Override - public Double getScore() { - return score; - } - - @Override - public void setScore(Double score) { - this.score = score; - } - - @Override - public String getType() { - return this.type; - } - - @Override - public void setType(final String type) { - this.type = type; - } - - @Override - public LSP getLSP() { - return lsp; - } - - @Override - public void setLSP(LSP lsp) { - this.lsp = lsp; - if (assigner != null) { - this.assigner.setLSP(lsp); - // yy vom Design her wäre es vlt. einfacher und logischer, wenn der assigner einen backpointer auf den LSPPlan hätte. Dann - // müsste man nicht (wie hier) hedgen gegen unterschiedliche Initialisierungssequenzen. kai, may'22 - } - for (LogisticChain solution : logisticChains) { - solution.setLSP(lsp); - } - } - - @Override public String toString() { - StringBuilder strb = new StringBuilder(); - strb.append("[score=").append(this.score).append("]"); - strb.append(", [type=").append(this.type).append("]"); - for (LogisticChain logisticChain : this.logisticChains) { - strb.append(", [LogisticChainId=").append(logisticChain.getId()).append("], [No of LogisticChainElements=").append(logisticChain.getLogisticChainElements().size()).append("] \n"); - if (!logisticChain.getLogisticChainElements().isEmpty()){ - for (LogisticChainElement solutionElement : logisticChain.getLogisticChainElements()) { - strb.append("\t \t").append(solutionElement.toString()).append("\n"); - } - } - } - return strb.toString(); - } - -} + +/* + * *********************************************************************** * + * * project: org.matsim.* + * * *********************************************************************** * + * * * + * * copyright : (C) 2022 by the members listed in the COPYING, * + * * LICENSE and WARRANTY file. * + * * email : info at matsim dot org * + * * * + * * *********************************************************************** * + * * * + * * This program is free software; you can redistribute it and/or modify * + * * it under the terms of the GNU General Public License as published by * + * * the Free Software Foundation; either version 2 of the License, or * + * * (at your option) any later version. * + * * See also COPYING, LICENSE and WARRANTY file * + * * * + * * *********************************************************************** + */ + +package org.matsim.freight.logistics; + +import org.matsim.freight.logistics.shipment.ShipmentPlan; + +import java.util.ArrayList; +import java.util.Collection; + +public class LSPPlanImpl implements LSPPlan { + + private final Collection logisticChains; + private final Collection shipmentPlans; + private LSP lsp; + private Double score = null; + private ShipmentAssigner assigner; + private String type = null; + + public LSPPlanImpl() { + this.logisticChains = new ArrayList<>(); + this.shipmentPlans = new ArrayList<>(); + } + + @Override + public LSPPlan addLogisticChain(LogisticChain solution) { + this.logisticChains.add(solution); + solution.setLSP(this.lsp); + return this; + } + + @Override + public Collection getLogisticChains() { + return logisticChains; + } + + @Override + public ShipmentAssigner getAssigner() { + return assigner; + } + + @Override + public LSPPlan setAssigner(ShipmentAssigner assigner) { + this.assigner = assigner; + this.assigner.setLSP(this.lsp); + return this; + } + + @Override public Collection getShipmentPlans() { + return this.shipmentPlans; + } + + @Override public LSPPlan addShipmentPlan(ShipmentPlan shipmentPlan) { + this.shipmentPlans.add(shipmentPlan); + return null; + } + + @Override + public Double getScore() { + return score; + } + + @Override + public void setScore(Double score) { + this.score = score; + } + + @Override + public String getType() { + return this.type; + } + + @Override + public void setType(final String type) { + this.type = type; + } + + @Override + public LSP getLSP() { + return lsp; + } + + @Override + public void setLSP(LSP lsp) { + this.lsp = lsp; + if (assigner != null) { + this.assigner.setLSP(lsp); + // yy vom Design her wäre es vlt. einfacher und logischer, wenn der assigner einen backpointer auf den LSPPlan hätte. Dann + // müsste man nicht (wie hier) hedgen gegen unterschiedliche Initialisierungssequenzen. kai, may'22 + } + for (LogisticChain solution : logisticChains) { + solution.setLSP(lsp); + } + } + + @Override public String toString() { + StringBuilder strb = new StringBuilder(); + strb.append("[score=").append(this.score).append("]"); + strb.append(", [type=").append(this.type).append("]"); + for (LogisticChain logisticChain : this.logisticChains) { + strb.append(", [LogisticChainId=").append(logisticChain.getId()).append("], [No of LogisticChainElements=").append(logisticChain.getLogisticChainElements().size()).append("] \n"); + if (!logisticChain.getLogisticChainElements().isEmpty()){ + for (LogisticChainElement solutionElement : logisticChain.getLogisticChainElements()) { + strb.append("\t \t").append(solutionElement.toString()).append("\n"); + } + } + } + return strb.toString(); + } + +} diff --git a/src/main/java/lsp/LSPRescheduler.java b/src/main/java/org/matsim/freight/logistics/LSPRescheduler.java similarity index 99% rename from src/main/java/lsp/LSPRescheduler.java rename to src/main/java/org/matsim/freight/logistics/LSPRescheduler.java index a9e590bc..428439d3 100644 --- a/src/main/java/lsp/LSPRescheduler.java +++ b/src/main/java/org/matsim/freight/logistics/LSPRescheduler.java @@ -18,7 +18,7 @@ * * *********************************************************************** */ -package lsp; +package org.matsim.freight.logistics; /** * There is a possibility and also sometimes a need for rescheduling before each diff --git a/src/main/java/lsp/LSPResource.java b/src/main/java/org/matsim/freight/logistics/LSPResource.java similarity index 97% rename from src/main/java/lsp/LSPResource.java rename to src/main/java/org/matsim/freight/logistics/LSPResource.java index 3765b337..9997d5e0 100644 --- a/src/main/java/lsp/LSPResource.java +++ b/src/main/java/org/matsim/freight/logistics/LSPResource.java @@ -18,7 +18,7 @@ * * *********************************************************************** */ -package lsp; +package org.matsim.freight.logistics; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.Identifiable; diff --git a/src/main/java/lsp/LSPResourceScheduler.java b/src/main/java/org/matsim/freight/logistics/LSPResourceScheduler.java similarity index 96% rename from src/main/java/lsp/LSPResourceScheduler.java rename to src/main/java/org/matsim/freight/logistics/LSPResourceScheduler.java index 6c945471..27252990 100644 --- a/src/main/java/lsp/LSPResourceScheduler.java +++ b/src/main/java/org/matsim/freight/logistics/LSPResourceScheduler.java @@ -18,10 +18,10 @@ * * *********************************************************************** */ -package lsp; +package org.matsim.freight.logistics; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import java.util.ArrayList; import java.util.Comparator; diff --git a/src/main/java/lsp/LSPScorer.java b/src/main/java/org/matsim/freight/logistics/LSPScorer.java similarity index 98% rename from src/main/java/lsp/LSPScorer.java rename to src/main/java/org/matsim/freight/logistics/LSPScorer.java index dc259d66..65c0b4ea 100644 --- a/src/main/java/lsp/LSPScorer.java +++ b/src/main/java/org/matsim/freight/logistics/LSPScorer.java @@ -18,7 +18,7 @@ * * *********************************************************************** */ -package lsp; +package org.matsim.freight.logistics; import org.matsim.api.core.v01.population.Activity; import org.matsim.core.controler.listener.ControlerListener; diff --git a/src/main/java/lsp/LSPScorerFactory.java b/src/main/java/org/matsim/freight/logistics/LSPScorerFactory.java similarity index 79% rename from src/main/java/lsp/LSPScorerFactory.java rename to src/main/java/org/matsim/freight/logistics/LSPScorerFactory.java index 7f88d82a..f6dbf8ea 100644 --- a/src/main/java/lsp/LSPScorerFactory.java +++ b/src/main/java/org/matsim/freight/logistics/LSPScorerFactory.java @@ -1,4 +1,4 @@ -package lsp; +package org.matsim.freight.logistics; import org.matsim.core.api.internal.MatsimFactory; diff --git a/src/main/java/lsp/LSPSimulationTracker.java b/src/main/java/org/matsim/freight/logistics/LSPSimulationTracker.java similarity index 97% rename from src/main/java/lsp/LSPSimulationTracker.java rename to src/main/java/org/matsim/freight/logistics/LSPSimulationTracker.java index 18e302b0..2ffb7b95 100644 --- a/src/main/java/lsp/LSPSimulationTracker.java +++ b/src/main/java/org/matsim/freight/logistics/LSPSimulationTracker.java @@ -18,7 +18,7 @@ * * *********************************************************************** */ -package lsp; +package org.matsim.freight.logistics; import org.matsim.core.controler.listener.ControlerListener; import org.matsim.core.events.handler.EventHandler; diff --git a/src/main/java/lsp/LSPStrategyManager.java b/src/main/java/org/matsim/freight/logistics/LSPStrategyManager.java similarity index 98% rename from src/main/java/lsp/LSPStrategyManager.java rename to src/main/java/org/matsim/freight/logistics/LSPStrategyManager.java index 1ed51230..e8690296 100644 --- a/src/main/java/lsp/LSPStrategyManager.java +++ b/src/main/java/org/matsim/freight/logistics/LSPStrategyManager.java @@ -19,7 +19,7 @@ * */ -package lsp; +package org.matsim.freight.logistics; import jakarta.inject.Provider; import org.matsim.core.replanning.GenericStrategyManager; diff --git a/src/main/java/lsp/LSPStrategyManagerImpl.java b/src/main/java/org/matsim/freight/logistics/LSPStrategyManagerImpl.java similarity index 98% rename from src/main/java/lsp/LSPStrategyManagerImpl.java rename to src/main/java/org/matsim/freight/logistics/LSPStrategyManagerImpl.java index 0ff2bf02..450e25e9 100644 --- a/src/main/java/lsp/LSPStrategyManagerImpl.java +++ b/src/main/java/org/matsim/freight/logistics/LSPStrategyManagerImpl.java @@ -1,4 +1,4 @@ -package lsp; +package org.matsim.freight.logistics; import org.matsim.api.core.v01.population.HasPlansAndId; import org.matsim.core.replanning.GenericPlanStrategy; diff --git a/src/main/java/lsp/LSPUtils.java b/src/main/java/org/matsim/freight/logistics/LSPUtils.java similarity index 98% rename from src/main/java/lsp/LSPUtils.java rename to src/main/java/org/matsim/freight/logistics/LSPUtils.java index 1eb530e7..77ac0f5f 100644 --- a/src/main/java/lsp/LSPUtils.java +++ b/src/main/java/org/matsim/freight/logistics/LSPUtils.java @@ -18,10 +18,10 @@ * * *********************************************************************** */ -package lsp; +package org.matsim.freight.logistics; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentPlan; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentPlan; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.Scenario; import org.matsim.freight.carriers.CarriersUtils; diff --git a/src/main/java/lsp/LSPs.java b/src/main/java/org/matsim/freight/logistics/LSPs.java similarity index 96% rename from src/main/java/lsp/LSPs.java rename to src/main/java/org/matsim/freight/logistics/LSPs.java index 42e1a22e..8cf58692 100644 --- a/src/main/java/lsp/LSPs.java +++ b/src/main/java/org/matsim/freight/logistics/LSPs.java @@ -1,48 +1,48 @@ -/* - * *********************************************************************** * - * * project: org.matsim.* - * * *********************************************************************** * - * * * - * * copyright : (C) 2022 by the members listed in the COPYING, * - * * LICENSE and WARRANTY file. * - * * email : info at matsim dot org * - * * * - * * *********************************************************************** * - * * * - * * This program is free software; you can redistribute it and/or modify * - * * it under the terms of the GNU General Public License as published by * - * * the Free Software Foundation; either version 2 of the License, or * - * * (at your option) any later version. * - * * See also COPYING, LICENSE and WARRANTY file * - * * * - * * *********************************************************************** - */ - -package lsp; - -import org.matsim.api.core.v01.Id; - -import java.util.Collection; -import java.util.LinkedHashMap; -import java.util.Map; - -public class LSPs { - - private final Map, LSP> lsps = new LinkedHashMap<>(); - - public LSPs(Collection lsps) { - makeMap(lsps); - } - - private void makeMap(Collection lsps) { - for (LSP c : lsps) { - this.lsps.put(c.getId(), c); - } - } - - - public Map, LSP> getLSPs() { - return lsps; - } - -} +/* + * *********************************************************************** * + * * project: org.matsim.* + * * *********************************************************************** * + * * * + * * copyright : (C) 2022 by the members listed in the COPYING, * + * * LICENSE and WARRANTY file. * + * * email : info at matsim dot org * + * * * + * * *********************************************************************** * + * * * + * * This program is free software; you can redistribute it and/or modify * + * * it under the terms of the GNU General Public License as published by * + * * the Free Software Foundation; either version 2 of the License, or * + * * (at your option) any later version. * + * * See also COPYING, LICENSE and WARRANTY file * + * * * + * * *********************************************************************** + */ + +package org.matsim.freight.logistics; + +import org.matsim.api.core.v01.Id; + +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.Map; + +public class LSPs { + + private final Map, LSP> lsps = new LinkedHashMap<>(); + + public LSPs(Collection lsps) { + makeMap(lsps); + } + + private void makeMap(Collection lsps) { + for (LSP c : lsps) { + this.lsps.put(c.getId(), c); + } + } + + + public Map, LSP> getLSPs() { + return lsps; + } + +} diff --git a/src/main/java/lsp/LogisticChain.java b/src/main/java/org/matsim/freight/logistics/LogisticChain.java similarity index 95% rename from src/main/java/lsp/LogisticChain.java rename to src/main/java/org/matsim/freight/logistics/LogisticChain.java index 50bf1ef4..1f76f1d3 100644 --- a/src/main/java/lsp/LogisticChain.java +++ b/src/main/java/org/matsim/freight/logistics/LogisticChain.java @@ -18,9 +18,9 @@ * * *********************************************************************** */ -package lsp; +package org.matsim.freight.logistics; -import lsp.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.LSPShipment; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.Identifiable; import org.matsim.utils.objectattributes.attributable.Attributable; diff --git a/src/main/java/lsp/LogisticChainElement.java b/src/main/java/org/matsim/freight/logistics/LogisticChainElement.java similarity index 98% rename from src/main/java/lsp/LogisticChainElement.java rename to src/main/java/org/matsim/freight/logistics/LogisticChainElement.java index d6b99b06..b59ad6a6 100644 --- a/src/main/java/lsp/LogisticChainElement.java +++ b/src/main/java/org/matsim/freight/logistics/LogisticChainElement.java @@ -18,7 +18,7 @@ * * *********************************************************************** */ -package lsp; +package org.matsim.freight.logistics; import org.matsim.api.core.v01.Identifiable; import org.matsim.utils.objectattributes.attributable.Attributable; diff --git a/src/main/java/lsp/LogisticChainElementImpl.java b/src/main/java/org/matsim/freight/logistics/LogisticChainElementImpl.java similarity index 98% rename from src/main/java/lsp/LogisticChainElementImpl.java rename to src/main/java/org/matsim/freight/logistics/LogisticChainElementImpl.java index fcb07139..01ef8041 100644 --- a/src/main/java/lsp/LogisticChainElementImpl.java +++ b/src/main/java/org/matsim/freight/logistics/LogisticChainElementImpl.java @@ -18,7 +18,7 @@ * * *********************************************************************** */ -package lsp; +package org.matsim.freight.logistics; /* package-private */ class LogisticChainElementImpl extends LSPDataObject implements LogisticChainElement { diff --git a/src/main/java/lsp/LogisticChainImpl.java b/src/main/java/org/matsim/freight/logistics/LogisticChainImpl.java similarity index 97% rename from src/main/java/lsp/LogisticChainImpl.java rename to src/main/java/org/matsim/freight/logistics/LogisticChainImpl.java index f203bff9..626392a8 100644 --- a/src/main/java/lsp/LogisticChainImpl.java +++ b/src/main/java/org/matsim/freight/logistics/LogisticChainImpl.java @@ -18,9 +18,9 @@ * * *********************************************************************** */ -package lsp; +package org.matsim.freight.logistics; -import lsp.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.LSPShipment; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.matsim.api.core.v01.Id; diff --git a/src/main/java/lsp/LogisticChainScheduler.java b/src/main/java/org/matsim/freight/logistics/LogisticChainScheduler.java similarity index 91% rename from src/main/java/lsp/LogisticChainScheduler.java rename to src/main/java/org/matsim/freight/logistics/LogisticChainScheduler.java index 05c9bb67..398d17c9 100644 --- a/src/main/java/lsp/LogisticChainScheduler.java +++ b/src/main/java/org/matsim/freight/logistics/LogisticChainScheduler.java @@ -18,11 +18,11 @@ * * *********************************************************************** */ -package lsp; +package org.matsim.freight.logistics; /** - * Serve the purpose of routing a set of {@link lsp.shipment.LSPShipment}s through a set of + * Serve the purpose of routing a set of {@link org.matsim.freight.logistics.shipment.LSPShipment}s through a set of * {@link LogisticChain}s, which, in turn, consist of several {@link LogisticChainElement}s * and the corresponding {@link LSPResource}s. */ diff --git a/src/main/java/lsp/LspShipmentWithTime.java b/src/main/java/org/matsim/freight/logistics/LspShipmentWithTime.java similarity index 95% rename from src/main/java/lsp/LspShipmentWithTime.java rename to src/main/java/org/matsim/freight/logistics/LspShipmentWithTime.java index ca645a37..488799d1 100644 --- a/src/main/java/lsp/LspShipmentWithTime.java +++ b/src/main/java/org/matsim/freight/logistics/LspShipmentWithTime.java @@ -18,10 +18,10 @@ * * *********************************************************************** */ -package lsp; +package org.matsim.freight.logistics; -import lsp.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.LSPShipment; public class LspShipmentWithTime { // yyyyyy find better solution for this. It is not so good to define an interface, and then immediately define a class that goes beyond it. diff --git a/src/main/java/lsp/ShipmentAssigner.java b/src/main/java/org/matsim/freight/logistics/ShipmentAssigner.java similarity index 95% rename from src/main/java/lsp/ShipmentAssigner.java rename to src/main/java/org/matsim/freight/logistics/ShipmentAssigner.java index 7dcd4708..11879d90 100644 --- a/src/main/java/lsp/ShipmentAssigner.java +++ b/src/main/java/org/matsim/freight/logistics/ShipmentAssigner.java @@ -1,41 +1,41 @@ -/* - * *********************************************************************** * - * * project: org.matsim.* - * * *********************************************************************** * - * * * - * * copyright : (C) 2022 by the members listed in the COPYING, * - * * LICENSE and WARRANTY file. * - * * email : info at matsim dot org * - * * * - * * *********************************************************************** * - * * * - * * This program is free software; you can redistribute it and/or modify * - * * it under the terms of the GNU General Public License as published by * - * * the Free Software Foundation; either version 2 of the License, or * - * * (at your option) any later version. * - * * See also COPYING, LICENSE and WARRANTY file * - * * * - * * *********************************************************************** - */ - -package lsp; - -import lsp.shipment.LSPShipment; - -/** - * Takes an {@link LSPShipment} and normally assigns it to something that belongs to an {@link LSP}. - *

- * If there are several {@link LogisticChain}s, the {@link LSP} has to assign each {@link LSPShipment} to - * the suitable one. For this purpose, each LSPPlan contains a pluggable strategy that - * is contained in classes implementing the interface {@link ShipmentAssigner}. - *

- * Discussion points:
    - *
  • yyyy Shipments are normally assigned to the selected plan only. I am not sure if this is what I would - * expect from the outside. kai, may'22
    • - *
- */ -public interface ShipmentAssigner extends KnowsLSP { - - void assignToPlan(LSPPlan lspPlan, LSPShipment shipment); - -} +/* + * *********************************************************************** * + * * project: org.matsim.* + * * *********************************************************************** * + * * * + * * copyright : (C) 2022 by the members listed in the COPYING, * + * * LICENSE and WARRANTY file. * + * * email : info at matsim dot org * + * * * + * * *********************************************************************** * + * * * + * * This program is free software; you can redistribute it and/or modify * + * * it under the terms of the GNU General Public License as published by * + * * the Free Software Foundation; either version 2 of the License, or * + * * (at your option) any later version. * + * * See also COPYING, LICENSE and WARRANTY file * + * * * + * * *********************************************************************** + */ + +package org.matsim.freight.logistics; + +import org.matsim.freight.logistics.shipment.LSPShipment; + +/** + * Takes an {@link LSPShipment} and normally assigns it to something that belongs to an {@link LSP}. + *

+ * If there are several {@link LogisticChain}s, the {@link LSP} has to assign each {@link LSPShipment} to + * the suitable one. For this purpose, each LSPPlan contains a pluggable strategy that + * is contained in classes implementing the interface {@link ShipmentAssigner}. + *

+ * Discussion points:
    + *
  • yyyy Shipments are normally assigned to the selected plan only. I am not sure if this is what I would + * expect from the outside. kai, may'22
    • + *
+ */ +public interface ShipmentAssigner extends KnowsLSP { + + void assignToPlan(LSPPlan lspPlan, LSPShipment shipment); + +} diff --git a/src/main/java/lsp/WaitingShipments.java b/src/main/java/org/matsim/freight/logistics/WaitingShipments.java similarity index 96% rename from src/main/java/lsp/WaitingShipments.java rename to src/main/java/org/matsim/freight/logistics/WaitingShipments.java index b0ff3e19..f49689d4 100644 --- a/src/main/java/lsp/WaitingShipments.java +++ b/src/main/java/org/matsim/freight/logistics/WaitingShipments.java @@ -1,53 +1,53 @@ -/* - * *********************************************************************** * - * * project: org.matsim.* - * * *********************************************************************** * - * * * - * * copyright : (C) 2022 by the members listed in the COPYING, * - * * LICENSE and WARRANTY file. * - * * email : info at matsim dot org * - * * * - * * *********************************************************************** * - * * * - * * This program is free software; you can redistribute it and/or modify * - * * it under the terms of the GNU General Public License as published by * - * * the Free Software Foundation; either version 2 of the License, or * - * * (at your option) any later version. * - * * See also COPYING, LICENSE and WARRANTY file * - * * * - * * *********************************************************************** - */ - -package lsp; - -import lsp.shipment.LSPShipment; - -import java.util.Collection; - -/** - * Each LogisticsSolutionElement maintains two collections of WaitingShipments. - * Instances of the latter class contain tuples of LSPShipments and time stamps. - *

- * The first of these collections stores LSPShipments that are waiting for their treatment in this element or more precisely the Resource that is in - * charge of the actual physical handling. - *

- * The second one stores shipments that have already been treated. - *

- * At the beginning of the scheduling process, all LSPShipments are added - * to the collection of incoming shipments of the first LogisticsSolutionElement of the - * LogisticsSolution to which they were assigned before. The tuples in the collection of - * WaitingShipments thus consist of the shipments themselves and a time stamp that states - * when they arrived there (see 3.9). In the case of the first LogisticsSolutionElement, - * this time stamp corresponds to the start time window of the LSPShipment - */ -public interface WaitingShipments { - - void addShipment(double time, LSPShipment shipment); - - Collection getSortedShipments(); - - Collection getShipments(); - - void clear(); - -} +/* + * *********************************************************************** * + * * project: org.matsim.* + * * *********************************************************************** * + * * * + * * copyright : (C) 2022 by the members listed in the COPYING, * + * * LICENSE and WARRANTY file. * + * * email : info at matsim dot org * + * * * + * * *********************************************************************** * + * * * + * * This program is free software; you can redistribute it and/or modify * + * * it under the terms of the GNU General Public License as published by * + * * the Free Software Foundation; either version 2 of the License, or * + * * (at your option) any later version. * + * * See also COPYING, LICENSE and WARRANTY file * + * * * + * * *********************************************************************** + */ + +package org.matsim.freight.logistics; + +import org.matsim.freight.logistics.shipment.LSPShipment; + +import java.util.Collection; + +/** + * Each LogisticsSolutionElement maintains two collections of WaitingShipments. + * Instances of the latter class contain tuples of LSPShipments and time stamps. + *

+ * The first of these collections stores LSPShipments that are waiting for their treatment in this element or more precisely the Resource that is in + * charge of the actual physical handling. + *

+ * The second one stores shipments that have already been treated. + *

+ * At the beginning of the scheduling process, all LSPShipments are added + * to the collection of incoming shipments of the first LogisticsSolutionElement of the + * LogisticsSolution to which they were assigned before. The tuples in the collection of + * WaitingShipments thus consist of the shipments themselves and a time stamp that states + * when they arrived there (see 3.9). In the case of the first LogisticsSolutionElement, + * this time stamp corresponds to the start time window of the LSPShipment + */ +public interface WaitingShipments { + + void addShipment(double time, LSPShipment shipment); + + Collection getSortedShipments(); + + Collection getShipments(); + + void clear(); + +} diff --git a/src/main/java/lsp/WaitingShipmentsImpl.java b/src/main/java/org/matsim/freight/logistics/WaitingShipmentsImpl.java similarity index 95% rename from src/main/java/lsp/WaitingShipmentsImpl.java rename to src/main/java/org/matsim/freight/logistics/WaitingShipmentsImpl.java index c3d4aebb..7f137040 100644 --- a/src/main/java/lsp/WaitingShipmentsImpl.java +++ b/src/main/java/org/matsim/freight/logistics/WaitingShipmentsImpl.java @@ -1,76 +1,76 @@ -/* - * *********************************************************************** * - * * project: org.matsim.* - * * *********************************************************************** * - * * * - * * copyright : (C) 2022 by the members listed in the COPYING, * - * * LICENSE and WARRANTY file. * - * * email : info at matsim dot org * - * * * - * * *********************************************************************** * - * * * - * * This program is free software; you can redistribute it and/or modify * - * * it under the terms of the GNU General Public License as published by * - * * the Free Software Foundation; either version 2 of the License, or * - * * (at your option) any later version. * - * * See also COPYING, LICENSE and WARRANTY file * - * * * - * * *********************************************************************** - */ - -package lsp; - -import lsp.shipment.LSPShipment; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Comparator; -import java.util.List; - -/* package-private */ class WaitingShipmentsImpl implements WaitingShipments { - - private final List shipments; - - WaitingShipmentsImpl() { - this.shipments = new ArrayList<>(); - } - - - @Override - public void addShipment(double time, LSPShipment shipment) { - LspShipmentWithTime tuple = new LspShipmentWithTime(time, shipment); - this.shipments.add(tuple); - shipments.sort(Comparator.comparingDouble(LspShipmentWithTime::getTime)); - } - - @Override - public Collection getSortedShipments() { - shipments.sort(Comparator.comparingDouble(LspShipmentWithTime::getTime)); - return shipments; - } - - public void clear() { - shipments.clear(); - } - - @Override - public Collection getShipments() { - return shipments; - } - - @Override public String toString() { - StringBuilder strb = new StringBuilder(); - strb.append("WaitingShipmentsImpl{") - .append("No of Shipments= ").append(shipments.size()); - if (shipments.size() >0 ){ - strb.append("; ShipmentIds="); - for (LspShipmentWithTime shipment : getSortedShipments()) { - strb.append("[") - .append(shipment.getShipment().getId()) - .append("]"); - } - } - strb.append('}'); - return strb.toString(); - } -} +/* + * *********************************************************************** * + * * project: org.matsim.* + * * *********************************************************************** * + * * * + * * copyright : (C) 2022 by the members listed in the COPYING, * + * * LICENSE and WARRANTY file. * + * * email : info at matsim dot org * + * * * + * * *********************************************************************** * + * * * + * * This program is free software; you can redistribute it and/or modify * + * * it under the terms of the GNU General Public License as published by * + * * the Free Software Foundation; either version 2 of the License, or * + * * (at your option) any later version. * + * * See also COPYING, LICENSE and WARRANTY file * + * * * + * * *********************************************************************** + */ + +package org.matsim.freight.logistics; + +import org.matsim.freight.logistics.shipment.LSPShipment; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Comparator; +import java.util.List; + +/* package-private */ class WaitingShipmentsImpl implements WaitingShipments { + + private final List shipments; + + WaitingShipmentsImpl() { + this.shipments = new ArrayList<>(); + } + + + @Override + public void addShipment(double time, LSPShipment shipment) { + LspShipmentWithTime tuple = new LspShipmentWithTime(time, shipment); + this.shipments.add(tuple); + shipments.sort(Comparator.comparingDouble(LspShipmentWithTime::getTime)); + } + + @Override + public Collection getSortedShipments() { + shipments.sort(Comparator.comparingDouble(LspShipmentWithTime::getTime)); + return shipments; + } + + public void clear() { + shipments.clear(); + } + + @Override + public Collection getShipments() { + return shipments; + } + + @Override public String toString() { + StringBuilder strb = new StringBuilder(); + strb.append("WaitingShipmentsImpl{") + .append("No of Shipments= ").append(shipments.size()); + if (shipments.size() >0 ){ + strb.append("; ShipmentIds="); + for (LspShipmentWithTime shipment : getSortedShipments()) { + strb.append("[") + .append(shipment.getShipment().getId()) + .append("]"); + } + } + strb.append('}'); + return strb.toString(); + } +} diff --git a/src/main/java/example/lsp/initialPlans/ExampleSchedulingOfInitialPlan.java b/src/main/java/org/matsim/freight/logistics/example/lsp/initialPlans/ExampleSchedulingOfInitialPlan.java similarity index 94% rename from src/main/java/example/lsp/initialPlans/ExampleSchedulingOfInitialPlan.java rename to src/main/java/org/matsim/freight/logistics/example/lsp/initialPlans/ExampleSchedulingOfInitialPlan.java index b19d9d48..3c194896 100644 --- a/src/main/java/example/lsp/initialPlans/ExampleSchedulingOfInitialPlan.java +++ b/src/main/java/org/matsim/freight/logistics/example/lsp/initialPlans/ExampleSchedulingOfInitialPlan.java @@ -18,14 +18,14 @@ * * *********************************************************************** */ -package example.lsp.initialPlans; - -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.example.lsp.initialPlans; + +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.Scenario; import org.matsim.api.core.v01.network.Link; diff --git a/src/main/java/example/lsp/initialPlans/ExampleSchedulingOfTransportChain.java b/src/main/java/org/matsim/freight/logistics/example/lsp/initialPlans/ExampleSchedulingOfTransportChain.java similarity index 95% rename from src/main/java/example/lsp/initialPlans/ExampleSchedulingOfTransportChain.java rename to src/main/java/org/matsim/freight/logistics/example/lsp/initialPlans/ExampleSchedulingOfTransportChain.java index 7471434f..a29cf450 100644 --- a/src/main/java/example/lsp/initialPlans/ExampleSchedulingOfTransportChain.java +++ b/src/main/java/org/matsim/freight/logistics/example/lsp/initialPlans/ExampleSchedulingOfTransportChain.java @@ -18,17 +18,17 @@ * * *********************************************************************** */ -package example.lsp.initialPlans; - -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.resourceImplementations.distributionCarrier.DistributionCarrierUtils; -import lsp.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; -import lsp.resourceImplementations.transshipmentHub.TranshipmentHubUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.example.lsp.initialPlans; + +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.distributionCarrier.DistributionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TranshipmentHubUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.Scenario; import org.matsim.api.core.v01.network.Link; diff --git a/src/main/java/example/lsp/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirect.java b/src/main/java/org/matsim/freight/logistics/example/lsp/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirect.java similarity index 97% rename from src/main/java/example/lsp/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirect.java rename to src/main/java/org/matsim/freight/logistics/example/lsp/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirect.java index 48c6c0ea..34bea242 100644 --- a/src/main/java/example/lsp/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirect.java +++ b/src/main/java/org/matsim/freight/logistics/example/lsp/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirect.java @@ -18,16 +18,16 @@ * * *********************************************************************** */ -package example.lsp.initialPlans; - -import example.lsp.lspReplanning.AssignmentStrategyFactory; -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.distributionCarrier.DistributionCarrierUtils; -import lsp.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; -import lsp.resourceImplementations.transshipmentHub.TranshipmentHubUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.example.lsp.initialPlans; + +import org.matsim.freight.logistics.example.lsp.lspReplanning.AssignmentStrategyFactory; +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.distributionCarrier.DistributionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TranshipmentHubUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.matsim.api.core.v01.Id; diff --git a/src/main/java/example/lsp/initialPlans/ExampleTestOutput.java b/src/main/java/org/matsim/freight/logistics/example/lsp/initialPlans/ExampleTestOutput.java similarity index 94% rename from src/main/java/example/lsp/initialPlans/ExampleTestOutput.java rename to src/main/java/org/matsim/freight/logistics/example/lsp/initialPlans/ExampleTestOutput.java index 35a0aaae..8580a8f1 100644 --- a/src/main/java/example/lsp/initialPlans/ExampleTestOutput.java +++ b/src/main/java/org/matsim/freight/logistics/example/lsp/initialPlans/ExampleTestOutput.java @@ -1,4 +1,4 @@ -package example.lsp.initialPlans; +package org.matsim.freight.logistics.example.lsp.initialPlans; import org.matsim.api.core.v01.Scenario; import org.matsim.core.config.Config; diff --git a/src/main/java/example/lsp/initialPlans/ExampleTwoEchelonGrid.java b/src/main/java/org/matsim/freight/logistics/example/lsp/initialPlans/ExampleTwoEchelonGrid.java similarity index 96% rename from src/main/java/example/lsp/initialPlans/ExampleTwoEchelonGrid.java rename to src/main/java/org/matsim/freight/logistics/example/lsp/initialPlans/ExampleTwoEchelonGrid.java index c804703b..24e9671f 100644 --- a/src/main/java/example/lsp/initialPlans/ExampleTwoEchelonGrid.java +++ b/src/main/java/org/matsim/freight/logistics/example/lsp/initialPlans/ExampleTwoEchelonGrid.java @@ -18,15 +18,15 @@ * * *********************************************************************** */ -package example.lsp.initialPlans; - -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.distributionCarrier.DistributionCarrierUtils; -import lsp.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; -import lsp.resourceImplementations.transshipmentHub.TranshipmentHubUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.example.lsp.initialPlans; + +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.distributionCarrier.DistributionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TranshipmentHubUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.matsim.api.core.v01.Id; @@ -59,7 +59,7 @@ * It uses the 9x9-grid network from the matsim-examples. *

* The depot is located at the outer border of the network, while the jobs are located in the middle area. - * The {@link lsp.LSP} has two different {@link lsp.LSPPlan}s: + * The {@link LSP} has two different {@link LSPPlan}s: * 1) direct delivery from the depot * 2) Using a TransshipmentHubResource: All goods were brought from the depot to the hub, reloaded and then brought from the hub to the customers *

diff --git a/src/main/java/example/lsp/initialPlans/ExampleTwoEchelonGrid_NR.java b/src/main/java/org/matsim/freight/logistics/example/lsp/initialPlans/ExampleTwoEchelonGrid_NR.java similarity index 96% rename from src/main/java/example/lsp/initialPlans/ExampleTwoEchelonGrid_NR.java rename to src/main/java/org/matsim/freight/logistics/example/lsp/initialPlans/ExampleTwoEchelonGrid_NR.java index 782b8951..ae581606 100644 --- a/src/main/java/example/lsp/initialPlans/ExampleTwoEchelonGrid_NR.java +++ b/src/main/java/org/matsim/freight/logistics/example/lsp/initialPlans/ExampleTwoEchelonGrid_NR.java @@ -18,17 +18,17 @@ * * *********************************************************************** */ -package example.lsp.initialPlans; - -import lsp.*; -import lsp.io.LSPPlanXmlReader; -import lsp.io.LSPPlanXmlWriter; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.distributionCarrier.DistributionCarrierUtils; -import lsp.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; -import lsp.resourceImplementations.transshipmentHub.TranshipmentHubUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.example.lsp.initialPlans; + +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.io.LSPPlanXmlReader; +import org.matsim.freight.logistics.io.LSPPlanXmlWriter; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.distributionCarrier.DistributionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TranshipmentHubUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.matsim.api.core.v01.Id; diff --git a/src/main/java/example/lsp/initialPlans/MyCarrierScorer.java b/src/main/java/org/matsim/freight/logistics/example/lsp/initialPlans/MyCarrierScorer.java similarity index 94% rename from src/main/java/example/lsp/initialPlans/MyCarrierScorer.java rename to src/main/java/org/matsim/freight/logistics/example/lsp/initialPlans/MyCarrierScorer.java index f1d36ecc..f65c70d9 100644 --- a/src/main/java/example/lsp/initialPlans/MyCarrierScorer.java +++ b/src/main/java/org/matsim/freight/logistics/example/lsp/initialPlans/MyCarrierScorer.java @@ -1,4 +1,4 @@ -package example.lsp.initialPlans; +package org.matsim.freight.logistics.example.lsp.initialPlans; 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/org/matsim/freight/logistics/example/lsp/initialPlans/MyEventBasedCarrierScorer.java similarity index 99% rename from src/main/java/example/lsp/initialPlans/MyEventBasedCarrierScorer.java rename to src/main/java/org/matsim/freight/logistics/example/lsp/initialPlans/MyEventBasedCarrierScorer.java index 6db4cda0..04cf9499 100644 --- a/src/main/java/example/lsp/initialPlans/MyEventBasedCarrierScorer.java +++ b/src/main/java/org/matsim/freight/logistics/example/lsp/initialPlans/MyEventBasedCarrierScorer.java @@ -1,4 +1,4 @@ -package example.lsp.initialPlans; +package org.matsim.freight.logistics.example.lsp.initialPlans; import jakarta.inject.Inject; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/example/lsp/initialPlans/MyLSPScorer.java b/src/main/java/org/matsim/freight/logistics/example/lsp/initialPlans/MyLSPScorer.java similarity index 92% rename from src/main/java/example/lsp/initialPlans/MyLSPScorer.java rename to src/main/java/org/matsim/freight/logistics/example/lsp/initialPlans/MyLSPScorer.java index 6247c0d6..3a49dad5 100644 --- a/src/main/java/example/lsp/initialPlans/MyLSPScorer.java +++ b/src/main/java/org/matsim/freight/logistics/example/lsp/initialPlans/MyLSPScorer.java @@ -1,7 +1,7 @@ -package example.lsp.initialPlans; +package org.matsim.freight.logistics.example.lsp.initialPlans; -import lsp.*; -import lsp.resourceImplementations.transshipmentHub.TransshipmentHubResource; +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TransshipmentHubResource; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/example/lsp/lspReplanning/AssignmentStrategyFactory.java b/src/main/java/org/matsim/freight/logistics/example/lsp/lspReplanning/AssignmentStrategyFactory.java similarity index 85% rename from src/main/java/example/lsp/lspReplanning/AssignmentStrategyFactory.java rename to src/main/java/org/matsim/freight/logistics/example/lsp/lspReplanning/AssignmentStrategyFactory.java index 2a47f4f4..85dcc11c 100644 --- a/src/main/java/example/lsp/lspReplanning/AssignmentStrategyFactory.java +++ b/src/main/java/org/matsim/freight/logistics/example/lsp/lspReplanning/AssignmentStrategyFactory.java @@ -1,11 +1,11 @@ -package example.lsp.lspReplanning; +package org.matsim.freight.logistics.example.lsp.lspReplanning; -import lsp.LSP; -import lsp.LSPPlan; -import lsp.LogisticChain; -import lsp.LogisticChainElement; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentUtils; +import org.matsim.freight.logistics.LSP; +import org.matsim.freight.logistics.LSPPlan; +import org.matsim.freight.logistics.LogisticChain; +import org.matsim.freight.logistics.LogisticChainElement; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.matsim.core.replanning.GenericPlanStrategy; import org.matsim.core.replanning.GenericPlanStrategyImpl; import org.matsim.core.replanning.ReplanningContext; diff --git a/src/main/java/example/lsp/lspReplanning/ExampleLSPReplanning.java b/src/main/java/org/matsim/freight/logistics/example/lsp/lspReplanning/ExampleLSPReplanning.java similarity index 96% rename from src/main/java/example/lsp/lspReplanning/ExampleLSPReplanning.java rename to src/main/java/org/matsim/freight/logistics/example/lsp/lspReplanning/ExampleLSPReplanning.java index 3b2e1229..19251e7f 100644 --- a/src/main/java/example/lsp/lspReplanning/ExampleLSPReplanning.java +++ b/src/main/java/org/matsim/freight/logistics/example/lsp/lspReplanning/ExampleLSPReplanning.java @@ -18,14 +18,14 @@ * * *********************************************************************** */ -package example.lsp.lspReplanning; +package org.matsim.freight.logistics.example.lsp.lspReplanning; import jakarta.inject.Provider; -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentUtils; +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.Scenario; import org.matsim.api.core.v01.network.Link; diff --git a/src/main/java/example/lsp/lspReplanning/MaybeTodayAssigner.java b/src/main/java/org/matsim/freight/logistics/example/lsp/lspReplanning/MaybeTodayAssigner.java similarity index 88% rename from src/main/java/example/lsp/lspReplanning/MaybeTodayAssigner.java rename to src/main/java/org/matsim/freight/logistics/example/lsp/lspReplanning/MaybeTodayAssigner.java index 3791f228..bf93e536 100644 --- a/src/main/java/example/lsp/lspReplanning/MaybeTodayAssigner.java +++ b/src/main/java/org/matsim/freight/logistics/example/lsp/lspReplanning/MaybeTodayAssigner.java @@ -18,12 +18,12 @@ * * *********************************************************************** */ -package example.lsp.lspReplanning; +package org.matsim.freight.logistics.example.lsp.lspReplanning; -import lsp.LSP; -import lsp.LSPPlan; -import lsp.ShipmentAssigner; -import lsp.shipment.LSPShipment; +import org.matsim.freight.logistics.LSP; +import org.matsim.freight.logistics.LSPPlan; +import org.matsim.freight.logistics.ShipmentAssigner; +import org.matsim.freight.logistics.shipment.LSPShipment; import org.matsim.core.gbl.Gbl; import java.util.Random; diff --git a/src/main/java/example/lsp/lspReplanning/TomorrowShipmentAssignerStrategyFactory.java b/src/main/java/org/matsim/freight/logistics/example/lsp/lspReplanning/TomorrowShipmentAssignerStrategyFactory.java similarity index 93% rename from src/main/java/example/lsp/lspReplanning/TomorrowShipmentAssignerStrategyFactory.java rename to src/main/java/org/matsim/freight/logistics/example/lsp/lspReplanning/TomorrowShipmentAssignerStrategyFactory.java index 6fff4f05..b02a435d 100644 --- a/src/main/java/example/lsp/lspReplanning/TomorrowShipmentAssignerStrategyFactory.java +++ b/src/main/java/org/matsim/freight/logistics/example/lsp/lspReplanning/TomorrowShipmentAssignerStrategyFactory.java @@ -18,11 +18,11 @@ * * *********************************************************************** */ -package example.lsp.lspReplanning; +package org.matsim.freight.logistics.example.lsp.lspReplanning; -import lsp.*; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentUtils; +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.matsim.core.replanning.GenericPlanStrategy; import org.matsim.core.replanning.GenericPlanStrategyImpl; import org.matsim.core.replanning.ReplanningContext; diff --git a/src/main/java/example/lsp/lspScoring/ExampleLSPScoring.java b/src/main/java/org/matsim/freight/logistics/example/lsp/lspScoring/ExampleLSPScoring.java similarity index 95% rename from src/main/java/example/lsp/lspScoring/ExampleLSPScoring.java rename to src/main/java/org/matsim/freight/logistics/example/lsp/lspScoring/ExampleLSPScoring.java index c1582d97..0ed9e151 100644 --- a/src/main/java/example/lsp/lspScoring/ExampleLSPScoring.java +++ b/src/main/java/org/matsim/freight/logistics/example/lsp/lspScoring/ExampleLSPScoring.java @@ -18,13 +18,13 @@ * * *********************************************************************** */ -package example.lsp.lspScoring; +package org.matsim.freight.logistics.example.lsp.lspScoring; -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentUtils; +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.matsim.api.core.v01.Id; diff --git a/src/main/java/example/lsp/mobsimExamples/ExampleMobsimOfSimpleLSP.java b/src/main/java/org/matsim/freight/logistics/example/lsp/mobsimExamples/ExampleMobsimOfSimpleLSP.java similarity index 95% rename from src/main/java/example/lsp/mobsimExamples/ExampleMobsimOfSimpleLSP.java rename to src/main/java/org/matsim/freight/logistics/example/lsp/mobsimExamples/ExampleMobsimOfSimpleLSP.java index db1438a8..93923d29 100644 --- a/src/main/java/example/lsp/mobsimExamples/ExampleMobsimOfSimpleLSP.java +++ b/src/main/java/org/matsim/freight/logistics/example/lsp/mobsimExamples/ExampleMobsimOfSimpleLSP.java @@ -18,14 +18,14 @@ * * *********************************************************************** */ -package example.lsp.mobsimExamples; - -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.example.lsp.mobsimExamples; + +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.Scenario; import org.matsim.api.core.v01.network.Link; diff --git a/src/main/java/example/lsp/mobsimExamples/ExampleMobsimOfTransportChain.java b/src/main/java/org/matsim/freight/logistics/example/lsp/mobsimExamples/ExampleMobsimOfTransportChain.java similarity index 96% rename from src/main/java/example/lsp/mobsimExamples/ExampleMobsimOfTransportChain.java rename to src/main/java/org/matsim/freight/logistics/example/lsp/mobsimExamples/ExampleMobsimOfTransportChain.java index 29f7b79a..3123ce27 100644 --- a/src/main/java/example/lsp/mobsimExamples/ExampleMobsimOfTransportChain.java +++ b/src/main/java/org/matsim/freight/logistics/example/lsp/mobsimExamples/ExampleMobsimOfTransportChain.java @@ -18,17 +18,17 @@ * * *********************************************************************** */ -package example.lsp.mobsimExamples; - -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.resourceImplementations.distributionCarrier.DistributionCarrierUtils; -import lsp.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; -import lsp.resourceImplementations.transshipmentHub.TranshipmentHubUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.example.lsp.mobsimExamples; + +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.distributionCarrier.DistributionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TranshipmentHubUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.Scenario; import org.matsim.api.core.v01.network.Link; diff --git a/src/main/java/example/lsp/multipleChains/EventBasedCarrierScorer_MultipleChains.java b/src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/EventBasedCarrierScorer_MultipleChains.java similarity index 99% rename from src/main/java/example/lsp/multipleChains/EventBasedCarrierScorer_MultipleChains.java rename to src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/EventBasedCarrierScorer_MultipleChains.java index 8cda8749..f517cd3c 100644 --- a/src/main/java/example/lsp/multipleChains/EventBasedCarrierScorer_MultipleChains.java +++ b/src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/EventBasedCarrierScorer_MultipleChains.java @@ -1,4 +1,4 @@ -package example.lsp.multipleChains; +package org.matsim.freight.logistics.example.lsp.multipleChains; import com.google.inject.Inject; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/example/lsp/multipleChains/ExampleGroceryDeliveryMultipleChains.java b/src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/ExampleGroceryDeliveryMultipleChains.java similarity index 94% rename from src/main/java/example/lsp/multipleChains/ExampleGroceryDeliveryMultipleChains.java rename to src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/ExampleGroceryDeliveryMultipleChains.java index fee3eb87..2b8305d2 100644 --- a/src/main/java/example/lsp/multipleChains/ExampleGroceryDeliveryMultipleChains.java +++ b/src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/ExampleGroceryDeliveryMultipleChains.java @@ -1,11 +1,11 @@ -package example.lsp.multipleChains; - -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.distributionCarrier.DistributionCarrierUtils; -import lsp.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; -import lsp.resourceImplementations.transshipmentHub.TranshipmentHubUtils; -import lsp.shipment.LSPShipment; +package org.matsim.freight.logistics.example.lsp.multipleChains; + +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.distributionCarrier.DistributionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TranshipmentHubUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.matsim.api.core.v01.Id; @@ -32,7 +32,7 @@ import java.util.Collections; import java.util.List; -import static example.lsp.multipleChains.MultipleChainsUtils.createLSPShipmentsFromCarrierShipments; +import static org.matsim.freight.logistics.example.lsp.multipleChains.MultipleChainsUtils.createLSPShipmentsFromCarrierShipments; public class ExampleGroceryDeliveryMultipleChains { diff --git a/src/main/java/example/lsp/multipleChains/ExampleMultipleMixedEchelonChains.java b/src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/ExampleMultipleMixedEchelonChains.java similarity index 95% rename from src/main/java/example/lsp/multipleChains/ExampleMultipleMixedEchelonChains.java rename to src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/ExampleMultipleMixedEchelonChains.java index f0dcb7a3..d6c7cc59 100644 --- a/src/main/java/example/lsp/multipleChains/ExampleMultipleMixedEchelonChains.java +++ b/src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/ExampleMultipleMixedEchelonChains.java @@ -1,12 +1,12 @@ -package example.lsp.multipleChains; - -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.distributionCarrier.DistributionCarrierUtils; -import lsp.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; -import lsp.resourceImplementations.transshipmentHub.TranshipmentHubUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.example.lsp.multipleChains; + +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.distributionCarrier.DistributionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TranshipmentHubUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.matsim.api.core.v01.Id; diff --git a/src/main/java/example/lsp/multipleChains/ExampleMultipleOneEchelonChains.java b/src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/ExampleMultipleOneEchelonChains.java similarity index 96% rename from src/main/java/example/lsp/multipleChains/ExampleMultipleOneEchelonChains.java rename to src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/ExampleMultipleOneEchelonChains.java index ca55b5b0..c6f65945 100644 --- a/src/main/java/example/lsp/multipleChains/ExampleMultipleOneEchelonChains.java +++ b/src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/ExampleMultipleOneEchelonChains.java @@ -1,10 +1,10 @@ -package example.lsp.multipleChains; +package org.matsim.freight.logistics.example.lsp.multipleChains; -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.distributionCarrier.DistributionCarrierUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentUtils; +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.distributionCarrier.DistributionCarrierUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.matsim.api.core.v01.Id; diff --git a/src/main/java/example/lsp/multipleChains/ExampleMultipleOneEchelonChainsReplanning.java b/src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/ExampleMultipleOneEchelonChainsReplanning.java similarity index 96% rename from src/main/java/example/lsp/multipleChains/ExampleMultipleOneEchelonChainsReplanning.java rename to src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/ExampleMultipleOneEchelonChainsReplanning.java index 228299f4..bb023f9c 100644 --- a/src/main/java/example/lsp/multipleChains/ExampleMultipleOneEchelonChainsReplanning.java +++ b/src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/ExampleMultipleOneEchelonChainsReplanning.java @@ -1,10 +1,10 @@ -package example.lsp.multipleChains; +package org.matsim.freight.logistics.example.lsp.multipleChains; -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.distributionCarrier.DistributionCarrierUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentUtils; +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.distributionCarrier.DistributionCarrierUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.matsim.api.core.v01.Id; diff --git a/src/main/java/example/lsp/multipleChains/ExampleMultipleTwoEchelonChainsReplanning.java b/src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/ExampleMultipleTwoEchelonChainsReplanning.java similarity index 96% rename from src/main/java/example/lsp/multipleChains/ExampleMultipleTwoEchelonChainsReplanning.java rename to src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/ExampleMultipleTwoEchelonChainsReplanning.java index f4a4d108..a312b2f4 100644 --- a/src/main/java/example/lsp/multipleChains/ExampleMultipleTwoEchelonChainsReplanning.java +++ b/src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/ExampleMultipleTwoEchelonChainsReplanning.java @@ -1,12 +1,12 @@ -package example.lsp.multipleChains; - -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.distributionCarrier.DistributionCarrierUtils; -import lsp.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; -import lsp.resourceImplementations.transshipmentHub.TranshipmentHubUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.example.lsp.multipleChains; + +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.distributionCarrier.DistributionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TranshipmentHubUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.matsim.api.core.v01.Id; diff --git a/src/main/java/example/lsp/multipleChains/MultipleChainsUtils.java b/src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/MultipleChainsUtils.java similarity index 93% rename from src/main/java/example/lsp/multipleChains/MultipleChainsUtils.java rename to src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/MultipleChainsUtils.java index cde81034..b60909ca 100644 --- a/src/main/java/example/lsp/multipleChains/MultipleChainsUtils.java +++ b/src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/MultipleChainsUtils.java @@ -1,7 +1,7 @@ -package example.lsp.multipleChains; +package org.matsim.freight.logistics.example.lsp.multipleChains; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.matsim.api.core.v01.Id; import org.matsim.freight.carriers.Carrier; import org.matsim.freight.carriers.CarrierShipment; diff --git a/src/main/java/example/lsp/multipleChains/MyLSPScorer.java b/src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/MyLSPScorer.java similarity index 92% rename from src/main/java/example/lsp/multipleChains/MyLSPScorer.java rename to src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/MyLSPScorer.java index e521bc76..54df2182 100644 --- a/src/main/java/example/lsp/multipleChains/MyLSPScorer.java +++ b/src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/MyLSPScorer.java @@ -1,7 +1,7 @@ -package example.lsp.multipleChains; +package org.matsim.freight.logistics.example.lsp.multipleChains; -import lsp.*; -import lsp.resourceImplementations.transshipmentHub.TransshipmentHubResource; +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TransshipmentHubResource; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/example/lsp/multipleChains/PrimaryLogisticChainShipmentAssigner.java b/src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/PrimaryLogisticChainShipmentAssigner.java similarity index 74% rename from src/main/java/example/lsp/multipleChains/PrimaryLogisticChainShipmentAssigner.java rename to src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/PrimaryLogisticChainShipmentAssigner.java index 3631c8c5..c197fc9b 100644 --- a/src/main/java/example/lsp/multipleChains/PrimaryLogisticChainShipmentAssigner.java +++ b/src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/PrimaryLogisticChainShipmentAssigner.java @@ -1,10 +1,10 @@ -package example.lsp.multipleChains; +package org.matsim.freight.logistics.example.lsp.multipleChains; -import lsp.LSP; -import lsp.LSPPlan; -import lsp.LogisticChain; -import lsp.ShipmentAssigner; -import lsp.shipment.LSPShipment; +import org.matsim.freight.logistics.LSP; +import org.matsim.freight.logistics.LSPPlan; +import org.matsim.freight.logistics.LogisticChain; +import org.matsim.freight.logistics.ShipmentAssigner; +import org.matsim.freight.logistics.shipment.LSPShipment; import org.matsim.core.gbl.Gbl; /** diff --git a/src/main/java/example/lsp/multipleChains/ProximityStrategyFactory.java b/src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/ProximityStrategyFactory.java similarity index 96% rename from src/main/java/example/lsp/multipleChains/ProximityStrategyFactory.java rename to src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/ProximityStrategyFactory.java index 99ad2f9b..3fbba335 100644 --- a/src/main/java/example/lsp/multipleChains/ProximityStrategyFactory.java +++ b/src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/ProximityStrategyFactory.java @@ -1,7 +1,7 @@ -package example.lsp.multipleChains; +package org.matsim.freight.logistics.example.lsp.multipleChains; -import lsp.*; -import lsp.shipment.LSPShipment; +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.shipment.LSPShipment; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.network.Link; import org.matsim.api.core.v01.network.Network; diff --git a/src/main/java/example/lsp/multipleChains/RandomDistributionAllShipmentsStrategyFactory.java b/src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/RandomDistributionAllShipmentsStrategyFactory.java similarity index 86% rename from src/main/java/example/lsp/multipleChains/RandomDistributionAllShipmentsStrategyFactory.java rename to src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/RandomDistributionAllShipmentsStrategyFactory.java index 5825b271..e22fc7ab 100644 --- a/src/main/java/example/lsp/multipleChains/RandomDistributionAllShipmentsStrategyFactory.java +++ b/src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/RandomDistributionAllShipmentsStrategyFactory.java @@ -1,9 +1,9 @@ -package example.lsp.multipleChains; +package org.matsim.freight.logistics.example.lsp.multipleChains; -import lsp.LSP; -import lsp.LSPPlan; -import lsp.LogisticChain; -import lsp.shipment.LSPShipment; +import org.matsim.freight.logistics.LSP; +import org.matsim.freight.logistics.LSPPlan; +import org.matsim.freight.logistics.LogisticChain; +import org.matsim.freight.logistics.shipment.LSPShipment; import org.matsim.core.config.groups.ScoringConfigGroup; import org.matsim.core.gbl.MatsimRandom; import org.matsim.core.replanning.GenericPlanStrategy; diff --git a/src/main/java/example/lsp/multipleChains/RandomLogisticChainShipmentAssigner.java b/src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/RandomLogisticChainShipmentAssigner.java similarity index 78% rename from src/main/java/example/lsp/multipleChains/RandomLogisticChainShipmentAssigner.java rename to src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/RandomLogisticChainShipmentAssigner.java index c61a43ea..fcbf8369 100644 --- a/src/main/java/example/lsp/multipleChains/RandomLogisticChainShipmentAssigner.java +++ b/src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/RandomLogisticChainShipmentAssigner.java @@ -1,10 +1,10 @@ -package example.lsp.multipleChains; +package org.matsim.freight.logistics.example.lsp.multipleChains; -import lsp.LSP; -import lsp.LSPPlan; -import lsp.LogisticChain; -import lsp.ShipmentAssigner; -import lsp.shipment.LSPShipment; +import org.matsim.freight.logistics.LSP; +import org.matsim.freight.logistics.LSPPlan; +import org.matsim.freight.logistics.LogisticChain; +import org.matsim.freight.logistics.ShipmentAssigner; +import org.matsim.freight.logistics.shipment.LSPShipment; import org.matsim.core.gbl.Gbl; import org.matsim.core.gbl.MatsimRandom; diff --git a/src/main/java/example/lsp/multipleChains/RandomShiftingStrategyFactory.java b/src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/RandomShiftingStrategyFactory.java similarity index 90% rename from src/main/java/example/lsp/multipleChains/RandomShiftingStrategyFactory.java rename to src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/RandomShiftingStrategyFactory.java index bcf5b4a6..9c3ccd86 100644 --- a/src/main/java/example/lsp/multipleChains/RandomShiftingStrategyFactory.java +++ b/src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/RandomShiftingStrategyFactory.java @@ -1,9 +1,9 @@ -package example.lsp.multipleChains; +package org.matsim.freight.logistics.example.lsp.multipleChains; -import lsp.LSP; -import lsp.LSPPlan; -import lsp.LogisticChain; -import lsp.shipment.LSPShipment; +import org.matsim.freight.logistics.LSP; +import org.matsim.freight.logistics.LSPPlan; +import org.matsim.freight.logistics.LogisticChain; +import org.matsim.freight.logistics.shipment.LSPShipment; import org.matsim.core.config.groups.ScoringConfigGroup; import org.matsim.core.gbl.MatsimRandom; import org.matsim.core.replanning.GenericPlanStrategy; diff --git a/src/main/java/example/lsp/multipleChains/RebalancingShipmentsStrategyFactory.java b/src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/RebalancingShipmentsStrategyFactory.java similarity index 91% rename from src/main/java/example/lsp/multipleChains/RebalancingShipmentsStrategyFactory.java rename to src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/RebalancingShipmentsStrategyFactory.java index ef80c2de..38bdf4cc 100644 --- a/src/main/java/example/lsp/multipleChains/RebalancingShipmentsStrategyFactory.java +++ b/src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/RebalancingShipmentsStrategyFactory.java @@ -1,9 +1,9 @@ -package example.lsp.multipleChains; +package org.matsim.freight.logistics.example.lsp.multipleChains; -import lsp.LSP; -import lsp.LSPPlan; -import lsp.LogisticChain; -import lsp.shipment.LSPShipment; +import org.matsim.freight.logistics.LSP; +import org.matsim.freight.logistics.LSPPlan; +import org.matsim.freight.logistics.LogisticChain; +import org.matsim.freight.logistics.shipment.LSPShipment; import org.matsim.api.core.v01.Id; import org.matsim.core.config.groups.ScoringConfigGroup; import org.matsim.core.replanning.GenericPlanStrategy; diff --git a/src/main/java/example/lsp/multipleChains/RoundRobinDistributionAllShipmentsStrategyFactory.java b/src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/RoundRobinDistributionAllShipmentsStrategyFactory.java similarity index 92% rename from src/main/java/example/lsp/multipleChains/RoundRobinDistributionAllShipmentsStrategyFactory.java rename to src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/RoundRobinDistributionAllShipmentsStrategyFactory.java index 2f50359a..bb30b34a 100644 --- a/src/main/java/example/lsp/multipleChains/RoundRobinDistributionAllShipmentsStrategyFactory.java +++ b/src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/RoundRobinDistributionAllShipmentsStrategyFactory.java @@ -18,12 +18,12 @@ * * *********************************************************************** */ -package example.lsp.multipleChains; +package org.matsim.freight.logistics.example.lsp.multipleChains; -import lsp.LSP; -import lsp.LSPPlan; -import lsp.LogisticChain; -import lsp.shipment.LSPShipment; +import org.matsim.freight.logistics.LSP; +import org.matsim.freight.logistics.LSPPlan; +import org.matsim.freight.logistics.LogisticChain; +import org.matsim.freight.logistics.shipment.LSPShipment; import org.matsim.core.config.groups.ScoringConfigGroup; import org.matsim.core.replanning.GenericPlanStrategy; import org.matsim.core.replanning.GenericPlanStrategyImpl; diff --git a/src/main/java/example/lsp/multipleChains/RoundRobinLogisticChainShipmentAssigner.java b/src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/RoundRobinLogisticChainShipmentAssigner.java similarity index 84% rename from src/main/java/example/lsp/multipleChains/RoundRobinLogisticChainShipmentAssigner.java rename to src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/RoundRobinLogisticChainShipmentAssigner.java index a94c0ae5..c1399528 100644 --- a/src/main/java/example/lsp/multipleChains/RoundRobinLogisticChainShipmentAssigner.java +++ b/src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/RoundRobinLogisticChainShipmentAssigner.java @@ -1,10 +1,10 @@ -package example.lsp.multipleChains; +package org.matsim.freight.logistics.example.lsp.multipleChains; -import lsp.LSP; -import lsp.LSPPlan; -import lsp.LogisticChain; -import lsp.ShipmentAssigner; -import lsp.shipment.LSPShipment; +import org.matsim.freight.logistics.LSP; +import org.matsim.freight.logistics.LSPPlan; +import org.matsim.freight.logistics.LogisticChain; +import org.matsim.freight.logistics.ShipmentAssigner; +import org.matsim.freight.logistics.shipment.LSPShipment; import org.matsim.core.gbl.Gbl; import java.util.Collections; diff --git a/src/main/java/example/lsp/multipleChains/WorstPlanForRemovalSelector.java b/src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/WorstPlanForRemovalSelector.java similarity index 91% rename from src/main/java/example/lsp/multipleChains/WorstPlanForRemovalSelector.java rename to src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/WorstPlanForRemovalSelector.java index 832adbbc..bd3defcd 100644 --- a/src/main/java/example/lsp/multipleChains/WorstPlanForRemovalSelector.java +++ b/src/main/java/org/matsim/freight/logistics/example/lsp/multipleChains/WorstPlanForRemovalSelector.java @@ -1,7 +1,7 @@ -package example.lsp.multipleChains; +package org.matsim.freight.logistics.example.lsp.multipleChains; -import lsp.LSP; -import lsp.LSPPlan; +import org.matsim.freight.logistics.LSP; +import org.matsim.freight.logistics.LSPPlan; import org.matsim.api.core.v01.population.HasPlansAndId; import org.matsim.core.replanning.selectors.PlanSelector; diff --git a/src/main/java/example/lsp/simulationTrackers/CollectionServiceHandler.java b/src/main/java/org/matsim/freight/logistics/example/lsp/simulationTrackers/CollectionServiceHandler.java similarity index 98% rename from src/main/java/example/lsp/simulationTrackers/CollectionServiceHandler.java rename to src/main/java/org/matsim/freight/logistics/example/lsp/simulationTrackers/CollectionServiceHandler.java index 96e1f061..7386c203 100644 --- a/src/main/java/example/lsp/simulationTrackers/CollectionServiceHandler.java +++ b/src/main/java/org/matsim/freight/logistics/example/lsp/simulationTrackers/CollectionServiceHandler.java @@ -18,7 +18,7 @@ * * *********************************************************************** */ -package example.lsp.simulationTrackers; +package org.matsim.freight.logistics.example.lsp.simulationTrackers; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.Scenario; diff --git a/src/main/java/example/lsp/simulationTrackers/DistanceAndTimeHandler.java b/src/main/java/org/matsim/freight/logistics/example/lsp/simulationTrackers/DistanceAndTimeHandler.java similarity index 98% rename from src/main/java/example/lsp/simulationTrackers/DistanceAndTimeHandler.java rename to src/main/java/org/matsim/freight/logistics/example/lsp/simulationTrackers/DistanceAndTimeHandler.java index ce86e205..dca261aa 100644 --- a/src/main/java/example/lsp/simulationTrackers/DistanceAndTimeHandler.java +++ b/src/main/java/org/matsim/freight/logistics/example/lsp/simulationTrackers/DistanceAndTimeHandler.java @@ -18,7 +18,7 @@ * * *********************************************************************** */ -package example.lsp.simulationTrackers; +package org.matsim.freight.logistics.example.lsp.simulationTrackers; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/example/lsp/simulationTrackers/ExampleSimulationTrackers.java b/src/main/java/org/matsim/freight/logistics/example/lsp/simulationTrackers/ExampleSimulationTrackers.java similarity index 93% rename from src/main/java/example/lsp/simulationTrackers/ExampleSimulationTrackers.java rename to src/main/java/org/matsim/freight/logistics/example/lsp/simulationTrackers/ExampleSimulationTrackers.java index 08caac9d..258777d9 100644 --- a/src/main/java/example/lsp/simulationTrackers/ExampleSimulationTrackers.java +++ b/src/main/java/org/matsim/freight/logistics/example/lsp/simulationTrackers/ExampleSimulationTrackers.java @@ -18,13 +18,13 @@ * * *********************************************************************** */ -package example.lsp.simulationTrackers; +package org.matsim.freight.logistics.example.lsp.simulationTrackers; -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentUtils; +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.Scenario; import org.matsim.api.core.v01.network.Link; @@ -93,10 +93,10 @@ static LSP createLSPWithTracker(Scenario scenario) { .build(); //Create cost tracker and add it to solution - example.lsp.simulationTrackers.LinearCostTracker tracker = new example.lsp.simulationTrackers.LinearCostTracker(0.2); - tracker.getEventHandlers().add(new example.lsp.simulationTrackers.TourStartHandler(scenario)); - tracker.getEventHandlers().add(new example.lsp.simulationTrackers.CollectionServiceHandler(scenario)); - tracker.getEventHandlers().add(new example.lsp.simulationTrackers.DistanceAndTimeHandler(scenario)); + LinearCostTracker tracker = new LinearCostTracker(0.2); + tracker.getEventHandlers().add(new TourStartHandler(scenario)); + tracker.getEventHandlers().add(new CollectionServiceHandler(scenario)); + tracker.getEventHandlers().add(new DistanceAndTimeHandler(scenario)); collectionSolution.addSimulationTracker(tracker); diff --git a/src/main/java/example/lsp/simulationTrackers/LinearCostTracker.java b/src/main/java/org/matsim/freight/logistics/example/lsp/simulationTrackers/LinearCostTracker.java similarity index 97% rename from src/main/java/example/lsp/simulationTrackers/LinearCostTracker.java rename to src/main/java/org/matsim/freight/logistics/example/lsp/simulationTrackers/LinearCostTracker.java index 90b1bec1..7b577dbb 100644 --- a/src/main/java/example/lsp/simulationTrackers/LinearCostTracker.java +++ b/src/main/java/org/matsim/freight/logistics/example/lsp/simulationTrackers/LinearCostTracker.java @@ -18,11 +18,11 @@ * * *********************************************************************** */ -package example.lsp.simulationTrackers; +package org.matsim.freight.logistics.example.lsp.simulationTrackers; -import lsp.LSPSimulationTracker; -import lsp.LSPUtils; -import lsp.LogisticChain; +import org.matsim.freight.logistics.LSPSimulationTracker; +import org.matsim.freight.logistics.LSPUtils; +import org.matsim.freight.logistics.LogisticChain; import org.matsim.api.core.v01.events.LinkEnterEvent; import org.matsim.api.core.v01.events.LinkLeaveEvent; import org.matsim.api.core.v01.events.VehicleLeavesTrafficEvent; diff --git a/src/main/java/example/lsp/simulationTrackers/TourStartHandler.java b/src/main/java/org/matsim/freight/logistics/example/lsp/simulationTrackers/TourStartHandler.java similarity index 98% rename from src/main/java/example/lsp/simulationTrackers/TourStartHandler.java rename to src/main/java/org/matsim/freight/logistics/example/lsp/simulationTrackers/TourStartHandler.java index c138878e..b200d57c 100644 --- a/src/main/java/example/lsp/simulationTrackers/TourStartHandler.java +++ b/src/main/java/org/matsim/freight/logistics/example/lsp/simulationTrackers/TourStartHandler.java @@ -18,7 +18,7 @@ * * *********************************************************************** */ -package example.lsp.simulationTrackers; +package org.matsim.freight.logistics.example.lsp.simulationTrackers; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/example/lspAndDemand/requirementsChecking/BlueRequirement.java b/src/main/java/org/matsim/freight/logistics/example/lspAndDemand/requirementsChecking/BlueRequirement.java similarity index 82% rename from src/main/java/example/lspAndDemand/requirementsChecking/BlueRequirement.java rename to src/main/java/org/matsim/freight/logistics/example/lspAndDemand/requirementsChecking/BlueRequirement.java index 6d0faad6..59a2efc6 100644 --- a/src/main/java/example/lspAndDemand/requirementsChecking/BlueRequirement.java +++ b/src/main/java/org/matsim/freight/logistics/example/lspAndDemand/requirementsChecking/BlueRequirement.java @@ -18,12 +18,12 @@ * * *********************************************************************** */ -package example.lspAndDemand.requirementsChecking; +package org.matsim.freight.logistics.example.lspAndDemand.requirementsChecking; -import lsp.LogisticChain; -import lsp.shipment.Requirement; +import org.matsim.freight.logistics.LogisticChain; +import org.matsim.freight.logistics.shipment.Requirement; -import static example.lspAndDemand.requirementsChecking.ExampleCheckRequirementsOfAssigner.ATTRIBUTE_COLOR; +import static org.matsim.freight.logistics.example.lspAndDemand.requirementsChecking.ExampleCheckRequirementsOfAssigner.ATTRIBUTE_COLOR; /*package-private*/ class BlueRequirement implements Requirement { diff --git a/src/main/java/example/lspAndDemand/requirementsChecking/ExampleCheckRequirementsOfAssigner.java b/src/main/java/org/matsim/freight/logistics/example/lspAndDemand/requirementsChecking/ExampleCheckRequirementsOfAssigner.java similarity index 95% rename from src/main/java/example/lspAndDemand/requirementsChecking/ExampleCheckRequirementsOfAssigner.java rename to src/main/java/org/matsim/freight/logistics/example/lspAndDemand/requirementsChecking/ExampleCheckRequirementsOfAssigner.java index 86dbea22..3d5e7c84 100644 --- a/src/main/java/example/lspAndDemand/requirementsChecking/ExampleCheckRequirementsOfAssigner.java +++ b/src/main/java/org/matsim/freight/logistics/example/lspAndDemand/requirementsChecking/ExampleCheckRequirementsOfAssigner.java @@ -18,13 +18,13 @@ * * *********************************************************************** */ -package example.lspAndDemand.requirementsChecking; +package org.matsim.freight.logistics.example.lspAndDemand.requirementsChecking; -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentUtils; +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.Scenario; import org.matsim.api.core.v01.network.Link; diff --git a/src/main/java/example/lspAndDemand/requirementsChecking/RedRequirement.java b/src/main/java/org/matsim/freight/logistics/example/lspAndDemand/requirementsChecking/RedRequirement.java similarity index 83% rename from src/main/java/example/lspAndDemand/requirementsChecking/RedRequirement.java rename to src/main/java/org/matsim/freight/logistics/example/lspAndDemand/requirementsChecking/RedRequirement.java index d7fb713e..2f131872 100644 --- a/src/main/java/example/lspAndDemand/requirementsChecking/RedRequirement.java +++ b/src/main/java/org/matsim/freight/logistics/example/lspAndDemand/requirementsChecking/RedRequirement.java @@ -18,12 +18,10 @@ * * *********************************************************************** */ -package example.lspAndDemand.requirementsChecking; +package org.matsim.freight.logistics.example.lspAndDemand.requirementsChecking; -import lsp.LogisticChain; -import lsp.shipment.Requirement; - -import static example.lspAndDemand.requirementsChecking.ExampleCheckRequirementsOfAssigner.ATTRIBUTE_COLOR; +import org.matsim.freight.logistics.LogisticChain; +import org.matsim.freight.logistics.shipment.Requirement; /*package-private*/ class RedRequirement implements Requirement { @@ -31,7 +29,7 @@ @Override public boolean checkRequirement(LogisticChain solution) { - return solution.getAttributes().getAttribute(ATTRIBUTE_COLOR).equals(RED); + return solution.getAttributes().getAttribute(ExampleCheckRequirementsOfAssigner.ATTRIBUTE_COLOR).equals(RED); } } diff --git a/src/main/java/example/lspAndDemand/requirementsChecking/RequirementsAssigner.java b/src/main/java/org/matsim/freight/logistics/example/lspAndDemand/requirementsChecking/RequirementsAssigner.java similarity index 85% rename from src/main/java/example/lspAndDemand/requirementsChecking/RequirementsAssigner.java rename to src/main/java/org/matsim/freight/logistics/example/lspAndDemand/requirementsChecking/RequirementsAssigner.java index 09b643b3..b205f96f 100644 --- a/src/main/java/example/lspAndDemand/requirementsChecking/RequirementsAssigner.java +++ b/src/main/java/org/matsim/freight/logistics/example/lspAndDemand/requirementsChecking/RequirementsAssigner.java @@ -18,14 +18,14 @@ * * *********************************************************************** */ -package example.lspAndDemand.requirementsChecking; +package org.matsim.freight.logistics.example.lspAndDemand.requirementsChecking; -import lsp.LSP; -import lsp.LSPPlan; -import lsp.LogisticChain; -import lsp.ShipmentAssigner; -import lsp.shipment.LSPShipment; -import lsp.shipment.Requirement; +import org.matsim.freight.logistics.LSP; +import org.matsim.freight.logistics.LSPPlan; +import org.matsim.freight.logistics.LogisticChain; +import org.matsim.freight.logistics.ShipmentAssigner; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.Requirement; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/lsp/io/LSPPlanXmlParserV1.java b/src/main/java/org/matsim/freight/logistics/io/LSPPlanXmlParserV1.java similarity index 94% rename from src/main/java/lsp/io/LSPPlanXmlParserV1.java rename to src/main/java/org/matsim/freight/logistics/io/LSPPlanXmlParserV1.java index bb38bb44..2461b171 100644 --- a/src/main/java/lsp/io/LSPPlanXmlParserV1.java +++ b/src/main/java/org/matsim/freight/logistics/io/LSPPlanXmlParserV1.java @@ -18,19 +18,18 @@ * * *********************************************************************** */ -package lsp.io; - -import lsp.LSP; -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.resourceImplementations.distributionCarrier.DistributionCarrierUtils; -import lsp.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; -import lsp.resourceImplementations.transshipmentHub.TranshipmentHubUtils; -import lsp.resourceImplementations.transshipmentHub.TransshipmentHubResource; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.io; + +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.distributionCarrier.DistributionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TranshipmentHubUtils; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TransshipmentHubResource; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.matsim.api.core.v01.Id; @@ -47,7 +46,7 @@ import java.util.*; -import static lsp.LSPConstants.*; +import static org.matsim.freight.logistics.LSPConstants.*; /** * Reads data out of LSPPlans file and builds the LSPs with their according resources, shipments and plans. @@ -58,7 +57,7 @@ class LSPPlanXmlParserV1 extends MatsimXmlParser { public static final Logger logger = LogManager.getLogger( LSPPlanXmlParserV1.class ); - private lsp.LSP currentLsp = null; + private LSP currentLsp = null; private Carrier currentCarrier = null; private LSPShipment currentShipment = null; private LSPPlan currentLspPlan = null; diff --git a/src/main/java/lsp/io/LSPPlanXmlReader.java b/src/main/java/org/matsim/freight/logistics/io/LSPPlanXmlReader.java similarity index 97% rename from src/main/java/lsp/io/LSPPlanXmlReader.java rename to src/main/java/org/matsim/freight/logistics/io/LSPPlanXmlReader.java index 6b94dd3e..4615514a 100644 --- a/src/main/java/lsp/io/LSPPlanXmlReader.java +++ b/src/main/java/org/matsim/freight/logistics/io/LSPPlanXmlReader.java @@ -18,10 +18,10 @@ * * *********************************************************************** */ -package lsp.io; +package org.matsim.freight.logistics.io; -import lsp.LSPConstants; -import lsp.LSPs; +import org.matsim.freight.logistics.LSPConstants; +import org.matsim.freight.logistics.LSPs; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.matsim.core.api.internal.MatsimReader; diff --git a/src/main/java/lsp/io/LSPPlanXmlWriter.java b/src/main/java/org/matsim/freight/logistics/io/LSPPlanXmlWriter.java similarity index 94% rename from src/main/java/lsp/io/LSPPlanXmlWriter.java rename to src/main/java/org/matsim/freight/logistics/io/LSPPlanXmlWriter.java index 40d120b3..4ba079e6 100644 --- a/src/main/java/lsp/io/LSPPlanXmlWriter.java +++ b/src/main/java/org/matsim/freight/logistics/io/LSPPlanXmlWriter.java @@ -18,14 +18,13 @@ * * *********************************************************************** */ -package lsp.io; - -import lsp.LSP; -import lsp.*; -import lsp.resourceImplementations.transshipmentHub.TransshipmentHubResource; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.io; + +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TransshipmentHubResource; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.matsim.api.core.v01.Id; @@ -41,7 +40,7 @@ import java.util.List; import java.util.Map; -import static lsp.LSPConstants.*; +import static org.matsim.freight.logistics.LSPConstants.*; /** * Writes out resources, shipments and plans for each LSP in an XML-file including header for validating against @@ -53,7 +52,7 @@ public class LSPPlanXmlWriter extends MatsimXmlWriter { private static final Logger logger = LogManager.getLogger(LSPPlanXmlWriter.class); - private final Collection lsPs; + private final Collection lsPs; public LSPPlanXmlWriter(LSPs lsPs) { super(); diff --git a/src/main/java/lsp/resourceImplementations/CarrierSchedulerUtils.java b/src/main/java/org/matsim/freight/logistics/resourceImplementations/CarrierSchedulerUtils.java similarity index 97% rename from src/main/java/lsp/resourceImplementations/CarrierSchedulerUtils.java rename to src/main/java/org/matsim/freight/logistics/resourceImplementations/CarrierSchedulerUtils.java index 3f660bf2..12ac74ec 100644 --- a/src/main/java/lsp/resourceImplementations/CarrierSchedulerUtils.java +++ b/src/main/java/org/matsim/freight/logistics/resourceImplementations/CarrierSchedulerUtils.java @@ -1,4 +1,4 @@ -package lsp.resourceImplementations; +package org.matsim.freight.logistics.resourceImplementations; import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm; import com.graphhopper.jsprit.core.algorithm.box.Jsprit; diff --git a/src/main/java/lsp/resourceImplementations/ResourceImplementationUtils.java b/src/main/java/org/matsim/freight/logistics/resourceImplementations/ResourceImplementationUtils.java similarity index 95% rename from src/main/java/lsp/resourceImplementations/ResourceImplementationUtils.java rename to src/main/java/org/matsim/freight/logistics/resourceImplementations/ResourceImplementationUtils.java index d8425083..dce31a04 100644 --- a/src/main/java/lsp/resourceImplementations/ResourceImplementationUtils.java +++ b/src/main/java/org/matsim/freight/logistics/resourceImplementations/ResourceImplementationUtils.java @@ -18,14 +18,14 @@ * * *********************************************************************** */ -package lsp.resourceImplementations; - -import lsp.LSP; -import lsp.LSPPlan; -import lsp.LSPResource; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.resourceImplementations; + +import org.matsim.freight.logistics.LSP; +import org.matsim.freight.logistics.LSPPlan; +import org.matsim.freight.logistics.LSPResource; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.matsim.core.utils.io.IOUtils; diff --git a/src/main/java/lsp/resourceImplementations/SimpleForwardLogisticChainScheduler.java b/src/main/java/org/matsim/freight/logistics/resourceImplementations/SimpleForwardLogisticChainScheduler.java similarity index 93% rename from src/main/java/lsp/resourceImplementations/SimpleForwardLogisticChainScheduler.java rename to src/main/java/org/matsim/freight/logistics/resourceImplementations/SimpleForwardLogisticChainScheduler.java index d5b12570..a6387476 100644 --- a/src/main/java/lsp/resourceImplementations/SimpleForwardLogisticChainScheduler.java +++ b/src/main/java/org/matsim/freight/logistics/resourceImplementations/SimpleForwardLogisticChainScheduler.java @@ -18,10 +18,10 @@ * * *********************************************************************** */ -package lsp.resourceImplementations; +package org.matsim.freight.logistics.resourceImplementations; -import lsp.*; -import lsp.shipment.LSPShipment; +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.shipment.LSPShipment; import org.matsim.api.core.v01.Id; import java.util.List; @@ -30,7 +30,7 @@ * In the class SimpleForwardSolutionScheduler two tasks are performed: *

* 1.) the {@link LSPShipment}s that were assigned to the suitable - * {@link LogisticChain} by the {@link lsp.ShipmentAssigner} in a previous step are handed over to the first + * {@link LogisticChain} by the {@link ShipmentAssigner} in a previous step are handed over to the first * {@link LogisticChainElement}. *

* 2.) all {@link LSPResource}s that were handed over to the SimpleForwardSolutionScheduler diff --git a/src/main/java/lsp/resourceImplementations/SingleLogisticChainShipmentAssigner.java b/src/main/java/org/matsim/freight/logistics/resourceImplementations/SingleLogisticChainShipmentAssigner.java similarity index 84% rename from src/main/java/lsp/resourceImplementations/SingleLogisticChainShipmentAssigner.java rename to src/main/java/org/matsim/freight/logistics/resourceImplementations/SingleLogisticChainShipmentAssigner.java index 98562fc0..6ac35cd2 100644 --- a/src/main/java/lsp/resourceImplementations/SingleLogisticChainShipmentAssigner.java +++ b/src/main/java/org/matsim/freight/logistics/resourceImplementations/SingleLogisticChainShipmentAssigner.java @@ -18,18 +18,18 @@ * * *********************************************************************** */ -package lsp.resourceImplementations; +package org.matsim.freight.logistics.resourceImplementations; -import lsp.LSP; -import lsp.LSPPlan; -import lsp.LogisticChain; -import lsp.ShipmentAssigner; -import lsp.shipment.LSPShipment; +import org.matsim.freight.logistics.LSP; +import org.matsim.freight.logistics.LSPPlan; +import org.matsim.freight.logistics.LogisticChain; +import org.matsim.freight.logistics.ShipmentAssigner; +import org.matsim.freight.logistics.shipment.LSPShipment; import org.matsim.core.gbl.Gbl; /** * Ganz einfacher {@link ShipmentAssigner}: - * Voraussetzung: Der {@link lsp.LSPPlan} hat genau 1 {@link LogisticChain}. + * Voraussetzung: Der {@link LSPPlan} hat genau 1 {@link LogisticChain}. *

* Dann wird das {@link LSPShipment} diesem zugeordnet. *

diff --git a/src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionCarrierResource.java b/src/main/java/org/matsim/freight/logistics/resourceImplementations/collectionCarrier/CollectionCarrierResource.java similarity index 96% rename from src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionCarrierResource.java rename to src/main/java/org/matsim/freight/logistics/resourceImplementations/collectionCarrier/CollectionCarrierResource.java index 945a4421..f78a9e74 100644 --- a/src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionCarrierResource.java +++ b/src/main/java/org/matsim/freight/logistics/resourceImplementations/collectionCarrier/CollectionCarrierResource.java @@ -18,14 +18,14 @@ * * *********************************************************************** */ -package lsp.resourceImplementations.collectionCarrier; +package org.matsim.freight.logistics.resourceImplementations.collectionCarrier; -import lsp.*; 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.freight.carriers.Carrier; import org.matsim.freight.carriers.CarrierVehicle; +import org.matsim.freight.logistics.*; import java.util.Collection; import java.util.List; diff --git a/src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionCarrierScheduler.java b/src/main/java/org/matsim/freight/logistics/resourceImplementations/collectionCarrier/CollectionCarrierScheduler.java similarity index 96% rename from src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionCarrierScheduler.java rename to src/main/java/org/matsim/freight/logistics/resourceImplementations/collectionCarrier/CollectionCarrierScheduler.java index 9f1c5d25..de7e6bc8 100644 --- a/src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionCarrierScheduler.java +++ b/src/main/java/org/matsim/freight/logistics/resourceImplementations/collectionCarrier/CollectionCarrierScheduler.java @@ -18,13 +18,13 @@ * * *********************************************************************** */ -package lsp.resourceImplementations.collectionCarrier; +package org.matsim.freight.logistics.resourceImplementations.collectionCarrier; -import lsp.*; -import lsp.resourceImplementations.CarrierSchedulerUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.CarrierSchedulerUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.matsim.api.core.v01.Id; import org.matsim.freight.carriers.Carrier; import org.matsim.freight.carriers.CarrierService; diff --git a/src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionCarrierUtils.java b/src/main/java/org/matsim/freight/logistics/resourceImplementations/collectionCarrier/CollectionCarrierUtils.java similarity index 87% rename from src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionCarrierUtils.java rename to src/main/java/org/matsim/freight/logistics/resourceImplementations/collectionCarrier/CollectionCarrierUtils.java index 7d28f463..a75b6a24 100644 --- a/src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionCarrierUtils.java +++ b/src/main/java/org/matsim/freight/logistics/resourceImplementations/collectionCarrier/CollectionCarrierUtils.java @@ -1,8 +1,8 @@ -package lsp.resourceImplementations.collectionCarrier; +package org.matsim.freight.logistics.resourceImplementations.collectionCarrier; -import lsp.LSPResource; -import lsp.LogisticChainElement; -import lsp.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.LSPResource; +import org.matsim.freight.logistics.LogisticChainElement; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.network.Link; import org.matsim.api.core.v01.network.Network; diff --git a/src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionServiceEndEventHandler.java b/src/main/java/org/matsim/freight/logistics/resourceImplementations/collectionCarrier/CollectionServiceEndEventHandler.java similarity index 89% rename from src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionServiceEndEventHandler.java rename to src/main/java/org/matsim/freight/logistics/resourceImplementations/collectionCarrier/CollectionServiceEndEventHandler.java index 0a2e668a..d8af8f3b 100644 --- a/src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionServiceEndEventHandler.java +++ b/src/main/java/org/matsim/freight/logistics/resourceImplementations/collectionCarrier/CollectionServiceEndEventHandler.java @@ -18,16 +18,16 @@ * * *********************************************************************** */ -package lsp.resourceImplementations.collectionCarrier; - -import lsp.LSPCarrierResource; -import lsp.LSPResource; -import lsp.LSPSimulationTracker; -import lsp.LogisticChainElement; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentLeg; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.resourceImplementations.collectionCarrier; + +import org.matsim.freight.logistics.LSPCarrierResource; +import org.matsim.freight.logistics.LSPResource; +import org.matsim.freight.logistics.LSPSimulationTracker; +import org.matsim.freight.logistics.LogisticChainElement; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentLeg; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.matsim.api.core.v01.Id; 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/org/matsim/freight/logistics/resourceImplementations/collectionCarrier/CollectionTourEndEventHandler.java similarity index 90% rename from src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionTourEndEventHandler.java rename to src/main/java/org/matsim/freight/logistics/resourceImplementations/collectionCarrier/CollectionTourEndEventHandler.java index f7f33c82..fdf06b68 100644 --- a/src/main/java/lsp/resourceImplementations/collectionCarrier/CollectionTourEndEventHandler.java +++ b/src/main/java/org/matsim/freight/logistics/resourceImplementations/collectionCarrier/CollectionTourEndEventHandler.java @@ -18,16 +18,16 @@ * * *********************************************************************** */ -package lsp.resourceImplementations.collectionCarrier; - -import lsp.LSPCarrierResource; -import lsp.LSPResource; -import lsp.LSPSimulationTracker; -import lsp.LogisticChainElement; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentLeg; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.resourceImplementations.collectionCarrier; + +import org.matsim.freight.logistics.LSPCarrierResource; +import org.matsim.freight.logistics.LSPResource; +import org.matsim.freight.logistics.LSPSimulationTracker; +import org.matsim.freight.logistics.LogisticChainElement; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentLeg; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.matsim.api.core.v01.Id; 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/org/matsim/freight/logistics/resourceImplementations/distributionCarrier/DistributionCarrierResource.java similarity index 96% rename from src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionCarrierResource.java rename to src/main/java/org/matsim/freight/logistics/resourceImplementations/distributionCarrier/DistributionCarrierResource.java index ffc7b59a..708c38a1 100644 --- a/src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionCarrierResource.java +++ b/src/main/java/org/matsim/freight/logistics/resourceImplementations/distributionCarrier/DistributionCarrierResource.java @@ -18,14 +18,14 @@ * * *********************************************************************** */ -package lsp.resourceImplementations.distributionCarrier; +package org.matsim.freight.logistics.resourceImplementations.distributionCarrier; -import lsp.*; 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.freight.carriers.Carrier; import org.matsim.freight.carriers.CarrierVehicle; +import org.matsim.freight.logistics.*; import java.util.Collection; diff --git a/src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionCarrierScheduler.java b/src/main/java/org/matsim/freight/logistics/resourceImplementations/distributionCarrier/DistributionCarrierScheduler.java similarity index 97% rename from src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionCarrierScheduler.java rename to src/main/java/org/matsim/freight/logistics/resourceImplementations/distributionCarrier/DistributionCarrierScheduler.java index f7cf3626..6db7d321 100644 --- a/src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionCarrierScheduler.java +++ b/src/main/java/org/matsim/freight/logistics/resourceImplementations/distributionCarrier/DistributionCarrierScheduler.java @@ -18,13 +18,13 @@ * * *********************************************************************** */ -package lsp.resourceImplementations.distributionCarrier; +package org.matsim.freight.logistics.resourceImplementations.distributionCarrier; -import lsp.*; -import lsp.resourceImplementations.CarrierSchedulerUtils; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.CarrierSchedulerUtils; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.locationtech.jts.util.Assert; import org.matsim.api.core.v01.Id; import org.matsim.freight.carriers.*; diff --git a/src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionCarrierUtils.java b/src/main/java/org/matsim/freight/logistics/resourceImplementations/distributionCarrier/DistributionCarrierUtils.java similarity index 87% rename from src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionCarrierUtils.java rename to src/main/java/org/matsim/freight/logistics/resourceImplementations/distributionCarrier/DistributionCarrierUtils.java index 3107d137..83aa521b 100644 --- a/src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionCarrierUtils.java +++ b/src/main/java/org/matsim/freight/logistics/resourceImplementations/distributionCarrier/DistributionCarrierUtils.java @@ -1,8 +1,8 @@ -package lsp.resourceImplementations.distributionCarrier; +package org.matsim.freight.logistics.resourceImplementations.distributionCarrier; -import lsp.LSPResource; -import lsp.LogisticChainElement; -import lsp.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.LSPResource; +import org.matsim.freight.logistics.LogisticChainElement; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.network.Link; import org.matsim.api.core.v01.network.Network; diff --git a/src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionServiceStartEventHandler.java b/src/main/java/org/matsim/freight/logistics/resourceImplementations/distributionCarrier/DistributionServiceStartEventHandler.java similarity index 90% rename from src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionServiceStartEventHandler.java rename to src/main/java/org/matsim/freight/logistics/resourceImplementations/distributionCarrier/DistributionServiceStartEventHandler.java index 14d79330..ee447d3f 100644 --- a/src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionServiceStartEventHandler.java +++ b/src/main/java/org/matsim/freight/logistics/resourceImplementations/distributionCarrier/DistributionServiceStartEventHandler.java @@ -18,15 +18,15 @@ * * *********************************************************************** */ -package lsp.resourceImplementations.distributionCarrier; - -import lsp.LSPCarrierResource; -import lsp.LSPSimulationTracker; -import lsp.LogisticChainElement; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentLeg; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.resourceImplementations.distributionCarrier; + +import org.matsim.freight.logistics.LSPCarrierResource; +import org.matsim.freight.logistics.LSPSimulationTracker; +import org.matsim.freight.logistics.LogisticChainElement; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentLeg; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.matsim.api.core.v01.Id; 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/org/matsim/freight/logistics/resourceImplementations/distributionCarrier/DistributionTourStartEventHandler.java similarity index 92% rename from src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionTourStartEventHandler.java rename to src/main/java/org/matsim/freight/logistics/resourceImplementations/distributionCarrier/DistributionTourStartEventHandler.java index 1c2e899a..5bfdf005 100644 --- a/src/main/java/lsp/resourceImplementations/distributionCarrier/DistributionTourStartEventHandler.java +++ b/src/main/java/org/matsim/freight/logistics/resourceImplementations/distributionCarrier/DistributionTourStartEventHandler.java @@ -18,14 +18,14 @@ * * *********************************************************************** */ -package lsp.resourceImplementations.distributionCarrier; - -import lsp.LSPCarrierResource; -import lsp.LSPSimulationTracker; -import lsp.LogisticChainElement; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.resourceImplementations.distributionCarrier; + +import org.matsim.freight.logistics.LSPCarrierResource; +import org.matsim.freight.logistics.LSPSimulationTracker; +import org.matsim.freight.logistics.LogisticChainElement; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.matsim.api.core.v01.Id; import org.matsim.freight.carriers.CarrierService; import org.matsim.freight.carriers.Tour; diff --git a/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunCarrierResource.java b/src/main/java/org/matsim/freight/logistics/resourceImplementations/mainRunCarrier/MainRunCarrierResource.java similarity index 94% rename from src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunCarrierResource.java rename to src/main/java/org/matsim/freight/logistics/resourceImplementations/mainRunCarrier/MainRunCarrierResource.java index b76f595b..314795c6 100644 --- a/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunCarrierResource.java +++ b/src/main/java/org/matsim/freight/logistics/resourceImplementations/mainRunCarrier/MainRunCarrierResource.java @@ -18,10 +18,10 @@ * * *********************************************************************** */ -package lsp.resourceImplementations.mainRunCarrier; +package org.matsim.freight.logistics.resourceImplementations.mainRunCarrier; -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.matsim.api.core.v01.Id; diff --git a/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunCarrierScheduler.java b/src/main/java/org/matsim/freight/logistics/resourceImplementations/mainRunCarrier/MainRunCarrierScheduler.java similarity index 97% rename from src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunCarrierScheduler.java rename to src/main/java/org/matsim/freight/logistics/resourceImplementations/mainRunCarrier/MainRunCarrierScheduler.java index 0207e4ec..ba348056 100644 --- a/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunCarrierScheduler.java +++ b/src/main/java/org/matsim/freight/logistics/resourceImplementations/mainRunCarrier/MainRunCarrierScheduler.java @@ -18,13 +18,13 @@ * * *********************************************************************** */ -package lsp.resourceImplementations.mainRunCarrier; +package org.matsim.freight.logistics.resourceImplementations.mainRunCarrier; -import lsp.*; -import lsp.resourceImplementations.CarrierSchedulerUtils; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.CarrierSchedulerUtils; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.network.Link; import org.matsim.core.population.routes.NetworkRoute; diff --git a/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunCarrierUtils.java b/src/main/java/org/matsim/freight/logistics/resourceImplementations/mainRunCarrier/MainRunCarrierUtils.java similarity index 92% rename from src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunCarrierUtils.java rename to src/main/java/org/matsim/freight/logistics/resourceImplementations/mainRunCarrier/MainRunCarrierUtils.java index 6a5961ca..16b9f89f 100644 --- a/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunCarrierUtils.java +++ b/src/main/java/org/matsim/freight/logistics/resourceImplementations/mainRunCarrier/MainRunCarrierUtils.java @@ -1,8 +1,8 @@ -package lsp.resourceImplementations.mainRunCarrier; +package org.matsim.freight.logistics.resourceImplementations.mainRunCarrier; -import lsp.LSPResource; -import lsp.LogisticChainElement; -import lsp.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.LSPResource; +import org.matsim.freight.logistics.LogisticChainElement; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.network.Link; import org.matsim.api.core.v01.network.Network; diff --git a/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunTourEndEventHandler.java b/src/main/java/org/matsim/freight/logistics/resourceImplementations/mainRunCarrier/MainRunTourEndEventHandler.java similarity index 91% rename from src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunTourEndEventHandler.java rename to src/main/java/org/matsim/freight/logistics/resourceImplementations/mainRunCarrier/MainRunTourEndEventHandler.java index f06119c9..2df12a38 100644 --- a/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunTourEndEventHandler.java +++ b/src/main/java/org/matsim/freight/logistics/resourceImplementations/mainRunCarrier/MainRunTourEndEventHandler.java @@ -18,15 +18,15 @@ * * *********************************************************************** */ -package lsp.resourceImplementations.mainRunCarrier; - -import lsp.LSPCarrierResource; -import lsp.LSPSimulationTracker; -import lsp.LogisticChainElement; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentLeg; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.resourceImplementations.mainRunCarrier; + +import org.matsim.freight.logistics.LSPCarrierResource; +import org.matsim.freight.logistics.LSPSimulationTracker; +import org.matsim.freight.logistics.LogisticChainElement; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentLeg; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.matsim.api.core.v01.Id; 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/org/matsim/freight/logistics/resourceImplementations/mainRunCarrier/MainRunTourStartEventHandler.java similarity index 92% rename from src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunTourStartEventHandler.java rename to src/main/java/org/matsim/freight/logistics/resourceImplementations/mainRunCarrier/MainRunTourStartEventHandler.java index 8d268008..56d4f399 100644 --- a/src/main/java/lsp/resourceImplementations/mainRunCarrier/MainRunTourStartEventHandler.java +++ b/src/main/java/org/matsim/freight/logistics/resourceImplementations/mainRunCarrier/MainRunTourStartEventHandler.java @@ -18,15 +18,15 @@ * * *********************************************************************** */ -package lsp.resourceImplementations.mainRunCarrier; - -import lsp.LSPCarrierResource; -import lsp.LSPSimulationTracker; -import lsp.LogisticChainElement; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentLeg; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.resourceImplementations.mainRunCarrier; + +import org.matsim.freight.logistics.LSPCarrierResource; +import org.matsim.freight.logistics.LSPSimulationTracker; +import org.matsim.freight.logistics.LogisticChainElement; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentLeg; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.matsim.api.core.v01.Id; import org.matsim.core.controler.events.AfterMobsimEvent; import org.matsim.core.controler.listener.AfterMobsimListener; diff --git a/src/main/java/lsp/resourceImplementations/transshipmentHub/TranshipmentHubUtils.java b/src/main/java/org/matsim/freight/logistics/resourceImplementations/transshipmentHub/TranshipmentHubUtils.java similarity index 92% rename from src/main/java/lsp/resourceImplementations/transshipmentHub/TranshipmentHubUtils.java rename to src/main/java/org/matsim/freight/logistics/resourceImplementations/transshipmentHub/TranshipmentHubUtils.java index 61c3a9ca..c141b227 100644 --- a/src/main/java/lsp/resourceImplementations/transshipmentHub/TranshipmentHubUtils.java +++ b/src/main/java/org/matsim/freight/logistics/resourceImplementations/transshipmentHub/TranshipmentHubUtils.java @@ -1,8 +1,8 @@ -package lsp.resourceImplementations.transshipmentHub; +package org.matsim.freight.logistics.resourceImplementations.transshipmentHub; -import lsp.LSPResource; -import lsp.LSPResourceScheduler; -import lsp.LogisticChainElement; +import org.matsim.freight.logistics.LSPResource; +import org.matsim.freight.logistics.LSPResourceScheduler; +import org.matsim.freight.logistics.LogisticChainElement; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.Scenario; import org.matsim.api.core.v01.network.Link; diff --git a/src/main/java/lsp/resourceImplementations/transshipmentHub/TransshipmentHubResource.java b/src/main/java/org/matsim/freight/logistics/resourceImplementations/transshipmentHub/TransshipmentHubResource.java similarity index 92% rename from src/main/java/lsp/resourceImplementations/transshipmentHub/TransshipmentHubResource.java rename to src/main/java/org/matsim/freight/logistics/resourceImplementations/transshipmentHub/TransshipmentHubResource.java index ac3d6f8e..a88fe8bc 100644 --- a/src/main/java/lsp/resourceImplementations/transshipmentHub/TransshipmentHubResource.java +++ b/src/main/java/org/matsim/freight/logistics/resourceImplementations/transshipmentHub/TransshipmentHubResource.java @@ -18,12 +18,12 @@ * * *********************************************************************** */ -package lsp.resourceImplementations.transshipmentHub; +package org.matsim.freight.logistics.resourceImplementations.transshipmentHub; -import lsp.LSPDataObject; -import lsp.LSPPlan; -import lsp.LSPResource; -import lsp.LogisticChainElement; +import org.matsim.freight.logistics.LSPDataObject; +import org.matsim.freight.logistics.LSPPlan; +import org.matsim.freight.logistics.LSPResource; +import org.matsim.freight.logistics.LogisticChainElement; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.Scenario; import org.matsim.api.core.v01.network.Link; @@ -38,7 +38,7 @@ *

* An entry is added to the schedule of the shipments that is an instance of * ScheduledShipmentHandle. There, the name of the Resource - * and the client element are entered, so that the way that the {@link lsp.shipment.LSPShipment} + * and the client element are entered, so that the way that the {@link org.matsim.freight.logistics.shipment.LSPShipment} * takes is specified. In addition, the planned start and end time of the handling * (i.e. cross-docking) of the shipment is entered. In the example, cross-docking * starts as soon as the considered LSPShipment arrives at the {@link TransshipmentHubResource} diff --git a/src/main/java/lsp/resourceImplementations/transshipmentHub/TransshipmentHubScheduler.java b/src/main/java/org/matsim/freight/logistics/resourceImplementations/transshipmentHub/TransshipmentHubScheduler.java similarity index 90% rename from src/main/java/lsp/resourceImplementations/transshipmentHub/TransshipmentHubScheduler.java rename to src/main/java/org/matsim/freight/logistics/resourceImplementations/transshipmentHub/TransshipmentHubScheduler.java index 044231d4..bdfacbc7 100644 --- a/src/main/java/lsp/resourceImplementations/transshipmentHub/TransshipmentHubScheduler.java +++ b/src/main/java/org/matsim/freight/logistics/resourceImplementations/transshipmentHub/TransshipmentHubScheduler.java @@ -18,15 +18,15 @@ * * *********************************************************************** */ -package lsp.resourceImplementations.transshipmentHub; - -import lsp.LSPResource; -import lsp.LSPResourceScheduler; -import lsp.LogisticChainElement; -import lsp.LspShipmentWithTime; -import lsp.shipment.ShipmentPlan; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.resourceImplementations.transshipmentHub; + +import org.matsim.freight.logistics.LSPResource; +import org.matsim.freight.logistics.LSPResourceScheduler; +import org.matsim.freight.logistics.LogisticChainElement; +import org.matsim.freight.logistics.LspShipmentWithTime; +import org.matsim.freight.logistics.shipment.ShipmentPlan; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.matsim.api.core.v01.Id; diff --git a/src/main/java/lsp/resourceImplementations/transshipmentHub/TransshipmentHubTourEndEventHandler.java b/src/main/java/org/matsim/freight/logistics/resourceImplementations/transshipmentHub/TransshipmentHubTourEndEventHandler.java similarity index 96% rename from src/main/java/lsp/resourceImplementations/transshipmentHub/TransshipmentHubTourEndEventHandler.java rename to src/main/java/org/matsim/freight/logistics/resourceImplementations/transshipmentHub/TransshipmentHubTourEndEventHandler.java index dd4f3730..45314810 100644 --- a/src/main/java/lsp/resourceImplementations/transshipmentHub/TransshipmentHubTourEndEventHandler.java +++ b/src/main/java/org/matsim/freight/logistics/resourceImplementations/transshipmentHub/TransshipmentHubTourEndEventHandler.java @@ -18,12 +18,12 @@ * * *********************************************************************** */ -package lsp.resourceImplementations.transshipmentHub; +package org.matsim.freight.logistics.resourceImplementations.transshipmentHub; -import lsp.LSPResource; -import lsp.LSPSimulationTracker; -import lsp.LogisticChainElement; -import lsp.shipment.*; +import org.matsim.freight.logistics.LSPResource; +import org.matsim.freight.logistics.LSPSimulationTracker; +import org.matsim.freight.logistics.LogisticChainElement; +import org.matsim.freight.logistics.shipment.*; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.Scenario; import org.matsim.api.core.v01.network.Link; diff --git a/src/main/java/lsp/shipment/LSPShipment.java b/src/main/java/org/matsim/freight/logistics/shipment/LSPShipment.java similarity index 96% rename from src/main/java/lsp/shipment/LSPShipment.java rename to src/main/java/org/matsim/freight/logistics/shipment/LSPShipment.java index c0ce5fc4..0b1dd5c9 100644 --- a/src/main/java/lsp/shipment/LSPShipment.java +++ b/src/main/java/org/matsim/freight/logistics/shipment/LSPShipment.java @@ -18,9 +18,9 @@ * * *********************************************************************** */ -package lsp.shipment; +package org.matsim.freight.logistics.shipment; -import lsp.HasSimulationTrackers; +import org.matsim.freight.logistics.HasSimulationTrackers; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.Identifiable; import org.matsim.api.core.v01.network.Link; diff --git a/src/main/java/lsp/shipment/LSPShipmentImpl.java b/src/main/java/org/matsim/freight/logistics/shipment/LSPShipmentImpl.java similarity index 97% rename from src/main/java/lsp/shipment/LSPShipmentImpl.java rename to src/main/java/org/matsim/freight/logistics/shipment/LSPShipmentImpl.java index 852fe254..da8e2135 100644 --- a/src/main/java/lsp/shipment/LSPShipmentImpl.java +++ b/src/main/java/org/matsim/freight/logistics/shipment/LSPShipmentImpl.java @@ -18,9 +18,9 @@ * * *********************************************************************** */ -package lsp.shipment; +package org.matsim.freight.logistics.shipment; -import lsp.LSPDataObject; +import org.matsim.freight.logistics.LSPDataObject; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.network.Link; import org.matsim.freight.carriers.TimeWindow; diff --git a/src/main/java/lsp/shipment/LoggedShipmentHandle.java b/src/main/java/org/matsim/freight/logistics/shipment/LoggedShipmentHandle.java similarity index 93% rename from src/main/java/lsp/shipment/LoggedShipmentHandle.java rename to src/main/java/org/matsim/freight/logistics/shipment/LoggedShipmentHandle.java index e5dd40d2..3b02fb00 100644 --- a/src/main/java/lsp/shipment/LoggedShipmentHandle.java +++ b/src/main/java/org/matsim/freight/logistics/shipment/LoggedShipmentHandle.java @@ -18,10 +18,10 @@ * * *********************************************************************** */ -package lsp.shipment; +package org.matsim.freight.logistics.shipment; -import lsp.LSPResource; -import lsp.LogisticChainElement; +import org.matsim.freight.logistics.LSPResource; +import org.matsim.freight.logistics.LogisticChainElement; import org.matsim.api.core.v01.Id; diff --git a/src/main/java/lsp/shipment/LoggedShipmentLoad.java b/src/main/java/org/matsim/freight/logistics/shipment/LoggedShipmentLoad.java similarity index 93% rename from src/main/java/lsp/shipment/LoggedShipmentLoad.java rename to src/main/java/org/matsim/freight/logistics/shipment/LoggedShipmentLoad.java index 56d0f4d0..98e27a4e 100644 --- a/src/main/java/lsp/shipment/LoggedShipmentLoad.java +++ b/src/main/java/org/matsim/freight/logistics/shipment/LoggedShipmentLoad.java @@ -18,10 +18,10 @@ * * *********************************************************************** */ -package lsp.shipment; +package org.matsim.freight.logistics.shipment; -import lsp.LSPResource; -import lsp.LogisticChainElement; +import org.matsim.freight.logistics.LSPResource; +import org.matsim.freight.logistics.LogisticChainElement; import org.matsim.api.core.v01.Id; /*package-private*/ class LoggedShipmentLoad implements ShipmentPlanElement { diff --git a/src/main/java/lsp/shipment/LoggedShipmentTransport.java b/src/main/java/org/matsim/freight/logistics/shipment/LoggedShipmentTransport.java similarity index 94% rename from src/main/java/lsp/shipment/LoggedShipmentTransport.java rename to src/main/java/org/matsim/freight/logistics/shipment/LoggedShipmentTransport.java index 21ea4652..fb8c10bc 100644 --- a/src/main/java/lsp/shipment/LoggedShipmentTransport.java +++ b/src/main/java/org/matsim/freight/logistics/shipment/LoggedShipmentTransport.java @@ -18,10 +18,10 @@ * * *********************************************************************** */ -package lsp.shipment; +package org.matsim.freight.logistics.shipment; -import lsp.LSPResource; -import lsp.LogisticChainElement; +import org.matsim.freight.logistics.LSPResource; +import org.matsim.freight.logistics.LogisticChainElement; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.network.Link; import org.matsim.freight.carriers.Carrier; diff --git a/src/main/java/lsp/shipment/LoggedShipmentUnload.java b/src/main/java/org/matsim/freight/logistics/shipment/LoggedShipmentUnload.java similarity index 93% rename from src/main/java/lsp/shipment/LoggedShipmentUnload.java rename to src/main/java/org/matsim/freight/logistics/shipment/LoggedShipmentUnload.java index 4ad7840e..6027e5dc 100644 --- a/src/main/java/lsp/shipment/LoggedShipmentUnload.java +++ b/src/main/java/org/matsim/freight/logistics/shipment/LoggedShipmentUnload.java @@ -18,10 +18,10 @@ * * *********************************************************************** */ -package lsp.shipment; +package org.matsim.freight.logistics.shipment; -import lsp.LSPResource; -import lsp.LogisticChainElement; +import org.matsim.freight.logistics.LSPResource; +import org.matsim.freight.logistics.LogisticChainElement; import org.matsim.api.core.v01.Id; class LoggedShipmentUnload implements ShipmentPlanElement { diff --git a/src/main/java/lsp/shipment/Requirement.java b/src/main/java/org/matsim/freight/logistics/shipment/Requirement.java similarity index 93% rename from src/main/java/lsp/shipment/Requirement.java rename to src/main/java/org/matsim/freight/logistics/shipment/Requirement.java index 42f4b236..170e5eef 100644 --- a/src/main/java/lsp/shipment/Requirement.java +++ b/src/main/java/org/matsim/freight/logistics/shipment/Requirement.java @@ -1,29 +1,29 @@ -/* - * *********************************************************************** * - * * project: org.matsim.* - * * *********************************************************************** * - * * * - * * copyright : (C) 2022 by the members listed in the COPYING, * - * * LICENSE and WARRANTY file. * - * * email : info at matsim dot org * - * * * - * * *********************************************************************** * - * * * - * * This program is free software; you can redistribute it and/or modify * - * * it under the terms of the GNU General Public License as published by * - * * the Free Software Foundation; either version 2 of the License, or * - * * (at your option) any later version. * - * * See also COPYING, LICENSE and WARRANTY file * - * * * - * * *********************************************************************** - */ - -package lsp.shipment; - -import lsp.LogisticChain; - -public interface Requirement { - - boolean checkRequirement(LogisticChain solution); - -} +/* + * *********************************************************************** * + * * project: org.matsim.* + * * *********************************************************************** * + * * * + * * copyright : (C) 2022 by the members listed in the COPYING, * + * * LICENSE and WARRANTY file. * + * * email : info at matsim dot org * + * * * + * * *********************************************************************** * + * * * + * * This program is free software; you can redistribute it and/or modify * + * * it under the terms of the GNU General Public License as published by * + * * the Free Software Foundation; either version 2 of the License, or * + * * (at your option) any later version. * + * * See also COPYING, LICENSE and WARRANTY file * + * * * + * * *********************************************************************** + */ + +package org.matsim.freight.logistics.shipment; + +import org.matsim.freight.logistics.LogisticChain; + +public interface Requirement { + + boolean checkRequirement(LogisticChain solution); + +} diff --git a/src/main/java/lsp/shipment/ScheduledShipmentHandle.java b/src/main/java/org/matsim/freight/logistics/shipment/ScheduledShipmentHandle.java similarity index 93% rename from src/main/java/lsp/shipment/ScheduledShipmentHandle.java rename to src/main/java/org/matsim/freight/logistics/shipment/ScheduledShipmentHandle.java index 72bdc4b5..4d804b09 100644 --- a/src/main/java/lsp/shipment/ScheduledShipmentHandle.java +++ b/src/main/java/org/matsim/freight/logistics/shipment/ScheduledShipmentHandle.java @@ -18,10 +18,10 @@ * * *********************************************************************** */ -package lsp.shipment; +package org.matsim.freight.logistics.shipment; -import lsp.LSPResource; -import lsp.LogisticChainElement; +import org.matsim.freight.logistics.LSPResource; +import org.matsim.freight.logistics.LogisticChainElement; import org.matsim.api.core.v01.Id; class ScheduledShipmentHandle implements ShipmentPlanElement { diff --git a/src/main/java/lsp/shipment/ScheduledShipmentLoad.java b/src/main/java/org/matsim/freight/logistics/shipment/ScheduledShipmentLoad.java similarity index 94% rename from src/main/java/lsp/shipment/ScheduledShipmentLoad.java rename to src/main/java/org/matsim/freight/logistics/shipment/ScheduledShipmentLoad.java index 2d1acff5..d1190969 100644 --- a/src/main/java/lsp/shipment/ScheduledShipmentLoad.java +++ b/src/main/java/org/matsim/freight/logistics/shipment/ScheduledShipmentLoad.java @@ -18,10 +18,10 @@ * * *********************************************************************** */ -package lsp.shipment; +package org.matsim.freight.logistics.shipment; -import lsp.LSPResource; -import lsp.LogisticChainElement; +import org.matsim.freight.logistics.LSPResource; +import org.matsim.freight.logistics.LogisticChainElement; import org.matsim.api.core.v01.Id; import org.matsim.freight.carriers.Carrier; import org.matsim.freight.carriers.CarrierService; diff --git a/src/main/java/lsp/shipment/ScheduledShipmentTransport.java b/src/main/java/org/matsim/freight/logistics/shipment/ScheduledShipmentTransport.java similarity index 95% rename from src/main/java/lsp/shipment/ScheduledShipmentTransport.java rename to src/main/java/org/matsim/freight/logistics/shipment/ScheduledShipmentTransport.java index 95632b74..126e2698 100644 --- a/src/main/java/lsp/shipment/ScheduledShipmentTransport.java +++ b/src/main/java/org/matsim/freight/logistics/shipment/ScheduledShipmentTransport.java @@ -18,10 +18,10 @@ * * *********************************************************************** */ -package lsp.shipment; +package org.matsim.freight.logistics.shipment; -import lsp.LSPResource; -import lsp.LogisticChainElement; +import org.matsim.freight.logistics.LSPResource; +import org.matsim.freight.logistics.LogisticChainElement; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.network.Link; import org.matsim.freight.carriers.Carrier; diff --git a/src/main/java/lsp/shipment/ScheduledShipmentUnload.java b/src/main/java/org/matsim/freight/logistics/shipment/ScheduledShipmentUnload.java similarity index 94% rename from src/main/java/lsp/shipment/ScheduledShipmentUnload.java rename to src/main/java/org/matsim/freight/logistics/shipment/ScheduledShipmentUnload.java index e26c4b3d..79c58185 100644 --- a/src/main/java/lsp/shipment/ScheduledShipmentUnload.java +++ b/src/main/java/org/matsim/freight/logistics/shipment/ScheduledShipmentUnload.java @@ -18,10 +18,10 @@ * * *********************************************************************** */ -package lsp.shipment; +package org.matsim.freight.logistics.shipment; -import lsp.LSPResource; -import lsp.LogisticChainElement; +import org.matsim.freight.logistics.LSPResource; +import org.matsim.freight.logistics.LogisticChainElement; import org.matsim.api.core.v01.Id; import org.matsim.freight.carriers.Carrier; import org.matsim.freight.carriers.CarrierService; diff --git a/src/main/java/lsp/shipment/ShipmentLeg.java b/src/main/java/org/matsim/freight/logistics/shipment/ShipmentLeg.java similarity index 90% rename from src/main/java/lsp/shipment/ShipmentLeg.java rename to src/main/java/org/matsim/freight/logistics/shipment/ShipmentLeg.java index e7a7da44..706c005e 100644 --- a/src/main/java/lsp/shipment/ShipmentLeg.java +++ b/src/main/java/org/matsim/freight/logistics/shipment/ShipmentLeg.java @@ -1,4 +1,4 @@ -package lsp.shipment; +package org.matsim.freight.logistics.shipment; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.network.Link; diff --git a/src/main/java/lsp/shipment/ShipmentPlan.java b/src/main/java/org/matsim/freight/logistics/shipment/ShipmentPlan.java similarity index 94% rename from src/main/java/lsp/shipment/ShipmentPlan.java rename to src/main/java/org/matsim/freight/logistics/shipment/ShipmentPlan.java index 63b4468d..d5cbbbc5 100644 --- a/src/main/java/lsp/shipment/ShipmentPlan.java +++ b/src/main/java/org/matsim/freight/logistics/shipment/ShipmentPlan.java @@ -18,9 +18,9 @@ * * *********************************************************************** */ -package lsp.shipment; +package org.matsim.freight.logistics.shipment; -import lsp.HasBackpointer; +import org.matsim.freight.logistics.HasBackpointer; import org.matsim.api.core.v01.Id; import java.util.Map; diff --git a/src/main/java/lsp/shipment/ShipmentPlanElement.java b/src/main/java/org/matsim/freight/logistics/shipment/ShipmentPlanElement.java similarity index 91% rename from src/main/java/lsp/shipment/ShipmentPlanElement.java rename to src/main/java/org/matsim/freight/logistics/shipment/ShipmentPlanElement.java index 455ed8fc..93f82334 100644 --- a/src/main/java/lsp/shipment/ShipmentPlanElement.java +++ b/src/main/java/org/matsim/freight/logistics/shipment/ShipmentPlanElement.java @@ -18,10 +18,10 @@ * * *********************************************************************** */ -package lsp.shipment; +package org.matsim.freight.logistics.shipment; -import lsp.LSPResource; -import lsp.LogisticChainElement; +import org.matsim.freight.logistics.LSPResource; +import org.matsim.freight.logistics.LogisticChainElement; import org.matsim.api.core.v01.Id; public interface ShipmentPlanElement { diff --git a/src/main/java/lsp/shipment/ShipmentPlanElementComparator.java b/src/main/java/org/matsim/freight/logistics/shipment/ShipmentPlanElementComparator.java similarity index 97% rename from src/main/java/lsp/shipment/ShipmentPlanElementComparator.java rename to src/main/java/org/matsim/freight/logistics/shipment/ShipmentPlanElementComparator.java index f52acde2..6262908c 100644 --- a/src/main/java/lsp/shipment/ShipmentPlanElementComparator.java +++ b/src/main/java/org/matsim/freight/logistics/shipment/ShipmentPlanElementComparator.java @@ -18,7 +18,7 @@ * * *********************************************************************** */ -package lsp.shipment; +package org.matsim.freight.logistics.shipment; import java.util.Comparator; diff --git a/src/main/java/lsp/shipment/ShipmentPlanImpl.java b/src/main/java/org/matsim/freight/logistics/shipment/ShipmentPlanImpl.java similarity index 98% rename from src/main/java/lsp/shipment/ShipmentPlanImpl.java rename to src/main/java/org/matsim/freight/logistics/shipment/ShipmentPlanImpl.java index b81d51cd..13da1778 100644 --- a/src/main/java/lsp/shipment/ShipmentPlanImpl.java +++ b/src/main/java/org/matsim/freight/logistics/shipment/ShipmentPlanImpl.java @@ -18,7 +18,7 @@ * * *********************************************************************** */ -package lsp.shipment; +package org.matsim.freight.logistics.shipment; import org.matsim.api.core.v01.Id; diff --git a/src/main/java/lsp/shipment/ShipmentUtils.java b/src/main/java/org/matsim/freight/logistics/shipment/ShipmentUtils.java similarity index 98% rename from src/main/java/lsp/shipment/ShipmentUtils.java rename to src/main/java/org/matsim/freight/logistics/shipment/ShipmentUtils.java index cf2ab8df..b1b33f00 100644 --- a/src/main/java/lsp/shipment/ShipmentUtils.java +++ b/src/main/java/org/matsim/freight/logistics/shipment/ShipmentUtils.java @@ -18,11 +18,11 @@ * * *********************************************************************** */ -package lsp.shipment; +package org.matsim.freight.logistics.shipment; -import lsp.LSPPlan; -import lsp.LSPResource; -import lsp.LogisticChainElement; +import org.matsim.freight.logistics.LSPPlan; +import org.matsim.freight.logistics.LSPResource; +import org.matsim.freight.logistics.LogisticChainElement; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.network.Link; import org.matsim.freight.carriers.Carrier; diff --git a/src/test/java/adapterTests/CollectionResourceTest.java b/src/test/java/org/matsim/freight/logistics/adapterTests/CollectionResourceTest.java similarity index 96% rename from src/test/java/adapterTests/CollectionResourceTest.java rename to src/test/java/org/matsim/freight/logistics/adapterTests/CollectionResourceTest.java index 5228775b..2007a608 100644 --- a/src/test/java/adapterTests/CollectionResourceTest.java +++ b/src/test/java/org/matsim/freight/logistics/adapterTests/CollectionResourceTest.java @@ -18,10 +18,10 @@ * * *********************************************************************** */ -package adapterTests; +package org.matsim.freight.logistics.adapterTests; -import lsp.LSPCarrierResource; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.LSPCarrierResource; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; import org.junit.Before; import org.junit.Test; import org.matsim.api.core.v01.Id; diff --git a/src/test/java/adapterTests/DistributionResourceTest.java b/src/test/java/org/matsim/freight/logistics/adapterTests/DistributionResourceTest.java similarity index 97% rename from src/test/java/adapterTests/DistributionResourceTest.java rename to src/test/java/org/matsim/freight/logistics/adapterTests/DistributionResourceTest.java index 74bb41dd..2cc9ed98 100644 --- a/src/test/java/adapterTests/DistributionResourceTest.java +++ b/src/test/java/org/matsim/freight/logistics/adapterTests/DistributionResourceTest.java @@ -18,10 +18,10 @@ * * *********************************************************************** */ -package adapterTests; +package org.matsim.freight.logistics.adapterTests; -import lsp.LSPCarrierResource; -import lsp.resourceImplementations.distributionCarrier.DistributionCarrierUtils; +import org.matsim.freight.logistics.LSPCarrierResource; +import org.matsim.freight.logistics.resourceImplementations.distributionCarrier.DistributionCarrierUtils; import org.junit.Before; import org.junit.Test; import org.matsim.api.core.v01.Id; diff --git a/src/test/java/adapterTests/MainRunResourceTest.java b/src/test/java/org/matsim/freight/logistics/adapterTests/MainRunResourceTest.java similarity index 96% rename from src/test/java/adapterTests/MainRunResourceTest.java rename to src/test/java/org/matsim/freight/logistics/adapterTests/MainRunResourceTest.java index 837b39e4..d02760aa 100644 --- a/src/test/java/adapterTests/MainRunResourceTest.java +++ b/src/test/java/org/matsim/freight/logistics/adapterTests/MainRunResourceTest.java @@ -18,10 +18,10 @@ * * *********************************************************************** */ -package adapterTests; +package org.matsim.freight.logistics.adapterTests; -import lsp.LSPCarrierResource; -import lsp.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; +import org.matsim.freight.logistics.LSPCarrierResource; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; import org.junit.Before; import org.junit.Test; import org.matsim.api.core.v01.Id; diff --git a/src/test/java/example/lsp/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirectTest.java b/src/test/java/org/matsim/freight/logistics/example/lsp/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirectTest.java similarity index 93% rename from src/test/java/example/lsp/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirectTest.java rename to src/test/java/org/matsim/freight/logistics/example/lsp/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirectTest.java index e373eb33..f5d2c366 100644 --- a/src/test/java/example/lsp/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirectTest.java +++ b/src/test/java/org/matsim/freight/logistics/example/lsp/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirectTest.java @@ -18,9 +18,9 @@ * * *********************************************************************** */ -package example.lsp.initialPlans; +package org.matsim.freight.logistics.example.lsp.initialPlans; -import example.lsp.initialPlans.ExampleSchedulingOfTransportChainHubsVsDirect.SolutionType; +import org.matsim.freight.logistics.example.lsp.initialPlans.ExampleSchedulingOfTransportChainHubsVsDirect.SolutionType; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.Rule; diff --git a/src/test/java/example/lsp/initialPlans/ExampleTwoEchelonGridTest.java b/src/test/java/org/matsim/freight/logistics/example/lsp/initialPlans/ExampleTwoEchelonGridTest.java similarity index 96% rename from src/test/java/example/lsp/initialPlans/ExampleTwoEchelonGridTest.java rename to src/test/java/org/matsim/freight/logistics/example/lsp/initialPlans/ExampleTwoEchelonGridTest.java index a1d9eda3..303d3c68 100644 --- a/src/test/java/example/lsp/initialPlans/ExampleTwoEchelonGridTest.java +++ b/src/test/java/org/matsim/freight/logistics/example/lsp/initialPlans/ExampleTwoEchelonGridTest.java @@ -18,7 +18,7 @@ * * *********************************************************************** */ -package example.lsp.initialPlans; +package org.matsim.freight.logistics.example.lsp.initialPlans; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/example/lsp/lspReplanning/CollectionLSPReplanningTest.java b/src/test/java/org/matsim/freight/logistics/example/lsp/lspReplanning/CollectionLSPReplanningTest.java similarity index 94% rename from src/test/java/example/lsp/lspReplanning/CollectionLSPReplanningTest.java rename to src/test/java/org/matsim/freight/logistics/example/lsp/lspReplanning/CollectionLSPReplanningTest.java index 8216009d..8be332e7 100644 --- a/src/test/java/example/lsp/lspReplanning/CollectionLSPReplanningTest.java +++ b/src/test/java/org/matsim/freight/logistics/example/lsp/lspReplanning/CollectionLSPReplanningTest.java @@ -18,13 +18,15 @@ * * *********************************************************************** */ -package example.lsp.lspReplanning; - -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.example.lsp.lspReplanning; + +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.example.lsp.lspReplanning.MaybeTodayAssigner; +import org.matsim.freight.logistics.example.lsp.lspReplanning.TomorrowShipmentAssignerStrategyFactory; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/example/lsp/lspScoring/CollectionLSPScoringTest.java b/src/test/java/org/matsim/freight/logistics/example/lsp/lspScoring/CollectionLSPScoringTest.java similarity index 92% rename from src/test/java/example/lsp/lspScoring/CollectionLSPScoringTest.java rename to src/test/java/org/matsim/freight/logistics/example/lsp/lspScoring/CollectionLSPScoringTest.java index eb6e905f..5bd7adeb 100644 --- a/src/test/java/example/lsp/lspScoring/CollectionLSPScoringTest.java +++ b/src/test/java/org/matsim/freight/logistics/example/lsp/lspScoring/CollectionLSPScoringTest.java @@ -18,12 +18,13 @@ * * *********************************************************************** */ -package example.lsp.lspScoring; +package org.matsim.freight.logistics.example.lsp.lspScoring; -import lsp.*; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentUtils; +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.example.lsp.lspScoring.ExampleLSPScoring; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -45,8 +46,8 @@ import java.util.*; -import static lsp.resourceImplementations.ResourceImplementationUtils.createDefaultSimpleForwardLogisticChainScheduler; -import static lsp.resourceImplementations.ResourceImplementationUtils.createSingleLogisticChainShipmentAssigner; +import static org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils.createDefaultSimpleForwardLogisticChainScheduler; +import static org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils.createSingleLogisticChainShipmentAssigner; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/src/test/java/example/lsp/lspScoring/ExampleLSPScoringTest.java b/src/test/java/org/matsim/freight/logistics/example/lsp/lspScoring/ExampleLSPScoringTest.java similarity index 83% rename from src/test/java/example/lsp/lspScoring/ExampleLSPScoringTest.java rename to src/test/java/org/matsim/freight/logistics/example/lsp/lspScoring/ExampleLSPScoringTest.java index 8ce2b916..4a22e014 100644 --- a/src/test/java/example/lsp/lspScoring/ExampleLSPScoringTest.java +++ b/src/test/java/org/matsim/freight/logistics/example/lsp/lspScoring/ExampleLSPScoringTest.java @@ -1,7 +1,7 @@ -package example.lsp.lspScoring; +package org.matsim.freight.logistics.example.lsp.lspScoring; -import lsp.LSP; -import lsp.LSPUtils; +import org.matsim.freight.logistics.LSP; +import org.matsim.freight.logistics.LSPUtils; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; @@ -9,6 +9,7 @@ import org.matsim.core.config.Config; import org.matsim.core.config.groups.VspExperimentalConfigGroup; import org.matsim.core.controler.Controler; +import org.matsim.freight.logistics.example.lsp.lspScoring.ExampleLSPScoring; import org.matsim.testcases.MatsimTestUtils; public class ExampleLSPScoringTest { diff --git a/src/test/java/example/lsp/lspScoring/MultipleIterationsCollectionLSPScoringTest.java b/src/test/java/org/matsim/freight/logistics/example/lsp/lspScoring/MultipleIterationsCollectionLSPScoringTest.java similarity index 95% rename from src/test/java/example/lsp/lspScoring/MultipleIterationsCollectionLSPScoringTest.java rename to src/test/java/org/matsim/freight/logistics/example/lsp/lspScoring/MultipleIterationsCollectionLSPScoringTest.java index cea3cfeb..82c3f074 100644 --- a/src/test/java/example/lsp/lspScoring/MultipleIterationsCollectionLSPScoringTest.java +++ b/src/test/java/org/matsim/freight/logistics/example/lsp/lspScoring/MultipleIterationsCollectionLSPScoringTest.java @@ -18,13 +18,14 @@ * * *********************************************************************** */ -package example.lsp.lspScoring; - -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.example.lsp.lspScoring; + +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.example.lsp.lspScoring.ExampleLSPScoring; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/example/lsp/mobsimExamples/ExampleMobsimOfSimpleLSPTest.java b/src/test/java/org/matsim/freight/logistics/example/lsp/mobsimExamples/ExampleMobsimOfSimpleLSPTest.java similarity index 93% rename from src/test/java/example/lsp/mobsimExamples/ExampleMobsimOfSimpleLSPTest.java rename to src/test/java/org/matsim/freight/logistics/example/lsp/mobsimExamples/ExampleMobsimOfSimpleLSPTest.java index bd7662ca..8f0bf78d 100644 --- a/src/test/java/example/lsp/mobsimExamples/ExampleMobsimOfSimpleLSPTest.java +++ b/src/test/java/org/matsim/freight/logistics/example/lsp/mobsimExamples/ExampleMobsimOfSimpleLSPTest.java @@ -1,4 +1,4 @@ -package example.lsp.mobsimExamples; +package org.matsim.freight.logistics.example.lsp.mobsimExamples; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/example/lsp/multipleChains/MultipleChainsReplanningTest.java b/src/test/java/org/matsim/freight/logistics/example/lsp/multipleChains/MultipleChainsReplanningTest.java similarity index 92% rename from src/test/java/example/lsp/multipleChains/MultipleChainsReplanningTest.java rename to src/test/java/org/matsim/freight/logistics/example/lsp/multipleChains/MultipleChainsReplanningTest.java index f67b405a..dc0fbb44 100644 --- a/src/test/java/example/lsp/multipleChains/MultipleChainsReplanningTest.java +++ b/src/test/java/org/matsim/freight/logistics/example/lsp/multipleChains/MultipleChainsReplanningTest.java @@ -1,11 +1,15 @@ -package example.lsp.multipleChains; - -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.distributionCarrier.DistributionCarrierUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentPlan; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.example.lsp.multipleChains; + +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.example.lsp.multipleChains.EventBasedCarrierScorer_MultipleChains; +import org.matsim.freight.logistics.example.lsp.multipleChains.MultipleChainsUtils; +import org.matsim.freight.logistics.example.lsp.multipleChains.MyLSPScorer; +import org.matsim.freight.logistics.example.lsp.multipleChains.RandomShiftingStrategyFactory; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.distributionCarrier.DistributionCarrierUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentPlan; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/example/lsp/multipleChains/WorstPlanSelectorTest.java b/src/test/java/org/matsim/freight/logistics/example/lsp/multipleChains/WorstPlanSelectorTest.java similarity index 95% rename from src/test/java/example/lsp/multipleChains/WorstPlanSelectorTest.java rename to src/test/java/org/matsim/freight/logistics/example/lsp/multipleChains/WorstPlanSelectorTest.java index a0969f82..5289d416 100644 --- a/src/test/java/example/lsp/multipleChains/WorstPlanSelectorTest.java +++ b/src/test/java/org/matsim/freight/logistics/example/lsp/multipleChains/WorstPlanSelectorTest.java @@ -1,10 +1,10 @@ -package example.lsp.multipleChains; +package org.matsim.freight.logistics.example.lsp.multipleChains; -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.distributionCarrier.DistributionCarrierUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentUtils; +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.distributionCarrier.DistributionCarrierUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -220,7 +220,7 @@ private static LSP createLSP(Scenario scenario) { lspPlans.add(lspPlan_singleChain); lspPlans.add(lspPlan_twoChains); - LSP lsp = LSPUtils.LSPBuilder.getInstance(Id.create("lsp", LSP.class)) + LSP lsp = LSPUtils.LSPBuilder.getInstance(Id.create("org/matsim/freight/logistics/lsp", LSP.class)) .setInitialPlan(lspPlan_singleChain) .setLogisticChainScheduler(ResourceImplementationUtils.createDefaultSimpleForwardLogisticChainScheduler(createResourcesListFromLSPPlans(lspPlans))) .build(); diff --git a/src/test/java/example/lsp/simulationTrackers/CollectionTrackerTest.java b/src/test/java/org/matsim/freight/logistics/example/lsp/simulationTrackers/CollectionTrackerTest.java similarity index 97% rename from src/test/java/example/lsp/simulationTrackers/CollectionTrackerTest.java rename to src/test/java/org/matsim/freight/logistics/example/lsp/simulationTrackers/CollectionTrackerTest.java index 5789b2d4..9da41195 100644 --- a/src/test/java/example/lsp/simulationTrackers/CollectionTrackerTest.java +++ b/src/test/java/org/matsim/freight/logistics/example/lsp/simulationTrackers/CollectionTrackerTest.java @@ -18,13 +18,13 @@ * * *********************************************************************** */ -package example.lsp.simulationTrackers; +package org.matsim.freight.logistics.example.lsp.simulationTrackers; -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentUtils; +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.Before; diff --git a/src/test/java/example/lspAndDemand/requirementsChecking/AssignerRequirementsTest.java b/src/test/java/org/matsim/freight/logistics/example/lspAndDemand/requirementsChecking/AssignerRequirementsTest.java similarity index 92% rename from src/test/java/example/lspAndDemand/requirementsChecking/AssignerRequirementsTest.java rename to src/test/java/org/matsim/freight/logistics/example/lspAndDemand/requirementsChecking/AssignerRequirementsTest.java index cfeeca15..47ff4864 100644 --- a/src/test/java/example/lspAndDemand/requirementsChecking/AssignerRequirementsTest.java +++ b/src/test/java/org/matsim/freight/logistics/example/lspAndDemand/requirementsChecking/AssignerRequirementsTest.java @@ -18,13 +18,16 @@ * * *********************************************************************** */ -package example.lspAndDemand.requirementsChecking; - -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.example.lspAndDemand.requirementsChecking; + +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.example.lspAndDemand.requirementsChecking.BlueRequirement; +import org.matsim.freight.logistics.example.lspAndDemand.requirementsChecking.RedRequirement; +import org.matsim.freight.logistics.example.lspAndDemand.requirementsChecking.RequirementsAssigner; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.junit.Before; import org.junit.Test; import org.matsim.api.core.v01.Id; diff --git a/src/test/java/lsp/io/LSPReadWriteTest.java b/src/test/java/org/matsim/freight/logistics/io/LSPReadWriteTest.java similarity index 96% rename from src/test/java/lsp/io/LSPReadWriteTest.java rename to src/test/java/org/matsim/freight/logistics/io/LSPReadWriteTest.java index 0ffbd41c..c92768da 100644 --- a/src/test/java/lsp/io/LSPReadWriteTest.java +++ b/src/test/java/org/matsim/freight/logistics/io/LSPReadWriteTest.java @@ -1,6 +1,6 @@ -package lsp.io; +package org.matsim.freight.logistics.io; -import lsp.LSPs; +import org.matsim.freight.logistics.LSPs; import org.junit.Rule; import org.junit.Test; import org.matsim.freight.carriers.CarrierPlanXmlReader; diff --git a/src/test/java/logisticChainElementTests/CollectionElementTest.java b/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/CollectionElementTest.java similarity index 93% rename from src/test/java/logisticChainElementTests/CollectionElementTest.java rename to src/test/java/org/matsim/freight/logistics/logisticChainElementTests/CollectionElementTest.java index 73ff917e..898ece37 100644 --- a/src/test/java/logisticChainElementTests/CollectionElementTest.java +++ b/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/CollectionElementTest.java @@ -18,12 +18,12 @@ * * *********************************************************************** */ -package logisticChainElementTests; +package org.matsim.freight.logistics.logisticChainElementTests; -import lsp.LSPCarrierResource; -import lsp.LSPUtils; -import lsp.LogisticChainElement; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.LSPCarrierResource; +import org.matsim.freight.logistics.LSPUtils; +import org.matsim.freight.logistics.LogisticChainElement; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; import org.junit.Before; import org.junit.Test; import org.matsim.api.core.v01.Id; diff --git a/src/test/java/logisticChainElementTests/DistributionElementTest.java b/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/DistributionElementTest.java similarity index 93% rename from src/test/java/logisticChainElementTests/DistributionElementTest.java rename to src/test/java/org/matsim/freight/logistics/logisticChainElementTests/DistributionElementTest.java index b43ad9e4..27262653 100644 --- a/src/test/java/logisticChainElementTests/DistributionElementTest.java +++ b/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/DistributionElementTest.java @@ -18,13 +18,13 @@ * * *********************************************************************** */ -package logisticChainElementTests; +package org.matsim.freight.logistics.logisticChainElementTests; -import lsp.LSPCarrierResource; -import lsp.LSPResource; -import lsp.LSPUtils; -import lsp.LogisticChainElement; -import lsp.resourceImplementations.distributionCarrier.DistributionCarrierUtils; +import org.matsim.freight.logistics.LSPCarrierResource; +import org.matsim.freight.logistics.LSPResource; +import org.matsim.freight.logistics.LSPUtils; +import org.matsim.freight.logistics.LogisticChainElement; +import org.matsim.freight.logistics.resourceImplementations.distributionCarrier.DistributionCarrierUtils; import org.junit.Before; import org.junit.Test; import org.matsim.api.core.v01.Id; diff --git a/src/test/java/logisticChainElementTests/MainRunElementTest.java b/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/MainRunElementTest.java similarity index 94% rename from src/test/java/logisticChainElementTests/MainRunElementTest.java rename to src/test/java/org/matsim/freight/logistics/logisticChainElementTests/MainRunElementTest.java index 28406a25..adf0e228 100644 --- a/src/test/java/logisticChainElementTests/MainRunElementTest.java +++ b/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/MainRunElementTest.java @@ -18,12 +18,12 @@ * * *********************************************************************** */ -package logisticChainElementTests; +package org.matsim.freight.logistics.logisticChainElementTests; -import lsp.LSPResource; -import lsp.LSPUtils; -import lsp.LogisticChainElement; -import lsp.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; +import org.matsim.freight.logistics.LSPResource; +import org.matsim.freight.logistics.LSPUtils; +import org.matsim.freight.logistics.LogisticChainElement; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; import org.junit.Before; import org.junit.Test; import org.matsim.api.core.v01.Id; diff --git a/src/test/java/logisticChainElementTests/SecondHubElementTest.java b/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/SecondHubElementTest.java similarity index 90% rename from src/test/java/logisticChainElementTests/SecondHubElementTest.java rename to src/test/java/org/matsim/freight/logistics/logisticChainElementTests/SecondHubElementTest.java index c2f6c755..85f7938e 100644 --- a/src/test/java/logisticChainElementTests/SecondHubElementTest.java +++ b/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/SecondHubElementTest.java @@ -18,12 +18,12 @@ * * *********************************************************************** */ -package logisticChainElementTests; +package org.matsim.freight.logistics.logisticChainElementTests; -import lsp.LSPResource; -import lsp.LSPUtils; -import lsp.LogisticChainElement; -import lsp.resourceImplementations.transshipmentHub.TranshipmentHubUtils; +import org.matsim.freight.logistics.LSPResource; +import org.matsim.freight.logistics.LSPUtils; +import org.matsim.freight.logistics.LogisticChainElement; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TranshipmentHubUtils; import org.junit.Before; import org.junit.Test; import org.matsim.api.core.v01.Id; diff --git a/src/test/java/logisticChainTests/CollectionChainTest.java b/src/test/java/org/matsim/freight/logistics/logisticChainTests/CollectionChainTest.java similarity index 93% rename from src/test/java/logisticChainTests/CollectionChainTest.java rename to src/test/java/org/matsim/freight/logistics/logisticChainTests/CollectionChainTest.java index a3761276..3d1c9f5b 100644 --- a/src/test/java/logisticChainTests/CollectionChainTest.java +++ b/src/test/java/org/matsim/freight/logistics/logisticChainTests/CollectionChainTest.java @@ -18,13 +18,13 @@ * * *********************************************************************** */ -package logisticChainTests; +package org.matsim.freight.logistics.logisticChainTests; -import lsp.LSPCarrierResource; -import lsp.LSPUtils; -import lsp.LogisticChain; -import lsp.LogisticChainElement; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.LSPCarrierResource; +import org.matsim.freight.logistics.LSPUtils; +import org.matsim.freight.logistics.LogisticChain; +import org.matsim.freight.logistics.LogisticChainElement; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; import org.junit.Before; import org.junit.Test; import org.matsim.api.core.v01.Id; diff --git a/src/test/java/logisticChainTests/CompleteLogisticChainTest.java b/src/test/java/org/matsim/freight/logistics/logisticChainTests/CompleteLogisticChainTest.java similarity index 95% rename from src/test/java/logisticChainTests/CompleteLogisticChainTest.java rename to src/test/java/org/matsim/freight/logistics/logisticChainTests/CompleteLogisticChainTest.java index 26512ec9..69b18c69 100644 --- a/src/test/java/logisticChainTests/CompleteLogisticChainTest.java +++ b/src/test/java/org/matsim/freight/logistics/logisticChainTests/CompleteLogisticChainTest.java @@ -18,16 +18,16 @@ * * *********************************************************************** */ -package logisticChainTests; - -import lsp.LSPResource; -import lsp.LSPUtils; -import lsp.LogisticChain; -import lsp.LogisticChainElement; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.resourceImplementations.distributionCarrier.DistributionCarrierUtils; -import lsp.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; -import lsp.resourceImplementations.transshipmentHub.TranshipmentHubUtils; +package org.matsim.freight.logistics.logisticChainTests; + +import org.matsim.freight.logistics.LSPResource; +import org.matsim.freight.logistics.LSPUtils; +import org.matsim.freight.logistics.LogisticChain; +import org.matsim.freight.logistics.LogisticChainElement; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.distributionCarrier.DistributionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TranshipmentHubUtils; import org.junit.Before; import org.junit.Test; import org.matsim.api.core.v01.Id; diff --git a/src/test/java/lspCreationTests/CollectionLSPCreationTest.java b/src/test/java/org/matsim/freight/logistics/lspCreationTests/CollectionLSPCreationTest.java similarity index 95% rename from src/test/java/lspCreationTests/CollectionLSPCreationTest.java rename to src/test/java/org/matsim/freight/logistics/lspCreationTests/CollectionLSPCreationTest.java index 1518040d..3a50fc83 100644 --- a/src/test/java/lspCreationTests/CollectionLSPCreationTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspCreationTests/CollectionLSPCreationTest.java @@ -18,11 +18,11 @@ * * *********************************************************************** */ -package lspCreationTests; +package org.matsim.freight.logistics.lspCreationTests; -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; import org.junit.Before; import org.junit.Test; import org.matsim.api.core.v01.Id; diff --git a/src/test/java/lspCreationTests/CompleteLSPCreationTest.java b/src/test/java/org/matsim/freight/logistics/lspCreationTests/CompleteLSPCreationTest.java similarity index 95% rename from src/test/java/lspCreationTests/CompleteLSPCreationTest.java rename to src/test/java/org/matsim/freight/logistics/lspCreationTests/CompleteLSPCreationTest.java index 1d4d0f0f..d8101dcc 100644 --- a/src/test/java/lspCreationTests/CompleteLSPCreationTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspCreationTests/CompleteLSPCreationTest.java @@ -18,14 +18,14 @@ * * *********************************************************************** */ -package lspCreationTests; - -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.resourceImplementations.distributionCarrier.DistributionCarrierUtils; -import lsp.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; -import lsp.resourceImplementations.transshipmentHub.TranshipmentHubUtils; +package org.matsim.freight.logistics.lspCreationTests; + +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.distributionCarrier.DistributionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TranshipmentHubUtils; import org.junit.Before; import org.junit.Test; import org.matsim.api.core.v01.Id; diff --git a/src/test/java/lspMobsimTests/CollectionLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/CollectionLSPMobsimTest.java similarity index 94% rename from src/test/java/lspMobsimTests/CollectionLSPMobsimTest.java rename to src/test/java/org/matsim/freight/logistics/lspMobsimTests/CollectionLSPMobsimTest.java index a2abe807..08b7d190 100644 --- a/src/test/java/lspMobsimTests/CollectionLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/CollectionLSPMobsimTest.java @@ -18,13 +18,13 @@ * * *********************************************************************** */ -package lspMobsimTests; +package org.matsim.freight.logistics.lspMobsimTests; -import lsp.*; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.Before; @@ -53,8 +53,8 @@ import java.util.LinkedList; import java.util.List; -import static lsp.resourceImplementations.ResourceImplementationUtils.createDefaultSimpleForwardLogisticChainScheduler; -import static lsp.resourceImplementations.ResourceImplementationUtils.createSingleLogisticChainShipmentAssigner; +import static org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils.createDefaultSimpleForwardLogisticChainScheduler; +import static org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils.createSingleLogisticChainShipmentAssigner; import static org.junit.Assert.*; public class CollectionLSPMobsimTest { diff --git a/src/test/java/lspMobsimTests/CompleteLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/CompleteLSPMobsimTest.java similarity index 95% rename from src/test/java/lspMobsimTests/CompleteLSPMobsimTest.java rename to src/test/java/org/matsim/freight/logistics/lspMobsimTests/CompleteLSPMobsimTest.java index e2b09e8c..ca86f5bb 100644 --- a/src/test/java/lspMobsimTests/CompleteLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/CompleteLSPMobsimTest.java @@ -18,17 +18,17 @@ * * *********************************************************************** */ -package lspMobsimTests; - -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.resourceImplementations.distributionCarrier.DistributionCarrierUtils; -import lsp.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; -import lsp.resourceImplementations.transshipmentHub.TranshipmentHubUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.lspMobsimTests; + +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.distributionCarrier.DistributionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TranshipmentHubUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/lspMobsimTests/FirstReloadLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/FirstReloadLSPMobsimTest.java similarity index 95% rename from src/test/java/lspMobsimTests/FirstReloadLSPMobsimTest.java rename to src/test/java/org/matsim/freight/logistics/lspMobsimTests/FirstReloadLSPMobsimTest.java index ea624fc2..e4983575 100644 --- a/src/test/java/lspMobsimTests/FirstReloadLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/FirstReloadLSPMobsimTest.java @@ -18,15 +18,15 @@ * * *********************************************************************** */ -package lspMobsimTests; - -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.resourceImplementations.transshipmentHub.TranshipmentHubUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.lspMobsimTests; + +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TranshipmentHubUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/lspMobsimTests/MainRunLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MainRunLSPMobsimTest.java similarity index 95% rename from src/test/java/lspMobsimTests/MainRunLSPMobsimTest.java rename to src/test/java/org/matsim/freight/logistics/lspMobsimTests/MainRunLSPMobsimTest.java index 33ec5657..f001e964 100644 --- a/src/test/java/lspMobsimTests/MainRunLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MainRunLSPMobsimTest.java @@ -18,16 +18,16 @@ * * *********************************************************************** */ -package lspMobsimTests; - -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; -import lsp.resourceImplementations.transshipmentHub.TranshipmentHubUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.lspMobsimTests; + +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TranshipmentHubUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/lspMobsimTests/MainRunOnlyLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MainRunOnlyLSPMobsimTest.java similarity index 95% rename from src/test/java/lspMobsimTests/MainRunOnlyLSPMobsimTest.java rename to src/test/java/org/matsim/freight/logistics/lspMobsimTests/MainRunOnlyLSPMobsimTest.java index 2a5e6c0a..6f9dfb9a 100644 --- a/src/test/java/lspMobsimTests/MainRunOnlyLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MainRunOnlyLSPMobsimTest.java @@ -18,14 +18,14 @@ * * *********************************************************************** */ -package lspMobsimTests; - -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.lspMobsimTests; + +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/lspMobsimTests/MultipleIterationsCollectionLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsCollectionLSPMobsimTest.java similarity index 95% rename from src/test/java/lspMobsimTests/MultipleIterationsCollectionLSPMobsimTest.java rename to src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsCollectionLSPMobsimTest.java index cb6bbb50..90715eb2 100644 --- a/src/test/java/lspMobsimTests/MultipleIterationsCollectionLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsCollectionLSPMobsimTest.java @@ -18,14 +18,14 @@ * * *********************************************************************** */ -package lspMobsimTests; - -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.lspMobsimTests; + +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/lspMobsimTests/MultipleIterationsCompleteLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsCompleteLSPMobsimTest.java similarity index 95% rename from src/test/java/lspMobsimTests/MultipleIterationsCompleteLSPMobsimTest.java rename to src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsCompleteLSPMobsimTest.java index a2b9d3fb..03d1c21c 100644 --- a/src/test/java/lspMobsimTests/MultipleIterationsCompleteLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsCompleteLSPMobsimTest.java @@ -18,18 +18,18 @@ * * *********************************************************************** */ -package lspMobsimTests; - -import example.lsp.lspReplanning.AssignmentStrategyFactory; -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.resourceImplementations.distributionCarrier.DistributionCarrierUtils; -import lsp.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; -import lsp.resourceImplementations.transshipmentHub.TranshipmentHubUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.lspMobsimTests; + +import org.matsim.freight.logistics.example.lsp.lspReplanning.AssignmentStrategyFactory; +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.distributionCarrier.DistributionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TranshipmentHubUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/lspMobsimTests/MultipleIterationsFirstReloadLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsFirstReloadLSPMobsimTest.java similarity index 95% rename from src/test/java/lspMobsimTests/MultipleIterationsFirstReloadLSPMobsimTest.java rename to src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsFirstReloadLSPMobsimTest.java index f4318caf..ee6523d1 100644 --- a/src/test/java/lspMobsimTests/MultipleIterationsFirstReloadLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsFirstReloadLSPMobsimTest.java @@ -18,16 +18,16 @@ * * *********************************************************************** */ -package lspMobsimTests; - -import example.lsp.lspReplanning.AssignmentStrategyFactory; -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.resourceImplementations.transshipmentHub.TranshipmentHubUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.lspMobsimTests; + +import org.matsim.freight.logistics.example.lsp.lspReplanning.AssignmentStrategyFactory; +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TranshipmentHubUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/lspMobsimTests/MultipleIterationsMainRunLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsMainRunLSPMobsimTest.java similarity index 95% rename from src/test/java/lspMobsimTests/MultipleIterationsMainRunLSPMobsimTest.java rename to src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsMainRunLSPMobsimTest.java index 80190967..2a0fac58 100644 --- a/src/test/java/lspMobsimTests/MultipleIterationsMainRunLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsMainRunLSPMobsimTest.java @@ -18,17 +18,17 @@ * * *********************************************************************** */ -package lspMobsimTests; - -import example.lsp.lspReplanning.AssignmentStrategyFactory; -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; -import lsp.resourceImplementations.transshipmentHub.TranshipmentHubUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.lspMobsimTests; + +import org.matsim.freight.logistics.example.lsp.lspReplanning.AssignmentStrategyFactory; +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TranshipmentHubUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/lspMobsimTests/MultipleIterationsSecondReloadLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsSecondReloadLSPMobsimTest.java similarity index 95% rename from src/test/java/lspMobsimTests/MultipleIterationsSecondReloadLSPMobsimTest.java rename to src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsSecondReloadLSPMobsimTest.java index 28f9d0f5..6822a43a 100644 --- a/src/test/java/lspMobsimTests/MultipleIterationsSecondReloadLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsSecondReloadLSPMobsimTest.java @@ -18,17 +18,17 @@ * * *********************************************************************** */ -package lspMobsimTests; - -import example.lsp.lspReplanning.AssignmentStrategyFactory; -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; -import lsp.resourceImplementations.transshipmentHub.TranshipmentHubUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.lspMobsimTests; + +import org.matsim.freight.logistics.example.lsp.lspReplanning.AssignmentStrategyFactory; +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TranshipmentHubUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/lspMobsimTests/MultipleShipmentsCollectionLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsCollectionLSPMobsimTest.java similarity index 95% rename from src/test/java/lspMobsimTests/MultipleShipmentsCollectionLSPMobsimTest.java rename to src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsCollectionLSPMobsimTest.java index 8b325645..b1f4342d 100644 --- a/src/test/java/lspMobsimTests/MultipleShipmentsCollectionLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsCollectionLSPMobsimTest.java @@ -18,14 +18,14 @@ * * *********************************************************************** */ -package lspMobsimTests; - -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.lspMobsimTests; + +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/lspMobsimTests/MultipleShipmentsCompleteLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsCompleteLSPMobsimTest.java similarity index 95% rename from src/test/java/lspMobsimTests/MultipleShipmentsCompleteLSPMobsimTest.java rename to src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsCompleteLSPMobsimTest.java index 371fcddd..8bd9bbeb 100644 --- a/src/test/java/lspMobsimTests/MultipleShipmentsCompleteLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsCompleteLSPMobsimTest.java @@ -18,18 +18,18 @@ * * *********************************************************************** */ -package lspMobsimTests; - -import example.lsp.lspReplanning.AssignmentStrategyFactory; -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.resourceImplementations.distributionCarrier.DistributionCarrierUtils; -import lsp.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; -import lsp.resourceImplementations.transshipmentHub.TranshipmentHubUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.lspMobsimTests; + +import org.matsim.freight.logistics.example.lsp.lspReplanning.AssignmentStrategyFactory; +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.distributionCarrier.DistributionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TranshipmentHubUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.Before; diff --git a/src/test/java/lspMobsimTests/MultipleShipmentsFirstReloadLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsFirstReloadLSPMobsimTest.java similarity index 95% rename from src/test/java/lspMobsimTests/MultipleShipmentsFirstReloadLSPMobsimTest.java rename to src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsFirstReloadLSPMobsimTest.java index 105f4635..268eaf42 100644 --- a/src/test/java/lspMobsimTests/MultipleShipmentsFirstReloadLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsFirstReloadLSPMobsimTest.java @@ -18,15 +18,15 @@ * * *********************************************************************** */ -package lspMobsimTests; - -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.resourceImplementations.transshipmentHub.TranshipmentHubUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.lspMobsimTests; + +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TranshipmentHubUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/lspMobsimTests/MultipleShipmentsMainRunLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsMainRunLSPMobsimTest.java similarity index 95% rename from src/test/java/lspMobsimTests/MultipleShipmentsMainRunLSPMobsimTest.java rename to src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsMainRunLSPMobsimTest.java index 4f4b36af..ec023346 100644 --- a/src/test/java/lspMobsimTests/MultipleShipmentsMainRunLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsMainRunLSPMobsimTest.java @@ -18,16 +18,16 @@ * * *********************************************************************** */ -package lspMobsimTests; - -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; -import lsp.resourceImplementations.transshipmentHub.TranshipmentHubUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.lspMobsimTests; + +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TranshipmentHubUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/lspMobsimTests/MultipleShipmentsSecondReloadLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsSecondReloadLSPMobsimTest.java similarity index 95% rename from src/test/java/lspMobsimTests/MultipleShipmentsSecondReloadLSPMobsimTest.java rename to src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsSecondReloadLSPMobsimTest.java index d8ee741e..a6dcfd8f 100644 --- a/src/test/java/lspMobsimTests/MultipleShipmentsSecondReloadLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsSecondReloadLSPMobsimTest.java @@ -18,17 +18,17 @@ * * *********************************************************************** */ -package lspMobsimTests; - -import example.lsp.lspReplanning.AssignmentStrategyFactory; -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; -import lsp.resourceImplementations.transshipmentHub.TranshipmentHubUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.lspMobsimTests; + +import org.matsim.freight.logistics.example.lsp.lspReplanning.AssignmentStrategyFactory; +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TranshipmentHubUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/lspMobsimTests/RepeatedMultipleShipmentsCompleteLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/RepeatedMultipleShipmentsCompleteLSPMobsimTest.java similarity index 96% rename from src/test/java/lspMobsimTests/RepeatedMultipleShipmentsCompleteLSPMobsimTest.java rename to src/test/java/org/matsim/freight/logistics/lspMobsimTests/RepeatedMultipleShipmentsCompleteLSPMobsimTest.java index 157803b0..5b3c3d4d 100644 --- a/src/test/java/lspMobsimTests/RepeatedMultipleShipmentsCompleteLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/RepeatedMultipleShipmentsCompleteLSPMobsimTest.java @@ -18,17 +18,17 @@ * * *********************************************************************** */ -package lspMobsimTests; - -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.resourceImplementations.distributionCarrier.DistributionCarrierUtils; -import lsp.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; -import lsp.resourceImplementations.transshipmentHub.TranshipmentHubUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.lspMobsimTests; + +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.distributionCarrier.DistributionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TranshipmentHubUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/lspMobsimTests/SecondReloadLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/SecondReloadLSPMobsimTest.java similarity index 95% rename from src/test/java/lspMobsimTests/SecondReloadLSPMobsimTest.java rename to src/test/java/org/matsim/freight/logistics/lspMobsimTests/SecondReloadLSPMobsimTest.java index 00c2099a..5dcec562 100644 --- a/src/test/java/lspMobsimTests/SecondReloadLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/SecondReloadLSPMobsimTest.java @@ -18,16 +18,16 @@ * * *********************************************************************** */ -package lspMobsimTests; - -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; -import lsp.resourceImplementations.transshipmentHub.TranshipmentHubUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.lspMobsimTests; + +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TranshipmentHubUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/lspPlanTests/CollectionLSPPlanTest.java b/src/test/java/org/matsim/freight/logistics/lspPlanTests/CollectionLSPPlanTest.java similarity index 94% rename from src/test/java/lspPlanTests/CollectionLSPPlanTest.java rename to src/test/java/org/matsim/freight/logistics/lspPlanTests/CollectionLSPPlanTest.java index 0917daa4..2e390fe0 100644 --- a/src/test/java/lspPlanTests/CollectionLSPPlanTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspPlanTests/CollectionLSPPlanTest.java @@ -18,11 +18,11 @@ * * *********************************************************************** */ -package lspPlanTests; +package org.matsim.freight.logistics.lspPlanTests; -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; import org.junit.Before; import org.junit.Test; import org.matsim.api.core.v01.Id; diff --git a/src/test/java/lspPlanTests/CompleteLSPPlanTest.java b/src/test/java/org/matsim/freight/logistics/lspPlanTests/CompleteLSPPlanTest.java similarity index 95% rename from src/test/java/lspPlanTests/CompleteLSPPlanTest.java rename to src/test/java/org/matsim/freight/logistics/lspPlanTests/CompleteLSPPlanTest.java index 95c2b709..74709053 100644 --- a/src/test/java/lspPlanTests/CompleteLSPPlanTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspPlanTests/CompleteLSPPlanTest.java @@ -18,14 +18,14 @@ * * *********************************************************************** */ -package lspPlanTests; - -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.resourceImplementations.distributionCarrier.DistributionCarrierUtils; -import lsp.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; -import lsp.resourceImplementations.transshipmentHub.TranshipmentHubUtils; +package org.matsim.freight.logistics.lspPlanTests; + +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.distributionCarrier.DistributionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TranshipmentHubUtils; import org.junit.Before; import org.junit.Test; import org.matsim.api.core.v01.Id; diff --git a/src/test/java/lspShipmentAssignmentTests/CollectionLSPShipmentAssigmentTest.java b/src/test/java/org/matsim/freight/logistics/lspShipmentAssignmentTests/CollectionLSPShipmentAssigmentTest.java similarity index 94% rename from src/test/java/lspShipmentAssignmentTests/CollectionLSPShipmentAssigmentTest.java rename to src/test/java/org/matsim/freight/logistics/lspShipmentAssignmentTests/CollectionLSPShipmentAssigmentTest.java index 80faba3d..0635f316 100644 --- a/src/test/java/lspShipmentAssignmentTests/CollectionLSPShipmentAssigmentTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspShipmentAssignmentTests/CollectionLSPShipmentAssigmentTest.java @@ -18,13 +18,13 @@ * * *********************************************************************** */ -package lspShipmentAssignmentTests; +package org.matsim.freight.logistics.lspShipmentAssignmentTests; -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentUtils; +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.junit.Before; import org.junit.Test; import org.matsim.api.core.v01.Id; diff --git a/src/test/java/lspShipmentAssignmentTests/CompleteLSPShipmentAssignerTest.java b/src/test/java/org/matsim/freight/logistics/lspShipmentAssignmentTests/CompleteLSPShipmentAssignerTest.java similarity index 95% rename from src/test/java/lspShipmentAssignmentTests/CompleteLSPShipmentAssignerTest.java rename to src/test/java/org/matsim/freight/logistics/lspShipmentAssignmentTests/CompleteLSPShipmentAssignerTest.java index 7023c0b8..b656f554 100644 --- a/src/test/java/lspShipmentAssignmentTests/CompleteLSPShipmentAssignerTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspShipmentAssignmentTests/CompleteLSPShipmentAssignerTest.java @@ -18,16 +18,16 @@ * * *********************************************************************** */ -package lspShipmentAssignmentTests; - -import lsp.*; -import lsp.resourceImplementations.ResourceImplementationUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.resourceImplementations.distributionCarrier.DistributionCarrierUtils; -import lsp.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; -import lsp.resourceImplementations.transshipmentHub.TranshipmentHubUtils; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.lspShipmentAssignmentTests; + +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.ResourceImplementationUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.distributionCarrier.DistributionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TranshipmentHubUtils; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.junit.Before; import org.junit.Test; import org.matsim.api.core.v01.Id; diff --git a/src/test/java/lspShipmentTest/CollectionShipmentBuilderTest.java b/src/test/java/org/matsim/freight/logistics/lspShipmentTest/CollectionShipmentBuilderTest.java similarity index 95% rename from src/test/java/lspShipmentTest/CollectionShipmentBuilderTest.java rename to src/test/java/org/matsim/freight/logistics/lspShipmentTest/CollectionShipmentBuilderTest.java index 85835c17..2b6286cf 100644 --- a/src/test/java/lspShipmentTest/CollectionShipmentBuilderTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspShipmentTest/CollectionShipmentBuilderTest.java @@ -1,118 +1,118 @@ -/* - * *********************************************************************** * - * * project: org.matsim.* - * * *********************************************************************** * - * * * - * * copyright : (C) 2022 by the members listed in the COPYING, * - * * LICENSE and WARRANTY file. * - * * email : info at matsim dot org * - * * * - * * *********************************************************************** * - * * * - * * This program is free software; you can redistribute it and/or modify * - * * it under the terms of the GNU General Public License as published by * - * * the Free Software Foundation; either version 2 of the License, or * - * * (at your option) any later version. * - * * See also COPYING, LICENSE and WARRANTY file * - * * * - * * *********************************************************************** - */ - -package lspShipmentTest; - -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentUtils; -import org.junit.Before; -import org.junit.Test; -import org.matsim.api.core.v01.Id; -import org.matsim.api.core.v01.Scenario; -import org.matsim.api.core.v01.network.Link; -import org.matsim.api.core.v01.network.Network; -import org.matsim.core.config.Config; -import org.matsim.core.gbl.MatsimRandom; -import org.matsim.core.network.io.MatsimNetworkReader; -import org.matsim.core.scenario.ScenarioUtils; -import org.matsim.freight.carriers.TimeWindow; - -import java.util.ArrayList; -import java.util.Collections; - -import static org.junit.Assert.*; - -public class CollectionShipmentBuilderTest { - - private Network network; - private ArrayList shipments; - - - @Before - public void initialize() { - Config config = new Config(); - config.addCoreModules(); - Scenario scenario = ScenarioUtils.createScenario(config); - new MatsimNetworkReader(scenario.getNetwork()).readFile("scenarios/2regions/2regions-network.xml"); - this.network = scenario.getNetwork(); - ArrayList linkList = new ArrayList<>(network.getLinks().values()); - Id collectionLinkId = Id.createLinkId("(4 2) (4 3)"); - Id toLinkId = network.getLinks().get(collectionLinkId).getId(); - this.shipments = new ArrayList<>(); - - for (int i = 1; i < 11; i++) { - Id id = Id.create(i, LSPShipment.class); - ShipmentUtils.LSPShipmentBuilder builder = ShipmentUtils.LSPShipmentBuilder.newInstance(id); - int capacityDemand = MatsimRandom.getRandom().nextInt(10); - builder.setCapacityDemand(capacityDemand); - - while (true) { - Collections.shuffle(linkList); - Link pendingFromLink = linkList.get(0); - if (pendingFromLink.getFromNode().getCoord().getX() <= 4000 && - pendingFromLink.getFromNode().getCoord().getY() <= 4000 && - pendingFromLink.getToNode().getCoord().getX() <= 4000 && - pendingFromLink.getToNode().getCoord().getY() <= 4000) { - builder.setFromLinkId(pendingFromLink.getId()); - break; - } - - } - - builder.setToLinkId(toLinkId); - TimeWindow endTimeWindow = TimeWindow.newInstance(0, (24 * 3600)); - builder.setEndTimeWindow(endTimeWindow); - TimeWindow startTimeWindow = TimeWindow.newInstance(0, (24 * 3600)); - builder.setStartTimeWindow(startTimeWindow); - builder.setDeliveryServiceTime(capacityDemand * 60); - shipments.add(builder.build()); - } - } - - @Test - public void testShipments() { - assertEquals(10, shipments.size()); - for (LSPShipment shipment : shipments) { - assertNotNull(shipment.getId()); - assertNotNull(shipment.getSize()); - assertNotNull(shipment.getDeliveryTimeWindow()); - assertNotNull(shipment.getFrom()); - assertNotNull(shipment.getDeliveryServiceTime()); - assertNotNull(shipment.getTo()); - assertNotNull(shipment.getPickupTimeWindow()); -// assertNotNull(shipment.getShipmentPlan()); - assertNotNull(shipment.getShipmentLog()); - assertNotNull(shipment.getSimulationTrackers()); - - assertTrue(shipment.getSimulationTrackers().isEmpty()); - assertEquals(shipment.getShipmentLog().getLspShipmentId(), shipment.getId()); - assertTrue(shipment.getShipmentLog().getPlanElements().isEmpty()); - -// assertEquals(shipment.getShipmentPlan().getEmbeddingContainer(), shipment.getId()); -// assertTrue(shipment.getShipmentPlan().getPlanElements().isEmpty()); - - Link link = network.getLinks().get(shipment.getFrom()); - assertTrue(link.getFromNode().getCoord().getX() <= 4000); - assertTrue(link.getFromNode().getCoord().getY() <= 4000); - - } - } - -} +/* + * *********************************************************************** * + * * project: org.matsim.* + * * *********************************************************************** * + * * * + * * copyright : (C) 2022 by the members listed in the COPYING, * + * * LICENSE and WARRANTY file. * + * * email : info at matsim dot org * + * * * + * * *********************************************************************** * + * * * + * * This program is free software; you can redistribute it and/or modify * + * * it under the terms of the GNU General Public License as published by * + * * the Free Software Foundation; either version 2 of the License, or * + * * (at your option) any later version. * + * * See also COPYING, LICENSE and WARRANTY file * + * * * + * * *********************************************************************** + */ + +package org.matsim.freight.logistics.lspShipmentTest; + +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentUtils; +import org.junit.Before; +import org.junit.Test; +import org.matsim.api.core.v01.Id; +import org.matsim.api.core.v01.Scenario; +import org.matsim.api.core.v01.network.Link; +import org.matsim.api.core.v01.network.Network; +import org.matsim.core.config.Config; +import org.matsim.core.gbl.MatsimRandom; +import org.matsim.core.network.io.MatsimNetworkReader; +import org.matsim.core.scenario.ScenarioUtils; +import org.matsim.freight.carriers.TimeWindow; + +import java.util.ArrayList; +import java.util.Collections; + +import static org.junit.Assert.*; + +public class CollectionShipmentBuilderTest { + + private Network network; + private ArrayList shipments; + + + @Before + public void initialize() { + Config config = new Config(); + config.addCoreModules(); + Scenario scenario = ScenarioUtils.createScenario(config); + new MatsimNetworkReader(scenario.getNetwork()).readFile("scenarios/2regions/2regions-network.xml"); + this.network = scenario.getNetwork(); + ArrayList linkList = new ArrayList<>(network.getLinks().values()); + Id collectionLinkId = Id.createLinkId("(4 2) (4 3)"); + Id toLinkId = network.getLinks().get(collectionLinkId).getId(); + this.shipments = new ArrayList<>(); + + for (int i = 1; i < 11; i++) { + Id id = Id.create(i, LSPShipment.class); + ShipmentUtils.LSPShipmentBuilder builder = ShipmentUtils.LSPShipmentBuilder.newInstance(id); + int capacityDemand = MatsimRandom.getRandom().nextInt(10); + builder.setCapacityDemand(capacityDemand); + + while (true) { + Collections.shuffle(linkList); + Link pendingFromLink = linkList.get(0); + if (pendingFromLink.getFromNode().getCoord().getX() <= 4000 && + pendingFromLink.getFromNode().getCoord().getY() <= 4000 && + pendingFromLink.getToNode().getCoord().getX() <= 4000 && + pendingFromLink.getToNode().getCoord().getY() <= 4000) { + builder.setFromLinkId(pendingFromLink.getId()); + break; + } + + } + + builder.setToLinkId(toLinkId); + TimeWindow endTimeWindow = TimeWindow.newInstance(0, (24 * 3600)); + builder.setEndTimeWindow(endTimeWindow); + TimeWindow startTimeWindow = TimeWindow.newInstance(0, (24 * 3600)); + builder.setStartTimeWindow(startTimeWindow); + builder.setDeliveryServiceTime(capacityDemand * 60); + shipments.add(builder.build()); + } + } + + @Test + public void testShipments() { + assertEquals(10, shipments.size()); + for (LSPShipment shipment : shipments) { + assertNotNull(shipment.getId()); + assertNotNull(shipment.getSize()); + assertNotNull(shipment.getDeliveryTimeWindow()); + assertNotNull(shipment.getFrom()); + assertNotNull(shipment.getDeliveryServiceTime()); + assertNotNull(shipment.getTo()); + assertNotNull(shipment.getPickupTimeWindow()); +// assertNotNull(shipment.getShipmentPlan()); + assertNotNull(shipment.getShipmentLog()); + assertNotNull(shipment.getSimulationTrackers()); + + assertTrue(shipment.getSimulationTrackers().isEmpty()); + assertEquals(shipment.getShipmentLog().getLspShipmentId(), shipment.getId()); + assertTrue(shipment.getShipmentLog().getPlanElements().isEmpty()); + +// assertEquals(shipment.getShipmentPlan().getEmbeddingContainer(), shipment.getId()); +// assertTrue(shipment.getShipmentPlan().getPlanElements().isEmpty()); + + Link link = network.getLinks().get(shipment.getFrom()); + assertTrue(link.getFromNode().getCoord().getX() <= 4000); + assertTrue(link.getFromNode().getCoord().getY() <= 4000); + + } + } + +} diff --git a/src/test/java/lspShipmentTest/CompleteShipmentBuilderTest.java b/src/test/java/org/matsim/freight/logistics/lspShipmentTest/CompleteShipmentBuilderTest.java similarity index 95% rename from src/test/java/lspShipmentTest/CompleteShipmentBuilderTest.java rename to src/test/java/org/matsim/freight/logistics/lspShipmentTest/CompleteShipmentBuilderTest.java index 43b1bbc2..f765c39b 100644 --- a/src/test/java/lspShipmentTest/CompleteShipmentBuilderTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspShipmentTest/CompleteShipmentBuilderTest.java @@ -1,133 +1,133 @@ -/* - * *********************************************************************** * - * * project: org.matsim.* - * * *********************************************************************** * - * * * - * * copyright : (C) 2022 by the members listed in the COPYING, * - * * LICENSE and WARRANTY file. * - * * email : info at matsim dot org * - * * * - * * *********************************************************************** * - * * * - * * This program is free software; you can redistribute it and/or modify * - * * it under the terms of the GNU General Public License as published by * - * * the Free Software Foundation; either version 2 of the License, or * - * * (at your option) any later version. * - * * See also COPYING, LICENSE and WARRANTY file * - * * * - * * *********************************************************************** - */ - -package lspShipmentTest; - -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentUtils; -import org.junit.Before; -import org.junit.Test; -import org.matsim.api.core.v01.Id; -import org.matsim.api.core.v01.Scenario; -import org.matsim.api.core.v01.network.Link; -import org.matsim.api.core.v01.network.Network; -import org.matsim.core.config.Config; -import org.matsim.core.gbl.MatsimRandom; -import org.matsim.core.network.io.MatsimNetworkReader; -import org.matsim.core.scenario.ScenarioUtils; -import org.matsim.freight.carriers.TimeWindow; - -import java.util.ArrayList; -import java.util.Collections; - -import static org.junit.Assert.*; - -public class CompleteShipmentBuilderTest { - - private Network network; - private ArrayList shipments; - - @Before - public void initialize() { - Config config = new Config(); - config.addCoreModules(); - Scenario scenario = ScenarioUtils.createScenario(config); - new MatsimNetworkReader(scenario.getNetwork()).readFile("scenarios/2regions/2regions-network.xml"); - this.network = scenario.getNetwork(); - ArrayList linkList = new ArrayList<>(network.getLinks().values()); - this.shipments = new ArrayList<>(); - - for (int i = 1; i < 11; i++) { - Id id = Id.create(i, LSPShipment.class); - ShipmentUtils.LSPShipmentBuilder builder = ShipmentUtils.LSPShipmentBuilder.newInstance(id); - int capacityDemand = MatsimRandom.getRandom().nextInt(10); - builder.setCapacityDemand(capacityDemand); - - while (true) { - Collections.shuffle(linkList); - Link pendingToLink = linkList.get(0); - if ((pendingToLink.getFromNode().getCoord().getX() <= 18000 && - pendingToLink.getFromNode().getCoord().getY() <= 4000 && - pendingToLink.getFromNode().getCoord().getX() >= 14000 && - pendingToLink.getToNode().getCoord().getX() <= 18000 && - pendingToLink.getToNode().getCoord().getY() <= 4000 && - pendingToLink.getToNode().getCoord().getX() >= 14000)) { - builder.setToLinkId(pendingToLink.getId()); - break; - } - - } - - while (true) { - Collections.shuffle(linkList); - Link pendingFromLink = linkList.get(0); - if (pendingFromLink.getFromNode().getCoord().getX() <= 4000 && - pendingFromLink.getFromNode().getCoord().getY() <= 4000 && - pendingFromLink.getToNode().getCoord().getX() <= 4000 && - pendingFromLink.getToNode().getCoord().getY() <= 4000) { - builder.setFromLinkId(pendingFromLink.getId()); - break; - } - - } - - TimeWindow endTimeWindow = TimeWindow.newInstance(0, (24 * 3600)); - builder.setEndTimeWindow(endTimeWindow); - TimeWindow startTimeWindow = TimeWindow.newInstance(0, (24 * 3600)); - builder.setStartTimeWindow(startTimeWindow); - builder.setDeliveryServiceTime(capacityDemand * 60); - shipments.add(builder.build()); - } - } - - - @Test - public void testShipments() { - assertEquals(10, shipments.size()); - for (LSPShipment shipment : shipments) { - assertNotNull(shipment.getId()); - assertNotNull(shipment.getSize()); - assertNotNull(shipment.getDeliveryTimeWindow()); - assertNotNull(shipment.getFrom()); - assertNotNull(shipment.getDeliveryServiceTime()); - assertNotNull(shipment.getTo()); - assertNotNull(shipment.getPickupTimeWindow()); -// assertNotNull(shipment.getShipmentPlan()); - assertNotNull(shipment.getShipmentLog()); - assertNotNull(shipment.getSimulationTrackers()); - - assertTrue(shipment.getSimulationTrackers().isEmpty()); - assertEquals(shipment.getShipmentLog().getLspShipmentId(), shipment.getId()); - assertTrue(shipment.getShipmentLog().getPlanElements().isEmpty()); - -// assertEquals(shipment.getShipmentPlan().getEmbeddingContainer(), shipment.getId()); -// assertTrue(shipment.getShipmentPlan().getPlanElements().isEmpty()); - Link link = network.getLinks().get(shipment.getTo()); - assertTrue(link.getFromNode().getCoord().getX() <= 18000); - assertTrue(link.getFromNode().getCoord().getX() >= 14000); - assertTrue(link.getToNode().getCoord().getX() <= 18000); - assertTrue(link.getToNode().getCoord().getX() >= 14000); - - link = network.getLinks().get(shipment.getFrom()); - assertTrue(link.getFromNode().getCoord().getX() <= 4000); - assertTrue(link.getFromNode().getCoord().getY() <= 4000); - } - } -} +/* + * *********************************************************************** * + * * project: org.matsim.* + * * *********************************************************************** * + * * * + * * copyright : (C) 2022 by the members listed in the COPYING, * + * * LICENSE and WARRANTY file. * + * * email : info at matsim dot org * + * * * + * * *********************************************************************** * + * * * + * * This program is free software; you can redistribute it and/or modify * + * * it under the terms of the GNU General Public License as published by * + * * the Free Software Foundation; either version 2 of the License, or * + * * (at your option) any later version. * + * * See also COPYING, LICENSE and WARRANTY file * + * * * + * * *********************************************************************** + */ + +package org.matsim.freight.logistics.lspShipmentTest; + +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentUtils; +import org.junit.Before; +import org.junit.Test; +import org.matsim.api.core.v01.Id; +import org.matsim.api.core.v01.Scenario; +import org.matsim.api.core.v01.network.Link; +import org.matsim.api.core.v01.network.Network; +import org.matsim.core.config.Config; +import org.matsim.core.gbl.MatsimRandom; +import org.matsim.core.network.io.MatsimNetworkReader; +import org.matsim.core.scenario.ScenarioUtils; +import org.matsim.freight.carriers.TimeWindow; + +import java.util.ArrayList; +import java.util.Collections; + +import static org.junit.Assert.*; + +public class CompleteShipmentBuilderTest { + + private Network network; + private ArrayList shipments; + + @Before + public void initialize() { + Config config = new Config(); + config.addCoreModules(); + Scenario scenario = ScenarioUtils.createScenario(config); + new MatsimNetworkReader(scenario.getNetwork()).readFile("scenarios/2regions/2regions-network.xml"); + this.network = scenario.getNetwork(); + ArrayList linkList = new ArrayList<>(network.getLinks().values()); + this.shipments = new ArrayList<>(); + + for (int i = 1; i < 11; i++) { + Id id = Id.create(i, LSPShipment.class); + ShipmentUtils.LSPShipmentBuilder builder = ShipmentUtils.LSPShipmentBuilder.newInstance(id); + int capacityDemand = MatsimRandom.getRandom().nextInt(10); + builder.setCapacityDemand(capacityDemand); + + while (true) { + Collections.shuffle(linkList); + Link pendingToLink = linkList.get(0); + if ((pendingToLink.getFromNode().getCoord().getX() <= 18000 && + pendingToLink.getFromNode().getCoord().getY() <= 4000 && + pendingToLink.getFromNode().getCoord().getX() >= 14000 && + pendingToLink.getToNode().getCoord().getX() <= 18000 && + pendingToLink.getToNode().getCoord().getY() <= 4000 && + pendingToLink.getToNode().getCoord().getX() >= 14000)) { + builder.setToLinkId(pendingToLink.getId()); + break; + } + + } + + while (true) { + Collections.shuffle(linkList); + Link pendingFromLink = linkList.get(0); + if (pendingFromLink.getFromNode().getCoord().getX() <= 4000 && + pendingFromLink.getFromNode().getCoord().getY() <= 4000 && + pendingFromLink.getToNode().getCoord().getX() <= 4000 && + pendingFromLink.getToNode().getCoord().getY() <= 4000) { + builder.setFromLinkId(pendingFromLink.getId()); + break; + } + + } + + TimeWindow endTimeWindow = TimeWindow.newInstance(0, (24 * 3600)); + builder.setEndTimeWindow(endTimeWindow); + TimeWindow startTimeWindow = TimeWindow.newInstance(0, (24 * 3600)); + builder.setStartTimeWindow(startTimeWindow); + builder.setDeliveryServiceTime(capacityDemand * 60); + shipments.add(builder.build()); + } + } + + + @Test + public void testShipments() { + assertEquals(10, shipments.size()); + for (LSPShipment shipment : shipments) { + assertNotNull(shipment.getId()); + assertNotNull(shipment.getSize()); + assertNotNull(shipment.getDeliveryTimeWindow()); + assertNotNull(shipment.getFrom()); + assertNotNull(shipment.getDeliveryServiceTime()); + assertNotNull(shipment.getTo()); + assertNotNull(shipment.getPickupTimeWindow()); +// assertNotNull(shipment.getShipmentPlan()); + assertNotNull(shipment.getShipmentLog()); + assertNotNull(shipment.getSimulationTrackers()); + + assertTrue(shipment.getSimulationTrackers().isEmpty()); + assertEquals(shipment.getShipmentLog().getLspShipmentId(), shipment.getId()); + assertTrue(shipment.getShipmentLog().getPlanElements().isEmpty()); + +// assertEquals(shipment.getShipmentPlan().getEmbeddingContainer(), shipment.getId()); +// assertTrue(shipment.getShipmentPlan().getPlanElements().isEmpty()); + Link link = network.getLinks().get(shipment.getTo()); + assertTrue(link.getFromNode().getCoord().getX() <= 18000); + assertTrue(link.getFromNode().getCoord().getX() >= 14000); + assertTrue(link.getToNode().getCoord().getX() <= 18000); + assertTrue(link.getToNode().getCoord().getX() >= 14000); + + link = network.getLinks().get(shipment.getFrom()); + assertTrue(link.getFromNode().getCoord().getX() <= 4000); + assertTrue(link.getFromNode().getCoord().getY() <= 4000); + } + } +} diff --git a/src/test/java/lspShipmentTest/DistributionShipmentBuilderTest.java b/src/test/java/org/matsim/freight/logistics/lspShipmentTest/DistributionShipmentBuilderTest.java similarity index 95% rename from src/test/java/lspShipmentTest/DistributionShipmentBuilderTest.java rename to src/test/java/org/matsim/freight/logistics/lspShipmentTest/DistributionShipmentBuilderTest.java index e5a0f7b2..b6d34d8d 100644 --- a/src/test/java/lspShipmentTest/DistributionShipmentBuilderTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspShipmentTest/DistributionShipmentBuilderTest.java @@ -1,119 +1,119 @@ -/* - * *********************************************************************** * - * * project: org.matsim.* - * * *********************************************************************** * - * * * - * * copyright : (C) 2022 by the members listed in the COPYING, * - * * LICENSE and WARRANTY file. * - * * email : info at matsim dot org * - * * * - * * *********************************************************************** * - * * * - * * This program is free software; you can redistribute it and/or modify * - * * it under the terms of the GNU General Public License as published by * - * * the Free Software Foundation; either version 2 of the License, or * - * * (at your option) any later version. * - * * See also COPYING, LICENSE and WARRANTY file * - * * * - * * *********************************************************************** - */ - -package lspShipmentTest; - -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentUtils; -import org.junit.Before; -import org.junit.Test; -import org.matsim.api.core.v01.Id; -import org.matsim.api.core.v01.Scenario; -import org.matsim.api.core.v01.network.Link; -import org.matsim.api.core.v01.network.Network; -import org.matsim.core.config.Config; -import org.matsim.core.gbl.MatsimRandom; -import org.matsim.core.network.io.MatsimNetworkReader; -import org.matsim.core.scenario.ScenarioUtils; -import org.matsim.freight.carriers.TimeWindow; - -import java.util.ArrayList; -import java.util.Collections; - -import static org.junit.Assert.*; - -public class DistributionShipmentBuilderTest { - - private Network network; - private ArrayList shipments; - - - @Before - public void initialize() { - Config config = new Config(); - config.addCoreModules(); - Scenario scenario = ScenarioUtils.createScenario(config); - new MatsimNetworkReader(scenario.getNetwork()).readFile("scenarios/2regions/2regions-network.xml"); - this.network = scenario.getNetwork(); - ArrayList linkList = new ArrayList<>(network.getLinks().values()); - Id distributionLinkId = Id.createLinkId("(14 2) (14 3)"); - Id fromLinkId = network.getLinks().get(distributionLinkId).getId(); - this.shipments = new ArrayList<>(); - - for (int i = 1; i < 11; i++) { - Id id = Id.create(i, LSPShipment.class); - ShipmentUtils.LSPShipmentBuilder builder = ShipmentUtils.LSPShipmentBuilder.newInstance(id); - int capacityDemand = MatsimRandom.getRandom().nextInt(10); - builder.setCapacityDemand(capacityDemand); - - while (true) { - Collections.shuffle(linkList); - Link pendingToLink = linkList.get(0); - if ((pendingToLink.getFromNode().getCoord().getX() <= 18000 && - pendingToLink.getFromNode().getCoord().getY() <= 4000 && - pendingToLink.getFromNode().getCoord().getX() >= 14000 && - pendingToLink.getToNode().getCoord().getX() <= 18000 && - pendingToLink.getToNode().getCoord().getY() <= 4000 && - pendingToLink.getToNode().getCoord().getX() >= 14000)) { - builder.setToLinkId(pendingToLink.getId()); - break; - } - - } - - builder.setFromLinkId(fromLinkId); - TimeWindow endTimeWindow = TimeWindow.newInstance(0, (24 * 3600)); - builder.setEndTimeWindow(endTimeWindow); - TimeWindow startTimeWindow = TimeWindow.newInstance(0, (24 * 3600)); - builder.setStartTimeWindow(startTimeWindow); - builder.setDeliveryServiceTime(capacityDemand * 60); - shipments.add(builder.build()); - } - } - - @Test - public void testShipments() { - assertEquals(10, shipments.size()); - for (LSPShipment shipment : shipments) { - assertNotNull(shipment.getId()); - assertNotNull(shipment.getSize()); - assertNotNull(shipment.getDeliveryTimeWindow()); - assertNotNull(shipment.getFrom()); - assertNotNull(shipment.getDeliveryServiceTime()); - assertNotNull(shipment.getTo()); - assertNotNull(shipment.getPickupTimeWindow()); -// assertNotNull(shipment.getShipmentPlan()); - assertNotNull(shipment.getShipmentLog()); - assertNotNull(shipment.getSimulationTrackers()); - - assertTrue(shipment.getSimulationTrackers().isEmpty()); - assertEquals(shipment.getShipmentLog().getLspShipmentId(), shipment.getId()); - assertTrue(shipment.getShipmentLog().getPlanElements().isEmpty()); - -// assertEquals(shipment.getShipmentPlan().getEmbeddingContainer(), shipment.getId()); -// assertTrue(shipment.getShipmentPlan().getPlanElements().isEmpty()); - Link link = network.getLinks().get(shipment.getTo()); - assertTrue(link.getFromNode().getCoord().getX() <= 18000); - assertTrue(link.getFromNode().getCoord().getX() >= 14000); - assertTrue(link.getToNode().getCoord().getX() <= 18000); - assertTrue(link.getToNode().getCoord().getX() >= 14000); - } - } -} +/* + * *********************************************************************** * + * * project: org.matsim.* + * * *********************************************************************** * + * * * + * * copyright : (C) 2022 by the members listed in the COPYING, * + * * LICENSE and WARRANTY file. * + * * email : info at matsim dot org * + * * * + * * *********************************************************************** * + * * * + * * This program is free software; you can redistribute it and/or modify * + * * it under the terms of the GNU General Public License as published by * + * * the Free Software Foundation; either version 2 of the License, or * + * * (at your option) any later version. * + * * See also COPYING, LICENSE and WARRANTY file * + * * * + * * *********************************************************************** + */ + +package org.matsim.freight.logistics.lspShipmentTest; + +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentUtils; +import org.junit.Before; +import org.junit.Test; +import org.matsim.api.core.v01.Id; +import org.matsim.api.core.v01.Scenario; +import org.matsim.api.core.v01.network.Link; +import org.matsim.api.core.v01.network.Network; +import org.matsim.core.config.Config; +import org.matsim.core.gbl.MatsimRandom; +import org.matsim.core.network.io.MatsimNetworkReader; +import org.matsim.core.scenario.ScenarioUtils; +import org.matsim.freight.carriers.TimeWindow; + +import java.util.ArrayList; +import java.util.Collections; + +import static org.junit.Assert.*; + +public class DistributionShipmentBuilderTest { + + private Network network; + private ArrayList shipments; + + + @Before + public void initialize() { + Config config = new Config(); + config.addCoreModules(); + Scenario scenario = ScenarioUtils.createScenario(config); + new MatsimNetworkReader(scenario.getNetwork()).readFile("scenarios/2regions/2regions-network.xml"); + this.network = scenario.getNetwork(); + ArrayList linkList = new ArrayList<>(network.getLinks().values()); + Id distributionLinkId = Id.createLinkId("(14 2) (14 3)"); + Id fromLinkId = network.getLinks().get(distributionLinkId).getId(); + this.shipments = new ArrayList<>(); + + for (int i = 1; i < 11; i++) { + Id id = Id.create(i, LSPShipment.class); + ShipmentUtils.LSPShipmentBuilder builder = ShipmentUtils.LSPShipmentBuilder.newInstance(id); + int capacityDemand = MatsimRandom.getRandom().nextInt(10); + builder.setCapacityDemand(capacityDemand); + + while (true) { + Collections.shuffle(linkList); + Link pendingToLink = linkList.get(0); + if ((pendingToLink.getFromNode().getCoord().getX() <= 18000 && + pendingToLink.getFromNode().getCoord().getY() <= 4000 && + pendingToLink.getFromNode().getCoord().getX() >= 14000 && + pendingToLink.getToNode().getCoord().getX() <= 18000 && + pendingToLink.getToNode().getCoord().getY() <= 4000 && + pendingToLink.getToNode().getCoord().getX() >= 14000)) { + builder.setToLinkId(pendingToLink.getId()); + break; + } + + } + + builder.setFromLinkId(fromLinkId); + TimeWindow endTimeWindow = TimeWindow.newInstance(0, (24 * 3600)); + builder.setEndTimeWindow(endTimeWindow); + TimeWindow startTimeWindow = TimeWindow.newInstance(0, (24 * 3600)); + builder.setStartTimeWindow(startTimeWindow); + builder.setDeliveryServiceTime(capacityDemand * 60); + shipments.add(builder.build()); + } + } + + @Test + public void testShipments() { + assertEquals(10, shipments.size()); + for (LSPShipment shipment : shipments) { + assertNotNull(shipment.getId()); + assertNotNull(shipment.getSize()); + assertNotNull(shipment.getDeliveryTimeWindow()); + assertNotNull(shipment.getFrom()); + assertNotNull(shipment.getDeliveryServiceTime()); + assertNotNull(shipment.getTo()); + assertNotNull(shipment.getPickupTimeWindow()); +// assertNotNull(shipment.getShipmentPlan()); + assertNotNull(shipment.getShipmentLog()); + assertNotNull(shipment.getSimulationTrackers()); + + assertTrue(shipment.getSimulationTrackers().isEmpty()); + assertEquals(shipment.getShipmentLog().getLspShipmentId(), shipment.getId()); + assertTrue(shipment.getShipmentLog().getPlanElements().isEmpty()); + +// assertEquals(shipment.getShipmentPlan().getEmbeddingContainer(), shipment.getId()); +// assertTrue(shipment.getShipmentPlan().getPlanElements().isEmpty()); + Link link = network.getLinks().get(shipment.getTo()); + assertTrue(link.getFromNode().getCoord().getX() <= 18000); + assertTrue(link.getFromNode().getCoord().getX() >= 14000); + assertTrue(link.getToNode().getCoord().getX() <= 18000); + assertTrue(link.getToNode().getCoord().getX() >= 14000); + } + } +} diff --git a/src/test/java/lsp/resourceImplementations/CollectionLSPSchedulingTest.java b/src/test/java/org/matsim/freight/logistics/resourceImplementations/CollectionLSPSchedulingTest.java similarity index 95% rename from src/test/java/lsp/resourceImplementations/CollectionLSPSchedulingTest.java rename to src/test/java/org/matsim/freight/logistics/resourceImplementations/CollectionLSPSchedulingTest.java index d46f6816..bd807eda 100644 --- a/src/test/java/lsp/resourceImplementations/CollectionLSPSchedulingTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/CollectionLSPSchedulingTest.java @@ -18,15 +18,15 @@ * * *********************************************************************** */ -package lsp.resourceImplementations; - -import lsp.*; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionServiceEndEventHandler; -import lsp.resourceImplementations.collectionCarrier.CollectionTourEndEventHandler; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.resourceImplementations; + +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionServiceEndEventHandler; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionTourEndEventHandler; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.junit.Before; import org.junit.Test; import org.matsim.api.core.v01.Id; diff --git a/src/test/java/lsp/resourceImplementations/CompleteLSPSchedulingTest.java b/src/test/java/org/matsim/freight/logistics/resourceImplementations/CompleteLSPSchedulingTest.java similarity index 96% rename from src/test/java/lsp/resourceImplementations/CompleteLSPSchedulingTest.java rename to src/test/java/org/matsim/freight/logistics/resourceImplementations/CompleteLSPSchedulingTest.java index 22c6a756..782f4a13 100644 --- a/src/test/java/lsp/resourceImplementations/CompleteLSPSchedulingTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/CompleteLSPSchedulingTest.java @@ -18,23 +18,23 @@ * * *********************************************************************** */ -package lsp.resourceImplementations; - -import lsp.*; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionServiceEndEventHandler; -import lsp.resourceImplementations.collectionCarrier.CollectionTourEndEventHandler; -import lsp.resourceImplementations.distributionCarrier.DistributionCarrierUtils; -import lsp.resourceImplementations.distributionCarrier.DistributionServiceStartEventHandler; -import lsp.resourceImplementations.distributionCarrier.DistributionTourStartEventHandler; -import lsp.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; -import lsp.resourceImplementations.mainRunCarrier.MainRunTourEndEventHandler; -import lsp.resourceImplementations.mainRunCarrier.MainRunTourStartEventHandler; -import lsp.resourceImplementations.transshipmentHub.TranshipmentHubUtils; -import lsp.resourceImplementations.transshipmentHub.TransshipmentHubTourEndEventHandler; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.resourceImplementations; + +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionServiceEndEventHandler; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionTourEndEventHandler; +import org.matsim.freight.logistics.resourceImplementations.distributionCarrier.DistributionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.distributionCarrier.DistributionServiceStartEventHandler; +import org.matsim.freight.logistics.resourceImplementations.distributionCarrier.DistributionTourStartEventHandler; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunTourEndEventHandler; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunTourStartEventHandler; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TranshipmentHubUtils; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TransshipmentHubTourEndEventHandler; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.junit.Before; import org.junit.Test; import org.matsim.api.core.v01.Id; diff --git a/src/test/java/lsp/resourceImplementations/FirstHubElementTest.java b/src/test/java/org/matsim/freight/logistics/resourceImplementations/FirstHubElementTest.java similarity index 88% rename from src/test/java/lsp/resourceImplementations/FirstHubElementTest.java rename to src/test/java/org/matsim/freight/logistics/resourceImplementations/FirstHubElementTest.java index 0f79c868..cf8fdf6e 100644 --- a/src/test/java/lsp/resourceImplementations/FirstHubElementTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/FirstHubElementTest.java @@ -18,13 +18,13 @@ * * *********************************************************************** */ -package lsp.resourceImplementations; +package org.matsim.freight.logistics.resourceImplementations; -import lsp.LSPResource; -import lsp.LSPUtils; -import lsp.LogisticChainElement; -import lsp.resourceImplementations.transshipmentHub.TranshipmentHubUtils; -import lsp.resourceImplementations.transshipmentHub.TransshipmentHubResource; +import org.matsim.freight.logistics.LSPResource; +import org.matsim.freight.logistics.LSPUtils; +import org.matsim.freight.logistics.LogisticChainElement; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TranshipmentHubUtils; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TransshipmentHubResource; import org.junit.Before; import org.junit.Test; import org.matsim.api.core.v01.Id; diff --git a/src/test/java/lsp/resourceImplementations/FirstReloadLSPSchedulingTest.java b/src/test/java/org/matsim/freight/logistics/resourceImplementations/FirstReloadLSPSchedulingTest.java similarity index 95% rename from src/test/java/lsp/resourceImplementations/FirstReloadLSPSchedulingTest.java rename to src/test/java/org/matsim/freight/logistics/resourceImplementations/FirstReloadLSPSchedulingTest.java index 742fbd2f..1c936ef7 100644 --- a/src/test/java/lsp/resourceImplementations/FirstReloadLSPSchedulingTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/FirstReloadLSPSchedulingTest.java @@ -18,17 +18,17 @@ * * *********************************************************************** */ -package lsp.resourceImplementations; - -import lsp.*; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionServiceEndEventHandler; -import lsp.resourceImplementations.collectionCarrier.CollectionTourEndEventHandler; -import lsp.resourceImplementations.transshipmentHub.TranshipmentHubUtils; -import lsp.resourceImplementations.transshipmentHub.TransshipmentHubTourEndEventHandler; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.resourceImplementations; + +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionServiceEndEventHandler; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionTourEndEventHandler; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TranshipmentHubUtils; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TransshipmentHubTourEndEventHandler; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.junit.Before; import org.junit.Test; import org.matsim.api.core.v01.Id; diff --git a/src/test/java/lsp/resourceImplementations/FirstReloadResourceTest.java b/src/test/java/org/matsim/freight/logistics/resourceImplementations/FirstReloadResourceTest.java similarity index 89% rename from src/test/java/lsp/resourceImplementations/FirstReloadResourceTest.java rename to src/test/java/org/matsim/freight/logistics/resourceImplementations/FirstReloadResourceTest.java index ea8516e2..8f5fb392 100644 --- a/src/test/java/lsp/resourceImplementations/FirstReloadResourceTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/FirstReloadResourceTest.java @@ -18,12 +18,12 @@ * * *********************************************************************** */ -package lsp.resourceImplementations; +package org.matsim.freight.logistics.resourceImplementations; -import lsp.LSPCarrierResource; -import lsp.LSPResource; -import lsp.resourceImplementations.transshipmentHub.TranshipmentHubUtils; -import lsp.resourceImplementations.transshipmentHub.TransshipmentHubResource; +import org.matsim.freight.logistics.LSPCarrierResource; +import org.matsim.freight.logistics.LSPResource; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TranshipmentHubUtils; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TransshipmentHubResource; import org.junit.Before; import org.junit.Test; import org.matsim.api.core.v01.Id; diff --git a/src/test/java/lsp/resourceImplementations/MainRunLSPSchedulingTest.java b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MainRunLSPSchedulingTest.java similarity index 95% rename from src/test/java/lsp/resourceImplementations/MainRunLSPSchedulingTest.java rename to src/test/java/org/matsim/freight/logistics/resourceImplementations/MainRunLSPSchedulingTest.java index c2942154..4861e28c 100644 --- a/src/test/java/lsp/resourceImplementations/MainRunLSPSchedulingTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MainRunLSPSchedulingTest.java @@ -18,20 +18,20 @@ * * *********************************************************************** */ -package lsp.resourceImplementations; - -import lsp.*; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionServiceEndEventHandler; -import lsp.resourceImplementations.collectionCarrier.CollectionTourEndEventHandler; -import lsp.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; -import lsp.resourceImplementations.mainRunCarrier.MainRunTourEndEventHandler; -import lsp.resourceImplementations.mainRunCarrier.MainRunTourStartEventHandler; -import lsp.resourceImplementations.transshipmentHub.TranshipmentHubUtils; -import lsp.resourceImplementations.transshipmentHub.TransshipmentHubTourEndEventHandler; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.resourceImplementations; + +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionServiceEndEventHandler; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionTourEndEventHandler; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunTourEndEventHandler; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunTourStartEventHandler; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TranshipmentHubUtils; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TransshipmentHubTourEndEventHandler; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.junit.Before; import org.junit.Test; import org.matsim.api.core.v01.Id; diff --git a/src/test/java/lsp/resourceImplementations/MultipleShipmentsCollectionLSPSchedulingTest.java b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsCollectionLSPSchedulingTest.java similarity index 95% rename from src/test/java/lsp/resourceImplementations/MultipleShipmentsCollectionLSPSchedulingTest.java rename to src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsCollectionLSPSchedulingTest.java index b75197c0..96ee2a88 100644 --- a/src/test/java/lsp/resourceImplementations/MultipleShipmentsCollectionLSPSchedulingTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsCollectionLSPSchedulingTest.java @@ -18,15 +18,15 @@ * * *********************************************************************** */ -package lsp.resourceImplementations; - -import lsp.*; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionServiceEndEventHandler; -import lsp.resourceImplementations.collectionCarrier.CollectionTourEndEventHandler; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.resourceImplementations; + +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionServiceEndEventHandler; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionTourEndEventHandler; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.junit.Before; import org.junit.Test; import org.matsim.api.core.v01.Id; diff --git a/src/test/java/lsp/resourceImplementations/MultipleShipmentsCompleteLSPSchedulingTest.java b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsCompleteLSPSchedulingTest.java similarity index 96% rename from src/test/java/lsp/resourceImplementations/MultipleShipmentsCompleteLSPSchedulingTest.java rename to src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsCompleteLSPSchedulingTest.java index 24a5cfba..5fbb3f90 100644 --- a/src/test/java/lsp/resourceImplementations/MultipleShipmentsCompleteLSPSchedulingTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsCompleteLSPSchedulingTest.java @@ -18,23 +18,23 @@ * * *********************************************************************** */ -package lsp.resourceImplementations; - -import lsp.*; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionServiceEndEventHandler; -import lsp.resourceImplementations.collectionCarrier.CollectionTourEndEventHandler; -import lsp.resourceImplementations.distributionCarrier.DistributionCarrierUtils; -import lsp.resourceImplementations.distributionCarrier.DistributionServiceStartEventHandler; -import lsp.resourceImplementations.distributionCarrier.DistributionTourStartEventHandler; -import lsp.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; -import lsp.resourceImplementations.mainRunCarrier.MainRunTourEndEventHandler; -import lsp.resourceImplementations.mainRunCarrier.MainRunTourStartEventHandler; -import lsp.resourceImplementations.transshipmentHub.TranshipmentHubUtils; -import lsp.resourceImplementations.transshipmentHub.TransshipmentHubTourEndEventHandler; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.resourceImplementations; + +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionServiceEndEventHandler; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionTourEndEventHandler; +import org.matsim.freight.logistics.resourceImplementations.distributionCarrier.DistributionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.distributionCarrier.DistributionServiceStartEventHandler; +import org.matsim.freight.logistics.resourceImplementations.distributionCarrier.DistributionTourStartEventHandler; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunTourEndEventHandler; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunTourStartEventHandler; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TranshipmentHubUtils; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TransshipmentHubTourEndEventHandler; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.junit.Before; import org.junit.Test; import org.matsim.api.core.v01.Id; diff --git a/src/test/java/lsp/resourceImplementations/MultipleShipmentsFirstReloadLSPSchedulingTest.java b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsFirstReloadLSPSchedulingTest.java similarity index 95% rename from src/test/java/lsp/resourceImplementations/MultipleShipmentsFirstReloadLSPSchedulingTest.java rename to src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsFirstReloadLSPSchedulingTest.java index 5b4f5008..2e6c1379 100644 --- a/src/test/java/lsp/resourceImplementations/MultipleShipmentsFirstReloadLSPSchedulingTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsFirstReloadLSPSchedulingTest.java @@ -18,17 +18,17 @@ * * *********************************************************************** */ -package lsp.resourceImplementations; - -import lsp.*; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionServiceEndEventHandler; -import lsp.resourceImplementations.collectionCarrier.CollectionTourEndEventHandler; -import lsp.resourceImplementations.transshipmentHub.TranshipmentHubUtils; -import lsp.resourceImplementations.transshipmentHub.TransshipmentHubTourEndEventHandler; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.resourceImplementations; + +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionServiceEndEventHandler; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionTourEndEventHandler; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TranshipmentHubUtils; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TransshipmentHubTourEndEventHandler; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.junit.Before; import org.junit.Test; import org.matsim.api.core.v01.Id; diff --git a/src/test/java/lsp/resourceImplementations/MultipleShipmentsMainRunLSPSchedulingTest.java b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsMainRunLSPSchedulingTest.java similarity index 95% rename from src/test/java/lsp/resourceImplementations/MultipleShipmentsMainRunLSPSchedulingTest.java rename to src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsMainRunLSPSchedulingTest.java index 998ce03c..031c250c 100644 --- a/src/test/java/lsp/resourceImplementations/MultipleShipmentsMainRunLSPSchedulingTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsMainRunLSPSchedulingTest.java @@ -18,20 +18,20 @@ * * *********************************************************************** */ -package lsp.resourceImplementations; - -import lsp.*; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionServiceEndEventHandler; -import lsp.resourceImplementations.collectionCarrier.CollectionTourEndEventHandler; -import lsp.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; -import lsp.resourceImplementations.mainRunCarrier.MainRunTourEndEventHandler; -import lsp.resourceImplementations.mainRunCarrier.MainRunTourStartEventHandler; -import lsp.resourceImplementations.transshipmentHub.TranshipmentHubUtils; -import lsp.resourceImplementations.transshipmentHub.TransshipmentHubTourEndEventHandler; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.resourceImplementations; + +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionServiceEndEventHandler; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionTourEndEventHandler; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunTourEndEventHandler; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunTourStartEventHandler; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TranshipmentHubUtils; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TransshipmentHubTourEndEventHandler; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.junit.Before; import org.junit.Test; import org.matsim.api.core.v01.Id; diff --git a/src/test/java/lsp/resourceImplementations/MultipleShipmentsSecondReloadLSPSchedulingTest.java b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsSecondReloadLSPSchedulingTest.java similarity index 96% rename from src/test/java/lsp/resourceImplementations/MultipleShipmentsSecondReloadLSPSchedulingTest.java rename to src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsSecondReloadLSPSchedulingTest.java index 665f0da8..f989b835 100644 --- a/src/test/java/lsp/resourceImplementations/MultipleShipmentsSecondReloadLSPSchedulingTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsSecondReloadLSPSchedulingTest.java @@ -18,20 +18,20 @@ * * *********************************************************************** */ -package lsp.resourceImplementations; - -import lsp.*; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionServiceEndEventHandler; -import lsp.resourceImplementations.collectionCarrier.CollectionTourEndEventHandler; -import lsp.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; -import lsp.resourceImplementations.mainRunCarrier.MainRunTourEndEventHandler; -import lsp.resourceImplementations.mainRunCarrier.MainRunTourStartEventHandler; -import lsp.resourceImplementations.transshipmentHub.TranshipmentHubUtils; -import lsp.resourceImplementations.transshipmentHub.TransshipmentHubTourEndEventHandler; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.resourceImplementations; + +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionServiceEndEventHandler; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionTourEndEventHandler; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunTourEndEventHandler; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunTourStartEventHandler; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TranshipmentHubUtils; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TransshipmentHubTourEndEventHandler; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.junit.Before; import org.junit.Test; import org.matsim.api.core.v01.Id; diff --git a/src/test/java/lsp/resourceImplementations/SecondReloadLSPSchedulingTest.java b/src/test/java/org/matsim/freight/logistics/resourceImplementations/SecondReloadLSPSchedulingTest.java similarity index 96% rename from src/test/java/lsp/resourceImplementations/SecondReloadLSPSchedulingTest.java rename to src/test/java/org/matsim/freight/logistics/resourceImplementations/SecondReloadLSPSchedulingTest.java index c817f83e..5b488e9e 100644 --- a/src/test/java/lsp/resourceImplementations/SecondReloadLSPSchedulingTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/SecondReloadLSPSchedulingTest.java @@ -18,20 +18,20 @@ * * *********************************************************************** */ -package lsp.resourceImplementations; - -import lsp.*; -import lsp.resourceImplementations.collectionCarrier.CollectionCarrierUtils; -import lsp.resourceImplementations.collectionCarrier.CollectionServiceEndEventHandler; -import lsp.resourceImplementations.collectionCarrier.CollectionTourEndEventHandler; -import lsp.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; -import lsp.resourceImplementations.mainRunCarrier.MainRunTourEndEventHandler; -import lsp.resourceImplementations.mainRunCarrier.MainRunTourStartEventHandler; -import lsp.resourceImplementations.transshipmentHub.TranshipmentHubUtils; -import lsp.resourceImplementations.transshipmentHub.TransshipmentHubTourEndEventHandler; -import lsp.shipment.LSPShipment; -import lsp.shipment.ShipmentPlanElement; -import lsp.shipment.ShipmentUtils; +package org.matsim.freight.logistics.resourceImplementations; + +import org.matsim.freight.logistics.*; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionServiceEndEventHandler; +import org.matsim.freight.logistics.resourceImplementations.collectionCarrier.CollectionTourEndEventHandler; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunCarrierUtils; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunTourEndEventHandler; +import org.matsim.freight.logistics.resourceImplementations.mainRunCarrier.MainRunTourStartEventHandler; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TranshipmentHubUtils; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TransshipmentHubTourEndEventHandler; +import org.matsim.freight.logistics.shipment.LSPShipment; +import org.matsim.freight.logistics.shipment.ShipmentPlanElement; +import org.matsim.freight.logistics.shipment.ShipmentUtils; import org.junit.Before; import org.junit.Test; import org.matsim.api.core.v01.Id; diff --git a/src/test/java/lsp/resourceImplementations/SecondReloadResourceTest.java b/src/test/java/org/matsim/freight/logistics/resourceImplementations/SecondReloadResourceTest.java similarity index 90% rename from src/test/java/lsp/resourceImplementations/SecondReloadResourceTest.java rename to src/test/java/org/matsim/freight/logistics/resourceImplementations/SecondReloadResourceTest.java index 375e3d28..bfb300b4 100644 --- a/src/test/java/lsp/resourceImplementations/SecondReloadResourceTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/SecondReloadResourceTest.java @@ -18,12 +18,12 @@ * * *********************************************************************** */ -package lsp.resourceImplementations; +package org.matsim.freight.logistics.resourceImplementations; -import lsp.LSPCarrierResource; -import lsp.LSPResource; -import lsp.resourceImplementations.transshipmentHub.TranshipmentHubUtils; -import lsp.resourceImplementations.transshipmentHub.TransshipmentHubResource; +import org.matsim.freight.logistics.LSPCarrierResource; +import org.matsim.freight.logistics.LSPResource; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TranshipmentHubUtils; +import org.matsim.freight.logistics.resourceImplementations.transshipmentHub.TransshipmentHubResource; import org.junit.Before; import org.junit.Test; import org.matsim.api.core.v01.Id; diff --git a/test/input/example/lsp/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirectTest/testMain1/output_events.xml.gz b/test/input/org/matsim/freight/logistics/example/lsp/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirectTest/testMain1/output_events.xml.gz similarity index 100% rename from test/input/example/lsp/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirectTest/testMain1/output_events.xml.gz rename to test/input/org/matsim/freight/logistics/example/lsp/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirectTest/testMain1/output_events.xml.gz diff --git a/test/input/example/lsp/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirectTest/testMain2_direct/output_events.xml.gz b/test/input/org/matsim/freight/logistics/example/lsp/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirectTest/testMain2_direct/output_events.xml.gz similarity index 100% rename from test/input/example/lsp/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirectTest/testMain2_direct/output_events.xml.gz rename to test/input/org/matsim/freight/logistics/example/lsp/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirectTest/testMain2_direct/output_events.xml.gz diff --git a/test/input/example/lsp/lspReplanning/CollectionLSPReplanningTest/output_events.xml.gz b/test/input/org/matsim/freight/logistics/example/lsp/lspReplanning/CollectionLSPReplanningTest/output_events.xml.gz similarity index 100% rename from test/input/example/lsp/lspReplanning/CollectionLSPReplanningTest/output_events.xml.gz rename to test/input/org/matsim/freight/logistics/example/lsp/lspReplanning/CollectionLSPReplanningTest/output_events.xml.gz diff --git a/test/input/example/lsp/lspScoring/CollectionLSPScoringTest/output_events.xml.gz b/test/input/org/matsim/freight/logistics/example/lsp/lspScoring/CollectionLSPScoringTest/output_events.xml.gz similarity index 100% rename from test/input/example/lsp/lspScoring/CollectionLSPScoringTest/output_events.xml.gz rename to test/input/org/matsim/freight/logistics/example/lsp/lspScoring/CollectionLSPScoringTest/output_events.xml.gz diff --git a/test/input/example/lsp/lspScoring/MultipleIterationsCollectionLSPScoringTest/output_events.xml.gz b/test/input/org/matsim/freight/logistics/example/lsp/lspScoring/MultipleIterationsCollectionLSPScoringTest/output_events.xml.gz similarity index 100% rename from test/input/example/lsp/lspScoring/MultipleIterationsCollectionLSPScoringTest/output_events.xml.gz rename to test/input/org/matsim/freight/logistics/example/lsp/lspScoring/MultipleIterationsCollectionLSPScoringTest/output_events.xml.gz diff --git a/test/input/example/lsp/mobsimExamples/ExampleMobsimOfSimpleLSPTest/output_events.xml.gz b/test/input/org/matsim/freight/logistics/example/lsp/mobsimExamples/ExampleMobsimOfSimpleLSPTest/output_events.xml.gz similarity index 100% rename from test/input/example/lsp/mobsimExamples/ExampleMobsimOfSimpleLSPTest/output_events.xml.gz rename to test/input/org/matsim/freight/logistics/example/lsp/mobsimExamples/ExampleMobsimOfSimpleLSPTest/output_events.xml.gz diff --git a/test/input/example/lsp/simulationTrackers/CollectionTrackerTest/output_events.xml.gz b/test/input/org/matsim/freight/logistics/example/lsp/simulationTrackers/CollectionTrackerTest/output_events.xml.gz similarity index 100% rename from test/input/example/lsp/simulationTrackers/CollectionTrackerTest/output_events.xml.gz rename to test/input/org/matsim/freight/logistics/example/lsp/simulationTrackers/CollectionTrackerTest/output_events.xml.gz diff --git a/test/input/lsp/io/carriers.xml b/test/input/org/matsim/freight/logistics/io/carriers.xml similarity index 93% rename from test/input/lsp/io/carriers.xml rename to test/input/org/matsim/freight/logistics/io/carriers.xml index 623e24e8..6e6493a0 100644 --- a/test/input/lsp/io/carriers.xml +++ b/test/input/org/matsim/freight/logistics/io/carriers.xml @@ -3,7 +3,7 @@ - distributionCarrier + distributionCarrier @@ -36,7 +36,7 @@ - distributionCarrier + distributionCarrier @@ -50,7 +50,7 @@ - distributionCarrier + distributionCarrier @@ -64,7 +64,7 @@ - mainRunCarrier + mainRunCarrier @@ -137,7 +137,7 @@ - distributionCarrier + distributionCarrier @@ -217,7 +217,7 @@ - distributionCarrier + distributionCarrier diff --git a/test/input/lsp/io/lsps.xml b/test/input/org/matsim/freight/logistics/io/lsps.xml similarity index 100% rename from test/input/lsp/io/lsps.xml rename to test/input/org/matsim/freight/logistics/io/lsps.xml diff --git a/test/input/lsp/io/vehicles.xml b/test/input/org/matsim/freight/logistics/io/vehicles.xml similarity index 100% rename from test/input/lsp/io/vehicles.xml rename to test/input/org/matsim/freight/logistics/io/vehicles.xml diff --git a/test/input/lspMobsimTests/CollectionLSPMobsimTest/output_events.xml.gz b/test/input/org/matsim/freight/logistics/lspMobsimTests/CollectionLSPMobsimTest/output_events.xml.gz similarity index 100% rename from test/input/lspMobsimTests/CollectionLSPMobsimTest/output_events.xml.gz rename to test/input/org/matsim/freight/logistics/lspMobsimTests/CollectionLSPMobsimTest/output_events.xml.gz diff --git a/test/input/lspMobsimTests/CompleteLSPMobsimTest/output_events.xml.gz b/test/input/org/matsim/freight/logistics/lspMobsimTests/CompleteLSPMobsimTest/output_events.xml.gz similarity index 100% rename from test/input/lspMobsimTests/CompleteLSPMobsimTest/output_events.xml.gz rename to test/input/org/matsim/freight/logistics/lspMobsimTests/CompleteLSPMobsimTest/output_events.xml.gz diff --git a/test/input/lspMobsimTests/FirstReloadLSPMobsimTest/output_events.xml.gz b/test/input/org/matsim/freight/logistics/lspMobsimTests/FirstReloadLSPMobsimTest/output_events.xml.gz similarity index 100% rename from test/input/lspMobsimTests/FirstReloadLSPMobsimTest/output_events.xml.gz rename to test/input/org/matsim/freight/logistics/lspMobsimTests/FirstReloadLSPMobsimTest/output_events.xml.gz diff --git a/test/input/lspMobsimTests/MainRunLSPMobsimTest/output_events.xml.gz b/test/input/org/matsim/freight/logistics/lspMobsimTests/MainRunLSPMobsimTest/output_events.xml.gz similarity index 100% rename from test/input/lspMobsimTests/MainRunLSPMobsimTest/output_events.xml.gz rename to test/input/org/matsim/freight/logistics/lspMobsimTests/MainRunLSPMobsimTest/output_events.xml.gz diff --git a/test/input/lspMobsimTests/MainRunOnlyLSPMobsimTest/output_events.xml.gz b/test/input/org/matsim/freight/logistics/lspMobsimTests/MainRunOnlyLSPMobsimTest/output_events.xml.gz similarity index 100% rename from test/input/lspMobsimTests/MainRunOnlyLSPMobsimTest/output_events.xml.gz rename to test/input/org/matsim/freight/logistics/lspMobsimTests/MainRunOnlyLSPMobsimTest/output_events.xml.gz diff --git a/test/input/lspMobsimTests/MultipleIterationsCollectionLSPMobsimTest/output_events.xml.gz b/test/input/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsCollectionLSPMobsimTest/output_events.xml.gz similarity index 100% rename from test/input/lspMobsimTests/MultipleIterationsCollectionLSPMobsimTest/output_events.xml.gz rename to test/input/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsCollectionLSPMobsimTest/output_events.xml.gz diff --git a/test/input/lspMobsimTests/MultipleIterationsCompleteLSPMobsimTest/output_events.xml.gz b/test/input/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsCompleteLSPMobsimTest/output_events.xml.gz similarity index 100% rename from test/input/lspMobsimTests/MultipleIterationsCompleteLSPMobsimTest/output_events.xml.gz rename to test/input/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsCompleteLSPMobsimTest/output_events.xml.gz diff --git a/test/input/lspMobsimTests/MultipleIterationsFirstReloadLSPMobsimTest/output_events.xml.gz b/test/input/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsFirstReloadLSPMobsimTest/output_events.xml.gz similarity index 100% rename from test/input/lspMobsimTests/MultipleIterationsFirstReloadLSPMobsimTest/output_events.xml.gz rename to test/input/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsFirstReloadLSPMobsimTest/output_events.xml.gz diff --git a/test/input/lspMobsimTests/MultipleIterationsMainRunLSPMobsimTest/output_events.xml.gz b/test/input/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsMainRunLSPMobsimTest/output_events.xml.gz similarity index 100% rename from test/input/lspMobsimTests/MultipleIterationsMainRunLSPMobsimTest/output_events.xml.gz rename to test/input/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsMainRunLSPMobsimTest/output_events.xml.gz diff --git a/test/input/lspMobsimTests/MultipleIterationsSecondReloadLSPMobsimTest/output_events.xml.gz b/test/input/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsSecondReloadLSPMobsimTest/output_events.xml.gz similarity index 100% rename from test/input/lspMobsimTests/MultipleIterationsSecondReloadLSPMobsimTest/output_events.xml.gz rename to test/input/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsSecondReloadLSPMobsimTest/output_events.xml.gz diff --git a/test/input/lspMobsimTests/MultipleShipmentsCollectionLSPMobsimTest/output_events.xml.gz b/test/input/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsCollectionLSPMobsimTest/output_events.xml.gz similarity index 100% rename from test/input/lspMobsimTests/MultipleShipmentsCollectionLSPMobsimTest/output_events.xml.gz rename to test/input/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsCollectionLSPMobsimTest/output_events.xml.gz diff --git a/test/input/lspMobsimTests/MultipleShipmentsCompleteLSPMobsimTest/output_events.xml.gz b/test/input/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsCompleteLSPMobsimTest/output_events.xml.gz similarity index 100% rename from test/input/lspMobsimTests/MultipleShipmentsCompleteLSPMobsimTest/output_events.xml.gz rename to test/input/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsCompleteLSPMobsimTest/output_events.xml.gz diff --git a/test/input/lspMobsimTests/MultipleShipmentsFirstReloadLSPMobsimTest/output_events.xml.gz b/test/input/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsFirstReloadLSPMobsimTest/output_events.xml.gz similarity index 100% rename from test/input/lspMobsimTests/MultipleShipmentsFirstReloadLSPMobsimTest/output_events.xml.gz rename to test/input/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsFirstReloadLSPMobsimTest/output_events.xml.gz diff --git a/test/input/lspMobsimTests/MultipleShipmentsMainRunLSPMobsimTest/output_events.xml.gz b/test/input/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsMainRunLSPMobsimTest/output_events.xml.gz similarity index 100% rename from test/input/lspMobsimTests/MultipleShipmentsMainRunLSPMobsimTest/output_events.xml.gz rename to test/input/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsMainRunLSPMobsimTest/output_events.xml.gz diff --git a/test/input/lspMobsimTests/MultipleShipmentsSecondReloadLSPMobsimTest/output_events.xml.gz b/test/input/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsSecondReloadLSPMobsimTest/output_events.xml.gz similarity index 100% rename from test/input/lspMobsimTests/MultipleShipmentsSecondReloadLSPMobsimTest/output_events.xml.gz rename to test/input/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsSecondReloadLSPMobsimTest/output_events.xml.gz diff --git a/test/input/lspMobsimTests/RepeatedMultipleShipmentsCompleteLSPMobsimTest/output_events.xml.gz b/test/input/org/matsim/freight/logistics/lspMobsimTests/RepeatedMultipleShipmentsCompleteLSPMobsimTest/output_events.xml.gz similarity index 100% rename from test/input/lspMobsimTests/RepeatedMultipleShipmentsCompleteLSPMobsimTest/output_events.xml.gz rename to test/input/org/matsim/freight/logistics/lspMobsimTests/RepeatedMultipleShipmentsCompleteLSPMobsimTest/output_events.xml.gz diff --git a/test/input/lspMobsimTests/SecondReloadLSPMobsimTest/output_events.xml.gz b/test/input/org/matsim/freight/logistics/lspMobsimTests/SecondReloadLSPMobsimTest/output_events.xml.gz similarity index 100% rename from test/input/lspMobsimTests/SecondReloadLSPMobsimTest/output_events.xml.gz rename to test/input/org/matsim/freight/logistics/lspMobsimTests/SecondReloadLSPMobsimTest/output_events.xml.gz