Changes in bucketsort

mgechev · mgechev · commit 3da6df70fac7 · 2014-03-08T18:12:09.000+02:00
diff --git a/src/sorting/linearsort/bucketsort.js b/src/sorting/linearsort/bucketsort.js
@@ -43,11 +43,10 @@
      */
     function createBuckets(array) {
       var buckets = [],
-          length = array.length,
           currentBucket, current;
       for (var i = 0; i < array.length; i += 1) {
         current = array[i];
-        currentBucket = Math.floor(length % current);
+        currentBucket = Math.floor(current);
         buckets[currentBucket] = buckets[currentBucket] || [];
         buckets[currentBucket].push(current);
       }
@@ -84,9 +83,7 @@
       for (var i = 0; i < buckets.length; i += 1) {
         currentBucket = buckets[i];
         if (currentBucket !== undefined) {
-          for (var j = 0; j < currentBucket.length; j += 1) {
-            result.push(currentBucket[j]);
-          }
+          result = result.concat(currentBucket);
         }
       }
       return result;
diff --git a/test/sorting/shellsort/shellsort.spec.js b/test/sorting/shellsort/shellsort.spec.js
@@ -1,4 +1,5 @@
 var sortTestCase = require('../sort.testcase.js'),
-    shellSort = require('../../../src/sorting/shellsort/shellsort.js').shellSort;
+    shellSort = require('../../../src/sorting/shellsort/shellsort.js')
+      .shellSort;
 
 sortTestCase(shellSort, 'Shell sort');
diff --git a/test/sorting/sort.testcase.js b/test/sorting/sort.testcase.js
@@ -1,14 +1,19 @@
-module.exports = function (sort, algorithmName) {
+module.exports = function (sort, algorithmName, options) {
 
   'use strict';
 
+  options = options || {
+    integers: false,
+    reverse : true
+  };
+
   describe(algorithmName, function () {
 
-    function createRandomArray(options) {
-      options = options || {};
-      var size = options.size || 100,
-          precision = options.precision || 2,
-          multiplier = options.multiplier || 100;
+    function createRandomArray(config) {
+      config = config || {};
+      var size = config.size || 100,
+          precision = config.precision || 2,
+          multiplier = config.multiplier || 100;
 
       var result = [];
       for (var i = size; i > 0; i -= 1) {
@@ -27,28 +32,35 @@ module.exports = function (sort, algorithmName) {
     });
 
     it('should work with random non-sorted arrays', function () {
-
-      var array = createRandomArray();
+      var array;
+      if (options.integers) {
+        array = createRandomArray();
+      } else {
+        array = createRandomArray({
+          precision: 0
+        });
+      }
       sort(array);
-
       for (var i = 0; i < array.length - 1; i += 1) {
         expect(array[i] <= array[i + 1]).toBeTruthy();
       }
     });
 
-    it('should sort the numbers in descending order ' +
-        'when such comparator is provided', function () {
-      function comparator(a, b) {
-        return b - a;
-      }
+    if (options.reverse) {
+      it('should sort the numbers in descending order ' +
+          'when such comparator is provided', function () {
+        function comparator(a, b) {
+          return b - a;
+        }
 
-      var array = createRandomArray();
-      sort(array, comparator);
+        var array = createRandomArray();
+        sort(array, comparator);
 
-      for (var i = 0; i < array.length - 1; i += 1) {
-        expect(array[i] >= array[i + 1]).toBeTruthy();
-      }
-    });
+        for (var i = 0; i < array.length - 1; i += 1) {
+          expect(array[i] >= array[i + 1]).toBeTruthy();
+        }
+      });
+    }
 
   });
 };
