x/box-o-sand
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Tweaks after reviewing Zed's version

Browse Source
This commit is contained in:
Dan Buch 2016-04-17 20:49:59 -04:00
parent 58a2ed31f4
commit 312c68e248
No known key found for this signature in database
GPG Key ID: FAEF12936DD3E3EC
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lcthw-remnants-2/liblcthw/src/lcthw/list_algos.c
View File

@ -1,9 +1,14 @@
#include <lcthw/list_algos.h> #include <lcthw/list_algos.h>
#include <lcthw/dbg.h>
int List_bubble_sort(List *list, List_compare cmp) int List_bubble_sort(List *list, List_compare cmp)
{ {
List_validate(list); List_validate(list);
if(List_count(list) <= 1) {
return 0;
}
int swapped = 1; int swapped = 1;
while(swapped == 1) { while(swapped == 1) {
@ -24,7 +29,7 @@ int List_bubble_sort(List *list, List_compare cmp)
return 0; return 0;
} }
List *_List_merge_sort_merge(List *left, List *right, List_compare cmp) List *List_merge(List *left, List *right, List_compare cmp)
{ {
List *result = List_create(); List *result = List_create();
@ -51,7 +56,7 @@ List *_List_merge_sort_merge(List *left, List *right, List_compare cmp)
List *List_merge_sort(List *list, List_compare cmp) List *List_merge_sort(List *list, List_compare cmp)
{ {
if(List_count(list) <= 1) { if(List_count(list) <= 1) {
return List_copy(list);; return list;;
} }
int i = 0; int i = 0;
@ -67,13 +72,16 @@ List *List_merge_sort(List *list, List_compare cmp)
i++; i++;
} }
left = List_merge_sort(left, cmp); List *sort_left = List_merge_sort(left, cmp);
right = List_merge_sort(right, cmp); List *sort_right = List_merge_sort(right, cmp);
List *result = _List_merge_sort_merge(left, right, cmp);
if(sort_left != left) {
List_destroy(left); List_destroy(left);
List_destroy(right); }
return result; if(sort_right != right) {
List_destroy(right);
}
return List_merge(sort_left, sort_right, cmp);
} }