Skip to content

Commit

Permalink
Update documentation for heuristics that now safely support axioms.
Browse files Browse the repository at this point in the history
  • Loading branch information
salome-eriksson committed Sep 17, 2024
1 parent f39b35b commit e430a0f
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 34 deletions.
8 changes: 2 additions & 6 deletions src/search/heuristics/additive_heuristic.cc
Original file line number Diff line number Diff line change
Expand Up @@ -159,15 +159,11 @@ class AdditiveHeuristicFeature

document_language_support("action costs", "supported");
document_language_support("conditional effects", "supported");
document_language_support(
"axioms",
"supported (in the sense that the planner won't complain -- "
"handling of axioms might be very stupid "
"and even render the heuristic unsafe)");
document_language_support("axioms", "supported");

document_property("admissible", "no");
document_property("consistent", "no");
document_property("safe", "yes for tasks without axioms");
document_property("safe", "yes");
document_property("preferred operators", "yes");
}

Expand Down
6 changes: 1 addition & 5 deletions src/search/heuristics/cea_heuristic.cc
Original file line number Diff line number Diff line change
Expand Up @@ -458,11 +458,7 @@ class ContextEnhancedAdditiveHeuristicFeature

document_language_support("action costs", "supported");
document_language_support("conditional effects", "supported");
document_language_support(
"axioms",
"supported (in the sense that the planner won't complain -- "
"handling of axioms might be very stupid "
"and even render the heuristic unsafe)");
document_language_support("axioms", "supported");

document_property("admissible", "no");
document_property("consistent", "no");
Expand Down
6 changes: 1 addition & 5 deletions src/search/heuristics/cg_heuristic.cc
Original file line number Diff line number Diff line change
Expand Up @@ -303,11 +303,7 @@ class CGHeuristicFeature

document_language_support("action costs", "supported");
document_language_support("conditional effects", "supported");
document_language_support(
"axioms",
"supported (in the sense that the planner won't complain -- "
"handling of axioms might be very stupid "
"and even render the heuristic unsafe)");
document_language_support("axioms", "supported");

document_property("admissible", "no");
document_property("consistent", "no");
Expand Down
8 changes: 2 additions & 6 deletions src/search/heuristics/ff_heuristic.cc
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,11 @@ class FFHeuristicFeature

document_language_support("action costs", "supported");
document_language_support("conditional effects", "supported");
document_language_support(
"axioms",
"supported (in the sense that the planner won't complain -- "
"handling of axioms might be very stupid "
"and even render the heuristic unsafe)");
document_language_support("axioms", "supported");

document_property("admissible", "no");
document_property("consistent", "no");
document_property("safe", "yes for tasks without axioms");
document_property("safe", "yes");
document_property("preferred operators", "yes");
}

Expand Down
8 changes: 2 additions & 6 deletions src/search/heuristics/max_heuristic.cc
Original file line number Diff line number Diff line change
Expand Up @@ -113,15 +113,11 @@ class HSPMaxHeuristicFeature

document_language_support("action costs", "supported");
document_language_support("conditional effects", "supported");
document_language_support(
"axioms",
"supported (in the sense that the planner won't complain -- "
"handling of axioms might be very stupid "
"and even render the heuristic unsafe)");
document_language_support("axioms", "supported");

document_property("admissible", "yes for tasks without axioms");
document_property("consistent", "yes for tasks without axioms");
document_property("safe", "yes for tasks without axioms");
document_property("safe", "yes");
document_property("preferred operators", "no");
}

Expand Down
7 changes: 3 additions & 4 deletions src/search/landmarks/landmark_sum_heuristic.cc
Original file line number Diff line number Diff line change
Expand Up @@ -185,15 +185,14 @@ class LandmarkSumHeuristicFeature
"conditional_effects",
"supported if the LandmarkFactory supports them; otherwise "
"ignored");
document_language_support("axioms", "ignored");
document_language_support("axioms", "supported");

document_property("admissible", "no");
document_property("consistent", "no");
document_property(
"safe",
"yes except on tasks with axioms or on tasks with "
"conditional effects when using a LandmarkFactory "
"not supporting them");
"yes except on tasks with conditional effects when "
"using a LandmarkFactory not supporting them");
}

virtual shared_ptr<LandmarkSumHeuristic> create_component(
Expand Down
4 changes: 2 additions & 2 deletions src/search/tasks/default_value_axioms_task.cc
Original file line number Diff line number Diff line change
Expand Up @@ -421,9 +421,9 @@ static plugins::TypedEnumPlugin<AxiomHandlingType> _enum_plugin({
{"approximate_negative_cycles",
"Overapproximate negated axioms for all derived variables which "
"have cyclic dependencies by setting an empty condition, "
"indicating the default value can always be achieved for free."
"indicating the default value can always be achieved for free. "
"For all other derived variables, the negated axioms are computed"
"exactly. Note that this can potentially lead to a combinatorial "
"explosion"}
"explosion."}
});
}

0 comments on commit e430a0f

Please sign in to comment.