Merge branch 'master' into scaleInflowCapBoundAccordingToFlowCapFactor

matsim-org · Mar 10, 2025 · a15976f · a15976f
2 parents d6ba805 + 2d41090
commit a15976f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 62 deletions.
diff --git a/...im/contrib/drt/extension/operations/eshifts/dispatcher/EDrtAssignShiftToVehicleLogic.java b/...im/contrib/drt/extension/operations/eshifts/dispatcher/EDrtAssignShiftToVehicleLogic.java
@@ -34,18 +34,6 @@ public EDrtAssignShiftToVehicleLogic(AssignShiftToVehicleLogic delegate, ShiftsP
 	@Override
 	public boolean canAssignVehicleToShift(ShiftDvrpVehicle vehicle, DrtShift shift) {
 
-		// no, if charging
-		if(vehicle.getSchedule().getStatus() == Schedule.ScheduleStatus.STARTED) {
-			final Task currentTask = vehicle.getSchedule().getCurrentTask();
-			if (currentTask instanceof EDrtWaitForShiftTask) {
-				if (((EDrtWaitForShiftTask) currentTask).getChargingTask() != null) {
-					if (currentTask.getEndTime() > shift.getStartTime()) {
-						return false;
-					}
-				}
-			}
-		}
-
 		// no, if below battery threshold
 		if (vehicle instanceof EvShiftDvrpVehicle) {
 			final Battery battery = ((EvShiftDvrpVehicle) vehicle).getElectricVehicle().getBattery();

diff --git a/...a/org/matsim/contrib/drt/extension/operations/eshifts/dispatcher/EDrtShiftStartLogic.java b/...a/org/matsim/contrib/drt/extension/operations/eshifts/dispatcher/EDrtShiftStartLogic.java
diff --git a/...matsim/contrib/drt/extension/operations/eshifts/run/ShiftEDrtModeOptimizerQSimModule.java b/...matsim/contrib/drt/extension/operations/eshifts/run/ShiftEDrtModeOptimizerQSimModule.java
@@ -1,5 +1,6 @@
 package org.matsim.contrib.drt.extension.operations.eshifts.run;
 
+import com.google.inject.Singleton;
 import org.matsim.api.core.v01.network.Network;
 import org.matsim.contrib.drt.extension.DrtWithExtensionsConfigGroup;
 import org.matsim.contrib.drt.extension.edrt.EDrtActionCreator;
@@ -9,18 +10,13 @@
 import org.matsim.contrib.drt.extension.operations.DrtOperationsParams;
 import org.matsim.contrib.drt.extension.operations.eshifts.dispatcher.EDrtAssignShiftToVehicleLogic;
 import org.matsim.contrib.drt.extension.operations.eshifts.dispatcher.EDrtShiftDispatcherImpl;
-import org.matsim.contrib.drt.extension.operations.eshifts.dispatcher.EDrtShiftStartLogic;
 import org.matsim.contrib.drt.extension.operations.eshifts.schedule.ShiftEDrtActionCreator;
 import org.matsim.contrib.drt.extension.operations.eshifts.schedule.ShiftEDrtTaskFactoryImpl;
 import org.matsim.contrib.drt.extension.operations.eshifts.scheduler.EShiftTaskScheduler;
 import org.matsim.contrib.drt.extension.operations.operationFacilities.OperationFacilities;
 import org.matsim.contrib.drt.extension.operations.operationFacilities.OperationFacilityFinder;
 import org.matsim.contrib.drt.extension.operations.shifts.config.ShiftsParams;
-import org.matsim.contrib.drt.extension.operations.shifts.dispatcher.DefaultAssignShiftToVehicleLogic;
-import org.matsim.contrib.drt.extension.operations.shifts.dispatcher.DefaultShiftStartLogic;
-import org.matsim.contrib.drt.extension.operations.shifts.dispatcher.DrtShiftDispatcher;
-import org.matsim.contrib.drt.extension.operations.shifts.dispatcher.DrtShiftDispatcherImpl;
-import org.matsim.contrib.drt.extension.operations.shifts.dispatcher.ShiftScheduler;
+import org.matsim.contrib.drt.extension.operations.shifts.dispatcher.*;
 import org.matsim.contrib.drt.extension.operations.shifts.optimizer.ShiftVehicleDataEntryFactory;
 import org.matsim.contrib.drt.extension.operations.shifts.schedule.ShiftDrtActionCreator;
 import org.matsim.contrib.drt.extension.operations.shifts.schedule.ShiftDrtTaskFactory;
@@ -44,8 +40,6 @@
 import org.matsim.core.router.costcalculators.TravelDisutilityFactory;
 import org.matsim.core.router.util.TravelTime;
 
-import com.google.inject.Singleton;
-
 /**
  * @author nkuehnel / MOIA
  */
@@ -75,7 +69,7 @@ protected void configureQSim() {
 						new DrtShiftDispatcherImpl(getMode(), getter.getModal(Fleet.class), getter.get(MobsimTimer.class),
 								getter.getModal(OperationFacilities.class), getter.getModal(OperationFacilityFinder.class),
 								getter.getModal(ShiftTaskScheduler.class), getter.getModal(Network.class), getter.get(EventsManager.class),
-								drtShiftParams, new EDrtShiftStartLogic(new DefaultShiftStartLogic()),
+								drtShiftParams, new DefaultShiftStartLogic(),
 								new EDrtAssignShiftToVehicleLogic(new DefaultAssignShiftToVehicleLogic(drtShiftParams), drtShiftParams),
 								getter.getModal(ShiftScheduler.class)),
 						getter.getModal(Fleet.class), getter.getModal(ChargingStrategy.Factory.class)))

diff --git a/...va/org/matsim/contrib/drt/extension/operations/eshifts/scheduler/EShiftTaskScheduler.java b/...va/org/matsim/contrib/drt/extension/operations/eshifts/scheduler/EShiftTaskScheduler.java
@@ -375,6 +375,12 @@ public void startShift(ShiftDvrpVehicle vehicle, double now, DrtShift shift) {
         if (stayTask instanceof WaitForShiftTask) {
             ((WaitForShiftTask) stayTask).getFacility().deregisterVehicle(vehicle.getId());
             stayTask.setEndTime(now);
+            if(stayTask instanceof EDrtWaitForShiftTask eTask) {
+                if(eTask.getChargingTask() != null) {
+                    eTask.getChargingTask().getChargingLogic().removeVehicle(eTask.getChargingTask().getElectricVehicle(), now);
+                    eTask.setEndTime(now);
+                }
+            }
             if (Schedules.getLastTask(schedule).equals(stayTask)) {
                 //nothing planned yet.
                 schedule.addTask(taskFactory.createStayTask(vehicle, now, shift.getEndTime(), stayTask.getLink()));

diff --git a/matsim/src/main/java/org/matsim/core/replanning/conflicts/ConflictModule.java b/matsim/src/main/java/org/matsim/core/replanning/conflicts/ConflictModule.java
@@ -42,7 +42,7 @@ ConflictWriter provideConflictWriter(OutputDirectoryHierarchy outputDirectoryHie
 	@Provides
 	@Singleton
 	ConflictManager provideConflictManager(Set<ConflictResolver> resolvers, ConflictWriter writer) {
-		if (!getConfig().replanning().getPlanSelectorForRemoval()
+		if (resolvers.size() > 0 && !getConfig().replanning().getPlanSelectorForRemoval()
 				.equals(WorstPlanForRemovalSelectorWithConflicts.SELECTOR_NAME)) {
 			logger.warn("The replanning.planSelectorForRemoval is not set to "
 					+ WorstPlanForRemovalSelectorWithConflicts.SELECTOR_NAME