From ba8820896e7c844c1947f31216a0a9a101b81f19 Mon Sep 17 00:00:00 2001 From: Eugene Fischer Date: Thu, 11 Jun 2020 12:00:27 -0500 Subject: [PATCH] file now only read once --- Sorting/AlgorithmTester.java | 16 ++++++++-------- Sorting/BubbleSorter.java | 4 ++-- Sorting/CountingSorter.java | 4 ++-- Sorting/InsertionSorter.java | 4 ++-- Sorting/MergeSorter.java | 4 ++-- Sorting/QuickSorter.java | 8 ++++---- Sorting/QuickSorterThreeWay.java | 4 ++-- Sorting/SelectionSorter.java | 4 ++-- Sorting/Sorter.java | 4 ++-- 9 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Sorting/AlgorithmTester.java b/Sorting/AlgorithmTester.java index 07e4102..efe8bc0 100644 --- a/Sorting/AlgorithmTester.java +++ b/Sorting/AlgorithmTester.java @@ -138,33 +138,33 @@ public class AlgorithmTester{ boolean quickTWP=sortingAlgoChoices[5]; boolean merge=sortingAlgoChoices[6]; ArrayList results = new ArrayList(); - + RandomNumberFileReader reader = new RandomNumberFileReader(filename); if(bubble){ - BubbleSorter bubSorter = new BubbleSorter(filename); + BubbleSorter bubSorter = new BubbleSorter(reader); results.add(bubSorter.measuredSort()); } if(selection){ - SelectionSorter selSorter = new SelectionSorter(filename); + SelectionSorter selSorter = new SelectionSorter(reader); results.add(selSorter.measuredSort()); } if(insertion){ - InsertionSorter inSorter = new InsertionSorter(filename); + InsertionSorter inSorter = new InsertionSorter(reader); results.add(inSorter.measuredSort()); } if(counting){ - CountingSorter countSorter = new CountingSorter(filename); + CountingSorter countSorter = new CountingSorter(reader); results.add(countSorter.measuredSort()); } if(quick){ - QuickSorter qSorter = new QuickSorter(filename); + QuickSorter qSorter = new QuickSorter(reader); results.add(qSorter.measuredSort()); } if(quickTWP){ - QuickSorterThreeWay qTWPSorter = new QuickSorterThreeWay(filename); + QuickSorterThreeWay qTWPSorter = new QuickSorterThreeWay(reader); results.add(qTWPSorter.measuredSort()); } if(merge){ - MergeSorter mSorter = new MergeSorter(filename); + MergeSorter mSorter = new MergeSorter(reader); results.add(mSorter.measuredSort()); } for(SortResult e: results){ diff --git a/Sorting/BubbleSorter.java b/Sorting/BubbleSorter.java index edbf0a1..e52d162 100644 --- a/Sorting/BubbleSorter.java +++ b/Sorting/BubbleSorter.java @@ -3,8 +3,8 @@ package Sorting; public class BubbleSorter extends Sorter{ //a class to sort arrays of numbers using bubble sort - public BubbleSorter(String filename){ - super("bubble sort", filename); + public BubbleSorter(RandomNumberFileReader reader){ + super("bubble sort", reader); } void sort(){ diff --git a/Sorting/CountingSorter.java b/Sorting/CountingSorter.java index c5e2a79..2d2a31b 100644 --- a/Sorting/CountingSorter.java +++ b/Sorting/CountingSorter.java @@ -4,8 +4,8 @@ import java.util.Arrays; public class CountingSorter extends Sorter{ - public CountingSorter(String filename){ - super("counting sort", filename); + public CountingSorter(RandomNumberFileReader reader){ + super("counting sort", reader); } void sort(){ diff --git a/Sorting/InsertionSorter.java b/Sorting/InsertionSorter.java index aa781c3..1d61453 100644 --- a/Sorting/InsertionSorter.java +++ b/Sorting/InsertionSorter.java @@ -5,8 +5,8 @@ package Sorting; public class InsertionSorter extends Sorter{ - public InsertionSorter(String filename){ - super("insertion sort", filename); + public InsertionSorter(RandomNumberFileReader reader){ + super("insertion sort", reader); } void sort(){ diff --git a/Sorting/MergeSorter.java b/Sorting/MergeSorter.java index 4dbb5f7..08f6d38 100644 --- a/Sorting/MergeSorter.java +++ b/Sorting/MergeSorter.java @@ -2,8 +2,8 @@ package Sorting; public class MergeSorter extends Sorter{ - public MergeSorter(String filename){ - super("merge sort",filename); + public MergeSorter(RandomNumberFileReader reader){ + super("merge sort",reader); } void sort(){ diff --git a/Sorting/QuickSorter.java b/Sorting/QuickSorter.java index ced6b42..8d31a66 100644 --- a/Sorting/QuickSorter.java +++ b/Sorting/QuickSorter.java @@ -2,12 +2,12 @@ package Sorting; public class QuickSorter extends Sorter{ - public QuickSorter(String filename){ - super("quick sort", filename); + public QuickSorter(RandomNumberFileReader reader){ + super("quick sort", reader); } - public QuickSorter(String qsortVariant, String filename){ - super(qsortVariant, filename); + public QuickSorter(String qsortVariant, RandomNumberFileReader reader){ + super(qsortVariant, reader); } void sort(){ diff --git a/Sorting/QuickSorterThreeWay.java b/Sorting/QuickSorterThreeWay.java index 6d7fa1c..a0069f9 100644 --- a/Sorting/QuickSorterThreeWay.java +++ b/Sorting/QuickSorterThreeWay.java @@ -6,8 +6,8 @@ package Sorting; public class QuickSorterThreeWay extends QuickSorter{ - public QuickSorterThreeWay(String filename){ - super("quick sort (3-way partition)", filename); + public QuickSorterThreeWay(RandomNumberFileReader reader){ + super("quick sort (3-way partition)", reader); } /* void sort(){ diff --git a/Sorting/SelectionSorter.java b/Sorting/SelectionSorter.java index 1add6fa..d545fdd 100644 --- a/Sorting/SelectionSorter.java +++ b/Sorting/SelectionSorter.java @@ -2,8 +2,8 @@ package Sorting; public class SelectionSorter extends Sorter { //a class to sort an array of numbers using selection sort - public SelectionSorter(String filename){ - super("selection sort", filename); + public SelectionSorter(RandomNumberFileReader reader){ + super("selection sort", reader); } void sort(){ diff --git a/Sorting/Sorter.java b/Sorting/Sorter.java index bdb152d..dd0e9ab 100644 --- a/Sorting/Sorter.java +++ b/Sorting/Sorter.java @@ -15,9 +15,9 @@ abstract class Sorter { protected long comparisonsUsed = 0; protected long writesUsed=0; - public Sorter(String st, String filename){ + public Sorter(String st, RandomNumberFileReader reader){ sortType=st; - RandomNumberFileReader reader = new RandomNumberFileReader(filename); + //RandomNumberFileReader reader = new RandomNumberFileReader(filename); numbers = new Integer[reader.getNumbers().size()]; reader.getNumbers().toArray(numbers); }