diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d71e7a0..e102af9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -9,7 +9,7 @@ LINK_DIRECTORIES(Husky) INSTALL(TARGETS cjsegment RUNTIME DESTINATION bin) INSTALL(TARGETS cjserver RUNTIME DESTINATION bin) -INSTALL(FILES ChineseFilter.hpp HMMSegment.hpp MPSegment.hpp Trie.hpp globals.h ISegment.hpp MixSegment.hpp SegmentBase.hpp TransCode.hpp DESTINATION include/CppJieba) +INSTALL(FILES ChineseFilter.hpp HMMSegment.hpp MPSegment.hpp Trie.hpp ISegment.hpp MixSegment.hpp SegmentBase.hpp TransCode.hpp DESTINATION include/CppJieba) ADD_SUBDIRECTORY(Husky) ADD_SUBDIRECTORY(Limonp) diff --git a/src/ChineseFilter.hpp b/src/ChineseFilter.hpp index 6016b09..06039bb 100644 --- a/src/ChineseFilter.hpp +++ b/src/ChineseFilter.hpp @@ -7,8 +7,9 @@ namespace CppJieba { + enum CHAR_TYPE { CHWORD = 0, DIGIT_OR_LETTER = 1, OTHERS = 2}; + typedef Unicode::const_iterator UniConIter; class ChineseFilter; - class ChFilterIterator { public: diff --git a/src/HMMSegment.hpp b/src/HMMSegment.hpp index 417ba91..6886289 100644 --- a/src/HMMSegment.hpp +++ b/src/HMMSegment.hpp @@ -14,6 +14,7 @@ namespace CppJieba { using namespace Limonp; + typedef unordered_map EmitProbMap; class HMMSegment: public SegmentBase { public: diff --git a/src/TransCode.hpp b/src/TransCode.hpp index febe3a4..f89aac6 100644 --- a/src/TransCode.hpp +++ b/src/TransCode.hpp @@ -13,6 +13,7 @@ namespace CppJieba { using namespace Limonp; + typedef std::vector Unicode; namespace TransCode { inline bool decode(const string& str, vector& vec) diff --git a/src/Trie.hpp b/src/Trie.hpp index b23bff3..4f50cfe 100644 --- a/src/Trie.hpp +++ b/src/Trie.hpp @@ -21,6 +21,9 @@ namespace CppJieba { using namespace Limonp; + const double MIN_DOUBLE = -3.14e+100; + const double MAX_DOUBLE = 3.14e+100; + typedef unordered_map TrieNodeMap; struct TrieNode { TrieNodeMap hmap; diff --git a/src/globals.h b/src/globals.h deleted file mode 100644 index c12007d..0000000 --- a/src/globals.h +++ /dev/null @@ -1,36 +0,0 @@ -/************************************ - * file enc : ASCII - * author : wuyanyi09@gmail.com -************************************/ -#ifndef CPPJIEBA_GLOBALS_H -#define CPPJIEBA_GLOBALS_H - -#include -#include -#include -#include -#include -//#include -#include -//#include - -namespace CppJieba -{ - - using namespace std; - using std::tr1::unordered_map; - //using __gnu_cxx::hash_map; - //using namespace stdext; - //typedefs - typedef std::vector::iterator VSI; - typedef std::vector Unicode; - typedef Unicode::const_iterator UniConIter; - typedef unordered_map TrieNodeMap; - typedef unordered_map EmitProbMap; - - const double MIN_DOUBLE = -3.14e+100; - const double MAX_DOUBLE = 3.14e+100; - enum CHAR_TYPE { CHWORD = 0, DIGIT_OR_LETTER = 1, OTHERS = 2}; -} - -#endif