♻️ refactor: improving and fixing some code

CarlosZoft · CarlosZoft · commit afd0b45c1e61 · 2023-07-20T18:28:54.000-03:00
diff --git a/Bit-Manipulation/IsPowerOfTwo.js b/Bit-Manipulation/IsPowerOfTwo.js
@@ -23,8 +23,5 @@
 */
 
 export const IsPowerOfTwo = (n) => {
-  if (n > 0 && (n & (n - 1)) === 0) {
-    return true
-  }
-  return false
+  return n > 0 && (n & (n - 1)) === 0
 }
diff --git a/Cellular-Automata/ConwaysGameOfLife.js b/Cellular-Automata/ConwaysGameOfLife.js
@@ -29,11 +29,12 @@ export function newGeneration (cells) {
 
       // Decide whether the cell is alive or dead
       const alive = cells[i][j] === 1
-      if ((alive && neighbourCount >= 2 && neighbourCount <= 3) || (!alive && neighbourCount === 3)) {
-        nextGenerationRow.push(1)
-      } else {
-        nextGenerationRow.push(0)
-      }
+
+      const cellIsAlive =
+        (alive && neighbourCount >= 2 && neighbourCount <= 3) ||
+        (!alive && neighbourCount === 3)
+
+      nextGenerationRow.push(cellIsAlive ? 1 : 0)
     }
     nextGeneration.push(nextGenerationRow)
   }
diff --git a/Conversions/DateDayDifference.js b/Conversions/DateDayDifference.js
@@ -19,7 +19,7 @@ const DateToDay = (dd, mm, yyyy) => {
 
 const DateDayDifference = (date1, date2) => {
   // firstly, check that both input are string or not.
-  if (typeof date1 !== 'string' && typeof date2 !== 'string') {
+  if (typeof date1 !== 'string' || typeof date2 !== 'string') {
     return new TypeError('Argument is not a string.')
   }
   // extract the first date
diff --git a/Data-Structures/Graph/test/Graph2.test.js b/Data-Structures/Graph/test/Graph2.test.js
@@ -5,9 +5,7 @@ describe('Test Graph2', () => {
   const graph = new Graph(vertices.length)
 
   // adding vertices
-  for (let i = 0; i < vertices.length; i++) {
-    graph.addVertex(vertices[i])
-  }
+  vertices.forEach((vertice) => graph.addVertex(vertice))
 
   // adding edges
   graph.addEdge('A', 'B')
@@ -27,7 +25,7 @@ describe('Test Graph2', () => {
     expect(mockFn.mock.calls.length).toBe(vertices.length)
 
     // Collect adjacency lists from output (call args)
-    const adjListArr = mockFn.mock.calls.map(v => v[0])
+    const adjListArr = mockFn.mock.calls.map((v) => v[0])
 
     expect(adjListArr).toEqual([
       'A -> B D E ',
diff --git a/Data-Structures/Heap/MinPriorityQueue.js b/Data-Structures/Heap/MinPriorityQueue.js
@@ -47,8 +47,7 @@ class MinPriorityQueue {
 
   // returns boolean value whether the heap is full or not
   isFull () {
-    if (this.size === this.capacity) return true
-    return false
+    return this.size === this.capacity
   }
 
   // prints the heap
diff --git a/Data-Structures/Tree/Trie.js b/Data-Structures/Tree/Trie.js
@@ -106,8 +106,8 @@ Trie.prototype.contains = function (word) {
   // find the node with given prefix
   const node = this.findPrefix(word)
   // No such word exists
-  if (node === null || node.count === 0) return false
-  return true
+
+  return node !== null && node.count !== 0
 }
 
 Trie.prototype.findOccurrences = function (word) {
diff --git a/Dynamic-Programming/FindMonthCalendar.js b/Dynamic-Programming/FindMonthCalendar.js
@@ -52,8 +52,7 @@ class Month {
   }
 
   isLeapYear (year) {
-    if (((year % 400) === 0) || (((year % 100) !== 0) && ((year % 4) === 0))) return true
-    return false
+    return ((year % 400) === 0) || (((year % 100) !== 0) && ((year % 4) === 0))
   }
 
   isGreater (startDate, endDate) {
diff --git a/Graphs/DijkstraSmallestPath.js b/Graphs/DijkstraSmallestPath.js
@@ -41,70 +41,3 @@ function solve (graph, s) {
 }
 
 export { solve }
-
-// // create graph
-// const graph = {}
-
-// const layout = {
-//   R: ['2'],
-//   2: ['3', '4'],
-//   3: ['4', '6', '13'],
-//   4: ['5', '8'],
-//   5: ['7', '11'],
-//   6: ['13', '15'],
-//   7: ['10'],
-//   8: ['11', '13'],
-//   9: ['14'],
-//   10: [],
-//   11: ['12'],
-//   12: [],
-//   13: ['14'],
-//   14: [],
-//   15: []
-// }
-
-// // convert uni-directional to bi-directional graph
-// let  graph = {
-//     a: {e:1, b:1, g:3},
-//     b: {a:1, c:1},
-//     c: {b:1, d:1},
-//     d: {c:1, e:1},
-//     e: {d:1, a:1},
-//     f: {g:1, h:1},
-//     g: {a:3, f:1},
-//     h: {f:1}
-// };
-
-// for (const id in layout) {
-//   if (!graph[id]) { graph[id] = {} }
-//   layout[id].forEach(function (aid) {
-//     graph[id][aid] = 1
-//     if (!graph[aid]) { graph[aid] = {} }
-//     graph[aid][id] = 1
-//   })
-// }
-
-// // choose start node
-// const start = '10'
-// // get all solutions
-// const solutions = solve(graph, start)
-
-// // for s in solutions..
-// ' -> ' + s + ': [' + solutions[s].join(', ') + ']   (dist:' + solutions[s].dist + ')'
-
-// From '10' to
-//  -> 2: [7, 5, 4, 2]   (dist:4)
-//  -> 3: [7, 5, 4, 3]   (dist:4)
-//  -> 4: [7, 5, 4]   (dist:3)
-//  -> 5: [7, 5]   (dist:2)
-//  -> 6: [7, 5, 4, 3, 6]   (dist:5)
-//  -> 7: [7]   (dist:1)
-//  -> 8: [7, 5, 4, 8]   (dist:4)
-//  -> 9: [7, 5, 4, 3, 13, 14, 9]   (dist:7)
-//  -> 10: []   (dist:0)
-//  -> 11: [7, 5, 11]   (dist:3)
-//  -> 12: [7, 5, 11, 12]   (dist:4)
-//  -> 13: [7, 5, 4, 3, 13]   (dist:5)
-//  -> 14: [7, 5, 4, 3, 13, 14]   (dist:6)
-//  -> 15: [7, 5, 4, 3, 6, 15]   (dist:6)
-//  -> R: [7, 5, 4, 2, R]   (dist:5)
diff --git a/Maths/MatrixMultiplication.js b/Maths/MatrixMultiplication.js
@@ -20,12 +20,9 @@ const matrixCheck = (matrix) => {
 // tests to see if the matrices have a like side, i.e. the row length on the first matrix matches the column length on the second matrix, or vice versa.
 const twoMatricesCheck = (first, second) => {
   const [firstRowLength, secondRowLength, firstColLength, secondColLength] = [first.length, second.length, matrixCheck(first), matrixCheck(second)]
-  if (firstRowLength !== secondColLength || secondRowLength !== firstColLength) {
-    // These matrices do not have a common side
-    return false
-  } else {
-    return true
-  }
+
+  // These matrices do not have a common side
+  return firstRowLength === secondColLength && secondRowLength === firstColLength
 }
 
 // returns an empty array that has the same number of rows as the left matrix being multiplied.
diff --git a/Maths/MidpointIntegration.js b/Maths/MidpointIntegration.js
@@ -42,7 +42,9 @@ function integralEvaluation (N, a, b, func) {
   // Calculate the integral
   let result = h
   temp = 0
-  for (let i = 0; i < pointsArray.length; i++) temp += pointsArray[i]
+  pointsArray.forEach(point => {
+    temp += point
+  })
 
   result *= temp
 
diff --git a/Maths/SimpsonIntegration.js b/Maths/SimpsonIntegration.js
@@ -55,7 +55,9 @@ function integralEvaluation (N, a, b, func) {
   // Calculate the integral
   let result = h / 3
   temp = 0
-  for (let i = 0; i < pointsArray.length; i++) temp += pointsArray[i]
+  pointsArray.forEach(point => {
+    temp += point
+  })
 
   result *= temp
 
diff --git a/Sorts/SimplifiedWiggleSort.js b/Sorts/SimplifiedWiggleSort.js
@@ -8,29 +8,30 @@
 import { quickSelectSearch } from '../Search/QuickSelectSearch.js'
 
 export const simplifiedWiggleSort = function (arr) {
+  const arrSize = arr.length
   // find Median using QuickSelect
-  let median = quickSelectSearch(arr, Math.floor(arr.length / 2.0))
-  median = median[Math.floor(arr.length / 2.0)]
+  let median = quickSelectSearch(arr, Math.floor(arrSize / 2.0))
+  median = median[Math.floor(arrSize / 2.0)]
 
-  const sorted = new Array(arr.length)
+  const sorted = new Array(arrSize)
 
   let smallerThanMedianIndx = 0
-  let greaterThanMedianIndx = arr.length - 1 - (arr.length % 2)
+  let greaterThanMedianIndx = arrSize - 1 - (arrSize % 2)
 
-  for (let i = 0; i < arr.length; i++) {
-    if (arr[i] > median) {
-      sorted[greaterThanMedianIndx] = arr[i]
+  arr.forEach(element => {
+    if (element > median) {
+      sorted[greaterThanMedianIndx] = element
       greaterThanMedianIndx -= 2
     } else {
-      if (smallerThanMedianIndx < arr.length) {
-        sorted[smallerThanMedianIndx] = arr[i]
+      if (smallerThanMedianIndx < arrSize) {
+        sorted[smallerThanMedianIndx] = element
         smallerThanMedianIndx += 2
       } else {
-        sorted[greaterThanMedianIndx] = arr[i]
+        sorted[greaterThanMedianIndx] = element
         greaterThanMedianIndx -= 2
       }
     }
-  }
+  })
 
   return sorted
 }
diff --git a/String/CheckRearrangePalindrome.js b/String/CheckRearrangePalindrome.js
@@ -12,7 +12,7 @@ export const palindromeRearranging = (str) => {
     return 'Not a string'
   }
   // Check if is a empty string
-  if (str.length === 0) {
+  if (!str) {
     return 'Empty string'
   }
 

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,5 @@`
`23`	`23`	`*/`
`24`	`24`
`25`	`25`	`export const IsPowerOfTwo = (n) => {`
`26`		`- if (n > 0 && (n & (n - 1)) === 0) {`
`27`		`- return true`
`28`		`- }`
`29`		`- return false`
	`26`	`+ return n > 0 && (n & (n - 1)) === 0`
`30`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ const DateToDay = (dd, mm, yyyy) => {`
`19`	`19`
`20`	`20`	`const DateDayDifference = (date1, date2) => {`
`21`	`21`	`// firstly, check that both input are string or not.`
`22`		`- if (typeof date1 !== 'string' && typeof date2 !== 'string') {`
	`22`	`+ if (typeof date1 !== 'string' \|\| typeof date2 !== 'string') {`
`23`	`23`	`return new TypeError('Argument is not a string.')`
`24`	`24`	`}`
`25`	`25`	`// extract the first date`
Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,7 @@ class MinPriorityQueue {`
`47`	`47`
`48`	`48`	`// returns boolean value whether the heap is full or not`
`49`	`49`	`isFull () {`
`50`		`- if (this.size === this.capacity) return true`
`51`		`- return false`
	`50`	`+ return this.size === this.capacity`
`52`	`51`	`}`
`53`	`52`
`54`	`53`	`// prints the heap`
Original file line number	Diff line number	Diff line change
`@@ -52,8 +52,7 @@ class Month {`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`isLeapYear (year) {`
`55`		`- if (((year % 400) === 0) \|\| (((year % 100) !== 0) && ((year % 4) === 0))) return true`
`56`		`- return false`
	`55`	`+ return ((year % 400) === 0) \|\| (((year % 100) !== 0) && ((year % 4) === 0))`
`57`	`56`	`}`
`58`	`57`
`59`	`58`	`isGreater (startDate, endDate) {`