Changeset 1924

Timestamp:

Apr 29, 2009, 5:43:22 PM (12 years ago)

Author:

Peter

Message:

Fixing NaN treatment in BectorMutable::sort (refs #535). The plan with using a local functor did not work out well

Location:

branches/0.5-stable

Files:

• test/vector_test.cc (modified) (2 diffs)
• yat/utility/VectorMutable.cc (modified) (2 diffs)
• yat/utility/VectorMutable.h (modified) (1 diff)

branches/0.5-stable/test/vector_test.cc

@@ -49 +49 @@
   }
 }
+
+void test_sort(test::Suite&);
 
 int main(int argc,char* argv[])
@@ -348 +350 @@
     theplu::yat::utility::Vector vec2(vec);
   }
+
+  // test that sort can handle NaN properly
+  test_sort(suite);
+
   return suite.return_value();
 }
+
+void test_sort(test::Suite& suite)
+{
+  utility::Vector vec(5);
+  vec(0) = 0;
+  vec(1) = 10;
+  vec(2) = std::numeric_limits<double>::quiet_NaN();
+  vec(3) = 2;
+  vec(4) = 5;
+
+  sort(vec);
+  for (size_t i=0; i<vec.size(); ++i)
+    for (size_t j=i+1; j<vec.size(); ++j) {
+      if (vec(j)<vec(i)) {
+        suite.err() << "Vector: '" << vec << "' is not sorted because '" 
+                    << vec(j) << "' is less than '" << vec(i) << "'\n";
+        suite.add(false);
+      }
+    }
+}

branches/0.5-stable/yat/utility/VectorMutable.cc

@@ -6 +6 @@
   Copyright (C) 2005, 2006, 2007 Jari Häkkinen, Peter Johansson, Markus Ringnér
   Copyright (C) 2008 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2009 Peter Johansson
 
   This file is part of the yat library, http://dev.thep.lu.se/trac/yat
@@ -172 +173 @@
   void sort(VectorMutable& invec)
   {
+    // Avoid problems with NaN (#535)
+    size_t nof_nans=0;
+    for (size_t i=0; i<invec.size(); ++i)
+      if (std::isnan(invec(i))) {
+        invec(i) = std::numeric_limits<double>::infinity();
+        ++nof_nans;
+      }
     std::sort(invec.begin(), invec.end());
+    for (size_t i=invec.size()-nof_nans; i<invec.size(); ++i)
+      invec(i) = std::numeric_limits<double>::quiet_NaN();
   }
 

branches/0.5-stable/yat/utility/VectorMutable.h

@@ -232 +232 @@
   /**
      Sort the elements in the VectorMutable \a vec
+
+     NaNs are treated as infinity
   */
   void sort(VectorMutable& vec);