Boost logo

Boost-Commit :

From: john_at_[hidden]
Date: 2007-10-14 08:54:50


Author: johnmaddock
Date: 2007-10-14 08:54:49 EDT (Sun, 14 Oct 2007)
New Revision: 40012
URL: http://svn.boost.org/trac/boost/changeset/40012

Log:
Renamed two over-long files
simplified test_compile_result.hpp so hopefully Sunpro can cope with it.
Modified Jamfile to static link to regex lib on Sun.
Adjusted Solaris expected error levels.
Added:
   trunk/libs/math/test/compile_test/dist_extreme_val_incl_test.cpp
      - copied unchanged from r40005, /trunk/libs/math/test/compile_test/dist_extreme_value_incl_test.cpp
   trunk/libs/math/test/compile_test/tools_toms748_inc_test.cpp
      - copied unchanged from r40005, /trunk/libs/math/test/compile_test/tools_toms748_solve_inc_test.cpp
Removed:
   trunk/libs/math/test/compile_test/dist_extreme_value_incl_test.cpp
   trunk/libs/math/test/compile_test/tools_toms748_solve_inc_test.cpp
Text files modified:
   trunk/libs/math/test/Jamfile.v2 | 8 ++++++--
   trunk/libs/math/test/compile_test/sf_fpclassify_incl_test.cpp | 2 ++
   trunk/libs/math/test/compile_test/sf_sph_harm_incl_test.cpp | 5 +++++
   trunk/libs/math/test/compile_test/test_compile_result.hpp | 9 +++++++--
   trunk/libs/math/test/compile_test/tools_roots_inc_test.cpp | 4 ++++
   trunk/libs/math/test/compile_test/tools_test_inc_test.cpp | 3 +++
   trunk/libs/math/test/test_bessel_y.cpp | 20 +++++++++++++-------
   trunk/libs/math/test/test_ibeta.cpp | 15 +++++++++++----
   8 files changed, 51 insertions(+), 15 deletions(-)

Modified: trunk/libs/math/test/Jamfile.v2
==============================================================================
--- trunk/libs/math/test/Jamfile.v2 (original)
+++ trunk/libs/math/test/Jamfile.v2 2007-10-14 08:54:49 EDT (Sun, 14 Oct 2007)
@@ -33,6 +33,8 @@
       <include>../../..
       <source>../../regex/build//boost_regex
       <link>shared:<define>BOOST_REGEX_DYN_LINK=1
+ # Sunpro has problems building regex as a shared lib:
+ <toolset>sun:<link>static
       <define>BOOST_ALL_NO_LIB=1
     ;
 
@@ -314,7 +316,7 @@
 compile compile_test/dist_chi_squared_incl_test.cpp ;
 compile compile_test/dist_complement_incl_test.cpp ;
 compile compile_test/dist_exponential_incl_test.cpp ;
-compile compile_test/dist_extreme_value_incl_test.cpp ;
+compile compile_test/dist_extreme_val_incl_test.cpp ;
 compile compile_test/dist_fisher_f_incl_test.cpp ;
 compile compile_test/dist_gamma_incl_test.cpp ;
 compile compile_test/dist_lognormal_incl_test.cpp ;
@@ -374,7 +376,7 @@
 compile compile_test/tools_stats_inc_test.cpp ;
 compile compile_test/tools_test_data_inc_test.cpp ;
 compile compile_test/tools_test_inc_test.cpp ;
-compile compile_test/tools_toms748_solve_inc_test.cpp ;
+compile compile_test/tools_toms748_inc_test.cpp ;
 
 run ../test/common_factor_test.cpp
     ../../test/build//boost_unit_test_framework/<link>static ;
@@ -396,3 +398,5 @@
 
 
 
+
+

Deleted: trunk/libs/math/test/compile_test/dist_extreme_value_incl_test.cpp
==============================================================================
--- trunk/libs/math/test/compile_test/dist_extreme_value_incl_test.cpp 2007-10-14 08:54:49 EDT (Sun, 14 Oct 2007)
+++ (empty file)
@@ -1,23 +0,0 @@
-// Copyright John Maddock 2006.
-// Use, modification and distribution are subject to the
-// Boost Software License, Version 1.0. (See accompanying file
-// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// Basic sanity check that header <boost/math/distributions/extreme_value.hpp>
-// #includes all the files that it needs to.
-//
-#include <boost/math/distributions/extreme_value.hpp>
-//
-// Note this header includes no other headers, this is
-// important if this test is to be meaningful:
-//
-#include "test_compile_result.hpp"
-
-void check()
-{
- TEST_DIST_FUNC(extreme_value)
-}
-
-template class boost::math::extreme_value_distribution<float, boost::math::policies::policy<> >;
-template class boost::math::extreme_value_distribution<double, boost::math::policies::policy<> >;
-template class boost::math::extreme_value_distribution<long double, boost::math::policies::policy<> >;

Modified: trunk/libs/math/test/compile_test/sf_fpclassify_incl_test.cpp
==============================================================================
--- trunk/libs/math/test/compile_test/sf_fpclassify_incl_test.cpp (original)
+++ trunk/libs/math/test/compile_test/sf_fpclassify_incl_test.cpp 2007-10-14 08:54:49 EDT (Sun, 14 Oct 2007)
@@ -13,6 +13,8 @@
 //
 #include "test_compile_result.hpp"
 
+inline void check_result_imp(bool, bool){}
+
 void check()
 {
    check_result<int>(boost::math::fpclassify<float>(f));

Modified: trunk/libs/math/test/compile_test/sf_sph_harm_incl_test.cpp
==============================================================================
--- trunk/libs/math/test/compile_test/sf_sph_harm_incl_test.cpp (original)
+++ trunk/libs/math/test/compile_test/sf_sph_harm_incl_test.cpp 2007-10-14 08:54:49 EDT (Sun, 14 Oct 2007)
@@ -13,6 +13,11 @@
 //
 #include "test_compile_result.hpp"
 
+inline void check_result_imp(std::complex<float>, std::complex<float>){}
+inline void check_result_imp(std::complex<double>, std::complex<double>){}
+inline void check_result_imp(std::complex<long double>, std::complex<long double>){}
+
+
 void check()
 {
    check_result<std::complex<float> >(boost::math::spherical_harmonic<float>(u, i, f, f));

Modified: trunk/libs/math/test/compile_test/test_compile_result.hpp
==============================================================================
--- trunk/libs/math/test/compile_test/test_compile_result.hpp (original)
+++ trunk/libs/math/test/compile_test/test_compile_result.hpp 2007-10-14 08:54:49 EDT (Sun, 14 Oct 2007)
@@ -15,8 +15,13 @@
 static const unsigned u = 0;
 static const int i = 0;
 
-template <class T>
-inline void check_result_imp(T, T){}
+//template <class T>
+//inline void check_result_imp(T, T){}
+
+inline void check_result_imp(float, float){}
+inline void check_result_imp(double, double){}
+inline void check_result_imp(long double, long double){}
+inline void check_result_imp(int, int){}
 
 template <class T1, class T2>
 inline void check_result_imp(T1, T2)

Modified: trunk/libs/math/test/compile_test/tools_roots_inc_test.cpp
==============================================================================
--- trunk/libs/math/test/compile_test/tools_roots_inc_test.cpp (original)
+++ trunk/libs/math/test/compile_test/tools_roots_inc_test.cpp 2007-10-14 08:54:49 EDT (Sun, 14 Oct 2007)
@@ -13,6 +13,10 @@
 //
 #include "test_compile_result.hpp"
 
+inline void check_result_imp(std::pair<float, float>, std::pair<float, float>){}
+inline void check_result_imp(std::pair<double, double>, std::pair<double, double>){}
+inline void check_result_imp(std::pair<long double, long double>, std::pair<long double, long double>){}
+
 void check()
 {
    typedef double (*F)(double);

Modified: trunk/libs/math/test/compile_test/tools_test_inc_test.cpp
==============================================================================
--- trunk/libs/math/test/compile_test/tools_test_inc_test.cpp (original)
+++ trunk/libs/math/test/compile_test/tools_test_inc_test.cpp 2007-10-14 08:54:49 EDT (Sun, 14 Oct 2007)
@@ -14,6 +14,9 @@
 //
 #include "test_compile_result.hpp"
 
+inline void check_result_imp(boost::math::tools::test_result<double>, boost::math::tools::test_result<double>){}
+
+
 void check()
 {
    check_result<float>(boost::math::tools::relative_error<float>(f, f));

Deleted: trunk/libs/math/test/compile_test/tools_toms748_solve_inc_test.cpp
==============================================================================
--- trunk/libs/math/test/compile_test/tools_toms748_solve_inc_test.cpp 2007-10-14 08:54:49 EDT (Sun, 14 Oct 2007)
+++ (empty file)
@@ -1,18 +0,0 @@
-// Copyright John Maddock 2006.
-// Use, modification and distribution are subject to the
-// Boost Software License, Version 1.0. (See accompanying file
-// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// Basic sanity check that header <boost/math/tools/toms748_solve.hpp>
-// #includes all the files that it needs to.
-//
-#include <boost/math/tools/toms748_solve.hpp>
-
-#define T double
-#define Tol boost::math::tools::eps_tolerance<double>
-
-typedef T (*F)(T);
-
-template std::pair<T, T> boost::math::tools::toms748_solve<F, T, Tol >(F, const T&, const T&, const T&, const T&, Tol, boost::uintmax_t&);
-template std::pair<T, T> boost::math::tools::toms748_solve<F, T, Tol>(F f, const T& ax, const T& bx, Tol tol, boost::uintmax_t& max_iter);
-template std::pair<T, T> boost::math::tools::bracket_and_solve_root<F, T, Tol>(F f, const T& guess, const T& factor, bool rising, Tol tol, boost::uintmax_t& max_iter);

Modified: trunk/libs/math/test/test_bessel_y.cpp
==============================================================================
--- trunk/libs/math/test/test_bessel_y.cpp (original)
+++ trunk/libs/math/test/test_bessel_y.cpp 2007-10-14 08:54:49 EDT (Sun, 14 Oct 2007)
@@ -153,13 +153,6 @@
       largest_type, // test type(s)
       "Y[0N] Mathworld.*", // test data group
       ".*", 2000, 2000); // test function
- add_expected_result(
- "GNU.*", // compiler
- ".*", // stdlib
- "Sun.*", // platform
- largest_type, // test type(s)
- "Y[0N].*", // test data group
- ".*", 200, 200); // test function
 
 #ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
    if((std::numeric_limits<double>::digits != std::numeric_limits<long double>::digits)
@@ -206,6 +199,19 @@
       largest_type, // test type(s)
       ".*(Y[nv]|y).*Random.*", // test data group
       ".*", 1500, 1000); // test function
+ //
+ // Fallback for sun has to go after the general cases above:
+ //
+ add_expected_result(
+ "GNU.*", // compiler
+ ".*", // stdlib
+ "Sun.*", // platform
+ largest_type, // test type(s)
+ "Y[0N].*", // test data group
+ ".*", 200, 200); // test function
+ //
+ // General fallback:
+ //
    add_expected_result(
       ".*", // compiler
       ".*", // stdlib

Modified: trunk/libs/math/test/test_ibeta.cpp
==============================================================================
--- trunk/libs/math/test/test_ibeta.cpp (original)
+++ trunk/libs/math/test/test_ibeta.cpp 2007-10-14 08:54:49 EDT (Sun, 14 Oct 2007)
@@ -148,7 +148,7 @@
       "Sun.*", // platform
       largest_type, // test type(s)
       "(?i).*large.*", // test data group
- ".*", 80000, 10000); // test function
+ ".*", 110000, 10000); // test function
    add_expected_result(
       "[^|]*", // compiler
       "[^|]*", // stdlib
@@ -160,9 +160,16 @@
       "[^|]*", // compiler
       "[^|]*", // stdlib
       "Sun.*", // platform
- "real_concept", // test type(s)
- "(?i).*medium.*", // test data group
- ".*", 200, 40); // test function
+ largest_type, // test type(s)
+ "(?i).*medium.*", // test data group
+ ".*", 200, 40); // test function
+ add_expected_result(
+ "[^|]*", // compiler
+ "[^|]*", // stdlib
+ "Sun.*", // platform
+ "real_concept", // test type(s)
+ "(?i).*medium.*", // test data group
+ ".*", 200, 40); // test function
    add_expected_result(
       "[^|]*", // compiler
       "[^|]*", // stdlib


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk