Refactor atom class to include a sigma literal

ratioSolver · Mar 27, 2024 · a1fc937 · a1fc937
1 parent 5d3c614
commit a1fc937
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/include/core.hpp b/include/core.hpp
@@ -108,7 +108,7 @@ namespace riddle
      *
      * @return std::shared_ptr<string_item> The string expression.
      */
-    [[nodiscard]] virtual std::shared_ptr<string_item> new_string() = 0;
+    [[nodiscard]] std::shared_ptr<string_item> new_string();
     /**
      * @brief Create a new string expression with a value.
      *

diff --git a/include/item.hpp b/include/item.hpp
@@ -94,12 +94,15 @@ namespace riddle
   class atom : public item, public env
   {
   public:
-    atom(predicate &t, bool is_fact, std::map<std::string, std::shared_ptr<item>> &&args = {});
+    atom(predicate &t, bool is_fact, const utils::lit &sigma, std::map<std::string, std::shared_ptr<item>> &&args = {});
     virtual ~atom() = default;
 
     [[nodiscard]] bool is_fact() const { return fact; }
+    [[nodiscard]] utils::lit &get_sigma() { return sigma; }
+    [[nodiscard]] const utils::lit &get_sigma() const { return sigma; }
 
   private:
-    bool fact; // whether the atom is a fact or a goal..
+    bool fact;        // whether the atom is a fact or a goal..
+    utils::lit sigma; // the literal indicating the status of the atom (i.e., true if active, false if unified, undefined if inactive)..
   };
 } // namespace riddle
diff --git a/src/core.cpp b/src/core.cpp
@@ -44,6 +44,7 @@ namespace riddle
     std::shared_ptr<arith_item> core::new_real(const utils::rational &value) { return std::make_shared<arith_item>(real_tp, utils::lin(value)); }
     std::shared_ptr<arith_item> core::new_time(const utils::rational &value) { return std::make_shared<arith_item>(time_tp, utils::lin(value)); }
 
+    std::shared_ptr<string_item> core::new_string() { return std::make_shared<string_item>(string_tp); }
     std::shared_ptr<string_item> core::new_string(const std::string &value) { return std::make_shared<string_item>(string_tp, value); }
 
     std::shared_ptr<component> core::new_item(component_type &tp) { return std::make_shared<component>(tp); }

diff --git a/src/item.cpp b/src/item.cpp
@@ -19,5 +19,5 @@ namespace riddle
 
     component::component(type &t, std::shared_ptr<env> parent) : item(t), env(t.get_scope().get_core(), parent) {}
 
-    atom::atom(predicate &t, bool is_fact, std::map<std::string, std::shared_ptr<item>> &&args) : item(t), env(t.get_scope().get_core(), nullptr, std::move(args)), fact(is_fact) {}
+    atom::atom(predicate &t, bool is_fact, const utils::lit &sigma, std::map<std::string, std::shared_ptr<item>> &&args) : item(t), env(t.get_scope().get_core(), nullptr, std::move(args)), fact(is_fact), sigma(sigma) {}
 } // namespace riddle