Apply formatting changes

Author: guilyx

jupyddl/automated_planner.py

@@ -27,9 +27,13 @@ def __init__(self, domain_path, problem_path, log_level="DEBUG"):
         self.initial_state = self.pddl.initialize(self.problem)
         self.goals = self.__flatten_goal()
         self.available_heuristics = [
-            "basic/zero", "basic/goal_count",
-            "delete_relaxation/h_add", "delete_relaxation/h_max",
-            "critical_path/1", "critical_path/2", "critical_path/3",
+            "basic/zero",
+            "basic/goal_count",
+            "delete_relaxation/h_add",
+            "delete_relaxation/h_max",
+            "critical_path/1",
+            "critical_path/2",
+            "critical_path/3",
         ]
 
         # Logger

jupyddl/heuristics.py

@@ -29,6 +29,7 @@ def __goal_count_heuristic(self, state):
                 count += 1
         return count
 
+
 class DeleteRelaxationHeuristic:
     def __init__(self, automated_planner, heuristic_key):
         class DRHCache:
@@ -127,6 +128,7 @@ def __facts_eq(self, facts_dict, facts_set):
                 return False
         return True
 
+
 class CriticalPathHeuristic:
     def __init__(self, automated_planner, critical_path_level=1):
         class CPCache:
@@ -139,10 +141,14 @@ def __init__(self, domain=None, axioms=None, preconds=None, additions=None):
         self.automated_planner = automated_planner
         self.cache = CPCache()
         if critical_path_level > 3:
-            logging.warning("Critical Path level is only implemented until 3, forcing it to 3.")
+            logging.warning(
+                "Critical Path level is only implemented until 3, forcing it to 3."
+            )
             self.critical_path_level = 3
         if critical_path_level < 1:
-            logging.warning("Critical Path level has to be at least 1, forcing it to 1.")
+            logging.warning(
+                "Critical Path level has to be at least 1, forcing it to 1."
+            )
             self.critical_path_level = 1
         else:
             self.critical_path_level = critical_path_level
@@ -170,15 +176,36 @@ def compute(self, state):
                         if str(g) in fact_costs_str:
                             costs.append(fact_costs_str[str(g)])
                 if self.critical_path_level == 2:
-                    pairs_of_goals = [(g1, g2) for g1 in goals for g2 in goals if g1 != g2]
+                    pairs_of_goals = [
+                        (g1, g2) for g1 in goals for g2 in goals if g1 != g2
+                    ]
                     for gs in pairs_of_goals:
-                        if str(gs[0]) in fact_costs_str and str(gs[1]) in fact_costs_str:
-                            costs.append(fact_costs_str[str(gs[0])] + fact_costs_str[str(gs[1])])
+                        if (
+                            str(gs[0]) in fact_costs_str
+                            and str(gs[1]) in fact_costs_str
+                        ):
+                            costs.append(
+                                fact_costs_str[str(gs[0])] + fact_costs_str[str(gs[1])]
+                            )
                 if self.critical_path_level == 3:
-                    triplets_of_goals = [(g1, g2, g3) for g1 in goals for g2 in goals for g3 in goals if g1 != g2 and g1 != g3 and g2 != g3]
+                    triplets_of_goals = [
+                        (g1, g2, g3)
+                        for g1 in goals
+                        for g2 in goals
+                        for g3 in goals
+                        if g1 != g2 and g1 != g3 and g2 != g3
+                    ]
                     for gs in triplets_of_goals:
-                        if str(gs[0]) in fact_costs_str and str(gs[1]) in fact_costs_str and str(gs[2]) in fact_costs_str:
-                            costs.append(fact_costs_str[str(gs[0])] + fact_costs_str[str(gs[1])] + fact_costs_str[str(gs[2])])
+                        if (
+                            str(gs[0]) in fact_costs_str
+                            and str(gs[1]) in fact_costs_str
+                            and str(gs[2]) in fact_costs_str
+                        ):
+                            costs.append(
+                                fact_costs_str[str(gs[0])]
+                                + fact_costs_str[str(gs[1])]
+                                + fact_costs_str[str(gs[2])]
+                            )
                 costs.insert(0, 0)
                 return max(costs)