Changeset 1004 for trunk/yat/classifier

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/classifier

Files:

• CrossValidationSampler.cc (modified) (1 diff)
• FeatureSelectorRandom.cc (modified) (1 diff)
• SVindex.cc (modified) (1 diff)
• Target.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());
   }