resolv conflict in mira

1 files changed, 6 insertions, 4 deletions

diff --git a/training/mira/kbest_cut_mira.cc b/training/mira/kbest_cut_mira.cc
index 9415909e..9de57f5f 100644
--- a/training/mira/kbest_cut_mira.cc
+++ b/training/mira/kbest_cut_mira.cc
@@ -134,6 +134,7 @@ static const int MAX_SMO = 10;
 int cur_pass;
 
 struct HypothesisInfo {
+  HypothesisInfo() : mt_metric(), hope(), fear(), alpha(), oracle_loss() {}
   SparseVector<double> features;
   vector<WordID> hyp;
   double mt_metric;
@@ -415,8 +416,9 @@ struct TrainingObserver : public DecoderObserver {
   template <class Filter>  
   void UpdateOracles(int sent_id, const Hypergraph& forest) {
 
-	if (stream) sent_id = 0;
+    if (stream) sent_id = 0;
     bool PRINT_LIST= false;
+    assert(sent_id < oracles.size());
     vector<boost::shared_ptr<HypothesisInfo> >& cur_good = oracles[sent_id].good;
     vector<boost::shared_ptr<HypothesisInfo> >& cur_bad = oracles[sent_id].bad;
     //TODO: look at keeping previous iterations hypothesis lists around
@@ -813,7 +815,6 @@ int main(int argc, char** argv) {
       }
       else if(optimizer == 1) //sgd - nonadapted step size
 	{
-	   
 	  lambdas += (cur_good.features) * max_step_size;
 	  lambdas -= (cur_bad.features) * max_step_size;
 	}
@@ -932,10 +933,11 @@ int main(int argc, char** argv) {
 			lambdas += (cur_pair[1]->features) * step_size;
 			lambdas -= (cur_pair[0]->features) * step_size;
 			if (VERBOSE) cerr << " Lambdas " << lambdas << endl;
-			//reload weights based on update
 
+			//reload weights based on update
 			dense_weights.clear();
 			lambdas.init_vector(&dense_weights);
+                        ShowLargestFeatures(dense_weights);
 			dense_w_local = dense_weights;
 			iter++;
 					
@@ -974,7 +976,7 @@ int main(int argc, char** argv) {
 
 	    for(int u=0;u!=cur_constraint.size();u++)	
 	      { 
-		cerr << cur_constraint[u]->alpha << " " << cur_constraint[u]->hope << " " << cur_constraint[u]->fear << endl;
+		cerr << "alpha=" << cur_constraint[u]->alpha << " hope=" << cur_constraint[u]->hope << " fear=" << cur_constraint[u]->fear << endl;
 		temp_objective += cur_constraint[u]->alpha * cur_constraint[u]->fear;
 	      }
 	    objective += temp_objective;