From da176941c1f481f14e93bd7d055cc29cac0ea8c8 Mon Sep 17 00:00:00 2001
From: Chris Dyer <cdyer@cs.cmu.edu>
Date: Sun, 12 Aug 2012 23:33:21 -0400
Subject: use new union api

---
 decoder/decoder.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'decoder/decoder.cc')

diff --git a/decoder/decoder.cc b/decoder/decoder.cc
index a6f7b1ce..a69a6d05 100644
--- a/decoder/decoder.cc
+++ b/decoder/decoder.cc
@@ -24,6 +24,7 @@
 #include "hg.h"
 #include "sentence_metadata.h"
 #include "hg_intersect.h"
+#include "hg_union.h"
 
 #include "oracle_bleu.h"
 #include "apply_models.h"
@@ -980,7 +981,7 @@ bool DecoderImpl::Decode(const string& input, DecoderObserver* o) {
         bool succeeded = HypergraphIO::ReadFromJSON(rf.stream(), &new_hg);
         if (!succeeded) abort();
       }
-      new_hg.Union(forest);
+      HG::Union(forest, &new_hg);
       bool succeeded = writer.Write(new_hg, false);
       if (!succeeded) abort();
     } else {
@@ -1067,7 +1068,7 @@ bool DecoderImpl::Decode(const string& input, DecoderObserver* o) {
             bool succeeded = HypergraphIO::ReadFromJSON(rf.stream(), &new_hg);
             if (!succeeded) abort();
           }
-          new_hg.Union(forest);
+          HG::Union(forest, &new_hg);
           bool succeeded = writer.Write(new_hg, false);
           if (!succeeded) abort();
         } else {
-- 
cgit v1.2.3