Fix runtime search computation

Author: guilyx

.gitignore

@@ -136,4 +136,5 @@ data.json
 pddl-examples/*
 data/*
 scripts/*
+*.txt
 !scripts/ipc.py

jupyddl/a_star.py

@@ -8,6 +8,7 @@
 
 class AStarBestFirstSearch:
     def __init__(self, automated_planner, heuristic_function):
+        self.time_start = now()
         self.automated_planner = automated_planner
         self.metrics = Metrics()
         self.init = Node(
@@ -30,7 +31,6 @@ def __hash(self, node):
         return string.split(sep, 1)[0] + ")"
 
     def search(self, node_bound=float("inf")):
-        time_start = now()
         self.automated_planner.logger.debug(
             "Search started at: " + str(timestamp.now())
         )
@@ -45,7 +45,7 @@ def search(self, node_bound=float("inf")):
             if self.automated_planner.satisfies(
                 self.automated_planner.problem.goal, current_node.state
             ):
-                self.metrics.runtime = now() - time_start
+                self.metrics.runtime = now() - self.time_start
                 self.automated_planner.logger.debug(
                     "Search finished at: " + str(timestamp.now())
                 )
@@ -95,6 +95,6 @@ def search(self, node_bound=float("inf")):
                     self.nodes[child_hash] = child
                     self.open_nodes_n += 1
                     self.metrics.n_opened += 1
-        self.metrics.runtime = now() - time_start
+        self.metrics.runtime = now() - self.time_start
         self.automated_planner.logger.warning("!!! No path found !!!")
         return None, self.metrics

jupyddl/automated_planner.py

@@ -4,7 +4,12 @@
 from .a_star import AStarBestFirstSearch
 from .greedy_best_first import GreedyBestFirstSearch
 from .metrics import Metrics
-from .heuristics import BasicHeuristic, DeleteRelaxationHeuristic, RelaxedCriticalPathHeuristic, CriticalPathHeuristic
+from .heuristics import (
+    BasicHeuristic,
+    DeleteRelaxationHeuristic,
+    RelaxedCriticalPathHeuristic,
+    CriticalPathHeuristic,
+)
 import coloredlogs
 import logging
 import julia
@@ -36,7 +41,7 @@ def __init__(self, domain_path, problem_path, log_level="DEBUG"):
             "relaxed_critical_path/3",
             "critical_path/1",
             "critical_path/2",
-            "critical_path/3"
+            "critical_path/3",
         ]
 
         # Logger

jupyddl/bfs.py

@@ -6,14 +6,14 @@
 
 class BreadthFirstSearch:
     def __init__(self, automated_planner):
+        self.time_start = now()
         self.visited = []
         self.automated_planner = automated_planner
         self.init = Node(self.automated_planner.initial_state, automated_planner)
         self.queue = [self.init]
         self.metrics = Metrics()
 
     def search(self, node_bound=float("inf")):
-        time_start = now()
         self.automated_planner.logger.debug(
             "Search started at: " + str(timestamp.now())
         )
@@ -25,7 +25,7 @@ def search(self, node_bound=float("inf")):
                 if self.automated_planner.satisfies(
                     self.automated_planner.problem.goal, current_node.state
                 ):
-                    self.metrics.runtime = now() - time_start
+                    self.metrics.runtime = now() - self.time_start
                     self.automated_planner.logger.debug(
                         "Search finished at: " + str(timestamp.now())
                     )
@@ -54,6 +54,6 @@ def search(self, node_bound=float("inf")):
                         continue
                     self.metrics.n_opened += 1
                     self.queue.append(child)
-        self.metrics.runtime = now() - time_start
+        self.metrics.runtime = now() - self.time_start
         self.automated_planner.logger.warning("!!! No path found !!!")
         return None, self.metrics

jupyddl/data_analyst.py

@@ -509,10 +509,7 @@ def comparative_astar_heuristic_plot(
                 times_y.append(data[node_opened])
 
             ax.plot(
-                nodes_sorted,
-                times_y,
-                "-o",
-                label=h,
+                nodes_sorted, times_y, "-o", label=h,
             )
 
         plt.title("A* heuristics complexity comparison")
@@ -544,10 +541,7 @@ def comparative_greedy_bfs_heuristic_plot(
                 times_y.append(data[node_opened])
 
             ax.plot(
-                nodes_sorted,
-                times_y,
-                "-o",
-                label=h,
+                nodes_sorted, times_y, "-o", label=h,
             )
 
         plt.title("Greedy Best First heuristics complexity comparison")
@@ -622,10 +616,7 @@ def comparative_data_plot(
             for node_opened in nodes_sorted:
                 times_y.append(data[node_opened])
             ax.plot(
-                nodes_sorted,
-                times_y,
-                "-o",
-                label=planner,
+                nodes_sorted, times_y, "-o", label=planner,
             )
         plt.title("Planners complexity comparison")
         plt.legend(loc="upper left")
@@ -753,9 +744,7 @@ def compute_planners_efficiency(self):
         plt.ylabel("Cost to goal")
         for key, val in costs.items():
             ax.plot(
-                val,
-                "-o",
-                label=key,
+                val, "-o", label=key,
             )
             costs[key] = [i for i in costs[key] if i != 0]
         plt.title("Planners efficiency (costs)")

jupyddl/dfs.py

@@ -6,14 +6,14 @@
 
 class DepthFirstSearch:
     def __init__(self, automated_planner):
+        self.time_start = now()
         self.visited = []
         self.automated_planner = automated_planner
         self.init = Node(self.automated_planner.initial_state, automated_planner)
         self.stack = [self.init]
         self.metrics = Metrics()
 
     def search(self, node_bound=float("inf")):
-        time_start = now()
         self.automated_planner.logger.debug(
             "Search started at: " + str(timestamp.now())
         )
@@ -25,7 +25,7 @@ def search(self, node_bound=float("inf")):
                 if self.automated_planner.satisfies(
                     self.automated_planner.problem.goal, current_node.state
                 ):
-                    self.metrics.runtime = now() - time_start
+                    self.metrics.runtime = now() - self.time_start
                     self.automated_planner.logger.debug(
                         "Search finished at: " + str(timestamp.now())
                     )
@@ -54,6 +54,6 @@ def search(self, node_bound=float("inf")):
                         continue
                     self.metrics.n_opened += 1
                     self.stack.append(child)
-        self.metrics.runtime = now() - time_start
+        self.metrics.runtime = now() - self.time_start
         self.automated_planner.logger.warning("!!! No path found !!!")
         return None, self.metrics

jupyddl/dijkstra.py

@@ -12,6 +12,7 @@ def zero_heuristic():
 
 class DijkstraBestFirstSearch:
     def __init__(self, automated_planner):
+        self.time_start = now()
         self.automated_planner = automated_planner
         self.metrics = Metrics()
         self.init = Node(
@@ -35,7 +36,6 @@ def search(self, node_bound=float("inf")):
         self.automated_planner.logger.debug(
             "Search started at: " + str(timestamp.now())
         )
-        time_start = now()
         while self.open_nodes_n > 0:
             current_key = min(
                 [n for n in self.nodes if self.nodes[n].is_open],
@@ -46,7 +46,7 @@ def search(self, node_bound=float("inf")):
             if self.automated_planner.satisfies(
                 self.automated_planner.problem.goal, current_node.state
             ):
-                self.metrics.runtime = now() - time_start
+                self.metrics.runtime = now() - self.time_start
                 self.automated_planner.logger.debug(
                     "Search finished at: " + str(timestamp.now())
                 )
@@ -96,6 +96,6 @@ def search(self, node_bound=float("inf")):
                     self.nodes[child_hash] = child
                     self.metrics.n_opened += 1
                     self.open_nodes_n += 1
-        self.metrics.runtime = now() - time_start
+        self.metrics.runtime = now() - self.time_start
         self.automated_planner.logger.warning("!!! No path found !!!")
         return None, self.metrics

jupyddl/greedy_best_first.py

@@ -8,6 +8,7 @@
 
 class GreedyBestFirstSearch:
     def __init__(self, automated_planner, heuristic_function):
+        self.time_start = now()
         self.automated_planner = automated_planner
         self.metrics = Metrics()
         self.init = Node(
@@ -30,7 +31,6 @@ def __hash(self, node):
         return string.split(sep, 1)[0] + ")"
 
     def search(self, node_bound=float("inf")):
-        time_start = now()
         self.automated_planner.logger.debug(
             "Search started at: " + str(timestamp.now())
         )
@@ -45,7 +45,7 @@ def search(self, node_bound=float("inf")):
             if self.automated_planner.satisfies(
                 self.automated_planner.problem.goal, current_node.state
             ):
-                self.metrics.runtime = now() - time_start
+                self.metrics.runtime = now() - self.time_start
                 self.automated_planner.logger.debug(
                     "Search finished at: " + str(timestamp.now())
                 )
@@ -96,6 +96,6 @@ def search(self, node_bound=float("inf")):
                     self.nodes[child_hash] = child
                     self.open_nodes_n += 1
                     self.metrics.n_opened += 1
-        self.metrics.runtime = now() - time_start
+        self.metrics.runtime = now() - self.time_start
         self.automated_planner.logger.warning("!!! No path found !!!")
         return None, self.metrics