diff options
| author | Jonathan Clark <jon.h.clark@gmail.com> | 2011-03-24 09:48:04 -0400 |
|---|---|---|
| committer | Jonathan Clark <jon.h.clark@gmail.com> | 2011-03-24 09:48:04 -0400 |
| commit | 3beddfbe44c52fb69c390d0af92ab7c5e1647622 (patch) | |
| tree | 07db22cfbd0b9aad59159ca25ad1bd67d519c69f /decoder | |
| parent | 4d1587807682769465027358050418323765c9b8 (diff) | |
| parent | e6b0800c5d03887b610c64d0b9ceb4739dfa5961 (diff) | |
Undo some silly local changes so we can pull
Diffstat (limited to 'decoder')
| -rw-r--r-- | decoder/Makefile.am | 2 | ||||
| -rw-r--r-- | decoder/ff_wordset.h | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/decoder/Makefile.am b/decoder/Makefile.am index f43e6894..9cf4c3c4 100644 --- a/decoder/Makefile.am +++ b/decoder/Makefile.am @@ -82,5 +82,5 @@ libcdec_a_SOURCES = \ if GLC # Until we build GLC as a library... - libcdec_a_SOURCES += ff_glc.cc feature-factory.cc string_util.cc + libcdec_a_SOURCES += ff_glc.cc endif diff --git a/decoder/ff_wordset.h b/decoder/ff_wordset.h index 256d54bb..00e1145b 100644 --- a/decoder/ff_wordset.h +++ b/decoder/ff_wordset.h @@ -13,13 +13,12 @@ class WordSet : public FeatureFunction { public: - // we depend on the order of the initializer list // to call member constructurs in the proper order // modify this carefully! // // Usage: "WordSet -v vocab.txt [--oov]" - WordSet(const std::string& param) { + WordSet(const std::string& param) { std::string vocabFile; std::string featName; parseArgs(param, &featName, &vocabFile, &oovMode_); @@ -30,6 +29,9 @@ class WordSet : public FeatureFunction { loadVocab(vocabFile, &vocab_); } + ~WordSet() { + } + protected: virtual void TraversalFeaturesImpl(const SentenceMetadata& smeta, |