Issue559-Prototype

build_configs.py

@@ -5,5 +5,16 @@
 glibcxx_debug = ["-DCMAKE_BUILD_TYPE=Debug", "-DUSE_LP=NO", "-DUSE_GLIBCXX_DEBUG=YES"]
 minimal = ["-DCMAKE_BUILD_TYPE=Release", "-DDISABLE_LIBRARIES_BY_DEFAULT=YES"]
 
-DEFAULT = "release"
+prototype = ["-DCMAKE_BUILD_TYPE=Release",
+             "-DDISABLE_LIBRARIES_BY_DEFAULT=YES",
+             "-DLIBRARY_ITERATED_SEARCH_ENABLED=YES",
+             "-DLIBRARY_CORE_TASKS_ENABLED=YES",
+             "-DLIBRARY_PLUGIN_EAGER_ENABLED=YES",
+             "-DLIBRARY_PLUGIN_ASTAR_ENABLED=YES",
+             "-DLIBRARY_LANDMARK_CUT_HEURISTIC_ENABLED=YES",
+             "-DLIBRARY_BLIND_SEARCH_HEURISTIC_ENABLED=YES",
+             ]
+
+DEFAULT = "prototype"
+#DEFAULT = "release"
 DEBUG = "debug"

driver/aliases.py

@@ -139,6 +139,119 @@ def _get_lama(pref):
 ALIASES["seq-opt-lmcut"] = [
     "--search", "astar(lmcut())"]
 
+# issue559
+
+ALIASES["issue559_testA"] = [
+    "--search",
+    "           eager(open=tiebreaking([blind()]))"
+    "           "] # TODO issue559 remove this
+ALIASES["issue559_testB"] = [
+    "--search",
+    "           let(h, blind(description=\"MyBlind\"), eager(open=tiebreaking([sum([h,h,h]),h])))"
+    "           "] # TODO issue559 remove this
+ALIASES["issue559_testC"] = [
+    "--search",
+    "let(h, blind(description=\"AllTimeBlind\"),"
+    " iterated([astar(description=\"ASTAR_1\",eval=h),"
+    "           eager(tiebreaking([sum([g(\"my_G_Eval\"), "
+    "                                   h]), "
+    "                              h],"
+    "                             unsafe_pruning=false"
+    "                            ),"
+    "                 reopen_closed=true,"
+    "                 f_eval=sum([g(), "
+    "                             h]))"
+    "          ]))"] # TODO issue559 remove this
+ALIASES["issue559_test0"] = [
+    "--search",
+    "let(h, lmcut(description=\"AllTimeLMcut\"),"
+    "           eager(tiebreaking([sum([g(\"my_G_Eval\"), "
+    "                                   h]), "
+    "                              h],"
+    "                             unsafe_pruning=false"
+    "                            ),"
+    "                 reopen_closed=true,"
+    "                 f_eval=sum([g(), "
+    "                             h]))"
+    "           )"] # TODO issue559 remove this
+ALIASES["issue559_test1"] = [
+    "--search",
+    "let(h, lmcut(description=\"AllTimeLMcut\"),"
+    " iterated([astar(description=\"ASTAR_1\",eval=h),"
+    "           eager(tiebreaking([sum([g(\"my_G_Eval\"), "
+    "                                   h]), "
+    "                              h],"
+    "                             unsafe_pruning=false"
+    "                            ),"
+    "                 reopen_closed=true,"
+    "                 f_eval=sum([g(), "
+    "                             h]))"
+    "          ]))"] # TODO issue559 remove this
+ALIASES["issue559_test2"] = [
+    "--search",
+    "let(h, lmcut(description=\"AllTimeLMcut\"),"
+    " iterated([astar(description=\"ASTAR_1\",eval=h),"
+    "           eager(tiebreaking([sum([g(\"my_G_Eval\"), "
+    "                                   h]), "
+    "                              h],"
+    "                             unsafe_pruning=false"
+    "                            ),"
+    "                 reopen_closed=true,"
+    "                 f_eval=sum([g(), "
+    "                             h])),"
+    "           eager(tiebreaking([sum([g(), "
+    "                                   blind()]), "
+    "                              blind()],"
+    "                             unsafe_pruning=false"
+    "                            )"
+    "                 ,description=\"eager3\")"
+    "          ],pass_bound=false))"] # TODO issue559 remove this
+ALIASES["issue559_test3"] = [
+    "--search",
+    "let(h, lmcut(description=\"AllTimeLMcut\"),"
+    " iterated([astar(description=\"ASTAR_1\",eval=h),"
+    "           eager(tiebreaking([sum([g(\"my_G_Eval\"), "
+    "                                   h]), "
+    "                              h],"
+    "                             unsafe_pruning=false"
+    "                            ),"
+    "                 reopen_closed=true,"
+    "                 f_eval=sum([g(), "
+    "                             h])),"
+    "           eager(tiebreaking([sum([g(), "
+    "                                   blind(transform=adapt_costs(normal))]), "
+    "                              blind()],"
+    "                             unsafe_pruning=false"
+    "                            )"
+    "                 ,description=\"eager3\")"
+    "          ],pass_bound=false))"] # TODO issue559 remove this
+ALIASES["issue559_test4"] = [
+    "--search",
+    "let(h, lmcut(description=\"AllTimeLMcut\"),"
+    " iterated("
+    "[iterated([astar(description=\"ASTAR_1\",eval=h),"
+    "          eager(tiebreaking([sum([g(\"my_G_Eval\"), "
+    "                                   h]), "
+    "                              h],"
+    "                             unsafe_pruning=false"
+    "                            ),"
+    "                 reopen_closed=true,"
+    "                 f_eval=sum([g(), "
+    "                             h]))"
+    "],pass_bound=false), iterated(["
+    "           eager(tiebreaking([sum([g(), "
+    "                                   blind(transform=adapt_costs(normal))]), "
+    "                              blind()],"
+    "                             unsafe_pruning=false"
+    "                            )"
+    "                 ,description=\"eager3\")"
+    "          ])"
+    "],pass_bound=false))"] # TODO issue559 remove this
+
+
+# issue559
+
+
 
 PORTFOLIOS = {}
 for portfolio in PORTFOLIO_DIR.iterdir():

src/search/CMakeLists.txt

@@ -453,9 +453,9 @@ create_fast_downward_library(
     SOURCES
         search_algorithms/search_common
     DEPENDS
-        alternation_open_list
+	#issue559 #alternation_open_list
         g_evaluator
-        best_first_open_list
+	#issue559 #best_first_open_list
         sum_evaluator
         tiebreaking_open_list
         weighted_evaluator

src/search/command_line.cc

@@ -84,20 +84,21 @@ static vector<string> replace_old_style_predefinitions(
     return new_args;
 }
 
-static shared_ptr<SearchAlgorithm> parse_cmd_line_aux(
-    const vector<string> &args) {
+static shared_ptr<TaskIndependentComponentType<SearchAlgorithm>>
+parse_cmd_line_aux(const vector<string> &args) {
     string plan_filename = "sas_plan";
     int num_previously_generated_plans = 0;
     bool is_part_of_anytime_portfolio = false;
 
-    using SearchPtr = shared_ptr<SearchAlgorithm>;
-    SearchPtr search_algorithm = nullptr;
+    using TISearchPtr =
+        shared_ptr<TaskIndependentComponentType<SearchAlgorithm>>;
+    TISearchPtr ti_search_algorithm = nullptr;
     // TODO: Remove code duplication.
     for (size_t i = 0; i < args.size(); ++i) {
         const string &arg = args[i];
         bool is_last = (i == args.size() - 1);
         if (arg == "--search") {
-            if (search_algorithm)
+            if (ti_search_algorithm)
                 input_error("multiple --search arguments defined");
             if (is_last)
                 input_error("missing argument after --search");
@@ -108,7 +109,8 @@ static shared_ptr<SearchAlgorithm> parse_cmd_line_aux(
                 parser::ASTNodePtr parsed = parser::parse(tokens);
                 parser::DecoratedASTNodePtr decorated = parsed->decorate();
                 plugins::Any constructed = decorated->construct();
-                search_algorithm = plugins::any_cast<SearchPtr>(constructed);
+                ti_search_algorithm =
+                    plugins::any_cast<TISearchPtr>(constructed);
             } catch (const plugins::BadAnyCast &) {
                 input_error(
                     "Could not interpret the argument of --search as a search algorithm.");
@@ -165,18 +167,18 @@ static shared_ptr<SearchAlgorithm> parse_cmd_line_aux(
         }
     }
 
-    if (search_algorithm) {
-        PlanManager &plan_manager = search_algorithm->get_plan_manager();
+    if (ti_search_algorithm) {
+        PlanManager &plan_manager = ti_search_algorithm->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 search_algorithm;
+    return ti_search_algorithm;
 }
 
-shared_ptr<SearchAlgorithm> parse_cmd_line(
+shared_ptr<TaskIndependentComponentType<SearchAlgorithm>> parse_cmd_line(
     int argc, const char **argv, bool is_unit_cost) {
     vector<string> args;
     bool active = true;

src/search/command_line.h

@@ -4,10 +4,12 @@
 #include <memory>
 #include <string>
 
+template<typename T>
+class TaskIndependentComponentType;
 class SearchAlgorithm;
 
-extern std::shared_ptr<SearchAlgorithm> parse_cmd_line(
-    int argc, const char **argv, bool is_unit_cost);
+extern std::shared_ptr<TaskIndependentComponentType<SearchAlgorithm>>
+parse_cmd_line(int argc, const char **argv, bool is_unit_cost);
 
 extern std::string get_revision_info();
 extern std::string get_usage(const std::string &progname);