This commit is contained in:
xuzhiheng 2025-06-20 16:21:15 +08:00
parent 5bcba189ef
commit 9121b1985a

View File

@ -849,7 +849,6 @@ public class DefaultVehicleController
);
if (Objects.equals(evt.getPropertyName(), VehicleProcessModel.Attribute.POSITION.name())) {
System.out.println("Position changed updateVehiclePosition");
updateVehiclePosition((String) evt.getNewValue());
}
else if (Objects.equals(
@ -1003,11 +1002,9 @@ public class DefaultVehicleController
vehicle.getName(),
point
);
System.out.println("update position updatePositionWithoutOrder 999999");
updatePositionWithoutOrder(point);
}
else {
System.out.println("update position updatePositionWithOrder 0000");
updatePositionWithOrder(point);
}
}
@ -1035,6 +1032,14 @@ public class DefaultVehicleController
Point currentVehiclePosition = originalCommand.getStep().getDestinationPoint();
Deque<Set<TCSResource<?>>> allocatedResources
= commandProcessingTracker.getAllocatedResources();
// KernelApplicationConfiguration.VehicleResourceManagementType vehicleResourceManagementType
// = configuration.vehicleResourceManagementType();
// System.out.println("vehicleResourceManagementType: " + vehicleResourceManagementType);
//
// long length = commAdapter.getProcessModel().getBoundingBox().getLength();
// System.out.println("vehicle_length: " + length);
switch (configuration.vehicleResourceManagementType()) {
case LENGTH_IGNORED:
while (!allocatedResources.peek().contains(currentVehiclePosition)) {