[Pexplicit] Minor

p-org · Apr 25, 2024 · 4b0867f · 4b0867f
1 parent e21ae0f
commit 4b0867f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 11 deletions.
diff --git a/Src/PRuntimes/PExplicitRuntime/src/main/java/pexplicit/commandline/PExplicitOptions.java b/Src/PRuntimes/PExplicitRuntime/src/main/java/pexplicit/commandline/PExplicitOptions.java
@@ -99,7 +99,7 @@ public class PExplicitOptions {
         Option strategy =
                 Option.builder("st")
                         .longOpt("strategy")
-                        .desc("Exploration strategy: dfs, random, astar (default: dfs)")
+                        .desc("Exploration strategy: dfs, random, astar (default: random)")
                         .numberOfArgs(1)
                         .hasArg()
                         .argName("Strategy (string)")

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
@@ -153,12 +153,6 @@ public static void logNewTasks(List<SearchTask> tasks) {
         }
     }
 
-    public static void logNextTask(SearchTask task) {
-        if (verbosity > 1) {
-            log.info(String.format("    Next task is %s", task.toStringDetailed()));
-        }
-    }
-
     /**
      * Log at the start of an iteration
      *

diff --git a/...itRuntime/src/main/java/pexplicit/runtime/scheduler/explicit/ExplicitSearchScheduler.java b/...itRuntime/src/main/java/pexplicit/runtime/scheduler/explicit/ExplicitSearchScheduler.java
@@ -122,7 +122,6 @@ public void run() throws TimeoutException {
             // set the next task
             SearchTask nextTask = setNextTask();
             assert (nextTask != null);
-            PExplicitLogger.logNextTask(nextTask);
         }
     }
 

diff --git a/...itRuntime/src/main/java/pexplicit/runtime/scheduler/explicit/strategy/SearchStrategy.java b/...itRuntime/src/main/java/pexplicit/runtime/scheduler/explicit/strategy/SearchStrategy.java
@@ -70,7 +70,7 @@ private boolean isValidTaskId(int id) {
         return (id < allTasks.size());
     }
 
-    private SearchTask getTask(int id) {
+    protected SearchTask getTask(int id) {
         assert (isValidTaskId(id));
         return allTasks.get(id);
     }
@@ -81,7 +81,6 @@ public SearchTask setNextTask() {
         }
 
         SearchTask nextTask = popNextTask();
-        assert (!nextTask.isInitialTask());
         setCurrTask(nextTask);
 
         return nextTask;

diff --git a/...untime/src/main/java/pexplicit/runtime/scheduler/explicit/strategy/SearchStrategyDfs.java b/...untime/src/main/java/pexplicit/runtime/scheduler/explicit/strategy/SearchStrategyDfs.java
@@ -5,9 +5,11 @@ public SearchStrategyDfs() {
     }
 
     public void addNewTask(SearchTask task) {
+        assert (pendingTasks.isEmpty());
     }
 
     public SearchTask popNextTask() {
-        throw new RuntimeException("Cannot pop the next task in dfs strategy since there should be just a single task");
+        assert (pendingTasks.size() == 1);
+        return getTask(pendingTasks.iterator().next());
     }
 }