Merge remote-tracking branch 'upstream/master'

1 files changed, 4 insertions, 7 deletions

diff --git a/gi/pf/pyp_tm.cc b/gi/pf/pyp_tm.cc
index e21f0267..6bc8a5bf 100644
--- a/gi/pf/pyp_tm.cc
+++ b/gi/pf/pyp_tm.cc
@@ -91,26 +91,23 @@ struct ConditionalPYPWordModel {
 };
 
 PYPLexicalTranslation::PYPLexicalTranslation(const vector<vector<WordID> >& lets,
+                                             const unsigned vocab_size,
                                              const unsigned num_letters) :
     letters(lets),
-    up0(new PYPWordModel(num_letters)),
-    tmodel(new ConditionalPYPWordModel<PYPWordModel>(up0, new FreqBinner("10k.freq"))),
+    base(vocab_size, num_letters, 5),
+    tmodel(new ConditionalPYPWordModel<PoissonUniformWordModel>(&base, new FreqBinner("10k.freq"))),
     kX(-TD::Convert("X")) {}
 
 void PYPLexicalTranslation::Summary() const {
   tmodel->Summary();
-  up0->Summary();
 }
 
 prob_t PYPLexicalTranslation::Likelihood() const {
-  prob_t p = up0->Likelihood();
-  p *= tmodel->Likelihood();
-  return p;
+  return tmodel->Likelihood() * base.Likelihood();
 }
 
 void PYPLexicalTranslation::ResampleHyperparameters(MT19937* rng) {
   tmodel->ResampleHyperparameters(rng);
-  up0->ResampleHyperparameters(rng);
 }
 
 unsigned PYPLexicalTranslation::UniqueConditioningContexts() const {