Merge pull request #3426 from steffenaxer/ShiftScheduler

DRT: Bypass Fleet object in schedule interface
matsim-org · Aug 23, 2024 · c9c868a · c9c868a
2 parents 03c1cb1 + 4a6f095
commit c9c868a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/.../org/matsim/contrib/drt/extension/operations/shifts/dispatcher/DefaultShiftScheduler.java b/.../org/matsim/contrib/drt/extension/operations/shifts/dispatcher/DefaultShiftScheduler.java
@@ -3,6 +3,7 @@
 import com.google.common.collect.ImmutableMap;
 import org.matsim.api.core.v01.Id;
 import org.matsim.contrib.drt.extension.operations.shifts.shift.*;
+import org.matsim.contrib.dvrp.fleet.Fleet;
 
 import java.util.Collections;
 import java.util.List;
@@ -32,7 +33,7 @@ public DefaultShiftScheduler(DrtShiftsSpecification shiftsSpecification) {
         this.shiftsSpecification = shiftsSpecification;
     }
     @Override
-    public List<DrtShift> schedule(double time) {
+    public List<DrtShift> schedule(double time, Fleet fleet) {
         return Collections.emptyList();
     }
 

diff --git a/...org/matsim/contrib/drt/extension/operations/shifts/dispatcher/DrtShiftDispatcherImpl.java b/...org/matsim/contrib/drt/extension/operations/shifts/dispatcher/DrtShiftDispatcherImpl.java
@@ -141,7 +141,7 @@ public void dispatch(double timeStep) {
         if (timeStep % (drtShiftParams.updateShiftEndInterval) == 0) {
             updateShiftEnds(timeStep);
         }
-        scheduleShifts(timeStep);
+        scheduleShifts(timeStep, this.fleet);
         assignShifts(timeStep);
         startShifts(timeStep);
         checkBreaks();
@@ -172,8 +172,8 @@ private void checkBreaks() {
     }
 
 
-    private void scheduleShifts(double timeStep) {
-        List<DrtShift> scheduled = shiftScheduler.schedule(timeStep);
+    private void scheduleShifts(double timeStep, Fleet fleet) {
+        List<DrtShift> scheduled = shiftScheduler.schedule(timeStep, fleet);
         unAssignedShifts.addAll(scheduled);
     }
 

diff --git a/...in/java/org/matsim/contrib/drt/extension/operations/shifts/dispatcher/ShiftScheduler.java b/...in/java/org/matsim/contrib/drt/extension/operations/shifts/dispatcher/ShiftScheduler.java
@@ -6,14 +6,16 @@
 import org.matsim.contrib.drt.extension.operations.shifts.shift.DrtShiftsSpecification;
 
 import jakarta.inject.Provider;
+import org.matsim.contrib.dvrp.fleet.Fleet;
+
 import java.util.List;
 
 /**
  * @author nkuehnel / MOIA
  */
 public interface ShiftScheduler extends Provider<DrtShiftsSpecification> {
 
-    List<DrtShift> schedule(double time);
+    List<DrtShift> schedule(double time, Fleet fleet);
     ImmutableMap<Id<DrtShift>, DrtShift> initialSchedule();
 
 }
diff --git a/...org/matsim/contrib/drt/extension/operations/shifts/run/RunOnTheFlyShiftDrtScenarioIT.java b/...org/matsim/contrib/drt/extension/operations/shifts/run/RunOnTheFlyShiftDrtScenarioIT.java
@@ -21,6 +21,7 @@
 import org.matsim.contrib.drt.optimizer.rebalancing.mincostflow.MinCostFlowRebalancingStrategyParams;
 import org.matsim.contrib.drt.run.DrtConfigGroup;
 import org.matsim.contrib.drt.run.MultiModeDrtConfigGroup;
+import org.matsim.contrib.dvrp.fleet.Fleet;
 import org.matsim.contrib.dvrp.run.AbstractDvrpModeModule;
 import org.matsim.contrib.dvrp.run.DvrpConfigGroup;
 import org.matsim.contrib.zone.skims.DvrpTravelTimeMatrixParams;
@@ -182,7 +183,7 @@ public DrtShiftsSpecification get() {
         }
 
         @Override
-        public List<DrtShift> schedule(double time) {
+        public List<DrtShift> schedule(double time, Fleet fleet) {
             List<DrtShiftSpecification> shifts = new ArrayList<>();
             if (time > 4 * 3600 && time < 15 * 3600 && time % 3600 == 0) {
                 for (int i = 0; i < iteration + 1 ; i++) {