Changeset 825 for trunk/yat/utility/vector.cc

Timestamp:

Mar 19, 2007, 1:46:10 PM (16 years ago)

Author:

Peter

Message:

removed minmax functions and moved shuffle into vector.*

File:

• trunk/yat/utility/vector.cc (modified) (3 diffs)

trunk/yat/utility/vector.cc

@@ -28 +28 @@
 #include "matrix.h"
 #include "utility.h"
+#include "yat/random/random.h"
 
 #include <cassert>
@@ -475 +476 @@
 
 
-  std::pair<double,double> minmax(const vector& v)
-  {
-    std::pair<double,double> minmax;
-    gsl_vector_minmax(v.gsl_vector_p(), &minmax.first, &minmax.second);
-    return minmax;
-  }
-
-
-  std::pair<size_t,size_t> minmax_index(const vector& v)
-  {
-    std::pair<size_t,size_t> minmax;
-    gsl_vector_minmax_index(v.gsl_vector_p(), &minmax.first, &minmax.second);
-    return minmax;
-  }
-
-
   bool nan(const vector& templat, vector& flag)
   {
@@ -515 +500 @@
 
 
+  void shuffle(vector& invec)
+  {
+    vector vec(invec);
+    random::DiscreteUniform rnd;
+    for (size_t i=0; i<vec.size(); i++){
+      size_t index = rnd(vec.size()-i);
+      invec[i]=vec(index);
+      vec(index)=vec(vec.size()-i-1);
+    }
+  }
+
+
   void sort(vector& v)
   {