remove unused var from method signature

matsim-vsp · Aug 14, 2024 · 1f901f0 · 1f901f0
1 parent 9b2e27c
commit 1f901f0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 19 deletions.
diff --git a/...java/org/matsim/freight/logistics/resourceImplementations/CollectionCarrierScheduler.java b/...java/org/matsim/freight/logistics/resourceImplementations/CollectionCarrierScheduler.java
@@ -107,7 +107,7 @@ protected void updateShipments() {
                   && pair.carrierService.getId() == carrierPair.carrierService.getId()) {
                 addShipmentLoadElement(lspShipment, tour, serviceActivity);
                 addShipmentTransportElement(lspShipment, tour, serviceActivity);
-                addShipmentUnloadElement(lspShipment, tour, serviceActivity);
+                addShipmentUnloadElement(lspShipment, tour);
                 addCollectionTourEndEventHandler(pair.carrierService, lspShipment, resource, tour);
                 addCollectionServiceEventHandler(pair.carrierService, lspShipment, resource);
               }
@@ -211,8 +211,7 @@ private void addCollectionTourEndEventHandler(
     }
   }
 
-  private void addShipmentUnloadElement(
-      LspShipment lspShipment, Tour tour, Tour.ServiceActivity serviceActivity) {
+  private void addShipmentUnloadElement(LspShipment lspShipment, Tour tour) {
 
     LspShipmentUtils.ScheduledShipmentUnloadBuilder builder =
         LspShipmentUtils.ScheduledShipmentUnloadBuilder.newInstance();

diff --git a/...va/org/matsim/freight/logistics/resourceImplementations/DistributionCarrierScheduler.java b/...va/org/matsim/freight/logistics/resourceImplementations/DistributionCarrierScheduler.java
@@ -193,7 +193,7 @@ protected void updateShipments() {
             for (LSPCarrierPair pair : pairs) {
               if (pair.lspShipment == carrierPair.lspShipment
                   && pair.carrierService.getId() == carrierPair.carrierService.getId()) {
-                addShipmentLoadElement(lspShipment, tour, serviceActivity);
+                addShipmentLoadElement(lspShipment, tour);
                 addShipmentTransportElement(lspShipment, tour, serviceActivity);
                 addShipmentUnloadElement(lspShipment, tour, serviceActivity);
                 addDistributionTourStartEventHandler(pair.carrierService, lspShipment, resource, tour);
@@ -206,9 +206,7 @@ protected void updateShipments() {
     }
   }
 
-  private void addShipmentLoadElement(
-      LspShipment lspShipment, Tour tour, Tour.ServiceActivity serviceActivity) {
-
+  private void addShipmentLoadElement(LspShipment lspShipment, Tour tour) {
     LspShipmentUtils.ScheduledShipmentLoadBuilder builder =
         LspShipmentUtils.ScheduledShipmentLoadBuilder.newInstance();
     builder.setResourceId(resource.getId());
@@ -219,8 +217,7 @@ private void addShipmentLoadElement(
       }
     }
 
-    int startIndex =
-        tour.getTourElements().indexOf(tour.getTourElements().indexOf(tour.getStart()));
+    int startIndex = tour.getTourElements().indexOf(tour.getTourElements().indexOf(tour.getStart()));
     Leg legAfterStart = (Leg) tour.getTourElements().get(startIndex + 1);
     double startTimeOfTransport = legAfterStart.getExpectedDepartureTime();
     double cumulatedLoadingTime = 0;
@@ -253,8 +250,7 @@ private void addShipmentTransportElement(
       }
     }
 
-    int startIndex =
-        tour.getTourElements().indexOf(tour.getTourElements().indexOf(tour.getStart()));
+    int startIndex = tour.getTourElements().indexOf(tour.getTourElements().indexOf(tour.getStart()));
     final Leg legAfterStart = (Leg) tour.getTourElements().get(startIndex + 1);
     final int serviceIndex = tour.getTourElements().indexOf(serviceActivity);
     final Leg legBeforeService = (Leg) tour.getTourElements().get(serviceIndex - 1);

diff --git a/...in/java/org/matsim/freight/logistics/resourceImplementations/MainRunCarrierScheduler.java b/...in/java/org/matsim/freight/logistics/resourceImplementations/MainRunCarrierScheduler.java
@@ -248,7 +248,7 @@ protected void updateShipments() {
                   && pair.carrierService.getId() == carrierPair.carrierService.getId()) {
                 addShipmentLoadElement(LspShipment, tour);
                 addShipmentTransportElement(LspShipment, tour, serviceActivity);
-                addShipmentUnloadElement(LspShipment, tour, serviceActivity);
+                addShipmentUnloadElement(LspShipment, tour);
                 addMainTourRunStartEventHandler(pair.carrierService, LspShipment, resource, tour);
                 addMainRunTourEndEventHandler(pair.carrierService, LspShipment, resource, tour);
               }
@@ -268,8 +268,7 @@ private void addShipmentLoadElement(LspShipment lspShipment, Tour tour) {
         builder.setLogisticChainElement(element);
       }
     }
-    int startIndex =
-        tour.getTourElements().indexOf(tour.getTourElements().indexOf(tour.getStart()));
+    int startIndex = tour.getTourElements().indexOf(tour.getTourElements().indexOf(tour.getStart()));
     Leg legAfterStart = (Leg) tour.getTourElements().get(startIndex + 1);
     double startTimeOfTransport = legAfterStart.getExpectedDepartureTime();
     double cumulatedLoadingTime = 0;
@@ -300,8 +299,7 @@ private void addShipmentTransportElement(LspShipment lspShipment, Tour tour, Tou
         builder.setLogisticChainElement(element);
       }
     }
-    int startIndex =
-        tour.getTourElements().indexOf(tour.getTourElements().indexOf(tour.getStart()));
+    int startIndex = tour.getTourElements().indexOf(tour.getTourElements().indexOf(tour.getStart()));
     Leg legAfterStart = (Leg) tour.getTourElements().get(startIndex + 1);
     double startTimeOfTransport = legAfterStart.getExpectedDepartureTime();
     builder.setStartTime(startTimeOfTransport);
@@ -320,7 +318,7 @@ private void addShipmentTransportElement(LspShipment lspShipment, Tour tour, Tou
         .addPlanElement(id, transport);
   }
 
-  private void addShipmentUnloadElement(LspShipment lspShipment, Tour tour, Tour.ServiceActivity serviceActivity) {
+  private void addShipmentUnloadElement(LspShipment lspShipment, Tour tour) {
     LspShipmentUtils.ScheduledShipmentUnloadBuilder builder =
         LspShipmentUtils.ScheduledShipmentUnloadBuilder.newInstance();
     builder.setResourceId(resource.getId());
@@ -335,8 +333,7 @@ private void addShipmentUnloadElement(LspShipment lspShipment, Tour tour, Tour.S
         cumulatedLoadingTime = cumulatedLoadingTime + activity.getDuration();
       }
     }
-    int startIndex =
-        tour.getTourElements().indexOf(tour.getTourElements().indexOf(tour.getStart()));
+    int startIndex = tour.getTourElements().indexOf(tour.getTourElements().indexOf(tour.getStart()));
     Leg legAfterStart = (Leg) tour.getTourElements().get(startIndex + 1);
     builder.setStartTime(
         legAfterStart.getExpectedDepartureTime() + legAfterStart.getExpectedTransportTime());