removed intrusive str of pddl objects and replaced it by Formatter

examples/multiple_problems.cpp

@@ -23,17 +23,17 @@ int main()
     // Parse the domain
     auto domain_parser = loki::DomainParser(std::string(DATA_DIR) + "gripper/domain.pddl");
     const auto domain = domain_parser.get_domain();
-    std::cout << *domain << std::endl;
+    std::cout << loki::StreamWriter(*domain) << std::endl;
 
     // Parse first problem
     const auto problem_parser = loki::ProblemParser(std::string(DATA_DIR) + "gripper/p-2-0.pddl", domain_parser);
     const auto problem1 = problem_parser.get_problem();
-    std::cout << *problem1 << std::endl;
+    std::cout << loki::StreamWriter(*problem1) << std::endl;
 
     // Parse second problem where the constants are reordered
     const auto problem_parser2 = loki::ProblemParser(std::string(DATA_DIR) + "gripper/p-2-1.pddl", domain_parser);
     const auto problem2 = problem_parser2.get_problem();
-    std::cout << *problem2 << std::endl;
+    std::cout << loki::StreamWriter(*problem2) << std::endl;
 
     /* Both problems are structurally equivalent */
     assert(problem1 == problem2);

examples/position_cache.cpp

@@ -67,7 +67,7 @@ int main()
     // Parse the domain
     auto domain_parser = loki::DomainParser(std::string(DATA_DIR) + "gripper/domain.pddl");
     const auto domain = domain_parser.get_domain();
-    std::cout << *domain << std::endl << std::endl;
+    std::cout << loki::StreamWriter(*domain) << std::endl << std::endl;
 
     const loki::PDDLPositionCache& position_cache = domain_parser.get_position_cache();
     const loki::PDDLErrorHandler& error_handler = position_cache.get_error_handler();

examples/single_problem.cpp

@@ -23,12 +23,12 @@ int main()
     // Parse the domain
     auto domain_parser = loki::DomainParser(std::string(DATA_DIR) + "gripper/domain.pddl");
     const auto domain = domain_parser.get_domain();
-    std::cout << *domain << std::endl;
+    std::cout << loki::StreamWriter(*domain) << std::endl;
 
     // Parse the problem
     const auto problem_parser = loki::ProblemParser(std::string(DATA_DIR) + "gripper/p-2-0.pddl", domain_parser);
     const auto problem = problem_parser.get_problem();
-    std::cout << *problem << std::endl;
+    std::cout << loki::StreamWriter(*problem) << std::endl;
 
     return 0;
 }

examples/undefined_behavior.cpp

@@ -26,15 +26,15 @@ int main()
         // Parse the domain
         auto domain_parser = loki::DomainParser(std::string(DATA_DIR) + "gripper/domain.pddl");
         domain = domain_parser.get_domain();
-        std::cout << *domain << std::endl;
+        std::cout << loki::StreamWriter(*domain) << std::endl;
 
         /* Destructor of DomainParser is called and all domain and problem specific PDDL objects are destroyed. */
     }
 
     std::cout << "Bye ;(" << std::endl;
 
     /* Undefined behavior when accessing the domain, usually the program crashes because memory was overwritten */
-    std::cout << *domain << std::endl;
+    std::cout << loki::StreamWriter(*domain) << std::endl;
 
     return 0;
 }

exe/domain.cpp

@@ -30,7 +30,7 @@ int main(int argc, char** argv)
     // 1. Parse the domain
     const auto domain_parser = loki::DomainParser(domain_file);
     const auto domain = domain_parser.get_domain();
-    std::cout << *domain << std::endl;
+    std::cout << loki::StreamWriter(*domain) << std::endl;
 
     return 0;
 }

exe/problem.cpp

@@ -31,12 +31,12 @@ int main(int argc, char** argv)
     // 1. Parse the domain
     auto domain_parser = loki::DomainParser(domain_file);
     const auto domain = domain_parser.get_domain();
-    std::cout << *domain << std::endl;
+    std::cout << loki::StreamWriter(*domain) << std::endl;
 
     // 2. Parse the problem
     const auto problem_parser = loki::ProblemParser(problem_file, domain_parser);
     const auto problem = problem_parser.get_problem();
-    std::cout << *problem << std::endl;
+    std::cout << loki::StreamWriter(*problem) << std::endl;
 
     return 0;
 }

include/loki/details/pddl/action.hpp

@@ -47,11 +47,6 @@ class ActionImpl : public Base<ActionImpl>
     template<typename HolderType, typename Hash, typename EqualTo>
     friend class UniqueFactory;
 
-    void str_impl(std::ostream& out, const FormattingOptions& options) const;
-
-    // Give access to the private interface implementations.
-    friend class Base<ActionImpl>;
-
 public:
     const std::string& get_name() const;
     size_t get_original_arity() const;

include/loki/details/pddl/atom.hpp

@@ -37,11 +37,6 @@ class AtomImpl : public Base<AtomImpl>
     template<typename HolderType, typename Hash, typename EqualTo>
     friend class UniqueFactory;
 
-    void str_impl(std::ostream& out, const FormattingOptions& options) const;
-
-    // Give access to the private interface implementations.
-    friend class Base<AtomImpl>;
-
 public:
     const Predicate& get_predicate() const;
     const TermList& get_terms() const;

include/loki/details/pddl/axiom.hpp

@@ -39,11 +39,6 @@ class AxiomImpl : public Base<AxiomImpl>
     template<typename HolderType, typename Hash, typename EqualTo>
     friend class UniqueFactory;
 
-    void str_impl(std::ostream& out, const FormattingOptions& options) const;
-
-    // Give access to the private interface implementations.
-    friend class Base<AxiomImpl>;
-
 public:
     const std::string& get_derived_predicate_name() const;
     const ParameterList& get_parameters() const;

include/loki/details/pddl/base.hpp

@@ -18,8 +18,6 @@
 #ifndef LOKI_INCLUDE_LOKI_PDDL_BASE_HPP_
 #define LOKI_INCLUDE_LOKI_PDDL_BASE_HPP_
 
-#include "loki/details/utils/printer.hpp"
-
 #include <algorithm>
 #include <cstddef>
 #include <sstream>
@@ -33,8 +31,6 @@ template<typename Derived>
 class Base
 {
 private:
-    constexpr const auto& self() const { return static_cast<Derived const&>(*this); }
-
     size_t m_index;
 
     explicit Base(size_t index) : m_index(index) {}
@@ -47,25 +43,6 @@ class Base
     Base(Base&& other) = default;
     Base& operator=(Base&& other) = default;
 
-    /// @brief Overload of the output stream insertion operator (operator<<).
-    friend std::ostream& operator<<(std::ostream& os, const Base& element)
-    {
-        os << element.str();
-        return os;
-    }
-
-    /// @brief Compute a string representation of this object.
-    void str(std::ostream& out, const FormattingOptions& options) const { self().str_impl(out, options); }
-
-    /// @brief Compute a string representation of this object.
-    std::string str() const
-    {
-        std::ostringstream out;
-        FormattingOptions options { 0, 4 };
-        str(out, options);
-        return out.str();
-    }
-
     /// @brief Get the index.
     size_t get_index() const { return m_index; }
 };

include/loki/details/pddl/conditions.hpp

@@ -38,11 +38,6 @@ class ConditionLiteralImpl : public Base<ConditionLiteralImpl>
     template<typename HolderType, typename Hash, typename EqualTo>
     friend class UniqueFactory;
 
-    void str_impl(std::ostream& out, const FormattingOptions& options) const;
-
-    // Give access to the private interface implementations.
-    friend class Base<ConditionLiteralImpl>;
-
 public:
     const Literal& get_literal() const;
 };
@@ -59,11 +54,6 @@ class ConditionAndImpl : public Base<ConditionAndImpl>
     template<typename HolderType, typename Hash, typename EqualTo>
     friend class UniqueFactory;
 
-    void str_impl(std::ostream& out, const FormattingOptions& options) const;
-
-    // Give access to the private interface implementations.
-    friend class Base<ConditionAndImpl>;
-
 public:
     const ConditionList& get_conditions() const;
 };
@@ -80,13 +70,6 @@ class ConditionOrImpl : public Base<ConditionOrImpl>
     template<typename HolderType, typename Hash, typename EqualTo>
     friend class UniqueFactory;
 
-    bool is_structurally_equivalent_to_impl(const ConditionOrImpl& other) const;
-    size_t hash_impl() const;
-    void str_impl(std::ostream& out, const FormattingOptions& options) const;
-
-    // Give access to the private interface implementations.
-    friend class Base<ConditionOrImpl>;
-
 public:
     const ConditionList& get_conditions() const;
 };
@@ -103,11 +86,6 @@ class ConditionNotImpl : public Base<ConditionNotImpl>
     template<typename HolderType, typename Hash, typename EqualTo>
     friend class UniqueFactory;
 
-    void str_impl(std::ostream& out, const FormattingOptions& options) const;
-
-    // Give access to the private interface implementations.
-    friend class Base<ConditionNotImpl>;
-
 public:
     const Condition& get_condition() const;
 };
@@ -125,11 +103,6 @@ class ConditionImplyImpl : public Base<ConditionImplyImpl>
     template<typename HolderType, typename Hash, typename EqualTo>
     friend class UniqueFactory;
 
-    void str_impl(std::ostream& out, const FormattingOptions& options) const;
-
-    // Give access to the private interface implementations.
-    friend class Base<ConditionImplyImpl>;
-
 public:
     const Condition& get_condition_left() const;
     const Condition& get_condition_right() const;
@@ -148,11 +121,6 @@ class ConditionExistsImpl : public Base<ConditionExistsImpl>
     template<typename HolderType, typename Hash, typename EqualTo>
     friend class UniqueFactory;
 
-    void str_impl(std::ostream& out, const FormattingOptions& options) const;
-
-    // Give access to the private interface implementations.
-    friend class Base<ConditionExistsImpl>;
-
 public:
     const ParameterList& get_parameters() const;
     const Condition& get_condition() const;
@@ -171,11 +139,6 @@ class ConditionForallImpl : public Base<ConditionForallImpl>
     template<typename HolderType, typename Hash, typename EqualTo>
     friend class UniqueFactory;
 
-    void str_impl(std::ostream& out, const FormattingOptions& options) const;
-
-    // Give access to the private interface implementations.
-    friend class Base<ConditionForallImpl>;
-
 public:
     const ParameterList& get_parameters() const;
     const Condition& get_condition() const;

include/loki/details/pddl/domain.hpp

@@ -56,11 +56,6 @@ class DomainImpl : public Base<DomainImpl>
     template<typename HolderType, typename Hash, typename EqualTo>
     friend class UniqueFactory;
 
-    void str_impl(std::ostream& out, const FormattingOptions& options) const;
-
-    // Give access to the private interface implementations.
-    friend class Base<DomainImpl>;
-
 public:
     const std::optional<fs::path>& get_filepath() const;
     const std::string& get_name() const;

include/loki/details/pddl/effects.hpp

@@ -49,11 +49,6 @@ class EffectLiteralImpl : public Base<EffectLiteralImpl>
     template<typename HolderType, typename Hash, typename EqualTo>
     friend class UniqueFactory;
 
-    void str_impl(std::ostream& out, const FormattingOptions& options) const;
-
-    // Give access to the private interface implementations.
-    friend class Base<EffectLiteralImpl>;
-
 public:
     const Literal& get_literal() const;
 };
@@ -70,11 +65,6 @@ class EffectAndImpl : public Base<EffectAndImpl>
     template<typename HolderType, typename Hash, typename EqualTo>
     friend class UniqueFactory;
 
-    void str_impl(std::ostream& out, const FormattingOptions& options) const;
-
-    // Give access to the private interface implementations.
-    friend class Base<EffectAndImpl>;
-
 public:
     const EffectList& get_effects() const;
 };
@@ -93,11 +83,6 @@ class EffectNumericImpl : public Base<EffectNumericImpl>
     template<typename HolderType, typename Hash, typename EqualTo>
     friend class UniqueFactory;
 
-    void str_impl(std::ostream& out, const FormattingOptions& options) const;
-
-    // Give access to the private interface implementations.
-    friend class Base<EffectNumericImpl>;
-
 public:
     AssignOperatorEnum get_assign_operator() const;
     const Function& get_function() const;
@@ -117,11 +102,6 @@ class EffectConditionalForallImpl : public Base<EffectConditionalForallImpl>
     template<typename HolderType, typename Hash, typename EqualTo>
     friend class UniqueFactory;
 
-    void str_impl(std::ostream& out, const FormattingOptions& options) const;
-
-    // Give access to the private interface implementations.
-    friend class Base<EffectConditionalForallImpl>;
-
 public:
     const ParameterList& get_parameters() const;
     const Effect& get_effect() const;
@@ -140,11 +120,6 @@ class EffectConditionalWhenImpl : public Base<EffectConditionalWhenImpl>
     template<typename HolderType, typename Hash, typename EqualTo>
     friend class UniqueFactory;
 
-    void str_impl(std::ostream& out, const FormattingOptions& options) const;
-
-    // Give access to the private interface implementations.
-    friend class Base<EffectConditionalWhenImpl>;
-
 public:
     const Condition& get_condition() const;
     const Effect& get_effect() const;