changing to rest parameters

Author: crizstian

12-chapter-Sorting-Algorithms/basic-sort.js

@@ -50,9 +50,9 @@
   }
 
   const selectionObject = {
-    sort (args) {
-      swap = [].slice.call(arguments, 1)[0]
-      alist = args
+    sort (...args) {
+      alist = args[0]
+      swap = args[1]
       selectionSort(0, alist.length - 1)
       return alist
     }

12-chapter-Sorting-Algorithms/quick-sort.module.js

@@ -31,9 +31,9 @@
   }
 
   const quickObject = {
-    sort (args) {
-      swap = [].slice.call(arguments, 1)[0]
-      alist = args
+    sort (...args) {
+      alist = args[0]
+      swap = args[1]
       quickSortHelper(0, alist.length - 1)
       return alist
     }

13-chapter-Searching-Algorithms/search-module.js

@@ -1,5 +1,5 @@
 (function (exports) {
-  function sequentialSearch (dataStore, data) {
+  const sequentialSearch = (dataStore, data) => {
     for (var i = 0; i < dataStore.length; i++) {
       if (dataStore[i] === data) {
         return i
@@ -8,7 +8,7 @@
     return -1
   }
 
-  function binarySearch (dataStore, data) {
+  const binarySearch = (dataStore, data) => {
     let upperBound = dataStore.length - 1
     let lowerBound = 0
     while (lowerBound <= upperBound) {
@@ -24,7 +24,7 @@
     return -1
   }
 
-  function countOccurrences (dataStore, data) {
+  const countOccurrences = (dataStore, data) => {
     let count = 0
     let position = binarySearch(dataStore, data)
     if (position > -1) {
@@ -47,7 +47,7 @@
     return count
   }
 
-  function minValue (dataStore) {
+  const minValue = (dataStore) => {
     let min = dataStore[0]
     for (var i = 1; i < dataStore.length; i++) {
       if (dataStore[i] < min) {
@@ -57,7 +57,7 @@
     return min
   }
 
-  function maxValue (dataStore) {
+  const maxValue = (dataStore) => {
     let max = dataStore[0]
     for (var i = 1; i < dataStore.length; i++) {
       if (dataStore[i] > max) {
@@ -67,5 +67,5 @@
     return max
   }
 
-  Object.assign(exports, {sequentialSearch}, {binarySearch}, {minValue}, {maxValue}, {countOccurrences})
+  Object.assign(exports, {sequentialSearch, binarySearch, minValue, maxValue, countOccurrences})
 }((typeof module.exports !== undefined) ? module.exports : window))

13-chapter-Searching-Algorithms/test.js

@@ -4,11 +4,7 @@ const fs = require('fs')
 
 const nsTime = (hrtime) => hrtime[0] * 1e9 + hrtime[1]
 
-let data = fs.readFileSync('./13-chapter-Searching-Algorithms/paragraph.txt', 'utf8')
-  .trim()
-  .split(' ')
-
-function setData (numElements = 100) {
+const setData = (numElements = 100) => {
   let dataStore = []
   for (let i = 0; i < numElements; i++) {
     dataStore[i] = Math.floor(Math.random() * (numElements + 1))
@@ -30,17 +26,23 @@ test ('Binary and Sequential search on array of numbers', assert => {
 })
 
 test ('Binary and Sequential search on text file', assert => {
+  let data = fs.readFileSync('./13-chapter-Searching-Algorithms/paragraph.txt', 'utf8')
+    .trim()
+    .split(' ')
+
   const word = 'rhetoric'
   let start = process.hrtime()
   let position = search.sequentialSearch(data, word)
   let end = process.hrtime(start)
+
   assert.ok(position, `${word} is present in the set and is in the position ${position}`)
   assert.ok(position, `Sequential search took ${nsTime(end) / 1e9} milliseconds.`)
 
   data = sort(data).insertionSort()
   start = process.hrtime()
   position = search.binarySearch(data, word)
   end = process.hrtime(start)
+
   assert.ok((position >= 0), `${word} is present in the set and is in the position ${position}`)
   assert.ok(position, `Binary search took ${nsTime(end) / 1e9} milliseconds.`)
 })