From 3dd40496277e65af574ce24724b573b90a86464f Mon Sep 17 00:00:00 2001 From: alee08 Date: Fri, 27 Oct 2023 16:02:58 +0200 Subject: [PATCH] Fix timeout, ProblemKind supported updated --- setup.py | 2 +- up_fmap/fmap_planner.py | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index 1eb402a..e2cbd20 100644 --- 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="onaindia@dsic.upv.es", diff --git a/up_fmap/fmap_planner.py b/up_fmap/fmap_planner.py index 6db5845..5280187 100644 --- 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,