diff --git a/setup.py b/setup.py index 8be5b94..8876c71 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ ENHSP_dst = './up_enhsp/ENHSP' ENHSP_PUBLIC = 'ENHSP-Public' COMPILE_CMD = './compile' -ENHSP_TAG = 'enhsp20-0.14.0' +ENHSP_TAG = 'enhsp-20-0.15.0' ENHSP_REPO = 'https://gitlab.com/enricos83/ENHSP-Public' JDK_REQUIRE = 17 @@ -62,7 +62,7 @@ def run(self): setup(name='up_enhsp', - version='0.0.25', + version='0.0.26', description='up_enhsp', author='UNIBS Team', author_email='enrico.scala@unibs.it', diff --git a/up_enhsp/ENHSP b/up_enhsp/ENHSP index 486e03a..2d5d910 160000 --- a/up_enhsp/ENHSP +++ b/up_enhsp/ENHSP @@ -1 +1 @@ -Subproject commit 486e03af71357ac3c351b80735ade0a7369db173 +Subproject commit 2d5d9103652d92bd97e9b57d76599f8e2e54a573 diff --git a/up_enhsp/enhsp_planner.py b/up_enhsp/enhsp_planner.py index 8cd535b..f2e84bb 100644 --- a/up_enhsp/enhsp_planner.py +++ b/up_enhsp/enhsp_planner.py @@ -33,7 +33,7 @@ def _manage_parameters(self, command): return command def _get_cmd(self, domain_filename: str, problem_filename: str, plan_filename: str) -> List[str]: - base_command = ['java', '-jar', pkg_resources.resource_filename(__name__, 'ENHSP/enhsp.jar'), '-o', domain_filename, '-f', problem_filename, '-sp', plan_filename] + base_command = ['java', '-jar', pkg_resources.resource_filename(__name__, 'ENHSP/enhsp.jar'), '-o', domain_filename, '-f', problem_filename, '-sp', plan_filename,'-npm'] return self._manage_parameters(base_command) def _result_status( @@ -80,6 +80,7 @@ def supported_kind() -> 'ProblemKind': supported_kind.set_actions_cost_kind("FLUENTS_IN_ACTIONS_COST") supported_kind.set_actions_cost_kind("INT_NUMBERS_IN_ACTIONS_COST") supported_kind.set_actions_cost_kind("REAL_NUMBERS_IN_ACTIONS_COST") + supported_kind.set_time("PROCESSES") return supported_kind @staticmethod