efischer/Tutoring-APCompSci
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

adding three-way partitioned quick sort

Browse Source
This commit is contained in:
Eugene Fischer
2020-06-08 12:00:51 -05:00
parent 9f0ce5056d
commit d9b51e1c53
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Sorting/AlgorithmTester.java
View File

@@ -82,7 +82,7 @@ public class AlgorithmTester{
int input; int input;
boolean ready=false; boolean ready=false;
boolean print=false; boolean print=false;
String[] sortingAlgoNames = {"bubble","selection","insertion","counting","quick","merge"}; String[] sortingAlgoNames = {"bubble","selection","insertion","counting","quick","3-way partitioned quick","merge"};
boolean[] sortingAlgoChoices = new boolean[sortingAlgoNames.length]; boolean[] sortingAlgoChoices = new boolean[sortingAlgoNames.length];
System.out.print("\nPlease enter file name: "); System.out.print("\nPlease enter file name: ");
filename = sc.next(); filename = sc.next();
@@ -131,7 +131,8 @@ public class AlgorithmTester{
boolean insertion=sortingAlgoChoices[2]; boolean insertion=sortingAlgoChoices[2];
boolean counting=sortingAlgoChoices[3]; boolean counting=sortingAlgoChoices[3];
boolean quick=sortingAlgoChoices[4]; boolean quick=sortingAlgoChoices[4];
boolean merge=sortingAlgoChoices[5]; boolean quickTWP=sortingAlgoChoices[5];
boolean merge=sortingAlgoChoices[6];
ArrayList<SortResult> results = new ArrayList<SortResult>(); ArrayList<SortResult> results = new ArrayList<SortResult>();
if(bubble){ if(bubble){
@@ -154,6 +155,10 @@ public class AlgorithmTester{
QuickSorter qSorter = new QuickSorter(filename); QuickSorter qSorter = new QuickSorter(filename);
results.add(qSorter.measuredSort()); results.add(qSorter.measuredSort());
} }
if(quickTWP){
QuickSorterThreeWay qTWPSorter = new QuickSorterThreeWay(filename);
results.add(qTWPSorter.measuredSort());
}
if(merge){ if(merge){
MergeSorter mSorter = new MergeSorter(filename); MergeSorter mSorter = new MergeSorter(filename);
results.add(mSorter.measuredSort()); results.add(mSorter.measuredSort());