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

Improve computation of vehicle loading times #940

Merged
merged 9 commits into from
May 8, 2023
Merged

Improve computation of vehicle loading times #940

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5d1f5af
Improve calculation of vehicle load time
lukasrad02 May 5, 2023
d3d39e9
Add migration
lukasrad02 May 5, 2023
9e44969
Remove old code
lukasrad02 May 5, 2023
271812e
Fix small bug
lukasrad02 May 5, 2023
a41df2a
Add test scenarios
lukasrad02 May 8, 2023
8f74083
Use `undefined` if no delay is set
lukasrad02 May 8, 2023
07f036c
Handle `undefined` in frontend
lukasrad02 May 8, 2023
63bb2ec
Update shared/src/simulation/activities/load-vehicle.ts
lukasrad02 May 8, 2023
b86c9ee
Merge branch 'dev' into fix/937-bug-the-vehicle-takes-time-to-load-ev…
lukasrad02 May 8, 2023
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
2 changes: 1 addition & 1 deletion ...viors/transfer-vehicles/simulated-region-overview-behavior-transfer-vehicles.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ export class SimulatedRegionOverviewBehaviorTransferVehiclesComponent
).length,
remainingTime:
activeActivityState.startTime +
activeActivityState.loadDelay -
(activeActivityState.loadDelay ?? 0) -
currentTime,
}))
);
Expand Down
8 changes: 5 additions & 3 deletions shared/src/simulation/activities/load-vehicle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ export class LoadVehicleActivityState implements SimulationActivityState {

@IsInt()
@Min(0)
public readonly loadDelay: number = 0;
@IsOptional()
public readonly loadDelay: number | undefined = undefined;
lukasrad02 marked this conversation as resolved.
Show resolved Hide resolved

@IsInt()
@Min(0)
Expand Down Expand Up @@ -242,7 +243,7 @@ export const loadVehicleActivity: SimulationActivity<LoadVehicleActivityState> =

// Calculate loading time based on the patients and personnel to be loaded
// Do not do the calculation if the time is already set (which could occur if an instance of this activity was imported from an older state version)
if (activityState.loadDelay === 0) {
if (activityState.loadDelay === undefined) {
activityState.loadDelay =
patientMovementsCount *
activityState.loadTimePerPatient +
Expand All @@ -256,8 +257,9 @@ export const loadVehicleActivity: SimulationActivity<LoadVehicleActivityState> =
}

if (
activityState.loadDelay !== undefined &&
activityState.startTime + activityState.loadDelay <=
draftState.currentTime
draftState.currentTime
) {
// terminate if the occupation has changed
if (
Expand Down