slight improvement to the way NTs are handled in the FST-CFG composition algorithm, new rescoring mode

1 files changed, 0 insertions, 63 deletions

diff --git a/decoder/hg.cc b/decoder/hg.cc
index dd272221..7240a8ab 100644
--- a/decoder/hg.cc
+++ b/decoder/hg.cc
@@ -605,69 +605,6 @@ void Hypergraph::TopologicallySortNodesAndEdges(int goal_index,
 #endif
 }
 
-TRulePtr Hypergraph::kEPSRule;
-TRulePtr Hypergraph::kUnaryRule;
-
-void Hypergraph::EpsilonRemove(WordID eps) {
-  if (!kEPSRule) {
-    kEPSRule.reset(new TRule("[X] ||| <eps> ||| <eps>"));
-    kUnaryRule.reset(new TRule("[X] ||| [X,1] ||| [X,1]"));
-  }
-  vector<bool> kill(edges_.size(), false);
-  for (unsigned i = 0; i < edges_.size(); ++i) {
-    const Edge& edge = edges_[i];
-    if (edge.tail_nodes_.empty() &&
-        edge.rule_->f_.size() == 1 &&
-        edge.rule_->f_[0] == eps) {
-      kill[i] = true;
-      if (!edge.feature_values_.empty()) {
-        Node& node = nodes_[edge.head_node_];
-        if (node.in_edges_.size() != 1) {
-          cerr << "[WARNING] <eps> edge with features going into non-empty node - can't promote\n";
-          // this *probably* means that there are multiple derivations of the
-          // same sequence via different paths through the input forest
-          // this needs to be investigated and fixed
-        } else {
-          for (unsigned j = 0; j < node.out_edges_.size(); ++j)
-            edges_[node.out_edges_[j]].feature_values_ += edge.feature_values_;
-          // cerr << "PROMOTED " << edge.feature_values_ << endl;
-	}
-      }
-    }
-  }
-  bool created_eps = false;
-  PruneEdges(kill);
-  for (unsigned i = 0; i < nodes_.size(); ++i) {
-    const Node& node = nodes_[i];
-    if (node.in_edges_.empty()) {
-      for (unsigned j = 0; j < node.out_edges_.size(); ++j) {
-        Edge& edge = edges_[node.out_edges_[j]];
-        if (edge.rule_->Arity() == 2) {
-          assert(edge.rule_->f_.size() == 2);
-          assert(edge.rule_->e_.size() == 2);
-          edge.rule_ = kUnaryRule;
-          unsigned cur = node.id_;
-          int t = -1;
-          assert(edge.tail_nodes_.size() == 2);
-          for (unsigned i = 0; i < 2u; ++i) if (edge.tail_nodes_[i] != cur) { t = edge.tail_nodes_[i]; }
-          assert(t != -1);
-          edge.tail_nodes_.resize(1);
-          edge.tail_nodes_[0] = t;
-        } else {
-          edge.rule_ = kEPSRule;
-          edge.rule_->f_[0] = eps;
-          edge.rule_->e_[0] = eps;
-          edge.tail_nodes_.clear();
-          created_eps = true;
-        }
-      }
-    }
-  }
-  vector<bool> k2(edges_.size(), false);
-  PruneEdges(k2);
-  if (created_eps) EpsilonRemove(eps);
-}
-
 struct EdgeWeightSorter {
   const Hypergraph& hg;
   EdgeWeightSorter(const Hypergraph& h) : hg(h) {}