Refactoring

ehmicky · Sep 5, 2021 · 5432ffc · 5432ffc
1 parent f9e4ddb
commit 5432ffc
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 18 deletions.
diff --git a/src/report/reporters/boxplot/box.js b/src/report/reporters/boxplot/box.js
@@ -59,9 +59,13 @@ const MEDIAN_CHARACTER = '\u2588'
 const MAX_CHARACTER = '\u2524'
 
 // Surround stats with padding
-export const getPaddedStat = function (string, mini) {
+const getPaddedStat = function (string, mini) {
   return mini ? '' : `${STAT_PADDING}${string}${STAT_PADDING}`
 }
 
+export const getPaddedStatLength = function (string) {
+  return string.length + STAT_PADDING_WIDTH * 2
+}
+
 const STAT_PADDING_WIDTH = 1
 const STAT_PADDING = ' '.repeat(STAT_PADDING_WIDTH)
diff --git a/src/report/reporters/boxplot/width.js b/src/report/reporters/boxplot/width.js
@@ -1,12 +1,14 @@
 import { getCombinationPaddedName } from '../../utils/name.js'
 
-import { getPaddedStat } from './box.js'
+import { getPaddedStatLength } from './box.js'
 
-// Retrieve the width of all blocks, in order:
-//  - Combination titles
-//  - Padding space reserved for the leftmost `min`
-//  - Content, i.e. box plot and their labels
-//  - Padding space reserved for the rightmost `max`
+// Compute the width of each column for reporters which show the following ones
+// for each combination:
+//  - Title
+//  - Min
+//  - Main content
+//  - Max
+// This is used for example by the `histogram` and `boxplot` reporters.
 export const getWidths = function (combinations, mini, screenWidth) {
   const titlesWidth = getCombinationPaddedName(combinations[0]).length
   const minBlockWidth = getMinMaxBlockWidth(combinations, mini, 'min')
@@ -19,15 +21,19 @@ export const getWidths = function (combinations, mini, screenWidth) {
 }
 
 const getMinMaxBlockWidth = function (combinations, mini, statName) {
+  if (mini) {
+    return 0
+  }
+
   return Math.max(
     ...combinations.map((combination) =>
-      getSingleMinMaxWidth(combination, mini, statName),
+      getSingleMinMaxWidth(combination, statName),
     ),
   )
 }
 
-const getSingleMinMaxWidth = function ({ quantiles }, mini, statName) {
+const getSingleMinMaxWidth = function ({ quantiles }, statName) {
   return quantiles === undefined
     ? 0
-    : getPaddedStat(quantiles[statName].pretty, mini).length
+    : getPaddedStatLength(quantiles[statName].pretty)
 }
diff --git a/src/report/reporters/histogram/width.js b/src/report/reporters/histogram/width.js
@@ -2,11 +2,13 @@ import { getCombinationPaddedName } from '../../utils/name.js'
 
 import { getPaddedStatLength } from './abscissa.js'
 
-// Retrieve the width of all blocks, in order:
-//  - Combination titles
-//  - Padding space reserved for the leftmost `min`
-//  - Content, i.e. box plot and their labels
-//  - Padding space reserved for the rightmost `max`
+// Compute the width of each columns for reporters which show the following ones
+// for each combination:
+//  - Title
+//  - Min
+//  - Main content
+//  - Max
+// This is used for example by the `histogram` and `boxplot` reporters.
 export const getWidths = function (combinations, mini, screenWidth) {
   const titlesWidth = getCombinationPaddedName(combinations[0]).length
   const minBlockWidth = getMinMaxBlockWidth(combinations, mini, 'min')
@@ -19,15 +21,19 @@ export const getWidths = function (combinations, mini, screenWidth) {
 }
 
 const getMinMaxBlockWidth = function (combinations, mini, statName) {
+  if (mini) {
+    return 0
+  }
+
   return Math.max(
     ...combinations.map((combination) =>
-      getSingleMinMaxWidth(combination, mini, statName),
+      getSingleMinMaxWidth(combination, statName),
     ),
   )
 }
 
-const getSingleMinMaxWidth = function ({ stats }, mini, statName) {
-  return mini || stats[statName] === undefined
+const getSingleMinMaxWidth = function ({ stats }, statName) {
+  return stats[statName] === undefined
     ? 0
     : getPaddedStatLength(stats[statName])
 }