Cleanup object generation code

[benchmarks-js.git] / benchmark-utils.js

diff --git a/benchmark-utils.js b/benchmark-utils.js
index 961043b03ca0d233295607608356d33ebb61ea65..9c82d8438c1df329ceed3a4317ba2db9a3f0370f 100644 (file)
--- a/benchmark-utils.js
+++ b/benchmark-utils.js
@@ -15,25 +15,39 @@ function secureRandom () {
  * @returns
  */
 function generateRandomInteger (max = Number.MAX_SAFE_INTEGER, min = 0) {
-  if (max < 0) {
+  if (max < min || max < 0 || min < 0) {
     throw new RangeError('Invalid interval')
   }
   max = Math.floor(max)
   if (min != null && min !== 0) {
-    if (max < min || min < 0) {
-      throw new RangeError('Invalid interval')
-    }
     min = Math.ceil(min)
     return Math.floor(secureRandom() * (max - min + 1)) + min
   }
   return Math.floor(secureRandom() * (max + 1))
 }
 
+/**
+ *
+ * @param max
+ * @param min
+ * @param negative
+ * @returns
+ */
+function generateRandomFloat (max = Number.MAX_VALUE, min = 0, negative = true) {
+  if (max < min || max < 0 || min < 0) {
+    throw new RangeError('Invalid interval')
+  }
+  const randomPositiveFloat = crypto.randomBytes(4).readUInt32LE() / 0xffffffff
+  const sign = negative && randomPositiveFloat < 0.5 ? -1 : 1
+  return sign * (randomPositiveFloat * (max - min) + min)
+}
+
 /**
  *
  * @param size
  * @param max
  * @param numberGenerator
+ * @returns
  */
 function generateRandomNumberArray (
   size,
@@ -49,17 +63,22 @@ function generateRandomNumberArray (
 
 /**
  *
- * @param max
- * @param min
- * @param negative
+ * @param sizeMax
+ * @param numberMax
+ * @param numberGenerator
+ * @returns
  */
-function generateRandomFloat (max = Number.MAX_VALUE, min = 0, negative = true) {
-  if (max < min || min < 0 || max < 0) {
-    throw new RangeError('Invalid interval')
+function generateRandomObject (
+  sizeMax = 500,
+  numberMax = Number.MAX_VALUE,
+  numberGenerator = generateRandomFloat
+) {
+  const size = generateRandomInteger(sizeMax)
+  const object = {}
+  for (let i = 0; i < size; i++) {
+    object[i.toString()] = numberGenerator(numberMax)
   }
-  const randomPositiveFloat = crypto.randomBytes(4).readUInt32LE() / 0xffffffff
-  const sign = negative && randomPositiveFloat < 0.5 ? -1 : 1
-  return sign * (randomPositiveFloat * (max - min) + min)
+  return { object, size }
 }
 
 /**
@@ -70,16 +89,11 @@ async function sleep (ms) {
   return new Promise(resolve => setTimeout(resolve, ms))
 }
 
-const LIST_FORMATTER = new Intl.ListFormat('en-US', {
-  style: 'long',
-  type: 'conjunction'
-})
-
 module.exports = {
   generateRandomInteger,
   generateRandomFloat,
   generateRandomNumberArray,
+  generateRandomObject,
   sleep,
-  secureRandom,
-  LIST_FORMATTER
+  secureRandom
 }