fix(interpreted functions): minor refactoring

plot-requirements.txt

@@ -1,6 +1,6 @@
 -r requirements.txt
 plotly
 matplotlib==3.7.3
-kaleido==0.2.1
+kaleido
 pandas
 pygraphviz

unified_planning/engines/mixins/compiler.py

@@ -17,7 +17,7 @@
 from unified_planning.model import ProblemKind
 from abc import ABC, abstractmethod
 from enum import Enum, auto
-from typing import Dict, Optional, OrderedDict
+from typing import Optional
 from warnings import warn
 
 from unified_planning.model.fnode import FNode

unified_planning/engines/parallel.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 #
 
+
 import warnings
 import unified_planning as up
 import unified_planning.engines as engines

unified_planning/engines/results.py

@@ -14,6 +14,7 @@
 #
 """This module defines the PlanGenerationResult class."""
 
+
 from fractions import Fraction
 import unified_planning as up
 from unified_planning.exceptions import UPUsageError, UPValueError

unified_planning/test/test_anml_reader.py

@@ -713,7 +713,6 @@ def test_anml_io(self):
                 or kind.has_interpreted_functions_in_numeric_assignments()
                 or kind.has_interpreted_functions_in_object_assignments()
                 or kind.has_interpreted_functions_in_conditions()
-                # could be done more cleanly with an has_interpreted_functions() imlpementation
             ):
                 continue
             with tempfile.TemporaryDirectory() as tempdir:

unified_planning/test/test_partial_order_plan.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 
-import pytest
 import unified_planning as up
 from unified_planning.shortcuts import *
 from unified_planning.model.problem_kind import basic_classical_kind, hierarchical_kind

unified_planning/test/test_pddl_io.py

@@ -542,7 +542,7 @@ def test_examples_io(self):
                     or kind.has_interpreted_functions_in_numeric_assignments()
                     or kind.has_interpreted_functions_in_object_assignments()
                     or kind.has_interpreted_functions_in_conditions()
-                )  # could be done more cleanly with an has_interpreted_functions() imlpementation
+                )
             ):
                 continue
             with tempfile.TemporaryDirectory() as tempdir:

unified_planning/test/test_planner.py

@@ -15,7 +15,6 @@
 
 from typing import Callable
 import warnings
-
 import unified_planning as up
 from unified_planning.shortcuts import *
 from unified_planning.model.problem_kind import (
@@ -98,8 +97,8 @@ def test_basic_parameters(self):
     @skipIfEngineNotAvailable("tamer")
     def test_basic_parallel(self):
         problem = self.problems["basic"].problem
-        # print (problem)
         a = problem.action("a")
+
         with OneshotPlanner(
             names=["tamer", "tamer"],
             params=[{"heuristic": "hadd"}, {"heuristic": "hmax"}],
@@ -153,8 +152,8 @@ def test_basic_oversubscription(self):
     @skipIfEngineNotAvailable("tamer")
     def test_basic_oversubscription_parallel(self):
         problem = self.problems["basic_oversubscription"].problem
-        # print(problem)
         a = problem.action("a")
+
         with OneshotPlanner(
             names=["oversubscription[tamer]", "oversubscription[tamer]"],
             params=[{"heuristic": "hadd"}, {"heuristic": "hmax"}],
@@ -172,7 +171,6 @@ def test_basic_oversubscription_parallel(self):
     @skipIfEngineNotAvailable("tamer")
     def test_timed_connected_locations_parallel(self):
         problem = self.problems["timed_connected_locations"].problem
-        # print(problem)
         move = problem.action("move")
         with OneshotPlanner(
             names=["tamer", "tamer"],

unified_planning/test/test_protobuf_io.py

@@ -410,7 +410,6 @@ def test_all_problems(self):
                 or kind.has_interpreted_functions_in_numeric_assignments()
                 or kind.has_interpreted_functions_in_object_assignments()
                 or kind.has_interpreted_functions_in_conditions()
-                # could be done more cleanly with an has_interpreted_functions() imlpementation
             ):
                 continue
             problem_pb = self.pb_writer.convert(problem)