Merge branch 'master' of git://github.com/redpony/cdec

1 files changed, 9 insertions, 35 deletions

diff --git a/klm/search/vertex_generator.cc b/klm/search/vertex_generator.cc
index 0945fe55..73139ffc 100644
--- a/klm/search/vertex_generator.cc
+++ b/klm/search/vertex_generator.cc
@@ -4,26 +4,18 @@
 #include "search/context.hh"
 #include "search/edge.hh"
 
+#include <boost/unordered_map.hpp>
+#include <boost/version.hpp>
+
 #include <stdint.h>
 
 namespace search {
 
-VertexGenerator::VertexGenerator(ContextBase &context, Vertex &gen) : context_(context), gen_(gen) {
-  gen.root_.InitRoot();
-}
-
+#if BOOST_VERSION > 104200
 namespace {
 
 const uint64_t kCompleteAdd = static_cast<uint64_t>(-1);
 
-// Parallel structure to VertexNode.  
-struct Trie {
-  Trie() : under(NULL) {}
-
-  VertexNode *under;
-  boost::unordered_map<uint64_t, Trie> extend;
-};
-
 Trie &FindOrInsert(ContextBase &context, Trie &node, uint64_t added, const lm::ngram::ChartState &state, unsigned char left, bool left_full, unsigned char right, bool right_full) {
   Trie &next = node.extend[added];
   if (!next.under) {
@@ -39,19 +31,10 @@ Trie &FindOrInsert(ContextBase &context, Trie &node, uint64_t added, const lm::n
   return next;
 }
 
-void CompleteTransition(ContextBase &context, Trie &starter, PartialEdge partial) {
-  Final final(context.FinalPool(), partial.GetScore(), partial.GetArity(), partial.GetNote());
-  Final *child_out = final.Children();
-  const PartialVertex *part = partial.NT();
-  const PartialVertex *const part_end_loop = part + partial.GetArity();
-  for (; part != part_end_loop; ++part, ++child_out)
-    *child_out = part->End();
-
-  starter.under->SetEnd(final);
-}
+} // namespace
 
-void AddHypothesis(ContextBase &context, Trie &root, PartialEdge partial) {
-  const lm::ngram::ChartState &state = partial.CompletedState();
+void AddHypothesis(ContextBase &context, Trie &root, const NBestComplete &end) {
+  const lm::ngram::ChartState &state = *end.state;
   
   unsigned char left = 0, right = 0;
   Trie *node = &root;
@@ -77,18 +60,9 @@ void AddHypothesis(ContextBase &context, Trie &root, PartialEdge partial) {
   }
 
   node = &FindOrInsert(context, *node, kCompleteAdd - state.left.full, state, state.left.length, true, state.right.length, true);
-  CompleteTransition(context, *node, partial);
+  node->under->SetEnd(end.history, end.score);
 }
 
-} // namespace
-
-void VertexGenerator::FinishedSearch() {
-  Trie root;
-  root.under = &gen_.root_;
-  for (Existing::const_iterator i(existing_.begin()); i != existing_.end(); ++i) {
-    AddHypothesis(context_, root, i->second);
-  }
-  root.under->SortAndSet(context_, NULL);
-}
+#endif // BOOST_VERSION
 
 } // namespace search