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

fix: ensure entity placer is not shared in ruin and recreate moves #1320

Merged
merged 14 commits into from
Jan 15, 2025
Merged

fix: ensure entity placer is not shared in ruin and recreate moves #1320

merged 14 commits into from
Jan 15, 2025
+629 −198

Conversation

zepfred
Copy link
Contributor

@zepfred zepfred commented Jan 13, 2025 •
edited
Loading

Fixes TimefoldAI/timefold-employee-scheduling#305

@zepfred zepfred requested a review from triceo January 13, 2025 21:20
@zepfred zepfred marked this pull request as draft January 13, 2025 23:39
@zepfred zepfred force-pushed the fix-ruin-recreate-mt branch from 8deda83 to 6f2c963 Compare January 14, 2025 23:37
@zepfred zepfred marked this pull request as ready for review January 15, 2025 00:08
triceo
triceo reviewed Jan 15, 2025
View reviewed changes
Copy link
Contributor

@triceo triceo left a comment

Choose a reason for hiding this comment

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

So what was the problem after all? I only see the changes we talked about - yet that version didn't work yet. So, what changed?

Let's discuss the custom actions on Slack.

Left a few more comments, but otherwise LGTM.

...solver/core/impl/heuristic/selector/move/generic/RuinRecreateConstructionHeuristicPhase.java Outdated Show resolved Hide resolved
...core/impl/heuristic/selector/move/generic/RuinRecreateConstructionHeuristicPhaseBuilder.java Outdated Show resolved Hide resolved
...core/impl/heuristic/selector/move/generic/RuinRecreateConstructionHeuristicPhaseBuilder.java Outdated Show resolved Hide resolved
@zepfred
Copy link
Contributor Author

zepfred commented Jan 15, 2025

So what was the problem after all? I only see the changes we talked about - yet that version didn't work yet. So, what changed?

constructionHeuristicPhaseBuilder is shared among all threads. Therefore, every time a thread builds the R&R phase, it updates the reference elementsToRecreate, which filters out non-ruined elements. Additionally, the entity placer and decider are both shared. When a main thread executes a chosen move, it utilizes the same decider, leading to the CH phase in move threads ending prematurely and not reassigning the ruined elements.

In short, constructionHeuristicPhaseBuilder was causing race conditions, and constructionHeuristicPhaseBuilder#ensureThreadSafe() fixes that.

@zepfred zepfred mentioned this pull request Jan 15, 2025
Closed
@triceo triceo linked an issue Jan 15, 2025 that may be closed by this pull request
fix: Ruin and Recreate index out of bound #1305
Closed
@zepfred zepfred force-pushed the fix-ruin-recreate-mt branch from 10665f8 to bb20bd9 Compare January 15, 2025 13:15
triceo
triceo approved these changes Jan 15, 2025
View reviewed changes
Copy link
Contributor

@triceo triceo left a comment

Choose a reason for hiding this comment

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

LGTM after comments resolved and CI green.

...in/java/ai/timefold/solver/core/impl/move/director/VariableChangeRecordingScoreDirector.java Outdated Show resolved Hide resolved
...in/java/ai/timefold/solver/core/impl/move/director/VariableChangeRecordingScoreDirector.java Outdated Show resolved Hide resolved
.../impl/heuristic/selector/move/generic/RuinRecreateConstructionHeuristicPhaseBuilderTest.java Outdated Show resolved Hide resolved
.../impl/heuristic/selector/move/generic/RuinRecreateConstructionHeuristicPhaseBuilderTest.java Outdated Show resolved Hide resolved
@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Passed Quality Gate passed

Issues
1 New issue
0 Accepted issues

Measures
0 Security Hotspots
88.8% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

@triceo triceo merged commit 3247e86 into TimefoldAI:main Jan 15, 2025
28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@triceo triceo triceo approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

fix: Ruin and Recreate index out of bound
2 participants
@zepfred @triceo