Skip to content

Commit

Permalink
uncrustify
Browse files Browse the repository at this point in the history
  • Loading branch information
salome-eriksson committed Jul 16, 2024
1 parent 90b8f2c commit 63188c7
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion src/search/axioms.cc
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ AxiomEvaluator::AxiomEvaluator(const TaskProxy &task_proxy) {
assert(effect.value != variables[effect.var].get_default_axiom_value());
AxiomLiteral *eff_literal = &axiom_literals[effect.var][effect.value];
rules.emplace_back(
num_conditions, effect.var, effect.value, eff_literal);
num_conditions, effect.var, effect.value, eff_literal);
}

// Cross-reference rules and literals
Expand Down
2 changes: 1 addition & 1 deletion src/search/cartesian_abstractions/subtask_generators.cc
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class SortFactsByIncreasingHaddValues {
const shared_ptr<AbstractTask> &task)
: hadd(utils::make_unique_ptr<additive_heuristic::AdditiveHeuristic>(
tasks::AxiomHandlingType::APPROXIMATE_NEGATIVE, task,
false, "h^add within CEGAR abstractions",
false, "h^add within CEGAR abstractions",
utils::Verbosity::SILENT)) {
TaskProxy task_proxy(*task);
hadd->compute_heuristic_for_cegar(task_proxy.get_initial_state());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ LandmarkCostPartitioningHeuristic::LandmarkCostPartitioningHeuristic(
CostPartitioningMethod cost_partitioning, bool alm,
lp::LPSolverType lpsolver)
: LandmarkHeuristic(
axiom_handling, pref, transform, cache_estimates, description, verbosity) {
axiom_handling, pref, transform, cache_estimates, description, verbosity) {
if (log.is_at_least_normal()) {
log << "Initializing landmark cost partitioning heuristic..." << endl;
}
Expand Down
30 changes: 15 additions & 15 deletions src/search/tasks/default_value_axioms_task.cc
Original file line number Diff line number Diff line change
Expand Up @@ -399,27 +399,27 @@ shared_ptr<AbstractTask> get_default_value_axioms_task_if_needed(

void add_axioms_option_to_feature(plugins::Feature &feature) {
feature.add_option<AxiomHandlingType>(
"axioms",
"How to compute axioms that describe how the negated "
"(=default) value of a derived variable can be achieved.",
"approximate_negative_cycles");
"axioms",
"How to compute axioms that describe how the negated "
"(=default) value of a derived variable can be achieved.",
"approximate_negative_cycles");
}
std::tuple<AxiomHandlingType> get_axioms_arguments_from_options(
const plugins::Options &opts) {
const plugins::Options &opts) {
return make_tuple<AxiomHandlingType>(
opts.get<AxiomHandlingType>("axioms"));
}

static plugins::TypedEnumPlugin<AxiomHandlingType> _enum_plugin({
{"approximate_negative",
"Overapproximate negated axioms for all derived variables by "
"setting an empty condition, indicating the default value can "
"always be achieved for free."},
{"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."
"For all other derived variables, the negated axioms are computed"
"exactly."}
{"approximate_negative",
"Overapproximate negated axioms for all derived variables by "
"setting an empty condition, indicating the default value can "
"always be achieved for free."},
{"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."
"For all other derived variables, the negated axioms are computed"
"exactly."}
});
}
2 changes: 1 addition & 1 deletion src/search/tasks/default_value_axioms_task.h
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ extern std::shared_ptr<AbstractTask> get_default_value_axioms_task_if_needed(
AxiomHandlingType axiom_handling);
extern void add_axioms_option_to_feature(plugins::Feature &feature);
extern std::tuple<AxiomHandlingType> get_axioms_arguments_from_options(
const plugins::Options &opts);
const plugins::Options &opts);
}

#endif

0 comments on commit 63188c7

Please sign in to comment.