Fix timeout, ProblemKind supported updated

aiplan4eu · Oct 27, 2023 · 3dd4049 · 3dd4049
1 parent c0c8903
commit 3dd4049
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/setup.py b/setup.py
@@ -56,7 +56,7 @@ def run(self):
 
 setup(
     name="up_fmap",
-    version="0.0.8",
+    version="0.0.9",
     description="up_fmap",
     author="Alejandro Torreño, Eva Onaindia and Oscar Sapena",
     author_email="[email protected]",

diff --git a/up_fmap/fmap_planner.py b/up_fmap/fmap_planner.py
@@ -99,11 +99,7 @@ def supported_kind() -> "ProblemKind":
         supported_kind.set_typing("FLAT_TYPING")
         supported_kind.set_typing("HIERARCHICAL_TYPING")
         supported_kind.set_conditions_kind("NEGATIVE_CONDITIONS")
-        supported_kind.set_conditions_kind("DISJUNCTIVE_CONDITIONS")
         supported_kind.set_conditions_kind("EQUALITIES")
-        supported_kind.set_conditions_kind("EXISTENTIAL_CONDITIONS")
-        supported_kind.set_conditions_kind("UNIVERSAL_CONDITIONS")
-        supported_kind.set_effects_kind("CONDITIONAL_EFFECTS")
         supported_kind.set_fluents_type("OBJECT_FLUENTS")
         return supported_kind
 
@@ -206,6 +202,8 @@ def _solve(
                 plan = None
 
             if timeout_occurred and retval != 0:
+                process.terminate()
+                process.wait()
                 return PlanGenerationResult(
                     PlanGenerationResultStatus.TIMEOUT,
                     plan=plan,