[issue1082] Jendriks requested changes

src/search/evaluator.cc

@@ -9,16 +9,17 @@
 using namespace std;
 
 
-Evaluator::Evaluator(bool use_for_reporting_minima,
-                     bool use_for_boosting,
-                     bool use_for_counting_evaluations,
-                     const string &name,
-                     utils::Verbosity verbosity)
+Evaluator::Evaluator(
+    bool use_for_reporting_minima,
+    bool use_for_boosting,
+    bool use_for_counting_evaluations,
+    const string &name,
+    utils::Verbosity verbosity)
     : name(name),
       use_for_reporting_minima(use_for_reporting_minima),
       use_for_boosting(use_for_boosting),
       use_for_counting_evaluations(use_for_counting_evaluations),
-      log(utils::get_log_from_verbosity(verbosity)) {
+      log(utils::get_log_for_verbosity(verbosity)) {
 }
 
 

src/search/evaluator.h

@@ -22,7 +22,7 @@ class Evaluator {
 protected:
     mutable utils::LogProxy log;
 public:
-    explicit Evaluator(
+    Evaluator(
         bool use_for_reporting_minima,
         bool use_for_boosting,
         bool use_for_counting_evaluations,

src/search/heuristic.cc

@@ -17,8 +17,7 @@ Heuristic::Heuristic(
     shared_ptr<AbstractTask> transform,
     bool cache_estimates,
     const string &name,
-    utils::Verbosity verbosity
-    )
+    utils::Verbosity verbosity)
     : Evaluator(true, true, true, name, verbosity),
       heuristic_cache(HEntry(NO_VALUE, true)),     //TODO: is true really a good idea here?
       cache_evaluator_values(cache_estimates),

src/search/heuristic.h

@@ -73,10 +73,11 @@ class Heuristic : public Evaluator {
     State convert_ancestor_state(const State &ancestor_state) const;
 
 public:
-    explicit Heuristic(std::shared_ptr<AbstractTask> transform,
-                       bool cache_estimates,
-                       const std::string &name,
-                       utils::Verbosity verbosity);
+    Heuristic(
+        std::shared_ptr<AbstractTask> transform,
+        bool cache_estimates,
+        const std::string &name,
+        utils::Verbosity verbosity);
     explicit Heuristic(const plugins::Options &opts);
     virtual ~Heuristic() override;
 

src/search/heuristics/additive_heuristic.cc

@@ -13,11 +13,11 @@ using namespace std;
 namespace additive_heuristic {
 const int AdditiveHeuristic::MAX_COST_VALUE;
 
-AdditiveHeuristic::AdditiveHeuristic(const shared_ptr<AbstractTask> &transform,
-                                     bool cache_estimates,
-                                     const string &name,
-                                     utils::Verbosity verbosity
-                                     )
+AdditiveHeuristic::AdditiveHeuristic(
+    const shared_ptr<AbstractTask> &transform,
+    bool cache_estimates,
+    const string &name,
+    utils::Verbosity verbosity)
     : RelaxationHeuristic(transform, cache_estimates, name, verbosity),
       did_write_overflow_warning(false) {
     if (log.is_at_least_normal()) {

src/search/heuristics/additive_heuristic.h

@@ -65,10 +65,11 @@ class AdditiveHeuristic : public relaxation_heuristic::RelaxationHeuristic {
     // Common part of h^add and h^ff computation.
     int compute_add_and_ff(const State &state);
 public:
-    AdditiveHeuristic(const std::shared_ptr<AbstractTask> &transform,
-                      bool cache_estimates,
-                      const std::string &name,
-                      utils::Verbosity verbosity);
+    AdditiveHeuristic(
+        const std::shared_ptr<AbstractTask> &transform,
+        bool cache_estimates,
+        const std::string &name,
+        utils::Verbosity verbosity);
 
     /*
       TODO: The two methods below are temporarily needed for the CEGAR

src/search/heuristics/blind_search_heuristic.cc

@@ -12,11 +12,11 @@
 using namespace std;
 
 namespace blind_search_heuristic {
-BlindSearchHeuristic::BlindSearchHeuristic(const shared_ptr<AbstractTask> &transform,
-                                           bool cache_estimates,
-                                           const string &name,
-                                           utils::Verbosity verbosity
-                                           )
+BlindSearchHeuristic::BlindSearchHeuristic(
+    const shared_ptr<AbstractTask> &transform,
+    bool cache_estimates,
+    const string &name,
+    utils::Verbosity verbosity)
     : Heuristic(transform, cache_estimates, name, verbosity),
       min_operator_cost(task_properties::get_min_operator_cost(task_proxy)) {
     if (log.is_at_least_normal()) {

src/search/heuristics/blind_search_heuristic.h

@@ -9,10 +9,11 @@ class BlindSearchHeuristic : public Heuristic {
 protected:
     virtual int compute_heuristic(const State &ancestor_state) override;
 public:
-    BlindSearchHeuristic(const std::shared_ptr<AbstractTask> &transform,
-                         bool cache_estimates,
-                         const std::string &name,
-                         utils::Verbosity verbosity);
+    BlindSearchHeuristic(
+        const std::shared_ptr<AbstractTask> &transform,
+        bool cache_estimates,
+        const std::string &name,
+        utils::Verbosity verbosity);
     ~BlindSearchHeuristic();
 };
 }

src/search/heuristics/ff_heuristic.cc

@@ -11,11 +11,11 @@ using namespace std;
 
 namespace ff_heuristic {
 // construction and destruction
-FFHeuristic::FFHeuristic(const shared_ptr<AbstractTask> &transform,
-                         bool cache_estimates,
-                         const string &name,
-                         utils::Verbosity verbosity
-                         )
+FFHeuristic::FFHeuristic(
+    const shared_ptr<AbstractTask> &transform,
+    bool cache_estimates,
+    const string &name,
+    utils::Verbosity verbosity)
     : AdditiveHeuristic(transform, cache_estimates, name, verbosity),
       relaxed_plan(task_proxy.get_operators().size(), false) {
     if (log.is_at_least_normal()) {

src/search/heuristics/ff_heuristic.h

@@ -32,10 +32,11 @@ class FFHeuristic : public additive_heuristic::AdditiveHeuristic {
 protected:
     virtual int compute_heuristic(const State &ancestor_state) override;
 public:
-    explicit FFHeuristic(const std::shared_ptr<AbstractTask> &transform,
-                         bool cache_estimates,
-                         const std::string &name,
-                         utils::Verbosity verbosity);
+    FFHeuristic(
+        const std::shared_ptr<AbstractTask> &transform,
+        bool cache_estimates,
+        const std::string &name,
+        utils::Verbosity verbosity);
 };
 }
 

src/search/heuristics/max_heuristic.cc

@@ -22,11 +22,11 @@ namespace max_heuristic {
  */
 
 // construction and destruction
-HSPMaxHeuristic::HSPMaxHeuristic(const shared_ptr<AbstractTask> &transform,
-                                 bool cache_estimates,
-                                 const string &name,
-                                 utils::Verbosity verbosity
-                                 )
+HSPMaxHeuristic::HSPMaxHeuristic(
+    const shared_ptr<AbstractTask> &transform,
+    bool cache_estimates,
+    const string &name,
+    utils::Verbosity verbosity)
     : RelaxationHeuristic(transform, cache_estimates, name, verbosity) {
     if (log.is_at_least_normal()) {
         log << "Initializing HSP max heuristic..." << endl;

src/search/heuristics/max_heuristic.h

@@ -33,10 +33,11 @@ class HSPMaxHeuristic : public relaxation_heuristic::RelaxationHeuristic {
 protected:
     virtual int compute_heuristic(const State &ancestor_state) override;
 public:
-    explicit HSPMaxHeuristic(const std::shared_ptr<AbstractTask> &transform,
-                             bool cache_estimates,
-                             const std::string &name,
-                             utils::Verbosity verbosity);
+    HSPMaxHeuristic(
+        const std::shared_ptr<AbstractTask> &transform,
+        bool cache_estimates,
+        const std::string &name,
+        utils::Verbosity verbosity);
 };
 }
 

src/search/heuristics/relaxation_heuristic.cc

@@ -35,11 +35,11 @@ UnaryOperator::UnaryOperator(
 
 
 // construction and destruction
-RelaxationHeuristic::RelaxationHeuristic(const shared_ptr<AbstractTask> &transform,
-                                         bool cache_estimates,
-                                         const string &name,
-                                         utils::Verbosity verbosity
-                                         )
+RelaxationHeuristic::RelaxationHeuristic(
+    const shared_ptr<AbstractTask> &transform,
+    bool cache_estimates,
+    const string &name,
+    utils::Verbosity verbosity)
     : Heuristic(transform, cache_estimates, name, verbosity) {
     // Build propositions.
     propositions.resize(task_properties::get_num_facts(task_proxy));

src/search/heuristics/relaxation_heuristic.h

@@ -110,10 +110,11 @@ class RelaxationHeuristic : public Heuristic {
     Proposition *get_proposition(int var, int value);
     Proposition *get_proposition(const FactProxy &fact);
 public:
-    RelaxationHeuristic(const std::shared_ptr<AbstractTask> &transform,
-                        bool cache_estimates,
-                        const std::string &name,
-                        utils::Verbosity verbosity);
+    RelaxationHeuristic(
+        const std::shared_ptr<AbstractTask> &transform,
+        bool cache_estimates,
+        const std::string &name,
+        utils::Verbosity verbosity);
 
     virtual bool dead_ends_are_reliable() const override;
 };

src/search/utils/logging.cc

@@ -29,7 +29,7 @@ void add_log_options_to_feature(plugins::Feature &feature) {
         "normal");
 }
 
-LogProxy get_log_from_verbosity(const Verbosity &verbosity) {
+LogProxy get_log_for_verbosity(const Verbosity &verbosity) {
     if (verbosity == Verbosity::NORMAL) {
         return LogProxy(global_log);
     }

src/search/utils/logging.h

@@ -130,7 +130,7 @@ class LogProxy {
 extern LogProxy g_log;
 
 extern void add_log_options_to_feature(plugins::Feature &feature);
-extern LogProxy get_log_from_verbosity(const Verbosity &verbosity);
+extern LogProxy get_log_for_verbosity(const Verbosity &verbosity);
 extern LogProxy get_log_from_options(const plugins::Options &options);
 extern LogProxy get_silent_log();