Merge remote-tracking branch 'upstream/master'

1 files changed, 4 insertions, 3 deletions

diff --git a/gi/pf/pyp_tm.h b/gi/pf/pyp_tm.h
index 63e7c96d..2b076a25 100644
--- a/gi/pf/pyp_tm.h
+++ b/gi/pf/pyp_tm.h
@@ -6,13 +6,14 @@
 #include "prob.h"
 #include "sampler.h"
 #include "freqdict.h"
+#include "poisson_uniform_word_model.h"
 
 struct FreqBinner;
-struct PYPWordModel;
 template <typename T, class B> struct ConditionalPYPWordModel;
 
 struct PYPLexicalTranslation {
   explicit PYPLexicalTranslation(const std::vector<std::vector<WordID> >& lets,
+                                 const unsigned vocab_size,
                                  const unsigned num_letters);
 
   prob_t Likelihood() const;
@@ -26,8 +27,8 @@ struct PYPLexicalTranslation {
 
  private:
   const std::vector<std::vector<WordID> >& letters;   // spelling dictionary
-  PYPWordModel* up0;  // base distribuction (model English word)
-  ConditionalPYPWordModel<PYPWordModel, FreqBinner>* tmodel;  // translation distributions
+  PoissonUniformWordModel base;  // "generator" of English types
+  ConditionalPYPWordModel<PoissonUniformWordModel, FreqBinner>* tmodel;  // translation distributions
                       // (model English word | French word)
   const WordID kX;
 };