diff options
| author | Patrick Simianer <p@simianer.de> | 2014-10-13 19:03:48 +0100 |
|---|---|---|
| committer | Patrick Simianer <p@simianer.de> | 2014-10-13 19:03:48 +0100 |
| commit | cb9fb7088dde35881516c088db402abe747d49fa (patch) | |
| tree | a91e4935a7941f1b261f76d88ab41fa3078a1891 /decoder/ff_basic.cc | |
| parent | 0a00e57e921c8eca8e02364db7d2e6607bfdcebc (diff) | |
| parent | b1ed81ef3216b212295afa76c5d20a56fb647204 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'decoder/ff_basic.cc')
| -rw-r--r-- | decoder/ff_basic.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/decoder/ff_basic.cc b/decoder/ff_basic.cc index f9404d24..f960418a 100644 --- a/decoder/ff_basic.cc +++ b/decoder/ff_basic.cc @@ -49,9 +49,7 @@ void SourceWordPenalty::TraversalFeaturesImpl(const SentenceMetadata& smeta, features->set_value(fid_, edge.rule_->FWords() * value_); } - -ArityPenalty::ArityPenalty(const std::string& param) : - value_(-1.0 / log(10)) { +ArityPenalty::ArityPenalty(const std::string& param) { string fname = "Arity_"; unsigned MAX=DEFAULT_MAX_ARITY; using namespace boost; @@ -61,7 +59,8 @@ ArityPenalty::ArityPenalty(const std::string& param) : WordID fid=FD::Convert(fname+lexical_cast<string>(i)); fids_.push_back(fid); } - while (!fids_.empty() && fids_.back()==0) fids_.pop_back(); // pretty up features vector in case FD was frozen. doesn't change anything + // pretty up features vector in case FD was frozen. doesn't change anything + while (!fids_.empty() && fids_.back()==0) fids_.pop_back(); } void ArityPenalty::TraversalFeaturesImpl(const SentenceMetadata& smeta, @@ -75,6 +74,6 @@ void ArityPenalty::TraversalFeaturesImpl(const SentenceMetadata& smeta, (void) state; (void) estimated_features; unsigned a=edge.Arity(); - features->set_value(a<fids_.size()?fids_[a]:0, value_); + if (a < fids_.size()) features->set_value(fids_[a], 1.0); } |