Made the random_subset_selector serializable.

--HG--
extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%403749

dlib/statistics/random_subset_selector.h

@@ -9,6 +9,8 @@
 #include "../algs.h"
 #include "../memory_manager.h"
 #include "../string.h"
+#include "../serialize.h"
+#include <iostream>
 
 namespace dlib
 {
@@ -171,6 +173,18 @@ namespace dlib
             std::swap(_next_add_accepts, a._next_add_accepts);
         }
 
+        template <typename T1, typename T2>
+        friend void serialize (
+            const random_subset_selector<T1,T2>& item,
+            std::ostream& out
+        );
+
+        template <typename T1, typename T2>
+        friend void deserialize (
+            random_subset_selector<T1,T2>& item,
+            std::istream& in 
+        );
+
     private:
 
         void update_next_add_accepts (
@@ -228,6 +242,34 @@ namespace dlib
         random_subset_selector<T,rand_type>& b
     ) { a.swap(b); }
 
+// ----------------------------------------------------------------------------------------
+
+    template <typename T1, typename T2>
+    void serialize (
+        const random_subset_selector<T1,T2>& item,
+        std::ostream& out
+    )
+    {
+        serialize(item.items, out);
+        serialize(item._max_size, out);
+        serialize(item.count, out);
+        serialize(item.rnd, out);
+        serialize(item._next_add_accepts, out);
+    }
+
+    template <typename T1, typename T2>
+    void deserialize (
+        random_subset_selector<T1,T2>& item,
+        std::istream& in 
+    )
+    {
+        deserialize(item.items, in);
+        deserialize(item._max_size, in);
+        deserialize(item.count, in);
+        deserialize(item.rnd, in);
+        deserialize(item._next_add_accepts, in);
+    }
+
 // ----------------------------------------------------------------------------------------
 
     template <

dlib/statistics/random_subset_selector_abstract.h

@@ -238,6 +238,30 @@ namespace dlib
         provides global swap support
     !*/
 
+    template <
+        typename T,
+        typename rand_type 
+        >
+    void serialize (
+        const random_subset_selector<T,rand_type>& item,
+        std::ostream& out 
+    );   
+    /*!
+        provides serialization support 
+    !*/
+
+    template <
+        typename T,
+        typename rand_type 
+        >
+    void deserialize (
+        random_subset_selector<T,rand_type>& item,
+        std::istream& in
+    );   
+    /*!
+        provides deserialization support 
+    !*/
+
 // ----------------------------------------------------------------------------------------
 
     template <

dlib/test/statistics.cpp

@@ -8,6 +8,7 @@
 #include <ctime>
 #include <dlib/statistics.h>
 #include <dlib/rand.h>
+#include <algorithm>
 
 #include "tester.h"
 
@@ -59,6 +60,35 @@ namespace
                 double ratio = rs.mean()/rs2.mean();
                 DLIB_TEST_MSG(0.96 < ratio  && ratio < 1.04, " ratio: " << ratio);
             }
+
+
+            {
+                random_subset_selector<int> r1, r2;
+                r1.set_max_size(300);
+                for (int i = 0; i < 4000; ++i)
+                    r1.add(i);
+
+                ostringstream sout;
+                serialize(r1, sout);
+                istringstream sin(sout.str());
+                deserialize(r2, sin);
+
+                DLIB_TEST(r1.size() == r2.size());
+                DLIB_TEST(r1.max_size() == r2.max_size());
+                DLIB_TEST(r1.next_add_accepts() == r2.next_add_accepts());
+                DLIB_TEST(std::equal(r1.begin(), r1.end(), r2.begin()));
+
+                for (int i = 0; i < 4000; ++i)
+                {
+                    r1.add(i);
+                    r2.add(i);
+                }
+
+                DLIB_TEST(r1.size() == r2.size());
+                DLIB_TEST(r1.max_size() == r2.max_size());
+                DLIB_TEST(r1.next_add_accepts() == r2.next_add_accepts());
+                DLIB_TEST(std::equal(r1.begin(), r1.end(), r2.begin()));
+            }
         }
 
         void test_random_subset_selector2 ()