diff --git a/Sorting/BubbleSorter.java b/Sorting/BubbleSorter.java index e52d162..9336bda 100644 --- a/Sorting/BubbleSorter.java +++ b/Sorting/BubbleSorter.java @@ -1,6 +1,6 @@ package Sorting; -public class BubbleSorter extends Sorter{ +public class BubbleSorter extends NumberSorter{ //a class to sort arrays of numbers using bubble sort public BubbleSorter(RandomNumberFileReader reader){ diff --git a/Sorting/CountingSorter.java b/Sorting/CountingSorter.java index 2d2a31b..e8ca14d 100644 --- a/Sorting/CountingSorter.java +++ b/Sorting/CountingSorter.java @@ -2,7 +2,7 @@ package Sorting; import java.util.Arrays; -public class CountingSorter extends Sorter{ +public class CountingSorter extends NumberSorter{ public CountingSorter(RandomNumberFileReader reader){ super("counting sort", reader); diff --git a/Sorting/InsertionSorter.java b/Sorting/InsertionSorter.java index 1d61453..64a2744 100644 --- a/Sorting/InsertionSorter.java +++ b/Sorting/InsertionSorter.java @@ -3,7 +3,7 @@ package Sorting; //import java.util.Arrays; //import java.util.List; -public class InsertionSorter extends Sorter{ +public class InsertionSorter extends NumberSorter{ public InsertionSorter(RandomNumberFileReader reader){ super("insertion sort", reader); diff --git a/Sorting/InsertionSorterLinkedList.java b/Sorting/InsertionSorterLinkedList.java index b252d9b..ee003af 100644 --- a/Sorting/InsertionSorterLinkedList.java +++ b/Sorting/InsertionSorterLinkedList.java @@ -4,7 +4,7 @@ import java.util.Arrays; import java.util.LinkedList; import java.util.ListIterator; -public class InsertionSorterLinkedList extends Sorter{ +public class InsertionSorterLinkedList extends NumberSorter{ public InsertionSorterLinkedList(RandomNumberFileReader reader){ super("insertion sort (linked list)", reader); diff --git a/Sorting/MergeSorter.java b/Sorting/MergeSorter.java index 045c993..a3608dc 100644 --- a/Sorting/MergeSorter.java +++ b/Sorting/MergeSorter.java @@ -1,6 +1,6 @@ package Sorting; -public class MergeSorter extends Sorter{ +public class MergeSorter extends NumberSorter{ public MergeSorter(RandomNumberFileReader reader){ super("merge sort",reader); diff --git a/Sorting/Sorter.java b/Sorting/NumberSorter.java similarity index 96% rename from Sorting/Sorter.java rename to Sorting/NumberSorter.java index 2fb5101..35e5965 100644 --- a/Sorting/Sorter.java +++ b/Sorting/NumberSorter.java @@ -8,14 +8,14 @@ import java.lang.Integer; * This is an abstract class, its subclasses will inherit its methods and instance * fields. Any abstract methods will have to be implemented in the subclasses. */ -abstract class Sorter { +abstract class NumberSorter { protected String sortType; protected Integer[] numbers; protected long comparisonsUsed = 0; protected long writesUsed=0; - public Sorter(String st, RandomNumberFileReader reader){ + public NumberSorter(String st, RandomNumberFileReader reader){ sortType=st; //RandomNumberFileReader reader = new RandomNumberFileReader(filename); numbers = new Integer[reader.getNumbers().size()]; diff --git a/Sorting/QuickSorter.java b/Sorting/QuickSorter.java index 8d31a66..26f3b09 100644 --- a/Sorting/QuickSorter.java +++ b/Sorting/QuickSorter.java @@ -1,6 +1,6 @@ package Sorting; -public class QuickSorter extends Sorter{ +public class QuickSorter extends NumberSorter{ public QuickSorter(RandomNumberFileReader reader){ super("quick sort", reader); diff --git a/Sorting/SelectionSorter.java b/Sorting/SelectionSorter.java index d545fdd..23843ff 100644 --- a/Sorting/SelectionSorter.java +++ b/Sorting/SelectionSorter.java @@ -1,6 +1,6 @@ package Sorting; -public class SelectionSorter extends Sorter { +public class SelectionSorter extends NumberSorter { //a class to sort an array of numbers using selection sort public SelectionSorter(RandomNumberFileReader reader){ super("selection sort", reader);