From 0d26c2f52153784e15393e5fb69c2531c63083b6 Mon Sep 17 00:00:00 2001
From: Barry Haddow <barry.haddow@gmail.com>
Date: Fri, 9 Nov 2012 12:11:49 +0000
Subject: [PATCH] Sync showweights order with nbest

---
 moses-cmd/src/Main.cpp | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/moses-cmd/src/Main.cpp b/moses-cmd/src/Main.cpp
index d7141ca57..ff8eaee6f 100644
--- a/moses-cmd/src/Main.cpp
+++ b/moses-cmd/src/Main.cpp
@@ -334,6 +334,7 @@ static void PrintFeatureWeight(const FeatureFunction* ff)
 
 static void ShowWeights()
 {
+  //TODO: Find a way of ensuring this order is synced with the nbest
   fix(cout,6);
   const StaticData& staticData = StaticData::Instance();
   const TranslationSystem& system = staticData.GetTranslationSystem(TranslationSystem::DEFAULT);
@@ -343,10 +344,23 @@ static void ShowWeights()
     PrintFeatureWeight(sff[i]);
   }
   for (size_t i = 0; i < slf.size(); ++i) {
-    if (slf[i]->GetScoreProducerWeightShortName() != "u") {
+    if (slf[i]->GetScoreProducerWeightShortName() != "u" &&
+          slf[i]->GetScoreProducerWeightShortName() != "tm" &&
+          slf[i]->GetScoreProducerWeightShortName() != "I" &&
+          slf[i]->GetScoreProducerWeightShortName() != "g")
+    {
   	  PrintFeatureWeight(slf[i]);
     }
   }
+  const vector<PhraseDictionaryFeature*>& pds = system.GetPhraseDictionaries();
+  for( size_t i=0; i<pds.size(); i++ ) {
+    PrintFeatureWeight(pds[i]);
+  }
+  const vector<GenerationDictionary*>& gds = system.GetGenerationDictionaries();
+  for( size_t i=0; i<gds.size(); i++ ) {
+    PrintFeatureWeight(gds[i]);
+  }
+
 }
 
 } //namespace