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

Anchors in Scheduling #663

Merged
merged 10 commits into from
Feb 14, 2023
Merged

Anchors in Scheduling #663

merged 10 commits into from
Feb 14, 2023

Conversation

Mythicaeda
Copy link
Contributor

Description

This PR:

  • Renames IncrementalSimultaionDriver to ResumableSimulationDriver
  • Renames files associated with Activity Directives to align with the current terminology we use within Aerie (ie SchedulingActivityInstanceId -> SchedulingActivityDirectiveId)
  • Retrieves anchorId and anchoredToStart from the database and adds them to SchedulingActivityDirective
  • Modifies how ResumableSimulationDriver schedules activities so that, when an activity finishes, all activities depending on it to know their start time are scheduled.
  • Adds bulk-simulation to ResumableSimulationDriver and SimulationFacade
  • Changes how SchedulingActivityDirectiveIds are assigned for SchedulingActivityDirectives that come from ActivityDirectives from the Plan

Verification

  • Similar tests to what were added in the Merlin Simulation driver were added to test the changes to the ResumableSimulationDriver directly.
  • Two integration tests were added
  • Banananation's DurationParameterActivity now delays for the duration

@Mythicaeda Mythicaeda added feature A new feature or feature request scheduling Anything related to the scheduling domain labels Feb 7, 2023
@Mythicaeda Mythicaeda requested a review from a team as a code owner February 7, 2023 00:10
@Mythicaeda Mythicaeda self-assigned this Feb 7, 2023
@Mythicaeda Mythicaeda added the DON'T MERGE Do Not Merge This Branch label Feb 7, 2023
@Mythicaeda Mythicaeda linked an issue Feb 9, 2023 that may be closed by this pull request
Modify the Scheduler's Simulation Driver to Process Anchors #618
Closed
@Mythicaeda Mythicaeda force-pushed the feat/anchors-in-simulation branch 3 times, most recently from 7e8e763 to dc7cd06 Compare February 9, 2023 22:39
Base automatically changed from feat/anchors-in-simulation to develop February 13, 2023 22:56
@Mythicaeda
Rename IncrementalSimulationDriver to ResumableSimulationDriver
1601c91 
This is a more accurate name, as it will always start simulation at either plan start or at the moment it last stopped.
@Mythicaeda
Rename ActivityInstance to SchedulingActivityDirective
906b800 
* Made copy-constructor make a copy of the original's arguments and variableArguments, rather than sharing the objects
@Mythicaeda
Rename SchedulingActivityInstanceId to SchedulingActivityDirectiveId
38f7d87
@Mythicaeda
Rename SchedulingActivityDirective.startTime to SchedulingActivityDir…
d00fdad 
…ective.startOffset
@Mythicaeda
Remove unthrown "Throws" tags
b83042d
@Mythicaeda Mythicaeda force-pushed the feat/anchors-in-scheduling branch from b0ef689 to b8295f1 Compare February 13, 2023 23:14
@Mythicaeda Mythicaeda temporarily deployed to e2e-test February 13, 2023 23:14 — with GitHub Actions Inactive
@Mythicaeda Mythicaeda removed the DON'T MERGE Do Not Merge This Branch label Feb 13, 2023
Mythicaeda and others added 5 commits February 13, 2023 15:44
@Mythicaeda
Add anchors to SchedulingActivityDirective
45cff41 
* Replace MerlinActivityInstance with ActivityDirective
* Replace PlannedActivityInstance with ActivityDirective
* Assign SchedulingActivityDirectives generated from ActivityDirectives an ID of negative the ActivityDirectiveId. This allows us to always know what the non-null anchorId should be during the conversion.
@Mythicaeda
fix comments
9bb949d
@Mythicaeda
Make Bananation's DurationParameterActivity delay for duration
08b7154 
* Remove inaccurate comment from ControllableDurationActivity
@Mythicaeda
Add Anchor Tests for ReusableSimulationDriver
f3f9454
@Mythicaeda @mattdailis
Add Integration Tests
c43673b 
Co-authored-by: Matt Dailis <[email protected]>
@Mythicaeda Mythicaeda force-pushed the feat/anchors-in-scheduling branch from b8295f1 to c43673b Compare February 13, 2023 23:45
@Mythicaeda Mythicaeda temporarily deployed to e2e-test February 13, 2023 23:45 — with GitHub Actions Inactive
adrienmaillard
adrienmaillard approved these changes Feb 14, 2023
View reviewed changes
Copy link
Contributor

@adrienmaillard adrienmaillard left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@Mythicaeda Mythicaeda merged commit 1aed8a0 into develop Feb 14, 2023
@Mythicaeda Mythicaeda deleted the feat/anchors-in-scheduling branch February 14, 2023 19:06
@adrienmaillard adrienmaillard mentioned this pull request Sep 19, 2023
Closed
@adrienmaillard adrienmaillard mentioned this pull request Mar 5, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adrienmaillard adrienmaillard adrienmaillard approved these changes

@mattdailis mattdailis Awaiting requested review from mattdailis

Assignees

@Mythicaeda Mythicaeda

Labels
feature A new feature or feature request scheduling Anything related to the scheduling domain
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Modify the Scheduler's Simulation Driver to Process Anchors
2 participants
@Mythicaeda @adrienmaillard