Changeset 83 for trunk/src/Merge.cc

Timestamp:

May 26, 2004, 4:42:25 PM (19 years ago)

Author:

cecilia

Message:

added test output

File:

• trunk/src/Merge.cc (modified) (4 diffs)

trunk/src/Merge.cc

@@ -41 +41 @@
     weights = calculate_weights();
 
-    // för varje annot: kolla vilka rader den finns på
+    // för varje annot: kolla vilka rader den finns på
     map<string, vector<u_int> > name;
     for (u_int i=0; i<annots_.size(); i++)
       name[annots_[i]].push_back(i);
     
-    // för varje namn:
-    
+    // för varje annot
     for (map<string,vector<u_int> >::const_iterator k=name.begin(); k!=name.end(); k++)
       merging((*k).second, weights);
@@ -53 +52 @@
 
   void Merge::merging(vector<u_int> index, gslapi::matrix& weights){
-    // nya rader i error_ och data_
-    
-    vector<double> new_data;
-    vector<double> new_error;
+
     // merge genes for each assay
     for (u_int j=0; j<nof_assays_; j++){
@@ -68 +64 @@
       }
       double m = sum_wx/sum_w;
-      new_data.push_back(m);
       
       // calc. U
@@ -80 +75 @@
       }
       double U = 1/sum_u+sum_var/(sum_w*sum_w);
-      new_error.push_back(U);
       
       // insert new values