diff options
author | Chris Dyer <cdyer@cs.cmu.edu> | 2012-02-17 13:01:54 -0500 |
---|---|---|
committer | Chris Dyer <cdyer@cs.cmu.edu> | 2012-02-17 13:01:54 -0500 |
commit | a38b3fa383412e56eb958db998662c026bc08f4b (patch) | |
tree | a6054f6f47e885c6ea07fc7c73441a188ec5b400 /training/em_utils.h | |
parent | e8583574e25c8ef09c9cd21cbc7421d9d12cf75f (diff) |
boost version checking, check for Eigen, get rid of old digamma stuff
Diffstat (limited to 'training/em_utils.h')
-rw-r--r-- | training/em_utils.h | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/training/em_utils.h b/training/em_utils.h deleted file mode 100644 index 37762978..00000000 --- a/training/em_utils.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef _EM_UTILS_H_ -#define _EM_UTILS_H_ - -#include "config.h" -#ifdef HAVE_BOOST_DIGAMMA -#include <boost/math/special_functions/digamma.hpp> -using boost::math::digamma; -#else -#warning Using Mark Johnsons digamma() -#include <cmath> -inline double digamma(double x) { - double result = 0, xx, xx2, xx4; - assert(x > 0); - for ( ; x < 7; ++x) - result -= 1/x; - x -= 1.0/2.0; - xx = 1.0/x; - xx2 = xx*xx; - xx4 = xx2*xx2; - result += log(x)+(1./24.)*xx2-(7.0/960.0)*xx4+(31.0/8064.0)*xx4*xx2-(127.0/30720.0)*xx4*xx4; - return result; -} -#endif -#endif |