Add caches to builders in order to avoid rebuilding the same object.

silvansievers · Feb 19, 2021 · bbc27dd · bbc27dd
1 parent aef886b
commit bbc27dd
Show file tree

Hide file tree

Showing 18 changed files with 36 additions and 20 deletions.
diff --git a/src/search/evaluators/cost_adapted_evaluator_builder.cc b/src/search/evaluators/cost_adapted_evaluator_builder.cc
@@ -12,7 +12,7 @@ CostadaptedEvaluatorBuilder::CostadaptedEvaluatorBuilder(const options::Options
       cost_type(opts.get<OperatorCost>("cost_type")) {
 }
 
-shared_ptr<Evaluator> CostadaptedEvaluatorBuilder::build(
+shared_ptr<Evaluator> CostadaptedEvaluatorBuilder::create(
     PluginVariableAssignment &variable_context,
     const shared_ptr<AbstractTask> &task) const {
     shared_ptr<AbstractTask> cost_adapted_task =

diff --git a/src/search/evaluators/cost_adapted_evaluator_builder.h b/src/search/evaluators/cost_adapted_evaluator_builder.h
@@ -15,7 +15,7 @@ class CostadaptedEvaluatorBuilder : public PluginBuilder<Evaluator> {
     std::shared_ptr<PluginBuilder<Evaluator>> child_evaluator_builder;
     OperatorCost cost_type;
 protected:
-    virtual std::shared_ptr<Evaluator> build(
+    virtual std::shared_ptr<Evaluator> create(
         PluginVariableAssignment &variable_context,
         const std::shared_ptr<AbstractTask> &task) const override;
 public:

diff --git a/src/search/evaluators/g_evaluator_builder.cc b/src/search/evaluators/g_evaluator_builder.cc
@@ -9,7 +9,7 @@
 using namespace std;
 
 namespace g_evaluator {
-shared_ptr<Evaluator> GEvaluatorBuilder::build(
+shared_ptr<Evaluator> GEvaluatorBuilder::create(
     PluginVariableAssignment &, const shared_ptr<AbstractTask> &task) const {
     return make_shared<GEvaluator>(task);
 }

diff --git a/src/search/evaluators/g_evaluator_builder.h b/src/search/evaluators/g_evaluator_builder.h
@@ -8,7 +8,7 @@ class Evaluator;
 namespace g_evaluator {
 class GEvaluatorBuilder : public PluginBuilder<Evaluator> {
 protected:
-    virtual std::shared_ptr<Evaluator> build(
+    virtual std::shared_ptr<Evaluator> create(
         PluginVariableAssignment &variable_context,
         const std::shared_ptr<AbstractTask> &task) const override;
 };

diff --git a/src/search/evaluators/sum_evaluator_builder.cc b/src/search/evaluators/sum_evaluator_builder.cc
@@ -19,7 +19,7 @@ SumEvaluatorBuilder::SumEvaluatorBuilder(const vector<shared_ptr<PluginBuilder<E
     : CombiningEvaluatorBuilder(evals) {
 }
 
-shared_ptr<Evaluator> SumEvaluatorBuilder::build(
+shared_ptr<Evaluator> SumEvaluatorBuilder::create(
     PluginVariableAssignment &variable_context,
     const std::shared_ptr<AbstractTask> &task) const {
     vector<shared_ptr<Evaluator>> evaluators;

diff --git a/src/search/evaluators/sum_evaluator_builder.h b/src/search/evaluators/sum_evaluator_builder.h
@@ -10,7 +10,7 @@ class Options;
 namespace sum_evaluator {
 class SumEvaluatorBuilder : public combining_evaluator::CombiningEvaluatorBuilder {
 protected:
-    virtual std::shared_ptr<Evaluator> build(
+    virtual std::shared_ptr<Evaluator> create(
         PluginVariableAssignment &variable_context,
         const std::shared_ptr<AbstractTask> &task) const override;
 public:

diff --git a/src/search/heuristics/blind_search_heuristic_builder.cc b/src/search/heuristics/blind_search_heuristic_builder.cc
@@ -18,7 +18,7 @@ BlindSearchHeuristicBuilder::BlindSearchHeuristicBuilder(const options::Options
     : HeuristicBuilder(opts) {
 }
 
-shared_ptr<Evaluator> BlindSearchHeuristicBuilder::build(
+shared_ptr<Evaluator> BlindSearchHeuristicBuilder::create(
     PluginVariableAssignment &, const shared_ptr<AbstractTask> &task) const {
     return make_shared<BlindSearchHeuristic>(task, cache_estimates, name);
 }

diff --git a/src/search/heuristics/blind_search_heuristic_builder.h b/src/search/heuristics/blind_search_heuristic_builder.h
@@ -6,7 +6,7 @@
 namespace blind_search_heuristic {
 class BlindSearchHeuristicBuilder : public HeuristicBuilder {
 protected:
-    virtual std::shared_ptr<Evaluator> build(
+    virtual std::shared_ptr<Evaluator> create(
         PluginVariableAssignment &variable_context,
         const std::shared_ptr<AbstractTask> &task) const override;
 public:

diff --git a/src/search/heuristics/lm_cut_heuristic_builder.cc b/src/search/heuristics/lm_cut_heuristic_builder.cc
@@ -14,7 +14,7 @@ LandmarkCutHeuristicBuilder::LandmarkCutHeuristicBuilder(const options::Options
     : HeuristicBuilder(opts) {
 }
 
-shared_ptr<Evaluator> LandmarkCutHeuristicBuilder::build(
+shared_ptr<Evaluator> LandmarkCutHeuristicBuilder::create(
     PluginVariableAssignment &, const shared_ptr<AbstractTask> &task) const {
     return make_shared<LandmarkCutHeuristic>(task, cache_estimates, name);
 }

diff --git a/src/search/heuristics/lm_cut_heuristic_builder.h b/src/search/heuristics/lm_cut_heuristic_builder.h
@@ -6,7 +6,7 @@
 namespace lm_cut_heuristic {
 class LandmarkCutHeuristicBuilder : public HeuristicBuilder {
 protected:
-    virtual std::shared_ptr<Evaluator> build(
+    virtual std::shared_ptr<Evaluator> create(
         PluginVariableAssignment &variable_context,
         const std::shared_ptr<AbstractTask> &task) const override;
 public:

diff --git a/src/search/planner.cc b/src/search/planner.cc
@@ -56,6 +56,8 @@ int main(int argc, const char **argv) {
     PluginVariableAssignment variable_context;
     shared_ptr<SearchEngine> engine = engine_builder->build(
             variable_context, tasks::g_root_task);
+    // TODO: is reset the right call? I want to delete the engine builder
+    engine_builder.reset();
 
     utils::Timer search_timer;
     engine->search();

diff --git a/src/search/plugin_builder.h b/src/search/plugin_builder.h
@@ -4,15 +4,29 @@
 #include "abstract_task.h"
 
 #include <memory>
+#include <unordered_map>
 
 class PluginVariableAssignment;
 
 template<typename T>
 class PluginBuilder {
-public:
-    virtual std::shared_ptr<T> build(
+protected:
+    std::unordered_map<std::shared_ptr<AbstractTask>, std::shared_ptr<T>> cache;
+    virtual std::shared_ptr<T> create(
         PluginVariableAssignment &variable_context,
         const std::shared_ptr<AbstractTask> &task) const = 0;
+public:
+    std::shared_ptr<T> build(
+            PluginVariableAssignment &variable_context,
+            const std::shared_ptr<AbstractTask> &task) {
+        if (cache.count(task) > 0) {
+            return cache[task];
+        } else {
+            std::shared_ptr<T> ret = create(variable_context, task);
+            cache.insert(std::make_pair(task,ret));
+            return ret;
+        }
+    }
     virtual ~PluginBuilder() = default;
 };
 

diff --git a/src/search/plugin_let_builder.h b/src/search/plugin_let_builder.h
@@ -17,7 +17,7 @@ class PluginLetBuilder : public PluginBuilder<ReturnType> {
         std::string name,
         const std::shared_ptr<PluginBuilder<VarType>> &element_builder,
         const std::shared_ptr<PluginBuilder<ReturnType>> &nested_builder);
-    virtual std::shared_ptr<ReturnType> build(
+    virtual std::shared_ptr<ReturnType> create(
         PluginVariableAssignment &variable_context,
         const std::shared_ptr<AbstractTask> &task) const override;
 };
@@ -31,7 +31,7 @@ inline PluginLetBuilder<VarType, ReturnType>::PluginLetBuilder(
 }
 
 template<typename VarType, typename ReturnType>
-inline std::shared_ptr<ReturnType> PluginLetBuilder<VarType, ReturnType>::build(
+inline std::shared_ptr<ReturnType> PluginLetBuilder<VarType, ReturnType>::create(
     PluginVariableAssignment &variable_context,
     const std::shared_ptr<AbstractTask> &task) const {
     variable_context.set(name, element_builder);

diff --git a/src/search/plugin_variable_builder.h b/src/search/plugin_variable_builder.h
@@ -12,7 +12,7 @@ class PluginVariableBuilder : public PluginBuilder<T> {
 public:
     explicit PluginVariableBuilder(const std::string &name);
 
-    virtual std::shared_ptr<T> build(
+    virtual std::shared_ptr<T> create(
         PluginVariableAssignment &variable_context,
         const std::shared_ptr<AbstractTask> &task) const override;
 };
@@ -23,7 +23,7 @@ inline PluginVariableBuilder<T>::PluginVariableBuilder(const std::string &name)
 }
 
 template<typename T>
-inline std::shared_ptr<T> PluginVariableBuilder<T>::build(
+inline std::shared_ptr<T> PluginVariableBuilder<T>::create(
     PluginVariableAssignment &variable_context,
     const std::shared_ptr<AbstractTask> &task) const {
     return variable_context.get<T>(name, task);

diff --git a/src/search/pruning/null_pruning_method_builder.cc b/src/search/pruning/null_pruning_method_builder.cc
@@ -10,7 +10,7 @@
 using namespace std;
 
 namespace null_pruning_method {
-shared_ptr<PruningMethod> NullPruningMethodBuilder::build(
+shared_ptr<PruningMethod> NullPruningMethodBuilder::create(
     PluginVariableAssignment &, const shared_ptr<AbstractTask> &) const {
     return make_shared<NullPruningMethod>();
 }

diff --git a/src/search/pruning/null_pruning_method_builder.h b/src/search/pruning/null_pruning_method_builder.h
@@ -8,7 +8,7 @@ class PruningMethod;
 namespace null_pruning_method {
 class NullPruningMethodBuilder : public PluginBuilder<PruningMethod> {
 protected:
-    virtual std::shared_ptr<PruningMethod> build(
+    virtual std::shared_ptr<PruningMethod> create(
         PluginVariableAssignment &variable_context,
         const std::shared_ptr<AbstractTask> &task) const override;
 

diff --git a/src/search/search_engines/eager_search_builder.cc b/src/search/search_engines/eager_search_builder.cc
@@ -20,7 +20,7 @@ EagerSearchBuilder::EagerSearchBuilder(const options::Options &opts)
       lazy_evaluator_builder(opts.get<shared_ptr<PluginBuilder<Evaluator>>>("lazy_evaluator", nullptr)) {
 }
 
-shared_ptr<SearchEngine> EagerSearchBuilder::build(
+shared_ptr<SearchEngine> EagerSearchBuilder::create(
     PluginVariableAssignment &variable_context, const shared_ptr<AbstractTask> &task) const {
     vector<shared_ptr<Evaluator>> preferred_operator_evaluators;
     preferred_operator_evaluators.reserve(preferred_operator_evaluator_builders.size());

diff --git a/src/search/search_engines/eager_search_builder.h b/src/search/search_engines/eager_search_builder.h
@@ -16,7 +16,7 @@ class EagerSearchBuilder : public SearchEngineBuilder {
     std::vector<std::shared_ptr<PluginBuilder<Evaluator>>> preferred_operator_evaluator_builders;
     std::shared_ptr<PluginBuilder<Evaluator>> lazy_evaluator_builder;
 protected:
-    virtual std::shared_ptr<SearchEngine> build(
+    virtual std::shared_ptr<SearchEngine> create(
         PluginVariableAssignment &variable_context,
         const std::shared_ptr<AbstractTask> &task) const override;
 public: