[irstlm] 18/126: minor changes

[Giulio Paci]

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

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

commit 627a289e426d2ca277a0f8b6b200d7fa1df439b9
Author: Nicola Bertoldi <bertoldi at fbk.eu>
Date:   Wed Jul 22 12:22:05 2015 +0200

    minor changes
---
 src/lmContainer.h          | 6 +++---
 src/lmContextDependent.cpp | 4 ++--
 src/lmContextDependent.h   | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/lmContainer.h b/src/lmContainer.h
index 3e998f6..69de5be 100644
--- a/src/lmContainer.h
+++ b/src/lmContainer.h
@@ -43,7 +43,7 @@ typedef enum {BINARY,TEXT,YRANIB,NONE} OUTFILE_TYPE;
 
 namespace irstlm {
 
-typedef std::map< std::string, float > topic_map;
+typedef std::map< std::string, float > topic_map_t;
 
 class lmContainer
 {
@@ -133,12 +133,12 @@ public:
     return 0.0;
   };
 
-  virtual double clprob(ngram ng, topic_map& topic_weights, double* bow=NULL, int* bol=NULL, char** maxsuffptr=NULL, unsigned int* statesize=NULL,bool* extendible=NULL) {
+  virtual double clprob(ngram ng, topic_map_t& topic_weights, double* bow=NULL, int* bol=NULL, char** maxsuffptr=NULL, unsigned int* statesize=NULL,bool* extendible=NULL) {
     UNUSED(topic_weights);
     return clprob(ng, bow, bol, maxsuffptr, statesize, extendible);
   };
 
-  virtual double clprob(int* ng, int ngsize, topic_map& topic_weights, double* bow=NULL, int* bol=NULL, char** maxsuffptr=NULL, unsigned int* statesize=NULL,bool* extendible=NULL) {
+  virtual double clprob(int* ng, int ngsize, topic_map_t& topic_weights, double* bow=NULL, int* bol=NULL, char** maxsuffptr=NULL, unsigned int* statesize=NULL,bool* extendible=NULL) {
     UNUSED(topic_weights);
     return clprob(ng, ngsize, bow, bol, maxsuffptr, statesize, extendible);
   }
diff --git a/src/lmContextDependent.cpp b/src/lmContextDependent.cpp
index d47b655..59ccbc6 100644
--- a/src/lmContextDependent.cpp
+++ b/src/lmContextDependent.cpp
@@ -127,7 +127,7 @@ void lmContextDependent::load(const std::string &filename,int mmap)
   inp.close();
 }
 
-double lmContextDependent::lprob(ngram ng, topic_map& topic_weights, double* bow,int* bol,char** maxsuffptr,unsigned int* statesize,bool* extendible)
+double lmContextDependent::lprob(ngram ng, topic_map_t& topic_weights, double* bow,int* bol,char** maxsuffptr,unsigned int* statesize,bool* extendible)
 {
   double lm_prob = m_lm->clprob(ng, bow, bol, maxsuffptr, statesize, extendible);
   double topic_prob = 0.0;  // to_CHECK
@@ -136,7 +136,7 @@ double lmContextDependent::lprob(ngram ng, topic_map& topic_weights, double* bow
   return ret_prob;
 }
 
-double lmContextDependent::lprob(int* codes, int sz, topic_map& topic_weights, double* bow,int* bol,char** maxsuffptr,unsigned int* statesize,bool* extendible)
+double lmContextDependent::lprob(int* codes, int sz, topic_map_t& topic_weights, double* bow,int* bol,char** maxsuffptr,unsigned int* statesize,bool* extendible)
 {
   //create the actual ngram
   ngram ong(dict);
diff --git a/src/lmContextDependent.h b/src/lmContextDependent.h
index e4d33fd..bf5a12f 100644
--- a/src/lmContextDependent.h
+++ b/src/lmContextDependent.h
@@ -97,11 +97,11 @@ public:
 	assert(false);
   };
 
-  virtual double clprob(int* ng, int ngsize, topic_map& topic_weights, double* bow=NULL,int* bol=NULL,char** maxsuffptr=NULL,unsigned int* statesize=NULL,bool* extendible=NULL){
+  virtual double clprob(int* ng, int ngsize, topic_map_t& topic_weights, double* bow=NULL,int* bol=NULL,char** maxsuffptr=NULL,unsigned int* statesize=NULL,bool* extendible=NULL){
 	return lprob(ng, ngsize, topic_weights, bow, bol, maxsuffptr, statesize, extendible);
   };
-  virtual double lprob(int* ng, int ngsize, topic_map& topic_weights, double* bow=NULL,int* bol=NULL,char** maxsuffptr=NULL,unsigned int* statesize=NULL,bool* extendible=NULL);
-  virtual double lprob(ngram ng, topic_map& topic_weights, double* bow=NULL,int* bol=NULL,char** maxsuffptr=NULL,unsigned int* statesize=NULL,bool* extendible=NULL);
+  virtual double lprob(int* ng, int ngsize, topic_map_t& topic_weights, double* bow=NULL,int* bol=NULL,char** maxsuffptr=NULL,unsigned int* statesize=NULL,bool* extendible=NULL);
+  virtual double lprob(ngram ng, topic_map_t& topic_weights, double* bow=NULL,int* bol=NULL,char** maxsuffptr=NULL,unsigned int* statesize=NULL,bool* extendible=NULL);
 
   int maxlevel() const {
     return maxlev;

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