diff --git a/src/test/java/org/matsim/freight/logistics/adapterTests/CollectionResourceTest.java b/src/test/java/org/matsim/freight/logistics/adapterTests/CollectionResourceTest.java index a1543516..5711bf84 100644 --- a/src/test/java/org/matsim/freight/logistics/adapterTests/CollectionResourceTest.java +++ b/src/test/java/org/matsim/freight/logistics/adapterTests/CollectionResourceTest.java @@ -74,7 +74,6 @@ public void initialize() { collectionCarrierVehicle = CarrierVehicle.newInstance(vollectionVehicleId, collectionLinkId, collectionType); CarrierCapabilities.Builder capabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - capabilitiesBuilder.addType(collectionType); capabilitiesBuilder.addVehicle(collectionCarrierVehicle); capabilitiesBuilder.setFleetSize(FleetSize.INFINITE); capabilities = capabilitiesBuilder.build(); diff --git a/src/test/java/org/matsim/freight/logistics/adapterTests/DistributionResourceTest.java b/src/test/java/org/matsim/freight/logistics/adapterTests/DistributionResourceTest.java index 7f97fe64..69dd7836 100644 --- a/src/test/java/org/matsim/freight/logistics/adapterTests/DistributionResourceTest.java +++ b/src/test/java/org/matsim/freight/logistics/adapterTests/DistributionResourceTest.java @@ -75,7 +75,6 @@ public void initialize() { distributionCarrierVehicle = CarrierVehicle.newInstance(distributionVehicleId, distributionLinkId, distributionType); CarrierCapabilities.Builder capabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - capabilitiesBuilder.addType(distributionType); capabilitiesBuilder.addVehicle(distributionCarrierVehicle); capabilitiesBuilder.setFleetSize(FleetSize.INFINITE); capabilities = capabilitiesBuilder.build(); diff --git a/src/test/java/org/matsim/freight/logistics/adapterTests/MainRunResourceTest.java b/src/test/java/org/matsim/freight/logistics/adapterTests/MainRunResourceTest.java index 9a54da10..777eb871 100644 --- a/src/test/java/org/matsim/freight/logistics/adapterTests/MainRunResourceTest.java +++ b/src/test/java/org/matsim/freight/logistics/adapterTests/MainRunResourceTest.java @@ -75,7 +75,6 @@ public void initialize() { CarrierCapabilities.Builder capabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - capabilitiesBuilder.addType(mainRunType); capabilitiesBuilder.addVehicle(carrierVehicle); capabilitiesBuilder.setFleetSize(FleetSize.INFINITE); capabilities = capabilitiesBuilder.build(); diff --git a/src/test/java/org/matsim/freight/logistics/examples/lspReplanning/CollectionLSPReplanningTest.java b/src/test/java/org/matsim/freight/logistics/examples/lspReplanning/CollectionLSPReplanningTest.java index 5068c98c..2e0b80c5 100644 --- a/src/test/java/org/matsim/freight/logistics/examples/lspReplanning/CollectionLSPReplanningTest.java +++ b/src/test/java/org/matsim/freight/logistics/examples/lspReplanning/CollectionLSPReplanningTest.java @@ -106,7 +106,6 @@ public void initialize() { CarrierVehicle carrierVehicle = CarrierVehicle.newInstance(Id.createVehicleId("CollectionVehicle"), collectionLink.getId(), collectionType); CarrierCapabilities.Builder capabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - capabilitiesBuilder.addType(collectionType); capabilitiesBuilder.addVehicle(carrierVehicle); capabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities capabilities = capabilitiesBuilder.build(); diff --git a/src/test/java/org/matsim/freight/logistics/examples/lspScoring/CollectionLSPScoringTest.java b/src/test/java/org/matsim/freight/logistics/examples/lspScoring/CollectionLSPScoringTest.java index f165eb84..5fe09bbe 100644 --- a/src/test/java/org/matsim/freight/logistics/examples/lspScoring/CollectionLSPScoringTest.java +++ b/src/test/java/org/matsim/freight/logistics/examples/lspScoring/CollectionLSPScoringTest.java @@ -77,7 +77,10 @@ public void initialize() { CarrierVehicle carrierVehicle = CarrierVehicle.newInstance(Id.createVehicleId("CollectionVehicle"), collectionLink.getId(), collectionVehicleType); Carrier carrier = CarriersUtils.createCarrier(Id.create("CollectionCarrier", Carrier.class)); - carrier.setCarrierCapabilities(CarrierCapabilities.Builder.newInstance().addType(collectionVehicleType).addVehicle(carrierVehicle).setFleetSize(FleetSize.INFINITE).build()); + carrier.setCarrierCapabilities(CarrierCapabilities.Builder.newInstance() + .addVehicle(carrierVehicle) + .setFleetSize(FleetSize.INFINITE) + .build()); LSPResource collectionResource = ResourceImplementationUtils.CollectionCarrierResourceBuilder.newInstance(carrier) .setCollectionScheduler(ResourceImplementationUtils.createDefaultCollectionCarrierScheduler(scenario)).setLocationLinkId(collectionLink.getId()).build(); diff --git a/src/test/java/org/matsim/freight/logistics/examples/lspScoring/MultipleIterationsCollectionLSPScoringTest.java b/src/test/java/org/matsim/freight/logistics/examples/lspScoring/MultipleIterationsCollectionLSPScoringTest.java index 7423567c..2910e9dc 100644 --- a/src/test/java/org/matsim/freight/logistics/examples/lspScoring/MultipleIterationsCollectionLSPScoringTest.java +++ b/src/test/java/org/matsim/freight/logistics/examples/lspScoring/MultipleIterationsCollectionLSPScoringTest.java @@ -93,7 +93,6 @@ public void initialize() { CarrierVehicle carrierVehicle = CarrierVehicle.newInstance(Id.createVehicleId("CollectionVehicle"), collectionLink.getId(), collectionType); CarrierCapabilities.Builder capabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - capabilitiesBuilder.addType(collectionType); capabilitiesBuilder.addVehicle(carrierVehicle); capabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities capabilities = capabilitiesBuilder.build(); diff --git a/src/test/java/org/matsim/freight/logistics/examples/requirementsChecking/AssignerRequirementsTest.java b/src/test/java/org/matsim/freight/logistics/examples/requirementsChecking/AssignerRequirementsTest.java index a19ddce7..063ebf65 100644 --- a/src/test/java/org/matsim/freight/logistics/examples/requirementsChecking/AssignerRequirementsTest.java +++ b/src/test/java/org/matsim/freight/logistics/examples/requirementsChecking/AssignerRequirementsTest.java @@ -95,7 +95,6 @@ public void initialize() { CarrierVehicle redVehicle = CarrierVehicle.newInstance(redVehicleId, collectionLinkId, collectionType); CarrierCapabilities redCapabilities = CarrierCapabilities.Builder.newInstance() - .addType(collectionType) .addVehicle(redVehicle) .setFleetSize(FleetSize.INFINITE) .build(); @@ -127,7 +126,6 @@ public void initialize() { CarrierVehicle blueVehicle = CarrierVehicle.newInstance(blueVehicleId, collectionLinkId, collectionType); CarrierCapabilities blueCapabilities = CarrierCapabilities.Builder.newInstance() - .addType(collectionType) .addVehicle(blueVehicle) .setFleetSize(FleetSize.INFINITE) .build(); diff --git a/src/test/java/org/matsim/freight/logistics/examples/simulationTrackers/CollectionTrackerTest.java b/src/test/java/org/matsim/freight/logistics/examples/simulationTrackers/CollectionTrackerTest.java index 6b16b5c1..de622ebd 100644 --- a/src/test/java/org/matsim/freight/logistics/examples/simulationTrackers/CollectionTrackerTest.java +++ b/src/test/java/org/matsim/freight/logistics/examples/simulationTrackers/CollectionTrackerTest.java @@ -96,7 +96,6 @@ public void initialize() { CarrierVehicle carrierVehicle = CarrierVehicle.newInstance(Id.createVehicleId("CollectionVehicle"), collectionLink.getId(), collectionType); CarrierCapabilities.Builder capabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - capabilitiesBuilder.addType(collectionType); capabilitiesBuilder.addVehicle(carrierVehicle); capabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities capabilities = capabilitiesBuilder.build(); diff --git a/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/CollectionElementTest.java b/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/CollectionElementTest.java index e8681b29..8c4dea37 100644 --- a/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/CollectionElementTest.java +++ b/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/CollectionElementTest.java @@ -67,7 +67,6 @@ public void initialize() { CarrierVehicle carrierVehicle = CarrierVehicle.newInstance(Id.createVehicleId("CollectionVehicle"), collectionLinkId, collectionType); CarrierCapabilities.Builder capabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - capabilitiesBuilder.addType(collectionType); capabilitiesBuilder.addVehicle(carrierVehicle); capabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities capabilities = capabilitiesBuilder.build(); diff --git a/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/MainRunElementTest.java b/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/MainRunElementTest.java index 5a7fe385..a9c0d3c6 100644 --- a/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/MainRunElementTest.java +++ b/src/test/java/org/matsim/freight/logistics/logisticChainElementTests/MainRunElementTest.java @@ -71,7 +71,6 @@ public void initialize() { CarrierCapabilities.Builder capabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - capabilitiesBuilder.addType(mainRunType); capabilitiesBuilder.addVehicle(carrierVehicle); capabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities capabilities = capabilitiesBuilder.build(); diff --git a/src/test/java/org/matsim/freight/logistics/logisticChainTests/CollectionChainTest.java b/src/test/java/org/matsim/freight/logistics/logisticChainTests/CollectionChainTest.java index 4c8ea5b5..8d417335 100644 --- a/src/test/java/org/matsim/freight/logistics/logisticChainTests/CollectionChainTest.java +++ b/src/test/java/org/matsim/freight/logistics/logisticChainTests/CollectionChainTest.java @@ -67,7 +67,6 @@ public void initialize() { CarrierVehicle carrierVehicle = CarrierVehicle.newInstance(Id.createVehicleId("CollectionVehicle"), collectionLinkId, collectionType); CarrierCapabilities.Builder capabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - capabilitiesBuilder.addType(collectionType); capabilitiesBuilder.addVehicle(carrierVehicle); capabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities capabilities = capabilitiesBuilder.build(); diff --git a/src/test/java/org/matsim/freight/logistics/logisticChainTests/CompleteLogisticChainTest.java b/src/test/java/org/matsim/freight/logistics/logisticChainTests/CompleteLogisticChainTest.java index 13afaa97..ba69e76f 100644 --- a/src/test/java/org/matsim/freight/logistics/logisticChainTests/CompleteLogisticChainTest.java +++ b/src/test/java/org/matsim/freight/logistics/logisticChainTests/CompleteLogisticChainTest.java @@ -79,7 +79,6 @@ public void initialize() { CarrierVehicle collectionCarrierVehicle = CarrierVehicle.newInstance(collectionVehicleId, collectionLinkId, collectionType); CarrierCapabilities.Builder collectionCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - collectionCapabilitiesBuilder.addType(collectionType); collectionCapabilitiesBuilder.addVehicle(collectionCarrierVehicle); collectionCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities collectionCapabilities = collectionCapabilitiesBuilder.build(); @@ -127,7 +126,6 @@ public void initialize() { CarrierVehicle mainRunCarrierVehicle = CarrierVehicle.newInstance(Id.createVehicleId("MainRunVehicle"), fromLinkId, mainRunType); CarrierCapabilities.Builder mainRunCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - mainRunCapabilitiesBuilder.addType(mainRunType); mainRunCapabilitiesBuilder.addVehicle(mainRunCarrierVehicle); mainRunCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities mainRunCapabilities = collectionCapabilitiesBuilder.build(); @@ -180,7 +178,6 @@ public void initialize() { CarrierVehicle distributionCarrierVehicle = CarrierVehicle.newInstance(distributionVehicleId, distributionLinkId, distributionType); CarrierCapabilities.Builder capabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - capabilitiesBuilder.addType(distributionType); capabilitiesBuilder.addVehicle(distributionCarrierVehicle); capabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities distributionCapabilities = capabilitiesBuilder.build(); diff --git a/src/test/java/org/matsim/freight/logistics/lspCreationTests/CollectionLSPCreationTest.java b/src/test/java/org/matsim/freight/logistics/lspCreationTests/CollectionLSPCreationTest.java index 75401fa5..5d8db51f 100644 --- a/src/test/java/org/matsim/freight/logistics/lspCreationTests/CollectionLSPCreationTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspCreationTests/CollectionLSPCreationTest.java @@ -68,7 +68,6 @@ public void initialize() { CarrierVehicle carrierVehicle = CarrierVehicle.newInstance(Id.createVehicleId("CollectionVehicle"), collectionLinkId, collectionType); CarrierCapabilities.Builder capabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - capabilitiesBuilder.addType(collectionType); capabilitiesBuilder.addVehicle(carrierVehicle); capabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities capabilities = capabilitiesBuilder.build(); diff --git a/src/test/java/org/matsim/freight/logistics/lspCreationTests/CompleteLSPCreationTest.java b/src/test/java/org/matsim/freight/logistics/lspCreationTests/CompleteLSPCreationTest.java index 1a8600d6..93bc4ddb 100644 --- a/src/test/java/org/matsim/freight/logistics/lspCreationTests/CompleteLSPCreationTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspCreationTests/CompleteLSPCreationTest.java @@ -70,7 +70,6 @@ public void initialize() { CarrierVehicle collectionCarrierVehicle = CarrierVehicle.newInstance(collectionVehicleId, collectionLinkId, collectionType); CarrierCapabilities.Builder collectionCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - collectionCapabilitiesBuilder.addType(collectionType); collectionCapabilitiesBuilder.addVehicle(collectionCarrierVehicle); collectionCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities collectionCapabilities = collectionCapabilitiesBuilder.build(); @@ -119,7 +118,6 @@ public void initialize() { CarrierCapabilities.Builder mainRunCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - mainRunCapabilitiesBuilder.addType(mainRunType); mainRunCapabilitiesBuilder.addVehicle(mainRunCarrierVehicle); mainRunCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities mainRunCapabilities = collectionCapabilitiesBuilder.build(); @@ -169,7 +167,6 @@ public void initialize() { CarrierVehicle distributionCarrierVehicle = CarrierVehicle.newInstance(distributionVehicleId, distributionLinkId, distributionType); CarrierCapabilities.Builder capabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - capabilitiesBuilder.addType(distributionType); capabilitiesBuilder.addVehicle(distributionCarrierVehicle); capabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities distributionCapabilities = capabilitiesBuilder.build(); diff --git a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/CollectionLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/CollectionLSPMobsimTest.java index d3d8a293..c8e99e94 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/CollectionLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/CollectionLSPMobsimTest.java @@ -100,7 +100,6 @@ public void initialize() { // define carrier: Id carrierId = Id.create("CollectionCarrier", Carrier.class); CarrierCapabilities.Builder capabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - capabilitiesBuilder.addType(collectionType); capabilitiesBuilder.addVehicle(carrierVehicle); capabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities capabilities = capabilitiesBuilder.build(); diff --git a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/CompleteLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/CompleteLSPMobsimTest.java index ffc2f870..7e435277 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/CompleteLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/CompleteLSPMobsimTest.java @@ -86,7 +86,6 @@ public void initialize() { CarrierVehicle collectionCarrierVehicle = CarrierVehicle.newInstance(collectionVehicleId, collectionLinkId, collectionType); CarrierCapabilities.Builder collectionCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - collectionCapabilitiesBuilder.addType(collectionType); collectionCapabilitiesBuilder.addVehicle(collectionCarrierVehicle); collectionCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities collectionCapabilities = collectionCapabilitiesBuilder.build(); @@ -135,7 +134,6 @@ public void initialize() { CarrierVehicle mainRunCarrierVehicle = CarrierVehicle.newInstance(mainRunVehicleId, fromLinkId, mainRunType); CarrierCapabilities.Builder mainRunCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - mainRunCapabilitiesBuilder.addType(mainRunType); mainRunCapabilitiesBuilder.addVehicle(mainRunCarrierVehicle); mainRunCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities mainRunCapabilities = mainRunCapabilitiesBuilder.build(); @@ -185,7 +183,6 @@ public void initialize() { CarrierVehicle distributionCarrierVehicle = CarrierVehicle.newInstance(distributionVehicleId, distributionLinkId, distributionType); CarrierCapabilities.Builder capabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - capabilitiesBuilder.addType(distributionType); capabilitiesBuilder.addVehicle(distributionCarrierVehicle); capabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities distributionCapabilities = capabilitiesBuilder.build(); diff --git a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/FirstAndSecondReloadLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/FirstAndSecondReloadLSPMobsimTest.java index efe494a3..79e2751f 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/FirstAndSecondReloadLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/FirstAndSecondReloadLSPMobsimTest.java @@ -90,7 +90,6 @@ public void initialize() { CarrierVehicle collectionCarrierVehicle = CarrierVehicle.newInstance(collectionVehicleId, collectionLinkId, collectionType); CarrierCapabilities.Builder collectionCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - collectionCapabilitiesBuilder.addType(collectionType); collectionCapabilitiesBuilder.addVehicle(collectionCarrierVehicle); collectionCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities collectionCapabilities = collectionCapabilitiesBuilder.build(); @@ -141,7 +140,6 @@ public void initialize() { CarrierCapabilities.Builder mainRunCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - mainRunCapabilitiesBuilder.addType(mainRunType); mainRunCapabilitiesBuilder.addVehicle(mainRunCarrierVehicle); mainRunCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities mainRunCapabilities = mainRunCapabilitiesBuilder.build(); diff --git a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/FirstReloadLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/FirstReloadLSPMobsimTest.java index 48b9f52a..7155658e 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/FirstReloadLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/FirstReloadLSPMobsimTest.java @@ -91,7 +91,6 @@ public void initialize() { CarrierVehicle collectionCarrierVehicle = CarrierVehicle.newInstance(collectionVehicleId, collectionLinkId, collectionType); CarrierCapabilities.Builder collectionCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - collectionCapabilitiesBuilder.addType(collectionType); collectionCapabilitiesBuilder.addVehicle(collectionCarrierVehicle); collectionCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities collectionCapabilities = collectionCapabilitiesBuilder.build(); diff --git a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MainRunLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MainRunLSPMobsimTest.java index e6602073..9022a2d9 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MainRunLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MainRunLSPMobsimTest.java @@ -90,7 +90,6 @@ public void initialize() { CarrierVehicle collectionCarrierVehicle = CarrierVehicle.newInstance(collectionVehicleId, collectionLinkId, collectionType); CarrierCapabilities.Builder collectionCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - collectionCapabilitiesBuilder.addType(collectionType); collectionCapabilitiesBuilder.addVehicle(collectionCarrierVehicle); collectionCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities collectionCapabilities = collectionCapabilitiesBuilder.build(); @@ -139,7 +138,6 @@ public void initialize() { CarrierVehicle mainRunCarrierVehicle = CarrierVehicle.newInstance(mainRunVehicleId, fromLinkId, mainRunType); CarrierCapabilities.Builder mainRunCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - mainRunCapabilitiesBuilder.addType(mainRunType); mainRunCapabilitiesBuilder.addVehicle(mainRunCarrierVehicle); mainRunCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities mainRunCapabilities = mainRunCapabilitiesBuilder.build(); diff --git a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MainRunOnlyLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MainRunOnlyLSPMobsimTest.java index 62b222b5..961f9020 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MainRunOnlyLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MainRunOnlyLSPMobsimTest.java @@ -89,7 +89,6 @@ public void initialize() { CarrierCapabilities.Builder mainRunCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - mainRunCapabilitiesBuilder.addType(mainRunType); mainRunCapabilitiesBuilder.addVehicle(mainRunCarrierVehicle); mainRunCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities mainRunCapabilities = mainRunCapabilitiesBuilder.build(); diff --git a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsCollectionLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsCollectionLSPMobsimTest.java index b1c3628c..208cf65a 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsCollectionLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsCollectionLSPMobsimTest.java @@ -93,7 +93,6 @@ public void initialize() { CarrierVehicle carrierVehicle = CarrierVehicle.newInstance(Id.createVehicleId("CollectionVehicle"), collectionLink.getId(), collectionType); CarrierCapabilities.Builder capabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - capabilitiesBuilder.addType(collectionType); capabilitiesBuilder.addVehicle(carrierVehicle); capabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities capabilities = capabilitiesBuilder.build(); diff --git a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsCompleteLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsCompleteLSPMobsimTest.java index 81d2d937..0e25899e 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsCompleteLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsCompleteLSPMobsimTest.java @@ -95,7 +95,6 @@ public void initialize() { CarrierVehicle collectionCarrierVehicle = CarrierVehicle.newInstance(collectionVehicleId, collectionLinkId, collectionType); CarrierCapabilities.Builder collectionCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - collectionCapabilitiesBuilder.addType(collectionType); collectionCapabilitiesBuilder.addVehicle(collectionCarrierVehicle); collectionCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities collectionCapabilities = collectionCapabilitiesBuilder.build(); @@ -146,7 +145,6 @@ public void initialize() { CarrierCapabilities.Builder mainRunCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - mainRunCapabilitiesBuilder.addType(mainRunType); mainRunCapabilitiesBuilder.addVehicle(mainRunCarrierVehicle); mainRunCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities mainRunCapabilities = mainRunCapabilitiesBuilder.build(); @@ -196,7 +194,6 @@ public void initialize() { CarrierVehicle distributionCarrierVehicle = CarrierVehicle.newInstance(distributionVehicleId, distributionLinkId, distributionType); CarrierCapabilities.Builder capabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - capabilitiesBuilder.addType(distributionType); capabilitiesBuilder.addVehicle(distributionCarrierVehicle); capabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities distributionCapabilities = capabilitiesBuilder.build(); diff --git a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsFirstAndSecondReloadLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsFirstAndSecondReloadLSPMobsimTest.java index e22de9f6..534b5552 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsFirstAndSecondReloadLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsFirstAndSecondReloadLSPMobsimTest.java @@ -96,7 +96,6 @@ public void initialize() { CarrierVehicle collectionCarrierVehicle = CarrierVehicle.newInstance(collectionVehicleId, collectionLinkId, collectionType); CarrierCapabilities.Builder collectionCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - collectionCapabilitiesBuilder.addType(collectionType); collectionCapabilitiesBuilder.addVehicle(collectionCarrierVehicle); collectionCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities collectionCapabilities = collectionCapabilitiesBuilder.build(); @@ -147,7 +146,6 @@ public void initialize() { CarrierCapabilities.Builder mainRunCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - mainRunCapabilitiesBuilder.addType(mainRunType); mainRunCapabilitiesBuilder.addVehicle(mainRunCarrierVehicle); mainRunCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities mainRunCapabilities = mainRunCapabilitiesBuilder.build(); diff --git a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsFirstReloadLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsFirstReloadLSPMobsimTest.java index 88321f48..96e68e1e 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsFirstReloadLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsFirstReloadLSPMobsimTest.java @@ -94,7 +94,6 @@ public void initialize() { CarrierVehicle collectionCarrierVehicle = CarrierVehicle.newInstance(Id.createVehicleId("CollectionVehicle"), collectionLinkId, collectionType); CarrierCapabilities.Builder collectionCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - collectionCapabilitiesBuilder.addType(collectionType); collectionCapabilitiesBuilder.addVehicle(collectionCarrierVehicle); collectionCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities collectionCapabilities = collectionCapabilitiesBuilder.build(); diff --git a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsMainRunLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsMainRunLSPMobsimTest.java index 7a6ffec7..9a25f460 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsMainRunLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsMainRunLSPMobsimTest.java @@ -60,6 +60,7 @@ import org.matsim.vehicles.Vehicle; import org.matsim.vehicles.VehicleType; +@SuppressWarnings("ALL") public class MultipleIterationsMainRunLSPMobsimTest { @RegisterExtension @@ -95,7 +96,6 @@ public void initialize() { CarrierVehicle collectionCarrierVehicle = CarrierVehicle.newInstance(collectionVehicleId, collectionLinkId, collectionType); CarrierCapabilities.Builder collectionCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - collectionCapabilitiesBuilder.addType(collectionType); collectionCapabilitiesBuilder.addVehicle(collectionCarrierVehicle); collectionCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities collectionCapabilities = collectionCapabilitiesBuilder.build(); @@ -146,7 +146,6 @@ public void initialize() { CarrierCapabilities.Builder mainRunCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - mainRunCapabilitiesBuilder.addType(mainRunType); mainRunCapabilitiesBuilder.addVehicle(mainRunCarrierVehicle); mainRunCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities mainRunCapabilities = mainRunCapabilitiesBuilder.build(); diff --git a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsCollectionLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsCollectionLSPMobsimTest.java index 4f3b2711..9bf7a021 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsCollectionLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsCollectionLSPMobsimTest.java @@ -88,7 +88,6 @@ public void initialize() { CarrierVehicle carrierVehicle = CarrierVehicle.newInstance(Id.createVehicleId("CollectionVehicle"), collectionLink.getId(), collectionType); CarrierCapabilities.Builder capabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - capabilitiesBuilder.addType(collectionType); capabilitiesBuilder.addVehicle(carrierVehicle); capabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities capabilities = capabilitiesBuilder.build(); diff --git a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsCompleteLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsCompleteLSPMobsimTest.java index 3217baa3..1f6257e3 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsCompleteLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsCompleteLSPMobsimTest.java @@ -98,7 +98,6 @@ public void initialize() { CarrierVehicle collectionCarrierVehicle = CarrierVehicle.newInstance(collectionVehicleId, collectionLinkId, collectionType); CarrierCapabilities.Builder collectionCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - collectionCapabilitiesBuilder.addType(collectionType); collectionCapabilitiesBuilder.addVehicle(collectionCarrierVehicle); collectionCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities collectionCapabilities = collectionCapabilitiesBuilder.build(); @@ -149,7 +148,6 @@ public void initialize() { CarrierCapabilities.Builder mainRunCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - mainRunCapabilitiesBuilder.addType(mainRunType); mainRunCapabilitiesBuilder.addVehicle(mainRunCarrierVehicle); mainRunCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities mainRunCapabilities = mainRunCapabilitiesBuilder.build(); @@ -199,7 +197,6 @@ public void initialize() { CarrierVehicle distributionCarrierVehicle = CarrierVehicle.newInstance(distributionVehicleId, distributionLinkId, distributionType); CarrierCapabilities.Builder capabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - capabilitiesBuilder.addType(distributionType); capabilitiesBuilder.addVehicle(distributionCarrierVehicle); capabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities distributionCapabilities = capabilitiesBuilder.build(); @@ -308,10 +305,10 @@ public void initialize() { LSPUtils.addLSPs(scenario, lsps); controler.addOverridingModule(new LSPModule()); controler.addOverridingModule( new AbstractModule(){ - @Override public void install(){ + @Override public void install(){ bind( LSPStrategyManager.class ).toProvider(() -> { LSPStrategyManager strategyManager = new LSPStrategyManagerImpl(); - strategyManager.addStrategy(new AssignmentStrategyFactory().createStrategy(), null, 1); + strategyManager.addStrategy(new AssignmentStrategyFactory().createStrategy(), null, 1); return strategyManager; }); bind( CarrierStrategyManager.class ).toProvider(() -> { diff --git a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsFirstAndSecondReloadLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsFirstAndSecondReloadLSPMobsimTest.java index dcc82858..352674b7 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsFirstAndSecondReloadLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsFirstAndSecondReloadLSPMobsimTest.java @@ -95,7 +95,6 @@ public void initialize() { CarrierVehicle collectionCarrierVehicle = CarrierVehicle.newInstance(collectionVehicleId, collectionLinkId, collectionType); CarrierCapabilities.Builder collectionCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - collectionCapabilitiesBuilder.addType(collectionType); collectionCapabilitiesBuilder.addVehicle(collectionCarrierVehicle); collectionCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities collectionCapabilities = collectionCapabilitiesBuilder.build(); @@ -146,7 +145,6 @@ public void initialize() { CarrierCapabilities.Builder mainRunCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - mainRunCapabilitiesBuilder.addType(mainRunType); mainRunCapabilitiesBuilder.addVehicle(mainRunCarrierVehicle); mainRunCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities mainRunCapabilities = mainRunCapabilitiesBuilder.build(); @@ -271,7 +269,7 @@ public void initialize() { @Override public void install(){ bind( LSPStrategyManager.class ).toProvider(() -> { LSPStrategyManager strategyManager = new LSPStrategyManagerImpl(); - strategyManager.addStrategy(new AssignmentStrategyFactory().createStrategy(), null, 1); + strategyManager.addStrategy(new AssignmentStrategyFactory().createStrategy(), null, 1); return strategyManager; }); bind( CarrierStrategyManager.class ).toProvider(() -> { diff --git a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsFirstReloadLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsFirstReloadLSPMobsimTest.java index d81d3a22..5d949c0a 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsFirstReloadLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsFirstReloadLSPMobsimTest.java @@ -90,7 +90,6 @@ public void initialize() { CarrierVehicle collectionCarrierVehicle = CarrierVehicle.newInstance(collectionVehicleId, collectionLinkId, collectionType); CarrierCapabilities.Builder collectionCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - collectionCapabilitiesBuilder.addType(collectionType); collectionCapabilitiesBuilder.addVehicle(collectionCarrierVehicle); collectionCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities collectionCapabilities = collectionCapabilitiesBuilder.build(); diff --git a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsMainRunLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsMainRunLSPMobsimTest.java index b8037a03..4b9c04a2 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsMainRunLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsMainRunLSPMobsimTest.java @@ -90,7 +90,6 @@ public void initialize() { CarrierVehicle collectionCarrierVehicle = CarrierVehicle.newInstance(collectionVehicleId, collectionLinkId, collectionType); CarrierCapabilities.Builder collectionCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - collectionCapabilitiesBuilder.addType(collectionType); collectionCapabilitiesBuilder.addVehicle(collectionCarrierVehicle); collectionCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities collectionCapabilities = collectionCapabilitiesBuilder.build(); @@ -140,7 +139,6 @@ public void initialize() { CarrierVehicle mainRunCarrierVehicle = CarrierVehicle.newInstance(mainRunVehicleId, fromLinkId, mainRunType); CarrierCapabilities.Builder mainRunCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - mainRunCapabilitiesBuilder.addType(mainRunType); mainRunCapabilitiesBuilder.addVehicle(mainRunCarrierVehicle); mainRunCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities mainRunCapabilities = mainRunCapabilitiesBuilder.build(); diff --git a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/RepeatedMultipleShipmentsCompleteLSPMobsimTest.java b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/RepeatedMultipleShipmentsCompleteLSPMobsimTest.java index d20cb939..a4521fc2 100644 --- a/src/test/java/org/matsim/freight/logistics/lspMobsimTests/RepeatedMultipleShipmentsCompleteLSPMobsimTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspMobsimTests/RepeatedMultipleShipmentsCompleteLSPMobsimTest.java @@ -90,7 +90,6 @@ public void initialize() { CarrierVehicle collectionCarrierVehicle = CarrierVehicle.newInstance(collectionVehicleId, collectionLinkId, collectionType); CarrierCapabilities.Builder collectionCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - collectionCapabilitiesBuilder.addType(collectionType); collectionCapabilitiesBuilder.addVehicle(collectionCarrierVehicle); collectionCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities collectionCapabilities = collectionCapabilitiesBuilder.build(); @@ -141,7 +140,6 @@ public void initialize() { CarrierCapabilities.Builder mainRunCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - mainRunCapabilitiesBuilder.addType(mainRunType); mainRunCapabilitiesBuilder.addVehicle(mainRunCarrierVehicle); mainRunCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities mainRunCapabilities = mainRunCapabilitiesBuilder.build(); @@ -191,7 +189,6 @@ public void initialize() { CarrierVehicle distributionCarrierVehicle = CarrierVehicle.newInstance(distributionVehicleId, distributionLinkId, distributionType); CarrierCapabilities.Builder capabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - capabilitiesBuilder.addType(distributionType); capabilitiesBuilder.addVehicle(distributionCarrierVehicle); capabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities distributionCapabilities = capabilitiesBuilder.build(); diff --git a/src/test/java/org/matsim/freight/logistics/lspPlanTests/CollectionLSPPlanTest.java b/src/test/java/org/matsim/freight/logistics/lspPlanTests/CollectionLSPPlanTest.java index c6797f4d..41285a8a 100644 --- a/src/test/java/org/matsim/freight/logistics/lspPlanTests/CollectionLSPPlanTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspPlanTests/CollectionLSPPlanTest.java @@ -67,7 +67,6 @@ public void initialize() { CarrierVehicle carrierVehicle = CarrierVehicle.newInstance(Id.createVehicleId("CollectionVehicle"), collectionLinkId, collectionType); CarrierCapabilities.Builder capabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - capabilitiesBuilder.addType(collectionType); capabilitiesBuilder.addVehicle(carrierVehicle); capabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities capabilities = capabilitiesBuilder.build(); diff --git a/src/test/java/org/matsim/freight/logistics/lspPlanTests/CompleteLSPPlanTest.java b/src/test/java/org/matsim/freight/logistics/lspPlanTests/CompleteLSPPlanTest.java index 3efe8d0f..f691b6c6 100644 --- a/src/test/java/org/matsim/freight/logistics/lspPlanTests/CompleteLSPPlanTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspPlanTests/CompleteLSPPlanTest.java @@ -70,7 +70,6 @@ public void initialize() { CarrierVehicle collectionCarrierVehicle = CarrierVehicle.newInstance(collectionVehicleId, collectionLinkId, collectionType); CarrierCapabilities.Builder collectionCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - collectionCapabilitiesBuilder.addType(collectionType); collectionCapabilitiesBuilder.addVehicle(collectionCarrierVehicle); collectionCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities collectionCapabilities = collectionCapabilitiesBuilder.build(); @@ -120,7 +119,6 @@ public void initialize() { CarrierCapabilities.Builder mainRunCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - mainRunCapabilitiesBuilder.addType(mainRunType); mainRunCapabilitiesBuilder.addVehicle(mainRunCarrierVehicle); mainRunCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities mainRunCapabilities = collectionCapabilitiesBuilder.build(); @@ -170,7 +168,6 @@ public void initialize() { CarrierVehicle distributionCarrierVehicle = CarrierVehicle.newInstance(distributionVehicleId, distributionLinkId, distributionType); CarrierCapabilities.Builder capabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - capabilitiesBuilder.addType(distributionType); capabilitiesBuilder.addVehicle(distributionCarrierVehicle); capabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities distributionCapabilities = capabilitiesBuilder.build(); diff --git a/src/test/java/org/matsim/freight/logistics/lspShipmentAssignmentTests/CollectionLspShipmentAssigmentTest.java b/src/test/java/org/matsim/freight/logistics/lspShipmentAssignmentTests/CollectionLspShipmentAssigmentTest.java index 30afaeba..3ae2ed4a 100644 --- a/src/test/java/org/matsim/freight/logistics/lspShipmentAssignmentTests/CollectionLspShipmentAssigmentTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspShipmentAssignmentTests/CollectionLspShipmentAssigmentTest.java @@ -71,7 +71,6 @@ public void initialize() { CarrierVehicle carrierVehicle = CarrierVehicle.newInstance(Id.createVehicleId("CollectionVehicle"), collectionLinkId, collectionType); CarrierCapabilities.Builder capabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - capabilitiesBuilder.addType(collectionType); capabilitiesBuilder.addVehicle(carrierVehicle); capabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities capabilities = capabilitiesBuilder.build(); diff --git a/src/test/java/org/matsim/freight/logistics/lspShipmentAssignmentTests/CompleteLspShipmentAssignerTest.java b/src/test/java/org/matsim/freight/logistics/lspShipmentAssignmentTests/CompleteLspShipmentAssignerTest.java index c64a5c1f..a3b520d4 100644 --- a/src/test/java/org/matsim/freight/logistics/lspShipmentAssignmentTests/CompleteLspShipmentAssignerTest.java +++ b/src/test/java/org/matsim/freight/logistics/lspShipmentAssignmentTests/CompleteLspShipmentAssignerTest.java @@ -75,7 +75,6 @@ public void initialize() { CarrierVehicle collectionCarrierVehicle = CarrierVehicle.newInstance(collectionVehicleId, collectionLinkId, collectionType); CarrierCapabilities.Builder collectionCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - collectionCapabilitiesBuilder.addType(collectionType); collectionCapabilitiesBuilder.addVehicle(collectionCarrierVehicle); collectionCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities collectionCapabilities = collectionCapabilitiesBuilder.build(); @@ -124,7 +123,6 @@ public void initialize() { CarrierCapabilities.Builder mainRunCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - mainRunCapabilitiesBuilder.addType(mainRunType); mainRunCapabilitiesBuilder.addVehicle(mainRunCarrierVehicle); mainRunCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities mainRunCapabilities = collectionCapabilitiesBuilder.build(); @@ -174,7 +172,6 @@ public void initialize() { CarrierVehicle distributionCarrierVehicle = CarrierVehicle.newInstance(distributionVehicleId, distributionLinkId, distributionType); CarrierCapabilities.Builder capabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - capabilitiesBuilder.addType(distributionType); capabilitiesBuilder.addVehicle(distributionCarrierVehicle); capabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities distributionCapabilities = capabilitiesBuilder.build(); diff --git a/src/test/java/org/matsim/freight/logistics/resourceImplementations/CollectionLSPSchedulingTest.java b/src/test/java/org/matsim/freight/logistics/resourceImplementations/CollectionLSPSchedulingTest.java index 41b00365..6a992b7a 100644 --- a/src/test/java/org/matsim/freight/logistics/resourceImplementations/CollectionLSPSchedulingTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/CollectionLSPSchedulingTest.java @@ -73,7 +73,6 @@ public void initialize() { CarrierVehicle carrierVehicle = CarrierVehicle.newInstance(Id.createVehicleId("CollectionVehicle"), collectionLinkId, collectionType); CarrierCapabilities.Builder capabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - capabilitiesBuilder.addType(collectionType); capabilitiesBuilder.addVehicle(carrierVehicle); capabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities capabilities = capabilitiesBuilder.build(); diff --git a/src/test/java/org/matsim/freight/logistics/resourceImplementations/CompleteLSPSchedulingTest.java b/src/test/java/org/matsim/freight/logistics/resourceImplementations/CompleteLSPSchedulingTest.java index 01ac0685..e4227cbd 100644 --- a/src/test/java/org/matsim/freight/logistics/resourceImplementations/CompleteLSPSchedulingTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/CompleteLSPSchedulingTest.java @@ -86,7 +86,6 @@ public void initialize() { CarrierVehicle collectionCarrierVehicle = CarrierVehicle.newInstance(collectionVehicleId, collectionLinkId, collectionType); CarrierCapabilities.Builder collectionCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - collectionCapabilitiesBuilder.addType(collectionType); collectionCapabilitiesBuilder.addVehicle(collectionCarrierVehicle); collectionCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities collectionCapabilities = collectionCapabilitiesBuilder.build(); @@ -137,7 +136,6 @@ public void initialize() { CarrierCapabilities.Builder mainRunCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - mainRunCapabilitiesBuilder.addType(mainRunType); mainRunCapabilitiesBuilder.addVehicle(mainRunCarrierVehicle); mainRunCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities mainRunCapabilities = mainRunCapabilitiesBuilder.build(); @@ -186,7 +184,6 @@ public void initialize() { CarrierVehicle distributionCarrierVehicle = CarrierVehicle.newInstance(distributionVehicleId, distributionLinkId, distributionType); CarrierCapabilities.Builder capabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - capabilitiesBuilder.addType(distributionType); capabilitiesBuilder.addVehicle(distributionCarrierVehicle); capabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities distributionCapabilities = capabilitiesBuilder.build(); diff --git a/src/test/java/org/matsim/freight/logistics/resourceImplementations/FirstReloadLSPSchedulingTest.java b/src/test/java/org/matsim/freight/logistics/resourceImplementations/FirstReloadLSPSchedulingTest.java index d79f3141..8ad0b1c4 100644 --- a/src/test/java/org/matsim/freight/logistics/resourceImplementations/FirstReloadLSPSchedulingTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/FirstReloadLSPSchedulingTest.java @@ -78,7 +78,6 @@ public void initialize() { CarrierVehicle collectionCarrierVehicle = CarrierVehicle.newInstance(collectionVehicleId, collectionLinkId, collectionType); CarrierCapabilities.Builder collectionCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - collectionCapabilitiesBuilder.addType(collectionType); collectionCapabilitiesBuilder.addVehicle(collectionCarrierVehicle); collectionCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities collectionCapabilities = collectionCapabilitiesBuilder.build(); diff --git a/src/test/java/org/matsim/freight/logistics/resourceImplementations/MainRunLSPSchedulingTest.java b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MainRunLSPSchedulingTest.java index 5909c999..7f6900e6 100644 --- a/src/test/java/org/matsim/freight/logistics/resourceImplementations/MainRunLSPSchedulingTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MainRunLSPSchedulingTest.java @@ -80,7 +80,6 @@ public void initialize() { CarrierVehicle collectionCarrierVehicle = CarrierVehicle.newInstance(collectionVehicleId, collectionLinkId, collectionType); CarrierCapabilities.Builder collectionCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - collectionCapabilitiesBuilder.addType(collectionType); collectionCapabilitiesBuilder.addVehicle(collectionCarrierVehicle); collectionCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities collectionCapabilities = collectionCapabilitiesBuilder.build(); @@ -129,7 +128,6 @@ public void initialize() { CarrierVehicle mainRunCarrierVehicle = CarrierVehicle.newInstance(mainRunVehicleId, fromLinkId, mainRunType); CarrierCapabilities.Builder mainRunCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - mainRunCapabilitiesBuilder.addType(mainRunType); mainRunCapabilitiesBuilder.addVehicle(mainRunCarrierVehicle); mainRunCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities mainRunCapabilities = mainRunCapabilitiesBuilder.build(); diff --git a/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsCollectionLSPSchedulingTest.java b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsCollectionLSPSchedulingTest.java index e4f84cd4..77e1d8c2 100644 --- a/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsCollectionLSPSchedulingTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsCollectionLSPSchedulingTest.java @@ -75,7 +75,6 @@ public void initialize() { CarrierVehicle carrierVehicle = CarrierVehicle.newInstance(vollectionVehicleId, collectionLinkId, collectionType); CarrierCapabilities.Builder capabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - capabilitiesBuilder.addType(collectionType); capabilitiesBuilder.addVehicle(carrierVehicle); capabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities capabilities = capabilitiesBuilder.build(); diff --git a/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsCompleteLSPSchedulingTest.java b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsCompleteLSPSchedulingTest.java index ec2ed677..8b09edd0 100644 --- a/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsCompleteLSPSchedulingTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsCompleteLSPSchedulingTest.java @@ -86,7 +86,6 @@ public void initialize() { CarrierVehicle collectionCarrierVehicle = CarrierVehicle.newInstance(collectionVehicleId, collectionLinkId, collectionType); CarrierCapabilities.Builder collectionCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - collectionCapabilitiesBuilder.addType(collectionType); collectionCapabilitiesBuilder.addVehicle(collectionCarrierVehicle); collectionCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities collectionCapabilities = collectionCapabilitiesBuilder.build(); @@ -138,7 +137,6 @@ public void initialize() { CarrierCapabilities.Builder mainRunCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - mainRunCapabilitiesBuilder.addType(mainRunType); mainRunCapabilitiesBuilder.addVehicle(mainRunCarrierVehicle); mainRunCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities mainRunCapabilities = mainRunCapabilitiesBuilder.build(); @@ -188,7 +186,6 @@ public void initialize() { CarrierVehicle distributionCarrierVehicle = CarrierVehicle.newInstance(distributionVehicleId, distributionLinkId, distributionType); CarrierCapabilities.Builder capabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - capabilitiesBuilder.addType(distributionType); capabilitiesBuilder.addVehicle(distributionCarrierVehicle); capabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities distributionCapabilities = capabilitiesBuilder.build(); diff --git a/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsFirstReloadLSPSchedulingTest.java b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsFirstReloadLSPSchedulingTest.java index 30507398..d101b4c9 100644 --- a/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsFirstReloadLSPSchedulingTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsFirstReloadLSPSchedulingTest.java @@ -78,7 +78,6 @@ public void initialize() { CarrierVehicle collectionCarrierVehicle = CarrierVehicle.newInstance(collectionVehicleId, collectionLinkId, collectionType); CarrierCapabilities.Builder collectionCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - collectionCapabilitiesBuilder.addType(collectionType); collectionCapabilitiesBuilder.addVehicle(collectionCarrierVehicle); collectionCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities collectionCapabilities = collectionCapabilitiesBuilder.build(); diff --git a/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsMainRunLSPSchedulingTest.java b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsMainRunLSPSchedulingTest.java index 205d0022..4f0605cf 100644 --- a/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsMainRunLSPSchedulingTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsMainRunLSPSchedulingTest.java @@ -80,7 +80,6 @@ public void initialize() { CarrierVehicle collectionCarrierVehicle = CarrierVehicle.newInstance(collectionVehicleId, collectionLinkId, collectionType); CarrierCapabilities.Builder collectionCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - collectionCapabilitiesBuilder.addType(collectionType); collectionCapabilitiesBuilder.addVehicle(collectionCarrierVehicle); collectionCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities collectionCapabilities = collectionCapabilitiesBuilder.build(); @@ -129,7 +128,6 @@ public void initialize() { CarrierVehicle mainRunCarrierVehicle = CarrierVehicle.newInstance(mainRunVehicleId, fromLinkId, mainRunType); CarrierCapabilities.Builder mainRunCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - mainRunCapabilitiesBuilder.addType(mainRunType); mainRunCapabilitiesBuilder.addVehicle(mainRunCarrierVehicle); mainRunCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities mainRunCapabilities = mainRunCapabilitiesBuilder.build(); diff --git a/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsSecondReloadLSPSchedulingTest.java b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsSecondReloadLSPSchedulingTest.java index 6fa3888e..42425002 100644 --- a/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsSecondReloadLSPSchedulingTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/MultipleShipmentsSecondReloadLSPSchedulingTest.java @@ -84,7 +84,6 @@ public void initialize() { CarrierVehicle collectionCarrierVehicle = CarrierVehicle.newInstance(collectionVehicleId, collectionLinkId, collectionType); CarrierCapabilities.Builder collectionCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - collectionCapabilitiesBuilder.addType(collectionType); collectionCapabilitiesBuilder.addVehicle(collectionCarrierVehicle); collectionCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities collectionCapabilities = collectionCapabilitiesBuilder.build(); @@ -136,7 +135,6 @@ public void initialize() { CarrierCapabilities.Builder mainRunCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - mainRunCapabilitiesBuilder.addType(mainRunType); mainRunCapabilitiesBuilder.addVehicle(mainRunCarrierVehicle); mainRunCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities mainRunCapabilities = mainRunCapabilitiesBuilder.build(); diff --git a/src/test/java/org/matsim/freight/logistics/resourceImplementations/SecondReloadLSPSchedulingTest.java b/src/test/java/org/matsim/freight/logistics/resourceImplementations/SecondReloadLSPSchedulingTest.java index e1440539..69d5e998 100644 --- a/src/test/java/org/matsim/freight/logistics/resourceImplementations/SecondReloadLSPSchedulingTest.java +++ b/src/test/java/org/matsim/freight/logistics/resourceImplementations/SecondReloadLSPSchedulingTest.java @@ -84,7 +84,6 @@ public void initialize() { CarrierVehicle collectionCarrierVehicle = CarrierVehicle.newInstance(collectionVehicleId, collectionLinkId, collectionType); CarrierCapabilities.Builder collectionCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - collectionCapabilitiesBuilder.addType(collectionType); collectionCapabilitiesBuilder.addVehicle(collectionCarrierVehicle); collectionCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities collectionCapabilities = collectionCapabilitiesBuilder.build(); @@ -136,7 +135,6 @@ public void initialize() { CarrierCapabilities.Builder mainRunCapabilitiesBuilder = CarrierCapabilities.Builder.newInstance(); - mainRunCapabilitiesBuilder.addType(mainRunType); mainRunCapabilitiesBuilder.addVehicle(mainRunCarrierVehicle); mainRunCapabilitiesBuilder.setFleetSize(FleetSize.INFINITE); CarrierCapabilities mainRunCapabilities = mainRunCapabilitiesBuilder.build();