diff options
| author | Patrick Simianer <simianer@cl.uni-heidelberg.de> | 2012-11-05 15:29:46 +0100 |
|---|---|---|
| committer | Patrick Simianer <simianer@cl.uni-heidelberg.de> | 2012-11-05 15:29:46 +0100 |
| commit | 1db70a45d59946560fbd5db6487b55a8674ef973 (patch) | |
| tree | 172585dafe4d1462f22d8200e733d52dddb55b1e /decoder/ff_lm.h | |
| parent | 4dd5216d3afa9ab72b150e250a3c30a5f223ce53 (diff) | |
| parent | 6bbf03ac46bd57400aa9e65a321a304a234af935 (diff) | |
merge upstream/master
Diffstat (limited to 'decoder/ff_lm.h')
| -rw-r--r-- | decoder/ff_lm.h | 5 |
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, |