added chapter 10

Author: loiane

Diff for: chapter10/01-SortingAlgorithms.js

@@ -25,41 +25,47 @@ function ArrayList(){
 
         for (var i=0; i<length; i++){
             for (var j=0; j<length-1; j++ ){
+                console.log('compare ' + array[j] + ' with ' + array[j+1]);
                 if (array[j] > array[j+1]){
+                    console.log('swap ' + array[j] + ' with ' + array[j+1]);
                     swap(j, j+1);
                 }
             }
         }
     };
 
     this.modifiedBubbleSort = function(){
-        var length = array.length,
-            swapped;
-
-        do {
-            swapped = false;
-            for (var i=0; i<length-1; i++){
-                if (array[i] > array[i+1]){
-                    swap(i, i+1);
-                    swapped = true;
+        var length = array.length;
+
+        for (var i=0; i<length; i++){
+            for (var j=0; j<length-1-i; j++ ){
+                console.log('compare ' + array[j] + ' with ' + array[j+1]);
+                if (array[j] > array[j+1]){
+                    console.log('swap ' + array[j] + ' with ' + array[j+1]);
+                    swap(j, j+1);
                 }
             }
-        } while (swapped);
+        }
 
     };
 
     this.selectionSort = function(){
         var length = array.length,
             indexMin;
 
-        for (var i=0; i<length; i++){
+        for (var i=0; i<length-1; i++){
             indexMin = i;
+            console.log('index ' + array[i]);
             for (var j=i; j<length; j++){
                 if(array[indexMin]>array[j]){
+                    console.log('new index min ' + array[j]);
                     indexMin = j;
                 }
             }
-            swap(i, indexMin);
+            if (i !== indexMin){
+                console.log('swap ' + array[i] + ' with ' + array[indexMin]);
+                swap(i, indexMin);
+            }
         }
     };
 
@@ -69,10 +75,13 @@ function ArrayList(){
         for (var i=1; i<length; i++){
             j = i;
             temp = array[i];
+            console.log('to be inserted ' + temp);
             while (j>0 && array[j-1] > temp){
+                console.log('shift ' + array[j-1]);
                 array[j] = array[j-1];
                 j--;
             }
+            console.log('insert ' + temp);
             array[j] = temp;
         }
     };
@@ -86,6 +95,7 @@ function ArrayList(){
         var length = array.length;
 
         if(length === 1) {
+            console.log(array);
             return array;
         }
 
@@ -118,6 +128,8 @@ function ArrayList(){
             result.push(right[ir++]);
         }
 
+        console.log(result);
+
         return result;
     };
 
@@ -131,16 +143,21 @@ function ArrayList(){
             i = left,
             j = right;
 
+        console.log('pivot is ' + pivot + '; left is ' + left + '; right is ' + right);
+
         while (i <= j) {
             while (array[i] < pivot) {
                 i++;
+                console.log('i = ' + i);
             }
 
             while (array[j] > pivot) {
                 j--;
+                console.log('j = ' + j);
             }
 
             if (i <= j) {
+                console.log('swap ' + array[i] + ' with ' + array[j]);
                 swapQuickStort(array, i, j);
                 i++;
                 j--;

Diff for: chapter10/02-UsingSortingAlgorithms.js

@@ -1,16 +1,28 @@
-function createNonSortedArray(){
+function createNonSortedArray(size){
     var array = new ArrayList();
 
-    for (var i = 5; i> 0; i--){
+    for (var i = size; i> 0; i--){
         array.insert(i);
     }
 
     return array;
 }
 
+function createRandomNonSortedArray(){
+    var array = new ArrayList();
+
+    array.insert(3);
+    array.insert(5);
+    array.insert(1);
+    array.insert(4);
+    array.insert(2);
+
+    return array;
+}
+
 console.log('********** Bubble Sort **********');
 
-var array = createNonSortedArray();
+var array = createNonSortedArray(5);
 
 console.log(array.toString());
 
@@ -20,7 +32,7 @@ console.log(array.toString());
 
 console.log('********** Modified Bubble Sort **********');
 
-array = createNonSortedArray();
+array = createNonSortedArray(5);
 
 console.log(array.toString());
 
@@ -30,7 +42,7 @@ console.log(array.toString());
 
 console.log('********** Selection Sort **********');
 
-array = createNonSortedArray();
+array = createNonSortedArray(5);
 
 console.log(array.toString());
 
@@ -40,7 +52,7 @@ console.log(array.toString());
 
 console.log('********** Insertion Sort **********');
 
-array = createNonSortedArray();
+array = createRandomNonSortedArray();
 
 console.log(array.toString());
 
@@ -50,7 +62,7 @@ console.log(array.toString());
 
 console.log('********** Merge Sort **********');
 
-array = createNonSortedArray();
+array = createNonSortedArray(8);
 
 console.log(array.toString());
 
@@ -59,8 +71,15 @@ array.mergeSort();
 console.log(array.toString());
 
 console.log('********** Quick Sort **********');
-
-array = createNonSortedArray();
+array = new ArrayList();
+
+array.insert(3);
+array.insert(5);
+array.insert(1);
+array.insert(6);
+array.insert(4);
+array.insert(7);
+array.insert(2);
 
 console.log(array.toString());