[irstlm] 33/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 b202b38043725d7588f9f6a73042f62fceeb6c69
Merge: 2905812 3c8a57f
Author: Nicola Bertoldi <bertoldi at fbk.eu>
Date:   Tue Nov 10 08:41:12 2015 +0100

    Merge branch 'master' into cd-correction-model

 Makefile.am       | 2 +-
 src/lmContainer.h | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --cc src/lmContainer.h
index 0003b87,ea255fa..fef19d4
--- a/src/lmContainer.h
+++ b/src/lmContainer.h
@@@ -144,14 -135,19 +144,19 @@@ namespace irstlm 
  			UNUSED(bol);
  			UNUSED(maxsuffidx);
  			UNUSED(maxsuffptr);
 -                        UNUSED(statesize);
 +			UNUSED(statesize);
  			UNUSED(extendible);
  			UNUSED(lastbow);
 -
 -                        return 0.0;
 -}
 +			
 +			return 0.0;
 +		}
  		
- 		virtual double clprob(int* ng, int ngsize=NULL, double* bow=NULL, int* bol=NULL, ngram_state_t* maxsuffidx=NULL, char** maxsuffptr=NULL, unsigned int* statesize=NULL,bool* extendible=NULL, double* lastbow=NULL)
+ 		virtual double clprob(int* ng, int ngsize){ return clprob(ng, ngsize, NULL, NULL, NULL, NULL, NULL, NULL, NULL); }
+ 		virtual double clprob(int* ng, int ngsize, double* bow){ return clprob(ng, ngsize, bow, NULL, NULL, NULL, NULL, NULL, NULL); }
+ 		virtual double clprob(int* ng, int ngsize, double* bow, int* bol){ return clprob(ng, ngsize, bow, bol, NULL, NULL, NULL, NULL, NULL); }
+ 		virtual double clprob(int* ng, int ngsize, double* bow, int* bol, char** maxsuffptr, unsigned int* statesize=NULL, bool* extendible=NULL, double* lastbow=NULL){ return clprob(ng, ngsize, bow, bol, NULL, maxsuffptr, statesize, extendible, lastbow); }
+ 		virtual double clprob(int* ng, int ngsize, double* bow, int* bol, ngram_state_t* maxsuffidx){ return clprob(ng, ngsize, bow, bol, maxsuffidx, NULL, NULL, NULL, NULL); }
+ 		virtual double clprob(int* ng, int ngsize, double* bow, int* bol, ngram_state_t* maxsuffidx, char** maxsuffptr, unsigned int* statesize=NULL, bool* extendible=NULL, double* lastbow=NULL)
  		{
  			//create the actual ngram
  			ngram ong(getDict());

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