From c46980c17c31cf10031b39b644d095c076713f79 Mon Sep 17 00:00:00 2001 From: wyy Date: Fri, 30 May 2014 00:21:11 +0800 Subject: [PATCH] minor change --- src/KeywordExtractor.hpp | 6 ++---- src/MixSegment.hpp | 2 +- src/PosTagger.hpp | 2 +- src/QuerySegment.hpp | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/KeywordExtractor.hpp b/src/KeywordExtractor.hpp index 6a81d4c..90be022 100644 --- a/src/KeywordExtractor.hpp +++ b/src/KeywordExtractor.hpp @@ -5,8 +5,6 @@ #include #include -#define MIN(X,Y) ((X) < (Y) ? (X) : (Y)) - namespace CppJieba { using namespace Limonp; @@ -23,7 +21,7 @@ namespace CppJieba unordered_set _stopWords; public: KeywordExtractor(){_setInitFlag(false);}; - explicit KeywordExtractor(const string& dictPath, const string& hmmFilePath, const string& idfPath, const string& stopWordPath) + KeywordExtractor(const string& dictPath, const string& hmmFilePath, const string& idfPath, const string& stopWordPath) { _setInitFlag(init(dictPath, hmmFilePath, idfPath, stopWordPath)); }; @@ -94,7 +92,7 @@ namespace CppJieba keywords.clear(); std::copy(wordmap.begin(), wordmap.end(), std::inserter(keywords, keywords.begin())); - topN = MIN(topN, keywords.size()); + topN = min(topN, keywords.size()); partial_sort(keywords.begin(), keywords.begin() + topN, keywords.end(), _cmp); keywords.resize(topN); return true; diff --git a/src/MixSegment.hpp b/src/MixSegment.hpp index fa392f6..9cea09b 100644 --- a/src/MixSegment.hpp +++ b/src/MixSegment.hpp @@ -15,7 +15,7 @@ namespace CppJieba HMMSegment _hmmSeg; public: MixSegment(){_setInitFlag(false);}; - explicit MixSegment(const string& mpSegDict, const string& hmmSegDict, const string& userDict = "") + MixSegment(const string& mpSegDict, const string& hmmSegDict, const string& userDict = "") { _setInitFlag(init(mpSegDict, hmmSegDict, userDict)); assert(_getInitFlag()); diff --git a/src/PosTagger.hpp b/src/PosTagger.hpp index f720f9d..325e765 100644 --- a/src/PosTagger.hpp +++ b/src/PosTagger.hpp @@ -17,7 +17,7 @@ namespace CppJieba public: PosTagger(){_setInitFlag(false);}; - explicit PosTagger(const string& dictPath, const string& hmmFilePath, const string& charStatus, const string& startProb, const string& emitProb, const string& endProb, const string& transProb) + PosTagger(const string& dictPath, const string& hmmFilePath, const string& charStatus, const string& startProb, const string& emitProb, const string& endProb, const string& transProb) { _setInitFlag(init(dictPath, hmmFilePath, charStatus, startProb, emitProb, endProb, transProb)); }; diff --git a/src/QuerySegment.hpp b/src/QuerySegment.hpp index abeb706..f20029e 100644 --- a/src/QuerySegment.hpp +++ b/src/QuerySegment.hpp @@ -24,7 +24,7 @@ namespace CppJieba public: QuerySegment(){_setInitFlag(false);}; - explicit QuerySegment(const string& dict, const string& model, size_t maxWordLen) + QuerySegment(const string& dict, const string& model, size_t maxWordLen) { _setInitFlag(init(dict, model, maxWordLen)); };