Merge pull request #188 from MikeMirzayanov/HeRaNO-fix-171-wany

rnd.any/wany use distance/advance instead of -/+

testlib.h

@@ -173,6 +173,7 @@ const char *latestFeatures[] = {
 #include <map>
 #include <set>
 #include <cmath>
+#include <iterator>
 #include <iostream>
 #include <sstream>
 #include <fstream>
@@ -901,7 +902,6 @@ public:
         int size = int(c.size());
         if (size <= 0)
             __testlib_fail("random_t::any(const Container& c): c.size() must be positive");
-        //return *(c.begin() + next(size));
         typename Container::const_iterator it = c.begin();
         std::advance(it, next(size));
         return *it;
@@ -910,10 +910,9 @@ public:
     /* Returns random element from iterator range. */
     template<typename Iter>
     typename Iter::value_type any(const Iter &begin, const Iter &end) {
-        int size = int(end - begin);
+        int size = static_cast<int>(std::distance(begin, end));
         if (size <= 0)
             __testlib_fail("random_t::any(const Iter& begin, const Iter& end): range must have positive length");
-        // return *(begin + next(size));
         Iter it = begin;
         std::advance(it, next(size));
         return *it;
@@ -1105,17 +1104,21 @@ public:
         int size = int(c.size());
         if (size <= 0)
             __testlib_fail("random_t::wany(const Container& c, int type): c.size() must be positive");
-        return *(c.begin() + wnext(size, type));
+        typename Container::const_iterator it = c.begin();
+        std::advance(it, wnext(size, type));
+        return *it;
     }
 
     /* Returns weighted random element from iterator range. */
     template<typename Iter>
     typename Iter::value_type wany(const Iter &begin, const Iter &end, int type) {
-        int size = int(end - begin);
+        int size = static_cast<int>(std::distance(begin, end));
         if (size <= 0)
             __testlib_fail(
                     "random_t::any(const Iter& begin, const Iter& end, int type): range must have positive length");
-        return *(begin + wnext(size, type));
+        Iter it = begin;
+        std::advance(it, wnext(size, type));
+        return *it;
     }
 
     /* Returns random permutation of the given size (values are between `first` and `first`+size-1)*/

tests/test-003_run-rnd/refs/r1/stdout

@@ -54,3 +54,15 @@ vutwaahqooeqoxzxwetlpecqiwgdbogiqqulttysyohwhzxzphvsfmnplizxoebzcvvfyppqbhxjksuz
 2116
 441
 e
+a
+c
+f
+e
+d
+b
+f
+c
+f
+f
+b
+b

tests/test-003_run-rnd/refs/r2/stdout

@@ -144,3 +144,15 @@ clizwkchataumicxkohcrpqnyrjyzbjvsypznpembvkkkbyzvzckcmhbjbuopfbwbkntswhwsdfzabjg
 3249
 3481
 e
+d
+c
+f
+d
+a
+a
+e
+e
+f
+f
+d
+c

tests/test-003_run-rnd/src/gen.cpp

@@ -127,11 +127,45 @@ int main(int argc, char* argv[])
     std::cout << rnd.wnext((signed long long) 42, (signed long long) 2011, 4) << std::endl;
     std::cout << rnd.wnext((signed int) 42, (signed int) 2011, 4) << std::endl;
     std::cout << rnd.wnext((signed short) 42, (signed short) 2011, 4) << std::endl;
-    
+
     println(rnd.wany(a, 1));
     println(rnd.wany(a, -1));
-    
+
     set<string> b;
     b.insert("a"); b.insert("b"); b.insert("c"); b.insert("d"); b.insert("e"); b.insert("f"); b.insert("g");
     println(rnd.any(b));
+
+    {
+        std::set<std::string> string_set;
+        string_set.insert("a");
+        string_set.insert("b");
+        string_set.insert("c");
+        string_set.insert("d");
+        string_set.insert("e");
+        string_set.insert("f");
+
+        std::cout << rnd.any(string_set) << std::endl;
+        std::cout << rnd.any(string_set.begin(), string_set.end()) << std::endl;
+        std::cout << rnd.wany(string_set, 1) << std::endl;
+        std::cout << rnd.wany(string_set.begin(), string_set.end(), 1) << std::endl;
+        std::cout << rnd.wany(string_set, -1) << std::endl;
+        std::cout << rnd.wany(string_set.begin(), string_set.end(), -1) << std::endl;
+    }
+
+    {
+        std::multiset<std::string> string_multiset;
+        string_multiset.insert("a");
+        string_multiset.insert("b"); string_multiset.insert("b");
+        string_multiset.insert("c"); string_multiset.insert("c"); string_multiset.insert("c");
+        string_multiset.insert("d");
+        string_multiset.insert("e"); string_multiset.insert("e"); string_multiset.insert("e");
+        string_multiset.insert("f"); string_multiset.insert("f"); string_multiset.insert("f"); string_multiset.insert("f");
+
+        std::cout << rnd.any(string_multiset) << std::endl;
+        std::cout << rnd.any(string_multiset.begin(), string_multiset.end()) << std::endl;
+        std::cout << rnd.wany(string_multiset, 2) << std::endl;
+        std::cout << rnd.wany(string_multiset.begin(), string_multiset.end(), 1) << std::endl;
+        std::cout << rnd.wany(string_multiset, -1) << std::endl;
+        std::cout << rnd.wany(string_multiset.begin(), string_multiset.end(), -2) << std::endl;
+    }
 }