moses-smt/mosesdecoder
1
1
Fork 0
mirror of https://github.com/moses-smt/mosesdecoder.git synced 2024-09-20 15:48:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

Removed Phrase penalty as a built-in feature function.

Browse Source
This commit is contained in:
Ulrich Germann 2014-06-03 21:36:04 +01:00
parent 729910883a
commit 8dee1725fb
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
moses/TranslationModel/UG/mmsapt.cpp
View File

@ -196,8 +196,8 @@ namespace Moses
// currently always active by default; may (should) change later
num_feats = calc_lex.init(num_feats, bname + L1 + "-" + L2 + ".lex");
if (this->m_numScoreComponents%2) // a bit of a hack, for backwards compatibility
num_feats = apply_pp.init(num_feats);
// if (this->m_numScoreComponents%2) // a bit of a hack, for backwards compatibility
// num_feats = apply_pp.init(num_feats);
if (num_feats < this->m_numScoreComponents)
{
@ -283,8 +283,8 @@ namespace Moses
{
PhrasePair pp;
pp.init(pid1, stats, this->m_numScoreComponents);
if (this->m_numScoreComponents%2)
apply_pp(bt,pp);
// if (this->m_numScoreComponents%2)
// apply_pp(bt,pp);
pstats::trg_map_t::const_iterator t;
for (t = stats.trg.begin(); t != stats.trg.end(); ++t)
{
@ -318,8 +318,8 @@ namespace Moses
pp.init(pid1b, *statsb, this->m_numScoreComponents);
else return false; // throw "no stats for pooling available!";
if (this->m_numScoreComponents%2)
apply_pp(bta,pp);
// if (this->m_numScoreComponents%2)
// apply_pp(bta,pp);
pstats::trg_map_t::const_iterator b;
pstats::trg_map_t::iterator a;
if (statsb)
@ -415,8 +415,8 @@ namespace Moses
if (statsb)
{
pool.init(pid1b,*statsb,0);
if (this->m_numScoreComponents%2)
apply_pp(btb,ppdyn);
// if (this->m_numScoreComponents%2)
// apply_pp(btb,ppdyn);
for (b = statsb->trg.begin(); b != statsb->trg.end(); ++b)
{
ppdyn.update(b->first,b->second);
@ -456,8 +456,8 @@ namespace Moses
if (statsa)
{
pool.init(pid1a,*statsa,0);
if (this->m_numScoreComponents%2)
apply_pp(bta,ppfix);
// if (this->m_numScoreComponents%2)
// apply_pp(bta,ppfix);
for (a = statsa->trg.begin(); a != statsa->trg.end(); ++a)
{
if (!a->second.valid()) continue; // done above

2
moses/TranslationModel/UG/mmsapt.h
View File

@ -71,7 +71,7 @@ namespace Moses
PScorePfwd<Token> calc_pfwd_fix, calc_pfwd_dyn;
PScorePbwd<Token> calc_pbwd_fix, calc_pbwd_dyn;
PScoreLex<Token> calc_lex; // this one I'd like to see as an external ff eventually
PScorePP<Token> apply_pp; // apply phrase penalty
// PScorePP<Token> apply_pp; // apply phrase penalty
PScoreLogCounts<Token> add_logcounts_fix;
PScoreLogCounts<Token> add_logcounts_dyn;
void init(string const& line);