Skip to content
This repository has been archived by the owner on Nov 29, 2024. It is now read-only.

Commit

Permalink
remove deprecated setting of vehType
Browse files Browse the repository at this point in the history
  • Loading branch information
@kt86
kt86 committed Aug 14, 2024
1 parent cfdd81d commit aa704b4
Show file tree
Hide file tree
Showing 45 changed files with 8 additions and 79 deletions.
1 change: 0 additions & 1 deletion src/test/java/org/matsim/freight/logistics/adapterTests/CollectionResourceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
1 change: 0 additions & 1 deletion src/test/java/org/matsim/freight/logistics/adapterTests/DistributionResourceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
1 change: 0 additions & 1 deletion src/test/java/org/matsim/freight/logistics/adapterTests/MainRunResourceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
1 change: 0 additions & 1 deletion ...java/org/matsim/freight/logistics/examples/lspReplanning/CollectionLSPReplanningTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
5 changes: 4 additions & 1 deletion src/test/java/org/matsim/freight/logistics/examples/lspScoring/CollectionLSPScoringTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
1 change: 0 additions & 1 deletion ...sim/freight/logistics/examples/lspScoring/MultipleIterationsCollectionLSPScoringTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 0 additions & 2 deletions .../org/matsim/freight/logistics/examples/requirementsChecking/AssignerRequirementsTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down
1 change: 0 additions & 1 deletion .../java/org/matsim/freight/logistics/examples/simulationTrackers/CollectionTrackerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
1 change: 0 additions & 1 deletion ...st/java/org/matsim/freight/logistics/logisticChainElementTests/CollectionElementTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
1 change: 0 additions & 1 deletion src/test/java/org/matsim/freight/logistics/logisticChainElementTests/MainRunElementTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
1 change: 0 additions & 1 deletion src/test/java/org/matsim/freight/logistics/logisticChainTests/CollectionChainTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
3 changes: 0 additions & 3 deletions src/test/java/org/matsim/freight/logistics/logisticChainTests/CompleteLogisticChainTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down
1 change: 0 additions & 1 deletion src/test/java/org/matsim/freight/logistics/lspCreationTests/CollectionLSPCreationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
3 changes: 0 additions & 3 deletions src/test/java/org/matsim/freight/logistics/lspCreationTests/CompleteLSPCreationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down
1 change: 0 additions & 1 deletion src/test/java/org/matsim/freight/logistics/lspMobsimTests/CollectionLSPMobsimTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ public void initialize() {
// define carrier:
Id<Carrier> 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();
Expand Down
3 changes: 0 additions & 3 deletions src/test/java/org/matsim/freight/logistics/lspMobsimTests/CompleteLSPMobsimTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down
2 changes: 0 additions & 2 deletions ...t/java/org/matsim/freight/logistics/lspMobsimTests/FirstAndSecondReloadLSPMobsimTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down
1 change: 0 additions & 1 deletion src/test/java/org/matsim/freight/logistics/lspMobsimTests/FirstReloadLSPMobsimTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 0 additions & 2 deletions src/test/java/org/matsim/freight/logistics/lspMobsimTests/MainRunLSPMobsimTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down
1 change: 0 additions & 1 deletion src/test/java/org/matsim/freight/logistics/lspMobsimTests/MainRunOnlyLSPMobsimTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
1 change: 0 additions & 1 deletion ...rg/matsim/freight/logistics/lspMobsimTests/MultipleIterationsCollectionLSPMobsimTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
3 changes: 0 additions & 3 deletions .../org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsCompleteLSPMobsimTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down
2 changes: 0 additions & 2 deletions ...freight/logistics/lspMobsimTests/MultipleIterationsFirstAndSecondReloadLSPMobsimTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down
1 change: 0 additions & 1 deletion ...g/matsim/freight/logistics/lspMobsimTests/MultipleIterationsFirstReloadLSPMobsimTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
3 changes: 1 addition & 2 deletions ...a/org/matsim/freight/logistics/lspMobsimTests/MultipleIterationsMainRunLSPMobsimTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
import org.matsim.vehicles.Vehicle;
import org.matsim.vehicles.VehicleType;

@SuppressWarnings("ALL")
public class MultipleIterationsMainRunLSPMobsimTest {

@RegisterExtension
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down
1 change: 0 additions & 1 deletion ...org/matsim/freight/logistics/lspMobsimTests/MultipleShipmentsCollectionLSPMobsimTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Loading

0 comments on commit aa704b4

Please sign in to comment.