Changeset 1004

Timestamp:

Jan 23, 2008, 7:24:53 PM (16 years ago)

Author:

Peter

Message:

adding a wrapper around std::random_shuffle that uses the RNG class. Changed all calls to random_shuffle to use the added function. Acctually all calls already used the RNG class so essentially this change is only cosmetic, but by providing a function I think it is easier to avoid using multiple random generators.

Location:

trunk/yat

Files:

• classifier/CrossValidationSampler.cc (modified) (1 diff)
• classifier/FeatureSelectorRandom.cc (modified) (1 diff)
• classifier/SVindex.cc (modified) (1 diff)
• classifier/Target.cc (modified) (1 diff)
• random/random.h (modified) (2 diffs)
• statistics/KolmogorovSmirnov.cc (modified) (1 diff)
• utility/vector.cc (modified) (1 diff)

trunk/yat/classifier/CrossValidationSampler.cc

@@ -66 +66 @@
     my_begin.push_back(target.size());
 
-    random::DiscreteUniform rnd;
-
     for (size_t i=0; i<N; ) {
       // shuffle indices within class each class
       for (size_t j=0; j+1<my_begin.size(); ++j)
-        random_shuffle(v.begin()+my_begin[j],v.begin()+my_begin[j+1],rnd);
+        random::random_shuffle(v.begin()+my_begin[j],v.begin()+my_begin[j+1]);
       
       for (size_t part=0; part<k && i<N; i++, part++) {

trunk/yat/classifier/FeatureSelectorRandom.cc

@@ -66 +66 @@
     for (size_t i=0; i<total_N; ++i)
       features_.push_back(i);
-    random::DiscreteUniform rnd;
     // Peter should use random_sample here, but not included in std
-    std::random_shuffle(features_.begin(), features_.end(), rnd);
+    random::random_shuffle(features_.begin(), features_.end());
     features_.resize(N_);
   }

trunk/yat/classifier/SVindex.cc

@@ -120 +120 @@
   void SVindex::shuffle(void)
   {
-    random::DiscreteUniform a;
-    random_shuffle(vec_.begin()+nof_sv_, vec_.end(), a); 
+    random::random_shuffle(vec_.begin()+nof_sv_, vec_.end()); 
   }
 

trunk/yat/classifier/Target.cc

@@ -167 +167 @@
   void Target::random_shuffle(void)
   {
-    random::DiscreteUniform d;
-    std::random_shuffle(classes_.begin(), classes_.end(),d);
+    random::random_shuffle(classes_.begin(), classes_.end());
   }
 

trunk/yat/random/random.h

@@ -30 +30 @@
 #include <gsl/gsl_randist.h>
 
+#include <algorithm>
 #include <string>
 
@@ -555 +556 @@
   };
 
+  /**
+     \brief Convenience function to shuffle a range with singleton RNG.
+
+     Wrapper around std::random_shuffle using DiscreteUniform as
+     random generator and thereby using the underlying RNG class,
+     which is singleton.
+   */
+  template<typename T>
+  void random_shuffle(T first, T last)
+  {
+    DiscreteUniform rnd;
+    std::random_shuffle(first, last, rnd);
+  }
+
 }}} // of namespace random, yat, and theplu
 

trunk/yat/statistics/KolmogorovSmirnov.cc

@@ -1 +1 @@
 // $Id$
+
+/*
+  Copyright (C) 2008 Peter Johansson
+
+  This file is part of the yat library, http://trac.thep.lu.se/yat
+
+  The yat library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License as
+  published by the Free Software Foundation; either version 2 of the
+  License, or (at your option) any later version.
+
+  The yat library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+  02111-1307, USA.
+*/
 
 #include "KolmogorovSmirnov.h"

trunk/yat/utility/vector.cc

@@ -521 +521 @@
   void shuffle(vector& invec)
   {
-    random::DiscreteUniform rnd;
-    std::random_shuffle(invec.begin(), invec.end(), rnd);
+    random::random_shuffle(invec.begin(), invec.end());
   }