Changeset 560

Timestamp:

Mar 13, 2006, 3:36:54 PM (17 years ago)

Author:

Markus Ringnér

Message:

Minor fixes plus fixed bug in ConsensusInputRanker?

Location:

trunk/lib

Files:

• classifier/ConsensusInputRanker.cc (modified) (2 diffs)
• classifier/CrossSplitter.h (modified) (2 diffs)
• classifier/InputRanker.cc (modified) (2 diffs)
• classifier/MatrixLookup.h (modified) (2 diffs)
• statistics/SNR.cc (modified) (1 diff)

trunk/lib/classifier/ConsensusInputRanker.cc

@@ -16 +16 @@
 #include <utility>
 #include <vector>
-
+#include <cmath>
 
 namespace theplu {
@@ -32 +32 @@
         input_rankers_.push_back(InputRanker(sampler.training_data(), 
                                              sampler.training_target(), 
-                                             score_object));
+                                             score_object,
+                                             sampler.training_weight()));
       }
       else{
         input_rankers_.push_back(InputRanker(sampler.training_data(), 
                                              sampler.training_target(), 
-                                             score_object));
+                                             score_object));        
       }
       sampler.next();

trunk/lib/classifier/CrossSplitter.h

@@ -115 +115 @@
     /// @note if state is invalid the result is undefined
     ///
-    inline const DataLookup2D& training_weight(void) const 
+    inline const MatrixLookup& training_weight(void) const 
     { assert(more()); return *(training_weight_[state_]); } 
 
@@ -147 +147 @@
     /// @note if state is invalid the result is undefined
     ///
-    inline const DataLookup2D& validation_weight(void) const 
+    inline const MatrixLookup& validation_weight(void) const 
     { assert(more()); return *(validation_weight_[state_]); } 
 

trunk/lib/classifier/InputRanker.cc

@@ -13 +13 @@
 #include <vector>
 
+#include <cmath>
 
 namespace theplu {
@@ -59 +60 @@
     for (size_t i=0; i<nof_genes; i++) {
       double area = score_object.score(target, DataLookup1D(data,i,true),
-                                       DataLookup1D(weight,i,true));
+                                       DataLookup1D(weight,i,true));      
+      assert(!std::isnan(area));
       std::pair<double, size_t> tmp(area,i);
       score.push_back(tmp);

trunk/lib/classifier/MatrixLookup.h

@@ -85 +85 @@
 
     ///
-    /// Constructor taking the column (default) or row index vector as
+    /// Constructor taking the column or row index vector (default) as
     /// input. If @a row is false the created MatrixLookup will have
     /// equally many rows as @a matrix.
@@ -94 +94 @@
     ///
     MatrixLookup(const MatrixLookup& matrix, const std::vector<size_t>&, 
-                 const bool row=false);
+                 const bool row_vectors=true);
 
     ///

trunk/lib/statistics/SNR.cc

@@ -53 +53 @@
     double diff = positive.mean() - negative.mean();
     double denom=positive.std()+negative.std();
+    assert(denom);
     score_=diff/denom;
     if(positive.sum_w()==0 || negative.sum_w()==0)