Changeset 825 for trunk/yat/utility

Timestamp:

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

Author:

Peter

Message:

removed minmax functions and moved shuffle into vector.*

Location:

trunk/yat/utility

Files:

• utility.cc (modified) (1 diff)
• utility.h (modified) (1 diff)
• vector.cc (modified) (3 diffs)
• vector.h (modified) (3 diffs)

trunk/yat/utility/utility.cc

@@ -93 +93 @@
 
 
-  std::pair<size_t, size_t> minmax_index(const vector& vec,
-                                         const std::vector<size_t>& subset)
-  {
-    size_t min_index = subset[0];
-    size_t max_index = subset[0];
-    for (unsigned int i=1; i<subset.size(); i++)
-      if (vec[subset[i]] < vec[min_index])
-        min_index = subset[i];
-      else if (vec[subset[i]] > vec[max_index])
-        max_index = subset[i];
-    return std::pair<size_t,size_t>(min_index, max_index);
-  }
-
-
-  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);
-    }
-  }
-
 
 }}} // end of namespace utility, yat and thep

trunk/yat/utility/utility.h

@@ -64 +64 @@
   bool is_nan(const std::string& s);
 
-  /**
-     This function returns the indices of the minimum and maximum
-     values in the sub-vector (defined by \a subset), storing them in
-     imin and imax. When there are several equal minimum or maximum
-     elements then the lowest indices are returned. The returned index
-     is the index from the complete vector (not the sub-vector)
-
-     @return Index corresponding to the smallest and largest value.
-
-     @note If \a subset is emtpy, the result is undefined.
-  */
-  std::pair<size_t,size_t> minmax_index(const vector& vec,
-                                        const std::vector<size_t>& subset);
-
-  /**
-     Randomly shuffles the elements in vector \a invec
-  */
-  void shuffle(vector& invec); 
 
 

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)
   {

trunk/yat/utility/vector.h

@@ -511 +511 @@
 
   /**
-     \brief Get the minimum and maximim values of the vector.
-
-     \return The minimum and maximum values of the vector,
-     respectively.
-  */
-  std::pair<double,double> minmax(const vector&);
-
-  /**
-     \brief Locate the maximum and minumum element in the vector.
-
-     \return The indecies to the element with the minimum and maximum
-     values of the vector, respectively.
-
-     \note Lower index has precedence.
-  */
-  std::pair<size_t,size_t> minmax_index(const vector&);
-
-  /**
      \brief Create a vector \a flag indicating NaN's in another vector
      \a templat.
@@ -541 +523 @@
      \return True if the \a templat vector contains at least one NaN.
   */
-  bool nan(const matrix& templat, matrix& flag);
+  bool nan(const vector& templat, vector& flag);
 
   /**
@@ -552 +534 @@
 
   /**
+     Randomly shuffles the elements in vector \a invec
+  */
+  void shuffle(vector& invec); 
+
+  /**
      Sort the elements in the vector.