Combine everything related to maxent to a single file

redpony · Dec 17, 2014 · bd9308e · bd9308e
1 parent f2d50c3
commit bd9308e
Show file tree

Hide file tree

Showing 10 changed files with 516 additions and 556 deletions.
diff --git 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)

diff --git a/training/const_reorder/trainer.cc b/training/const_reorder/trainer.cc
@@ -10,7 +10,7 @@ void Tsuruoka_Maxent_Trainer::fnTrain(const char* pszInstanceFName,
          strcmp(pszAlgorithm, "sgd") == 0 || strcmp(pszAlgorithm, "SGD") == 0);
   FILE* fpIn = fopen(pszInstanceFName, "r");
 
-  ME_Model* pModel = new ME_Model();
+  maxent::ME_Model* pModel = new maxent::ME_Model();
 
   char* pszLine = new char[100001];
   int iNumInstances = 0;
@@ -30,7 +30,7 @@ void Tsuruoka_Maxent_Trainer::fnTrain(const char* pszInstanceFName,
 
     iNumInstances++;
 
-    ME_Sample* pmes = new ME_Sample();
+    maxent::ME_Sample* pmes = new maxent::ME_Sample();
 
     char* p = strrchr(pszLine, ' ');
     assert(p != NULL);

diff --git a/utils/Makefile.am b/utils/Makefile.am
@@ -38,20 +38,15 @@ libutils_a_SOURCES = \
   have_64_bits.h \
   indices_after.h \
   kernel_string_subseq.h \
-  lbfgs.h \
-  lbfgs.cpp \
   logval.h \
   m.h \
-  mathvec.h \
   maxent.h \
   maxent.cpp \
   murmur_hash3.h \
   murmur_hash3.cc \
   named_enum.h \
   null_deleter.h \
   null_traits.h \
-  owlqn.cpp \
-  sgd.cpp \
   perfect_hash.h \
   prob.h \
   sampler.h \

diff --git a/utils/lbfgs.cpp b/utils/lbfgs.cpp
diff --git a/utils/lbfgs.h b/utils/lbfgs.h
diff --git a/utils/mathvec.h b/utils/mathvec.h