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

Scheduler phase switch #667

Merged
merged 25 commits into from
Dec 7, 2023
Merged

Scheduler phase switch #667

merged 25 commits into from
Dec 7, 2023

Conversation

sebastian-peter
Copy link
Member

@sebastian-peter sebastian-peter commented Nov 27, 2023 •
edited
Loading

@sebastian-peter sebastian-peter added this to the Version 4.0 milestone Nov 27, 2023
@sebastian-peter sebastian-peter self-assigned this Nov 27, 2023
@sebastian-peter sebastian-peter added the enhancement New feature or request label Nov 27, 2023
@sebastian-peter
Merge branch 'sp/#650-scheduling-protocol' into sp/#651-scheduler-pha…
b665d4c 
…se-switch

# Conflicts:
#	src/main/scala/edu/ie3/simona/scheduler/SchedulerData.scala
@sebastian-peter
Adapting new files to pekko
b31ce47
@sebastian-peter
Enhancing SchedulerSpec
e542d44
@sebastian-peter
Configurable Core in Scheduler
d746236
@sebastian-peter
Improving comments in SchedulerSpec
6fed6ea
@sebastian-peter
Fixes
080f30b
@sebastian-peter
Fixing variable shadowing
8d7fd80
@sebastian-peter
Enhancing PrioritySwitchBiSet to fix PhaseSwitchCore
d04fcd1
@sebastian-peter
Fixing activation retrieval from PrioritySwitchBiSet
2ce91b4
@sebastian-peter
One more test case in SchedulerSpec
0e52567
@sebastian-peter
Fixing scheduling checking when active
e9996e8
@sebastian-peter
Refactoring "trigger"
982b8e3
@sebastian-peter
PhaseSwitchSchedulerSpec
74348be
@sebastian-peter
Merge branch 'dev' into sp/#651-scheduler-phase-switch
54dab62
@sebastian-peter
Merge branch 'dev' into sp/#651-scheduler-phase-switch
a13238c
@sebastian-peter
Adding/fixing ScalaDoc
a2faeb6
@sebastian-peter
Fixing code smells
39610e5
@sebastian-peter sebastian-peter marked this pull request as ready for review November 30, 2023 21:08
danielfeismann
danielfeismann requested changes Dec 7, 2023
View reviewed changes
Copy link
Member

@danielfeismann danielfeismann left a comment

Choose a reason for hiding this comment

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

Just a little question from my side

src/test/scala/edu/ie3/simona/scheduler/SchedulerSpec.scala Show resolved Hide resolved
danielfeismann
danielfeismann approved these changes Dec 7, 2023
View reviewed changes
Copy link
Member

@danielfeismann danielfeismann left a comment

Choose a reason for hiding this comment

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

LGTM, thanks for the work done here!

@danielfeismann danielfeismann merged commit 2dba213 into dev Dec 7, 2023
4 checks passed
@danielfeismann danielfeismann deleted the sp/#651-scheduler-phase-switch branch December 7, 2023 11:21
This was referenced Feb 1, 2024
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@danielfeismann danielfeismann danielfeismann approved these changes

Assignees

@sebastian-peter sebastian-peter

Labels
enhancement New feature or request
Projects
None yet
Milestone
Version 4.0
Development

Successfully merging this pull request may close these issues.

Introduce scheduler lock and phased scheduler as solutions to em scheduling + MobSim
2 participants
@sebastian-peter @danielfeismann