Merge pull request #59 from APLA-Toolbox/add-performance-metrics

Data Analyst

Author: guilyx

.gitignore

@@ -136,3 +136,4 @@ dmypy.json
 # Logs
 logs/*
 !logs/.gitkeep
+data.json

jupyddl/a_star.py

@@ -15,6 +15,7 @@ def __init__(self, automated_planner, heuristic_function):
             is_closed=False,
             is_open=True,
             heuristic=heuristic_function,
+            heuristic_based=True,
         )
         self.heuristic_function = heuristic_function
         self.open_nodes_n = 1
@@ -27,6 +28,7 @@ def __hash(self, node):
         return string.split(sep, 1)[0] + ")"
 
     def search(self):
+        opened_nodes = 0
         time_start = now()
         self.automated_planner.logger.debug(
             "Search started at: " + str(timestamp.now())
@@ -45,7 +47,7 @@ def search(self):
                 self.automated_planner.logger.debug(
                     "Search finished at: " + str(timestamp.now())
                 )
-                return current_node, computation_time
+                return current_node, computation_time, opened_nodes
 
             current_node.is_closed = True
             current_node.is_open = False
@@ -61,7 +63,9 @@ def search(self):
                     heuristic=self.heuristic_function,
                     is_closed=False,
                     is_open=True,
+                    heuristic_based=True,
                 )
+                opened_nodes += 1
                 child_hash = self.__hash(child)
                 if child_hash in self.nodes:
                     if self.nodes[child_hash].is_closed:
@@ -79,4 +83,4 @@ def search(self):
                     self.open_nodes_n += 1
         computation_time = now() - time_start
         self.automated_planner.logger.warning("!!! No path found !!!")
-        return None, computation_time
+        return None, computation_time, opened_nodes

jupyddl/automated_planner.py

@@ -41,7 +41,10 @@ def __init_logger(self, log_level):
             format="%(levelname)s:%(message)s",
             filemode="w",
             level=log_level,
-        )  # Creates the log file
+        )
+
+    def display_available_heuristics(self):
+        print(list(self.available_heuristics.keys()))
 
     def transition(self, state, action):
         return self.pddl.transition(self.domain, state, action, check=False)
@@ -92,34 +95,30 @@ def get_state_def_from_path(self, path):
             trimmed_path.append(node.state)
         return trimmed_path
 
-    def breadth_first_search(self, time_it=False):
+    def breadth_first_search(self):
         bfs = BreadthFirstSearch(self)
-        last_node, total_time = bfs.search()
+        last_node, total_time, opened_nodes = bfs.search()
         path = self.__retrace_path(last_node)
-        if time_it:
-            return path, total_time
-        return path, None
 
-    def depth_first_search(self, time_it=False):
+        return path, total_time, opened_nodes
+
+    def depth_first_search(self):
         dfs = DepthFirstSearch(self)
-        last_node, total_time = dfs.search()
+        last_node, total_time, opened_nodes = dfs.search()
         path = self.__retrace_path(last_node)
-        if time_it:
-            return path, total_time
-        return path, None
 
-    def dijktra_best_first_search(self, time_it=False):
+        return path, total_time, opened_nodes
+
+    def dijktra_best_first_search(self):
         dijkstra = DijkstraBestFirstSearch(self)
-        last_node, total_time = dijkstra.search()
+        last_node, total_time, opened_nodes = dijkstra.search()
         path = self.__retrace_path(last_node)
-        if time_it:
-            return path, total_time
-        return path, None
 
-    def astar_best_first_search(self, time_it=False, heuristic=goal_count_heuristic):
+        return path, total_time, opened_nodes
+
+    def astar_best_first_search(self, heuristic=goal_count_heuristic):
         astar = AStarBestFirstSearch(self, heuristic)
-        last_node, total_time = astar.search()
+        last_node, total_time, opened_nodes = astar.search()
         path = self.__retrace_path(last_node)
-        if time_it:
-            return path, total_time
-        return path, None
+
+        return path, total_time, opened_nodes

jupyddl/bfs.py

@@ -11,6 +11,7 @@ def __init__(self, automated_planner):
         self.queue = [self.init]
 
     def search(self):
+        opened_nodes = 0
         time_start = now()
         self.automated_planner.logger.debug(
             "Search started at: " + str(timestamp.now())
@@ -27,7 +28,7 @@ def search(self):
                     self.automated_planner.logger.debug(
                         "Search finished at: " + str(timestamp.now())
                     )
-                    return current_node, computation_time
+                    return current_node, computation_time, opened_nodes
 
                 actions = self.automated_planner.available_actions(current_node.state)
                 for act in actions:
@@ -39,9 +40,10 @@ def search(self):
                         parent_action=act,
                         parent=current_node,
                     )
+                    opened_nodes += 1
                     if child in self.visited:
                         continue
                     self.queue.append(child)
         computation_time = now() - time_start
         self.automated_planner.logger.warning("!!! No path found !!!")
-        return None, computation_time
+        return None, computation_time, opened_nodes