Changeset 301 for trunk/lib/svm


Ignore:
Timestamp:
Apr 30, 2005, 3:39:27 PM (17 years ago)
Author:
Peter
Message:

modified includes in tests

Location:
trunk/lib/svm
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/lib/svm/ConsensusInputRanker.cc

    r298 r301  
    4444    //sort medians and assign id_ and rank_
    4545    sort(median.begin(), median.end(),
    46          cpptools::pair_value_compare<size_t, double>());
     46         utility::pair_value_compare<size_t, double>());
    4747    id_.resize(data.rows());
    4848    rank_.resize(data.rows());
     
    8181    //sort medians and assign id_ and rank_
    8282    sort(median.begin(), median.end(),
    83          cpptools::pair_value_compare<size_t, double>());
     83         utility::pair_value_compare<size_t, double>());
    8484    id_.resize(data.rows());
    8585    rank_.resize(data.rows());
  • trunk/lib/svm/CrossValidation.cc

    r295 r301  
    2424    }
    2525
    26     cpptools::my_uniform_rng a;
     26    utility::my_uniform_rng a;
    2727    random_shuffle(index_negative_.begin(), index_negative_.end(), a);
    2828    random_shuffle(index_positive_.begin(), index_positive_.end(), a);
     
    3333    if (count_==k_){
    3434      count_=0;
    35       cpptools::my_uniform_rng a;
     35      utility::my_uniform_rng a;
    3636      random_shuffle(index_negative_.begin(), index_negative_.end(), a);
    3737      random_shuffle(index_positive_.begin(), index_positive_.end(), a);
     
    5757  }
    5858 
    59 }} // of namespace cpptools and namespace theplu
     59}} // of namespace svm and namespace theplu
  • trunk/lib/svm/InputRanker.cc

    r295 r301  
    4949    //sort the scores and assign id_ and rank_
    5050    sort(score.begin(), score.end(),
    51          cpptools::pair_value_compare<size_t, double>());
     51         utility::pair_value_compare<size_t, double>());
    5252   
    5353    for (size_t i=0; i<nof_genes; i++){
     
    8484    //sort the scores and assign id_ and rank_
    8585    sort(score.begin(), score.end(),
    86          cpptools::pair_value_compare<size_t, double>());
     86         utility::pair_value_compare<size_t, double>());
    8787
    8888    for (size_t i=0; i<nof_genes; i++){
  • trunk/lib/svm/SVM.cc

    r295 r301  
    7474    for (size_t i=0; i<E.size(); i++)
    7575      tmp[i]=i;
    76     cpptools::my_uniform_rng a;
     76    utility::my_uniform_rng a;
    7777    random_shuffle(tmp.begin(), tmp.end(), a);
    7878    for (size_t i=0; i<tmp.size(); i++){
     
    212212   
    213213
    214 }} // of namespace cpptools and namespace theplu
     214}} // of namespace svm and namespace theplu
Note: See TracChangeset for help on using the changeset viewer.