Group files in relevant packages

Zoybean · Zoybean · commit 88c7ca1b3ca9 · 2019-01-06T15:51:57.000+08:00
Move files to packages of similar functionality
Move all files to under array.visualiser
diff --git a/src/array/visualizer/AAFrame.java b/src/array/visualizer/AAFrame.java
diff --git a/src/array/visualizer/ArrayVisualizer.java b/src/array/visualizer/ArrayVisualizer.java
@@ -1,7 +1,8 @@
 package array.visualizer;
 
+import array.visualizer.sort.RadixLSDInPlace;
+
 import java.awt.Color;
-import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.Graphics;
 import java.awt.Image;
@@ -11,29 +12,26 @@
 import javax.sound.midi.Synthesizer;
 import javax.swing.JFrame;
 
-import static array.visualizer.Swaps.*;
-import static array.visualizer.BitonicSort.*;
-import static array.visualizer.BubbleSort.*;
-import static array.visualizer.CocktailShaker.*;
-import static array.visualizer.CountingSort.*;
-import static array.visualizer.DoubleSelection.*;
-import static array.visualizer.GravitySort.*;
-import static array.visualizer.InsertionSort.*;
-import static array.visualizer.MergeSort.*;
-import static array.visualizer.MergeSortOOP.*;
-import static array.visualizer.QuickSort.*;
-import static array.visualizer.RadixLSD.*;
-import static array.visualizer.RadixMSD.*;
-import static array.visualizer.Searches.*;
-import static array.visualizer.SelectionSort.*;
-import static array.visualizer.ShatterSorts.*;
-import static array.visualizer.Swaps.*;
-import static array.visualizer.TimeSort.*;
-import static array.visualizer.WeaveMerge.*;
-import static array.visualizer.RadixLSDInPlace.*;
-import static array.visualizer.BogoSort.*;
-import static array.visualizer.HeapSort.*;
-import static array.visualizer.ShellSort.*;
+import static array.visualizer.utils.Swaps.*;
+import static array.visualizer.sort.BubbleSort.*;
+import static array.visualizer.sort.CocktailShaker.*;
+import static array.visualizer.sort.CountingSort.*;
+import static array.visualizer.sort.DoubleSelection.*;
+import static array.visualizer.sort.GravitySort.*;
+import static array.visualizer.sort.InsertionSort.*;
+import static array.visualizer.sort.MergeSort.*;
+import static array.visualizer.sort.MergeSortOOP.*;
+import static array.visualizer.sort.QuickSort.*;
+import static array.visualizer.sort.RadixLSD.*;
+import static array.visualizer.sort.RadixMSD.*;
+import static array.visualizer.sort.SelectionSort.*;
+import static array.visualizer.sort.ShatterSorts.*;
+import static array.visualizer.sort.TimeSort.*;
+import static array.visualizer.sort.WeaveMerge.*;
+import static array.visualizer.sort.RadixLSDInPlace.*;
+import static array.visualizer.sort.BogoSort.*;
+import static array.visualizer.sort.HeapSort.*;
+import static array.visualizer.sort.ShellSort.*;
 import java.awt.BasicStroke;
 import java.awt.Graphics2D;
 import java.awt.Polygon;
@@ -45,15 +43,15 @@
 
 public class ArrayVisualizer {
 
-    static final int [] array = new int[1000];
+    public static final int [] array = new int[1000];
     static final JFrame window = new JFrame();
     
     static String heading = "";
-    static final ArrayList<Integer> marked = new ArrayList();
+    public static final ArrayList<Integer> marked = new ArrayList();
     static int frames;
-    static long aa = 0;
+    public static long aa = 0;
     static int snd = 0;
-    static long comps = 0;
+    public static long comps = 0;
     static long nanos;
     static Font fon = new Font("TimesRoman",Font.PLAIN,(int)(640/1280.0*25));
     
@@ -157,7 +155,7 @@ public static void main(String[] args) throws Exception {
             marked.add(-5);
         rianr(array);
         
-        window.setSize(new Dimension(640,480));
+        window.setSize(640, 480);
         window.setLocation(0, 0);
         window.setVisible(true);
         window.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
diff --git a/src/array/visualizer/SortPrompt.java b/src/array/visualizer/SortPrompt.java
diff --git a/src/array/visualizer/UtilFrame.java b/src/array/visualizer/UtilFrame.java
diff --git a/src/array/visualizer/ViewPrompt.java b/src/array/visualizer/ViewPrompt.java
diff --git a/src/array/visualizer/sort/BitonicSort.java b/src/array/visualizer/sort/BitonicSort.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package array.visualizer;
+package array.visualizer.sort;
 
 import static array.visualizer.ArrayVisualizer.*;
 
diff --git a/src/array/visualizer/sort/BogoSort.java b/src/array/visualizer/sort/BogoSort.java
@@ -1,7 +1,7 @@
-package array.visualizer;
+package array.visualizer.sort;
 
 import static array.visualizer.ArrayVisualizer.*;
-import static array.visualizer.Swaps.*;
+import static array.visualizer.utils.Swaps.*;
 
 public class BogoSort {
     public static boolean bogoIsSorted(int[] arr){
diff --git a/src/array/visualizer/sort/BubbleSort.java b/src/array/visualizer/sort/BubbleSort.java
@@ -2,10 +2,10 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package array.visualizer;
+package array.visualizer.sort;
 
 import static array.visualizer.ArrayVisualizer.*;
-import static array.visualizer.Swaps.*;
+import static array.visualizer.utils.Swaps.*;
 
 /**
  *
diff --git a/src/array/visualizer/sort/CocktailShaker.java b/src/array/visualizer/sort/CocktailShaker.java
@@ -2,10 +2,10 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package array.visualizer;
+package array.visualizer.sort;
 
 import static array.visualizer.ArrayVisualizer.*;
-import static array.visualizer.Swaps.*;
+import static array.visualizer.utils.Swaps.*;
 
 /**
  *
diff --git a/src/array/visualizer/sort/CountingSort.java b/src/array/visualizer/sort/CountingSort.java
@@ -2,10 +2,10 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package array.visualizer;
+package array.visualizer.sort;
 
 import static array.visualizer.ArrayVisualizer.*;
-import static array.visualizer.Analysis.*;
+import static array.visualizer.utils.Analysis.*;
 
 /**
  *
diff --git a/src/array/visualizer/sort/DoubleSelection.java b/src/array/visualizer/sort/DoubleSelection.java
@@ -2,10 +2,10 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package array.visualizer;
+package array.visualizer.sort;
 
 import static array.visualizer.ArrayVisualizer.*;
-import static array.visualizer.Swaps.*;
+import static array.visualizer.utils.Swaps.*;
 
 /**
  *
diff --git a/src/array/visualizer/sort/GravitySort.java b/src/array/visualizer/sort/GravitySort.java
@@ -2,10 +2,10 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package array.visualizer;
+package array.visualizer.sort;
 
 import static array.visualizer.ArrayVisualizer.*;
-import static array.visualizer.Analysis.*;
+import static array.visualizer.utils.Analysis.*;
 
 /**
  *
diff --git a/src/array/visualizer/sort/HeapSort.java b/src/array/visualizer/sort/HeapSort.java
@@ -1,7 +1,7 @@
-package array.visualizer;
+package array.visualizer.sort;
 
 import static array.visualizer.ArrayVisualizer.*;
-import static array.visualizer.Swaps.*;
+import static array.visualizer.utils.Swaps.*;
 
 public class HeapSort {
     
@@ -76,7 +76,7 @@ else if (!max && (array[child1]<array[pos])){
         }
     }
     
-    static void maxheapsort(){
+    public static void maxheapsort(){
         maxheapifyrec(0,true);
         for(int i = array.length-1; i > 0; i--){
             swap(array, 0, i, SLP);
diff --git a/src/array/visualizer/sort/InsertionSort.java b/src/array/visualizer/sort/InsertionSort.java
@@ -2,10 +2,10 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package array.visualizer;
+package array.visualizer.sort;
 
 import static array.visualizer.ArrayVisualizer.*;
-import static array.visualizer.Swaps.*;
+import static array.visualizer.utils.Swaps.*;
 
 /**
  *
diff --git a/src/array/visualizer/sort/MergeSort.java b/src/array/visualizer/sort/MergeSort.java
@@ -2,10 +2,12 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package array.visualizer;
+package array.visualizer.sort;
+
+import array.visualizer.ArrayVisualizer;
 
 import static array.visualizer.ArrayVisualizer.*;
-import static array.visualizer.Swaps.*;
+import static array.visualizer.utils.Swaps.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -46,7 +48,7 @@ static void push(int s,int e){
                 
 	}
     
-    static void mergeSort(int min,int max){
+    public static void mergeSort(int min, int max){
 	if(max-min==0){//only one element.
 		//no swap
 	}
diff --git a/src/array/visualizer/sort/MergeSortOOP.java b/src/array/visualizer/sort/MergeSortOOP.java
@@ -2,10 +2,9 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package array.visualizer;
+package array.visualizer.sort;
 
 import static array.visualizer.ArrayVisualizer.*;
-import static array.visualizer.Swaps.*;
 
 /**
  *
diff --git a/src/array/visualizer/sort/QuickSort.java b/src/array/visualizer/sort/QuickSort.java
@@ -2,10 +2,10 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package array.visualizer;
+package array.visualizer.sort;
 
 import static array.visualizer.ArrayVisualizer.*;
-import static array.visualizer.Swaps.*;
+import static array.visualizer.utils.Swaps.*;
 
 /**
  *
diff --git a/src/array/visualizer/sort/RadixLSD.java b/src/array/visualizer/sort/RadixLSD.java
@@ -2,11 +2,11 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package array.visualizer;
+package array.visualizer.sort;
 
 import static array.visualizer.ArrayVisualizer.*;
-import static array.visualizer.Analysis.*;
-import static array.visualizer.Transcriptions.*;
+import static array.visualizer.utils.Analysis.*;
+import static array.visualizer.utils.Transcriptions.*;
 import java.util.ArrayList;
 
 /**
diff --git a/src/array/visualizer/sort/RadixLSDInPlace.java b/src/array/visualizer/sort/RadixLSDInPlace.java
@@ -1,8 +1,8 @@
-package array.visualizer;
+package array.visualizer.sort;
 
-import static array.visualizer.Analysis.*;
+import static array.visualizer.utils.Analysis.*;
 import static array.visualizer.ArrayVisualizer.*;
-import static array.visualizer.Swaps.*;
+import static array.visualizer.utils.Swaps.*;
 
 public class RadixLSDInPlace {
     public static void inPlaceRadixLSDSort(int radix)throws Exception{
diff --git a/src/array/visualizer/sort/RadixMSD.java b/src/array/visualizer/sort/RadixMSD.java
@@ -2,11 +2,11 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package array.visualizer;
+package array.visualizer.sort;
 
 import static array.visualizer.ArrayVisualizer.*;
-import static array.visualizer.Transcriptions.*;
-import static array.visualizer.Analysis.*;
+import static array.visualizer.utils.Transcriptions.*;
+import static array.visualizer.utils.Analysis.*;
 import java.util.ArrayList;
 
 /**
diff --git a/src/array/visualizer/sort/SelectionSort.java b/src/array/visualizer/sort/SelectionSort.java
@@ -2,10 +2,10 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package array.visualizer;
+package array.visualizer.sort;
 
 import static array.visualizer.ArrayVisualizer.*;
-import static array.visualizer.Swaps.*;
+import static array.visualizer.utils.Swaps.*;
 
 /**
  *
diff --git a/src/array/visualizer/sort/ShatterSorts.java b/src/array/visualizer/sort/ShatterSorts.java
@@ -2,10 +2,10 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package array.visualizer;
+package array.visualizer.sort;
 
 import static array.visualizer.ArrayVisualizer.*;
-import static array.visualizer.Transcriptions.*;
+import static array.visualizer.utils.Transcriptions.*;
 import java.util.ArrayList;
 
 /**
diff --git a/src/array/visualizer/sort/ShellSort.java b/src/array/visualizer/sort/ShellSort.java
@@ -1,7 +1,7 @@
-package array.visualizer;
+package array.visualizer.sort;
 
 import static array.visualizer.ArrayVisualizer.*;
-import static array.visualizer.Swaps.*;
+import static array.visualizer.utils.Swaps.*;
 
 public class ShellSort {
     public static void shellSort(int gap, int divrate){
diff --git a/src/array/visualizer/sort/TimeSort.java b/src/array/visualizer/sort/TimeSort.java
@@ -2,11 +2,13 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package array.visualizer;
+package array.visualizer.sort;
 
 
+import array.visualizer.ArrayVisualizer;
+
 import static array.visualizer.ArrayVisualizer.*;
-import static array.visualizer.InsertionSort.*;
+import static array.visualizer.sort.InsertionSort.*;
 import java.util.ArrayList;
 import java.util.logging.Level;
 import java.util.logging.Logger;
diff --git a/src/array/visualizer/sort/WeaveMerge.java b/src/array/visualizer/sort/WeaveMerge.java
@@ -2,11 +2,13 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package array.visualizer;
+package array.visualizer.sort;
+
+import array.visualizer.ArrayVisualizer;
 
 import static array.visualizer.ArrayVisualizer.*;
-import static array.visualizer.InsertionSort.*;
-import static array.visualizer.Swaps.*;
+import static array.visualizer.sort.InsertionSort.*;
+import static array.visualizer.utils.Swaps.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -45,7 +47,7 @@ static void push(int s,int e){
         } 
     }
     
-    static void weaveMergeSort(int min,int max){
+    public static void weaveMergeSort(int min, int max){
 	if(max-min==0){//only one element.
 		//no swap
 	}
diff --git a/src/array/visualizer/utils/Analysis.java b/src/array/visualizer/utils/Analysis.java
diff --git a/src/array/visualizer/utils/Searches.java b/src/array/visualizer/utils/Searches.java
diff --git a/src/array/visualizer/utils/Swaps.java b/src/array/visualizer/utils/Swaps.java
diff --git a/src/array/visualizer/utils/Transcriptions.java b/src/array/visualizer/utils/Transcriptions.java
