Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

More data on ReplanningEvent #3822

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

More data on ReplanningEvent #3822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dc00827
Added more data to ReplanningEvent. Refactored it to scala code for s…
dimaopen Feb 22, 2024
7bbec4f
ReplanningEvent: Reason and other attributes are not always there.
dimaopen Feb 22, 2024
d1cb871
fix for reading paths from csv relative to beamInputDir
nikolayilyin Feb 24, 2024
35b13b5
fmt
nikolayilyin Feb 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 0 additions & 109 deletions src/main/java/beam/agentsim/events/ReplanningEvent.java
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions src/main/java/beam/analysis/plots/RealizedModeAnalysis.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
public class RealizedModeAnalysis extends BaseModeAnalysis {

public static final String defaultFileName = "realizedMode";
private static final String REPLANNING_SEPARATOR = "-" + ReplanningEvent.EVENT_TYPE + "-";
private static final String REPLANNING_SEPARATOR = "-" + ReplanningEvent.EVENT_TYPE() + "-";

private static final String graphTitle = "Realized Mode Histogram";
private static final String referenceGraphTitle = "Reference Realized Mode Histogram";
Expand Down Expand Up @@ -110,7 +110,7 @@ private boolean isModeChoiceEvent(Event event) {
}

private boolean isReplanningEvent(Event event) {
return event instanceof ReplanningEvent || event.getEventType().equalsIgnoreCase(ReplanningEvent.EVENT_TYPE);
return event instanceof ReplanningEvent || event.getEventType().equalsIgnoreCase(ReplanningEvent.EVENT_TYPE());
}

@Override
Expand Down Expand Up @@ -204,11 +204,11 @@ private void processRealizedMode(Event event) {
}

private void processReplanningEvent(ReplanningEvent re, int hour) {
String person = re.getPersonId().toString();
String person = re.personId().toString();

personReplanningChain.merge(person, Lists.newArrayList(re.getEventType()), ListUtils::union);
affectedModeCount.merge(hour, 1, Integer::sum);
replanningReasonCount.merge(re.getReason(), 1, Integer::sum);
replanningReasonCount.merge(re.reason(), 1, Integer::sum);

if (personIdList.containsKey(person) && personIdList.get(person) == 0) {
personIdList.put(person, 1);
Expand Down Expand Up @@ -569,7 +569,7 @@ public Map<String, Integer> calculateModeCount() {
if (modes.size() > 1) {
StringBuffer lastModes = new StringBuffer();
for (String mode : modes) {
if (ReplanningEvent.EVENT_TYPE.equals(mode)) {
if (ReplanningEvent.EVENT_TYPE().equals(mode)) {
lastModes.append(REPLANNING_SEPARATOR);
} else if (lastModes.toString().endsWith(REPLANNING_SEPARATOR)) {
//This is used to decrease previous key count(if any)
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/beam/agentsim/Resource.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ object Resource {

case class Boarded(vehicle: BeamVehicle, triggerId: Long) extends HasTriggerId

case class NotAvailable(triggerId: Long) extends HasTriggerId
case class NotAvailable(vehicleId: Id[BeamVehicle], triggerId: Long) extends HasTriggerId

}
53 changes: 27 additions & 26 deletions src/main/scala/beam/agentsim/agents/PersonAgent.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,14 +714,12 @@ class PersonAgent(
.isEmpty || beamScenario.trainStopQuadTree.getDisk(nextCoord.getX, nextCoord.getY, minDistanceToTrainStop).isEmpty
}

def handleFailedRideHailReservation(
error: ReservationError,
response: RideHailResponse,
data: BasePersonData
): State = {
private def handleFailedRideHailReservation(response: RideHailResponse, data: BasePersonData): State = {
val error = response.error.getOrElse(UnknownInquiryIdError)
logDebug(s"replanning because ${error.errorCode}")
val tick = _currentTick.getOrElse(response.request.departAt)
val replanningReason = getReplanningReasonFrom(data, error.errorCode.entryName)
val replanningReason =
getReplanningReasonFrom(data, s"${response.rideHailManagerName}:${error.errorCode.entryName}")
eventsManager.processEvent(
new RideHailReservationConfirmationEvent(
tick,
Expand Down Expand Up @@ -755,12 +753,12 @@ class PersonAgent(
val currentCoord = beamServices.geo.wgs2Utm(data.restOfCurrentTrip.head.beamLeg.travelPath.startPoint).loc

eventsManager.processEvent(
new ReplanningEvent(
ReplanningEvent(
tick,
Id.createPersonId(id),
replanningReason,
currentCoord.getX,
currentCoord.getY
legMode = Some(if (response.request.asPooled) BeamMode.RIDE_HAIL_POOLED else BeamMode.RIDE_HAIL),
start = currentCoord
)
)
val nextCoord = nextActivity(data).get.getCoord
Expand Down Expand Up @@ -795,14 +793,14 @@ class PersonAgent(
val nextCoord = nextActivity(data).get.getCoord
val replanningReason = getReplanningReasonFrom(data, firstErrorResponse.errorCode.entryName)
eventsManager.processEvent(
new ReplanningEvent(
ReplanningEvent(
_currentTick.get,
Id.createPersonId(id),
replanningReason,
currentCoord.getX,
currentCoord.getY,
nextCoord.getX,
nextCoord.getY
Some(data.nextLeg.beamVehicleId),
Some(data.nextLeg.beamLeg.mode),
start = currentCoord,
end = Some(nextCoord)
)
)
goto(ChoosingMode) using ChoosesModeData(
Expand Down Expand Up @@ -839,13 +837,13 @@ class PersonAgent(
data: BasePersonData
) =>
holdTickAndTriggerId(tick, triggerId)
handleFailedRideHailReservation(response.error.getOrElse(UnknownInquiryIdError), response, data)
handleFailedRideHailReservation(response, data)
// RIDE HAIL SUCCESS (single request mode of RHM)
case Event(response: RideHailResponse, data: BasePersonData) if response.isSuccessful(id) =>
handleSuccessfulRideHailReservation(_currentTick.get, response, data)
// RIDE HAIL FAILURE (single request mode of RHM)
case Event(response: RideHailResponse, data: BasePersonData) =>
handleFailedRideHailReservation(response.error.getOrElse(UnknownInquiryIdError), response, data)
handleFailedRideHailReservation(response, data)
}

private def handleSuccessfulRideHailReservation(tick: Int, response: RideHailResponse, data: BasePersonData) = {
Expand Down Expand Up @@ -1032,18 +1030,19 @@ class PersonAgent(
beamVehicles.put(vehicle.id, ActualVehicle(vehicle))
potentiallyChargingBeamVehicles.remove(vehicle.id)
goto(ProcessingNextLegOrStartActivity)
case Event(NotAvailable(_), basePersonData: BasePersonData) =>
case Event(NotAvailable(vehicleId, _), basePersonData: BasePersonData) =>
log.debug("{} replanning because vehicle not available when trying to board")
val replanningReason = getReplanningReasonFrom(basePersonData, ReservationErrorCode.ResourceUnavailable.entryName)
val currentCoord =
beamServices.geo.wgs2Utm(basePersonData.restOfCurrentTrip.head.beamLeg.travelPath.startPoint).loc
eventsManager.processEvent(
new ReplanningEvent(
ReplanningEvent(
_currentTick.get,
Id.createPersonId(id),
replanningReason,
currentCoord.getX,
currentCoord.getY
Some(vehicleId),
Some(basePersonData.nextLeg.beamLeg.mode),
start = currentCoord
)
)

Expand Down Expand Up @@ -1226,12 +1225,13 @@ class PersonAgent(
val replanningReason = getReplanningReasonFrom(data, ReservationErrorCode.MissedTransitPickup.entryName)
val currentCoord = beamServices.geo.wgs2Utm(data.nextLeg.beamLeg.travelPath.startPoint).loc
eventsManager.processEvent(
new ReplanningEvent(
ReplanningEvent(
_currentTick.get,
Id.createPersonId(id),
replanningReason,
currentCoord.getX,
currentCoord.getY
Some(data.nextLeg.beamVehicleId),
Some(data.nextLeg.beamLeg.mode),
start = currentCoord
)
)

Expand Down Expand Up @@ -1273,12 +1273,13 @@ class PersonAgent(
val replanningReason = getReplanningReasonFrom(data, ReservationErrorCode.MissedTransitPickup.entryName)
val currentCoord = beamServices.geo.wgs2Utm(data.nextLeg.beamLeg.travelPath.startPoint).loc
eventsManager.processEvent(
new ReplanningEvent(
ReplanningEvent(
_currentTick.get,
Id.createPersonId(id),
replanningReason,
currentCoord.getX,
currentCoord.getY
Some(data.nextLeg.beamVehicleId),
Some(data.nextLeg.beamLeg.mode),
start = currentCoord
)
)

Expand Down
13 changes: 5 additions & 8 deletions src/main/scala/beam/agentsim/agents/modalbehaviors/ChoosesMode.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,15 +473,14 @@ trait ChoosesMode {
beamScenario.beamConfig.beam.agentsim.agents.vehicles.replanOnTheFlyWhenHouseholdVehiclesAreNotAvailable && vehicles.isEmpty
) {
eventsManager.processEvent(
new ReplanningEvent(
ReplanningEvent(
departTime,
Id.createPersonId(id),
getReplanningReasonFrom(
choosesModeData.personData,
ReservationErrorCode.HouseholdVehicleNotAvailable.entryName
),
currentPersonLocation.loc.getX,
currentPersonLocation.loc.getY
start = currentPersonLocation.loc
)
)
householdVehiclesWereNotAvailable = true
Expand Down Expand Up @@ -1343,17 +1342,15 @@ trait ChoosesMode {
)
}
eventsManager.processEvent(
new ReplanningEvent(
ReplanningEvent(
_currentTick.get,
Id.createPersonId(id),
getReplanningReasonFrom(
choosesModeData.personData,
ReservationErrorCode.RouteNotAvailableForChosenMode.entryName
),
choosesModeData.currentLocation.loc.getX,
choosesModeData.currentLocation.loc.getY,
nextAct.getCoord.getX,
nextAct.getCoord.getY
start = choosesModeData.currentLocation.loc,
end = Some(nextAct.getCoord)
)
)
//give another chance to make a choice without predefined mode
Expand Down
Loading