From 720f0583e7329ee6dfcf572379ba80855faef8e5 Mon Sep 17 00:00:00 2001 From: Simon Dold Date: Fri, 9 Feb 2024 12:17:24 +0100 Subject: [PATCH] [issue1082] style. --- .../additive_cartesian_heuristic.cc | 4 ++-- src/search/heuristic.h | 2 +- .../operator_counting/delete_relaxation_constraints.cc | 4 ++-- src/search/pruning/limited_pruning.cc | 8 ++++---- src/search/pruning/stubborn_sets_atom_centric.h | 2 +- src/search/utils/tuples.h | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/search/cartesian_abstractions/additive_cartesian_heuristic.cc b/src/search/cartesian_abstractions/additive_cartesian_heuristic.cc index af4e44e40a..1013d7750e 100644 --- a/src/search/cartesian_abstractions/additive_cartesian_heuristic.cc +++ b/src/search/cartesian_abstractions/additive_cartesian_heuristic.cc @@ -45,8 +45,8 @@ AdditiveCartesianHeuristic::AdditiveCartesianHeuristic( const std::string &description, utils::Verbosity verbosity) : Heuristic(transform, cache_estimates, description, verbosity), heuristic_functions(generate_heuristic_functions( - subtasks, max_states, max_transitions, max_time, pick, - use_general_costs, random_seed, transform, log)) { + subtasks, max_states, max_transitions, max_time, pick, + use_general_costs, random_seed, transform, log)) { } int AdditiveCartesianHeuristic::compute_heuristic(const State &ancestor_state) { diff --git a/src/search/heuristic.h b/src/search/heuristic.h index 9f0231c46c..b44609a17f 100644 --- a/src/search/heuristic.h +++ b/src/search/heuristic.h @@ -96,5 +96,5 @@ class Heuristic : public Evaluator { extern void add_heuristic_options_to_feature( plugins::Feature &feature, const std::string &description); extern std::tuple, bool, std::string, utils::Verbosity> - get_heuristic_arguments_from_options(const plugins::Options &opts); +get_heuristic_arguments_from_options(const plugins::Options &opts); #endif diff --git a/src/search/operator_counting/delete_relaxation_constraints.cc b/src/search/operator_counting/delete_relaxation_constraints.cc index 54bbbbe20f..538c92cd05 100644 --- a/src/search/operator_counting/delete_relaxation_constraints.cc +++ b/src/search/operator_counting/delete_relaxation_constraints.cc @@ -285,8 +285,8 @@ class DeleteRelaxationConstraintsFeature : public plugins::TypedFeature create_component( const plugins::Options &options, const utils::Context &) const override { return make_shared( - options.get("use_time_vars"), - options.get("use_integer_vars")); + options.get("use_time_vars"), + options.get("use_integer_vars")); } }; diff --git a/src/search/pruning/limited_pruning.cc b/src/search/pruning/limited_pruning.cc index ad2cbe5e0f..f5cbf7bbd7 100644 --- a/src/search/pruning/limited_pruning.cc +++ b/src/search/pruning/limited_pruning.cc @@ -7,10 +7,10 @@ using namespace std; namespace limited_pruning { LimitedPruning::LimitedPruning( - const shared_ptr &pruning, - double min_required_pruning_ratio, - int expansions_before_checking_pruning_ratio, - utils::Verbosity verbosity) + const shared_ptr &pruning, + double min_required_pruning_ratio, + int expansions_before_checking_pruning_ratio, + utils::Verbosity verbosity) : PruningMethod(verbosity), pruning_method(pruning), min_required_pruning_ratio(min_required_pruning_ratio), diff --git a/src/search/pruning/stubborn_sets_atom_centric.h b/src/search/pruning/stubborn_sets_atom_centric.h index 7ce6b85a77..f19ce8a595 100644 --- a/src/search/pruning/stubborn_sets_atom_centric.h +++ b/src/search/pruning/stubborn_sets_atom_centric.h @@ -52,7 +52,7 @@ class StubbornSetsAtomCentric : public stubborn_sets::StubbornSets { virtual void compute_stubborn_set(const State &state) override; public: explicit StubbornSetsAtomCentric(bool use_sibling_shortcut, - AtomSelectionStrategy atom_selection_strategy, utils::Verbosity verbosity); + AtomSelectionStrategy atom_selection_strategy, utils::Verbosity verbosity); virtual void initialize(const std::shared_ptr &task) override; }; } diff --git a/src/search/utils/tuples.h b/src/search/utils/tuples.h index 567b80a634..3d2626c371 100644 --- a/src/search/utils/tuples.h +++ b/src/search/utils/tuples.h @@ -4,7 +4,7 @@ #include namespace utils { -template +template auto flatten_tuple_elements(std::tuple &&t, std::index_sequence); template @@ -12,13 +12,13 @@ auto flatten_tuple(T &&t) { return std::make_tuple(std::move(t)); } -template +template auto flatten_tuple(std::tuple &&t) { constexpr auto tuple_size = std::tuple_size>::value; return flatten_tuple_elements(std::move(t), std::make_index_sequence()); } -template +template auto flatten_tuple_elements(std::tuple &&t, std::index_sequence) { return std::tuple_cat(flatten_tuple(std::get(std::move(t)))...); }