diff options
| author | Chris Dyer <cdyer@cs.cmu.edu> | 2011-04-22 13:38:32 -0400 |
|---|---|---|
| committer | Chris Dyer <cdyer@cs.cmu.edu> | 2011-04-22 13:38:32 -0400 |
| commit | 9d393298ce21159907884ea9b7318c52585409ee (patch) | |
| tree | cab034a01642abb2a067818f9c8f29999c4c6797 /extools | |
| parent | b6634dff2cd515d9e6f95416512db893a08bde29 (diff) | |
make compatible with FastSparseVector
Diffstat (limited to 'extools')
| -rw-r--r-- | extools/extract.cc | 4 | ||||
| -rw-r--r-- | extools/sg_lexer.l | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/extools/extract.cc b/extools/extract.cc index a9de142e..f6c121b4 100644 --- a/extools/extract.cc +++ b/extools/extract.cc @@ -105,8 +105,8 @@ void Extract::LoosenPhraseBounds(const AnnotatedParallelSentence& sentence, const int ilim = min(i2_max, i1 + max_base_phrase_size); for (int i2 = max(i1+1,i2_min); i2 <= ilim; ++i2) { for (int j1 = j1_min; j1 <= j1_max; ++j1) { - const int jlim = min(j2_max, j1 + max_base_phrase_size); - for (int j2 = max(j1+1, j2_min); j2 <= jlim; ++j2) { + const int jlim = std::min(j2_max, j1 + max_base_phrase_size); + for (int j2 = std::max(j1+1, j2_min); j2 <= jlim; ++j2) { bool& seen = marker[i1][i2][j1][j2]; if (!seen) phrases->push_back(ParallelSpan(i1,i2,j1,j2)); diff --git a/extools/sg_lexer.l b/extools/sg_lexer.l index d60bd0fc..c85cdea7 100644 --- a/extools/sg_lexer.l +++ b/extools/sg_lexer.l @@ -240,7 +240,7 @@ ALIGN [0-9]+-[0-9]+ } <FEATVAL>{REAL} { // std::cerr << "Feature val input: " << yytext << std::endl; - cur_stats->counts[sglex_cur_fid] += strtod(yytext, NULL); + cur_stats->counts.add_value(sglex_cur_fid, strtod(yytext, NULL)); BEGIN(FEATS); } <FEATVAL>. { |