[irstlm] 78/78: bug fixed

[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 4c1a64aa053fde03f2d0f2ee6d49f69ac312fad9
Author: Nicola Bertoldi <bertoldi at fbk.eu>
Date:   Tue Jan 12 17:31:00 2016 +0100

    bug fixed
---
 src/lmContainer.h | 10 ++++------
 src/lmtable.cpp   |  6 +++---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/lmContainer.h b/src/lmContainer.h
index d20be0f..5c627ce 100644
--- a/src/lmContainer.h
+++ b/src/lmContainer.h
@@ -155,13 +155,11 @@ namespace irstlm {
 		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)
 		{
                         //create the actual ngram
-//                        ngram ong(getDict());
-//                        ong.pushc(ng,ngsize);
-//                        MY_ASSERT (ong.size == ngsize);
+                        ngram ong(getDict());
+                        ong.pushc(ng,ngsize);
+                        MY_ASSERT (ong.size == ngsize);
 
-                        UNUSED(topic_weights);
-			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);
+			return clprob(ong, topic_weights, bow, bol, maxsuffidx, maxsuffptr, statesize, extendible, lastbow);
 		}
 
 	//this is a function which should be overwritten	
diff --git a/src/lmtable.cpp b/src/lmtable.cpp
index 22d04a8..e683742 100644
--- a/src/lmtable.cpp
+++ b/src/lmtable.cpp
@@ -2451,7 +2451,7 @@ namespace irstlm {
 	//non recursive version, also includes maxsuffptr and maxsuffidx
 	double lmtable::lprob(ngram ong,double* bow, int* bol, ngram_state_t* maxsuffidx, char** maxsuffptr,unsigned int* statesize,bool* extendible, double *lastbow)
 	{
-		VERBOSE(3," lmtable::lprob(ngram) ong |" << ong  << "|\n" << std::endl);
+		VERBOSE(3,"double lmtable::lprob(ngram ong,double* bow, int* bol, ngram_state_t* maxsuffidx, char** maxsuffptr,unsigned int* statesize,bool* extendible, double *lastbow) ong |" << ong  << "|" << std::endl);
 		
 		if (ong.size==0){ //sanity check
 			if (maxsuffptr) *maxsuffptr=NULL;
@@ -2566,9 +2566,9 @@ namespace irstlm {
 	}
 	
 	//return log10 probsL use cache memory
-	double lmtable::clprob(ngram ong,double* bow, int* bol, ngram_state_t* ngramstate, char** state, unsigned int* statesize, bool* extendible, double* lastbow)
+	double lmtable::clprob(ngram ong, double* bow, int* bol, ngram_state_t* ngramstate, char** state, unsigned int* statesize, bool* extendible, double* lastbow)
 	{
-		VERBOSE(3,"double lmtable::clprob(ngram ong,double* bow, int* bol, ngram_state_t* ngramstate, char** state, unsigned int* statesize, bool* extendible, double* lastbow) ong:|" << ong  << "|\n");
+		VERBOSE(3,"double lmtable::clprob(ngram ong, double* bow, int* bol, ngram_state_t* ngramstate, char** state, unsigned int* statesize, bool* extendible, double* lastbow) ong:|" << ong  << "|\n");
 		
 #ifdef TRACE_CACHELM
 		//		if (probcache && ong.size==maxlev && sentence_id>0) {

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