Rename ResultsDashboard to ScoreCalculator

`BenchmarkRunnerClient.results` becomes `BenchmarkRunnerClient.scoreCalculator`.

Add a public getter for `targetFrameRate`.

Author: smfr

MotionMark/resources/debug-runner/debug-runner.js

@@ -152,10 +152,10 @@ class DebugSectionsManager extends SectionsManager {
         document.querySelector("#" + sectionIdentifier + " h1").textContent = title;
     }
 
-    populateTable(tableIdentifier, headers, dashboard)
+    populateTable(tableIdentifier, headers, scoreCalculator)
     {
         var table = new DeveloperResultsTable(document.getElementById(tableIdentifier), headers);
-        table.showIterations(dashboard);
+        table.showIterations(scoreCalculator);
     }
 }
 
@@ -599,7 +599,7 @@ class DebugBenchmarkController extends BenchmarkController {
 
                 this.migrateImportedData(run);
                 this.ensureRunnerClient([ ], { });
-                this.runnerClient.results = new ResultsDashboard(run.version, run.options, run.data);
+                this.runnerClient.scoreCalculator = new ScoreCalculator(run.version, run.options, run.data);
                 this.showResults();
             };
 
@@ -704,38 +704,38 @@ class DebugBenchmarkController extends BenchmarkController {
             this.addedKeyEvent = true;
         }
 
-        var dashboard = this.runnerClient.results;
-        if (dashboard.options["controller"] == "ramp")
+        var scoreCalculator = this.runnerClient.scoreCalculator;
+        if (scoreCalculator.options["controller"] == "ramp")
             Headers.details[3].disabled = true;
         else {
             Headers.details[1].disabled = true;
             Headers.details[4].disabled = true;
         }
 
-        if (dashboard.options[Strings.json.configuration]) {
+        if (scoreCalculator.options[Strings.json.configuration]) {
             document.body.classList.remove("small", "medium", "large");
-            document.body.classList.add(dashboard.options[Strings.json.configuration]);
+            document.body.classList.add(scoreCalculator.options[Strings.json.configuration]);
         }
 
-        var score = dashboard.score;
-        var confidence = ((dashboard.scoreLowerBound / score - 1) * 100).toFixed(2) +
-            "% / +" + ((dashboard.scoreUpperBound / score - 1) * 100).toFixed(2) + "%";
-        var fps = dashboard._systemFrameRate;
-        sectionsManager.setSectionVersion("results", dashboard.version);
+        var score = scoreCalculator.score;
+        var confidence = ((scoreCalculator.scoreLowerBound / score - 1) * 100).toFixed(2) +
+            "% / +" + ((scoreCalculator.scoreUpperBound / score - 1) * 100).toFixed(2) + "%";
+        var fps = scoreCalculator._systemFrameRate;
+        sectionsManager.setSectionVersion("results", scoreCalculator.version);
         sectionsManager.setSectionScore("results", score.toFixed(2), confidence, fps);
-        sectionsManager.populateTable("results-header", Headers.testName, dashboard);
-        sectionsManager.populateTable("results-score", Headers.score, dashboard);
-        sectionsManager.populateTable("results-data", Headers.details, dashboard);
+        sectionsManager.populateTable("results-header", Headers.testName, scoreCalculator);
+        sectionsManager.populateTable("results-score", Headers.score, scoreCalculator);
+        sectionsManager.populateTable("results-data", Headers.details, scoreCalculator);
         sectionsManager.showSection("results", true);
 
-        suitesManager.updateLocalStorageFromJSON(dashboard.results[0]);
+        suitesManager.updateLocalStorageFromJSON(scoreCalculator.results[0]);
     }
 
     showTestGraph(testName, testResult, testData)
     {
         sectionsManager.setSectionHeader("test-graph", testName);
         sectionsManager.showSection("test-graph", true);
-        this.graphController.updateGraphData(testResult, testData, this.runnerClient.results.options);
+        this.graphController.updateGraphData(testResult, testData, this.runnerClient.scoreCalculator.options);
     }
 }
 

MotionMark/resources/runner/motionmark.js

@@ -33,19 +33,29 @@ class BenchmarkRunnerClient {
         this.options = options;
     }
 
+    get scoreCalculator()
+    {
+        return this._scoreCalculator;
+    }
+
+    set scoreCalculator(calculator)
+    {
+        this._scoreCalculator = calculator;
+    }
+
     willStartFirstIteration()
     {
-        this.results = new ResultsDashboard(Strings.version, this.options);
+        this.scoreCalculator = new ScoreCalculator(Strings.version, this.options);
     }
 
     didRunSuites(suitesSamplers)
     {
-        this.results.push(suitesSamplers);
+        this._scoreCalculator.push(suitesSamplers);
     }
 
     didRunTest(testData)
     {
-        this.results.calculateScore(testData);
+        this._scoreCalculator.calculateScore(testData);
     }
 
     didFinishLastIteration()
@@ -89,10 +99,10 @@ class SectionsManager {
             document.querySelector("#" + sectionIdentifier + " .confidence").textContent = confidence;
     }
 
-    populateTable(tableIdentifier, headers, dashboard)
+    populateTable(tableIdentifier, headers, scoreCalculator)
     {
         var table = new ResultsTable(document.getElementById(tableIdentifier), headers);
-        table.showIterations(dashboard);
+        table.showIterations(scoreCalculator);
     }
 }
 
@@ -299,15 +309,15 @@ class BenchmarkController {
             this.addedKeyEvent = true;
         }
 
-        const dashboard = this.runnerClient.results;
-        const score = dashboard.score;
-        const confidence = "±" + (Statistics.largestDeviationPercentage(dashboard.scoreLowerBound, score, dashboard.scoreUpperBound) * 100).toFixed(2) + "%";
-        const fps = dashboard._targetFrameRate;
-        sectionsManager.setSectionVersion("results", dashboard.version);
+        const scoreCalculator = this.runnerClient.scoreCalculator;
+        const score = scoreCalculator.score;
+        const confidence = "±" + (Statistics.largestDeviationPercentage(scoreCalculator.scoreLowerBound, score, scoreCalculator.scoreUpperBound) * 100).toFixed(2) + "%";
+        const fps = scoreCalculator.targetFrameRate;
+        sectionsManager.setSectionVersion("results", scoreCalculator.version);
         sectionsManager.setSectionScore("results", score.toFixed(2), confidence, fps);
-        sectionsManager.populateTable("results-header", Headers.testName, dashboard);
-        sectionsManager.populateTable("results-score", Headers.score, dashboard);
-        sectionsManager.populateTable("results-data", Headers.details, dashboard);
+        sectionsManager.populateTable("results-header", Headers.testName, scoreCalculator);
+        sectionsManager.populateTable("results-score", Headers.score, scoreCalculator);
+        sectionsManager.populateTable("results-data", Headers.details, scoreCalculator);
         sectionsManager.showSection("results", true);
     }
 
@@ -352,9 +362,9 @@ class BenchmarkController {
         data.textContent = "Please wait...";
         setTimeout(() => {
             var output = {
-                version: this.runnerClient.results.version,
-                options: this.runnerClient.results.options,
-                data: this.runnerClient.results.data
+                version: this.runnerClient.scoreCalculator.version,
+                options: this.runnerClient.scoreCalculator.options,
+                data: this.runnerClient.scoreCalculator.data
             };
             data.textContent = JSON.stringify(output, (key, value) => {
                 if (typeof value === 'number')

MotionMark/resources/runner/results.js

@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-class ResultsDashboard {
+class ScoreCalculator {
     constructor(version, options, testData)
     {
         this._iterationsSamplers = [];
@@ -42,6 +42,11 @@ class ResultsDashboard {
             this._processData();
         }
     }
+    
+    get targetFrameRate()
+    {
+        return this._targetFrameRate;
+    }
 
     push(suitesSamplers)
     {
@@ -394,15 +399,15 @@ class ResultsTable {
         }
     }
 
-    showIterations(dashboard)
+    showIterations(scoreCalculator)
     {
         this.clear();
         this._addHeader();
         this._addBody();
 
-        var iterationsResults = dashboard.results;
+        var iterationsResults = scoreCalculator.results;
         iterationsResults.forEach(function(iterationResult, index) {
-            this._addIteration(iterationResult, dashboard.data[index], dashboard.options);
+            this._addIteration(iterationResult, scoreCalculator.data[index], scoreCalculator.options);
         }, this);
     }
 }

MotionMark/unit-tests/tests/test-data-import.js

@@ -46,8 +46,8 @@ describe('Data Import', function() {
         // Make the results analysis faster.
         this.json.options[Strings.json.bootstrapIterations] = 10;
 
-        const dashboard = new ResultsDashboard(this.json.version, this.json.options, this.json.data);
-        this.results = dashboard.results;
+        const calculator = new ScoreCalculator(this.json.version, this.json.options, this.json.data);
+        this.results = calculator.results;
         expect(this.results instanceof Array).to.be(true);
     });