[irstlm] 68/78: merged master into cd-correction-model; solved conflicts

[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 3fbe82e51640676629077de62a6aa60fa683a584
Merge: e6de4d5 e9a0dbb
Author: Nicola Bertoldi <bertoldi at fbk.eu>
Date:   Tue Dec 8 22:47:11 2015 +0100

    merged master into cd-correction-model; solved conflicts

 src/lmContainer.h | 11 +++++++++++
 src/lmtable.cpp   |  4 ++--
 src/shiftlm.cpp   |  6 ------
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --cc src/lmContainer.h
index fb760e6,40aaa3a..ac67ea8
--- a/src/lmContainer.h
+++ b/src/lmContainer.h
@@@ -171,44 -155,19 +171,55 @@@ namespace irstlm 
  			MY_ASSERT (ong.size == ngsize);
  			
  			return clprob(ong, bow, bol, maxsuffidx, maxsuffptr, statesize, extendible, lastbow);
 +		}		
 +		virtual double clprob(ngram ng, topic_map_t& topic_weights, double* bow=NULL, int* bol=NULL, ngram_state_t* maxsuffidx=NULL, char** maxsuffptr=NULL, unsigned int* statesize=NULL,bool* extendible=NULL, double* lastbow=NULL)
 +		{
 +			UNUSED(topic_weights);
 +			return clprob(ng, bow, bol, maxsuffidx, maxsuffptr, statesize, extendible, lastbow);
 +		}
 +		virtual double clprob(int* ng, int ngsize, topic_map_t& topic_weights, double* bow=NULL, int* bol=NULL, ngram_state_t* maxsuffidx=NULL, char** maxsuffptr=NULL, unsigned int* statesize=NULL,bool* extendible=NULL, double* lastbow=NULL)
 +		{
 +			UNUSED(topic_weights);
 +			return clprob(ng, ngsize, bow, bol, maxsuffidx, maxsuffptr, statesize, extendible, lastbow);
 +		}
 +		virtual double clprob(string_vec_t& text, double* bow=NULL, int* bol=NULL, ngram_state_t* maxsuffidx=NULL, char** maxsuffptr=NULL, unsigned int* statesize=NULL,bool* extendible=NULL, double* lastbow=NULL)
 +		{
 +			UNUSED(text);
 +			UNUSED(bow);
 +			UNUSED(bol);
 +			UNUSED(maxsuffidx);
 +			UNUSED(maxsuffptr);
 +			UNUSED(statesize);
 +			UNUSED(extendible);
 +			UNUSED(lastbow);
 +			return 0.0;
 +		}
 +		
 +		virtual double clprob(string_vec_t& text, topic_map_t& topic_weights, double* bow=NULL,int* bol=NULL, ngram_state_t* maxsuffidx=NULL, char** maxsuffptr=NULL, unsigned int* statesize=NULL, bool* extendible=NULL, double* lastbow=NULL)
 +		{ 
 +			UNUSED(text);
 +			UNUSED(topic_weights);
 +			UNUSED(bow);
 +			UNUSED(bol);
 +			UNUSED(maxsuffidx);
 +			UNUSED(maxsuffptr);
 +			UNUSED(statesize);
 +			UNUSED(extendible);
 +			UNUSED(lastbow);
 +			return 0.0;
  		}
  		
+ 		virtual double clprob(ngram ng, topic_map_t& topic_weights, double* bow=NULL, int* bol=NULL, ngram_state_t* maxsuffidx=NULL, char** maxsuffptr=NULL, unsigned int* statesize=NULL,bool* extendible=NULL, double* lastbow=NULL)
+ 		{
+ 			UNUSED(topic_weights);		
+ 			return clprob(ng, bow, bol, maxsuffidx, maxsuffptr, statesize, extendible, lastbow);
+ 		}
+ 		virtual double clprob(int* ng, int ngsize, topic_map_t& topic_weights, double* bow=NULL, int* bol=NULL, ngram_state_t* maxsuffidx=NULL, char** maxsuffptr=NULL, unsigned int* statesize=NULL,bool* extendible=NULL, double* lastbow=NULL)
+ 		{
+ 			UNUSED(topic_weights);		
+ 			return clprob(ng, ngsize, bow, bol, maxsuffidx, maxsuffptr, statesize, extendible, lastbow);
+ 		}
+ 
  		virtual const char *cmaxsuffptr(ngram ng, unsigned int* statesize=NULL)
  		{
  			UNUSED(ng);
diff --cc src/lmtable.cpp
index a930d85,8902d12..22d04a8
--- a/src/lmtable.cpp
+++ b/src/lmtable.cpp
@@@ -2382,10 -2369,10 +2382,10 @@@ namespace irstlm 
  	//It relies on the computation of maxsuffptr
  	ngram_state_t lmtable::maxsuffidx(ngram ong, unsigned int* size)
  	{
- 		VERBOSE(3,"ngram_state_t lmtable::maxsuffidx(ngram ong, unsigned int* size)\n");
+ 		VERBOSE(3,"ngram_state_t lmtable::maxsuffidx(ngram ong, unsigned int* size) ong:|" << ong  << "|\n");
 -		unsigned int isize;
 +		unsigned int isize; //internal state size variable
  		const char* suffptr = cmaxsuffptr(ong,&isize);
 -		if (size) *size=isize;
 +		if (size != NULL){ *size = isize; }
  		return convert(suffptr,isize);
  	}
  	

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