From d4f700beface6100f58c8a098f092c3e94682316 Mon Sep 17 00:00:00 2001
From: HuaQiang <puhuaqiang@hotmail.com>
Date: Mon, 29 Oct 2018 15:44:49 +0800
Subject: [PATCH] Add files via upload

---
 c-cpp/07_linkedlist/SingleList.cpp | 133 ++++++++++++++++-------------
 1 file changed, 75 insertions(+), 58 deletions(-)

diff --git a/c-cpp/07_linkedlist/SingleList.cpp b/c-cpp/07_linkedlist/SingleList.cpp
index a43079c..5f07863 100644
--- a/c-cpp/07_linkedlist/SingleList.cpp
+++ b/c-cpp/07_linkedlist/SingleList.cpp
@@ -6,7 +6,7 @@ using namespace std;
 
 class CElement;
 /***
- * @brief 单链表容器
+ * @brief ����������
 */
 class CSingleList
 {
@@ -15,61 +15,61 @@ public:
     ~CSingleList();
 
     /**
-     * @brief 插入..链表末尾插入
-     * @return 成功返回非空指针,否则失败
+     * @brief ����..����ĩβ����
+     * @return �ɹ����طǿ�ָ��,����ʧ��
     */
     CElement* Insert(void* lpData, int iDataSize);
     /**
-     * @brief 插入..链表指定位置插入
-     * @return 成功返回非空指针,否则失败
+     * @brief ����..����ָ��λ�ò���
+     * @return �ɹ����طǿ�ָ��,����ʧ��
     */
     CElement* Insert(CElement* lpElement, void* lpData, int iDataSize);
     /**
-     * @brief 删除
+     * @brief ɾ��
     */
     void Delete(CElement*);
 
     /**
-     * @brief 链首
+     * @brief ����
     */
     CElement* Begin();
     /**
-     * @brief 下一个元素
+     * @brief ��һ��Ԫ��
     */
     CElement* Next();
     /***
-     * @brief 链尾
+     * @brief ��β
     */
     CElement* End();
 
     /**
-     * @brief 是否是空链表
-     * @return 空返回TRUE，否则返回FALSE
+     * @brief �Ƿ��ǿ�����
+     * @return �շ���TRUE�����򷵻�FALSE
     */
     bool Empty();
 
     /**
-     * @brief 反转
+     * @brief ��ת
     */
     void Reverse();
 
     /**
-     * @brief 检测环
-     * @return 返回TRUE时表示链表存在环,否则不存在环.
+     * @brief ��⻷
+     * @return ����TRUEʱ��ʾ�������ڻ�,���򲻴��ڻ�.
     */
     bool CheckCircle();
 
     /**
-     * @brief 合并2个有序的链表
+     * @brief �ϲ�2�����������
     */
     void Merge(CSingleList& lst, std::function<int(void* t1, void* t2)>);
 
     /**
-     * @brief 删除倒数第K个结点
+     * @brief ɾ��������K�����
     */
     void DeleteLastKth(int k);
     /**
-     * @brief 求中间节点
+     * @brief ���м�ڵ�
     */
     CElement* Center();
 private:
@@ -80,18 +80,18 @@ private:
 	CSingleList(CSingleList const & rhs);
 	CSingleList& operator= (CSingleList const& rhs);
 private:
-    /**头结点*/
+    /**ͷ���*/
     CElement* m_lpHead;
-    /**哨兵*/
+    /**�ڱ�*/
     CElement* m_lpSentinel;
-    /**空结点，用于End()返回 */
+    /**�ս�㣬����End()���� */
     CElement* m_lpNull;
-    /**当前结点. 枚举时使用. */
+    /**��ǰ���. ö��ʱʹ��. */
     CElement* m_lpCur;
 };
 
 /***
- * @brief 单链表结点元素.
+ * @brief ���������Ԫ��.
 */
 class CElement
 {
@@ -101,11 +101,11 @@ protected:
     ~CElement();
 public:
     /***
-     * @brief 获取数据指针
+     * @brief ��ȡ����ָ��
     */
     void* GetDataPtr();
 protected:
-    /**下一个结点*/
+    /**��һ�����*/
     CElement* m_lpNext;
     void* m_lpData;
 };
@@ -113,7 +113,7 @@ protected:
 
 void CreateList(CSingleList& lst)
 {
-    //循环插入元素到链表尾
+    //ѭ������Ԫ�ص�����β
     for(int i=1; i<10;i++)
     {
         int* p = new int();
@@ -134,15 +134,15 @@ void PrintList(CSingleList& lst)
 int main()
 {
     {
-        /// 链表的基本操作，插入/枚举/删除
+        /// �����Ļ�������������/ö��/ɾ��
         CSingleList lst;
         CElement* lpElement = NULL;
         CreateList(lst);
 
-        std::cout<<"枚举链表当前的元素"<<std::endl;
+        std::cout<<"ö��������ǰ��Ԫ��"<<std::endl;
         PrintList(lst);
 
-        std::cout<<"查找指定元素,并在指定元素后面插入新元素"<<std::endl;
+        std::cout<<"����ָ��Ԫ��,����ָ��Ԫ�غ��������Ԫ��"<<std::endl;
         lpElement = lst.Begin();
         while(lpElement != lst.End())
         {
@@ -157,10 +157,10 @@ int main()
             }
         }
 
-        std::cout<<"枚举链表当前的元素"<<std::endl;
+        std::cout<<"ö��������ǰ��Ԫ��"<<std::endl;
         PrintList(lst);
 
-        std::cout<<"查找指定元素(数字是7的元素),并删除指定元素"<<std::endl;
+        std::cout<<"����ָ��Ԫ��(������7��Ԫ��),��ɾ��ָ��Ԫ��"<<std::endl;
         lpElement = lst.Begin();
         while(lpElement != lst.End())
         {
@@ -172,52 +172,52 @@ int main()
                 lpElement = lst.Next();
             }
         }
-        std::cout<<"枚举链表当前的元素"<<std::endl;
+        std::cout<<"ö��������ǰ��Ԫ��"<<std::endl;
         PrintList(lst);
     }
 
     std::cout<<"--------------------------"<<std::endl;
     {
-        /// 链表的反转
+        /// �����ķ�ת
         CSingleList lst;
         CElement* lpElement = NULL;
         CreateList(lst);
-        std::cout<<"反转"<<std::endl;
+        std::cout<<"��ת"<<std::endl;
         lst.Reverse();
         PrintList(lst);
     }
 
     std::cout<<"--------------------------"<<std::endl;
     {
-        /// 检测环
+        /// ��⻷
         CSingleList lst;
         CElement* lpElement = NULL;
         CreateList(lst);
-        std::cout<<"检测环"<<std::endl;
+        std::cout<<"��⻷"<<std::endl;
         bool bRet = lst.CheckCircle();
         if(bRet){
-            std::cout<<"存在环."<<std::endl;
+            std::cout<<"���ڻ�."<<std::endl;
         }else{
-            std::cout<<"不存在环."<<std::endl;
+            std::cout<<"�����ڻ�."<<std::endl;
         }
     }
 
     std::cout<<"--------------------------"<<std::endl;
     {
-        /// 有序链表合并
+        /// ���������ϲ�
         CSingleList lst,lst2;
         CElement* lpElement = NULL;
-        for(int i=1; i<10;i++)
+        for(int i=1; i<30;i++)
         {
             int* p = new int();
             *p = i;
-            if(i%2){
+            if(i%4){
                 lst2.Insert(p, 4);
             }else{
                 lst.Insert(p, 4);
             }
         }
-        std::cout<<"枚举链表当前的元素"<<std::endl;
+        std::cout<<"ö��������ǰ��Ԫ��"<<std::endl;
         PrintList(lst);
         std::cout<<"......"<<std::endl;
         PrintList(lst2);
@@ -231,31 +231,31 @@ int main()
             }
             return 0;
         });
-        std::cout<<"合并之后，打印当前链表."<<std::endl;
+        std::cout<<"�ϲ�֮�󣬴�ӡ��ǰ����."<<std::endl;
         PrintList(lst);
     }
     std::cout<<"--------------------------"<<std::endl;
     {
-        /// 删除倒数第K个结点,并查看中间节点
+        /// ɾ��������K�����,���鿴�м�ڵ�
         CSingleList lst;
         CreateList(lst);
-        std::cout<<"删除倒数第0个结点"<<std::endl;
+        std::cout<<"ɾ��������0�����"<<std::endl;
         lst.DeleteLastKth(0);
         PrintList(lst);
         CElement* lpCenter = lst.Center();
-        std::cout<<"中间节点:"<<*((int*)lpCenter->GetDataPtr())<<std::endl;
+        std::cout<<"�м�ڵ�:"<<*((int*)lpCenter->GetDataPtr())<<std::endl;
 
-        std::cout<<"删除倒数第1个结点"<<std::endl;
+        std::cout<<"ɾ��������1�����"<<std::endl;
         lst.DeleteLastKth(1);
         PrintList(lst);
         lpCenter = lst.Center();
-        std::cout<<"中间节点:"<<*((int*)lpCenter->GetDataPtr())<<std::endl;
+        std::cout<<"�м�ڵ�:"<<*((int*)lpCenter->GetDataPtr())<<std::endl;
 
-        std::cout<<"删除倒数第3个结点"<<std::endl;
+        std::cout<<"ɾ��������3�����"<<std::endl;
         lst.DeleteLastKth(3);
         PrintList(lst);
         lpCenter = lst.Center();
-        std::cout<<"中间节点:"<<*((int*)lpCenter->GetDataPtr())<<std::endl;
+        std::cout<<"�м�ڵ�:"<<*((int*)lpCenter->GetDataPtr())<<std::endl;
     }
     std::cin.ignore();
 
@@ -316,10 +316,10 @@ CElement* CSingleList::Insert(CElement* lpElement, void* lpData, int iDataSize)
 }
 void CSingleList::Insert(CElement* lpNewElement, CElement* lpCurElement, bool bBack /*= true*/)
 {
-    if(bBack){//插入到指定元素的后面
+    if(bBack){//���뵽ָ��Ԫ�صĺ���
         lpNewElement->m_lpNext = lpCurElement->m_lpNext;
         lpCurElement->m_lpNext = lpNewElement;
-    }else{//插入到指定元素的前面
+    }else{//���뵽ָ��Ԫ�ص�ǰ��
         CElement* lpIter = m_lpSentinel;
         while(NULL != lpIter)
         {
@@ -443,11 +443,13 @@ bool CSingleList::CheckCircle()
     return false;
 }
 
+/**
+ * �ϲ���2�����������������
+*/
 void CSingleList::Merge(CSingleList& lst, std::function<int(void* t1, void* t2)> fnCompare)
 {
     CElement* lpL1 = Begin();
     CElement* lpL2 = lst.Begin();
-    CElement* lpTail = NULL;
 
     if(!fnCompare)
     {
@@ -458,7 +460,26 @@ void CSingleList::Merge(CSingleList& lst, std::function<int(void* t1, void* t2)>
     {
         if(lpL1 != End())
         {
+            /**
+             * ������Ҫ�������ȷλ��
+             * 
+             * ����1,����2; ����1 <- ����2, ����2���ϲ�������1��
+             * 
+             * �������1��Ԫ��С������2�е�Ԫ�أ���ѭ����������1�д�������2�еĵ�ǰԪ�ص�Ԫ��
+             * ���������1���ҵ��������������ĵ�Ԫ��λ��[A]ʱ���������2�еĵ�ǰԪ�ز��뵽Ԫ��λ��[A]��ǰ��;
+             * ���������1�в��������λ����������1��ĩλ����Ԫ��
+            */
             iRet = fnCompare(lpL1->GetDataPtr(), lpL2->GetDataPtr());
+            if(iRet < 0){
+                lpL1 = Next();
+                while(lpL1 != End()){
+                    iRet = fnCompare(lpL1->GetDataPtr(), lpL2->GetDataPtr());
+                    if(iRet > 0){
+                        break;
+                    }
+                    lpL1 = Next();
+                }
+            }
         }else{
             iRet = -1;
         }
@@ -468,17 +489,13 @@ void CSingleList::Merge(CSingleList& lst, std::function<int(void* t1, void* t2)>
             lpNewElement->m_lpData = lpL2->GetDataPtr();
             if(lpL1 != End())
             {
-                Insert(lpNewElement,lpL1, iRet <= 0);
+                Insert(lpNewElement,lpL1, iRet < 0);
             }else{
-                if(NULL == lpTail)
-                {
-                    lpTail = Tail();
-                }
+                CElement* lpTail = Tail();
                 Insert(lpNewElement,lpTail);
             }
         }
         lpL2 = lst.Next();
-        lpL1 = Next();
     }
 }