added chapter 10

loiane · loiane · commit 460344223b08 · 2014-08-08T11:31:08.000-03:00
diff --git a/chapter10/01-SortingAlgorithms.js b/chapter10/01-SortingAlgorithms.js
@@ -76,4 +76,96 @@ function ArrayList(){
             array[j] = temp;
         }
     };
+
+    this.mergeSort = function(){
+        array = mergeSortRec(array);
+    };
+
+    var mergeSortRec = function(array){
+
+        var length = array.length;
+
+        if(length === 1) {
+            return array;
+        }
+
+        var mid = Math.floor(length / 2),
+            left = array.slice(0, mid),
+            right = array.slice(mid, length);
+
+        return merge(mergeSortRec(left), mergeSortRec(right));
+    };
+
+    var merge = function(left, right){
+        var result = [],
+            il = 0,
+            ir = 0;
+
+        while(il < left.length && ir < right.length) {
+
+            if(left[il] < right[ir]) {
+                result.push(left[il++]);
+            } else{
+                result.push(right[ir++]);
+            }
+        }
+
+        while (il < left.length){
+            result.push(left[il++]);
+        }
+
+        while (ir < right.length){
+            result.push(right[ir++]);
+        }
+
+        return result;
+    };
+
+    this.quickStort = function(){
+        quick(array,  0, array.length - 1);
+    };
+
+    var partition = function(array, left, right) {
+
+        var pivot = array[Math.floor((right + left) / 2)],
+            i = left,
+            j = right;
+
+        while (i <= j) {
+            while (array[i] < pivot) {
+                i++;
+            }
+
+            while (array[j] > pivot) {
+                j--;
+            }
+
+            if (i <= j) {
+                swap(array, i, j);
+                i++;
+                j--;
+            }
+        }
+
+        return i;
+    };
+
+    var quick = function(array, left, right){
+
+        var index;
+
+        if (array.length > 1) {
+
+            index = partition(array, left, right);
+
+            if (left < index - 1) {
+                quick(array, left, index - 1);
+            }
+
+            if (index < right) {
+                quick(array, index, right);
+            }
+        }
+        return array;
+    };
 }
diff --git a/chapter10/02-UsingSortingAlgorithms.html b/chapter10/02-UsingSortingAlgorithms.html
@@ -6,6 +6,6 @@
 </head>
 <body>
 <script type="text/javascript" src="01-SortingAlgorithms.js"></script>
-<script type="text/javascript" src="02-TestingSortingAlgorithms.js"></script>
+<script type="text/javascript" src="02-UsingSortingAlgorithms.js"></script>
 </body>
 </html>
diff --git a/chapter10/02-UsingSortingAlgorithms.js b/chapter10/02-UsingSortingAlgorithms.js
@@ -54,7 +54,17 @@ array = createNonSortedArray();
 
 console.log(array.toString());
 
-array.insertionSort();
+array.mergeSort();
+
+console.log(array.toString());
+
+console.log('********** Quick Sort **********');
+
+array = createNonSortedArray();
+
+console.log(array.toString());
+
+array.mergeSort();
 
 console.log(array.toString());
 
