Skip to content

Commit

Permalink
Make titles part of normalization
Browse files Browse the repository at this point in the history
  • Loading branch information
ehmicky committed Aug 29, 2021
1 parent 6b92dd1 commit 52e4a59
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 17 deletions.
6 changes: 4 additions & 2 deletions src/report/normalize/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { addCombinationsDiff } from '../../history/compare/diff.js'
import { omitSystemProps } from '../../system/omit.js'
import { normalizeTimestamp } from '../../system/timestamp.js'

import { addFakeTitles } from './fake_titles.js'
import { omitCombinationsProps } from './omit.js'
import { addCombinationsTitles, addDimensionsTitles } from './titles.js'

Expand Down Expand Up @@ -64,10 +65,11 @@ export const normalizeCombEach = function (
) {
const resultA = addDimensionsTitles(result, titles, showTitles)
const resultB = addCombinationsTitles(resultA, titles, showTitles)
const resultC = omitCombinationsProps(resultB, {
const resultC = addFakeTitles({ result: resultB })
const resultD = omitCombinationsProps(resultC, {
showPrecision,
showDiff,
debugStats,
})
return resultC
return resultD
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@
// - `combination.task|runner|systemTitlePadded`: like
// `combination.*Title` but padded so all combinations vertically align
// - `combination.titles`: combines all *TitlePadded
export const addTitles = function (combinations) {
export const addFakeTitles = function ({ result, result: { combinations } }) {
const propNames = getUniquePropNames(combinations)
const paddings = getPaddings(combinations, propNames)
return combinations.map((combination) => addPadding(combination, paddings))
const combinationsA = combinations.map((combination) =>
addPadding(combination, paddings),
)
return { ...result, combinations: combinationsA }
}

const getUniquePropNames = function (combinations) {
Expand Down
9 changes: 3 additions & 6 deletions src/report/reporters/debug/main.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
import { serializeHistograms } from '../../utils/histogram/main.js'
import { addTitles } from '../../utils/title.js'

import { getStatsTables } from './stats.js'
import { getTimeSeries } from './time_series.js'

// Debugging reporter only meant for development purpose
const reportTerminal = function ({ combinations, screenWidth, history }) {
const combinationsA = addTitles(combinations)

const statsTables = getStatsTables(combinationsA, screenWidth)
const timeSeries = getTimeSeries(history, combinationsA, screenWidth)
const histograms = serializeHistograms(combinationsA, {
const statsTables = getStatsTables(combinations, screenWidth)
const timeSeries = getTimeSeries(history, combinations, screenWidth)
const histograms = serializeHistograms(combinations, {
showStats: false,
screenWidth,
})
Expand Down
8 changes: 1 addition & 7 deletions src/report/reporters/histogram.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
import { serializeHistograms } from '../utils/histogram/main.js'
import { addTitles } from '../utils/title.js'

// Reporter showing distribution of measures with a histogram
const reportTerminal = function ({ combinations, screenWidth }) {
const combinationsA = addTitles(combinations)
const histograms = serializeHistograms(combinationsA, {
showStats: true,
screenWidth,
})
return histograms
return serializeHistograms(combinations, { showStats: true, screenWidth })
}

export const histogram = { reportTerminal }

0 comments on commit 52e4a59

Please sign in to comment.