diff options
| author | Nicola Bertoldi <bertoldi@fbk.eu> | 2014-12-13 14:52:47 +0300 |
|---|---|---|
| committer | Nicola Bertoldi <bertoldi@fbk.eu> | 2014-12-13 14:52:47 +0300 |
| commit | e4eb201c52be74fee74399a6f35fcbe8eb85d834 (patch) | |
| tree | 7792ef96d63262f6e28f1857741e1162c7dccbc4 /mert/MeteorScorer.h | |
| parent | cea2d9d8bb34a81660974cae20d66aefec4e0468 (diff) | |
| parent | a0b6b6a341e74b47bbef4652ad7fd928cf91e17c (diff) | |
merged master into dynamic-models and solved conflicts
Diffstat (limited to 'mert/MeteorScorer.h')
| -rw-r--r-- | mert/MeteorScorer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mert/MeteorScorer.h b/mert/MeteorScorer.h index 8260a9455..31b05ec72 100644 --- a/mert/MeteorScorer.h +++ b/mert/MeteorScorer.h @@ -54,7 +54,7 @@ public: return 23; } - virtual float calculateScore(const std::vector<int>& comps) const; + virtual float calculateScore(const std::vector<ScoreStatsType>& comps) const; private: // Meteor and process IO |