-
Notifications
You must be signed in to change notification settings - Fork 9.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
core(lhr): make reportCategories shallow; move audit scores to AuditResultJSON #4711
Merged
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
539ec76
make reportCategories shallow. move score to AuditResultJSON
paulirish 47669a6
extract scoringMode changes.
paulirish e24e3c7
regen sample_v2 json
paulirish ef10f4f
object.values/entries, wassup.
paulirish cf4ae95
smoosh. what a time to be alive.
paulirish 010f2fd
temporary hack to retain boolean scores for the moment.
paulirish e4784a2
don't mutate the LHR within the renderer
paulirish fddb987
tempoary: cast boolean scores when creating arithmetic mean score.
paulirish 5e1337d
Merge branch 'master' into shallowCategories
paulirish c2e25b5
feedback.
paulirish b4ac5f0
placate ts
paulirish File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,39 +9,53 @@ | |
class ReportScoring { | ||
/** | ||
* Computes the weighted-average of the score of the list of items. | ||
* @param {!Array<{score: number|undefined, weight: number|undefined}>} items | ||
* @param {!Array<{score: ?number|boolean|undefined, weight: number|undefined}>} items | ||
* @return {number} | ||
*/ | ||
static arithmeticMean(items) { | ||
const results = items.reduce((result, item) => { | ||
const score = Number(item.score) || 0; | ||
const weight = Number(item.weight) || 0; | ||
return { | ||
weight: result.weight + weight, | ||
sum: result.sum + score * weight, | ||
}; | ||
}, {weight: 0, sum: 0}); | ||
const results = items.reduce( | ||
(result, item) => { | ||
// HACK. remove this in the next PR | ||
// Srsly. The score inconsitency has been very bad. | ||
let itemScore = item.score; | ||
if (typeof item.score === 'boolean') { | ||
itemScore = item.score ? 100 : 0; | ||
} | ||
|
||
const score = Number(itemScore) || 0; | ||
const weight = Number(item.weight) || 0; | ||
return { | ||
weight: result.weight + weight, | ||
sum: result.sum + score * weight, | ||
}; | ||
}, | ||
{weight: 0, sum: 0} | ||
); | ||
|
||
return (results.sum / results.weight) || 0; | ||
return results.sum / results.weight || 0; | ||
} | ||
|
||
/** | ||
* Returns the report JSON object with computed scores. | ||
* @param {{categories: !Object<string, {id: string|undefined, weight: number|undefined, audits: !Array<{id: string, weight: number|undefined}>}>}} config | ||
* @param {{categories: !Object<string, {id: string|undefined, weight: number|undefined, score: number|undefined, audits: !Array<{id: string, weight: number|undefined}>}>}} config | ||
* @param {!Object<string, {score: ?number|boolean|undefined, notApplicable: boolean, informative: boolean}>} resultsByAuditId | ||
* @return {{score: number, categories: !Array<{audits: !Array<{score: number, result: !Object}>}>}} | ||
*/ | ||
static scoreAllCategories(config, resultsByAuditId) { | ||
const categories = Object.keys(config.categories).map(categoryId => { | ||
const category = config.categories[categoryId]; | ||
for (const [categoryId, category] of Object.entries(config.categories)) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🎉 |
||
category.id = categoryId; | ||
|
||
const audits = category.audits.map(audit => { | ||
category.audits.forEach(audit => { | ||
const result = resultsByAuditId[audit.id]; | ||
// Cast to number to catch `null` and undefined when audits error | ||
/** @type {number|boolean} */ | ||
let auditScore = Number(result.score) || 0; | ||
if (typeof result.score === 'boolean') { | ||
auditScore = result.score ? 100 : 0; | ||
// HACK removed in the next PR | ||
// While we'd like to do this boolean transformation happened on the auditDfn: | ||
// auditScore = result.score ? 100 : 0; | ||
// …the original result.score is untouched which means the smokehouse expectations will fail | ||
// We're officially rebaselining all those expectations in the next PR... | ||
// So for now, we'll keep keep both auditDfn.score and result.score boolean | ||
auditScore = result.score; | ||
} | ||
// If a result was not applicable, meaning its checks did not run against anything on | ||
// the page, force it's weight to 0. It will not count during the arithmeticMean() but | ||
|
@@ -53,15 +67,17 @@ class ReportScoring { | |
result.informative = true; | ||
} | ||
|
||
return Object.assign({}, audit, {result, score: auditScore}); | ||
result.score = auditScore; | ||
}); | ||
|
||
const categoryScore = ReportScoring.arithmeticMean(audits); | ||
return Object.assign({}, category, {audits, score: categoryScore}); | ||
}); | ||
|
||
const overallScore = ReportScoring.arithmeticMean(categories); | ||
return {score: overallScore, categories}; | ||
const scores = category.audits.map(audit => ({ | ||
score: resultsByAuditId[audit.id].score, | ||
weight: audit.weight, | ||
})); | ||
const categoryScore = ReportScoring.arithmeticMean(scores); | ||
// mutate config.categories[].score | ||
category.score = categoryScore; | ||
} | ||
} | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
before this defaulted to an empty array. Will it cause problems anywhere as
undefined
(and removed from the JSON) instead?