[issue1098] Rename cegar directory to cartesian_abstractions.

For developers: the cegar directory is now called cartesian_abstractions to better reflect what it actually contains and to avoid confusion with CEGAR-based code in the pdbs directory. This changes includes renaming the namespace as well as some minor changes in the documentation.
aibasel · Jul 27, 2023 · 1fb9879 · 1fb9879
1 parent 66a2ca6
commit 1fb9879
Show file tree

Hide file tree

Showing 31 changed files with 51 additions and 51 deletions.
diff --git a/src/search/DownwardFiles.cmake b/src/search/DownwardFiles.cmake
@@ -642,24 +642,24 @@ fast_downward_plugin(
 
 fast_downward_plugin(
     NAME CEGAR
-    HELP "Plugin containing the code for CEGAR heuristics"
-    SOURCES
-        cegar/abstraction
-        cegar/abstract_search
-        cegar/abstract_state
-        cegar/additive_cartesian_heuristic
-        cegar/cartesian_heuristic_function
-        cegar/cartesian_set
-        cegar/cegar
-        cegar/cost_saturation
-        cegar/refinement_hierarchy
-        cegar/split_selector
-        cegar/subtask_generators
-        cegar/transition
-        cegar/transition_system
-        cegar/types
-        cegar/utils
-        cegar/utils_landmarks
+    HELP "Plugin containing the code for Cartesian CEGAR heuristics"
+    SOURCES
+        cartesian_abstractions/abstraction
+        cartesian_abstractions/abstract_search
+        cartesian_abstractions/abstract_state
+        cartesian_abstractions/additive_cartesian_heuristic
+        cartesian_abstractions/cartesian_heuristic_function
+        cartesian_abstractions/cartesian_set
+        cartesian_abstractions/cegar
+        cartesian_abstractions/cost_saturation
+        cartesian_abstractions/refinement_hierarchy
+        cartesian_abstractions/split_selector
+        cartesian_abstractions/subtask_generators
+        cartesian_abstractions/transition
+        cartesian_abstractions/transition_system
+        cartesian_abstractions/types
+        cartesian_abstractions/utils
+        cartesian_abstractions/utils_landmarks
     DEPENDS ADDITIVE_HEURISTIC DYNAMIC_BITSET EXTRA_TASKS LANDMARKS PRIORITY_QUEUES TASK_PROPERTIES
 )
 

diff --git a/src/search/cegar/abstract_search.cc → ...cartesian_abstractions/abstract_search.cc b/src/search/cegar/abstract_search.cc → ...cartesian_abstractions/abstract_search.cc
@@ -10,7 +10,7 @@
 
 using namespace std;
 
-namespace cegar {
+namespace cartesian_abstractions {
 AbstractSearch::AbstractSearch(
     const vector<int> &operator_costs)
     : operator_costs(operator_costs),

diff --git a/src/search/cegar/abstract_search.h → .../cartesian_abstractions/abstract_search.h b/src/search/cegar/abstract_search.h → .../cartesian_abstractions/abstract_search.h
@@ -10,7 +10,7 @@
 #include <memory>
 #include <vector>
 
-namespace cegar {
+namespace cartesian_abstractions {
 using Solution = std::deque<Transition>;
 
 /*

diff --git a/src/search/cegar/abstract_state.cc → .../cartesian_abstractions/abstract_state.cc b/src/search/cegar/abstract_state.cc → .../cartesian_abstractions/abstract_state.cc
@@ -11,7 +11,7 @@
 
 using namespace std;
 
-namespace cegar {
+namespace cartesian_abstractions {
 AbstractState::AbstractState(
     int state_id, NodeID node_id, CartesianSet &&cartesian_set)
     : state_id(state_id),

diff --git a/src/search/cegar/abstract_state.h → ...h/cartesian_abstractions/abstract_state.h b/src/search/cegar/abstract_state.h → ...h/cartesian_abstractions/abstract_state.h
@@ -12,7 +12,7 @@ class OperatorProxy;
 class State;
 class TaskProxy;
 
-namespace cegar {
+namespace cartesian_abstractions {
 class Node;
 
 /*

diff --git a/src/search/cegar/abstraction.cc → ...rch/cartesian_abstractions/abstraction.cc b/src/search/cegar/abstraction.cc → ...rch/cartesian_abstractions/abstraction.cc
@@ -18,7 +18,7 @@
 
 using namespace std;
 
-namespace cegar {
+namespace cartesian_abstractions {
 Abstraction::Abstraction(const shared_ptr<AbstractTask> &task, utils::LogProxy &log)
     : transition_system(utils::make_unique_ptr<TransitionSystem>(TaskProxy(*task).get_operators())),
       concrete_initial_state(TaskProxy(*task).get_initial_state()),

diff --git a/src/search/cegar/abstraction.h → ...arch/cartesian_abstractions/abstraction.h b/src/search/cegar/abstraction.h → ...arch/cartesian_abstractions/abstraction.h
@@ -14,7 +14,7 @@ namespace utils {
 class LogProxy;
 }
 
-namespace cegar {
+namespace cartesian_abstractions {
 class AbstractState;
 class RefinementHierarchy;
 class TransitionSystem;

diff --git a/...rch/cegar/additive_cartesian_heuristic.cc → ...tractions/additive_cartesian_heuristic.cc b/...rch/cegar/additive_cartesian_heuristic.cc → ...tractions/additive_cartesian_heuristic.cc
@@ -15,7 +15,7 @@
 
 using namespace std;
 
-namespace cegar {
+namespace cartesian_abstractions {
 static vector<CartesianHeuristicFunction> generate_heuristic_functions(
     const plugins::Options &opts, utils::LogProxy &log) {
     if (log.is_at_least_normal()) {
@@ -62,10 +62,10 @@ class AdditiveCartesianHeuristicFeature
     : public plugins::TypedFeature<Evaluator, AdditiveCartesianHeuristic> {
 public:
     AdditiveCartesianHeuristicFeature() : TypedFeature("cegar") {
-        document_title("Additive CEGAR heuristic");
+        document_title("Additive Cartesian CEGAR heuristic");
         document_synopsis(
-            "See the paper introducing Counterexample-guided Abstraction "
-            "Refinement (CEGAR) for classical planning:" +
+            "See the paper introducing counterexample-guided Cartesian "
+            "abstraction refinement (CEGAR) for classical planning:" +
             utils::format_conference_reference(
                 {"Jendrik Seipp", "Malte Helmert"},
                 "Counterexample-guided Cartesian Abstraction Refinement",

diff --git a/...arch/cegar/additive_cartesian_heuristic.h → ...stractions/additive_cartesian_heuristic.h b/...arch/cegar/additive_cartesian_heuristic.h → ...stractions/additive_cartesian_heuristic.h
@@ -5,7 +5,7 @@
 
 #include <vector>
 
-namespace cegar {
+namespace cartesian_abstractions {
 class CartesianHeuristicFunction;
 
 /*

diff --git a/...rch/cegar/cartesian_heuristic_function.cc → ...tractions/cartesian_heuristic_function.cc b/...rch/cegar/cartesian_heuristic_function.cc → ...tractions/cartesian_heuristic_function.cc
@@ -6,7 +6,7 @@
 
 using namespace std;
 
-namespace cegar {
+namespace cartesian_abstractions {
 CartesianHeuristicFunction::CartesianHeuristicFunction(
     unique_ptr<RefinementHierarchy> &&hierarchy,
     vector<int> &&h_values)

diff --git a/...arch/cegar/cartesian_heuristic_function.h → ...stractions/cartesian_heuristic_function.h b/...arch/cegar/cartesian_heuristic_function.h → ...stractions/cartesian_heuristic_function.h
@@ -6,7 +6,7 @@
 
 class State;
 
-namespace cegar {
+namespace cartesian_abstractions {
 class RefinementHierarchy;
 /*
   Store RefinementHierarchy and heuristic values for looking up abstract state

diff --git a/src/search/cegar/cartesian_set.cc → ...h/cartesian_abstractions/cartesian_set.cc b/src/search/cegar/cartesian_set.cc → ...h/cartesian_abstractions/cartesian_set.cc
@@ -4,7 +4,7 @@
 
 using namespace std;
 
-namespace cegar {
+namespace cartesian_abstractions {
 CartesianSet::CartesianSet(const vector<int> &domain_sizes) {
     domain_subsets.reserve(domain_sizes.size());
     for (int domain_size : domain_sizes) {

diff --git a/src/search/cegar/cartesian_set.h → ...ch/cartesian_abstractions/cartesian_set.h b/src/search/cegar/cartesian_set.h → ...ch/cartesian_abstractions/cartesian_set.h
@@ -6,7 +6,7 @@
 #include <ostream>
 #include <vector>
 
-namespace cegar {
+namespace cartesian_abstractions {
 using Bitset = dynamic_bitset::DynamicBitset<unsigned short>;
 
 /*

diff --git a/src/search/cegar/cegar.cc → src/search/cartesian_abstractions/cegar.cc b/src/search/cegar/cegar.cc → src/search/cartesian_abstractions/cegar.cc
@@ -19,7 +19,7 @@
 
 using namespace std;
 
-namespace cegar {
+namespace cartesian_abstractions {
 // Create the Cartesian set that corresponds to the given preconditions or goals.
 static CartesianSet get_cartesian_set(
     const vector<int> &domain_sizes, const ConditionsProxy &conditions) {

diff --git a/src/search/cegar/cegar.h → src/search/cartesian_abstractions/cegar.h b/src/search/cegar/cegar.h → src/search/cartesian_abstractions/cegar.h
@@ -15,7 +15,7 @@ class RandomNumberGenerator;
 class LogProxy;
 }
 
-namespace cegar {
+namespace cartesian_abstractions {
 class Abstraction;
 struct Flaw;
 

diff --git a/src/search/cegar/cost_saturation.cc → ...cartesian_abstractions/cost_saturation.cc b/src/search/cegar/cost_saturation.cc → ...cartesian_abstractions/cost_saturation.cc
@@ -20,7 +20,7 @@
 
 using namespace std;
 
-namespace cegar {
+namespace cartesian_abstractions {
 /*
   We reserve some memory to be able to recover from out-of-memory
   situations gracefully. When the memory runs out, we stop refining and

diff --git a/src/search/cegar/cost_saturation.h → .../cartesian_abstractions/cost_saturation.h b/src/search/cegar/cost_saturation.h → .../cartesian_abstractions/cost_saturation.h
@@ -14,7 +14,7 @@ class RandomNumberGenerator;
 class LogProxy;
 }
 
-namespace cegar {
+namespace cartesian_abstractions {
 class CartesianHeuristicFunction;
 class SubtaskGenerator;
 

diff --git a/src/search/cegar/refinement_hierarchy.cc → ...sian_abstractions/refinement_hierarchy.cc b/src/search/cegar/refinement_hierarchy.cc → ...sian_abstractions/refinement_hierarchy.cc
@@ -4,7 +4,7 @@
 
 using namespace std;
 
-namespace cegar {
+namespace cartesian_abstractions {
 Node::Node(int state_id)
     : left_child(UNDEFINED),
       right_child(UNDEFINED),

diff --git a/src/search/cegar/refinement_hierarchy.h → ...esian_abstractions/refinement_hierarchy.h b/src/search/cegar/refinement_hierarchy.h → ...esian_abstractions/refinement_hierarchy.h
@@ -12,7 +12,7 @@
 class AbstractTask;
 class State;
 
-namespace cegar {
+namespace cartesian_abstractions {
 class Node;
 
 /*

diff --git a/src/search/cegar/split_selector.cc → .../cartesian_abstractions/split_selector.cc b/src/search/cegar/split_selector.cc → .../cartesian_abstractions/split_selector.cc
@@ -14,7 +14,7 @@
 
 using namespace std;
 
-namespace cegar {
+namespace cartesian_abstractions {
 SplitSelector::SplitSelector(
     const shared_ptr<AbstractTask> &task,
     PickSplit pick)

diff --git a/src/search/cegar/split_selector.h → ...h/cartesian_abstractions/split_selector.h b/src/search/cegar/split_selector.h → ...h/cartesian_abstractions/split_selector.h
@@ -14,7 +14,7 @@ namespace utils {
 class RandomNumberGenerator;
 }
 
-namespace cegar {
+namespace cartesian_abstractions {
 class AbstractState;
 
 // Strategies for selecting a split in case there are multiple possibilities.

diff --git a/src/search/cegar/subtask_generators.cc → ...tesian_abstractions/subtask_generators.cc b/src/search/cegar/subtask_generators.cc → ...tesian_abstractions/subtask_generators.cc
@@ -22,7 +22,7 @@
 
 using namespace std;
 
-namespace cegar {
+namespace cartesian_abstractions {
 class SortFactsByIncreasingHaddValues {
     // Can't store as unique_ptr since the class needs copy-constructor.
     shared_ptr<additive_heuristic::AdditiveHeuristic> hadd;

diff --git a/src/search/cegar/subtask_generators.h → ...rtesian_abstractions/subtask_generators.h b/src/search/cegar/subtask_generators.h → ...rtesian_abstractions/subtask_generators.h
@@ -20,7 +20,7 @@ class RandomNumberGenerator;
 class LogProxy;
 }
 
-namespace cegar {
+namespace cartesian_abstractions {
 using Facts = std::vector<FactPair>;
 using SharedTasks = std::vector<std::shared_ptr<AbstractTask>>;
 

diff --git a/src/search/cegar/transition.h → ...earch/cartesian_abstractions/transition.h b/src/search/cegar/transition.h → ...earch/cartesian_abstractions/transition.h
@@ -3,7 +3,7 @@
 
 #include <iostream>
 
-namespace cegar {
+namespace cartesian_abstractions {
 struct Transition {
     int op_id;
     int target_id;

diff --git a/src/search/cegar/transition_system.cc → ...rtesian_abstractions/transition_system.cc b/src/search/cegar/transition_system.cc → ...rtesian_abstractions/transition_system.cc
@@ -14,7 +14,7 @@
 
 using namespace std;
 
-namespace cegar {
+namespace cartesian_abstractions {
 static vector<vector<FactPair>> get_preconditions_by_operator(
     const OperatorsProxy &ops) {
     vector<vector<FactPair>> preconditions_by_operator;

diff --git a/src/search/cegar/transition_system.h → ...artesian_abstractions/transition_system.h b/src/search/cegar/transition_system.h → ...artesian_abstractions/transition_system.h
@@ -12,7 +12,7 @@ namespace utils {
 class LogProxy;
 }
 
-namespace cegar {
+namespace cartesian_abstractions {
 /*
   Rewire transitions after each split.
 */

diff --git a/src/search/cegar/types.h → src/search/cartesian_abstractions/types.h b/src/search/cegar/types.h → src/search/cartesian_abstractions/types.h
@@ -6,7 +6,7 @@
 #include <unordered_set>
 #include <vector>
 
-namespace cegar {
+namespace cartesian_abstractions {
 class AbstractState;
 struct Transition;
 

diff --git a/src/search/cegar/utils.cc → src/search/cartesian_abstractions/utils.cc b/src/search/cegar/utils.cc → src/search/cartesian_abstractions/utils.cc
@@ -12,7 +12,7 @@
 
 using namespace std;
 
-namespace cegar {
+namespace cartesian_abstractions {
 unique_ptr<additive_heuristic::AdditiveHeuristic> create_additive_heuristic(
     const shared_ptr<AbstractTask> &task) {
     plugins::Options opts;

diff --git a/src/search/cegar/utils.h → src/search/cartesian_abstractions/utils.h b/src/search/cegar/utils.h → src/search/cartesian_abstractions/utils.h
@@ -16,7 +16,7 @@ namespace additive_heuristic {
 class AdditiveHeuristic;
 }
 
-namespace cegar {
+namespace cartesian_abstractions {
 extern std::unique_ptr<additive_heuristic::AdditiveHeuristic>
 create_additive_heuristic(const std::shared_ptr<AbstractTask> &task);
 

diff --git a/src/search/cegar/utils_landmarks.cc → ...cartesian_abstractions/utils_landmarks.cc b/src/search/cegar/utils_landmarks.cc → ...cartesian_abstractions/utils_landmarks.cc
@@ -12,7 +12,7 @@
 using namespace std;
 using namespace landmarks;
 
-namespace cegar {
+namespace cartesian_abstractions {
 static FactPair get_fact(const Landmark &landmark) {
     // We assume that the given Landmarks are from an h^m landmark graph with m=1.
     assert(landmark.facts.size() == 1);

diff --git a/src/search/cegar/utils_landmarks.h → .../cartesian_abstractions/utils_landmarks.h b/src/search/cegar/utils_landmarks.h → .../cartesian_abstractions/utils_landmarks.h
@@ -12,7 +12,7 @@ namespace landmarks {
 class LandmarkGraph;
 }
 
-namespace cegar {
+namespace cartesian_abstractions {
 using VarToValues = std::unordered_map<int, std::vector<int>>;
 
 extern std::shared_ptr<landmarks::LandmarkGraph> get_landmark_graph(