[PEx] Minor: correct an assertion

p-org · May 8, 2024 · c438e7f · c438e7f
1 parent d739b61
commit c438e7f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/Src/PRuntimes/PExplicitRuntime/src/main/java/pexplicit/runtime/logger/PExplicitLogger.java b/Src/PRuntimes/PExplicitRuntime/src/main/java/pexplicit/runtime/logger/PExplicitLogger.java
@@ -146,6 +146,17 @@ public static void logEndTask(SearchTask task, int numSchedules) {
         }
     }
 
+    /**
+     * Log when the next task is selected
+     *
+     * @param task Next search task
+     */
+    public static void logNextTask(SearchTask task) {
+        if (verbosity > 1) {
+            log.info(String.format("  Next task: %s", task.toStringDetailed()));
+        }
+    }
+
     public static void logNewTasks(List<SearchTask> tasks) {
         if (verbosity > 0) {
             log.info(String.format("    Added %d new tasks", tasks.size()));

diff --git a/...itRuntime/src/main/java/pexplicit/runtime/scheduler/explicit/ExplicitSearchScheduler.java b/...itRuntime/src/main/java/pexplicit/runtime/scheduler/explicit/ExplicitSearchScheduler.java
@@ -464,6 +464,7 @@ private void setChildTask(Choice choice, int choiceNum, SearchTask parentTask, b
     public SearchTask setNextTask() {
         SearchTask nextTask = searchStrategy.setNextTask();
         if (nextTask != null) {
+            PExplicitLogger.logNextTask(nextTask);
             schedule.setChoices(nextTask.getAllChoices());
             postIterationCleanup();
         }
@@ -504,7 +505,9 @@ private void postIterationCleanup() {
                 if (PExplicitGlobal.getConfig().isStatefulBacktrackEnabled()) {
                     scheduleChoice = schedule.getScheduleChoiceAt(choice);
                     if (scheduleChoice != null && scheduleChoice.getChoiceState() != null) {
-                        assert ((scheduleChoice == choice) || (scheduleChoice.getStepNumber() == (choice.getStepNumber() - 1)));
+                        assert ((scheduleChoice == choice) ||
+                                (scheduleChoice.getStepNumber() == (choice.getStepNumber() - 1)) ||
+                                (scheduleChoice.getStepNumber() == choice.getStepNumber()));
                         newStepNumber = scheduleChoice.getStepNumber();
                     } else {
                         assert (choice.getStepNumber() <= 1);