Make the `window` scoring function the default. In developer.html, add a “MotionMark 2.0 dev’ grouping at the top, selected by default.
diff --git a/MotionMark/developer.html b/MotionMark/developer.html index 4036596..7bcf00e 100644 --- a/MotionMark/developer.html +++ b/MotionMark/developer.html
@@ -113,7 +113,7 @@ <select name="score-profile" id="score-profile"> <option value="slope">Slope</option> <option value="flat">Flat</option> - <option value="window">Windowed</option> + <option value="window" selected>Windowed</option> <option value="window-strict">Windowed Strict</option> </select> </label>
diff --git a/MotionMark/resources/debug-runner/debug-runner.js b/MotionMark/resources/debug-runner/debug-runner.js index 049f92a..90bf264 100644 --- a/MotionMark/resources/debug-runner/debug-runner.js +++ b/MotionMark/resources/debug-runner/debug-runner.js
@@ -396,8 +396,11 @@ var suiteCheckbox = this._checkboxElement(suiteElement); suite.tests.forEach(function(test) { - this._createTestElement(listElement, test, suiteCheckbox); + var testElement = this._createTestElement(listElement, test, suiteCheckbox); + this._checkboxElement(testElement).checked = suite.enabledByDefault; }, this); + + this._updateSuiteCheckboxState(suiteCheckbox); }, this); }
diff --git a/MotionMark/resources/debug-runner/tests.js b/MotionMark/resources/debug-runner/tests.js index 7097441..d79b007 100644 --- a/MotionMark/resources/debug-runner/tests.js +++ b/MotionMark/resources/debug-runner/tests.js
@@ -161,6 +161,43 @@ /////////// // Suites +Suites.splice(Suites.findIndex((suite) => suite.name == "MotionMark"), 1, new Suite("MotionMark 1.3", + [ + { + url: "core/multiply.html", + name: "Multiply" + }, + { + url: "core/canvas-stage.html?pathType=arcs", + name: "Canvas Arcs" + }, + { + url: "core/leaves.html", + name: "Leaves" + }, + { + url: "core/canvas-stage.html?pathType=linePath", + name: "Paths" + }, + { + url: "core/canvas-stage.html?pathType=line&lineCap=square", + name: "Canvas Lines" + }, + { + url: "core/image-data.html", + name: "Images" + }, + { + url: "core/design.html", + name: "Design" + }, + { + url: "core/suits.html", + name: "Suits" + }, + ] +)); + Suites.push(new Suite("HTML suite", [ { @@ -458,7 +495,7 @@ ] )); -Suites.push(new Suite("Tentative 1.4 suite", +Suites.unshift(new Suite("MotionMark 2.0 dev", [ { url: "dev/stories/stories.html", @@ -492,5 +529,6 @@ url: "dev/filtering/filtering.html", name: "Filtering" } - ] + ], + { enabledByDefault: true } ));
diff --git a/MotionMark/resources/runner/motionmark.js b/MotionMark/resources/runner/motionmark.js index 8b3a030..93bd57f 100644 --- a/MotionMark/resources/runner/motionmark.js +++ b/MotionMark/resources/runner/motionmark.js
@@ -113,6 +113,7 @@ "display": "minimal", "tiles": "big", "controller": "ramp", + "score-profile": "window", "kalman-process-error": 1, "kalman-measurement-error": 4, "time-measurement": "performance",
diff --git a/MotionMark/resources/runner/results.js b/MotionMark/resources/runner/results.js index 2b47eea..4156275 100644 --- a/MotionMark/resources/runner/results.js +++ b/MotionMark/resources/runner/results.js
@@ -114,7 +114,7 @@ } get scoreProfile() { - return this._preferredProfile || "slope"; + return this._preferredProfile || Strings.json.profiles.window; } _processData()
diff --git a/MotionMark/resources/runner/tests.js b/MotionMark/resources/runner/tests.js index 3fdb389..fc7ff64 100644 --- a/MotionMark/resources/runner/tests.js +++ b/MotionMark/resources/runner/tests.js
@@ -22,9 +22,10 @@ ] }; -var Suite = function(name, tests) { +var Suite = function(name, tests, options = {}) { this.name = name; this.tests = tests; + this.enabledByDefault = !!options.enabledByDefault; }; var Suites = [];
diff --git a/MotionMark/resources/statistics.js b/MotionMark/resources/statistics.js index d8e76ee..8d8c742 100644 --- a/MotionMark/resources/statistics.js +++ b/MotionMark/resources/statistics.js
@@ -181,15 +181,16 @@ const kWindowSizeMultiple = 0.1; var profile; - - if (!options.preferredProfile || options.preferredProfile == Strings.json.profiles.slope) { + const preferredProfile = options.preferredProfile || Strings.json.profiles.window; + + if (preferredProfile == Strings.json.profiles.slope) { profile = this._calculateRegression(samples, { shouldClip: true, s1: desiredFrameLength, t1: 0 }); this.profile = Strings.json.profiles.slope; - } else if (options.preferredProfile == Strings.json.profiles.flat) { + } else if (preferredProfile == Strings.json.profiles.flat) { profile = this._calculateRegression(samples, { shouldClip: true, s1: desiredFrameLength, @@ -197,11 +198,11 @@ t2: 0 }); this.profile = Strings.json.profiles.flat; - } else if (options.preferredProfile == Strings.json.profiles.window || options.preferredProfile == Strings.json.profiles.windowStrict) { + } else if (preferredProfile == Strings.json.profiles.window || preferredProfile == Strings.json.profiles.windowStrict) { const window_size = Math.max(1, Math.floor(samples.length * kWindowSizeMultiple)); - const strict = options.preferredProfile == Strings.json.profiles.windowStrict; + const strict = preferredProfile == Strings.json.profiles.windowStrict; profile = this._windowedFit(samples, desiredFrameLength, window_size, strict); - this.profile = options.preferredProfile; + this.profile = preferredProfile; } this.startIndex = Math.min(startIndex, endIndex);
diff --git a/MotionMark/version b/MotionMark/version index baec8fc..fd80073 100644 --- a/MotionMark/version +++ b/MotionMark/version
@@ -1 +1 @@ -development \ No newline at end of file +2.0 development \ No newline at end of file