[irstlm] 113/126: added default behavior for topic model

[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 f56aeec1cbbaada7e7ad2d7e39371a54c94be022
Author: Nicola Bertoldi <bertoldi at fbk.eu>
Date:   Sun Oct 11 09:05:59 2015 +0200

    added default behavior for topic model
---
 src/context-similarity.cpp | 4 +++-
 src/lmContextDependent.cpp | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/context-similarity.cpp b/src/context-similarity.cpp
index efd660e..a43ddd4 100644
--- a/src/context-similarity.cpp
+++ b/src/context-similarity.cpp
@@ -442,7 +442,9 @@ namespace irstlm {
 #else
 		UNUSED(text);
 		UNUSED(topic_weights);
-		exit(IRSTLM_CMD_ERROR_GENERIC);
+		VERBOSE(3, "This solution type is not defined; forced to default solution 1" << std::endl);
+		return context_similarity_solution1(text, topic_weights);
+//		exit(IRSTLM_CMD_ERROR_GENERIC);
 #endif
 	}
 	
diff --git a/src/lmContextDependent.cpp b/src/lmContextDependent.cpp
index fb47c6e..9fc530a 100644
--- a/src/lmContextDependent.cpp
+++ b/src/lmContextDependent.cpp
@@ -178,7 +178,7 @@ namespace irstlm {
 		double lm_logprob = m_lm->clprob(ng, bow, bol, maxsuffptr, statesize, extendible);
 		double similarity_score = m_similaritymodel->context_similarity(text, topic_weights);
 		double ret_logprob = lm_logprob + m_similaritymodel_weight * similarity_score;
-		VERBOSE(3, "lm_log10_pr:" << lm_logprob << " similarity_score:" << similarity_score << " m_similaritymodel_weight:" << m_similaritymodel_weight << " ret_log10_pr:" << ret_logprob << std::endl);
+		VERBOSE(2, "lm_log10_pr:" << lm_logprob << " similarity_score:" << similarity_score << " m_similaritymodel_weight:" << m_similaritymodel_weight << " ret_log10_pr:" << ret_logprob << std::endl);
 		
 		return ret_logprob;
 	}

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