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

adding merge sort

Browse Source
This commit is contained in:
Eugene Fischer
2020-06-02 13:05:26 -05:00
parent 9db2462791
commit f0b987afe5
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Sorting/AlgorithmTester.java
View File

@@ -84,7 +84,7 @@ public class AlgorithmTester{
//boolean quick=false, counting=false, radix=false, merge=false;
boolean ready=false;
boolean print=false;
String[] sortingAlgoNames = {"bubble","selection","insertion","counting","quick"};
String[] sortingAlgoNames = {"bubble","selection","insertion","counting","quick","merge"};
boolean[] sortingAlgoChoices = new boolean[sortingAlgoNames.length];
System.out.print("\nPlease enter file name: ");
filename = sc.next();
@@ -135,6 +135,7 @@ public class AlgorithmTester{
boolean insertion=sortingAlgoChoices[2];
boolean counting=sortingAlgoChoices[3];
boolean quick=sortingAlgoChoices[4];
boolean merge=sortingAlgoChoices[5];
ArrayList<SortResult> results = new ArrayList<SortResult>();
if(bubble){
@@ -157,6 +158,10 @@ public class AlgorithmTester{
QuickSorter qSorter = new QuickSorter(filename);
results.add(qSorter.measuredSort());
}
if(merge){
MergeSorter mSorter = new MergeSorter(filename);
results.add(mSorter.measuredSort());
}
for(SortResult e: results){
if(print){
for(int i: e.getSortedArray()){