[Boost-commit] svn:boost r68367 - branches/release/boost/math/distributions/detail

Subject: [Boost-commit] svn:boost r68367 - branches/release/boost/math/distributions/detail
From: john_at_[hidden]
Date: 2011-01-22 12:31:30

Author: johnmaddock
Date: 2011-01-22 12:31:29 EST (Sat, 22 Jan 2011)
New Revision: 68367
URL: http://svn.boost.org/trac/boost/changeset/68367

Log:
Merge fix for issue 5095.
Refs #5095.
Text files modified: 
   branches/release/boost/math/distributions/detail/hypergeometric_pdf.hpp |    74 +++++++++++++++++++++++++++++++++++---- 
   1 files changed, 65 insertions(+), 9 deletions(-)

Modified: branches/release/boost/math/distributions/detail/hypergeometric_pdf.hpp
==============================================================================
--- branches/release/boost/math/distributions/detail/hypergeometric_pdf.hpp	(original)
+++ branches/release/boost/math/distributions/detail/hypergeometric_pdf.hpp	2011-01-22 12:31:29 EST (Sat, 22 Jan 2011)
@@ -16,6 +16,10 @@
 #include <boost/math/special_functions/prime.hpp>
 #include <boost/math/policies/error_handling.hpp>
 
+#ifdef BOOST_MATH_INSTRUMENT
+#include <typeinfo>
+#endif
+
 namespace boost{ namespace math{ namespace detail{
 
 template <class T, class Func>
@@ -49,6 +53,13 @@
 {
    BOOST_MATH_STD_USING
 
+   BOOST_MATH_INSTRUMENT_FPU
+   BOOST_MATH_INSTRUMENT_VARIABLE(x);
+   BOOST_MATH_INSTRUMENT_VARIABLE(r);
+   BOOST_MATH_INSTRUMENT_VARIABLE(n);
+   BOOST_MATH_INSTRUMENT_VARIABLE(N);
+   BOOST_MATH_INSTRUMENT_VARIABLE(typeid(Lanczos).name());
+
    T bases[9] = {
       T(n) + Lanczos::g() + 0.5f,
       T(r) + Lanczos::g() + 0.5f,
@@ -61,15 +72,15 @@
       1 / (T(N - n - r + x) + Lanczos::g() + 0.5f)
    };
    T exponents[9] = {
-      n + 0.5f,
-      r + 0.5f,
-      N - n + 0.5f,
-      N - r + 0.5f,
-      N + 0.5f,
-      x + 0.5f,
-      n - x + 0.5f,
-      r - x + 0.5f,
-      N - n - r + x + 0.5f
+      n + T(0.5f),
+      r + T(0.5f),
+      N - n + T(0.5f),
+      N - r + T(0.5f),
+      N + T(0.5f),
+      x + T(0.5f),
+      n - x + T(0.5f),
+      r - x + T(0.5f),
+      N - n - r + x + T(0.5f)
    };
    int base_e_factors[9] = {
       -1, -1, -1, -1, 1, 1, 1, 1, 1
@@ -77,7 +88,29 @@
    int sorted_indexes[9] = {
       0, 1, 2, 3, 4, 5, 6, 7, 8
    };
+#ifdef BOOST_MATH_INSTRUMENT
+   BOOST_MATH_INSTRUMENT_FPU
+   for(unsigned i = 0; i < 9; ++i)
+   {
+      BOOST_MATH_INSTRUMENT_VARIABLE(i);
+      BOOST_MATH_INSTRUMENT_VARIABLE(bases[i]);
+      BOOST_MATH_INSTRUMENT_VARIABLE(exponents[i]);
+      BOOST_MATH_INSTRUMENT_VARIABLE(base_e_factors[i]);
+      BOOST_MATH_INSTRUMENT_VARIABLE(sorted_indexes[i]);
+   }
+#endif
    std::sort(sorted_indexes, sorted_indexes + 9, sort_functor<T>(exponents));
+#ifdef BOOST_MATH_INSTRUMENT
+   BOOST_MATH_INSTRUMENT_FPU
+   for(unsigned i = 0; i < 9; ++i)
+   {
+      BOOST_MATH_INSTRUMENT_VARIABLE(i);
+      BOOST_MATH_INSTRUMENT_VARIABLE(bases[i]);
+      BOOST_MATH_INSTRUMENT_VARIABLE(exponents[i]);
+      BOOST_MATH_INSTRUMENT_VARIABLE(base_e_factors[i]);
+      BOOST_MATH_INSTRUMENT_VARIABLE(sorted_indexes[i]);
+   }
+#endif
 
    do{
       exponents[sorted_indexes[0]] -= exponents[sorted_indexes[1]];
@@ -88,6 +121,17 @@
       }
       base_e_factors[sorted_indexes[1]] += base_e_factors[sorted_indexes[0]];
       bubble_down_one(sorted_indexes, sorted_indexes + 9, sort_functor<T>(exponents));
+
+#ifdef BOOST_MATH_INSTRUMENT
+      for(unsigned i = 0; i < 9; ++i)
+      {
+         BOOST_MATH_INSTRUMENT_VARIABLE(i);
+         BOOST_MATH_INSTRUMENT_VARIABLE(bases[i]);
+         BOOST_MATH_INSTRUMENT_VARIABLE(exponents[i]);
+         BOOST_MATH_INSTRUMENT_VARIABLE(base_e_factors[i]);
+         BOOST_MATH_INSTRUMENT_VARIABLE(sorted_indexes[i]);
+      }
+#endif
    }while(exponents[sorted_indexes[1]] > 1);
 
    //
@@ -106,6 +150,18 @@
          --j;
       }
       --j;
+
+#ifdef BOOST_MATH_INSTRUMENT
+      BOOST_MATH_INSTRUMENT_VARIABLE(j);
+      for(unsigned i = 0; i < 9; ++i)
+      {
+         BOOST_MATH_INSTRUMENT_VARIABLE(i);
+         BOOST_MATH_INSTRUMENT_VARIABLE(bases[i]);
+         BOOST_MATH_INSTRUMENT_VARIABLE(exponents[i]);
+         BOOST_MATH_INSTRUMENT_VARIABLE(base_e_factors[i]);
+         BOOST_MATH_INSTRUMENT_VARIABLE(sorted_indexes[i]);
+      }
+#endif
    }
 
 #ifdef BOOST_MATH_INSTRUMENT