diff options
author | Barry Haddow <barry.haddow@gmail.com> | 2012-02-01 14:12:16 +0400 |
---|---|---|
committer | Barry Haddow <barry.haddow@gmail.com> | 2012-02-01 14:12:16 +0400 |
commit | 5a17ef82b3c7449d9fb3686875a7936193e14a89 (patch) | |
tree | 15c7bc53884e757084cad9d9030d62db74bd39ea /moses-cmd | |
parent | 1e10bb7ef7081ddc76463c90ff5d58820b91a39e (diff) | |
parent | 04229893c4f08da987c6509bf50baeb90f41bb6a (diff) |
Merge remote branch 'github/miramerge' into bjam
Conflicts:
mira/Decoder.h
mira/Main.cpp
mira/Main.h
moses-chart-cmd/src/IOWrapper.cpp
moses-chart-cmd/src/Main.cpp
moses-cmd/src/Main.cpp
moses/src/BleuScoreFeature.cpp
moses/src/BleuScoreFeature.h
moses/src/TargetNgramFeature.h
Diffstat (limited to 'moses-cmd')
-rw-r--r-- | moses-cmd/src/Main.cpp | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/moses-cmd/src/Main.cpp b/moses-cmd/src/Main.cpp index feb092dab..0eeaa74e5 100644 --- a/moses-cmd/src/Main.cpp +++ b/moses-cmd/src/Main.cpp @@ -295,17 +295,13 @@ static void PrintFeatureWeight(const FeatureFunction* ff) << ff->GetScoreProducerWeightShortName() << " " << values[i] << endl; } -} - -static void PrintSparseFeatureWeight(const FeatureFunction* ff) -{ - if (ff->GetNumScoreComponents() == ScoreProducer::unlimited) { - if (ff->GetSparseProducerWeight() == 1) - cout << ff->GetScoreProducerDescription() << " " << - ff->GetScoreProducerWeightShortName() << " sparse" << endl; - else - cout << ff->GetScoreProducerDescription() << " " << - ff->GetScoreProducerWeightShortName() << " " << ff->GetSparseProducerWeight() << endl; + else { + if (ff->GetSparseProducerWeight() == 1) + cout << ff->GetScoreProducerDescription() << " " << + ff->GetScoreProducerWeightShortName() << " sparse" << endl; + else + cout << ff->GetScoreProducerDescription() << " " << + ff->GetScoreProducerWeightShortName() << " " << ff->GetSparseProducerWeight() << endl; } } @@ -322,7 +318,7 @@ static void ShowWeights() PrintFeatureWeight(sff[i]); } for (size_t i = 0; i < slf.size(); ++i) { - PrintFeatureWeight(slf[i]); + PrintFeatureWeight(slf[i]); } for (size_t i = 0; i < pds.size(); ++i) { PrintFeatureWeight(pds[i]); @@ -330,9 +326,6 @@ static void ShowWeights() for (size_t i = 0; i < gds.size(); ++i) { PrintFeatureWeight(gds[i]); } - for (size_t i = 0; i < sff.size(); ++i) { - PrintSparseFeatureWeight(sff[i]); - } } /** main function of the command line version of the decoder **/ |