Merge branch 'master' into evMaintenance

matsim-org · Oct 23, 2023 · 4cbbf73 · 4cbbf73
2 parents 9c47c82 + be45159
commit 4cbbf73
Show file tree

Hide file tree

Showing 32 changed files with 1,632 additions and 480 deletions.
diff --git a/...ght/src/main/java/org/matsim/freight/carriers/events/CarrierShipmentDeliveryEndEvent.java b/...ght/src/main/java/org/matsim/freight/carriers/events/CarrierShipmentDeliveryEndEvent.java
@@ -84,7 +84,7 @@ public static CarrierShipmentDeliveryEndEvent convert(GenericEvent event) {
 		Id<Link> shipmentTo = Id.createLinkId(attributes.get(ATTRIBUTE_LINK));
 		int size = Integer.parseInt(attributes.get(CarrierEventAttributes.ATTRIBUTE_CAPACITYDEMAND));
 		CarrierShipment shipment = CarrierShipment.Builder.newInstance(shipmentId, null, shipmentTo, size)
-				.setDeliveryServiceTime(Double.parseDouble(attributes.get(CarrierEventAttributes.ATTRIBUTE_SERVICE_DURATION)))
+				.setDeliveryServiceTime(Double.parseDouble(attributes.get(CarrierEventAttributes.ATTRIBUTE_DROPOFF_DURATION)))
 				.build();
 		Id<Vehicle> vehicleId = Id.createVehicleId(attributes.get(ATTRIBUTE_VEHICLE));
 		return new CarrierShipmentDeliveryEndEvent(time, carrierId, shipment, vehicleId);

diff --git a/...t/src/main/java/org/matsim/freight/carriers/events/CarrierShipmentDeliveryStartEvent.java b/...t/src/main/java/org/matsim/freight/carriers/events/CarrierShipmentDeliveryStartEvent.java
@@ -85,7 +85,7 @@ public static CarrierShipmentDeliveryStartEvent convert(GenericEvent event) {
 		Id<Link> shipmentTo = Id.createLinkId(attributes.get(ATTRIBUTE_LINK));
 		int size = Integer.parseInt(attributes.get(ATTRIBUTE_CAPACITYDEMAND));
 		CarrierShipment shipment = CarrierShipment.Builder.newInstance(shipmentId, null, shipmentTo, size)
-				.setDeliveryServiceTime(Double.parseDouble(attributes.get(ATTRIBUTE_SERVICE_DURATION)))
+				.setDeliveryServiceTime(Double.parseDouble(attributes.get(ATTRIBUTE_DROPOFF_DURATION)))
 				.build();
 		Id<Vehicle> vehicleId = Id.createVehicleId(attributes.get(ATTRIBUTE_VEHICLE));
 		return new CarrierShipmentDeliveryStartEvent(time, carrierId, shipment, vehicleId);

diff --git a/...andler/FreightServiceEndEventHandler.java → ...andler/CarrierServiceEndEventHandler.java b/...andler/FreightServiceEndEventHandler.java → ...andler/CarrierServiceEndEventHandler.java
@@ -25,7 +25,7 @@
 import org.matsim.core.events.handler.EventHandler;
 import org.matsim.freight.carriers.events.CarrierServiceEndEvent;
 
-public interface FreightServiceEndEventHandler extends EventHandler{
+public interface CarrierServiceEndEventHandler extends EventHandler{
 
 		void handleEvent( CarrierServiceEndEvent event );
 }
diff --git a/...dler/FreightServiceStartEventHandler.java → ...dler/CarrierServiceStartEventHandler.java b/...dler/FreightServiceStartEventHandler.java → ...dler/CarrierServiceStartEventHandler.java
@@ -25,7 +25,7 @@
 import org.matsim.freight.carriers.events.CarrierServiceStartEvent;
 
 
-public interface FreightServiceStartEventHandler extends EventHandler {
+public interface CarrierServiceStartEventHandler extends EventHandler {
 
 	void handleEvent( CarrierServiceStartEvent event );
 

diff --git a/.../FreightShipmentDeliveryEventHandler.java → ...rrierShipmentDeliveryEndEventHandler.java b/.../FreightShipmentDeliveryEventHandler.java → ...rrierShipmentDeliveryEndEventHandler.java
@@ -30,7 +30,7 @@
  * @author sschroeder
  *
  */
-public interface FreightShipmentDeliveryEventHandler extends EventHandler {
+public interface CarrierShipmentDeliveryEndEventHandler extends EventHandler {
 
 	void handleEvent(CarrierShipmentDeliveryEndEvent event);
 

diff --git a/...matsim/freight/carriers/events/eventhandler/CarrierShipmentDeliveryStartEventHandler.java b/...matsim/freight/carriers/events/eventhandler/CarrierShipmentDeliveryStartEventHandler.java
@@ -0,0 +1,37 @@
+/*
+ *   *********************************************************************** *
+ *   project: org.matsim.*
+ *   *********************************************************************** *
+ *                                                                           *
+ *   copyright       : (C)  by the members listed in the COPYING,        *
+ *                     LICENSE and WARRANTY file.                            *
+ *   email           : info at matsim dot org                                *
+ *                                                                           *
+ *   *********************************************************************** *
+ *                                                                           *
+ *     This program is free software; you can redistribute it and/or modify  *
+ *     it under the terms of the GNU General Public License as published by  *
+ *     the Free Software Foundation; either version 2 of the License, or     *
+ *     (at your option) any later version.                                   *
+ *     See also COPYING, LICENSE and WARRANTY file                           *
+ *                                                                           *
+ *   ***********************************************************************
+ *
+ */
+
+package org.matsim.freight.carriers.events.eventhandler;
+
+import org.matsim.core.events.handler.EventHandler;
+import org.matsim.freight.carriers.events.CarrierShipmentDeliveryStartEvent;
+
+/**
+ * Interface to listen to shipmentDeliveredEvents.
+ *
+ * @author sschroeder
+ *
+ */
+public interface CarrierShipmentDeliveryStartEventHandler extends EventHandler {
+
+	void handleEvent(CarrierShipmentDeliveryStartEvent event);
+
+}
diff --git a/...er/FreightShipmentPickupEventHandler.java → ...CarrierShipmentPickupEndEventHandler.java b/...er/FreightShipmentPickupEventHandler.java → ...CarrierShipmentPickupEndEventHandler.java
@@ -30,6 +30,6 @@
  * @author sschroeder
  *
  */
-public interface FreightShipmentPickupEventHandler extends EventHandler {
+public interface CarrierShipmentPickupEndEventHandler extends EventHandler {
 	void handleEvent(CarrierShipmentPickupEndEvent event);
 }
diff --git a/...g/matsim/freight/carriers/events/eventhandler/CarrierShipmentPickupStartEventHandler.java b/...g/matsim/freight/carriers/events/eventhandler/CarrierShipmentPickupStartEventHandler.java
@@ -0,0 +1,35 @@
+/*
+ *   *********************************************************************** *
+ *   project: org.matsim.*
+ *   *********************************************************************** *
+ *                                                                           *
+ *   copyright       : (C)  by the members listed in the COPYING,        *
+ *                     LICENSE and WARRANTY file.                            *
+ *   email           : info at matsim dot org                                *
+ *                                                                           *
+ *   *********************************************************************** *
+ *                                                                           *
+ *     This program is free software; you can redistribute it and/or modify  *
+ *     it under the terms of the GNU General Public License as published by  *
+ *     the Free Software Foundation; either version 2 of the License, or     *
+ *     (at your option) any later version.                                   *
+ *     See also COPYING, LICENSE and WARRANTY file                           *
+ *                                                                           *
+ *   ***********************************************************************
+ *
+ */
+
+package org.matsim.freight.carriers.events.eventhandler;
+
+import org.matsim.core.events.handler.EventHandler;
+import org.matsim.freight.carriers.events.CarrierShipmentPickupStartEvent;
+
+/**
+ * Interface to listen to shipmentPickedUpEvents.
+ *
+ * @author sschroeder
+ *
+ */
+public interface CarrierShipmentPickupStartEventHandler extends EventHandler {
+	void handleEvent(CarrierShipmentPickupStartEvent event);
+}
diff --git a/...nthandler/FreightTourEndEventHandler.java → ...nthandler/CarrierTourEndEventHandler.java b/...nthandler/FreightTourEndEventHandler.java → ...nthandler/CarrierTourEndEventHandler.java
@@ -25,7 +25,7 @@
 import org.matsim.freight.carriers.events.CarrierTourEndEvent;
 
 
-public interface FreightTourEndEventHandler extends EventHandler {
+public interface CarrierTourEndEventHandler extends EventHandler {
 
 	void handleEvent( CarrierTourEndEvent event );
 

diff --git a/...handler/FreightTourStartEventHandler.java → ...handler/CarrierTourStartEventHandler.java b/...handler/FreightTourStartEventHandler.java → ...handler/CarrierTourStartEventHandler.java
@@ -25,7 +25,7 @@
 import org.matsim.freight.carriers.events.CarrierTourStartEvent;
 
 
-public interface FreightTourStartEventHandler extends EventHandler {
+public interface CarrierTourStartEventHandler extends EventHandler {
 
 	void handleEvent( CarrierTourStartEvent event );
 

diff --git a/...ain/java/org/matsim/freight/carriers/events/eventhandler/Vehicle2CarrierEventHandler.java b/...ain/java/org/matsim/freight/carriers/events/eventhandler/Vehicle2CarrierEventHandler.java
@@ -36,7 +36,7 @@
  *
  * @author kturner
  */
-public final class Vehicle2CarrierEventHandler implements FreightTourStartEventHandler, FreightTourEndEventHandler {
+public final class Vehicle2CarrierEventHandler implements CarrierTourStartEventHandler, CarrierTourEndEventHandler {
 
 
 	// Comment from Janek (in https://github.com/matsim-org/matsim-libs/pull/2128)