From 0daafbe76763b2e9e8b82b1e3c61a24a2b69b2af Mon Sep 17 00:00:00 2001 From: Eugene Fischer Date: Wed, 17 Jun 2020 16:50:25 -0500 Subject: [PATCH] rename to distinguish btw number and word sorters --- Sorting/AlgorithmTester.java | 16 ++++++++-------- ...BubbleSorter.java => NumberBubbleSorter.java} | 4 ++-- ...tingSorter.java => NumberCountingSorter.java} | 4 ++-- ...ionSorter.java => NumberInsertionSorter.java} | 4 ++-- ...java => NumberInsertionSorterLinkedList.java} | 4 ++-- .../{MergeSorter.java => NumberMergeSorter.java} | 4 ++-- .../{QuickSorter.java => NumberQuickSorter.java} | 6 +++--- ...eeWay.java => NumberQuickSorterThreeWay.java} | 4 ++-- ...ionSorter.java => NumberSelectionSorter.java} | 4 ++-- 9 files changed, 25 insertions(+), 25 deletions(-) rename Sorting/{BubbleSorter.java => NumberBubbleSorter.java} (79%) rename Sorting/{CountingSorter.java => NumberCountingSorter.java} (89%) rename Sorting/{InsertionSorter.java => NumberInsertionSorter.java} (88%) rename Sorting/{InsertionSorterLinkedList.java => NumberInsertionSorterLinkedList.java} (89%) rename Sorting/{MergeSorter.java => NumberMergeSorter.java} (94%) rename Sorting/{QuickSorter.java => NumberQuickSorter.java} (79%) rename Sorting/{QuickSorterThreeWay.java => NumberQuickSorterThreeWay.java} (88%) rename Sorting/{SelectionSorter.java => NumberSelectionSorter.java} (80%) diff --git a/Sorting/AlgorithmTester.java b/Sorting/AlgorithmTester.java index 8111589..9a0d2ca 100644 --- a/Sorting/AlgorithmTester.java +++ b/Sorting/AlgorithmTester.java @@ -143,35 +143,35 @@ public class AlgorithmTester{ boolean merge=sortingAlgoChoices[7]; ArrayList results = new ArrayList(); if(bubble){ - BubbleSorter bubSorter = new BubbleSorter(reader); + NumberBubbleSorter bubSorter = new NumberBubbleSorter(reader); results.add(bubSorter.measuredSort()); } if(selection){ - SelectionSorter selSorter = new SelectionSorter(reader); + NumberSelectionSorter selSorter = new NumberSelectionSorter(reader); results.add(selSorter.measuredSort()); } if(insertion){ - InsertionSorter inSorter = new InsertionSorter(reader); + NumberInsertionSorter inSorter = new NumberInsertionSorter(reader); results.add(inSorter.measuredSort()); } if(insertionll){ - InsertionSorterLinkedList inSorterLL = new InsertionSorterLinkedList(reader); + NumberInsertionSorterLinkedList inSorterLL = new NumberInsertionSorterLinkedList(reader); results.add(inSorterLL.measuredSort()); } if(counting){ - CountingSorter countSorter = new CountingSorter(reader); + NumberCountingSorter countSorter = new NumberCountingSorter(reader); results.add(countSorter.measuredSort()); } if(quick){ - QuickSorter qSorter = new QuickSorter(reader); + NumberQuickSorter qSorter = new NumberQuickSorter(reader); results.add(qSorter.measuredSort()); } if(quickTWP){ - QuickSorterThreeWay qTWPSorter = new QuickSorterThreeWay(reader); + NumberQuickSorterThreeWay qTWPSorter = new NumberQuickSorterThreeWay(reader); results.add(qTWPSorter.measuredSort()); } if(merge){ - MergeSorter mSorter = new MergeSorter(reader); + NumberMergeSorter mSorter = new NumberMergeSorter(reader); results.add(mSorter.measuredSort()); } for(SortResult e: results){ diff --git a/Sorting/BubbleSorter.java b/Sorting/NumberBubbleSorter.java similarity index 79% rename from Sorting/BubbleSorter.java rename to Sorting/NumberBubbleSorter.java index 9336bda..990df2b 100644 --- a/Sorting/BubbleSorter.java +++ b/Sorting/NumberBubbleSorter.java @@ -1,9 +1,9 @@ package Sorting; -public class BubbleSorter extends NumberSorter{ +public class NumberBubbleSorter extends NumberSorter{ //a class to sort arrays of numbers using bubble sort - public BubbleSorter(RandomNumberFileReader reader){ + public NumberBubbleSorter(RandomNumberFileReader reader){ super("bubble sort", reader); } diff --git a/Sorting/CountingSorter.java b/Sorting/NumberCountingSorter.java similarity index 89% rename from Sorting/CountingSorter.java rename to Sorting/NumberCountingSorter.java index e8ca14d..dfa7213 100644 --- a/Sorting/CountingSorter.java +++ b/Sorting/NumberCountingSorter.java @@ -2,9 +2,9 @@ package Sorting; 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); } diff --git a/Sorting/InsertionSorter.java b/Sorting/NumberInsertionSorter.java similarity index 88% rename from Sorting/InsertionSorter.java rename to Sorting/NumberInsertionSorter.java index 64a2744..c94d0b1 100644 --- a/Sorting/InsertionSorter.java +++ b/Sorting/NumberInsertionSorter.java @@ -3,9 +3,9 @@ package Sorting; //import java.util.Arrays; //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); } diff --git a/Sorting/InsertionSorterLinkedList.java b/Sorting/NumberInsertionSorterLinkedList.java similarity index 89% rename from Sorting/InsertionSorterLinkedList.java rename to Sorting/NumberInsertionSorterLinkedList.java index ee003af..7a04ad8 100644 --- a/Sorting/InsertionSorterLinkedList.java +++ b/Sorting/NumberInsertionSorterLinkedList.java @@ -4,9 +4,9 @@ import java.util.Arrays; import java.util.LinkedList; 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); } diff --git a/Sorting/MergeSorter.java b/Sorting/NumberMergeSorter.java similarity index 94% rename from Sorting/MergeSorter.java rename to Sorting/NumberMergeSorter.java index a3608dc..1bb536e 100644 --- a/Sorting/MergeSorter.java +++ b/Sorting/NumberMergeSorter.java @@ -1,8 +1,8 @@ package Sorting; -public class MergeSorter extends NumberSorter{ +public class NumberMergeSorter extends NumberSorter{ - public MergeSorter(RandomNumberFileReader reader){ + public NumberMergeSorter(RandomNumberFileReader reader){ super("merge sort",reader); } diff --git a/Sorting/QuickSorter.java b/Sorting/NumberQuickSorter.java similarity index 79% rename from Sorting/QuickSorter.java rename to Sorting/NumberQuickSorter.java index 26f3b09..c3c6ac3 100644 --- a/Sorting/QuickSorter.java +++ b/Sorting/NumberQuickSorter.java @@ -1,12 +1,12 @@ package Sorting; -public class QuickSorter extends NumberSorter{ +public class NumberQuickSorter extends NumberSorter{ - public QuickSorter(RandomNumberFileReader reader){ + public NumberQuickSorter(RandomNumberFileReader reader){ super("quick sort", reader); } - public QuickSorter(String qsortVariant, RandomNumberFileReader reader){ + public NumberQuickSorter(String qsortVariant, RandomNumberFileReader reader){ super(qsortVariant, reader); } diff --git a/Sorting/QuickSorterThreeWay.java b/Sorting/NumberQuickSorterThreeWay.java similarity index 88% rename from Sorting/QuickSorterThreeWay.java rename to Sorting/NumberQuickSorterThreeWay.java index a0069f9..9a26afb 100644 --- a/Sorting/QuickSorterThreeWay.java +++ b/Sorting/NumberQuickSorterThreeWay.java @@ -4,9 +4,9 @@ package Sorting; * 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); } /* diff --git a/Sorting/SelectionSorter.java b/Sorting/NumberSelectionSorter.java similarity index 80% rename from Sorting/SelectionSorter.java rename to Sorting/NumberSelectionSorter.java index 23843ff..88b4836 100644 --- a/Sorting/SelectionSorter.java +++ b/Sorting/NumberSelectionSorter.java @@ -1,8 +1,8 @@ package Sorting; -public class SelectionSorter extends NumberSorter { +public class NumberSelectionSorter extends NumberSorter { //a class to sort an array of numbers using selection sort - public SelectionSorter(RandomNumberFileReader reader){ + public NumberSelectionSorter(RandomNumberFileReader reader){ super("selection sort", reader); }