Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ProblemKind's version 2 #54

Merged
merged 1 commit into from
Oct 31, 2023
Merged

ProblemKind's version 2 #54

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 32 additions & 33 deletions up_tamer/engine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,41 +90,40 @@ def name(self) -> str:

@staticmethod
def supported_kind() -> ProblemKind:
supported_kind = ProblemKind()
supported_kind.set_problem_class('ACTION_BASED') # type: ignore
supported_kind.set_time('CONTINUOUS_TIME') # type: ignore
supported_kind.set_time('INTERMEDIATE_CONDITIONS_AND_EFFECTS') # type: ignore
supported_kind.set_time('TIMED_EFFECTS') # type: ignore
supported_kind.set_time('TIMED_GOALS') # type: ignore
supported_kind.set_time('DURATION_INEQUALITIES') # type: ignore
supported_kind.set_expression_duration('STATIC_FLUENTS_IN_DURATIONS') # type: ignore
supported_kind.set_expression_duration('FLUENTS_IN_DURATIONS') # type: ignore
supported_kind.set_numbers('DISCRETE_NUMBERS') # type: ignore
supported_kind.set_numbers('CONTINUOUS_NUMBERS') # type: ignore
supported_kind.set_numbers("BOUNDED_TYPES") # type: ignore
supported_kind.set_problem_type("SIMPLE_NUMERIC_PLANNING") # type: ignore
supported_kind.set_problem_type("GENERAL_NUMERIC_PLANNING") # type: ignore
supported_kind.set_typing('FLAT_TYPING') # type: ignore

supported_kind = ProblemKind(version=2)
supported_kind.set_problem_class('ACTION_BASED')
supported_kind.set_time('CONTINUOUS_TIME')
supported_kind.set_time('INTERMEDIATE_CONDITIONS_AND_EFFECTS')
supported_kind.set_time('TIMED_EFFECTS')
supported_kind.set_time('TIMED_GOALS')
supported_kind.set_time('DURATION_INEQUALITIES')
supported_kind.set_expression_duration('STATIC_FLUENTS_IN_DURATIONS')
supported_kind.set_expression_duration('FLUENTS_IN_DURATIONS')
supported_kind.set_expression_duration("INT_TYPE_DURATIONS")
supported_kind.set_expression_duration("REAL_TYPE_DURATIONS")
supported_kind.set_numbers("BOUNDED_TYPES")
supported_kind.set_problem_type("SIMPLE_NUMERIC_PLANNING")
supported_kind.set_problem_type("GENERAL_NUMERIC_PLANNING")
supported_kind.set_typing('FLAT_TYPING')
supported_kind.set_parameters("BOOL_FLUENT_PARAMETERS")
supported_kind.set_parameters("BOUNDED_INT_FLUENT_PARAMETERS")
supported_kind.set_parameters("BOOL_ACTION_PARAMETERS")
supported_kind.set_parameters("BOUNDED_INT_ACTION_PARAMETERS")

supported_kind.set_effects_kind('INCREASE_EFFECTS') # type: ignore
supported_kind.set_effects_kind('DECREASE_EFFECTS') # type: ignore
supported_kind.set_effects_kind("STATIC_FLUENTS_IN_BOOLEAN_ASSIGNMENTS") # type: ignore
supported_kind.set_effects_kind("STATIC_FLUENTS_IN_NUMERIC_ASSIGNMENTS") # type: ignore
supported_kind.set_effects_kind("STATIC_FLUENTS_IN_OBJECT_ASSIGNMENTS") # type: ignore
supported_kind.set_effects_kind("FLUENTS_IN_BOOLEAN_ASSIGNMENTS") # type: ignore
supported_kind.set_effects_kind("FLUENTS_IN_NUMERIC_ASSIGNMENTS") # type: ignore
supported_kind.set_effects_kind("FLUENTS_IN_OBJECT_ASSIGNMENTS") # type: ignore
supported_kind.set_conditions_kind('NEGATIVE_CONDITIONS') # type: ignore
supported_kind.set_conditions_kind('DISJUNCTIVE_CONDITIONS') # type: ignore
supported_kind.set_conditions_kind('EQUALITIES') # type: ignore
supported_kind.set_fluents_type('NUMERIC_FLUENTS') # type: ignore
supported_kind.set_fluents_type('OBJECT_FLUENTS') # type: ignore
supported_kind.set_simulated_entities('SIMULATED_EFFECTS') # type: ignore
supported_kind.set_effects_kind('INCREASE_EFFECTS')
supported_kind.set_effects_kind('DECREASE_EFFECTS')
supported_kind.set_effects_kind("STATIC_FLUENTS_IN_BOOLEAN_ASSIGNMENTS")
supported_kind.set_effects_kind("STATIC_FLUENTS_IN_NUMERIC_ASSIGNMENTS")
supported_kind.set_effects_kind("STATIC_FLUENTS_IN_OBJECT_ASSIGNMENTS")
supported_kind.set_effects_kind("FLUENTS_IN_BOOLEAN_ASSIGNMENTS")
supported_kind.set_effects_kind("FLUENTS_IN_NUMERIC_ASSIGNMENTS")
supported_kind.set_effects_kind("FLUENTS_IN_OBJECT_ASSIGNMENTS")
supported_kind.set_conditions_kind('NEGATIVE_CONDITIONS')
supported_kind.set_conditions_kind('DISJUNCTIVE_CONDITIONS')
supported_kind.set_conditions_kind('EQUALITIES')
supported_kind.set_fluents_type("INT_FLUENTS")
supported_kind.set_fluents_type("REAL_FLUENTS")
supported_kind.set_fluents_type('OBJECT_FLUENTS')
supported_kind.set_simulated_entities('SIMULATED_EFFECTS')
return supported_kind

@staticmethod
Expand Down Expand Up @@ -183,7 +182,7 @@ def fun(ts: pytamer.tamer_classical_state,
else:
return res
heuristic_fun = fun
if problem.kind.has_continuous_time(): # type: ignore
if problem.kind.has_continuous_time():
pytamer.tamer_env_set_boolean_option(self._env, "simultaneity", 1)
pytamer.tamer_env_set_boolean_option(self._env, "ftp-deordering-plan", 1)
if self._heuristic is not None:
Expand Down Expand Up @@ -507,7 +506,7 @@ def _to_up_plan(self, problem: 'up.model.Problem',
for p in pytamer.tamer_ttplan_step_get_parameters(s):
params.append(converter.convert_back(p))
actions.append((start, up.plans.ActionInstance(action, tuple(params)), duration))
if problem.kind.has_continuous_time(): # type: ignore
if problem.kind.has_continuous_time():
return up.plans.TimeTriggeredPlan(actions, problem.environment)
else:
return up.plans.SequentialPlan([a[1] for a in actions], problem.environment)
Expand Down