[issue1082] add more indirection to RelaxationHeuristics to mathc the…

… pattern.

src/search/heuristics/additive_heuristic.cc

@@ -148,6 +148,10 @@ void AdditiveHeuristic::compute_heuristic_for_cegar(const State &state) {
     compute_heuristic(state);
 }
 
+shared_ptr<tuple<shared_ptr<AbstractTask>, bool, string, utils::Verbosity>> get_additive_heuristic_parameters_from_options(const plugins::Options &opts) {
+    return relaxation_heuristic::get_relaxation_heuristic_parameters_from_options(opts);
+}
+
 class AdditiveHeuristicFeature : public plugins::TypedFeature<Evaluator, AdditiveHeuristic> {
 public:
     AdditiveHeuristicFeature() : TypedFeature("add") {

src/search/heuristics/additive_heuristic.h

@@ -83,6 +83,10 @@ class AdditiveHeuristic : public relaxation_heuristic::RelaxationHeuristic {
         return get_proposition(var, value)->cost;
     }
 };
+
+extern std::shared_ptr<std::tuple<std::shared_ptr<AbstractTask>, bool, std::string, utils::Verbosity>> get_additive_heuristic_parameters_from_options(const plugins::Options &opts);
+
+
 }
 
 #endif

src/search/heuristics/ff_heuristic.cc

@@ -97,7 +97,7 @@ class FFHeuristicFeature : public plugins::TypedFeature<Evaluator, FFHeuristic>
     virtual shared_ptr<FFHeuristic> create_component(
         const plugins::Options &opts, const utils::Context &) const override {
         return plugins::make_shared_from_args_tuple_and_args<FFHeuristic>(
-            Heuristic::get_heuristic_parameters_from_options(opts)
+                additive_heuristic::get_additive_heuristic_parameters_from_options(opts)
             );
     }
 };

src/search/heuristics/max_heuristic.cc

@@ -126,7 +126,7 @@ class HSPMaxHeuristicFeature : public plugins::TypedFeature<Evaluator, HSPMaxHeu
     virtual shared_ptr<HSPMaxHeuristic> create_component(
         const plugins::Options &opts, const utils::Context &) const override {
         return plugins::make_shared_from_args_tuple_and_args<HSPMaxHeuristic>(
-            Heuristic::get_heuristic_parameters_from_options(opts));
+                relaxation_heuristic::get_relaxation_heuristic_parameters_from_options(opts));
     }
 };
 

src/search/heuristics/relaxation_heuristic.cc

@@ -305,4 +305,9 @@ void RelaxationHeuristic::simplify() {
         log << " done! [" << unary_operators.size() << " unary operators]" << endl;
     }
 }
+
+shared_ptr<tuple<shared_ptr<AbstractTask>, bool, string, utils::Verbosity>> get_relaxation_heuristic_parameters_from_options(const plugins::Options &opts) {
+    return Heuristic::get_heuristic_parameters_from_options(opts);
+}
+
 }

src/search/heuristics/relaxation_heuristic.h

@@ -118,6 +118,8 @@ class RelaxationHeuristic : public Heuristic {
 
     virtual bool dead_ends_are_reliable() const override;
 };
+
+    std::shared_ptr<std::tuple<std::shared_ptr<AbstractTask>, bool, std::string, utils::Verbosity>> get_relaxation_heuristic_parameters_from_options(const plugins::Options &opts);
 }
 
 #endif