From b6474b5cdbf870725371b32670c9dc28671e394c Mon Sep 17 00:00:00 2001 From: Chris Dyer Date: Thu, 9 Aug 2012 01:36:36 -0400 Subject: fixes for new word api --- decoder/hg_intersect.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'decoder/hg_intersect.cc') diff --git a/decoder/hg_intersect.cc b/decoder/hg_intersect.cc index 6e3bfee6..e9a91061 100644 --- a/decoder/hg_intersect.cc +++ b/decoder/hg_intersect.cc @@ -101,7 +101,7 @@ bool HG::Intersect(const Lattice& target, Hypergraph* hg) { // grammar, create the labels here const string kSEP = "_"; for (unsigned i = 0; i < nnodes; ++i) { - const char* pstr = "CAT"; + string pstr = "CAT"; if (hg->nodes_[i].cat_ < 0) pstr = TD::Convert(-hg->nodes_[i].cat_); cats[i] = TD::Convert(pstr + kSEP + lexical_cast(i)) * -1; -- cgit v1.2.3 From 81ac6ea30c1105693e9d6886eff686908180d7b9 Mon Sep 17 00:00:00 2001 From: Chris Dyer Date: Sun, 12 Aug 2012 23:36:44 -0400 Subject: redefine HG --- decoder/hg_intersect.cc | 6 +++++- decoder/hg_intersect.h | 6 ++---- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'decoder/hg_intersect.cc') diff --git a/decoder/hg_intersect.cc b/decoder/hg_intersect.cc index e9a91061..ad5b701a 100644 --- a/decoder/hg_intersect.cc +++ b/decoder/hg_intersect.cc @@ -79,7 +79,9 @@ static bool FastLinearIntersect(const Lattice& target, Hypergraph* hg) { return (cov.size() == target.size()); } -bool HG::Intersect(const Lattice& target, Hypergraph* hg) { +namespace HG { + +bool Intersect(const Lattice& target, Hypergraph* hg) { // there are a number of faster algorithms available for restricted // classes of hypergraph and/or target. if (hg->IsLinearChain() && target.IsSentence()) @@ -160,3 +162,5 @@ bool HG::Intersect(const Lattice& target, Hypergraph* hg) { return true; } +} + diff --git a/decoder/hg_intersect.h b/decoder/hg_intersect.h index 826bdaae..29a5ea2a 100644 --- a/decoder/hg_intersect.h +++ b/decoder/hg_intersect.h @@ -1,13 +1,11 @@ #ifndef _HG_INTERSECT_H_ #define _HG_INTERSECT_H_ -#include - #include "lattice.h" class Hypergraph; -struct HG { - static bool Intersect(const Lattice& target, Hypergraph* hg); +namespace HG { + bool Intersect(const Lattice& target, Hypergraph* hg); }; #endif -- cgit v1.2.3