Changeset 2210 for trunk/yat/normalizer/qQuantileNormalizer.h

Timestamp:

Mar 5, 2010, 11:59:01 PM (13 years ago)

Author:

Peter

Message:

fixes #281. Change all throws of std::runtime_error to theplu::yat::utility::runtime_error to clarify that the error comes from yat. Also removed some throw declarations.

File:

• trunk/yat/normalizer/qQuantileNormalizer.h (modified) (4 diffs)

trunk/yat/normalizer/qQuantileNormalizer.h

@@ -27 +27 @@
 #include "yat/utility/DataIterator.h"
 #include "yat/utility/DataWeight.h"
+#include "yat/utility/Exception.h"
 #include "yat/utility/iterator_traits.h"
 #include "yat/utility/sort_index.h"
@@ -232 +233 @@
     : target_(Partitioner(first, last, Q))
   {
-    utility::yat_assert<std::runtime_error>(Q>2,
-                                            "qQuantileNormalizer: Q too small");
+    YAT_ASSERT(Q>2);
   }
 
@@ -261 +261 @@
     utility::check_iterator_is_unweighted(result);
     size_t N = last-first;
-    utility::yat_assert<std::runtime_error>
-      (N >= target_.size(), "qQuantileNormalizer: Input range too small");
+    YAT_ASSERT(N >= target_.size());
 
     std::vector<size_t> sorted_index(last-first);
@@ -296 +295 @@
       size_t si = sorted_index[i];
       
-      yat_assert<std::runtime_error>((i+0.5)/N>idx(0), 
-                               "qQuantileNormalizer: invalid input to cspline");
+      YAT_ASSERT((i+0.5)/N>idx(0));
       result[si] = first[si] - cspline.evaluate((i+0.5)/N);
     }