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.

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

Planning refactor #202

Merged
merged 44 commits into from
Feb 13, 2024
Merged

Planning refactor #202

merged 44 commits into from
Feb 13, 2024

Conversation

bischoffz
Copy link
Contributor

No description provided.

@shawnhatch shawnhatch merged commit df76bbf into dev Feb 13, 2024
1 check passed
@shawnhatch shawnhatch deleted the planning-refactor branch February 13, 2024 17:40
bischoffz added a commit that referenced this pull request Feb 28, 2024
* remove plan conversion mechinisms

* remove plan.key

* remove prioritized plan data

* remove plandata

* refactor plan

* create subplans
update planRec

* clean up

* remove at_plan

* remove at_priortizedplandata

* remove planqueue data

* remove nucleus errors used in planqueuedata

* clean up simstate comments

* set masterarrivalid to -1

* add planing queue mode logic to addPlan

* rebuild planning queue before chaning state

* drop planrec toString

* remove planrec.planner

* remove planrec arrival id

* remove planrec time

* remove planRec isactive

* remove planrec type fields

* replace planRec with plan

* clean up

* cancel mekanism

* safer casting

* clean up

* clean up

* fix test

* clean up

* clean up

* Added access to retrieved plans

* Fixed rebuild of plan queue.  Added plan retrieval mechanism.

* Added suggested constructors for plans

* Added new nucleus error to handle plan retrievals that happen before the end of the simulation.

* slight refactor of rebuildPlanQueue

* remove plansRequirePlanData

* arrivalId fix

* Changed arrival id inputs from -1 to -1L since it is a long value. Dropped setXId() methods in the plans since there is already package access. Changed Plan constructor to package access to avoid confusion. Added getArrivalId() method on the Plan to facilitate serialization of descendant types.

* Adapting the gcm lessons to the changes in the planning system

* Updated actor, dataManager and report contexts to reflect changes in the planning system.

* Added simple test that demonstrates recovered plans are executed in the plan queue before new plans scheduled for the same time.  Both recovered and new plans execute in the proper order.

* add tests for plans

* remove OBE test

* add tests for retrievePlans

---------

Co-authored-by: shawnhatch <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants