[Boost-commit] svn:boost r41086 - in trunk: boost/math/tools libs/math/doc/sf_and_dist

From: john_at_[hidden]
Date: 2007-11-14 07:14:20

Author: johnmaddock
Date: 2007-11-14 07:14:19 EST (Wed, 14 Nov 2007)
New Revision: 41086
URL: http://svn.boost.org/trac/boost/changeset/41086

Log:
Merged changes from the Sandbox to Trunk.
Text files modified: 
   trunk/boost/math/tools/toms748_solve.hpp          |    12 ++++++++++--                            
   trunk/libs/math/doc/sf_and_dist/html4_symbols.qbk |     1 +                                       
   trunk/libs/math/doc/sf_and_dist/math.qbk          |     2 +-                                      
   trunk/libs/math/doc/sf_and_dist/roadmap.qbk       |     2 +-                                      
   4 files changed, 13 insertions(+), 4 deletions(-)

Modified: trunk/boost/math/tools/toms748_solve.hpp
==============================================================================
--- trunk/boost/math/tools/toms748_solve.hpp	(original)
+++ trunk/boost/math/tools/toms748_solve.hpp	2007-11-14 07:14:19 EST (Wed, 14 Nov 2007)
@@ -488,7 +488,7 @@
    //
    boost::uintmax_t count = max_iter - 1;
 
-   if((fa < 0) == rising)
+   if((fa < 0) == (guess < 0 ? !rising : rising))
    {
       //
       // Zero is to the right of b, so walk upwards
@@ -551,7 +551,15 @@
    }
    max_iter -= count;
    max_iter += 1;
-   std::pair<T, T> r = toms748_solve(f, a, b, fa, fb, tol, count, pol);
+   std::pair<T, T> r = toms748_solve(
+      f, 
+      (a < 0 ? b : a), 
+      (a < 0 ? a : b), 
+      (a < 0 ? fb : fa), 
+      (a < 0 ? fa : fb), 
+      tol, 
+      count, 
+      pol);
    max_iter += count;
    BOOST_MATH_INSTRUMENT_CODE("max_iter = " << max_iter << " count = " << count);
    return r;

Modified: trunk/libs/math/doc/sf_and_dist/html4_symbols.qbk
==============================================================================
--- trunk/libs/math/doc/sf_and_dist/html4_symbols.qbk	(original)
+++ trunk/libs/math/doc/sf_and_dist/html4_symbols.qbk	2007-11-14 07:14:19 EST (Wed, 14 Nov 2007)
@@ -1,6 +1,7 @@
 [/ Symbols and Greek letters (about 120) from HTML4 ]
 [/ File HTML4_symbols.qbk]
 [/ See http://www.htmlhelp.com/reference/html40/entities/symbols.html]
+[/ http://www.alanwood.net/demos/ent4_frame.html]
 [/ All (except 2 angle brackets) show OK on Firefox 2.0]
 
 [/ See also Latin-1 aka Western (ISO-8859-1) in latin1_symbols.qbk]

Modified: trunk/libs/math/doc/sf_and_dist/math.qbk
==============================================================================
--- trunk/libs/math/doc/sf_and_dist/math.qbk	(original)
+++ trunk/libs/math/doc/sf_and_dist/math.qbk	2007-11-14 07:14:19 EST (Wed, 14 Nov 2007)
@@ -25,7 +25,7 @@
 [include html4_symbols.qbk] [/ just for testing]
 [/include latin1_symbols.qbk] [/ just for testing]
 [include common_overviews.qbk][/ overviews that appear in more than one place!]
-[include roadmap.qbk]
+[include roadmap.qbk] [/ for history]
 
 [def __effects [*Effects: ]]
 [def __formula [*Formula: ]]

Modified: trunk/libs/math/doc/sf_and_dist/roadmap.qbk
==============================================================================
--- trunk/libs/math/doc/sf_and_dist/roadmap.qbk	(original)
+++ trunk/libs/math/doc/sf_and_dist/roadmap.qbk	2007-11-14 07:14:19 EST (Wed, 14 Nov 2007)
@@ -59,7 +59,7 @@
 
 SVN Revisions:
 
-Sandbox and trunk last synchonised at revision: 40161.
+Sandbox and trunk last synchonised at revision: 41065.
 
 ]
 [/