Changeset 3912

Timestamp:

May 19, 2020, 12:07:28 AM (3 years ago)

Author:

Peter

Message:

boost random classes beta_distribution, hyperexponential_distribution
and laplace_distribution are not available with boost 1.53. Similar to
non_central_chi_squared (refs #944) these classes are only used in a
typedef, so we exclude these typedefs when the classes were not found
in configure. Lifting out tests of these classes to their own tests,
so these tests can return SKIP.

Location:

trunk

Files:

• configure.ac (modified) (2 diffs)
• test/Makefile.am (modified) (2 diffs)
• test/beta_distribution.cc (added)
• test/hyperexponential_distribution.cc (added)
• test/laplace_distribution.cc (added)
• test/random_distribution.cc (modified) (1 diff)
• yat/random/DiscreteDistribution.h (modified) (4 diffs)
• yat/utility/config_public.h.in (modified) (1 diff)

trunk/configure.ac

@@ -414 +414 @@
     AC_MSG_RESULT([no])
   ])
+
+# test if boost::random::beta_distribution<> is available in header
+# file <boost/random/non_central_chi_squared_distribution.hpp>
+AC_COMPILE_IFELSE([
+  AC_LANG_PROGRAM(
+      [@%:@include <boost/random/beta_distribution.hpp>],
+      [boost::random::beta_distribution<> foo])
+], [
+  AC_DEFINE([YAT_HAVE_BOOST_RANDOM_BETA_DISTRIBUTION],
+            [1],
+            [Define to 1 if boost::random::beta_distribution<> is available])
+])
+
+
+# test if boost::random::hyperexponential_distribution is available in header
+# file <boost/random/hyperexponential_distribution.hpp>
+AC_COMPILE_IFELSE([
+  AC_LANG_PROGRAM(
+      [@%:@include <boost/random/hyperexponential_distribution.hpp>],
+      [boost::random::hyperexponential_distribution<> foo])
+], [
+  AC_DEFINE([YAT_HAVE_BOOST_RANDOM_HYPEREXPONENTIAL_DISTRIBUTION],
+            [1],
+            [Define to 1 if boost::random::hyperexponential_distribution<> is available])
+])
+
+
+# test if boost::random::laplace_distribution is available in header
+# file <boost/random/laplace_distribution.hpp>
+AC_COMPILE_IFELSE([
+  AC_LANG_PROGRAM(
+      [@%:@include <boost/random/laplace_distribution.hpp>],
+      [boost::random::laplace_distribution<> foo])
+], [
+  AC_DEFINE([YAT_HAVE_BOOST_RANDOM_LAPLACE_DISTRIBUTION],
+            [1],
+            [Define to 1 if boost::random::laplace_distribution<> is available])
+])
+
+
 # test if boost::random::non_central_chi_squared_distribution<> is
 # available in header file
@@ -427 +467 @@
 ])
 
-#      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

@@ -49 +49 @@
   test/bam_pair_iterator.test \
   test/bam_pair_iterator2.test \
+  test/beta_distribution.test \
   test/binary_read_write.test \
   test/chi2.test \
@@ -74 +75 @@
   test/getvector.test \
   test/gff.test test/help.test test/histogram.test \
+  test/hyperexponential_distribution.test \
   test/igp.test test/index.test test/inputranker.test test/interpolation.test \
   test/iterator.test test/kendall.test test/kernel_lookup.test \
   test/kernel_matrix.test \
   test/kernel_pca.test test/kernel.test \
-  test/knn.test test/kolmogorov_smirnov.test test/large_file.test \
+  test/knn.test test/kolmogorov_smirnov.test \
+  test/laplace_distribution.test \
+  test/large_file.test \
   test/libbam.test \
   test/likelihood_ratio_test_binomial.test \

trunk/test/random_distribution.cc

@@ -78 +78 @@
 
   test_discrete<random::Bernoulli>();
-  test_discrete<random::Beta>();
   test_discrete<random::NegativeBinomial>();
-  test_discrete<random::Hyperexponential>();
   test_discrete<random::Weibull>();
-  test_discrete<random::Laplace>();
 
   test_continuous<random::Cauchy>();

trunk/yat/random/DiscreteDistribution.h

@@ -29 +29 @@
 
 #include <boost/random/bernoulli_distribution.hpp>
+#ifdef YAT_HAVE_BOOST_RANDOM_BETA_DISTRIBUTION
 #include <boost/random/beta_distribution.hpp>
+#endif
+#ifdef YAT_HAVE_BOOST_RANDOM_HYPEREXPONENTIAL_DISTRIBUTION
 #include <boost/random/hyperexponential_distribution.hpp>
+#endif
+#ifdef YAT_HAVE_BOOST_RANDOM_LAPLACE_DISTRIBUTION
 #include <boost/random/laplace_distribution.hpp>
+#endif
 #include <boost/random/negative_binomial_distribution.hpp>
 #include <boost/random/weibull_distribution.hpp>
@@ -95 +101 @@
 
      \since New in yat 0.18
+
+     \note beta_distribution is not available in older boost
    */
+#ifdef YAT_HAVE_BOOST_RANDOM_BETA_DISTRIBUTION
   typedef DiscreteDistribution<boost::random::beta_distribution<> > Beta;
+#endif
 
   /**
@@ -104 +114 @@
 
      \since New in yat 0.18
+
+     \note hyperexponential_distribution is not available in older boost
    */
+#ifdef YAT_HAVE_BOOST_RANDOM_HYPEREXPONENTIAL_DISTRIBUTION
   typedef
   DiscreteDistribution<boost::random::hyperexponential_distribution<> >
   Hyperexponential;
+#endif
 
   /**
@@ -115 +129 @@
 
      \since New in yat 0.18
+
+     \note laplace_distribution is not available in older boost
    */
+#ifdef YAT_HAVE_BOOST_RANDOM_LAPLACE_DISTRIBUTION
   typedef DiscreteDistribution<boost::random::laplace_distribution<> > Laplace;
+#endif
 
   /**

trunk/yat/utility/config_public.h.in

@@ -39 +39 @@
 #endif
 #endif
+
+/// Define to 1 if boost::random::beta_distribution is available in
+/// header file <boost/random/beta_distribution.hpp>
+#undef YAT_HAVE_BOOST_RANDOM_BETA_DISTRIBUTION
+
+/// Define to 1 if boost::random::hyperexponential_distribution is
+/// available in header file <boost/random/hyperexponential_distribution.hpp>
+#undef YAT_HAVE_BOOST_RANDOM_HYPEREXPONENTIAL_DISTRIBUTION
+
+/// Define to 1 if boost::random::laplace_distribution is
+/// available in header file <boost/random/laplace_distribution.hpp>
+#undef YAT_HAVE_BOOST_RANDOM_LAPLACE_DISTRIBUTION
 
 /// Define to 1 if boost::random::non_central_chi_squared_distribution