[main] uncrustify: set indent_align_assign=false and re-uncrustify

Author: maltehelmert

.uncrustify.cfg

@@ -48,7 +48,7 @@ indent_comma_paren=false
 indent_bool_paren=false
 indent_square_nl=false
 indent_preserve_sql=false
-indent_align_assign=true
+indent_align_assign=false
 sp_balance_nested_parens=false
 align_keep_tabs=false
 align_with_tabs=false

experiments/issue269/rng-microbenchmark/old_rng.cc

@@ -58,7 +58,7 @@ void OldRandomNumberGenerator::seed(unsigned int *init_key, int key_length) {
     seed(19650218UL);
     for (; k; --k) {
         mt[i] = (mt[i] ^ ((mt[i - 1] ^ (mt[i - 1] >> 30)) * 1664525UL)) +
-                init_key[j] + j;
+            init_key[j] + j;
         mt[i] &= 0xffffffffUL;
         ++i;
         ++j;

src/search/cegar/abstract_search.cc

@@ -73,8 +73,8 @@ AbstractState *AbstractSearch::astar_search(
             return state;
         }
         const Transitions &transitions = forward ?
-                                         state->get_outgoing_transitions() :
-                                         state->get_incoming_transitions();
+            state->get_outgoing_transitions() :
+            state->get_incoming_transitions();
         for (const Transition &transition : transitions) {
             int op_id = transition.op_id;
             AbstractState *successor = transition.target;

src/search/heuristics/cea_heuristic.cc

@@ -153,8 +153,8 @@ LocalProblem *ContextEnhancedAdditiveHeuristic::build_problem_for_variable(
             LocalProblemNode &target = problem->nodes[target_value];
             for (const ValueTransitionLabel &label : dtg_trans.labels) {
                 OperatorProxy op = label.is_axiom ?
-                                   task_proxy.get_axioms()[label.op_id] :
-                                   task_proxy.get_operators()[label.op_id];
+                    task_proxy.get_axioms()[label.op_id] :
+                    task_proxy.get_operators()[label.op_id];
                 LocalTransition trans(&node, &target, &label, op.get_cost());
                 node.outgoing_transitions.push_back(trans);
             }
@@ -365,8 +365,8 @@ void ContextEnhancedAdditiveHeuristic::mark_helpful_transitions(
             // Transition possibly applicable.
             const ValueTransitionLabel &label = *first_on_path->label;
             OperatorProxy op = label.is_axiom ?
-                               task_proxy.get_axioms()[label.op_id] :
-                               task_proxy.get_operators()[label.op_id];
+                task_proxy.get_axioms()[label.op_id] :
+                task_proxy.get_operators()[label.op_id];
             if (min_action_cost != 0 || task_properties::is_applicable(op, state)) {
                 // If there are no zero-cost actions, the target_cost/
                 // action_cost test above already guarantees applicability.

src/search/heuristics/cg_heuristic.cc

@@ -150,8 +150,8 @@ int CGHeuristic::get_transition_cost(const State &state,
                 // Scan labels of the transition.
                 for (ValueTransitionLabel &label : transition.labels) {
                     OperatorProxy op = label.is_axiom ?
-                                       task_proxy.get_axioms()[label.op_id] :
-                                       task_proxy.get_operators()[label.op_id];
+                        task_proxy.get_axioms()[label.op_id] :
+                        task_proxy.get_operators()[label.op_id];
                     int new_distance = source_distance + op.get_cost();
                     for (LocalAssignment &assignment : label.precond) {
                         if (new_distance >= *target_distance_ptr)
@@ -268,8 +268,8 @@ void CGHeuristic::mark_helpful_transitions(const State &state,
     }
 
     OperatorProxy op = helpful->is_axiom ?
-                       task_proxy.get_axioms()[helpful->op_id] :
-                       task_proxy.get_operators()[helpful->op_id];
+        task_proxy.get_axioms()[helpful->op_id] :
+        task_proxy.get_operators()[helpful->op_id];
     if (cost == op.get_cost() &&
         !op.is_axiom() &&
         task_properties::is_applicable(op, state)) {

src/search/landmarks/exploration.cc

@@ -228,7 +228,7 @@ void Exploration::relaxed_exploration(bool use_h_max, bool level_out) {
             assert(unary_op->unsatisfied_preconditions >= 0);
             if (unary_op->unsatisfied_preconditions == 0) {
                 int depth = unary_op->is_induced_by_axiom(task_proxy)
-                            ? unary_op->depth : unary_op->depth + 1;
+                    ? unary_op->depth : unary_op->depth + 1;
                 if (use_h_max)
                     enqueue_if_necessary(unary_op->effect, unary_op->h_max_cost,
                                          depth, unary_op, use_h_max);

src/search/merge_and_shrink/merge_scoring_function_miasm.cc

@@ -62,7 +62,7 @@ vector<double> MergeScoringFunctionMIASM::compute_scores(
         */
         assert(num_states);
         double score = static_cast<double>(alive_states_count) /
-                       static_cast<double>(num_states);
+            static_cast<double>(num_states);
         scores.push_back(score);
     }
     return scores;

src/search/options/plugin.h

@@ -56,11 +56,11 @@ class Plugin {
         Registry<T *>::instance()->insert(key, factory);
         // See comment in PluginShared.
         DocFactory doc_factory = [factory](OptionParser &parser) {
-                                     factory(parser);
-                                 };
+                factory(parser);
+            };
         PluginTypeNameGetter type_name_factory = [&]() {
-                                                     return TypeNamer<T *>::name();
-                                                 };
+                return TypeNamer<T *>::name();
+            };
         DocStore::instance()->register_plugin(key, doc_factory, type_name_factory, group);
     }
     ~Plugin() = default;
@@ -85,11 +85,11 @@ class PluginShared {
           call them later, after all PluginType objects have been constructed.
         */
         DocFactory doc_factory = [factory](OptionParser &parser) {
-                                     factory(parser);
-                                 };
+                factory(parser);
+            };
         PluginTypeNameGetter type_name_factory = [&]() {
-                                                     return TypeNamer<TPtr>::name();
-                                                 };
+                return TypeNamer<TPtr>::name();
+            };
         DocStore::instance()->register_plugin(key, doc_factory, type_name_factory, group);
     }
     ~PluginShared() = default;

src/search/pdbs/pattern_collection_generator_genetic.cc

@@ -57,7 +57,7 @@ void PatternCollectionGeneratorGenetic::select(
             // Find first entry which is strictly greater than random.
             selected = upper_bound(cumulative_fitness.begin(),
                                    cumulative_fitness.end(), random) -
-                       cumulative_fitness.begin();
+                cumulative_fitness.begin();
         }
         new_pattern_collections.push_back(pattern_collections[selected]);
     }

src/search/search_engines/enforced_hill_climbing_search.cc

@@ -81,7 +81,7 @@ EnforcedHillClimbingSearch::EnforcedHillClimbingSearch(
     }
     use_preferred = find(preferred_operator_evaluators.begin(),
                          preferred_operator_evaluators.end(), evaluator) !=
-                    preferred_operator_evaluators.end();
+        preferred_operator_evaluators.end();
 
     open_list = create_ehc_open_list_factory(
         use_preferred, preferred_usage)->create_edge_open_list();
@@ -163,7 +163,7 @@ void EnforcedHillClimbingSearch::expand(EvaluationContext &eval_context) {
             eval_context.get_state(), successor_operators);
         for (OperatorID op_id : successor_operators) {
             bool preferred = use_preferred &&
-                             preferred_operators.contains(op_id);
+                preferred_operators.contains(op_id);
             insert_successor_into_open_list(
                 eval_context, node_g, op_id, preferred);
         }
@@ -197,7 +197,7 @@ SearchStatus EnforcedHillClimbingSearch::ehc() {
 
         // d: distance from initial node in this EHC phase
         int d = parent_node.get_g() - current_phase_start_g +
-                get_adjusted_cost(last_op);
+            get_adjusted_cost(last_op);
 
         if (parent_node.get_real_g() + last_op.get_cost() >= bound)
             continue;

src/search/search_engines/lazy_search.cc

@@ -155,7 +155,7 @@ SearchStatus LazySearch::step() {
 
     SearchNode node = search_space.get_node(current_state);
     bool reopen = reopen_closed_nodes && !node.is_new() &&
-                  !node.is_dead_end() && (current_g < node.get_g());
+        !node.is_dead_end() && (current_g < node.get_g());
 
     if (node.is_new() || reopen) {
         if (current_operator_id != OperatorID::no_operator) {

src/search/task_utils/sampling.h

@@ -39,8 +39,8 @@ std::vector<State> sample_states_with_random_walks(
     double average_operator_cost,
     utils::RandomNumberGenerator &rng,
     std::function<bool(State)> is_dead_end = [] (const State &) {
-                                                 return false;
-                                             },
+            return false;
+        },
     const utils::CountdownTimer *timer = nullptr);
 }