[irstlm] 38/78: Merge branch 'cd-correction-model' of https://github.com/irstlm-team/irstlm 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 2e7794aa81c6e6538866ee0435cfafcf85e9609b
Merge: e2e0a3f 2905812
Author: nicolabertoldi <bertoldi at fbk.eu>
Date:   Wed Nov 11 19:23:46 2015 +0100

    Merge branch 'cd-correction-model' of https://github.com/irstlm-team/irstlm into cd-correction-model

 src/CMakeLists.txt                   |    5 +-
 src/Makefile.am                      |   13 +-
 src/context-dependent-evaluation.cpp | 1090 ++++++++++++++++++++++++++++++++++
 src/context-similarity.cpp           |  559 +++++++++++++++++
 src/context-similarity.h             |  138 +++++
 src/cswam.cpp                        |    5 -
 src/lmContainer.cpp                  |   72 +++
 src/lmContainer.h                    |   79 ++-
 src/lmContextDependent.cpp           |  247 ++++++++
 src/lmContextDependent.h             |  199 +++++++
 src/lmInterpolation.cpp              |  190 +++++-
 src/lmInterpolation.h                |   45 +-
 src/lmtable.h                        |    1 -
 src/n_gram.cpp                       |   12 +-
 src/n_gram.h                         |    4 +-
 src/ngramtable.h                     |    5 +
 src/util.cpp                         |   83 ++-
 src/util.h                           |   39 +-
 18 files changed, 2711 insertions(+), 75 deletions(-)

diff --cc src/lmContainer.h
index ea255fa,0003b87..fef19d4
--- a/src/lmContainer.h
+++ b/src/lmContainer.h
@@@ -135,19 -144,14 +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