Changeset 3571

Timestamp:

Jan 10, 2017, 6:47:56 AM (7 years ago)

Author:

Peter

Message:

closes #875

With new version of sort_index (since yat 0.13) allows sorting ranges
of DataWeight?, which behaves as desired, use that function rather than
copying input range.

File:

• trunk/yat/normalizer/qQuantileNormalizer.h (modified) (1 diff)

trunk/yat/normalizer/qQuantileNormalizer.h

@@ -328 +328 @@
 
     std::vector<size_t> sorted_index(last-first);
-    // Code to avoid problems with NaN (ticket:535)
-    // utility::sort_index(utility::data_iterator(first),
-    //                     utility::data_iterator(last), sorted_index);
-    // ... above statement replaced below code block
-    {
-      using namespace utility;
-      std::vector<double> vec;
-      vec.reserve(std::distance(first, last));
-      std::copy(utility::data_iterator(first), utility::data_iterator(last),
-                std::back_inserter(vec));
-      for (std::vector<double>::iterator i(vec.begin()); i!=vec.end(); ++i)
-        if (std::isnan(*i))
-          *i = std::numeric_limits<double>::infinity();
-      utility::sort_index(vec.begin(), vec.end(), sorted_index);
-    }
-    // end Code to avoid problems with NaN (ticket:535)
+    utility::sort_index(first, last, sorted_index);
 
     utility::Vector diff(source.averages());