Skip to content

Commit

Permalink
Merge remote-tracking branch 'c-cpp/master'
Browse files Browse the repository at this point in the history 
111
  • Loading branch information
@jinshaohui
jinshaohui committed Oct 31, 2018
2 parents e713d63 + ba02e5d commit 17c5b96
Show file tree
Hide file tree
Showing 55 changed files with 3,299 additions and 126 deletions.
133 changes: 75 additions & 58 deletions c-cpp/07_linkedlist/SingleList.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ using namespace std;

class CElement;
/***
* @brief 单链表容器
* @brief 单链表容器
*/
class CSingleList
{
Expand All @@ -15,61 +15,61 @@ class CSingleList
~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:
Expand All @@ -80,18 +80,18 @@ class CSingleList
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
{
Expand All @@ -101,19 +101,19 @@ class CElement
~CElement();
public:
/***
* @brief 获取数据指针
* @brief 获取数据指针
*/
void* GetDataPtr();
protected:
/**下一个结点*/
/**下一个结点*/
CElement* m_lpNext;
void* m_lpData;
};


void CreateList(CSingleList& lst)
{
//循环插入元素到链表尾
//循环插入元素到链表尾
for(int i=1; i<10;i++)
{
int* p = new int();
Expand All @@ -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())
{
Expand All @@ -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())
{
Expand All @@ -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);
Expand All @@ -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();

Expand Down Expand Up @@ -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)
{
Expand Down Expand Up @@ -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)
{
Expand All @@ -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;
}
Expand All @@ -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();
}
}

Expand Down
Empty file added c-cpp/13_sorts/.gitkeep
View file
Empty file.
43 changes: 43 additions & 0 deletions c-cpp/13_sorts/bucket_sort.hpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/**
* Created by Liam Huang (Liam0205) on 2018/10/26.
*/

#ifndef SORTS_BUCKET_SORT_HPP_
#define SORTS_BUCKET_SORT_HPP_

#include <iterator>
#include <functional>
#include <algorithm>
#include <vector>

template <size_t BucketSize,
typename IterT,
typename T = typename std::iterator_traits<IterT>::value_type,
typename Compare = std::less<T>>
void bucket_sort(IterT first, IterT last, Compare comp = Compare()) {
const T min = *std::min_element(first, last), max = *std::max_element(first, last);
const T range = max + 1 - min;
const size_t bucket_num = (range - 1) / BucketSize + 1;

std::vector<std::vector<T>> buckets(bucket_num);
for (auto b : buckets) {
b.reserve(2 * BucketSize);
}

for (IterT i = first; i != last; ++i) {
size_t idx = (*i - min) / BucketSize;
buckets[idx].emplace_back(*i);
}

IterT dest = first;
for (auto b : buckets) {
std::sort(b.begin(), b.end(), comp);
std::copy(b.begin(), b.end(), dest);
dest += b.size();
}

return;
}

#endif // SORTS_BUCKET_SORT_HPP_

Loading

0 comments on commit 17c5b96

Please sign in to comment.