Changeset 120 for trunk/src/InputRanker.cc

Timestamp:

Jul 20, 2004, 6:25:29 PM (18 years ago)

Author:

Peter

Message:

modified to handle weights

File:

• trunk/src/InputRanker.cc (modified) (1 diff)

trunk/src/InputRanker.cc

@@ -39 +39 @@
   std::vector<pair<size_t, double> > score;
   for (size_t i=0; i<nof_genes; i++){ 
-    double area = score_object.score(data_transposed[i], target); 
+    double area = score_object.score(data_transposed[i], target, train_set_); 
+    std::pair<size_t, double> tmp(i,area);
+    score.push_back(tmp);
+  }
+  //sort the scores and assign id_ and rank_
+  sort(score.begin(), score.end(), 
+       pair_value_compare<size_t, double>());
+  
+  for (size_t i=0; i<nof_genes; i++){
+    id_[i]=score[i].first;
+    rank_[id_[i]]=i;            
+  }
+}
+
+InputRanker::InputRanker(const gslapi::matrix& data, 
+                         const gslapi::vector& target, 
+                         const gslapi::matrix& weight, 
+                         Score& score_object,
+                         const std::vector<size_t>& train_set)
+  :train_set_(train_set),
+   id_(std::vector<size_t>(data.rows())),
+   rank_(std::vector<size_t>(data.rows()))
+ 
+{
+  using namespace std;
+  // Peter, this copying and transposing is done since it seems
+  // problematic to get a column vector from a matrix
+  gslapi::matrix data_transposed = data;
+  data_transposed.transpose();
+  gslapi::matrix weight_transposed = weight;
+  weight_transposed.transpose();
+  
+  size_t nof_genes = data_transposed.rows();
+  size_t nof_samples = data_transposed.columns();
+  if (!train_set_.size()){
+    train_set_.resize(nof_samples);
+    for (size_t i=0; i<nof_samples; i++)
+      train_set_[i]=i;  
+  }
+  //scoring each input
+  std::vector<pair<size_t, double> > score;
+  for (size_t i=0; i<nof_genes; i++){ 
+    double area = score_object.score(data_transposed[i], target, 
+                                     weight_transposed[i], train_set_); 
     std::pair<size_t, double> tmp(i,area);
     score.push_back(tmp);