From f48c96705ede6589e49bcc2050c86ff7b2b0a466 Mon Sep 17 00:00:00 2001 From: cdez Date: Tue, 12 Sep 2023 09:49:07 -0700 Subject: [PATCH] Trying to bubble sort +- PA02_Main +- PA02_Main.c +- StateUtilities.c --- PA02-0913/PA02_Main | Bin 33216 -> 33216 bytes PA02-0913/PA02_Main.c | 4 ++-- PA02-0913/StateUtilities.c | 29 +++++++++++++++++++++++++---- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/PA02-0913/PA02_Main b/PA02-0913/PA02_Main index 1a577e4d4201662cbfb1f1bedeccb258f5b95d37..1de69088537fef3d0ee2f577b237f0b788bd3a89 100755 GIT binary patch delta 5739 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 delta 5278 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 diff --git a/PA02-0913/PA02_Main.c b/PA02-0913/PA02_Main.c index ec390c5..929535b 100644 --- a/PA02-0913/PA02_Main.c +++ b/PA02-0913/PA02_Main.c @@ -72,7 +72,7 @@ int main() // display original list displayData( wkgArray, wkgNumStates, "Original data after state removal" ); - /* + // bubble sort // function: runBubbleSort runBubbleSortByName( sortingArray, sortingNumStates ); @@ -80,7 +80,7 @@ int main() // display bubble-sorted list displayData( sortingArray, sortingNumStates, "Full list sorted by name using bubble sort" ); - + /* // insertion sort // function: runInsertionSort runInsertionSortByPopulation( sortingArray, sortingNumStates ); diff --git a/PA02-0913/StateUtilities.c b/PA02-0913/StateUtilities.c index 316c8ce..b26c386 100644 --- a/PA02-0913/StateUtilities.c +++ b/PA02-0913/StateUtilities.c @@ -395,10 +395,31 @@ Dependencies: as needed */ void runBubbleSortByName( StateDataType *array, int size ) { - // start iterator at size - 2? - // iterate through iterator - // check the current index vs the next one. - // if current > next, swap. + int bubbleCount; + int arrayCount; + printf("\nArray @ 0: %s\n", array[0].name); + printf("\nArray @ 1: %s\n", array[1].name); + printf("\nArray @ 2: %s\n", array[2].name); + printf("\nArray @ 3: %s\n", array[3].name); + printf("\nArray @ 4: %s\n", array[4].name); + printf("\nArray @ size: %s\n", array[size].name); + // use two for loops to iterate through array + // for(bubbleCount = 0; bubbleCount < size - 1; bubbleCount++) + // { + // for(arrayCount = bubbleCount + 1; arrayCount < size; arrayCount++) + // { + // printf("\nValue of bubbleCount: %d\n", bubbleCount); + // printf("\nValue of arrayCount: %d\n", arrayCount); + // //printf("\nValue of array[arrayCount].name: %s", array[0].name); + // //printf("\nValue of array[arrayCount + 1].name: %s\n", array[1].name); + // // check the current index vs the next one. + // if(strcmp(array[arrayCount].name, array[arrayCount + 1].name) > 0) + // { + // // if current > next, swap. AKA: strcmp(current, next) > 0 + // swapElements(array, arrayCount, arrayCount + 1); + // } + // } + // } // no return, void }