2018 update

w0rthy · w0rthy · commit 1c0c4b089e5b · 2018-12-25T11:46:02.000-06:00
diff --git a/dist/ArrayVisualizer.jar b/dist/ArrayVisualizer.jar
diff --git a/src/Analysis.java b/src/Analysis.java
@@ -40,7 +40,7 @@ public static int analyzemax() throws Exception{
                 a=array[i];
             marked.set(1,i);
             aa++;
-            sleep(1);
+            sleep(1.0);
         }
         return a;
     }
diff --git a/src/ArrayVisualizer.java b/src/ArrayVisualizer.java
diff --git a/src/BogoSort.java b/src/BogoSort.java
@@ -5,17 +5,24 @@
 
 public class BogoSort {
     public static boolean bogoIsSorted(int[] arr){
-        for(int i = 1; i < arr.length; i++)
+        for(int i = 1; i < arr.length; i++){
+            comps++;
+            aa++;
+            marked.set(1, i);
+            marked.set(2,i-1);
+            sleep(1);
             if(arr[i]<arr[i-1])
                 return false;
+        }
         return true;
     }
     
     public static void bogoSort(){
         while(!bogoIsSorted(array)){
-            for(int i = 0; i < array.length; i++)
+            for(int i = 0; i < array.length; i++){
                 swap(array, i, (int)(Math.random()*array.length));
-            //sleep(100.0);
+                sleep(1);
+            }
         }
     }
     
diff --git a/src/BubbleSort.java b/src/BubbleSort.java
@@ -14,12 +14,17 @@
 public class BubbleSort {
     public static void bubbleSort() throws Exception{
         for(int i = array.length-1; i > 0; i--){
-            marked.set(0,i);
-            for(int j = 0; j < i; j++)
+            for(int j = 0; j < i; j++){
+                sleep(0.005);
                 if(array[j]>array[j+1]){
                     comps++;
-                    swap(array, j, j+1, Math.max(j%50-48,0));
+                    swap(array, j, j+1,0.01);
+                }else{
+                    marked.set(1,j+1);
+                    marked.set(2,-5);
                 }
+            }
+            //marked.set(0,i);
         }
     }
 }
diff --git a/src/CocktailShaker.java b/src/CocktailShaker.java
@@ -18,12 +18,12 @@ public static void cocktailShakerSort(){
             for(int j = i; j < array.length-i-1; j++){
                 comps++;
                 if(array[j]>array[j+1])
-                    swap(array, j, j+1, j%40/39);
+                    swap(array, j, j+1, 0.022);
             }
             for(int j = array.length-i-1; j > i; j--){
                 comps++;
                 if(array[j]<array[j-1])
-                    swap(array, j, j-1, j%40/39);
+                    swap(array, j, j-1, 0.022);
             }
             i++;
         }
diff --git a/src/CountingSort.java b/src/CountingSort.java
@@ -17,7 +17,7 @@ public static void countingSort() throws Exception {
         int[] counts = new int[max+1];
         for(int i = 0; i < array.length; i++){
             marked.set(1,i);
-            sleep(1);
+            sleep(2);
             counts[array[i]]++;
             aa++;
         }
@@ -29,7 +29,7 @@ public static void countingSort() throws Exception {
             aa++;
             counts[x]--;
             marked.set(1, i);
-            sleep(1);
+            sleep(2);
         }
     }
 }
diff --git a/src/DoubleSelection.java b/src/DoubleSelection.java
@@ -20,16 +20,18 @@ public static void doubleSelectionSort(int[] arr) {
         int biggest = 0;
         while(left<=right){
             for(int i = left; i <= right; i++){
+                marked.set(1,i);
                 if(arr[i]>arr[biggest])
                     biggest = i;
                 if(arr[i]<arr[smallest])
                     smallest = i;
                 comps+=2;
+                sleep(0.02);
             }
             if(biggest==left)
                 biggest = smallest;
-            swap(arr, left, smallest, sleepTime(0.01));
-            swap(arr, right, biggest, sleepTime(0.01));
+            swap(arr, left, smallest, 0.01);
+            swap(arr, right, biggest, 0.01);
             left++;
             right--;
             smallest = left;
diff --git a/src/GravitySort.java b/src/GravitySort.java
@@ -41,7 +41,9 @@ public static void gravitySort() throws Exception {
                 for(int y = 0; y < abacus[0].length; y++)
                     count+=abacus[x][y];
                 array[x] = count;
+                sleep(0.002);
             }
+            marked.set(1,array.length-i-1);
             sleep(2);
         }
     }
diff --git a/src/InsertionSort.java b/src/InsertionSort.java
@@ -16,11 +16,12 @@ public static void insertionSort() {
         int pos;
         for(int i = 1; i < array.length; i++){
             pos = i;
-            //marked.set(0, i);
+            marked.set(1, i);
+            marked.set(2, -5);
             while(pos>0&&array[pos]<=array[pos-1]){
-                    comps+=2;
-                    swap(array, pos, pos-1,Math.max(pos%50-48,0));
-                    pos--;
+                comps+=2;
+                swap(array, pos, pos-1, 0.02);
+                pos--;
             }
         }
     }
@@ -29,7 +30,8 @@ public static void insertionSort(int start, int end, double slpamt) {
         int pos;
         for(int i = start; i < end; i++){
             pos = i;
-            //marked.set(0, i);
+            marked.set(1, i);
+            marked.set(2, -5);
             while(pos>start&&array[pos]<=array[pos-1]){
                     comps+=2;
                     swap(array, pos, pos-1);
diff --git a/src/MergeSort.java b/src/MergeSort.java
@@ -23,9 +23,9 @@ static void merge(int min,int max,int mid){
                     while(i<=mid){
                             if(array[i]>array[mid+1]){
                                     comps++;
-                                    swap(array,i,mid+1,sleepTime(0.005));
+                                    swap(array,i,mid+1,1.5);
                                     push(mid+1,max);
-                            }			
+                            }
                             i++;
                     }		
                     
@@ -39,7 +39,7 @@ static void push(int s,int e){
 		for(int i=s;i<e;i++){
 			if(array[i]>array[i+1]){
                             comps++;
-                            swap(array,i,i+1);
+                            swap(array,i,i+1,0.0175);
                         }
 		}
                 
diff --git a/src/MergeSortOOP.java b/src/MergeSortOOP.java
@@ -55,8 +55,8 @@ else if(array[low]<array[high]){
             aa++;
             marked.set(1,low);
             marked.set(2, high);
-            if(end-start>=array.length/10)
-                sleep(1);
+            //if(end-start>=array.length/10)
+                sleep(0.65);
         }
         //System.arraycopy(tmp, 0, array, start, tmp.length);
         marked.set(2, -5);
@@ -65,7 +65,7 @@ else if(array[low]<array[high]){
             aa++;
             marked.set(1, start+i);
             if(end-start>=array.length/100)
-                sleep(1);
+                sleep(0.5);
         }
     }
 }
diff --git a/src/QuickSort.java b/src/QuickSort.java
@@ -30,15 +30,19 @@ public static int partition(int[] a, int p, int r) throws InterruptedException {
         int j = r+1 ;
 
         while (true) {
-            sleep(sleepTime(0.005));
+            //sleep(0.);
             i++;
             while ( i< r && a[i] < x){
                 i++;
+                marked.set(1, i);
+                sleep(0.45);
                 comps+=2;
             }
             j--;
             while (j>p && a[j] > x){
                 j--;
+                marked.set(2,j);
+                sleep(0.45);
                 comps+=2;
             }
 
diff --git a/src/RadixLSDInPlace.java b/src/RadixLSDInPlace.java
@@ -9,6 +9,7 @@ public static void inPlaceRadixLSDSort(int radix)throws Exception{
         int pos = 0;
         int[] vregs = new int[radix-1];
         int maxpower = analyze(radix);
+        double smul = Math.sqrt(radix);
         for(int p = 0; p <= maxpower; p++){
             for(int i = 0; i < vregs.length; i++)
                 vregs[i]=array.length-1;
@@ -21,7 +22,7 @@ public static void inPlaceRadixLSDSort(int radix)throws Exception{
                 } else {
                     for(int j = 0; j<vregs.length;j++)
                         marked.set(j+1,vregs[j]);
-                    swapUpToNM(pos,vregs[digit-1]);
+                    swapUpToNM(pos,vregs[digit-1], 0.0011*smul);
                     for(int j = digit-1; j > 0; j--)
                         vregs[j-1]--;
                 }
diff --git a/src/ShellSort.java b/src/ShellSort.java
@@ -13,10 +13,13 @@ public static void shellSort(int gap, int divrate){
                     int prev = pos-gap;
                     while(prev>=0){
                         if(array[pos] < array[prev]){
+                            comps++;
                             swap(array, pos, prev);
                             sleep(sleepamt);
-                        }else
+                        }else{
+                            aa+=2;
                             break;
+                        }
                         pos = prev;
                         prev = pos-gap;
                     }
diff --git a/src/Swaps.java b/src/Swaps.java
@@ -19,7 +19,7 @@ public static void swap(int[] a, int i, int j) {
         a[j] = temp;
     }
     
-    public static void swap(int[] a, int i, int j, int pause) {
+    public static void swap(int[] a, int i, int j, double pause) {
         marked.set(1, i);
         marked.set(2, j);
         aa+=2;
@@ -30,34 +30,34 @@ public static void swap(int[] a, int i, int j, int pause) {
         a[j] = temp;
     }
     
-        public static void swapnm(int[] a, int i, int j, int pause) {
-            sleep(pause);
+    public static void swapnm(int[] a, int i, int j, double pause) {
+        sleep(pause);
         aa+=2;
         int temp = a[i];
         a[i] = a[j];
         a[j] = temp;
     }
         
-    public static void swapUpTo(int pos, int to){
+    public static void swapUpTo(int pos, int to, double pause){
         if(to - pos > 0)
-         for(int i = pos; i < to; i++)
-            swap(array, i, i+1, i%240/239);
+            for(int i = pos; i < to; i++)
+                swap(array, i, i+1, pause);
         else
             for(int i = pos; i > to; i--)
-                swap(array, i, i-1, i%240/239);
+                swap(array, i, i-1, pause);
     }
     
-    public static void swapUpToNM(int pos, int to){
+    public static void swapUpToNM(int pos, int to, double pause){
         if(to - pos > 0)
          for(int i = pos; i < to; i++)
-            swapnm(array, i, i+1, i%240/239);
+            swapnm(array, i, i+1, pause);
         else
             for(int i = pos; i > to; i--)
-                swapnm(array, i, i-1, i%240/239);
+                swapnm(array, i, i-1, pause);
     }
     
-    public static void swapUp(int pos) {
+    public static void swapUp(int pos, double pause) {
         for(int i = pos; i < array.length; i++)
-            swap(array, i, i+1,i%180/179);
+            swap(array, i, i+1, pause);
     }
 }
diff --git a/src/TimeSort.java b/src/TimeSort.java
@@ -21,6 +21,8 @@ public static void timeSort(int magnitude) throws Exception {
         ArrayList<Thread> threads = new ArrayList<Thread>();
         final int[] tmp = array.clone();
         for(int i = 0; i < array.length; i++){
+            marked.set(0,i);
+            sleep(1);
             final int c = i;
             threads.add(new Thread(){
                 public void run() {
diff --git a/src/UtilFrame.form b/src/UtilFrame.form
@@ -32,19 +32,16 @@
       <Group type="103" groupAlignment="0" attributes="0">
           <Group type="102" alignment="0" attributes="0">
               <EmptySpace max="-2" attributes="0"/>
-              <Group type="103" groupAlignment="1" max="-2" attributes="0">
-                  <Component id="jButton4" max="32767" attributes="0"/>
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <Component id="jCheckBox3" min="-2" max="-2" attributes="0"/>
-                      <Component id="jCheckBox2" min="-2" max="-2" attributes="0"/>
-                      <Group type="103" groupAlignment="1" max="-2" attributes="0">
-                          <Component id="jButton3" max="32767" attributes="0"/>
-                          <Component id="jButton2" alignment="1" max="32767" attributes="0"/>
-                          <Component id="jButton1" alignment="1" max="32767" attributes="0"/>
-                      </Group>
+              <Group type="103" groupAlignment="0" attributes="0">
+                  <Component id="jCheckBox3" min="-2" max="-2" attributes="0"/>
+                  <Component id="jCheckBox2" min="-2" max="-2" attributes="0"/>
+                  <Group type="103" groupAlignment="1" max="-2" attributes="0">
+                      <Component id="jButton3" max="32767" attributes="0"/>
+                      <Component id="jButton2" alignment="1" max="32767" attributes="0"/>
+                      <Component id="jButton1" alignment="1" max="32767" attributes="0"/>
                   </Group>
               </Group>
-              <EmptySpace min="0" pref="10" max="32767" attributes="0"/>
+              <EmptySpace min="0" pref="8" max="32767" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
@@ -57,13 +54,11 @@
               <Component id="jButton2" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
               <Component id="jButton3" min="-2" max="-2" attributes="0"/>
-              <EmptySpace max="-2" attributes="0"/>
-              <Component id="jButton4" min="-2" max="-2" attributes="0"/>
-              <EmptySpace pref="7" max="32767" attributes="0"/>
+              <EmptySpace type="unrelated" max="-2" attributes="0"/>
               <Component id="jCheckBox2" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
               <Component id="jCheckBox3" min="-2" max="-2" attributes="0"/>
-              <EmptySpace max="-2" attributes="0"/>
+              <EmptySpace max="32767" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
@@ -111,13 +106,5 @@
         <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jCheckBox3ActionPerformed"/>
       </Events>
     </Component>
-    <Component class="javax.swing.JButton" name="jButton4">
-      <Properties>
-        <Property name="text" type="java.lang.String" value="Change Inst"/>
-      </Properties>
-      <Events>
-        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton4ActionPerformed"/>
-      </Events>
-    </Component>
   </SubComponents>
 </Form>
diff --git a/src/UtilFrame.java b/src/UtilFrame.java
diff --git a/src/ViewPrompt.form b/src/ViewPrompt.form
diff --git a/src/ViewPrompt.java b/src/ViewPrompt.java
diff --git a/src/WeaveMerge.java b/src/WeaveMerge.java

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public static int analyzemax() throws Exception{`
`40`	`40`	`a=array[i];`
`41`	`41`	`marked.set(1,i);`
`42`	`42`	`aa++;`
`43`		`- sleep(1);`
	`43`	`+ sleep(1.0);`
`44`	`44`	`}`
`45`	`45`	`return a;`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,12 +14,17 @@`
`14`	`14`	`public class BubbleSort {`
`15`	`15`	`public static void bubbleSort() throws Exception{`
`16`	`16`	`for(int i = array.length-1; i > 0; i--){`
`17`		`- marked.set(0,i);`
`18`		`- for(int j = 0; j < i; j++)`
	`17`	`+ for(int j = 0; j < i; j++){`
	`18`	`+ sleep(0.005);`
`19`	`19`	`if(array[j]>array[j+1]){`
`20`	`20`	`comps++;`
`21`		`- swap(array, j, j+1, Math.max(j%50-48,0));`
	`21`	`+ swap(array, j, j+1,0.01);`
	`22`	`+ }else{`
	`23`	`+ marked.set(1,j+1);`
	`24`	`+ marked.set(2,-5);`
`22`	`25`	`}`
	`26`	`+ }`
	`27`	`+ //marked.set(0,i);`
`23`	`28`	`}`
`24`	`29`	`}`
`25`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,12 +18,12 @@ public static void cocktailShakerSort(){`
`18`	`18`	`for(int j = i; j < array.length-i-1; j++){`
`19`	`19`	`comps++;`
`20`	`20`	`if(array[j]>array[j+1])`
`21`		`- swap(array, j, j+1, j%40/39);`
	`21`	`+ swap(array, j, j+1, 0.022);`
`22`	`22`	`}`
`23`	`23`	`for(int j = array.length-i-1; j > i; j--){`
`24`	`24`	`comps++;`
`25`	`25`	`if(array[j]<array[j-1])`
`26`		`- swap(array, j, j-1, j%40/39);`
	`26`	`+ swap(array, j, j-1, 0.022);`
`27`	`27`	`}`
`28`	`28`	`i++;`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public static void countingSort() throws Exception {`
`17`	`17`	`int[] counts = new int[max+1];`
`18`	`18`	`for(int i = 0; i < array.length; i++){`
`19`	`19`	`marked.set(1,i);`
`20`		`- sleep(1);`
	`20`	`+ sleep(2);`
`21`	`21`	`counts[array[i]]++;`
`22`	`22`	`aa++;`
`23`	`23`	`}`
`@@ -29,7 +29,7 @@ public static void countingSort() throws Exception {`
`29`	`29`	`aa++;`
`30`	`30`	`counts[x]--;`
`31`	`31`	`marked.set(1, i);`
`32`		`- sleep(1);`
	`32`	`+ sleep(2);`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,9 @@ public static void gravitySort() throws Exception {`
`41`	`41`	`for(int y = 0; y < abacus[0].length; y++)`
`42`	`42`	`count+=abacus[x][y];`
`43`	`43`	`array[x] = count;`
	`44`	`+ sleep(0.002);`
`44`	`45`	`}`
	`46`	`+ marked.set(1,array.length-i-1);`
`45`	`47`	`sleep(2);`
`46`	`48`	`}`
`47`	`49`	`}`