From 63188c70993d275a07f6d499564421bd931d908e Mon Sep 17 00:00:00 2001 From: Salome Eriksson Date: Tue, 16 Jul 2024 15:46:45 +0200 Subject: [PATCH] uncrustify --- src/search/axioms.cc | 2 +- .../subtask_generators.cc | 2 +- .../landmark_cost_partitioning_heuristic.cc | 2 +- src/search/tasks/default_value_axioms_task.cc | 30 +++++++++---------- src/search/tasks/default_value_axioms_task.h | 2 +- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/search/axioms.cc b/src/search/axioms.cc index 0551a9e9e5..235234e759 100644 --- a/src/search/axioms.cc +++ b/src/search/axioms.cc @@ -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 diff --git a/src/search/cartesian_abstractions/subtask_generators.cc b/src/search/cartesian_abstractions/subtask_generators.cc index 836a077184..ce38b099c6 100644 --- a/src/search/cartesian_abstractions/subtask_generators.cc +++ b/src/search/cartesian_abstractions/subtask_generators.cc @@ -36,7 +36,7 @@ class SortFactsByIncreasingHaddValues { const shared_ptr &task) : hadd(utils::make_unique_ptr( 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()); diff --git a/src/search/landmarks/landmark_cost_partitioning_heuristic.cc b/src/search/landmarks/landmark_cost_partitioning_heuristic.cc index cb2a99b16c..0c2ffb559b 100644 --- a/src/search/landmarks/landmark_cost_partitioning_heuristic.cc +++ b/src/search/landmarks/landmark_cost_partitioning_heuristic.cc @@ -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; } diff --git a/src/search/tasks/default_value_axioms_task.cc b/src/search/tasks/default_value_axioms_task.cc index 985cf6eedb..ae14a43855 100644 --- a/src/search/tasks/default_value_axioms_task.cc +++ b/src/search/tasks/default_value_axioms_task.cc @@ -399,27 +399,27 @@ shared_ptr get_default_value_axioms_task_if_needed( void add_axioms_option_to_feature(plugins::Feature &feature) { feature.add_option( - "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 get_axioms_arguments_from_options( - const plugins::Options &opts) { + const plugins::Options &opts) { return make_tuple( opts.get("axioms")); } static plugins::TypedEnumPlugin _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."} }); } diff --git a/src/search/tasks/default_value_axioms_task.h b/src/search/tasks/default_value_axioms_task.h index e6780d756e..d72cdd9e96 100644 --- a/src/search/tasks/default_value_axioms_task.h +++ b/src/search/tasks/default_value_axioms_task.h @@ -91,7 +91,7 @@ extern std::shared_ptr get_default_value_axioms_task_if_needed( AxiomHandlingType axiom_handling); extern void add_axioms_option_to_feature(plugins::Feature &feature); extern std::tuple get_axioms_arguments_from_options( - const plugins::Options &opts); + const plugins::Options &opts); } #endif