Fixes to make things compile after merging with branch mmt-dev.

7 files changed, 24 insertions, 23 deletions

diff --git a/moses/TranslationModel/UG/mm/ug_bitext.h b/moses/TranslationModel/UG/mm/ug_bitext.h
index b9178edd3..de56c429e 100644
--- a/moses/TranslationModel/UG/mm/ug_bitext.h
+++ b/moses/TranslationModel/UG/mm/ug_bitext.h
@@ -363,7 +363,7 @@ namespace Moses {
       size_t & s1, size_t & s2, // beginning and end of target start
       size_t & e1, size_t & e2, // beginning and end of target end
       int& po_fwd, int& po_bwd, // phrase orientations
-      std::vector<uchar> * core_alignment, // stores the core alignment
+      std::vector<unsigned char> * core_alignment, // stores the core alignment
       bitvector* full_alignment, // stores full word alignment for this sent.
       bool const flip) const     // flip source and target (reverse lookup)
     {
diff --git a/moses/TranslationModel/UG/mm/ug_bitext_jstats.cc b/moses/TranslationModel/UG/mm/ug_bitext_jstats.cc
index 803d41ac1..a5debcec8 100644
--- a/moses/TranslationModel/UG/mm/ug_bitext_jstats.cc
+++ b/moses/TranslationModel/UG/mm/ug_bitext_jstats.cc
@@ -56,7 +56,7 @@ namespace Moses
 
     void
     jstats::
-    add(float w, float b, vector<uchar> const& a, uint32_t const cnt2,
+    add(float w, float b, std::vector<unsigned char> const& a, uint32_t const cnt2,
 	uint32_t fwd_orient, uint32_t bwd_orient, int const docid)
     {
       boost::lock_guard<boost::mutex> lk(this->lock);
diff --git a/moses/TranslationModel/UG/mm/ug_bitext_jstats.h b/moses/TranslationModel/UG/mm/ug_bitext_jstats.h
index bd6fcfcd1..2984c9293 100644
--- a/moses/TranslationModel/UG/mm/ug_bitext_jstats.h
+++ b/moses/TranslationModel/UG/mm/ug_bitext_jstats.h
@@ -42,9 +42,11 @@ namespace Moses
       float    bcnt() const; // cumulative bias scores
 
       std::vector<std::pair<size_t, std::vector<unsigned char> > > const & aln() const;
-      void add(float w, std::vector<unsigned char> const& a, uint32_t const cnt2,
-	       uint32_t fwd_orient, uint32_t bwd_orient,
-	       int const docid);
+
+      void 
+      add(float w, float b, std::vector<unsigned char> const& a, uint32_t const cnt2, 
+	  uint32_t fwd_orient, uint32_t bwd_orient, int const docid);
+
       void invalidate();
       void validate();
       bool valid();
diff --git a/moses/TranslationModel/UG/mm/ug_bitext_phrase_extraction_record.h b/moses/TranslationModel/UG/mm/ug_bitext_phrase_extraction_record.h
index 646875859..390ccbf5c 100644
--- a/moses/TranslationModel/UG/mm/ug_bitext_phrase_extraction_record.h
+++ b/moses/TranslationModel/UG/mm/ug_bitext_phrase_extraction_record.h
@@ -13,12 +13,12 @@ namespace Moses
       bool   const        flip; // 'backward' lookup from L2
       size_t    s1, s2, e1, e2; // soft and hard boundaries of target phrase
       int       po_fwd, po_bwd; // fwd and bwd phrase orientation 
-      std::vector<uchar>*  aln; // local alignments
-      bitvector*      full_aln; // full word alignment for sentence
+      std::vector<unsigned char>*  aln; // local alignments
+      ugdiss::bitvector*      full_aln; // full word alignment for sentence
 
       PhraseExtractionRecord(size_t const xsid, size_t const xstart, 
                              size_t const xstop, bool const xflip,
-                             std::vector<uchar>* xaln, bitvector* xfull_aln = NULL)
+                             std::vector<unsigned char>* xaln, ugdiss::bitvector* xfull_aln = NULL)
         : sid(xsid), start(xstart), stop(xstop), flip(xflip) 
         , aln(xaln), full_aln(xfull_aln) { }
     };
diff --git a/moses/TranslationModel/UG/mm/ug_bitext_sampler.h b/moses/TranslationModel/UG/mm/ug_bitext_sampler.h
index 628c2059f..9333dd879 100644
--- a/moses/TranslationModel/UG/mm/ug_bitext_sampler.h
+++ b/moses/TranslationModel/UG/mm/ug_bitext_sampler.h
@@ -150,7 +150,7 @@ namespace bitext
   BitextSampler<Token>::
   consider_sample(TokenPosition const& p)
   {
-    vector<uchar>  aln; 
+    std::vector<unsigned char>  aln; 
     bitvector full_aln(100*100);
     PhraseExtractionRecord rec(p.sid, p.offset, p.offset + m_plen, 
                                !m_fwd, &aln, &full_aln);
diff --git a/moses/TranslationModel/UG/mm/ug_sampling_bias.cc b/moses/TranslationModel/UG/mm/ug_sampling_bias.cc
index 60ba0314c..7bb2e2afe 100644
--- a/moses/TranslationModel/UG/mm/ug_sampling_bias.cc
+++ b/moses/TranslationModel/UG/mm/ug_sampling_bias.cc
@@ -49,16 +49,15 @@ namespace Moses
     }
 
     DocumentBias::
-    DocumentBias
-    ( std::vector<id_type> const& sid2doc,
-      std::map<std::string,id_type> const& docname2docid,
-      std::string const& server_url, std::string const& text,
-      std::ostream* log)
+    DocumentBias(std::vector<id_type> const& sid2doc,
+		 std::map<std::string,id_type> const& docname2docid,
+		 std::string const& server_url, std::string const& text,
+		 std::ostream* log)
       : SamplingBias(&sid2doc)
       , m_bias(docname2docid.size(), 0)
     {
       // #ifdef HAVE_CURLPP
-#ifndef NO_MOSES
+      // #ifndef NO_MOSES
       Timer timer;
       if (log) timer.start(NULL);
       std::string json = query_bias_server(server_url, text);
@@ -67,13 +66,13 @@ namespace Moses
       if (log) *log << "Bias query took " << timer << " seconds." << std::endl;
     }
 
-    DocumentBias
-    ::DocumentBias(std::vector<id_type> const& sid2doc,
-                   std::map<std::string,id_type> const& docname2docid,
-                   std::map<std::string, float> const& context_weights,
-                   std::ostream* log)
-                   : m_sid2docid(sid2doc)
-                   , m_bias(docname2docid.size(), 0)
+    DocumentBias::
+    DocumentBias(std::vector<id_type> const& sid2doc,
+		 std::map<std::string,id_type> const& docname2docid,
+		 std::map<std::string, float> const& context_weights,
+		 std::ostream* log)
+      : SamplingBias(&sid2doc)
+      , m_bias(docname2docid.size(), 0)
     {
     init(context_weights, docname2docid);
     }
diff --git a/moses/TranslationModel/UG/mmsapt.cpp b/moses/TranslationModel/UG/mmsapt.cpp
index c2e973239..3fa76f4d8 100644
--- a/moses/TranslationModel/UG/mmsapt.cpp
+++ b/moses/TranslationModel/UG/mmsapt.cpp
@@ -841,7 +841,7 @@ namespace Moses
               context->bias_log = m_bias_log;
             }
           context->bias
-            = btfix.SetupDocumentBias(ttask->GetContextWeights(), m_bias_log);
+            = btfix->SetupDocumentBias(ttask->GetContextWeights(), m_bias_log);
           context->bias->loglevel = m_bias_loglevel;
           context->bias->log = m_bias_log;
         if (!context->cache1) context->cache1.reset(new pstats::cache_t);