summaryrefslogtreecommitdiff
path: root/decoder/ff_lm.h
diff options
context:
space:
mode:
authorVictor Chahuneau <vchahune@cs.cmu.edu>2012-10-16 01:27:30 -0400
committerVictor Chahuneau <vchahune@cs.cmu.edu>2012-10-16 01:27:30 -0400
commit62bf03f0ec79b658c9208f0ae8976397e64a7dee (patch)
treed95676017f04b2abb6315c5f550064c03aeda702 /decoder/ff_lm.h
parent501c0419200234f4ff6b8c3d9f9602596a96c28e (diff)
parent51b5c16c9110999ac573bd3383d7eb0e3f10fc37 (diff)
Merge branch 'master' of github.com:redpony/cdec
Diffstat (limited to 'decoder/ff_lm.h')
-rw-r--r--decoder/ff_lm.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/decoder/ff_lm.h b/decoder/ff_lm.h
index ccee4268..94e18f00 100644
--- a/decoder/ff_lm.h
+++ b/decoder/ff_lm.h
@@ -55,10 +55,9 @@ class LanguageModel : public FeatureFunction {
SparseVector<double>* features) const;
std::string DebugStateToString(const void* state) const;
static std::string usage(bool param,bool verbose);
- Features features() const;
protected:
virtual void TraversalFeaturesImpl(const SentenceMetadata& smeta,
- const Hypergraph::Edge& edge,
+ const HG::Edge& edge,
const std::vector<const void*>& ant_contexts,
SparseVector<double>* features,
SparseVector<double>* estimated_features,
@@ -81,7 +80,7 @@ class LanguageModelRandLM : public FeatureFunction {
std::string DebugStateToString(const void* state) const;
protected:
virtual void TraversalFeaturesImpl(const SentenceMetadata& smeta,
- const Hypergraph::Edge& edge,
+ const HG::Edge& edge,
const std::vector<const void*>& ant_contexts,
SparseVector<double>* features,
SparseVector<double>* estimated_features,