Add functionality to sort in descending order

main
Hammy 3 years ago
parent bdb60ffc5b
commit 3c7eb952ab

@ -10,11 +10,19 @@
* [ERRNO 2147483642] -> Element Does Not Exist Within List * [ERRNO 2147483642] -> Element Does Not Exist Within List
*/ */
#define DEFAULT_MAX_SIZE 10
#define ERRNO_001 2147483646
#define ERRNO_002 2147483645
#define ERRNO_003 2147483644
#define ERRNO_004 2147483643
#define ERRNO_005 2147483642
#define ERRNO_SIZE 5
List *List_createList(int maxSize, int currentSize); List *List_createList(int maxSize, int currentSize);
int List_merge(List *list, int start_index, int mid_index, int end_index); int List_merge(List *list, int start_index, int mid_index, int end_index, bool reverse);
int List_mergeSort(List *list, int start_index, int end_index); int List_mergeSort(List *list, int start_index, int end_index, bool reverse);
typedef struct list { typedef struct list {
int *_array; int *_array;
@ -31,7 +39,7 @@ int errorCodes[ERRNO_SIZE] = {
}; };
List *List_new() { List *List_new() {
List *list = List_createList(10, -1); List *list = List_createList(DEFAULT_MAX_SIZE, -1);
if (!list) { if (!list) {
return NULL; return NULL;
} }
@ -95,7 +103,7 @@ int List_remove(List *list, int element) {
return 0; return 0;
} }
int List_merge(List *list, int start_index, int mid_index, int end_index) { int List_merge(List *list, int start_index, int mid_index, int end_index, bool reverse) {
List *left = List_slice(list, start_index, mid_index + 1); List *left = List_slice(list, start_index, mid_index + 1);
if (!left) { if (!left) {
return 1; return 1;
@ -106,29 +114,28 @@ int List_merge(List *list, int start_index, int mid_index, int end_index) {
return 1; return 1;
} }
int leftSuccessCode = List_append(left, INT_MAX);
if (leftSuccessCode != 0) {
List_destroy(&left);
List_destroy(&right);
return 1;
}
int rightSuccessCode = List_append(right, INT_MAX);
if (rightSuccessCode != 0) {
List_destroy(&left);
List_destroy(&right);
return 1;
}
int left_index = 0; int left_index = 0;
int right_index = 0; int right_index = 0;
int left_length = List_length(left);
int right_length = List_length(right);
for (int i = start_index; i < end_index + 1; i++) { for (int i = start_index; i < end_index + 1; i++) {
if (left_index == left_length) {
list->_array[i] = right->_array[right_index++];
} else if (right_index == right_length) {
list->_array[i] = left->_array[left_index++];
} else if (reverse) {
if (left->_array[left_index] > right->_array[right_index]) {
list->_array[i] = left->_array[left_index++];
} else {
list->_array[i] = right->_array[right_index++];
}
} else {
if (left->_array[left_index] < right->_array[right_index]) { if (left->_array[left_index] < right->_array[right_index]) {
list->_array[i] = left->_array[left_index]; list->_array[i] = left->_array[left_index++];
left_index++;
} else { } else {
list->_array[i] = right->_array[right_index]; list->_array[i] = right->_array[right_index++];
right_index++; }
} }
} }
@ -138,16 +145,16 @@ int List_merge(List *list, int start_index, int mid_index, int end_index) {
return 0; return 0;
} }
int List_mergeSort(List *list, int start_index, int end_index) { int List_mergeSort(List *list, int start_index, int end_index, bool reverse) {
if (start_index < end_index) { if (start_index < end_index) {
int mid_index = (start_index + end_index) / 2; int mid_index = (start_index + end_index) / 2;
if (List_mergeSort(list, start_index, mid_index) != 0) { if (List_mergeSort(list, start_index, mid_index, reverse) != 0) {
return 1; return 1;
} }
if (List_mergeSort(list, mid_index + 1, end_index) != 0) { if (List_mergeSort(list, mid_index + 1, end_index, reverse) != 0) {
return 1; return 1;
} }
if (List_merge(list, start_index, mid_index, end_index) != 0) { if (List_merge(list, start_index, mid_index, end_index, reverse) != 0) {
return 1; return 1;
} }
} }
@ -156,8 +163,8 @@ int List_mergeSort(List *list, int start_index, int end_index) {
} }
int List_sort(List *list) { int List_sort(List *list, bool reverse) {
return List_mergeSort(list, 0, list->_currentSize); return List_mergeSort(list, 0, list->_currentSize, reverse);
} }
List *List_copy(List *list) { List *List_copy(List *list) {

@ -1,13 +1,6 @@
#include "stdlib.h" #include "stdlib.h"
#include "stdio.h" #include "stdio.h"
#include "stdbool.h"
#define INT_MAX 2147483647
#define ERRNO_001 2147483646
#define ERRNO_002 2147483645
#define ERRNO_003 2147483644
#define ERRNO_004 2147483643
#define ERRNO_005 2147483642
#define ERRNO_SIZE 5
typedef struct list List; typedef struct list List;
@ -70,19 +63,20 @@ int List_insert(List *list, int index, int element);
int List_remove(List *list, int element); int List_remove(List *list, int element);
/* /*
* Function: List_sort(List *list) * Function: List_sort(List *list, bool reverse)
* ---------------------------- * ----------------------------
* Sort the given list into ascending order * Sort the given list into ascending/descending order
* *
* ============================== * ==============================
* WARNING: This is an in-place operation * WARNING: This is an in-place operation
* ============================== * ==============================
* *
* *list: the list to sort * *list: the list to sort
* reverse: true if wanting list to be sorted in descending order, false for ascending order
* *
* returns: int (0 for success, Non-0 for error) * returns: int (0 for success, Non-0 for error)
*/ */
int List_sort(List *list); int List_sort(List *list, bool reverse);
/* /*
* Function: List_copy(List *list) * Function: List_copy(List *list)

@ -36,7 +36,7 @@ void shouldReturnListLengthTwo() {
printSuccess(__func__); printSuccess(__func__);
} }
void shouldReturnSortedList() { void shouldReturnSortedListInAscendingOrder() {
// Arrange // Arrange
List *list = List_new(); List *list = List_new();
List_append(list, 10); List_append(list, 10);
@ -52,7 +52,7 @@ void shouldReturnSortedList() {
List_append(list, 0); List_append(list, 0);
// Act // Act
int returnCode = List_sort(list); int returnCode = List_sort(list, false);
// Assert // Assert
assert(returnCode == 0); assert(returnCode == 0);
@ -191,7 +191,7 @@ int main() {
printf("\n============================================\n"); printf("\n============================================\n");
shouldReturnListLengthZero(); shouldReturnListLengthZero();
shouldReturnListLengthTwo(); shouldReturnListLengthTwo();
shouldReturnSortedList(); shouldReturnSortedListInAscendingOrder();
shouldClearList(); shouldClearList();
shouldReturnListMaxLengthTwenty(); shouldReturnListMaxLengthTwenty();
shouldCopyPopulatedList(); shouldCopyPopulatedList();

Loading…
Cancel
Save