From 230cf27272cc7c15ebf7370b9aa8808b5b282426 Mon Sep 17 00:00:00 2001
From: Chris Dyer <cdyer@cs.cmu.edu>
Date: Thu, 26 Apr 2012 21:19:56 -0400
Subject: working rampion, gimpel&smith (2012)

---
 rampion/rampion_cccp.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'rampion/rampion_cccp.cc')

diff --git a/rampion/rampion_cccp.cc b/rampion/rampion_cccp.cc
index 6eb3ccf3..a04da831 100644
--- a/rampion/rampion_cccp.cc
+++ b/rampion/rampion_cccp.cc
@@ -58,6 +58,7 @@ struct HypInfo {
     SufficientStats ss;
     scorer.Evaluate(hyp, &ss);
     g = metric->ComputeScore(ss);
+    if (metric->IsErrorMetric()) g = 1 - g;
   }
 
   vector<WordID> hyp;
@@ -91,7 +92,6 @@ int main(int argc, char** argv) {
   DocumentScorer ds(metric, conf["reference"].as<vector<string> >());
   cerr << "Loaded " << ds.size() << " references for scoring with " << evaluation_metric << endl;
   double goodsign = 1;
-  if (metric->IsErrorMetric()) goodsign = -goodsign;
   double badsign = -goodsign;
 
   Hypergraph hg;
@@ -121,6 +121,8 @@ int main(int argc, char** argv) {
     vector<HypInfo>& curkbest = kis.back();
     is >> file >> sent_id;
     ReadFile rf(file);
+    if (kis.size() % 5 == 0) { cerr << '.'; }
+    if (kis.size() % 200 == 0) { cerr << " [" << kis.size() << "]\n"; }
     HypergraphIO::ReadFromJSON(rf.stream(), &hg);
     hg.Reweight(weights);
     KBest::KBestDerivations<vector<WordID>, ESentenceTraversal> kbest(hg, kbest_size);
@@ -132,8 +134,8 @@ int main(int argc, char** argv) {
       curkbest.push_back(HypInfo(d->yield, d->feature_values, *ds[sent_id], metric));
     }
   }
+  cerr << "\nHypergraphs loaded.\n";
 
-  cerr << "Hypergraphs loaded.\n";
   vector<SparseVector<weight_t> > goals(kis.size());  // f(x_i,y+,h+)
   SparseVector<weight_t> fear;  // f(x,y-,h-)
   for (unsigned iterp = 1; iterp <= tp; ++iterp) {
-- 
cgit v1.2.3


From c5f69888943623e80478b6ba9247acc85758bedf Mon Sep 17 00:00:00 2001
From: Chris Dyer <cdyer@cs.cmu.edu>
Date: Fri, 27 Apr 2012 00:24:21 -0400
Subject: make rampion match pseudocode exactly

---
 rampion/rampion.pl      | 1 +
 rampion/rampion_cccp.cc | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'rampion/rampion_cccp.cc')

diff --git a/rampion/rampion.pl b/rampion/rampion.pl
index d29c02b3..9884f453 100755
--- a/rampion/rampion.pl
+++ b/rampion/rampion.pl
@@ -309,6 +309,7 @@ while (1){
 	check_call($cmd);
 	$lastWeightsFile = $outweights;
 	$iteration++;
+	`rm hgs/*.gz`;
 	print STDERR "\n==========\n";
 }
 
diff --git a/rampion/rampion_cccp.cc b/rampion/rampion_cccp.cc
index a04da831..7a6f1f0c 100644
--- a/rampion/rampion_cccp.cc
+++ b/rampion/rampion_cccp.cc
@@ -58,7 +58,7 @@ struct HypInfo {
     SufficientStats ss;
     scorer.Evaluate(hyp, &ss);
     g = metric->ComputeScore(ss);
-    if (metric->IsErrorMetric()) g = 1 - g;
+    if (!metric->IsErrorMetric()) g = 1 - g;
   }
 
   vector<WordID> hyp;
@@ -91,7 +91,7 @@ int main(int argc, char** argv) {
   EvaluationMetric* metric = EvaluationMetric::Instance(evaluation_metric);
   DocumentScorer ds(metric, conf["reference"].as<vector<string> >());
   cerr << "Loaded " << ds.size() << " references for scoring with " << evaluation_metric << endl;
-  double goodsign = 1;
+  double goodsign = -1;
   double badsign = -goodsign;
 
   Hypergraph hg;
-- 
cgit v1.2.3