From 3ea6bc5eadc05b9f052e16a33a5eb96823048e88 Mon Sep 17 00:00:00 2001 From: Patrick Simianer Date: Fri, 26 Apr 2013 15:30:44 +0200 Subject: added Gesa's alternative source syntax features --- decoder/ff_source_syntax2_p.cc | 166 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 166 insertions(+) create mode 100644 decoder/ff_source_syntax2_p.cc (limited to 'decoder/ff_source_syntax2_p.cc') diff --git a/decoder/ff_source_syntax2_p.cc b/decoder/ff_source_syntax2_p.cc new file mode 100644 index 00000000..3517b87f --- /dev/null +++ b/decoder/ff_source_syntax2_p.cc @@ -0,0 +1,166 @@ +#include "ff_source_syntax2_p.h" + +#include +#include +#include +#include + +#include "sentence_metadata.h" +#include "array2d.h" +#include "filelib.h" + +using namespace std; + +// implements the source side syntax features described in Blunsom et al. (EMNLP 2008) +// source trees must be represented in Penn Treebank format, e.g. +// (S (NP John) (VP (V left))) + +struct SourceSyntaxFeatures2Impl { + SourceSyntaxFeatures2Impl(const string& param) { + if (param.compare("") != 0) { + string triggered_features_fn = param; + ReadFile triggered_features(triggered_features_fn); + string in; + while(getline(*triggered_features, in)) { + feature_filter.insert(FD::Convert(in)); + } + } + /*cerr << "find(\"One\") == " << boolalpha << (table.find("One") != table.end()) << endl; + cerr << "find(\"Three\") == " << boolalpha << (table.find("Three") != table.end()) << endl;*/ + } + + void InitializeGrids(const string& tree, unsigned src_len) { + assert(tree.size() > 0); + //fids_cat.clear(); + fids_ef.clear(); + src_tree.clear(); + //fids_cat.resize(src_len, src_len + 1); + fids_ef.resize(src_len, src_len + 1); + src_tree.resize(src_len, src_len + 1, TD::Convert("XX")); + ParseTreeString(tree, src_len); + } + + void ParseTreeString(const string& tree, unsigned src_len) { + //cerr << "TREE: " << tree << endl; + stack > stk; // first = i, second = category + pair cur_cat; cur_cat.first = -1; + unsigned i = 0; + unsigned p = 0; + while(p < tree.size()) { + const char cur = tree[p]; + if (cur == '(') { + stk.push(cur_cat); + ++p; + unsigned k = p + 1; + while (k < tree.size() && tree[k] != ' ') { ++k; } + cur_cat.first = i; + cur_cat.second = TD::Convert(tree.substr(p, k - p)); + // cerr << "NT: '" << tree.substr(p, k-p) << "' (i=" << i << ")\n"; + p = k + 1; + } else if (cur == ')') { + unsigned k = p; + while (k < tree.size() && tree[k] == ')') { ++k; } + const unsigned num_closes = k - p; + for (unsigned ci = 0; ci < num_closes; ++ci) { + src_tree(cur_cat.first, i) = cur_cat.second; + cur_cat = stk.top(); + stk.pop(); + } + p = k; + while (p < tree.size() && (tree[p] == ' ' || tree[p] == '\t')) { ++p; } + } else if (cur == ' ' || cur == '\t') { + cerr << "Unexpected whitespace in: " << tree << endl; + abort(); + } else { // terminal symbol + unsigned k = p + 1; + do { + while (k < tree.size() && tree[k] != ')' && tree[k] != ' ') { ++k; } + // cerr << "TERM: '" << tree.substr(p, k-p) << "' (i=" << i << ")\n"; + ++i; + assert(i <= src_len); + while (k < tree.size() && tree[k] == ' ') { ++k; } + p = k; + } while (p < tree.size() && tree[p] != ')'); + } + //cerr << "i=" << i << " src_len=" << src_len << endl; + } + //cerr << "i=" << i << " src_len=" << src_len << endl; + assert(i == src_len); // make sure tree specified in src_tree is + // the same length as the source sentence + } + + WordID FireFeatures(const TRule& rule, const int i, const int j, const WordID* ants, SparseVector* feats) { + //cerr << "fire features: " << rule.AsString() << " for " << i << "," << j << endl; + const WordID lhs = src_tree(i,j); + int& fid_ef = fids_ef(i,j)[&rule]; + ostringstream os; + os << "SYN:" << TD::Convert(lhs); + os << ':'; + unsigned ntc = 0; + for (unsigned k = 0; k < rule.f_.size(); ++k) { + int fj = rule.f_[k]; + if (k > 0 && fj <= 0) os << '_'; + if (fj <= 0) { + os << '[' << TD::Convert(ants[ntc++]) << ']'; + } /*else { + os << TD::Convert(fj); + }*/ + } + os << ':'; + for (unsigned k = 0; k < rule.e_.size(); ++k) { + const int ei = rule.e_[k]; + if (k > 0) os << '_'; + if (ei <= 0) + os << '[' << (1-ei) << ']'; + else + os << TD::Convert(ei); + } + fid_ef = FD::Convert(os.str()); + //cerr << "FEATURE: " << os.str() << endl; + //cerr << "FID_EF: " << fid_ef << endl; + if (feature_filter.size() > 0) { + if (feature_filter.find(fid_ef) != feature_filter.end()) { + //cerr << "SYN-Feature was trigger more than once on training set." << endl; + feats->set_value(fid_ef, 1.0); + } + //else cerr << "SYN-Feature was triggered less than once on training set." << endli; + } + else { + feats->set_value(fid_ef, 1.0); + } + return lhs; + } + + Array2D src_tree; // src_tree(i,j) NT = type + mutable Array2D > fids_ef; // fires for fully lexicalized + tr1::unordered_set feature_filter; + +}; + +SourceSyntaxFeatures2::SourceSyntaxFeatures2(const string& param) : + FeatureFunction(sizeof(WordID)) { + impl = new SourceSyntaxFeatures2Impl(param); +} + +SourceSyntaxFeatures2::~SourceSyntaxFeatures2() { + delete impl; + impl = NULL; +} + +void SourceSyntaxFeatures2::TraversalFeaturesImpl(const SentenceMetadata& smeta, + const Hypergraph::Edge& edge, + const vector& ant_contexts, + SparseVector* features, + SparseVector* estimated_features, + void* context) const { + WordID ants[8]; + for (unsigned i = 0; i < ant_contexts.size(); ++i) + ants[i] = *static_cast(ant_contexts[i]); + + *static_cast(context) = + impl->FireFeatures(*edge.rule_, edge.i_, edge.j_, ants, features); +} + +void SourceSyntaxFeatures2::PrepareForInput(const SentenceMetadata& smeta) { + impl->InitializeGrids(smeta.GetSGMLValue("src_tree"), smeta.GetSourceLength()); +} -- cgit v1.2.3 From 619daa3700303b55604781645b28aa702d96b91a Mon Sep 17 00:00:00 2001 From: Patrick Simianer Date: Mon, 29 Apr 2013 11:01:38 +0200 Subject: added (broken) variant of a feature --- decoder/Makefile.am | 13 +++---------- decoder/cdec_ff.cc | 24 +++++++++++++++++++----- decoder/ff_source_syntax2_p.cc | 14 +++++++------- decoder/ff_source_syntax2_p.h | 10 +++++----- 4 files changed, 34 insertions(+), 27 deletions(-) (limited to 'decoder/ff_source_syntax2_p.cc') diff --git a/decoder/Makefile.am b/decoder/Makefile.am index a93a5dbe..00f8b5f9 100644 --- a/decoder/Makefile.am +++ b/decoder/Makefile.am @@ -142,20 +142,13 @@ libcdec_a_SOURCES = \ ff_csplit.cc \ ff_tagger.cc \ ff_source_path.cc \ - ff_source_syntax.h \ + ff_parse_match.cc \ + ff_soft_syntax.cc \ + ff_soft_syntax2.cc \ ff_source_syntax.cc \ - ff_source_syntax_p.h \ ff_source_syntax_p.cc \ - ff_source_syntax2.h \ ff_source_syntax2.cc \ - ff_source_syntax2_p.h \ ff_source_syntax2_p.cc \ - ff_parse_match.cc \ - ff_parse_match.h \ - ff_soft_syntax.cc \ - ff_soft_syntax.h \ - ff_soft_syntax2.cc \ - ff_soft_syntax2.h \ ff_bleu.cc \ ff_factory.cc \ incremental.cc \ diff --git a/decoder/cdec_ff.cc b/decoder/cdec_ff.cc index 186c4de3..bbb83258 100644 --- a/decoder/cdec_ff.cc +++ b/decoder/cdec_ff.cc @@ -17,11 +17,15 @@ #include "ff_soft_syntax.h" #include "ff_soft_syntax2.h" #include "ff_source_path.h" + + +#include "ff_parse_match.h" #include "ff_source_syntax.h" #include "ff_source_syntax_p.h" #include "ff_source_syntax2.h" #include "ff_source_syntax2_p.h" -#include "ff_parse_match.h" + + #include "ff_register.h" #include "ff_charset.h" #include "ff_wordset.h" @@ -54,14 +58,24 @@ void register_feature_functions() { ff_registry.Register("NgramFeatures", new FFFactory()); ff_registry.Register("RuleContextFeatures", new FFFactory()); ff_registry.Register("RuleIdentityFeatures", new FFFactory()); - ff_registry.Register("SoftSyntactcFeatures", new FFFactory); - ff_registry.Register("SoftSyntcticFeatures2", new FFFactory); + + + ff_registry.Register("ParseMatchFeatures", new FFFactory); + + ff_registry.Register("SoftSyntacticFeatures", new FFFactory); + ff_registry.Register("SoftSyntacticFeatures2", new FFFactory); + ff_registry.Register("SourceSyntaxFeatures", new FFFactory); - //ff_registry.Register("PSourceSyntaxFeatures", new FFFactory); ff_registry.Register("SourceSyntaxFeatures2", new FFFactory); - ff_registry.Register("ParseMatchFeatures", new FFFactory); + ff_registry.Register("SourceSpanSizeFeatures", new FFFactory); + + //ff_registry.Register("PSourceSyntaxFeatures", new FFFactory); //ff_registry.Register("PSourceSpanSizeFeatures", new FFFactory); + ff_registry.Register("PSourceSyntaxFeatures2", new FFFactory); + + + ff_registry.Register("CMR2008ReorderingFeatures", new FFFactory()); ff_registry.Register("RuleSourceBigramFeatures", new FFFactory()); ff_registry.Register("RuleTargetBigramFeatures", new FFFactory()); diff --git a/decoder/ff_source_syntax2_p.cc b/decoder/ff_source_syntax2_p.cc index 3517b87f..dfa791ea 100644 --- a/decoder/ff_source_syntax2_p.cc +++ b/decoder/ff_source_syntax2_p.cc @@ -15,8 +15,8 @@ using namespace std; // source trees must be represented in Penn Treebank format, e.g. // (S (NP John) (VP (V left))) -struct SourceSyntaxFeatures2Impl { - SourceSyntaxFeatures2Impl(const string& param) { +struct PSourceSyntaxFeatures2Impl { + PSourceSyntaxFeatures2Impl(const string& param) { if (param.compare("") != 0) { string triggered_features_fn = param; ReadFile triggered_features(triggered_features_fn); @@ -137,17 +137,17 @@ struct SourceSyntaxFeatures2Impl { }; -SourceSyntaxFeatures2::SourceSyntaxFeatures2(const string& param) : +PSourceSyntaxFeatures2::PSourceSyntaxFeatures2(const string& param) : FeatureFunction(sizeof(WordID)) { - impl = new SourceSyntaxFeatures2Impl(param); + impl = new PSourceSyntaxFeatures2Impl(param); } -SourceSyntaxFeatures2::~SourceSyntaxFeatures2() { +PSourceSyntaxFeatures2::~PSourceSyntaxFeatures2() { delete impl; impl = NULL; } -void SourceSyntaxFeatures2::TraversalFeaturesImpl(const SentenceMetadata& smeta, +void PSourceSyntaxFeatures2::TraversalFeaturesImpl(const SentenceMetadata& smeta, const Hypergraph::Edge& edge, const vector& ant_contexts, SparseVector* features, @@ -161,6 +161,6 @@ void SourceSyntaxFeatures2::TraversalFeaturesImpl(const SentenceMetadata& smeta, impl->FireFeatures(*edge.rule_, edge.i_, edge.j_, ants, features); } -void SourceSyntaxFeatures2::PrepareForInput(const SentenceMetadata& smeta) { +void PSourceSyntaxFeatures2::PrepareForInput(const SentenceMetadata& smeta) { impl->InitializeGrids(smeta.GetSGMLValue("src_tree"), smeta.GetSourceLength()); } diff --git a/decoder/ff_source_syntax2_p.h b/decoder/ff_source_syntax2_p.h index b6b7dc3d..d56ecab0 100644 --- a/decoder/ff_source_syntax2_p.h +++ b/decoder/ff_source_syntax2_p.h @@ -4,12 +4,12 @@ #include "ff.h" #include "hg.h" -struct SourceSyntaxFeatures2Impl; +struct PSourceSyntaxFeatures2Impl; -class SourceSyntaxFeatures2 : public FeatureFunction { +class PSourceSyntaxFeatures2 : public FeatureFunction { public: - SourceSyntaxFeatures2(const std::string& param); - ~SourceSyntaxFeatures2(); + PSourceSyntaxFeatures2(const std::string& param); + ~PSourceSyntaxFeatures2(); protected: virtual void TraversalFeaturesImpl(const SentenceMetadata& smeta, const Hypergraph::Edge& edge, @@ -19,7 +19,7 @@ class SourceSyntaxFeatures2 : public FeatureFunction { void* context) const; virtual void PrepareForInput(const SentenceMetadata& smeta); private: - SourceSyntaxFeatures2Impl* impl; + PSourceSyntaxFeatures2Impl* impl; }; #endif -- cgit v1.2.3