Changeset 3900

Timestamp:

May 3, 2020, 10:29:25 AM (3 years ago)

Author:

Peter

Message:

closes #944; add configure check whether class is availabale in boost and exclude typedef if not. Lift out test for that typedef to separate test so it can be skipped (without skipping all sister tests) when boost is old.

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• test/Makefile.am (modified) (1 diff)
• test/non_central_chi_squared_distribution.cc (added)
• test/random_distribution.cc (modified) (1 diff)
• yat/random/ContinuousDistribution.h (modified) (2 diffs)
• yat/utility/config_public.h.in (modified) (1 diff)

trunk/configure.ac

@@ -414 +414 @@
     AC_MSG_RESULT([no])
   ])
-
+# test if boost::random::non_central_chi_squared_distribution<> is
+# available in header file
+# <boost/random/non_central_chi_squared_distribution.hpp>
+AC_COMPILE_IFELSE([
+  AC_LANG_PROGRAM(
+      [@%:@include <boost/random/non_central_chi_squared_distribution.hpp>],
+      [boost::random::non_central_chi_squared_distribution<> foo])
+], [
+  AC_DEFINE([YAT_HAVE_BOOST_RANDOM_NON_CENTRAL_CHI_SQUARED_DISTRIBUTION],
+            [1],
+            [Define to 1 if boost::random::non_central_chi_squared_distribution<> is available])
+])
+
+#      AC_DEFINE([YAT_HAVE_BOOST_RANDOM_NON_CENTRAL_CHI_SQUARED_DISTRIBUTION],
+#               [1],
+#               [define if boost::random::non_central_chi_squared_distribution<> is available])
 
 # check for hts and samtools available from http://www.htslib.org

trunk/test/Makefile.am

@@ -90 +90 @@
   test/negative_binomial_distribution.test \
   test/nni.test test/normalization.test \
+  test/non_central_chi_squared_distribution.test \
   test/ostream_iterator.test \
   test/pca.test \

trunk/test/random_distribution.cc

@@ -90 +90 @@
   test_continuous<random::Gamma>();
   test_continuous<random::Lognormal>();
-  test_continuous<random::NonCentralChiSquared>();
   test_continuous<random::StudentT>();
 

trunk/yat/random/ContinuousDistribution.h

@@ -34 +34 @@
 #include <boost/random/gamma_distribution.hpp>
 #include <boost/random/lognormal_distribution.hpp>
+#ifdef YAT_HAVE_BOOST_RANDOM_NON_CENTRAL_CHI_SQUARED_DISTRIBUTION
 #include <boost/random/non_central_chi_squared_distribution.hpp>
+#endif
 #include <boost/random/student_t_distribution.hpp>
 
@@ -135 +137 @@
 
      \since New in yat 0.18
+
+     \note non_central_chi_squared_distribution is not available in
+     older boost (it does exist in boost 1.59)
    */
+#ifdef YAT_HAVE_BOOST_RANDOM_NON_CENTRAL_CHI_SQUARED_DISTRIBUTION
   typedef
   ContinuousDistribution<boost::random::non_central_chi_squared_distribution<> >
   NonCentralChiSquared;
+#endif
 
   /**

trunk/yat/utility/config_public.h.in

@@ -39 +39 @@
 #endif
 #endif
+
+/// Define to 1 if boost::random::non_central_chi_squared_distribution
+/// is available in header file
+/// <boost/random/non_central_chi_squared_distribution.hpp>
+#undef YAT_HAVE_BOOST_RANDOM_NON_CENTRAL_CHI_SQUARED_DISTRIBUTION
 
 /// Define to 1 if htslib is available