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

Commit

Permalink
some encapsulation. fix and comment test
Browse files Browse the repository at this point in the history
  • Loading branch information
@kt86
kt86 committed Aug 14, 2024
1 parent 1f901f0 commit 28217d0
Show file tree
Hide file tree
Showing 2 changed files with 122 additions and 94 deletions.
104 changes: 57 additions & 47 deletions ...ght/logistics/resourceImplementations/MultipleShipmentsSecondReloadLSPSchedulingTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -354,63 +354,73 @@ public void testSecondReloadLSPScheduling() {
assertSame(planElements.getFirst().getLogisticChainElement(), collectionElement);
}

assertEquals(1, firstTranshipmentHubResource.getSimulationTrackers().size());
ArrayList<EventHandler> eventHandlers = new ArrayList<>(firstTranshipmentHubResource.getSimulationTrackers());
assertInstanceOf(TransshipmentHubTourEndEventHandler.class, eventHandlers.getFirst());
TransshipmentHubTourEndEventHandler reloadEventHandler = (TransshipmentHubTourEndEventHandler) eventHandlers.getFirst();
Iterator<Entry<CarrierService, TransshipmentHubTourEndEventHandler.TransshipmentHubEventHandlerPair>> iter = reloadEventHandler.getServicesWaitedFor().entrySet().iterator();

while (iter.hasNext()) {
Entry<CarrierService, TransshipmentHubTourEndEventHandler.TransshipmentHubEventHandlerPair> entry = iter.next();
CarrierService service = entry.getKey();
LspShipment shipment = entry.getValue().lspShipment;
LogisticChainElement element = entry.getValue().element;
assertSame(service.getLocationLinkId(), shipment.getFrom());
assertEquals(service.getCapacityDemand(), shipment.getSize());
assertEquals(service.getServiceDuration(), shipment.getDeliveryServiceTime(), 0.0);
boolean handledByTranshipmentHub = false;
for (LogisticChainElement clientElement : reloadEventHandler.getTranshipmentHub().getClientElements()) {
if (clientElement == element) {
handledByTranshipmentHub = true;
break;
{
assertEquals(1, firstTranshipmentHubResource.getSimulationTrackers().size());
ArrayList<EventHandler> eventHandlers = new ArrayList<>(firstTranshipmentHubResource.getSimulationTrackers());
assertInstanceOf(TransshipmentHubTourEndEventHandler.class, eventHandlers.getFirst());
TransshipmentHubTourEndEventHandler reloadEventHandler = (TransshipmentHubTourEndEventHandler) eventHandlers.getFirst();
Iterator<Entry<CarrierService, TransshipmentHubTourEndEventHandler.TransshipmentHubEventHandlerPair>>
iter = reloadEventHandler.getServicesWaitedFor().entrySet().iterator();

while (iter.hasNext()) {
Entry<CarrierService, TransshipmentHubTourEndEventHandler.TransshipmentHubEventHandlerPair>
entry = iter.next();
CarrierService service = entry.getKey();
LspShipment shipment = entry.getValue().lspShipment;
LogisticChainElement element = entry.getValue().element;
assertSame(service.getLocationLinkId(), shipment.getFrom());
assertEquals(service.getCapacityDemand(), shipment.getSize());
assertEquals(service.getServiceDuration(), shipment.getDeliveryServiceTime(), 0.0);
boolean handledByTranshipmentHub = false;
for (LogisticChainElement clientElement :
reloadEventHandler.getTranshipmentHub().getClientElements()) {
if (clientElement == element) {
handledByTranshipmentHub = true;
break;
}
}
}
assertTrue(handledByTranshipmentHub);
assertTrue(handledByTranshipmentHub);

assertTrue(element.getOutgoingShipments().getLspShipmentsWTime().contains(shipment));
assertFalse(element.getIncomingShipments().getLspShipmentsWTime().contains(shipment));
//There IS a next element following the 1st hub, so the outgoing shipments does NOT contain the shipment anymore (got handled).
assertFalse(element.getOutgoingShipments().getLspShipmentsWTime().contains(shipment));
assertFalse(element.getIncomingShipments().getLspShipmentsWTime().contains(shipment));
}
}

assertEquals(1, secondTranshipmentHubResource.getSimulationTrackers().size());
eventHandlers = new ArrayList<>(secondTranshipmentHubResource.getSimulationTrackers());
assertInstanceOf(TransshipmentHubTourEndEventHandler.class, eventHandlers.getFirst());
reloadEventHandler = (TransshipmentHubTourEndEventHandler) eventHandlers.getFirst();
iter = reloadEventHandler.getServicesWaitedFor().entrySet().iterator();

while (iter.hasNext()) {
Entry<CarrierService, TransshipmentHubTourEndEventHandler.TransshipmentHubEventHandlerPair> entry = iter.next();
CarrierService service = entry.getKey();
LspShipment shipment = entry.getValue().lspShipment;
LogisticChainElement element = entry.getValue().element;
assertSame(service.getLocationLinkId(), toLinkId);
assertEquals(service.getCapacityDemand(), shipment.getSize());
assertEquals(service.getServiceDuration(), shipment.getDeliveryServiceTime(), 0.0);
boolean handledByTranshipmentHub = false;
for (LogisticChainElement clientElement : reloadEventHandler.getTranshipmentHub().getClientElements()) {
if (clientElement == element) {
handledByTranshipmentHub = true;
break;
{
assertEquals(1, secondTranshipmentHubResource.getSimulationTrackers().size());
ArrayList<EventHandler> eventHandlers = new ArrayList<>(secondTranshipmentHubResource.getSimulationTrackers());
assertInstanceOf(TransshipmentHubTourEndEventHandler.class, eventHandlers.getFirst());
TransshipmentHubTourEndEventHandler reloadEventHandler = (TransshipmentHubTourEndEventHandler) eventHandlers.getFirst();
Iterator<Entry<CarrierService, TransshipmentHubTourEndEventHandler.TransshipmentHubEventHandlerPair>>
iter = reloadEventHandler.getServicesWaitedFor().entrySet().iterator();

while (iter.hasNext()) {
Entry<CarrierService, TransshipmentHubTourEndEventHandler.TransshipmentHubEventHandlerPair> entry = iter.next();
CarrierService service = entry.getKey();
LspShipment shipment = entry.getValue().lspShipment;
LogisticChainElement element = entry.getValue().element;
assertSame(service.getLocationLinkId(), toLinkId);
assertEquals(service.getCapacityDemand(), shipment.getSize());
assertEquals(service.getServiceDuration(), shipment.getDeliveryServiceTime(), 0.0);
boolean handledByTranshipmentHub = false;
for (LogisticChainElement clientElement : reloadEventHandler.getTranshipmentHub().getClientElements()) {
if (clientElement == element) {
handledByTranshipmentHub = true;
break;
}
}
}
assertTrue(handledByTranshipmentHub);
assertTrue(handledByTranshipmentHub);

assertTrue(element.getOutgoingShipments().getLspShipmentsWTime().contains(shipment));
assertFalse(element.getIncomingShipments().getLspShipmentsWTime().contains(shipment));
//There is NO next element following the 2nd hub, so the outgoing shipments remain in the list of the 2nd hub.
assertTrue(element.getOutgoingShipments().getLspShipmentsWTime().contains(shipment));
assertFalse(element.getIncomingShipments().getLspShipmentsWTime().contains(shipment));
}
}

for (LspShipment shipment : lsp.getLspShipments()) {
assertEquals(4, shipment.getSimulationTrackers().size());
eventHandlers = new ArrayList<>(shipment.getSimulationTrackers());
ArrayList<LSPSimulationTracker<LspShipment>> eventHandlers = new ArrayList<>(shipment.getSimulationTrackers());
ArrayList<LspShipmentPlanElement> planElements = new ArrayList<>(LspShipmentUtils.getOrCreateShipmentPlan(lsp.getSelectedPlan(), shipment.getId()).getPlanElements().values());
planElements.sort(LspShipmentUtils.createShipmentPlanElementComparator());
ArrayList<LogisticChainElement> solutionElements = new ArrayList<>(lsp.getSelectedPlan().getLogisticChains().iterator().next().getLogisticChainElements());
Expand Down
112 changes: 65 additions & 47 deletions ...a/org/matsim/freight/logistics/resourceImplementations/SecondReloadLSPSchedulingTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -354,63 +354,81 @@ public void testSecondReloadLSPScheduling() {
assertSame(planElements.getFirst().getLogisticChainElement(), collectionElement);
}

assertEquals(1, firstTranshipmentHubResource.getSimulationTrackers().size());
ArrayList<EventHandler> eventHandlers = new ArrayList<>(firstTranshipmentHubResource.getSimulationTrackers());
assertInstanceOf(TransshipmentHubTourEndEventHandler.class, eventHandlers.getFirst());
TransshipmentHubTourEndEventHandler reloadEventHandler = (TransshipmentHubTourEndEventHandler) eventHandlers.getFirst();
Iterator<Entry<CarrierService, TransshipmentHubTourEndEventHandler.TransshipmentHubEventHandlerPair>> iter = reloadEventHandler.getServicesWaitedFor().entrySet().iterator();

while (iter.hasNext()) {
Entry<CarrierService, TransshipmentHubTourEndEventHandler.TransshipmentHubEventHandlerPair> entry = iter.next();
CarrierService service = entry.getKey();
LspShipment shipment = entry.getValue().lspShipment;
LogisticChainElement element = entry.getValue().element;
assertSame(service.getLocationLinkId(), shipment.getFrom());
assertEquals(service.getCapacityDemand(), shipment.getSize());
assertEquals(service.getServiceDuration(), shipment.getDeliveryServiceTime(), 0.0);
boolean handledByTranshipmentHub = false;
for (LogisticChainElement clientElement : reloadEventHandler.getTranshipmentHub().getClientElements()) {
if (clientElement == element) {
handledByTranshipmentHub = true;
break;
{
assertEquals(1, firstTranshipmentHubResource.getSimulationTrackers().size());
ArrayList<EventHandler> eventHandlers = new ArrayList<>(firstTranshipmentHubResource.getSimulationTrackers());
assertInstanceOf(TransshipmentHubTourEndEventHandler.class, eventHandlers.getFirst());
TransshipmentHubTourEndEventHandler reloadEventHandler = (TransshipmentHubTourEndEventHandler) eventHandlers.getFirst();
Iterator<Entry<CarrierService, TransshipmentHubTourEndEventHandler.TransshipmentHubEventHandlerPair>>
iter = reloadEventHandler.getServicesWaitedFor().entrySet().iterator();

while (iter.hasNext()) {
Entry<CarrierService, TransshipmentHubTourEndEventHandler.TransshipmentHubEventHandlerPair>
entry = iter.next();
CarrierService service = entry.getKey();
LspShipment shipment = entry.getValue().lspShipment;
LogisticChainElement element = entry.getValue().element;
assertSame(service.getLocationLinkId(), shipment.getFrom());
assertEquals(service.getCapacityDemand(), shipment.getSize());
assertEquals(service.getServiceDuration(), shipment.getDeliveryServiceTime(), 0.0);
boolean handledByTranshipmentHub = false;
for (LogisticChainElement clientElement :
reloadEventHandler.getTranshipmentHub().getClientElements()) {
if (clientElement == element) {
handledByTranshipmentHub = true;
break;
}
}
}
assertTrue(handledByTranshipmentHub);
assertTrue(handledByTranshipmentHub);

assertTrue(element.getOutgoingShipments().getLspShipmentsWTime().contains(shipment));
assertFalse(element.getIncomingShipments().getLspShipmentsWTime().contains(shipment));
//There IS a next element following the 1st hub, so the outgoing shipments does NOT contain the shipment anymore (got handled).
assertFalse(element.getOutgoingShipments().getLspShipmentsWTime().contains(shipment));
assertFalse(element.getIncomingShipments().getLspShipmentsWTime().contains(shipment));
}
}

assertEquals(1, secondTranshipmentHubResource.getSimulationTrackers().size());
eventHandlers = new ArrayList<>(secondTranshipmentHubResource.getSimulationTrackers());
assertInstanceOf(TransshipmentHubTourEndEventHandler.class, eventHandlers.getFirst());
reloadEventHandler = (TransshipmentHubTourEndEventHandler) eventHandlers.getFirst();
iter = reloadEventHandler.getServicesWaitedFor().entrySet().iterator();

while (iter.hasNext()) {
Entry<CarrierService, TransshipmentHubTourEndEventHandler.TransshipmentHubEventHandlerPair> entry = iter.next();
CarrierService service = entry.getKey();
LspShipment shipment = entry.getValue().lspShipment;
LogisticChainElement element = entry.getValue().element;
assertSame(service.getLocationLinkId(), toLinkId);
assertEquals(service.getCapacityDemand(), shipment.getSize());
assertEquals(service.getServiceDuration(), shipment.getDeliveryServiceTime(), 0.0);
boolean handledByTranshipmentHub = false;
for (LogisticChainElement clientElement : reloadEventHandler.getTranshipmentHub().getClientElements()) {
if (clientElement == element) {
handledByTranshipmentHub = true;
break;
{
assertEquals(1, secondTranshipmentHubResource.getSimulationTrackers().size());
ArrayList<EventHandler> eventHandlers =
new ArrayList<>(secondTranshipmentHubResource.getSimulationTrackers());
assertInstanceOf(TransshipmentHubTourEndEventHandler.class, eventHandlers.getFirst());
TransshipmentHubTourEndEventHandler reloadEventHandler =
(TransshipmentHubTourEndEventHandler) eventHandlers.getFirst();
Iterator<
Entry<
CarrierService,
TransshipmentHubTourEndEventHandler.TransshipmentHubEventHandlerPair>>
iter = reloadEventHandler.getServicesWaitedFor().entrySet().iterator();

while (iter.hasNext()) {
Entry<CarrierService, TransshipmentHubTourEndEventHandler.TransshipmentHubEventHandlerPair>
entry = iter.next();
CarrierService service = entry.getKey();
LspShipment shipment = entry.getValue().lspShipment;
LogisticChainElement element = entry.getValue().element;
assertSame(service.getLocationLinkId(), toLinkId);
assertEquals(service.getCapacityDemand(), shipment.getSize());
assertEquals(service.getServiceDuration(), shipment.getDeliveryServiceTime(), 0.0);
boolean handledByTranshipmentHub = false;
for (LogisticChainElement clientElement :
reloadEventHandler.getTranshipmentHub().getClientElements()) {
if (clientElement == element) {
handledByTranshipmentHub = true;
break;
}
}
}
assertTrue(handledByTranshipmentHub);
assertTrue(handledByTranshipmentHub);

assertTrue(element.getOutgoingShipments().getLspShipmentsWTime().contains(shipment));
assertFalse(element.getIncomingShipments().getLspShipmentsWTime().contains(shipment));
//There is NO next element following the 2nd hub, so the outgoing shipments remain in the list of the 2nd hub.
assertTrue(element.getOutgoingShipments().getLspShipmentsWTime().contains(shipment));
assertFalse(element.getIncomingShipments().getLspShipmentsWTime().contains(shipment));
}
}


for (LspShipment shipment : lsp.getLspShipments()) {
assertEquals(4, shipment.getSimulationTrackers().size());
eventHandlers = new ArrayList<>(shipment.getSimulationTrackers());
ArrayList<EventHandler> eventHandlers = new ArrayList<>(shipment.getSimulationTrackers());
ArrayList<LspShipmentPlanElement> planElements = new ArrayList<>(LspShipmentUtils.getOrCreateShipmentPlan(lsp.getSelectedPlan(), shipment.getId()).getPlanElements().values());
planElements.sort(LspShipmentUtils.createShipmentPlanElementComparator());
ArrayList<LogisticChainElement> solutionElements = new ArrayList<>(lsp.getSelectedPlan().getLogisticChains().iterator().next().getLogisticChainElements());
Expand Down

0 comments on commit 28217d0

Please sign in to comment.