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

Revert "Stream test"

Browse Source
This commit is contained in:
eugenefischer
2020-06-11 14:03:27 -05:00
committed by GitHub
parent 87cf8a3e05
commit 435a9ef718
12 changed files with 47 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Sorting/AlgorithmTester.java
View File

@@ -138,33 +138,33 @@ public class AlgorithmTester{
boolean quickTWP=sortingAlgoChoices[5];
boolean merge=sortingAlgoChoices[6];
ArrayList<SortResult> results = new ArrayList<SortResult>();
RandomNumberFileReader reader = new RandomNumberFileReader(filename);
if(bubble){
BubbleSorter bubSorter = new BubbleSorter(reader);
BubbleSorter bubSorter = new BubbleSorter(filename);
results.add(bubSorter.measuredSort());
}
if(selection){
SelectionSorter selSorter = new SelectionSorter(reader);
SelectionSorter selSorter = new SelectionSorter(filename);
results.add(selSorter.measuredSort());
}
if(insertion){
InsertionSorter inSorter = new InsertionSorter(reader);
InsertionSorter inSorter = new InsertionSorter(filename);
results.add(inSorter.measuredSort());
}
if(counting){
CountingSorter countSorter = new CountingSorter(reader);
CountingSorter countSorter = new CountingSorter(filename);
results.add(countSorter.measuredSort());
}
if(quick){
QuickSorter qSorter = new QuickSorter(reader);
QuickSorter qSorter = new QuickSorter(filename);
results.add(qSorter.measuredSort());
}
if(quickTWP){
QuickSorterThreeWay qTWPSorter = new QuickSorterThreeWay(reader);
QuickSorterThreeWay qTWPSorter = new QuickSorterThreeWay(filename);
results.add(qTWPSorter.measuredSort());
}
if(merge){
MergeSorter mSorter = new MergeSorter(reader);
MergeSorter mSorter = new MergeSorter(filename);
results.add(mSorter.measuredSort());
}
for(SortResult e: results){
@@ -174,7 +174,7 @@ public class AlgorithmTester{
}
System.out.print("\n");
}
System.out.println("\n"+e.getSortType()+" of "+e.getSortCount()+" numbers with range "+e.getMin()+" to "+e.getMax()+" took:");
System.out.println("\n"+e.getSortType()+" of "+e.getSortCount()+" numbers took:");
System.out.println(e.getComparisonsUsed()+" comparisons");
System.out.println(e.getWritesUsed()+" write operations");
System.out.println(e.getTimeUsed()+" milliseconds");