rename to distinguish btw number and word sorters

This commit is contained in:
2020-06-17 16:50:25 -05:00
parent fdca76f02a
commit 0daafbe767
9 changed files with 25 additions and 25 deletions

View File

@@ -143,35 +143,35 @@ public class AlgorithmTester{
boolean merge=sortingAlgoChoices[7]; boolean merge=sortingAlgoChoices[7];
ArrayList<SortResult> results = new ArrayList<SortResult>(); ArrayList<SortResult> results = new ArrayList<SortResult>();
if(bubble){ if(bubble){
BubbleSorter bubSorter = new BubbleSorter(reader); NumberBubbleSorter bubSorter = new NumberBubbleSorter(reader);
results.add(bubSorter.measuredSort()); results.add(bubSorter.measuredSort());
} }
if(selection){ if(selection){
SelectionSorter selSorter = new SelectionSorter(reader); NumberSelectionSorter selSorter = new NumberSelectionSorter(reader);
results.add(selSorter.measuredSort()); results.add(selSorter.measuredSort());
} }
if(insertion){ if(insertion){
InsertionSorter inSorter = new InsertionSorter(reader); NumberInsertionSorter inSorter = new NumberInsertionSorter(reader);
results.add(inSorter.measuredSort()); results.add(inSorter.measuredSort());
} }
if(insertionll){ if(insertionll){
InsertionSorterLinkedList inSorterLL = new InsertionSorterLinkedList(reader); NumberInsertionSorterLinkedList inSorterLL = new NumberInsertionSorterLinkedList(reader);
results.add(inSorterLL.measuredSort()); results.add(inSorterLL.measuredSort());
} }
if(counting){ if(counting){
CountingSorter countSorter = new CountingSorter(reader); NumberCountingSorter countSorter = new NumberCountingSorter(reader);
results.add(countSorter.measuredSort()); results.add(countSorter.measuredSort());
} }
if(quick){ if(quick){
QuickSorter qSorter = new QuickSorter(reader); NumberQuickSorter qSorter = new NumberQuickSorter(reader);
results.add(qSorter.measuredSort()); results.add(qSorter.measuredSort());
} }
if(quickTWP){ if(quickTWP){
QuickSorterThreeWay qTWPSorter = new QuickSorterThreeWay(reader); NumberQuickSorterThreeWay qTWPSorter = new NumberQuickSorterThreeWay(reader);
results.add(qTWPSorter.measuredSort()); results.add(qTWPSorter.measuredSort());
} }
if(merge){ if(merge){
MergeSorter mSorter = new MergeSorter(reader); NumberMergeSorter mSorter = new NumberMergeSorter(reader);
results.add(mSorter.measuredSort()); results.add(mSorter.measuredSort());
} }
for(SortResult e: results){ for(SortResult e: results){

View File

@@ -1,9 +1,9 @@
package Sorting; package Sorting;
public class BubbleSorter extends NumberSorter{ public class NumberBubbleSorter extends NumberSorter{
//a class to sort arrays of numbers using bubble sort //a class to sort arrays of numbers using bubble sort
public BubbleSorter(RandomNumberFileReader reader){ public NumberBubbleSorter(RandomNumberFileReader reader){
super("bubble sort", reader); super("bubble sort", reader);
} }

View File

@@ -2,9 +2,9 @@ package Sorting;
import java.util.Arrays; import java.util.Arrays;
public class CountingSorter extends NumberSorter{ public class NumberCountingSorter extends NumberSorter{
public CountingSorter(RandomNumberFileReader reader){ public NumberCountingSorter(RandomNumberFileReader reader){
super("counting sort", reader); super("counting sort", reader);
} }

View File

@@ -3,9 +3,9 @@ package Sorting;
//import java.util.Arrays; //import java.util.Arrays;
//import java.util.List; //import java.util.List;
public class InsertionSorter extends NumberSorter{ public class NumberInsertionSorter extends NumberSorter{
public InsertionSorter(RandomNumberFileReader reader){ public NumberInsertionSorter(RandomNumberFileReader reader){
super("insertion sort", reader); super("insertion sort", reader);
} }

View File

@@ -4,9 +4,9 @@ import java.util.Arrays;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.ListIterator; import java.util.ListIterator;
public class InsertionSorterLinkedList extends NumberSorter{ public class NumberInsertionSorterLinkedList extends NumberSorter{
public InsertionSorterLinkedList(RandomNumberFileReader reader){ public NumberInsertionSorterLinkedList(RandomNumberFileReader reader){
super("insertion sort (linked list)", reader); super("insertion sort (linked list)", reader);
} }

View File

@@ -1,8 +1,8 @@
package Sorting; package Sorting;
public class MergeSorter extends NumberSorter{ public class NumberMergeSorter extends NumberSorter{
public MergeSorter(RandomNumberFileReader reader){ public NumberMergeSorter(RandomNumberFileReader reader){
super("merge sort",reader); super("merge sort",reader);
} }

View File

@@ -1,12 +1,12 @@
package Sorting; package Sorting;
public class QuickSorter extends NumberSorter{ public class NumberQuickSorter extends NumberSorter{
public QuickSorter(RandomNumberFileReader reader){ public NumberQuickSorter(RandomNumberFileReader reader){
super("quick sort", reader); super("quick sort", reader);
} }
public QuickSorter(String qsortVariant, RandomNumberFileReader reader){ public NumberQuickSorter(String qsortVariant, RandomNumberFileReader reader){
super(qsortVariant, reader); super(qsortVariant, reader);
} }

View File

@@ -4,9 +4,9 @@ package Sorting;
* an implementation of quick sort with three-way partitioning * an implementation of quick sort with three-way partitioning
*/ */
public class QuickSorterThreeWay extends QuickSorter{ public class NumberQuickSorterThreeWay extends NumberQuickSorter{
public QuickSorterThreeWay(RandomNumberFileReader reader){ public NumberQuickSorterThreeWay(RandomNumberFileReader reader){
super("quick sort (3-way partition)", reader); super("quick sort (3-way partition)", reader);
} }
/* /*

View File

@@ -1,8 +1,8 @@
package Sorting; package Sorting;
public class SelectionSorter extends NumberSorter { public class NumberSelectionSorter extends NumberSorter {
//a class to sort an array of numbers using selection sort //a class to sort an array of numbers using selection sort
public SelectionSorter(RandomNumberFileReader reader){ public NumberSelectionSorter(RandomNumberFileReader reader){
super("selection sort", reader); super("selection sort", reader);
} }