@@ -22,38 +22,12 @@ static std::vector< std::vector<unsigned> > sampleIndices(unsigned n, unsigned n

     for (unsigned i = 0; i < (n - 1); ++i)

     {

-        std::vector<unsigned> set = gaps::random::sample(toBeSampled, (int) (n - 1) / (nSets - 1));

-        sampleIndices.push_back(set);

-        for(std::vector<unsigned>::iterator it = set.begin(); it != set.end(); ++it)

-        {

-            unsigned index = *it;

-            std::vector<unsigned>::iterator it2 = toBeSampled.begin();

-            while(it2 != toBeSampled.end())

-            {

-                if(*it2 == index)

-                {

-                    it2 = toBeSampled.erase(it);

-                }

-                else

-                    it2++;

-            }

-        }

+        sampleIndices.push_back(gaps::random::sample(toBeSampled, (int) (n - 1) / (nSets - 1)));

     }

-    std::vector<unsigned> set = gaps::random::sample(toBeSampled, (n - 1) % (nSets - 1));

-    sampleIndices.push_back(set);

-    for(std::vector<unsigned>::iterator it = set.begin(); it != set.end(); ++it)

+

+    if (!toBeSampled.empty())

     {

-        unsigned index = *it;

-        std::vector<unsigned>::iterator it2 = toBeSampled.begin();

-        while(it2 != toBeSampled.end())

-        {

-            if(*it2 == index)

-            {

-                it2 = toBeSampled.erase(it);

-            }

-            else

-                it2++;

-        }

+        sampleIndices.push_back(toBeSampled);

     }

     return sampleIndices;

@@ -21,6 +21,7 @@

 #include <boost/random/uniform_real_distribution.hpp>

 #include <stdint.h>

+#include <algorithm>

 #ifdef __GAPS_OPENMP__

     #include <omp.h>

@@ -180,7 +181,20 @@ float gaps::random::inverseGammaSample(float a, float b, float mean, float sd)

     return gaps::random::q_gamma(u, mean, sd);

 }

-std::vector<unsigned> sample(const std::vector<unsigned> &elements, unsigned n) {

+std::vector<unsigned> sample(std::vector<unsigned> &elements, unsigned n) {

+    std::vector<unsigned> sampleVect;

+    for (unsigned i = 0; i < n; ++i)

+    {

+        if (elements.empty()) {

+            break;

+        }

+        unsigned sampleIndex = gaps::random::uniform64(0, elements.size());

+        sampleVect.push_back(elements.at(sampleIndex));

+        elements.erase(std::remove(elements.begin(), elements.end(), elements.at(sampleIndex)), elements.end());

+    }

+    return sampleVect;

+

+    /*

     std::vector<unsigned> sampleVect;

     std::vector<unsigned> sampledIndices;

     for (unsigned i = 0; i < n; ++i)

@@ -197,4 +211,5 @@ std::vector<unsigned> sample(const std::vector<unsigned> &elements, unsigned n)

         }

     }

     return sampleVect;

+    */

 }