Finished Shuffle

Author: codelogicws

out/production/Algorithms/ws/codelogic/algorithms/shuffle/Shuffler.class

@@ -1,8 +1,37 @@
 package ws.codelogic.algorithms.shuffle;
 
+import java.util.Random;
+
 public class Shuffler {
 
+    private Random random = new Random();
+    private int[] shuffledArray;
+
     public int[] shuffle(int[] sorted) {
-        return new int[4];
+        shuffledArray = sorted.clone();
+        for(int i=0;i<sorted.length;i++){
+            swap(i, random(i));
+        }
+        printShuffledArray(sorted);
+        return shuffledArray;
+    }
+
+    private void swap(int i, int random) {
+        int temp = shuffledArray[i];
+        shuffledArray[i] = shuffledArray[random];
+        shuffledArray[random] = temp;
+    }
+
+    private int random(int index){
+        if(index > 0){
+            return random.nextInt(index);
+        }
+        return 0;
+    }
+
+    private void printShuffledArray(int[] array){
+        for(int i : array){
+            System.out.print(i + ", ");
+        }
     }
 }

out/production/Algorithms/ws/codelogic/algorithms/shuffle/ShufflerTest.class

@@ -17,19 +17,24 @@ public void setup() {
     @Test
     public void testItemsAreNotInTheSortedOrderTheyWhereSentIn() {
         int[] shuffled = shuffler.shuffle(sorted);
-        assertFalse(arraysNotEqual(shuffled, sorted));
+        assertTrue(arraysNotEqual(shuffled, sorted));
     }
 
     private boolean arraysNotEqual(int[] array1, int[] array2){
         boolean arraysEqual = true;
         if(array1.length != array2.length){
             arraysEqual = false;
         }else{
-            for(int i=0;i<array1.length;i++){
-                if(array1[i] != array2[i]){
-                    arraysEqual = false;
-                    break;
-                }
+            arraysEqual = checkForMatchs(array1, array2, arraysEqual);
+        }
+        return !arraysEqual;
+    }
+
+    private boolean checkForMatchs(int[] array1, int[] array2, boolean arraysEqual) {
+        for(int i=0;i<array1.length;i++){
+            if(array1[i] != array2[i]){
+                arraysEqual = false;
+                break;
             }
         }
         return arraysEqual;

out/production/Algorithms/ws/codelogic/test/TestSuite.class

@@ -6,10 +6,9 @@
 import ws.codelogic.algorithms.Stack.LinkStackTest;
 import ws.codelogic.algorithms.arithmetic.evaluation.DijkstrasTwoStackTest;
 import ws.codelogic.algorithms.search.SearchTest;
-import ws.codelogic.algorithms.shuffle.Shuffler;
+import ws.codelogic.algorithms.shuffle.ShufflerTest;
 import ws.codelogic.algorithms.sort.InsertionSortTest;
 import ws.codelogic.algorithms.sort.SelectionSortTest;
-import ws.codelogic.algorithms.sort.ShellSort;
 import ws.codelogic.algorithms.sort.ShellSortTest;
 import ws.codelogic.algorithms.union.UnionTest;
 
@@ -22,7 +21,7 @@
         ShellSortTest.class,
         DijkstrasTwoStackTest.class,
         ArrayStackTest.class,
-//        Shuffler.class,
+        ShufflerTest.class,
         LinkStackTest.class})
 public class TestSuite {
 }