From f062405bec8178e2c50a8a8b0cdb052ac8d5e47f Mon Sep 17 00:00:00 2001
From: Micooz <Micooz@hotmail.com>
Date: Sun, 15 Feb 2015 13:25:00 +0800
Subject: [PATCH] Improve: a better sort algorithm.

---
 src/core/chars_segment.cpp  | 50 +++----------------------------------
 src/include/chars_segment.h |  3 ---
 2 files changed, 4 insertions(+), 49 deletions(-)

diff --git a/src/core/chars_segment.cpp b/src/core/chars_segment.cpp
index 762d77c..6738174 100644
--- a/src/core/chars_segment.cpp
+++ b/src/core/chars_segment.cpp
@@ -224,9 +224,11 @@ int CCharsSegment::charsSegment(Mat input, vector<Mat>& resultVec)
 	if (vecRect.size() == 0)
 		return -3;
 
-	vector<Rect> sortedRect;
+	vector<Rect> sortedRect(vecRect);
 	//对符合尺寸的图块按照从左到右进行排序
-	SortRect(vecRect, sortedRect);
+    std::sort(sortedRect.begin(), sortedRect.end(), [] (const Rect &r1, const Rect &r2) {
+        return r1.x < r2.x;
+    });
 
 	int specIndex = 0;
 	//获得指示城市的特定Rect,如苏A的"A"
@@ -292,50 +294,6 @@ int CCharsSegment::charsSegment(Mat input, vector<Mat>& resultVec)
 	return 0;
 }
 
-//! 将Rect按位置从左到右进行排序
-int CCharsSegment::SortRect(const vector<Rect>& vecRect, vector<Rect>& out)
-{
-	vector<int> orderIndex;
-    vector<int> xpositions;
-
-	for (int i = 0; i < vecRect.size(); i++)
-	{
-		orderIndex.push_back(i);
-        xpositions.push_back(vecRect[i].x);
-	}
-
-    float min;
-	int minIdx=0;
-    for(int i=0; i< xpositions.size(); i++)
-	{
-        min=xpositions[i];
-        minIdx=i;
-        for(int j=i; j<xpositions.size(); j++)
-		{
-            if(xpositions[j]<min){
-                min=xpositions[j];
-                minIdx=j;
-            }
-        }
-        int aux_i=orderIndex[i];
-        int aux_min=orderIndex[minIdx];
-        orderIndex[i]=aux_min;
-        orderIndex[minIdx]=aux_i;
-        
-        float aux_xi=xpositions[i];
-        float aux_xmin=xpositions[minIdx];
-        xpositions[i]=aux_xmin;
-        xpositions[minIdx]=aux_xi;
-    }
-
-    for(int i=0; i<orderIndex.size(); i++)
-	{
-        out.push_back(vecRect[orderIndex[i]]);
-    }
-
-	return 0;
-}
-
 //! 根据特殊车牌来构造猜测中文字符的位置和大小
 Rect CCharsSegment::GetChineseRect(const Rect rectSpe)
 {
diff --git a/src/include/chars_segment.h b/src/include/chars_segment.h
index be4bef0..f51a681 100644
--- a/src/include/chars_segment.h
+++ b/src/include/chars_segment.h
@@ -59,9 +59,6 @@ public:
 	//  2.从特殊字符Rect开始，依次选择6个Rect，多余的舍去。
 	int RebuildRect(const vector<Rect>& vecRect, vector<Rect>& outRect, int specIndex);
 
-	//! 将Rect按位置从左到右进行排序
-	int SortRect(const vector<Rect>& vecRect, vector<Rect>& out);
-
 	//! 设置变量
 	inline void setLiuDingSize(int param){ m_LiuDingSize = param;}
 	inline void setColorThreshold(int param){ m_ColorThreshold = param;}