Merge pull request mgechev#82 from infusion/master

JakeHP · JakeHP · commit b98ea128ff27 · 2015-08-14T19:14:46.000-05:00
Improved prime check and Fisher Yates
diff --git a/src/primes/is-prime.js b/src/primes/is-prime.js
@@ -16,45 +16,33 @@
    * console.log(isPrime(18)); // false
    */
   exports.isPrime = function (number) {
-    if (number === 1) {
+
+    if (number < 2) {
       return false;
+    }
 
-    } else if (number < 4) {
-      /**
-       * 2 and 3 are prime
-       */
-      return true;
+    if (number % 2 === 0) {
+      return (number === 2);
+    }
 
-    } else if (number % 2 === 0) {
-      return false;
+    if (number % 3 === 0) {
+      return (number === 3);
+    }
 
-    } else if (number < 9) {
-      /**
-       * We have already excluded 4,6 and 8
-       */
-      return true;
+    var horizon = Math.floor(Math.sqrt(number));
+    var factor = 5;
 
-    } else if (number % 3 === 0) {
-      return false;
+    while (factor <= horizon) {
 
-    } else {
-      /**
-       * 'number' rounded to the greatest integer 'rounded' so that:
-       * rounded * rounded <= number
-       */
-      var rounded = Math.floor(Math.sqrt(number));
-      var factor = 5;
-      while (factor <= rounded) {
-        if (number % factor === 0) {
-          return false;
-        }
-        if (number % (factor + 2) === 0) {
-          return false;
-        }
-        factor += 6;
+      if (number % factor === 0) {
+        return false;
       }
-    }
 
+      if (number % (factor + 2) === 0) {
+        return false;
+      }
+      factor += 6;
+    }
     return true;
   };
 
diff --git a/src/shuffle/fisheryates.js b/src/shuffle/fisheryates.js
@@ -21,8 +21,8 @@
     var size = array.length;
     var rand;
     var temp;
-    for (var i = 1; i < size; i += 1) {
-      rand = Math.round(Math.random() * i);
+    for (var i = 0; i < size; i += 1) {
+      rand = Math.floor(i + Math.random() * (size - i));
       temp = array[rand];
       array[rand] = array[i];
       array[i] = temp;
