summaryrefslogtreecommitdiff
path: root/decoder
diff options
context:
space:
mode:
authorWu, Ke <wuke@cs.umd.edu>2014-12-17 16:00:04 -0500
committerWu, Ke <wuke@cs.umd.edu>2014-12-17 16:00:04 -0500
commitbd9308e22b5434aa220cc57d82ee867464a011f1 (patch)
tree8acd68894f53f6bf1833847a0c246974701a611e /decoder
parentf2d50c333d0dde8a5ef211bc31b4978a3d8911cf (diff)
Combine everything related to maxent to a single file
Diffstat (limited to 'decoder')
-rw-r--r--decoder/ff_const_reorder_common.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/decoder/ff_const_reorder_common.h b/decoder/ff_const_reorder_common.h
index b124ce47..755fd948 100644
--- a/decoder/ff_const_reorder_common.h
+++ b/decoder/ff_const_reorder_common.h
@@ -1081,7 +1081,7 @@ typedef std::unordered_map<std::string, int>::iterator Iterator;
struct Tsuruoka_Maxent {
Tsuruoka_Maxent(const char* pszModelFName) {
if (pszModelFName != NULL) {
- m_pModel = new ME_Model();
+ m_pModel = new maxent::ME_Model();
m_pModel->load_from_file(pszModelFName);
} else
m_pModel = NULL;
@@ -1093,7 +1093,7 @@ struct Tsuruoka_Maxent {
void fnEval(const char* pszContext, std::vector<double>& vecOutput) const {
std::vector<std::string> vecContext;
- ME_Sample* pmes = new ME_Sample();
+ maxent::ME_Sample* pmes = new maxent::ME_Sample();
SplitOnWhitespace(std::string(pszContext), &vecContext);
vecOutput.clear();
@@ -1113,7 +1113,7 @@ struct Tsuruoka_Maxent {
}
private:
- ME_Model* m_pModel;
+ maxent::ME_Model* m_pModel;
};
// an argument item or a predicate item (the verb itself)