Issue559 prototype

build_configs.py

@@ -3,6 +3,7 @@
 # USE_GLIBCXX_DEBUG is not compatible with USE_LP (see issue983).
 glibcxx_debug = ["-DCMAKE_BUILD_TYPE=Debug", "-DUSE_LP=NO", "-DUSE_GLIBCXX_DEBUG=YES"]
 minimal = ["-DCMAKE_BUILD_TYPE=Release", "-DDISABLE_PLUGINS_BY_DEFAULT=YES"]
+prototype = ["-DCMAKE_BUILD_TYPE=Release", "-DDISABLE_PLUGINS_BY_DEFAULT=YES", "-DPLUGIN_BLIND_SEARCH_HEURISTIC_ENABLED=YES", "-DPLUGIN_PLUGIN_ASTAR_ENABLED=YES", "-DPLUGIN_LANDMARK_CUT_HEURISTIC_ENABLED=YES"]
 
-DEFAULT = "release"
+DEFAULT = "prototype" # "release"
 DEBUG = "debug"

src/search/DownwardFiles.cmake

@@ -54,8 +54,10 @@ fast_downward_plugin(
         evaluation_context
         evaluation_result
         evaluator
+        evaluator_builder
         evaluator_cache
         heuristic
+        heuristic_builder
         open_list
         open_list_factory
         operator_cost
@@ -68,8 +70,14 @@ fast_downward_plugin(
         per_task_information
         plan_manager
         plugin
+        plugin_builder
+        plugin_let_builder
+        plugin_variable_builder
+        plugin_variable_assignment
         pruning_method
+        pruning_method_builder
         search_engine
+        search_engine_builder
         search_node_info
         search_progress
         search_space
@@ -263,11 +271,21 @@ fast_downward_plugin(
     DEPENDS EVALUATORS_PLUGIN_GROUP
 )
 
+fast_downward_plugin(
+    NAME COST_ADAPTED_EVALUATOR
+    HELP "Cost-adapted evaluator"
+    SOURCES
+        evaluators/cost_adapted_evaluator_builder
+    DEPENDS EVALUATORS_PLUGIN_GROUP
+    CORE_PLUGIN
+)
+
 fast_downward_plugin(
     NAME G_EVALUATOR
     HELP "The g-evaluator"
     SOURCES
         evaluators/g_evaluator
+        evaluators/g_evaluator_builder
     DEPENDS EVALUATORS_PLUGIN_GROUP
 )
 
@@ -276,6 +294,7 @@ fast_downward_plugin(
     HELP "The combining evaluator"
     SOURCES
         evaluators/combining_evaluator
+        evaluators/combining_evaluator_builder
     DEPENDENCY_ONLY
 )
 
@@ -300,6 +319,7 @@ fast_downward_plugin(
     HELP "The weighted evaluator"
     SOURCES
         evaluators/weighted_evaluator
+        evaluators/weighted_evaluator_builder
     DEPENDS EVALUATORS_PLUGIN_GROUP
 )
 
@@ -308,6 +328,7 @@ fast_downward_plugin(
     HELP "The sum evaluator"
     SOURCES
         evaluators/sum_evaluator
+        evaluators/sum_evaluator_builder
     DEPENDS COMBINING_EVALUATOR EVALUATORS_PLUGIN_GROUP
 )
 
@@ -316,6 +337,7 @@ fast_downward_plugin(
     HELP "Pruning method that does nothing"
     SOURCES
         pruning/null_pruning_method
+        pruning/null_pruning_method_builder
     DEPENDENCY_ONLY
 )
 
@@ -357,7 +379,7 @@ fast_downward_plugin(
     HELP "Basic classes used for all search engines"
     SOURCES
         search_engines/search_common
-    DEPENDS ALTERNATION_OPEN_LIST G_EVALUATOR BEST_FIRST_OPEN_LIST SUM_EVALUATOR TIEBREAKING_OPEN_LIST WEIGHTED_EVALUATOR
+    DEPENDS G_EVALUATOR BEST_FIRST_OPEN_LIST SUM_EVALUATOR TIEBREAKING_OPEN_LIST #ALTERNATION_OPEN_LIST WEIGHTED_EVALUATOR
     DEPENDENCY_ONLY
 )
 
@@ -366,6 +388,7 @@ fast_downward_plugin(
     HELP "Eager search algorithm"
     SOURCES
         search_engines/eager_search
+        search_engines/eager_search_builder
     DEPENDS NULL_PRUNING_METHOD ORDERED_SET SUCCESSOR_GENERATOR
     DEPENDENCY_ONLY
 )
@@ -481,6 +504,7 @@ fast_downward_plugin(
     HELP "The 'blind search' heuristic"
     SOURCES
         heuristics/blind_search_heuristic
+        heuristics/blind_search_heuristic_builder
     DEPENDS TASK_PROPERTIES
 )
 
@@ -536,6 +560,7 @@ fast_downward_plugin(
     HELP "The LM-cut heuristic"
     SOURCES
         heuristics/lm_cut_heuristic
+        heuristics/lm_cut_heuristic_builder
         heuristics/lm_cut_landmarks
     DEPENDS PRIORITY_QUEUES TASK_PROPERTIES
 )

src/search/command_line.cc

@@ -2,7 +2,7 @@
 
 #include "option_parser.h"
 #include "plan_manager.h"
-#include "search_engine.h"
+#include "search_engine_builder.h"
 
 #include "options/doc_printer.h"
 #include "options/predefinitions.h"
@@ -41,14 +41,17 @@ static int parse_int_arg(const string &name, const string &value) {
     }
 }
 
-static shared_ptr<SearchEngine> parse_cmd_line_aux(
+static shared_ptr<PluginBuilder<SearchEngine>> parse_cmd_line_aux(
     const vector<string> &args, options::Registry &registry, bool dry_run) {
     string plan_filename = "sas_plan";
     int num_previously_generated_plans = 0;
-    bool is_part_of_anytime_portfolio = false;
-    options::Predefinitions predefinitions;
+//    bool is_part_of_anytime_portfolio = false;
+//    options::Predefinitions predefinitions;
+    unordered_map<string,string> predefinitions;
+    unordered_set<string> variable_names;
+    string search_string;
+    shared_ptr<PluginBuilder<SearchEngine>> engine;
 
-    shared_ptr<SearchEngine> engine;
     /*
       Note that we don’t sanitize all arguments beforehand because filenames should remain as-is
       (no conversion to lower-case, no conversion of newlines to spaces).
@@ -61,9 +64,10 @@ static shared_ptr<SearchEngine> parse_cmd_line_aux(
             if (is_last)
                 throw ArgError("missing argument after --search");
             ++i;
-            OptionParser parser(sanitize_arg_string(args[i]), registry,
-                                predefinitions, dry_run);
-            engine = parser.start_parsing<shared_ptr<SearchEngine>>();
+            search_string = sanitize_arg_string(args[i]);
+//            OptionParser parser(sanitize_arg_string(args[i]), registry,
+//                                predefinitions, dry_run);
+//            engine = parser.start_parsing<shared_ptr<PluginBuilder<SearchEngine>>>();
         } else if (arg == "--help" && dry_run) {
             cout << "Help:" << endl;
             bool txt2tags = false;
@@ -101,7 +105,7 @@ static shared_ptr<SearchEngine> parse_cmd_line_aux(
             if (is_last)
                 throw ArgError("missing argument after --internal-previous-portfolio-plans");
             ++i;
-            is_part_of_anytime_portfolio = true;
+//            is_part_of_anytime_portfolio = true;
             num_previously_generated_plans = parse_int_arg(arg, args[i]);
             if (num_previously_generated_plans < 0)
                 throw ArgError("argument for --internal-previous-portfolio-plans must be positive");
@@ -110,25 +114,51 @@ static shared_ptr<SearchEngine> parse_cmd_line_aux(
             if (is_last)
                 throw ArgError("missing argument after " + arg);
             ++i;
-            registry.handle_predefinition(arg.substr(2),
-                                          sanitize_arg_string(args[i]),
-                                          predefinitions, dry_run);
+            std::pair<std::string, std::string> predefinition;
+            try {
+                predefinition = utils::split(args[i], "=");
+            } catch (utils::StringOperationError &) {
+                throw OptionParserError("Predefinition error: Predefinition has to be "
+                                        "of the form [name]=[definition].");
+            }
+
+            std::string key = predefinition.first;
+            std::string value = predefinition.second;
+            utils::strip(key);
+            utils::strip(value);
+            variable_names.insert(key);
+            predefinitions.insert(make_pair(key,value));
         } else {
             throw ArgError("unknown option " + arg);
         }
     }
 
-    if (engine) {
-        PlanManager &plan_manager = engine->get_plan_manager();
-        plan_manager.set_plan_filename(plan_filename);
-        plan_manager.set_num_previously_generated_plans(num_previously_generated_plans);
-        plan_manager.set_is_part_of_anytime_portfolio(is_part_of_anytime_portfolio);
+    for (auto predefinition : predefinitions) {
+        search_string = "let(" + predefinition.first +
+            ", " + predefinition.second + ", " + search_string + ")";
     }
+
+
+    /*
+      HACK: we currently do not test whether predefinition types match,
+      that is we could call "--landmarks h=lmcut() --search "astar(h)"
+      and it would work.
+    */
+    OptionParser parser(search_string, registry,
+                        variable_names, dry_run);
+    engine = parser.start_parsing<shared_ptr<PluginBuilder<SearchEngine>>>();
+
+//    if (engine) {
+//        PlanManager &plan_manager = engine->get_plan_manager();
+//        plan_manager.set_plan_filename(plan_filename);
+//        plan_manager.set_num_previously_generated_plans(num_previously_generated_plans);
+//        plan_manager.set_is_part_of_anytime_portfolio(is_part_of_anytime_portfolio);
+//    }
     return engine;
 }
 
 
-shared_ptr<SearchEngine> parse_cmd_line(
+shared_ptr<PluginBuilder<SearchEngine>> parse_cmd_line(
     int argc, const char **argv, options::Registry &registry, bool dry_run, bool is_unit_cost) {
     vector<string> args;
     bool active = true;
@@ -153,7 +183,7 @@ shared_ptr<SearchEngine> parse_cmd_line(
 string usage(const string &progname) {
     return "usage: \n" +
            progname + " [OPTIONS] --search SEARCH < OUTPUT\n\n"
-           "* SEARCH (SearchEngine): configuration of the search algorithm\n"
+           "* SEARCH (SearchEngineBuilder): configuration of the search algorithm\n"
            "* OUTPUT (filename): translator output\n\n"
            "Options:\n"
            "--help [NAME]\n"

src/search/command_line.h

@@ -1,6 +1,7 @@
 #ifndef COMMAND_LINE_H
 #define COMMAND_LINE_H
 
+#include "plugin_builder.h"
 #include "utils/exceptions.h"
 
 #include <memory>
@@ -20,7 +21,7 @@ class ArgError : public utils::Exception {
     virtual void print() const override;
 };
 
-extern std::shared_ptr<SearchEngine> parse_cmd_line(
+extern std::shared_ptr<PluginBuilder<SearchEngine>> parse_cmd_line(
     int argc, const char **argv, options::Registry &registry, bool dry_run,
     bool is_unit_cost);
 

src/search/evaluator.cc

@@ -1,8 +1,5 @@
 #include "evaluator.h"
 
-#include "option_parser.h"
-#include "plugin.h"
-
 #include "utils/logging.h"
 #include "utils/system.h"
 
@@ -11,14 +8,17 @@
 using namespace std;
 
 
-Evaluator::Evaluator(const string &description,
+Evaluator::Evaluator(const shared_ptr<AbstractTask> &task,
+                     const string &description,
                      bool use_for_reporting_minima,
                      bool use_for_boosting,
                      bool use_for_counting_evaluations)
     : description(description),
       use_for_reporting_minima(use_for_reporting_minima),
       use_for_boosting(use_for_boosting),
-      use_for_counting_evaluations(use_for_counting_evaluations) {
+      use_for_counting_evaluations(use_for_counting_evaluations),
+      task(task),
+      task_proxy(*task) {
 }
 
 bool Evaluator::dead_ends_are_reliable() const {
@@ -68,20 +68,3 @@ bool Evaluator::is_estimate_cached(const State &) const {
 int Evaluator::get_cached_estimate(const State &) const {
     ABORT("Called get_cached_estimate when estimate is not cached.");
 }
-
-static PluginTypePlugin<Evaluator> _type_plugin(
-    "Evaluator",
-    "An evaluator specification is either a newly created evaluator "
-    "instance or an evaluator that has been defined previously. "
-    "This page describes how one can specify a new evaluator instance. "
-    "For re-using evaluators, see OptionSyntax#Evaluator_Predefinitions.\n\n"
-    "If the evaluator is a heuristic, "
-    "definitions of //properties// in the descriptions below:\n\n"
-    " * **admissible:** h(s) <= h*(s) for all states s\n"
-    " * **consistent:** h(s) <= c(s, s') + h(s') for all states s "
-    "connected to states s' by an action with cost c(s, s')\n"
-    " * **safe:** h(s) = infinity is only true for states "
-    "with h*(s) = infinity\n"
-    " * **preferred operators:** this heuristic identifies "
-    "preferred operators ",
-    "evaluator", "heuristic");

src/search/evaluator.h

@@ -2,7 +2,9 @@
 #define EVALUATOR_H
 
 #include "evaluation_result.h"
+#include "task_proxy.h"
 
+#include <memory>
 #include <set>
 
 class EvaluationContext;
@@ -14,8 +16,15 @@ class Evaluator {
     const bool use_for_boosting;
     const bool use_for_counting_evaluations;
 
+protected:
+    // Hold a reference to the task implementation and pass it to objects that need it.
+    const std::shared_ptr<AbstractTask> task;
+    // Use task_proxy to access task information.
+    const TaskProxy task_proxy;
+
 public:
     Evaluator(
+        const std::shared_ptr<AbstractTask> &task,
         const std::string &description = "<none>",
         bool use_for_reporting_minima = false,
         bool use_for_boosting = false,

src/search/evaluator_builder.cc

@@ -0,0 +1,20 @@
+#include "evaluator.h"
+#include "plugin.h"
+#include "plugin_builder.h"
+
+static PluginTypePlugin<PluginBuilder<Evaluator>> _type_plugin(
+    "Evaluator",
+    "An evaluator specification is either a newly created evaluator "
+    "instance or an evaluator that has been defined previously. "
+    "This page describes how one can specify a new evaluator instance. "
+    "For re-using evaluators, see OptionSyntax#Evaluator_Predefinitions.\n\n"
+    "If the evaluator is a heuristic, "
+    "definitions of //properties// in the descriptions below:\n\n"
+    " * **admissible:** h(s) <= h*(s) for all states s\n"
+    " * **consistent:** h(s) <= c(s, s') + h(s') for all states s "
+    "connected to states s' by an action with cost c(s, s')\n"
+    " * **safe:** h(s) = infinity is only true for states "
+    "with h*(s) = infinity\n"
+    " * **preferred operators:** this heuristic identifies "
+    "preferred operators ",
+    "evaluator", "heuristic");

src/search/evaluators/combining_evaluator.cc

@@ -7,8 +7,10 @@ using namespace std;
 
 namespace combining_evaluator {
 CombiningEvaluator::CombiningEvaluator(
+    const shared_ptr<AbstractTask> &task,
     const vector<shared_ptr<Evaluator>> &subevaluators_)
-    : subevaluators(subevaluators_) {
+    : Evaluator(task),
+      subevaluators(subevaluators_) {
     all_dead_ends_are_reliable = true;
     for (const shared_ptr<Evaluator> &subevaluator : subevaluators)
         if (!subevaluator->dead_ends_are_reliable())

src/search/evaluators/combining_evaluator.h

@@ -20,6 +20,7 @@ class CombiningEvaluator : public Evaluator {
     virtual int combine_values(const std::vector<int> &values) = 0;
 public:
     explicit CombiningEvaluator(
+        const std::shared_ptr<AbstractTask> &task,
         const std::vector<std::shared_ptr<Evaluator>> &subevaluators_);
     virtual ~CombiningEvaluator() override;
 

src/search/evaluators/combining_evaluator_builder.cc

@@ -0,0 +1,12 @@
+#include "combining_evaluator_builder.h"
+
+#include "combining_evaluator.h"
+
+using namespace std;
+
+namespace combining_evaluator {
+CombiningEvaluatorBuilder::CombiningEvaluatorBuilder(
+    const vector<shared_ptr<PluginBuilder<Evaluator>>> &subevaluators_) // TODO: could directly get from options
+    : subevaluators(subevaluators_) {
+}
+}