Renamed Sorter to NumberSorter
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
package Sorting;
|
package Sorting;
|
||||||
|
|
||||||
public class BubbleSorter extends Sorter{
|
public class BubbleSorter 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 BubbleSorter(RandomNumberFileReader reader){
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ package Sorting;
|
|||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
|
||||||
public class CountingSorter extends Sorter{
|
public class CountingSorter extends NumberSorter{
|
||||||
|
|
||||||
public CountingSorter(RandomNumberFileReader reader){
|
public CountingSorter(RandomNumberFileReader reader){
|
||||||
super("counting sort", reader);
|
super("counting sort", reader);
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ package Sorting;
|
|||||||
//import java.util.Arrays;
|
//import java.util.Arrays;
|
||||||
//import java.util.List;
|
//import java.util.List;
|
||||||
|
|
||||||
public class InsertionSorter extends Sorter{
|
public class InsertionSorter extends NumberSorter{
|
||||||
|
|
||||||
public InsertionSorter(RandomNumberFileReader reader){
|
public InsertionSorter(RandomNumberFileReader reader){
|
||||||
super("insertion sort", reader);
|
super("insertion sort", reader);
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import java.util.Arrays;
|
|||||||
import java.util.LinkedList;
|
import java.util.LinkedList;
|
||||||
import java.util.ListIterator;
|
import java.util.ListIterator;
|
||||||
|
|
||||||
public class InsertionSorterLinkedList extends Sorter{
|
public class InsertionSorterLinkedList extends NumberSorter{
|
||||||
|
|
||||||
public InsertionSorterLinkedList(RandomNumberFileReader reader){
|
public InsertionSorterLinkedList(RandomNumberFileReader reader){
|
||||||
super("insertion sort (linked list)", reader);
|
super("insertion sort (linked list)", reader);
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package Sorting;
|
package Sorting;
|
||||||
|
|
||||||
public class MergeSorter extends Sorter{
|
public class MergeSorter extends NumberSorter{
|
||||||
|
|
||||||
public MergeSorter(RandomNumberFileReader reader){
|
public MergeSorter(RandomNumberFileReader reader){
|
||||||
super("merge sort",reader);
|
super("merge sort",reader);
|
||||||
|
|||||||
@@ -8,14 +8,14 @@ import java.lang.Integer;
|
|||||||
* This is an abstract class, its subclasses will inherit its methods and instance
|
* 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.
|
* fields. Any abstract methods will have to be implemented in the subclasses.
|
||||||
*/
|
*/
|
||||||
abstract class Sorter {
|
abstract class NumberSorter {
|
||||||
|
|
||||||
protected String sortType;
|
protected String sortType;
|
||||||
protected Integer[] numbers;
|
protected Integer[] numbers;
|
||||||
protected long comparisonsUsed = 0;
|
protected long comparisonsUsed = 0;
|
||||||
protected long writesUsed=0;
|
protected long writesUsed=0;
|
||||||
|
|
||||||
public Sorter(String st, RandomNumberFileReader reader){
|
public NumberSorter(String st, RandomNumberFileReader reader){
|
||||||
sortType=st;
|
sortType=st;
|
||||||
//RandomNumberFileReader reader = new RandomNumberFileReader(filename);
|
//RandomNumberFileReader reader = new RandomNumberFileReader(filename);
|
||||||
numbers = new Integer[reader.getNumbers().size()];
|
numbers = new Integer[reader.getNumbers().size()];
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
package Sorting;
|
package Sorting;
|
||||||
|
|
||||||
public class QuickSorter extends Sorter{
|
public class QuickSorter extends NumberSorter{
|
||||||
|
|
||||||
public QuickSorter(RandomNumberFileReader reader){
|
public QuickSorter(RandomNumberFileReader reader){
|
||||||
super("quick sort", reader);
|
super("quick sort", reader);
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package Sorting;
|
package Sorting;
|
||||||
|
|
||||||
public class SelectionSorter extends Sorter {
|
public class SelectionSorter 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 SelectionSorter(RandomNumberFileReader reader){
|
||||||
super("selection sort", reader);
|
super("selection sort", reader);
|
||||||
|
|||||||
Reference in New Issue
Block a user