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

Fix analysis mode of scheduling engine #1586

Merged
merged 1 commit into from
Nov 1, 2024
Merged

Fix analysis mode of scheduling engine #1586

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions scheduler-driver/src/main/java/gov/nasa/jpl/aerie/scheduler/solver/PrioritySolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,8 +491,8 @@ private void satisfyGoalGeneral(Goal goal) throws SchedulingInterruptedException
assert missing != null;
logger.info("Processing conflict " + (++i));
logger.info(missing.toString());
//determine the best activities to satisfy the conflict
ConflictSolverResult conflictSolverReturn = null;
//initialize conflict result to unsatisfied + no activities created
var conflictSolverReturn = new ConflictSolverResult();
if (!analysisOnly && (missing instanceof MissingActivityInstanceConflict missingActivityInstanceConflict)) {
conflictSolverReturn = solveActivityInstanceConflict(missingActivityInstanceConflict, goal);
} else if (!analysisOnly && (missing instanceof MissingActivityTemplateConflict missingActivityTemplateConflict)) {
Expand Down
Loading