print prettier SymbolicComplex

Author: alan23273850

include/autoq/complex/symbolic_complex.hh

@@ -124,9 +124,13 @@ struct AUTOQ::Complex::SymbolicComplex : std::map<Term, Complex> {
         for (const auto &tc : static_cast<std::map<Term, Complex>>(obj)) {
             if (tc.second.isZero()) continue;
             if (!isFirst) os << " + ";
-            os << tc.second;
-            if (!tc.first.empty())
-                os << " * " << tc.first;
+            if (tc.second != Complex(1) || tc.first.empty())
+                os << tc.second;
+            if (!tc.first.empty()) {
+                if (tc.second != Complex(1))
+                    os << " * ";
+                os << tc.first;
+            }
             isFirst = false;
         }
         if (obj.empty()) os << "0";

src/inclusion.cc

@@ -379,7 +379,9 @@ bool AUTOQ::Automata<AUTOQ::Symbol::Concrete>::operator<=(const Automata<AUTOQ::
 }
 
 template <typename Symbol>
-bool AUTOQ::Automata<Symbol>::operator<=(const Automata<Symbol> &autB) const {}
+bool AUTOQ::Automata<Symbol>::operator<=(const Automata<Symbol> &) const {
+    THROW_AUTOQ_ERROR("The operator <= is not defined for the given type of automata.");
+}
 
 bool AUTOQ::check_validity(Constraint C, const PredicateAutomata::Symbol &ps, const SymbolicAutomata::Symbol &te) {
     std::string str(ps);

src/timbuk_serializer.cc

@@ -9,6 +9,7 @@
  *****************************************************************************/
 
 // AUTOQ headers
+#include <regex>
 #include "autoq/error.hh"
 #include "autoq/aut_description.hh"
 #include "autoq/symbol/concrete.hh"
@@ -77,9 +78,12 @@ std::string TimbukSerializer::Serialize(Automata<Symbol> desc)
             if (it == leafMap.end()) {
                 if constexpr(std::is_same_v<Symbol, AUTOQ::Symbol::Concrete>)
                     result += "c" + std::to_string(leafMap.size()) + " := " + Convert::ToString(sym) + "\n";
-                else if constexpr(std::is_same_v<Symbol, AUTOQ::Symbol::Symbolic>)
-                    result += "e" + std::to_string(leafMap.size()) + " := " + Convert::ToString(sym) + "\n";
-                else if constexpr(std::is_same_v<Symbol, AUTOQ::Symbol::Predicate>)
+                else if constexpr(std::is_same_v<Symbol, AUTOQ::Symbol::Symbolic>) {
+                    auto str = Convert::ToString(sym);
+                    str = std::regex_replace(str, std::regex(R"(([^ ]+)R)"), "real($1)");
+                    str = std::regex_replace(str, std::regex(R"(([^ ]+)I)"), "imag($1)");
+                    result += "e" + std::to_string(leafMap.size()) + " := " + str + "\n";
+                } else if constexpr(std::is_same_v<Symbol, AUTOQ::Symbol::Predicate>)
                     result += "p" + std::to_string(leafMap.size()) + " := " + Convert::ToString(sym) + "\n";
                 leafMap[sym] = leafMap.size();
             }