Add std::set generator

thejohnfreeman · Sep 14, 2022 · d008ae2 · d008ae2
1 parent f8287b0
commit d008ae2
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/include/autocheck/generator.hpp b/include/autocheck/generator.hpp
@@ -4,6 +4,7 @@
 #include <cassert>
 #include <random>
 #include <vector>
+#include <set>
 #include <iterator>
 #include <limits>
 #include <algorithm>
@@ -240,9 +241,7 @@ namespace autocheck {
   class generator<std::basic_string<CharType>> :
     public string_generator<generator<CharType>> {};
 
-  /* TODO: Generic sequence generator. */
-
-  template <typename Gen>
+  template <typename Gen, template<typename, typename...> class Container = std::vector>
   class list_generator {
     private:
       Gen eltgen;
@@ -251,12 +250,11 @@ namespace autocheck {
       list_generator(const Gen& eltgen = Gen()) :
         eltgen(eltgen) {}
 
-      typedef std::vector<typename Gen::result_type> result_type;
+      typedef Container<typename Gen::result_type> result_type;
 
       result_type operator() (size_t size = 0) {
         result_type rv;
-        rv.reserve(size);
-        std::generate_n(std::back_insert_iterator<result_type>(rv), size,
+        std::generate_n(std::insert_iterator<result_type>(rv, rv.end()), size,
             fix(size, eltgen));
         return rv;
       }
@@ -275,6 +273,9 @@ namespace autocheck {
   template <typename T>
   class generator<std::vector<T>> : public list_generator<generator<T>> {};
 
+  template<typename T>
+  class generator<std::set<T>> : public list_generator<generator<T>, std::set> {};
+
   /* Ordered list combinator. */
 
   namespace detail {

diff --git a/include/autocheck/ostream.hpp b/include/autocheck/ostream.hpp
@@ -4,6 +4,7 @@
 #include <ostream>
 #include <tuple>
 #include <vector>
+#include <set>
 
 /* Forward declarations of output stream operators. */
 
@@ -15,6 +16,9 @@ namespace autocheck {
   template <typename T>
   std::ostream& operator<< (std::ostream& out, const std::vector<T>& seq);
 
+  template <typename T>
+  std::ostream& operator<< (std::ostream& out, const std::set<T>& seq);
+
 }
 
 #endif

diff --git a/include/autocheck/sequence.hpp b/include/autocheck/sequence.hpp
@@ -21,6 +21,22 @@ namespace autocheck {
     return out;
   }
 
+  template <typename T>
+  std::ostream& operator<< (std::ostream& out, const std::set<T>& seq) {
+    out << "[";
+    bool first = true;
+    for (auto b = seq.begin(), e = seq.end(); b != e; ++b) {
+      if (first) {
+        first = false;
+      } else {
+        out << ", ";
+      }
+      out << *b;
+    }
+    out << "]";
+    return out;
+  }
+
 }
 
 #endif