[irstlm] 60/126: Merge branch 'context-dependent' of https://github.com/irstlm-team/irstlm into context-dependent

[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 7bc855bcdcf94103b2d2b3e03495727417939a87
Merge: de0e534 7b84023
Author: nicolabertoldi <bertoldi at fbk.eu>
Date:   Wed Sep 9 17:15:28 2015 +0200

    Merge branch 'context-dependent' of https://github.com/irstlm-team/irstlm into context-dependent

 src/CMakeLists.txt                   |   9 +
 src/context-dependent-evaluation.cpp | 477 ++++++++++++++++++++++++++---
 src/context-similarity.cpp           | 565 +++++++++++++++++++++++++----------
 src/context-similarity.h             |  50 +++-
 src/lmContextDependent.cpp           |  56 +++-
 src/lmContextDependent.h             |  18 +-
 src/util.cpp                         |  25 +-
 src/util.h                           |   4 +
 8 files changed, 992 insertions(+), 212 deletions(-)

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