change order of -show-weights output to match nbest list order

1 files changed, 18 insertions, 13 deletions

diff --git a/moses-cmd/src/Main.cpp b/moses-cmd/src/Main.cpp
index ea132b08b..04fc0ad2c 100644
--- a/moses-cmd/src/Main.cpp
+++ b/moses-cmd/src/Main.cpp
@@ -287,25 +287,27 @@ private:
 
 static void PrintFeatureWeight(const FeatureFunction* ff)
 {
-
   size_t numScoreComps = ff->GetNumScoreComponents();
   if (numScoreComps != ScoreProducer::unlimited) {
     vector<float> values = StaticData::Instance().GetAllWeights().GetScoresForProducer(ff);
-    for (size_t i = 0; i < numScoreComps; ++i) {
+    for (size_t i = 0; i < numScoreComps; ++i) 
       cout << ff->GetScoreProducerDescription() <<  " "
            << ff->GetScoreProducerWeightShortName() << " "
            << values[i] << endl;
-    }
-  } else {
-  	if (ff->GetSparseProducerWeight() == 1)
-  		cout << ff->GetScoreProducerDescription() << " " <<
-  				ff->GetScoreProducerWeightShortName() << " sparse" <<  endl;
-  	else
-  		cout << ff->GetScoreProducerDescription() << " " <<
-  				ff->GetScoreProducerWeightShortName() << " " << ff->GetSparseProducerWeight() << 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;
+  }
+}
 
 static void ShowWeights()
 {
@@ -319,15 +321,18 @@ static void ShowWeights()
   for (size_t i = 0; i < sff.size(); ++i) {
     PrintFeatureWeight(sff[i]);
   }
-  for (size_t i = 0; i < slf.size(); ++i) {
-    PrintFeatureWeight(slf[i]);
-  }
   for (size_t i = 0; i < pds.size(); ++i) {
     PrintFeatureWeight(pds[i]);
   }
   for (size_t i = 0; i < gds.size(); ++i) {
     PrintFeatureWeight(gds[i]);
   }
+  for (size_t i = 0; i < slf.size(); ++i) {
+    PrintFeatureWeight(slf[i]);
+  }
+  for (size_t i = 0; i < sff.size(); ++i) {
+    PrintSparseFeatureWeight(sff[i]);
+  }
 }
 
 /** main function of the command line version of the decoder **/