small fixes

aibasel · Feb 8, 2024 · 0452fb9 · 0452fb9
1 parent 7aa2c45
commit 0452fb9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 17 deletions.
diff --git a/src/search/heuristic.cc b/src/search/heuristic.cc
@@ -55,19 +55,6 @@ void add_heuristic_options_to_feature(plugins::Feature &feature, const string &d
     add_evaluator_options_to_feature(feature, description);
 }
 
-/*
-// TODO 1082 remove this, just keep the one above
-void add_options_to_feature(plugins::Feature &feature) {
-    feature.add_option<shared_ptr<AbstractTask>>(
-        "transform",
-        "Optional task transformation for the heuristic."
-        " Currently, adapt_costs() and no_transform() are available.",
-        "no_transform()");
-    feature.add_option<bool>("cache_estimates", "cache heuristic estimates", "true");
-    add_evaluator_options_to_feature(feature);
-}
-*/
-
 tuple<shared_ptr<AbstractTask>, bool, string, utils::Verbosity> get_heuristic_arguments_from_options(const plugins::Options &opts) {
     return tuple_cat(
         make_tuple(

diff --git a/src/search/heuristic.h b/src/search/heuristic.h
@@ -93,7 +93,8 @@ class Heuristic : public Evaluator {
     virtual int get_cached_estimate(const State &state) const override;
 };
 
-extern void add_heuristic_options_to_feature(plugins::Feature &feature, const std::string &description);
-extern void add_options_to_feature(plugins::Feature &feature); // TODO 1082 remove this, just keep the one above
-extern std::tuple<std::shared_ptr<AbstractTask>, bool, std::string, utils::Verbosity> get_heuristic_arguments_from_options(const plugins::Options &opts);
+extern void add_heuristic_options_to_feature(
+    plugins::Feature &feature, const std::string &description);
+extern std::tuple<std::shared_ptr<AbstractTask>, bool, std::string, utils::Verbosity>
+    get_heuristic_arguments_from_options(const plugins::Options &opts);
 #endif
diff --git a/src/search/pdbs/pattern_collection_generator_multiple_cegar.cc b/src/search/pdbs/pattern_collection_generator_multiple_cegar.cc
@@ -79,7 +79,7 @@ class PatternCollectionGeneratorMultipleCegarFeature : public plugins::TypedFeat
     virtual shared_ptr<PatternCollectionGeneratorMultipleCegar> create_component(
         const plugins::Options &opts, const utils::Context &) const override {
         return plugins::make_shared_from_arg_tuples<PatternCollectionGeneratorMultipleCegar>(
-            opts.get<bool>("use_wildcard_plans"),
+            get_cegar_wildcard_arguments_from_options(opts),
             get_multiple_arguments_from_options(opts)
             );
     }