Changeset 3321

Timestamp:

Sep 19, 2014, 8:59:59 AM (9 years ago)

Author:

Peter

Message:

fixes bug #815

Location:

branches/0.12-stable

Files:

• test/normalization.cc (modified) (3 diffs)
• yat/normalizer/QuantileNormalizer.cc (modified) (2 diffs)

branches/0.12-stable/test/normalization.cc

@@ -3 +3 @@
 /*
   Copyright (C) 2008, 2009 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2010, 2012 Peter Johansson
+  Copyright (C) 2010, 2012, 2014 Peter Johansson
 
   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -289 +289 @@
 {
   suite.err() << "Testing QuantileNormalizer\n";
-  
   utility::Matrix m(2,2);
   m(0,0) = 0;
@@ -305 +304 @@
   suite.err() << "Testing m(1,1)\n";
   suite.add(suite.equal(m(1,1), 2));
+
+  // testing with landscape-shaped data matrix
+  m.resize(2, 10);
+  qn(m, m);
 }
 

branches/0.12-stable/yat/normalizer/QuantileNormalizer.cc

@@ -4 +4 @@
   Copyright (C) 2005, 2006 Jari Häkkinen, Markus Ringnér
   Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2012 Peter Johansson
+  Copyright (C) 2012, 2014 Peter Johansson
 
   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -43 +43 @@
     assert(data.columns()==result.columns());
 
-    std::vector<std::vector<size_t> > index(data.rows());
-    for (size_t column=0; column<data.columns(); ++column)
+    std::vector<std::vector<size_t> > index(data.columns());
+    for (size_t column=0; column<data.columns(); ++column) {
+      assert(column<index.size());
       utility::sort_index(index[column], data.column_const_view(column));
-      
+    }
+
     for (size_t rank=0; rank<data.rows(); ++rank) {
       statistics::Averager a;
-      for (size_t column=0; column<data.columns(); ++column)
+      for (size_t column=0; column<data.columns(); ++column) {
+        assert(column<index.size());
+        assert(rank<index[column].size());
         a.add(data(index[column][rank], column));
+      }
       double mean = a.mean();
-      for (size_t column=0; column<data.columns(); ++column)
+      for (size_t column=0; column<data.columns(); ++column) {
+        assert(column<index.size());
         result(index[column][rank], column) = mean;
+      }
     }
   }