Changeset 301 for trunk/lib/svm

Timestamp:

Apr 30, 2005, 3:39:27 PM (17 years ago)

Author:

Peter

Message:

modified includes in tests

Location:

trunk/lib/svm

Files:

• ConsensusInputRanker.cc (modified) (2 diffs)
• CrossValidation.cc (modified) (3 diffs)
• InputRanker.cc (modified) (2 diffs)
• SVM.cc (modified) (2 diffs)

trunk/lib/svm/ConsensusInputRanker.cc

@@ -44 +44 @@
     //sort medians and assign id_ and rank_
     sort(median.begin(), median.end(), 
-         cpptools::pair_value_compare<size_t, double>());
+         utility::pair_value_compare<size_t, double>());
     id_.resize(data.rows());
     rank_.resize(data.rows());
@@ -81 +81 @@
     //sort medians and assign id_ and rank_
     sort(median.begin(), median.end(), 
-         cpptools::pair_value_compare<size_t, double>());
+         utility::pair_value_compare<size_t, double>());
     id_.resize(data.rows());
     rank_.resize(data.rows());

trunk/lib/svm/CrossValidation.cc

@@ -24 +24 @@
     }
 
-    cpptools::my_uniform_rng a;
+    utility::my_uniform_rng a;
     random_shuffle(index_negative_.begin(), index_negative_.end(), a);
     random_shuffle(index_positive_.begin(), index_positive_.end(), a);
@@ -33 +33 @@
     if (count_==k_){
       count_=0;
-      cpptools::my_uniform_rng a;
+      utility::my_uniform_rng a;
       random_shuffle(index_negative_.begin(), index_negative_.end(), a);
       random_shuffle(index_positive_.begin(), index_positive_.end(), a);
@@ -57 +57 @@
   }
   
-}} // of namespace cpptools and namespace theplu
+}} // of namespace svm and namespace theplu

trunk/lib/svm/InputRanker.cc

@@ -49 +49 @@
     //sort the scores and assign id_ and rank_
     sort(score.begin(), score.end(), 
-         cpptools::pair_value_compare<size_t, double>());
+         utility::pair_value_compare<size_t, double>());
     
     for (size_t i=0; i<nof_genes; i++){
@@ -84 +84 @@
     //sort the scores and assign id_ and rank_
     sort(score.begin(), score.end(), 
-         cpptools::pair_value_compare<size_t, double>());
+         utility::pair_value_compare<size_t, double>());
 
     for (size_t i=0; i<nof_genes; i++){

trunk/lib/svm/SVM.cc

@@ -74 +74 @@
     for (size_t i=0; i<E.size(); i++)
       tmp[i]=i;
-    cpptools::my_uniform_rng a;
+    utility::my_uniform_rng a;
     random_shuffle(tmp.begin(), tmp.end(), a);
     for (size_t i=0; i<tmp.size(); i++){
@@ -212 +212 @@
     
 
-}} // of namespace cpptools and namespace theplu
+}} // of namespace svm and namespace theplu