From 642ef236b42199c230e770a22c190836e2af0cf1 Mon Sep 17 00:00:00 2001 From: Patrick Simianer Date: Fri, 22 Nov 2013 13:58:35 +0100 Subject: typos and minor additions --- training/dtrain/score.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'training/dtrain/score.h') diff --git a/training/dtrain/score.h b/training/dtrain/score.h index 53e970ba..2a49e52d 100644 --- a/training/dtrain/score.h +++ b/training/dtrain/score.h @@ -138,7 +138,7 @@ make_ngram_counts(const vector& hyp, const vector& ref, const un struct BleuScorer : public LocalScorer { score_t Bleu(NgramCounts& counts, const unsigned hyp_len, const unsigned ref_len); - score_t Score(vector& hyp, vector& ref, const unsigned /*rank*/, const unsigned /*src_len*/); + score_t Score(const vector& hyp, const vector& ref, const unsigned /*rank*/, const unsigned /*src_len*/); void Reset() {} }; -- cgit v1.2.3 From 95a69136109665881be66ff4e8f9eca6abb08477 Mon Sep 17 00:00:00 2001 From: Patrick Simianer Date: Fri, 22 Nov 2013 14:27:29 +0100 Subject: argh, const --- training/dtrain/dtrain.h | 2 +- training/dtrain/score.cc | 18 +++++++++--------- training/dtrain/score.h | 16 ++++++++-------- 3 files changed, 18 insertions(+), 18 deletions(-) (limited to 'training/dtrain/score.h') diff --git a/training/dtrain/dtrain.h b/training/dtrain/dtrain.h index ccb5ad4d..eb23b813 100644 --- a/training/dtrain/dtrain.h +++ b/training/dtrain/dtrain.h @@ -64,7 +64,7 @@ struct LocalScorer vector w_; virtual score_t - Score(vector& hyp, vector& ref, const unsigned rank, const unsigned src_len)=0; + Score(const vector& hyp, const vector& ref, const unsigned rank, const unsigned src_len)=0; virtual void Reset() {} // only for ApproxBleuScorer, LinearBleuScorer diff --git a/training/dtrain/score.cc b/training/dtrain/score.cc index 96d6e10a..127f34d2 100644 --- a/training/dtrain/score.cc +++ b/training/dtrain/score.cc @@ -32,7 +32,7 @@ BleuScorer::Bleu(NgramCounts& counts, const unsigned hyp_len, const unsigned ref } score_t -BleuScorer::Score(vector& hyp, vector& ref, +BleuScorer::Score(const vector& hyp, const vector& ref, const unsigned /*rank*/, const unsigned /*src_len*/) { unsigned hyp_len = hyp.size(), ref_len = ref.size(); @@ -52,7 +52,7 @@ BleuScorer::Score(vector& hyp, vector& ref, * NOTE: 0 iff no 1gram match ('grounded') */ score_t -StupidBleuScorer::Score(vector& hyp, vector& ref, +StupidBleuScorer::Score(const vector& hyp, const vector& ref, const unsigned /*rank*/, const unsigned /*src_len*/) { unsigned hyp_len = hyp.size(), ref_len = ref.size(); @@ -81,7 +81,7 @@ StupidBleuScorer::Score(vector& hyp, vector& ref, * (Nakov et al. '12) */ score_t -FixedStupidBleuScorer::Score(vector& hyp, vector& ref, +FixedStupidBleuScorer::Score(const vector& hyp, const vector& ref, const unsigned /*rank*/, const unsigned /*src_len*/) { unsigned hyp_len = hyp.size(), ref_len = ref.size(); @@ -112,7 +112,7 @@ FixedStupidBleuScorer::Score(vector& hyp, vector& ref, * NOTE: max is 0.9375 (with N=4) */ score_t -SmoothBleuScorer::Score(vector& hyp, vector& ref, +SmoothBleuScorer::Score(const vector& hyp, const vector& ref, const unsigned /*rank*/, const unsigned /*src_len*/) { unsigned hyp_len = hyp.size(), ref_len = ref.size(); @@ -143,7 +143,7 @@ SmoothBleuScorer::Score(vector& hyp, vector& ref, * sum up Ngram precisions */ score_t -SumBleuScorer::Score(vector& hyp, vector& ref, +SumBleuScorer::Score(const vector& hyp, const vector& ref, const unsigned /*rank*/, const unsigned /*src_len*/) { unsigned hyp_len = hyp.size(), ref_len = ref.size(); @@ -167,7 +167,7 @@ SumBleuScorer::Score(vector& hyp, vector& ref, * sum up exp(Ngram precisions) */ score_t -SumExpBleuScorer::Score(vector& hyp, vector& ref, +SumExpBleuScorer::Score(const vector& hyp, const vector& ref, const unsigned /*rank*/, const unsigned /*src_len*/) { unsigned hyp_len = hyp.size(), ref_len = ref.size(); @@ -191,7 +191,7 @@ SumExpBleuScorer::Score(vector& hyp, vector& ref, * sum up exp(weight * log(Ngram precisions)) */ score_t -SumWhateverBleuScorer::Score(vector& hyp, vector& ref, +SumWhateverBleuScorer::Score(const vector& hyp, const vector& ref, const unsigned /*rank*/, const unsigned /*src_len*/) { unsigned hyp_len = hyp.size(), ref_len = ref.size(); @@ -224,7 +224,7 @@ SumWhateverBleuScorer::Score(vector& hyp, vector& ref, * No scaling by src len. */ score_t -ApproxBleuScorer::Score(vector& hyp, vector& ref, +ApproxBleuScorer::Score(const vector& hyp, const vector& ref, const unsigned rank, const unsigned src_len) { unsigned hyp_len = hyp.size(), ref_len = ref.size(); @@ -255,7 +255,7 @@ ApproxBleuScorer::Score(vector& hyp, vector& ref, * */ score_t -LinearBleuScorer::Score(vector& hyp, vector& ref, +LinearBleuScorer::Score(const vector& hyp, const vector& ref, const unsigned rank, const unsigned /*src_len*/) { unsigned hyp_len = hyp.size(), ref_len = ref.size(); diff --git a/training/dtrain/score.h b/training/dtrain/score.h index 2a49e52d..1cdd3fa9 100644 --- a/training/dtrain/score.h +++ b/training/dtrain/score.h @@ -144,37 +144,37 @@ struct BleuScorer : public LocalScorer struct StupidBleuScorer : public LocalScorer { - score_t Score(vector& hyp, vector& ref, const unsigned /*rank*/, const unsigned /*src_len*/); + score_t Score(const vector& hyp, const vector& ref, const unsigned /*rank*/, const unsigned /*src_len*/); void Reset() {} }; struct FixedStupidBleuScorer : public LocalScorer { - score_t Score(vector& hyp, vector& ref, const unsigned /*rank*/, const unsigned /*src_len*/); + score_t Score(const vector& hyp, const vector& ref, const unsigned /*rank*/, const unsigned /*src_len*/); void Reset() {} }; struct SmoothBleuScorer : public LocalScorer { - score_t Score(vector& hyp, vector& ref, const unsigned /*rank*/, const unsigned /*src_len*/); + score_t Score(const vector& hyp, const vector& ref, const unsigned /*rank*/, const unsigned /*src_len*/); void Reset() {} }; struct SumBleuScorer : public LocalScorer { - score_t Score(vector& hyp, vector& ref, const unsigned /*rank*/, const unsigned /*src_len*/); + score_t Score(const vector& hyp, const vector& ref, const unsigned /*rank*/, const unsigned /*src_len*/); void Reset() {} }; struct SumExpBleuScorer : public LocalScorer { - score_t Score(vector& hyp, vector& ref, const unsigned /*rank*/, const unsigned /*src_len*/); + score_t Score(const vector& hyp, const vector& ref, const unsigned /*rank*/, const unsigned /*src_len*/); void Reset() {} }; struct SumWhateverBleuScorer : public LocalScorer { - score_t Score(vector& hyp, vector& ref, const unsigned /*rank*/, const unsigned /*src_len*/); + score_t Score(const vector& hyp, const vector& ref, const unsigned /*rank*/, const unsigned /*src_len*/); void Reset() {}; }; @@ -194,7 +194,7 @@ struct ApproxBleuScorer : public BleuScorer glob_hyp_len_ = glob_ref_len_ = glob_src_len_ = 0.; } - score_t Score(vector& hyp, vector& ref, const unsigned rank, const unsigned src_len); + score_t Score(const vector& hyp, const vector& ref, const unsigned rank, const unsigned src_len); }; struct LinearBleuScorer : public BleuScorer @@ -207,7 +207,7 @@ struct LinearBleuScorer : public BleuScorer onebest_counts_.One(); } - score_t Score(vector& hyp, vector& ref, const unsigned rank, const unsigned /*src_len*/); + score_t Score(const vector& hyp, const vector& ref, const unsigned rank, const unsigned /*src_len*/); inline void Reset() { onebest_len_ = 1; -- cgit v1.2.3