[irstlm] 74/78: Merge branch 'master' into cd-correction-model

[Giulio Paci]

This is an automated email from the git hooks/post-receive script.

giuliopaci-guest pushed a commit to tag adaptiveLM.v0.10
in repository irstlm.

commit 3674ba919abd39ee98bcd4e485f81585a804aa1a
Merge: 6d571ce f69113a
Author: Nicola Bertoldi <bertoldi at fbk.eu>
Date:   Thu Dec 10 00:31:44 2015 +0100

    Merge branch 'master' into cd-correction-model

 src/lmContainer.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc src/lmContainer.h
index 67ec5db,b70aea8..312b2dd
--- a/src/lmContainer.h
+++ b/src/lmContainer.h
@@@ -159,10 -151,9 +159,10 @@@ namespace irstlm 
                          ong.pushc(ng,ngsize);
                          MY_ASSERT (ong.size == ngsize);
  
- 			return clprob(ng, ngsize, topic_weights, bow, bol, maxsuffidx, maxsuffptr, statesize, extendible, lastbow);
+ 			return clprob(ong, topic_weights, bow, bol, maxsuffidx, maxsuffptr, statesize, extendible, lastbow);
  		}
  
 +	//this is a function which could be overwritten	
  		virtual double clprob(ngram ng, double* bow, int* bol, ngram_state_t* maxsuffidx, char** maxsuffptr, unsigned int* statesize, bool* extendible, double* lastbow)
                  {
                          UNUSED(ng);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/irstlm.git