diff options
author | Chris Dyer <cdyer@cs.cmu.edu> | 2012-02-08 16:22:55 -0500 |
---|---|---|
committer | Chris Dyer <cdyer@cs.cmu.edu> | 2012-02-08 16:22:55 -0500 |
commit | 400d60b20e9e480b0eff9843404a4cb9f8bd02cc (patch) | |
tree | b19dad517c1f9a6ed68720be2e88b814f1d66aa5 /phrasinator | |
parent | 2c3ee44cea2c46c6c1cdd21bc20568142181937b (diff) |
move widely duplicated math functions into m.h header
Diffstat (limited to 'phrasinator')
-rw-r--r-- | phrasinator/gibbs_train_plm.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/phrasinator/gibbs_train_plm.cc b/phrasinator/gibbs_train_plm.cc index 29b3d7ea..66b46011 100644 --- a/phrasinator/gibbs_train_plm.cc +++ b/phrasinator/gibbs_train_plm.cc @@ -8,6 +8,7 @@ #include "dict.h" #include "sampler.h" #include "ccrp.h" +#include "m.h" using namespace std; using namespace std::tr1; @@ -95,11 +96,6 @@ void ReadCorpus(const string& filename, vector<vector<int> >* c, set<int>* vocab if (in != &cin) delete in; } -double log_poisson(unsigned x, const double& lambda) { - assert(lambda > 0.0); - return log(lambda) * x - lgamma(x + 1) - lambda; -} - struct UniphraseLM { UniphraseLM(const vector<vector<int> >& corpus, const set<int>& vocab, @@ -128,7 +124,7 @@ struct UniphraseLM { double log_p0(const vector<int>& phrase) const { double len_logprob; if (use_poisson_) - len_logprob = log_poisson(phrase.size(), 1.0); + len_logprob = Md::log_poisson(phrase.size(), 1.0); else len_logprob = log(1 - p_end_) * (phrase.size() -1) + log(p_end_); return log(uniform_word_) * phrase.size() + len_logprob; |