Change printing of vectors from [] to {}

libsemigroups · Oct 27, 2023 · a9151f3 · a9151f3
1 parent b4f1dda
commit a9151f3
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/include/epu.hpp b/include/epu.hpp
@@ -17,6 +17,7 @@
 #define HPCOMBI_EPU_HPP_INCLUDED
 
 #include <array>
+#include <string>
 #include <cassert>
 #include <cstdint>
 #include <functional>  // less<>, equal_to<>
@@ -727,6 +728,8 @@ namespace std {
 
 inline std::ostream &operator<<(std::ostream &stream, HPCombi::epu8 const &a);
 
+inline std::string to_string(HPCombi::epu8 const &a);
+
 /** We also specialize the struct
  *  - std::equal_to<epu8>
  *  - std::not_equal_to<epu8>

diff --git a/include/epu_impl.hpp b/include/epu_impl.hpp
@@ -481,13 +481,19 @@ inline bool is_permutation(epu8 v, const size_t k) {
 namespace std {
 
 inline std::ostream &operator<<(std::ostream &stream, HPCombi::epu8 const &a) {
-    stream << "[" << std::setw(2) << unsigned(a[0]);
+    stream << "{" << std::setw(2) << unsigned(a[0]);
     for (unsigned i = 1; i < 16; ++i)
         stream << "," << std::setw(2) << unsigned(a[i]);
-    stream << "]";
+    stream << "}";
     return stream;
 }
 
+inline std::string to_string(HPCombi::epu8 const &a) {
+    std::ostringstream ss;
+    ss << a;
+    return ss.str();
+}
+
 template <> struct equal_to<HPCombi::epu8> {
     bool operator()(const HPCombi::epu8 &lhs, const HPCombi::epu8 &rhs) const {
         return HPCombi::equal(lhs, rhs);

diff --git a/tests/test_perm_all.cpp b/tests/test_perm_all.cpp
@@ -260,28 +260,28 @@ TEMPLATE_TEST_CASE_METHOD(Fixture1, "operator_insert", "[AllPerm][011]",
                           PermTypes) {
     std::ostringstream out, out2;
     out << Fixture1<TestType>::zero;
-    out2 << "[ 0";
+    out2 << "{ 0";
     for (size_t i = 1; i < Fixture1<TestType>::VectType::Size(); i++)
         out2 << ", 0";
-    out2 << "]";
+    out2 << "}";
     REQUIRE(out.str() == out2.str());
 
     out.str("");
     out2.str("");
     out << Fixture1<TestType>::V01;
-    out2 << "[ 0, 1";
+    out2 << "{ 0, 1";
     for (size_t i = 2; i < Fixture1<TestType>::VectType::Size(); i++)
         out2 << ", 0";
-    out2 << "]";
+    out2 << "}";
     REQUIRE(out.str() == out2.str());
 
     out.str("");
     out2.str("");
     out << Fixture1<TestType>::PPa;
-    out2 << "[ 1, 2, 3, 4, 0";
+    out2 << "{ 1, 2, 3, 4, 0";
     for (size_t i = 5; i < Fixture1<TestType>::VectType::Size(); i++)
         out2 << "," << std::setw(2) << i;
-    out2 << "]";
+    out2 << "}";
     REQUIRE(out.str() == out2.str());
 }