Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Freight (carrier): Rename internal variables and getter/setter to make them more consitent #3645

Merged
merged 15 commits into from
Dec 20, 2024
Merged

Freight (carrier): Rename internal variables and getter/setter to make them more consitent #3645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
2c26b6a
add getId() and getDemand() to interface
kt86 Dec 20, 2024
9e964e0
replace getSize() and getCapacityDemand() by new method getDemand()
kt86 Dec 20, 2024
91a19fb
remove field name from CarrierService, incl. Builder
kt86 Dec 20, 2024
701b615
reorder variables
kt86 Dec 20, 2024
e700fea
rename internal variables
kt86 Dec 20, 2024
27984fa
make vars in Builder private
kt86 Dec 20, 2024
5d71e55
make id final
kt86 Dec 20, 2024
da488be
make Builder constructor private, use available Builder.newInstance m…
kt86 Dec 20, 2024
10071db
rename setters in Builder to make it more consistent. old setters rem…
kt86 Dec 20, 2024
cbe5a12
comments and javadoc
kt86 Dec 20, 2024
b8c6da6
rename setter in Builder to make it more consistent. old setter remai…
kt86 Dec 20, 2024
80cc5df
use new method names
kt86 Dec 20, 2024
8c5e2aa
rename getters and setters to make it more consistent. old setters re…
kt86 Dec 20, 2024
1eac344
rename getters and setters to make it more consistent. old setters re…
kt86 Dec 20, 2024
9e65b09
reorganisation of code
kt86 Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 23 additions & 22 deletions ...ibs/application/src/main/java/org/matsim/freightDemandGeneration/DemandReaderFromCSV.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@ else if (samplingOption.equals("changeNumberOfLocationsWithDemand")) {
createJobId(scenario, newDemandInformationElement, link.getId(), null),
CarrierService.class);
CarrierService thisService = CarrierService.Builder.newInstance(idNewService, link.getId())
.setCapacityDemand(demandForThisLink).setServiceDuration(serviceTime)
.setDemand(demandForThisLink).setServiceDuration(serviceTime)
.setServiceStartTimeWindow(newDemandInformationElement.getFirstJobElementTimeWindow())
.build();
CarriersUtils.getCarriers(scenario).getCarriers()
Expand Down Expand Up @@ -696,7 +696,7 @@ else if (samplingOption.equals("changeNumberOfLocationsWithDemand")) {
CarrierService.class);
if (demandToDistribute > 0 && singleDemandForThisLink > 0) {
CarrierService thisService = CarrierService.Builder.newInstance(idNewService, link.getId())
.setCapacityDemand(singleDemandForThisLink).setServiceDuration(serviceTime)
.setDemand(singleDemandForThisLink).setServiceDuration(serviceTime)
.setServiceStartTimeWindow(newDemandInformationElement.getFirstJobElementTimeWindow())
.build();
thisCarrier.getServices().put(thisService.getId(), thisService);
Expand Down Expand Up @@ -747,7 +747,7 @@ else if (samplingOption.equals("changeNumberOfLocationsWithDemand")) {
createJobId(scenario, newDemandInformationElement, link.getId(), null), CarrierService.class);
if ((demandToDistribute > 0 && singleDemandForThisLink > 0) || demandToDistribute == 0) {
CarrierService thisService = CarrierService.Builder.newInstance(idNewService, link.getId())
.setCapacityDemand(singleDemandForThisLink).setServiceDuration(serviceTime)
.setDemand(singleDemandForThisLink).setServiceDuration(serviceTime)
.setServiceStartTimeWindow(newDemandInformationElement.getFirstJobElementTimeWindow())
.build();
CarriersUtils.getCarriers(scenario).getCarriers()
Expand Down Expand Up @@ -1051,8 +1051,8 @@ private static void createSingleShipment(Scenario scenario, DemandInformationEle

CarrierShipment thisShipment = CarrierShipment.Builder
.newInstance(idNewShipment, linkPickup.getId(), linkDelivery.getId(), singleDemandForThisLink)
.setPickupServiceTime(serviceTimePickup).setPickupTimeWindow(timeWindowPickup)
.setDeliveryServiceTime(serviceTimeDelivery).setDeliveryTimeWindow(timeWindowDelivery)
.setPickupDuration(serviceTimePickup).setPickupStartsTimeWindow(timeWindowPickup)
.setDeliveryDuration(serviceTimeDelivery).setDeliveryStartsTimeWindow(timeWindowDelivery)
.build();
thisCarrier.getShipments().put(thisShipment.getId(), thisShipment);
if (demandForThisLink == 0)
Expand Down Expand Up @@ -1188,29 +1188,30 @@ private static void combineSimilarJobs(Scenario scenario) {
if (!shipmentsToRemove.containsKey(thisShipmentId)) {
CarrierShipment thisShipment = thisCarrier.getShipments().get(thisShipmentId);
if (baseShipment.getId() != thisShipment.getId()
&& baseShipment.getFrom() == thisShipment.getFrom()
&& baseShipment.getTo() == thisShipment.getTo()
&& baseShipment.getPickupTimeWindow() == thisShipment.getPickupTimeWindow()
&& baseShipment.getDeliveryTimeWindow() == thisShipment.getDeliveryTimeWindow())
shipmentsToConnect.put(thisShipmentId, thisShipment);
&& baseShipment.getPickupLinkId() == thisShipment.getPickupLinkId()
&& baseShipment.getDeliveryLinkId() == thisShipment.getDeliveryLinkId()) {
if (baseShipment.getPickupStartsTimeWindow() == thisShipment.getPickupStartsTimeWindow()) {
if (baseShipment.getDeliveryStartsTimeWindow() == thisShipment.getDeliveryStartsTimeWindow()) shipmentsToConnect.put(thisShipmentId, thisShipment);
}
}
}
}
Id<CarrierShipment> idNewShipment = baseShipment.getId();
int demandForThisLink = 0;
double serviceTimePickup = 0;
double serviceTimeDelivery = 0;
for (CarrierShipment carrierShipment : shipmentsToConnect.values()) {
demandForThisLink = demandForThisLink + carrierShipment.getSize();
serviceTimePickup = serviceTimePickup + carrierShipment.getPickupServiceTime();
serviceTimeDelivery = serviceTimeDelivery + carrierShipment.getDeliveryServiceTime();
demandForThisLink = demandForThisLink + carrierShipment.getDemand();
serviceTimePickup = serviceTimePickup + carrierShipment.getPickupDuration();
serviceTimeDelivery = serviceTimeDelivery + carrierShipment.getDeliveryDuration();
shipmentsToRemove.put(carrierShipment.getId(), carrierShipment);
}
CarrierShipment newShipment = CarrierShipment.Builder
.newInstance(idNewShipment, baseShipment.getFrom(), baseShipment.getTo(), demandForThisLink)
.setPickupServiceTime(serviceTimePickup)
.setPickupTimeWindow(baseShipment.getPickupTimeWindow())
.setDeliveryServiceTime(serviceTimeDelivery)
.setDeliveryTimeWindow(baseShipment.getDeliveryTimeWindow()).build();
.newInstance(idNewShipment, baseShipment.getPickupLinkId(), baseShipment.getDeliveryLinkId(), demandForThisLink)
.setPickupDuration(serviceTimePickup)
.setPickupStartsTimeWindow(baseShipment.getPickupStartsTimeWindow())
.setDeliveryDuration(serviceTimeDelivery)
.setDeliveryStartsTimeWindow(baseShipment.getDeliveryStartsTimeWindow()).build();
shipmentsToAdd.add(newShipment);
}
}
Expand All @@ -1236,7 +1237,7 @@ private static void combineSimilarJobs(Scenario scenario) {
if (!servicesToRemove.containsKey(thisServiceId)) {
CarrierService thisService = thisCarrier.getServices().get(thisServiceId);
if (baseService.getId() != thisService.getId()
&& baseService.getLocationLinkId() == thisService.getLocationLinkId() && baseService
&& baseService.getServiceLinkId() == thisService.getServiceLinkId() && baseService
.getServiceStartTimeWindow() == thisService.getServiceStartTimeWindow())
servicesToConnect.put(thisServiceId, thisService);
}
Expand All @@ -1245,15 +1246,15 @@ private static void combineSimilarJobs(Scenario scenario) {
int demandForThisLink = 0;
double serviceTimeService = 0;
for (CarrierService carrierService : servicesToConnect.values()) {
demandForThisLink = demandForThisLink + carrierService.getCapacityDemand();
demandForThisLink = demandForThisLink + carrierService.getDemand();
serviceTimeService = serviceTimeService + carrierService.getServiceDuration();
servicesToRemove.put(carrierService.getId(), carrierService);
}
CarrierService newService = CarrierService.Builder
.newInstance(idNewService, baseService.getLocationLinkId())
.newInstance(idNewService, baseService.getServiceLinkId())
.setServiceDuration(serviceTimeService)
.setServiceStartTimeWindow(baseService.getServiceStartTimeWindow())
.setCapacityDemand(demandForThisLink).build();
.setDemand(demandForThisLink).build();
servicesToAdd.add(newService);
}
}
Expand Down
12 changes: 6 additions & 6 deletions ...cation/src/main/java/org/matsim/freightDemandGeneration/FreightDemandGenerationUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,23 +130,23 @@ static void createDemandLocationsFile(Controler controler) {
for (Carrier thisCarrier : CarriersUtils.getCarriers(controler.getScenario()).getCarriers().values()) {
for (CarrierService thisService : thisCarrier.getServices().values()) {
Coord coord = FreightDemandGenerationUtils
.getCoordOfMiddlePointOfLink(network.getLinks().get(thisService.getLocationLinkId()));
.getCoordOfMiddlePointOfLink(network.getLinks().get(thisService.getServiceLinkId()));
writer.write(thisCarrier.getId().toString() + thisService.getId().toString() + " " + coord.getX()
+ " " + coord.getY() + " " + "Service" + " "
+ thisService.getLocationLinkId().toString() + " " + "\n");
+ thisService.getServiceLinkId().toString() + " " + "\n");
}
for (CarrierShipment thisShipment : thisCarrier.getShipments().values()) {
Coord coordFrom = FreightDemandGenerationUtils
.getCoordOfMiddlePointOfLink(network.getLinks().get(thisShipment.getFrom()));
.getCoordOfMiddlePointOfLink(network.getLinks().get(thisShipment.getPickupLinkId()));
Coord coordTo = FreightDemandGenerationUtils
.getCoordOfMiddlePointOfLink(network.getLinks().get(thisShipment.getTo()));
.getCoordOfMiddlePointOfLink(network.getLinks().get(thisShipment.getDeliveryLinkId()));

writer.write(thisCarrier.getId().toString() + thisShipment.getId().toString() + " "
+ coordFrom.getX() + " " + coordFrom.getY() + " " + "Pickup" + " "
+ thisShipment.getFrom().toString() + " " + thisShipment.getTo().toString() + "\n");
+ thisShipment.getPickupLinkId().toString() + " " + thisShipment.getDeliveryLinkId().toString() + "\n");
writer.write(thisCarrier.getId().toString() + thisShipment.getId() + " "
+ coordTo.getX() + " " + coordTo.getY() + " " + "Delivery" + " "
+ thisShipment.getFrom() + " " + thisShipment.getTo() + "\n");
+ thisShipment.getPickupLinkId() + " " + thisShipment.getDeliveryLinkId() + "\n");
}
}
writer.flush();
Expand Down
Loading
Loading