From 83a8474a1d763109f19c8c8a71341afcf1a3755d Mon Sep 17 00:00:00 2001
From: gwdwyy <wuyanyi09@gmail.com>
Date: Tue, 9 Jul 2013 16:43:43 +0800
Subject: [PATCH] finished cutDAG

---
 Segment.cpp | 72 +++++++++++++++++++++++++++++++++++++++--------------
 Segment.h   |  1 +
 2 files changed, 54 insertions(+), 19 deletions(-)

diff --git a/Segment.cpp b/Segment.cpp
index 365e067..ea0d5c7 100644
--- a/Segment.cpp
+++ b/Segment.cpp
@@ -22,6 +22,7 @@ namespace CppJieba
 
 	bool Segment::cutDAG(const string& chStr, vector<string>& res)
 	{
+		bool retFlag;
 		res.clear();
 		string uniStr = _utf8ToUni(chStr);
 		if(uniStr.empty())
@@ -32,30 +33,31 @@ namespace CppJieba
 
 		//calc DAG
 		vector<vector<uint> > dag;
-		_calcDAG(uniStr, dag);
-
-		cout<<__FILE__<<__LINE__<<endl;
-		PRINT_MATRIX(dag);
-		getchar();
-
-		vector<pair<int, double> > dp;
-		_calcDP(uniStr, dag, dp);
-
-		cout<<__FILE__<<__LINE__<<endl;
-		for(int i = 0 ;i< dp.size(); i++)
+		retFlag = _calcDAG(uniStr, dag);
+		if(!retFlag)
 		{
-			cout<<dp[i].first<<","
-				<<dp[i].second<<endl;
+			LogError("_calcDAG failed.");
+			return false;
 		}
 
-		
-
-		
-
-		//calc dp
-		
+		//cout<<__FILE__<<__LINE__<<endl;
+		//PRINT_MATRIX(dag);
+		//getchar();
 
+		vector<pair<int, double> > dp;
+		retFlag = _calcDP(uniStr, dag, dp);
+		if(!retFlag)
+		{
+			LogError("_calcDP failed.");
+			return false;
+		}
 
+		retFlag = _cutDAG(uniStr, dp, res);
+		if(!retFlag)
+		{
+			LogError("_cutDAG failed.");
+			return false;
+		}
 		
 		return true;
 	}
@@ -128,6 +130,38 @@ namespace CppJieba
 				}
 			}
 		}
+		res.pop_back();
+		return true;
+	}
+	bool Segment::_cutDAG(const string& uniStr, const vector<pair<int, double> >& dp, vector<string>& res)
+	{
+		if(dp.size() != uniStr.size()/2)
+		{
+			LogError("dp or uniStr illegal!");
+			return false;
+		}
+
+		res.clear();
+
+		uint begin = 0;
+		for(uint i = 0; i < dp.size(); i++)
+		{
+			//cout<<dp[i].first<<","
+			//	<<dp[i].second<<endl;
+			uint end = dp[i].first * 2 + 2;
+			if(end <= begin)
+			{
+				continue;
+			}
+			string tmp = unicodeToUtf8(uniStr.substr(begin, end - begin));
+			if(tmp.empty())
+			{
+				LogError("unicodeToUtf8 failed.");
+				return false;
+			}
+			res.push_back(tmp);
+			begin = end;
+		}
 		return true;
 	}
 
diff --git a/Segment.h b/Segment.h
index 992cd81..de6c554 100644
--- a/Segment.h
+++ b/Segment.h
@@ -24,6 +24,7 @@ namespace CppJieba
 			string _utf8ToUni(const string& chStr);
 			bool _calcDAG(const string& uniStr, vector<vector<uint> >& dag);
 			bool _calcDP(const string& uniStr, const vector<vector<uint> >& dag, vector<pair<int, double> >& res);
+			bool _cutDAG(const string& uniStr, const vector<pair<int, double> >& dp, vector<string>& res);
 
 		private:
 			enum {bufSize = 1024};