am 824ce195: am 98ccdc77: Merge "Update to catapult ToT."
* commit '824ce1956f1c4fbf6dcb62bd849e578d5c8b9749':
Update to catapult ToT.
diff --git a/UPSTREAM_REVISION b/UPSTREAM_REVISION
index 8fc4fb1..3304631 100644
--- a/UPSTREAM_REVISION
+++ b/UPSTREAM_REVISION
@@ -1 +1 @@
-7600f2db8d6c0dfe13763c5d463aeb8e2ed66e5e
+46c9452dfb33721fe697b2c7e3e53bd87a908951
diff --git a/catapult/PRESUBMIT.py b/catapult/PRESUBMIT.py
index 68ef74e..2a7617e 100644
--- a/catapult/PRESUBMIT.py
+++ b/catapult/PRESUBMIT.py
@@ -11,6 +11,7 @@
import sys
_EXCLUDED_PATHS = (
+ r'(.*[\\/])?\.git[\\/].*',
r'.+\.png$',
r'.+\.svg$',
r'.+\.skp$',
@@ -24,17 +25,17 @@
r'.*LICENSE$',
r'.*OWNERS$',
r'.*README\.md$',
- r'^dashboard[\\\/]dashboard[\\\/]templates[\\\/].*',
- r'^experimental[\\\/]heatmap[\\\/].*',
- r'^perf_insights[\\\/]test_data[\\\/].*',
- r'^perf_insights[\\\/]third_party[\\\/].*',
- r'^third_party[\\\/].*',
- r'^tracing[\\\/]\.allow-devtools-save$',
- r'^tracing[\\\/]bower\.json$',
- r'^tracing[\\\/]\.bowerrc$',
- r'^tracing[\\\/]tracing_examples[\\\/]string_convert\.js$',
- r'^tracing[\\\/]test_data[\\\/].*',
- r'^tracing[\\\/]third_party[\\\/].*',
+ r'^dashboard[\\/]dashboard[\\/]templates[\\/].*',
+ r'^experimental[\\/]heatmap[\\/].*',
+ r'^perf_insights[\\/]test_data[\\/].*',
+ r'^perf_insights[\\/]third_party[\\/].*',
+ r'^third_party[\\/].*',
+ r'^tracing[\\/]\.allow-devtools-save$',
+ r'^tracing[\\/]bower\.json$',
+ r'^tracing[\\/]\.bowerrc$',
+ r'^tracing[\\/]tracing_examples[\\/]string_convert\.js$',
+ r'^tracing[\\/]test_data[\\/].*',
+ r'^tracing[\\/]third_party[\\/].*',
)
diff --git a/catapult/catapult_build/__init__.py b/catapult/catapult_build/__init__.py
index 78442fd..debe0f9 100644
--- a/catapult/catapult_build/__init__.py
+++ b/catapult/catapult_build/__init__.py
@@ -18,5 +18,6 @@
_AddToPathIfNeeded(os.path.join(catapult_third_party_path, 'WebOb'))
_AddToPathIfNeeded(os.path.join(catapult_path, 'tracing'))
_AddToPathIfNeeded(os.path.join(catapult_path, 'perf_insights'))
+ _AddToPathIfNeeded(os.path.join(catapult_path, 'dashboard'))
_UpdateSysPathIfNeeded()
diff --git a/catapult/catapult_build/dev_server.py b/catapult/catapult_build/dev_server.py
index 1c56642..d0afe10 100644
--- a/catapult/catapult_build/dev_server.py
+++ b/catapult/catapult_build/dev_server.py
@@ -15,6 +15,7 @@
import webapp2
from webapp2 import Route, RedirectHandler
+from dashboard_build import dashboard_dev_server_config
from perf_insights_build import perf_insights_dev_server_config
from tracing_build import tracing_dev_server_config
@@ -232,6 +233,7 @@
def Main(argv):
pds = [
+ dashboard_dev_server_config.DashboardDevServerConfig(),
perf_insights_dev_server_config.PerfInsightsDevServerConfig(),
tracing_dev_server_config.TracingDevServerConfig(),
]
diff --git a/catapult/dashboard/README.md b/catapult/dashboard/README.md
index 14d2ab6..372ace9 100644
--- a/catapult/dashboard/README.md
+++ b/catapult/dashboard/README.md
@@ -1,53 +1,47 @@
-# Dashboard
+# Performance Dashboard
-This is a App Engine web app for displaying performance test results.
-
-Currently, the code is still being migrated from its original location;
-the Python unit tests should run and the deployment script should work,
-but the version of the dashboard currently here is incomplete.
+This is a App Engine web app for displaying and monitoring performance
+test results.
See [online documentation](
http://www.chromium.org/developers/speed-infra/performance-dashboard).
-## Directory structure
-
- * `static`: JavaScript and tests, CSS and images.
- * `templates`: HTML templates for each page.
- * `elements`: Polymer custom element definitions and tests.
-
## Prerequisites
-Running the tests, running the local server and deploying all depends
-on [the App Engine SDK](https://cloud.google.com/appengine/downloads).
-After downloading and unpacking, you should add the path to the SDK
-to both `PATH` and `PYTHONPATH`.
+Running the tests, running the local server and
+deploying all depends on having the [the App Engine
+SDK](https://cloud.google.com/appengine/downloads).
+
+After downloading and unpacking, you should add the path to the SDK to
+both `PATH` and `PYTHONPATH`.
## Running the tests
-To run all of the unit tests, you can run `bin/run_tests`. You can
-also pass the import path to the test module to run a particular test,
-for example `bin/run_tests dashboard.utils_test`.
+To run all of the unit tests, you can run `bin/run_tests`. You can also
+pass the import path to the test module to run a particular test, for
+example `bin/run_tests dashboard.utils_test`.
## To run locally
-Run `bin/dev_server`; this sets up a temporary directory, adds links
-to required libraries, and calls `dev_appserver.py` on that directory.
-By default, this starts a server on localhost:8080.
+Run `bin/dev_server`; this sets up a temporary directory, adds links to
+required libraries, and calls `dev_appserver.py` on that directory. By
+default, this starts a server on [localhost:8080](http://localhost:8080/).
To load sample graph or alert data from production, navigate to
-`http://localhost:8080/load_from_prod`.
+[/load_from_prod](http://localhost:8080/load_from_prod).
## Deploying to production
-To deploy, you can run `bin/deploy`, which prepares the code to be
-deployed and runs `appcfg.py`. This requires having the App Engine SDK
-directory in your `PATH`.
+To deploy, you can run `bin/deploy`, which prepares the
+code to be deployed and runs `appcfg.py`. Note that this
+doesn't set the new version as the default version; to do
+this, you can use the versions page on the [Google Developers
+Console](https://console.developers.google.com/) if you have edit or
+owner permissions for the App Engine project; otherwise if you want to
+request to set a new default version for chromeperf.appspot.com you can
+contact chrome-perf-dashboard-team@google.com.
-This doesn't set the new version as the default version.
-To do this, you can use the versions page on the
-[Google Developers Console](https://console.developers.google.com/).
-
-WARNING: Some changes to production may not be easily reversible; for example
-`appcfg.py ... vacuum\_indexes` will remove datastore indexes that are
-not in your local index.yaml file, which may take more than 24 hours,
+WARNING: Some changes to production may not be easily reversible; for
+example `appcfg.py ... vacuum_indexes` will remove datastore indexes that
+are not in your local index.yaml file, which may take more than 24 hours,
and will disable any queries that depend on those indexes.
diff --git a/catapult/dashboard/app.yaml b/catapult/dashboard/app.yaml
index dd52279..f07c08d 100644
--- a/catapult/dashboard/app.yaml
+++ b/catapult/dashboard/app.yaml
@@ -52,7 +52,7 @@
static_dir: dashboard/elements/
secure: always
-- url: /third_party/polymer/components/(.*)/(.*\.(html|js|css))$
+- url: /components/(.*)/(.*\.(html|js|css))$
static_files: polymer/components/\1/\2
upload: polymer/components/.*/.*\.(html|js|css)$
secure: always
diff --git a/catapult/dashboard/bin/run_dev_server_tests b/catapult/dashboard/bin/run_dev_server_tests
new file mode 100755
index 0000000..354f829
--- /dev/null
+++ b/catapult/dashboard/bin/run_dev_server_tests
@@ -0,0 +1,14 @@
+#!/usr/bin/env python
+# Copyright (c) 2015 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import os
+import sys
+
+if __name__ == '__main__':
+ catapult_path = os.path.abspath(os.path.join(os.path.dirname(__file__),
+ '..', '..'))
+ sys.path.append(catapult_path)
+ from catapult_build import run_dev_server_tests
+ sys.exit(run_dev_server_tests.Main(sys.argv + ['--tests=dashboard']))
diff --git a/catapult/dashboard/dashboard/add_point.py b/catapult/dashboard/dashboard/add_point.py
index 058f2b2..50221c8 100644
--- a/catapult/dashboard/dashboard/add_point.py
+++ b/catapult/dashboard/dashboard/add_point.py
@@ -104,6 +104,7 @@
"name": "foo",
"units": "ms",
"values": [4.2, 5.7, 6.8],
+ "std": 1.30512,
},
},
}
@@ -335,7 +336,11 @@
raise BadRequestError('Expected list of scalar values, got: ' + values)
else:
value = math_utils.Mean(values)
- error = math_utils.StandardDeviation(values)
+ std = trace.get('std')
+ if std is not None:
+ error = std
+ else:
+ error = math_utils.StandardDeviation(values)
elif trace_type == 'histogram':
value, error = _GeomMeanAndStdDevFromHistogram(trace)
elif trace_type is not None:
diff --git a/catapult/dashboard/dashboard/add_point_test.py b/catapult/dashboard/dashboard/add_point_test.py
index 128054c..1ec9607 100644
--- a/catapult/dashboard/dashboard/add_point_test.py
+++ b/catapult/dashboard/dashboard/add_point_test.py
@@ -1166,6 +1166,19 @@
self.assertAlmostEqual(row['value'], 13)
self.assertAlmostEqual(row['error'], 6.78232998)
+ def testFlattenTraceListValueWithStd(self):
+ """Tests that lists with reported std use std as error."""
+ trace = {
+ 'type': 'list_of_scalar_values',
+ 'name': 'bar.baz',
+ 'units': 'ms',
+ 'values': [5, 10, 25, 10, 15],
+ 'std': 100,
+ }
+ row = add_point._FlattenTrace('foo', 'bar', 'baz', trace)
+ self.assertNotAlmostEqual(row['error'], 6.78232998)
+ self.assertEqual(row['error'], 100)
+
def testFlattenTrace_ListNoneValue(self):
"""Tests that LoS NoneValue is flattened to NaN."""
trace = {
diff --git a/catapult/dashboard/dashboard/alerts.py b/catapult/dashboard/dashboard/alerts.py
index 2d6e13a..2e0272f 100644
--- a/catapult/dashboard/dashboard/alerts.py
+++ b/catapult/dashboard/dashboard/alerts.py
@@ -5,6 +5,7 @@
"""Provides the web interface for displaying an overview of alerts."""
import json
+import logging
from google.appengine.ext import ndb
@@ -147,9 +148,12 @@
def _GetStoppageAlertDict(stoppage_alert_entity):
"""Returns a dictionary of properties of a stoppage alert."""
alert_dict = _AlertDict(stoppage_alert_entity)
+ last_row_date = stoppage_alert_entity.last_row_date
+ if not last_row_date:
+ logging.error('No date for StoppageAlert:\n%s', stoppage_alert_entity)
alert_dict.update({
'mail_sent': stoppage_alert_entity.mail_sent,
- 'last_row_date': str(stoppage_alert_entity.last_row_date.date()),
+ 'last_row_date': str(last_row_date.date()) if last_row_date else 'N/A',
'recovered': stoppage_alert_entity.recovered,
})
return alert_dict
diff --git a/catapult/dashboard/dashboard/alerts_test.py b/catapult/dashboard/dashboard/alerts_test.py
index 4d21ca9..5cdd1d3 100644
--- a/catapult/dashboard/dashboard/alerts_test.py
+++ b/catapult/dashboard/dashboard/alerts_test.py
@@ -4,6 +4,7 @@
import unittest
+import mock
import webapp2
import webtest
@@ -12,6 +13,7 @@
from dashboard import utils
from dashboard.models import anomaly
from dashboard.models import bug_data
+from dashboard.models import graph_data
from dashboard.models import sheriff
from dashboard.models import stoppage_alert
@@ -178,6 +180,22 @@
self.assertEqual(2, len(stoppage_alert_list))
self.assertEqual(1, len(response.html('alerts-table')))
+ @mock.patch('logging.error')
+ def testGet_StoppageAlertWithBogusRow_LogsErrorAndShowsTable(
+ self, mock_logging_error):
+ sheriff.Sheriff(id='Sheriff', patterns=['M/b/*/*']).put()
+ testing_common.AddTests(['M'], ['b'], {'foo': {'bar': {}}})
+ test_key = utils.TestKey('M/b/foo/bar')
+ row_parent = utils.GetTestContainerKey(test_key)
+ row = graph_data.Row(parent=row_parent, id=1234)
+ stoppage_alert.CreateStoppageAlert(test_key.get(), row).put()
+ response = self.testapp.get('/alerts?sheriff=Sheriff')
+ stoppage_alert_list = self.GetEmbeddedVariable(
+ response, 'STOPPAGE_ALERT_LIST')
+ self.assertEqual(1, len(stoppage_alert_list))
+ self.assertEqual(1, len(response.html('alerts-table')))
+ self.assertEqual(1, mock_logging_error.call_count)
+
def testGet_WithNoAlerts_HasImageAndNoAlertsTable(self):
response = self.testapp.get('/alerts')
self.assertEqual(1, len(response.html('img')))
diff --git a/catapult/dashboard/dashboard/auto_bisect.py b/catapult/dashboard/dashboard/auto_bisect.py
index 3b32a24..ff7b800 100644
--- a/catapult/dashboard/dashboard/auto_bisect.py
+++ b/catapult/dashboard/dashboard/auto_bisect.py
@@ -185,7 +185,7 @@
"""Whether bisect job is due for restart."""
old_timestamp = (datetime.datetime.now() - datetime.timedelta(
days=_BISECT_RESTART_PERIOD_DAYS[bisect_job.run_count - 1]))
- return bisect_job.last_ran_timestamp < old_timestamp
+ return bisect_job.last_ran_timestamp <= old_timestamp
def _ChooseTest(anomalies, index=0):
diff --git a/catapult/dashboard/dashboard/auto_bisect_test.py b/catapult/dashboard/dashboard/auto_bisect_test.py
index 1b287dc..d2c5f31 100644
--- a/catapult/dashboard/dashboard/auto_bisect_test.py
+++ b/catapult/dashboard/dashboard/auto_bisect_test.py
@@ -50,7 +50,6 @@
mock_perform_bisect.assert_called_once_with(
try_job.TryJob.query(try_job.TryJob.bug_id == 111).get())
- @unittest.skipIf(sys.platform.startswith('win'), 'Flaky on Windows (#1285)')
@mock.patch.object(auto_bisect.start_try_job, 'PerformBisect')
def testPost_FailedJobRunOnce_JobRestarted(self, mock_perform_bisect):
try_job.TryJob(
diff --git a/catapult/dashboard/dashboard/buildbucket_job.py b/catapult/dashboard/dashboard/buildbucket_job.py
index 8142fdc..e1aed84 100644
--- a/catapult/dashboard/dashboard/buildbucket_job.py
+++ b/catapult/dashboard/dashboard/buildbucket_job.py
@@ -13,7 +13,7 @@
def __init__(self, bisect_director, good_revision, bad_revision, test_command,
metric, repeats, truncate, timeout_minutes, bug_id, gs_bucket,
recipe_tester_name, builder_host=None, builder_port=None,
- test_type='perf'):
+ test_type='perf', required_confidence='95'):
if not all([good_revision, bad_revision, test_command, metric,
repeats, timeout_minutes, recipe_tester_name]):
raise ValueError('At least one of the values required for BisectJob '
@@ -33,6 +33,7 @@
self.builder_port = builder_port
self.test_type = test_type
self.recipe_tester_name = recipe_tester_name
+ self.required_confidence = required_confidence
@staticmethod
def EnsureCommandPath(command):
@@ -61,6 +62,7 @@
'builder_host': self.builder_host,
'builder_port': self.builder_port,
'recipe_tester_name': self.recipe_tester_name,
+ 'required_initial_confidence': self.required_confidence,
}
properties = {'bisect_config': bisect_config}
parameters = {
diff --git a/catapult/dashboard/dashboard/elements/alert-icon.html b/catapult/dashboard/dashboard/elements/alert-icon.html
new file mode 100644
index 0000000..479b5a4
--- /dev/null
+++ b/catapult/dashboard/dashboard/elements/alert-icon.html
@@ -0,0 +1,59 @@
+<link rel="import" href="/components/core-icon/core-icon.html">
+
+<polymer-element name="alert-icon">
+ <template>
+ <style>
+
+ .highlighted {
+ box-shadow: 0px 0px 5px #ffba02;
+ border: 2px solid #ffba02;
+ border-radius: 14px;
+ }
+
+ </style>
+
+ <core-icon id="icon"></core-icon>
+
+ </template>
+ <script>
+ 'use strict';
+ Polymer('alert-icon', {
+
+ initialize: function(alertAnnotation, alertKey) {
+ var bugId = alertAnnotation['bug_id'];
+ var improvement = alertAnnotation['improvement'];
+ var recovered = alertAnnotation['recovered'];
+ var key = alertAnnotation['key'];
+
+ this.$.icon.icon = 'report';
+ var color = 'black';
+ if (!bugId && !improvement) {
+ color = 'red';
+ } else if (!bugId && improvement) {
+ color = 'green';
+ this.$.icon.icon = 'info';
+ }
+
+ this.$.icon.style.color = color;
+
+ if (bugId && bugId < 0 || recovered) {
+ // Triaged as invalid, ignored, or recovered; lower opacity.
+ this.$.icon.style.opacity = 0.25;
+ }
+
+ // alertKey is an optional attribute to specify that this chart
+ // is associated with an alert. If this alert is the one alert that
+ // this chart is meant to draw attention to, we want to distinguish
+ // this alert from any others on the chart.
+ if (alertKey == key) {
+ this.$.icon.classList.add('highlighted');
+ }
+ },
+
+ setPosition: function(top, left) {
+ this.$.icon.style.top = top + 'px';
+ this.$.icon.style.left = left + 'px';
+ }
+ });
+ </script>
+</polymer-element>
diff --git a/catapult/dashboard/dashboard/elements/alert-remove-box-test.html b/catapult/dashboard/dashboard/elements/alert-remove-box-test.html
index d39dcc6..bc97e90 100644
--- a/catapult/dashboard/dashboard/elements/alert-remove-box-test.html
+++ b/catapult/dashboard/dashboard/elements/alert-remove-box-test.html
@@ -1,82 +1,80 @@
<!doctype html>
-<html>
-<head>
- <meta charset="utf-8">
- <title>alert-remove-box test</title>
- <link type="text/css" rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/mocha/2.2.1/mocha.min.css">
- <script src="//cdnjs.cloudflare.com/ajax/libs/mocha/2.2.1/mocha.min.js"></script>
- <script src="//cdnjs.cloudflare.com/ajax/libs/chai/2.1.1/chai.min.js"></script>
- <link rel="import" href="/components/polymer/polymer.html">
- <link rel="import" href="alert-remove-box.html">
-</head>
-<body>
-<div id="mocha"></div>
-<div>
- <alert-remove-box id="demo-box" key="alert-key" xsrfToken="xsrf-token"></alert-remove-box>
-</div>
+<!--
+Copyright 2015 The Chromium Authors. All rights reserved.
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file.
+-->
+<link rel="import" href="/tracing/core/test_utils.html">
+
+<link rel="import" href="alert-remove-box.html">
+
<script>
'use strict';
-var assert = chai.assert;
-mocha.setup('tdd');
+tr.b.unittest.testSuite(function() {
+ /**
+ * Mock XMLHttpRequest which returns a canned response.
+ * @param {string} responseText Text to put in mock XHR response.
+ * @param {Object} expectedData Parameter data expected by the test.
+ * @return {Function} A fake constructor for XMLHttpRequest.
+ */
+ function XMLHttpRequestMock(responseText, expectedData) {
+ return function() {
+ this.responseText = responseText;
+ this.status = 200;
+ this.onload = function() {};
+ this.onerror = function() {};
+ this.open = function() {};
+ this.setRequestHeader = function() {};
+ this.send = function(data) {
+ if (expectedData != undefined) {
+ try {
+ assert.equal(data, expectedData);
+ } catch (err) {
+ assert.equal(true, true);
+ }
+ }
+ this.onload();
+ };
+ }
+ };
-/**
- * Mock XMLHttpRequest which returns a canned response.
- * @param {string} responseText Text to put in mock XHR response.
- * @param {Object} expectedData Parameter data expected by the test.
- * @return {Function} A fake constructor for XMLHttpRequest.
- */
-function XMLHttpRequestMock(responseText, expectedData) {
- return function() {
- this.responseText = responseText;
- this.status = 200;
- this.onload = function() {};
- this.onerror = function() {};
- this.open = function() {};
- this.setRequestHeader = function() {};
- this.send = function(data) {
- if (expectedData != undefined) {
- assert.equal(data, expectedData);
- }
- this.onload();
- };
- }
-}
-
-suite('alert-remove-box', function() {
-
- suite('onRemoveBug', function() {
-
- setup(function() {
+ var testOptions = {
+ setUp: function() {
window.untriagedEventFired = false;
- });
+ },
- test('The expected request parameters are used.', function(done) {
- var box = document.getElementById('demo-box');
- window.XMLHttpRequest = new XMLHttpRequestMock(
- '{"bug_id": "REMOVE"}',
- 'xsrf_token=xsrf-token&keys=alert-key&bug_id=REMOVE');
- window.setTimeout(function() {
- // Wait for a small amount of time to allow Polymer to update,
- // so that the right alert key is used in the XMLHttpRequest.
+ tearDown: function() {
+ delete window.XMLHttpRequest;
+ }
+ };
+
+ test('onRemoveBug, request parameters are used.', function() {
+ var box = document.createElement('alert-remove-box');
+ box['key'] = 'alert-key';
+ box['xsrfToken'] = 'xsrf-token';
+ window.XMLHttpRequest = new XMLHttpRequestMock(
+ '{"bug_id": "REMOVE"}',
+ 'xsrf_token=xsrf-token&keys=alert-key&bug_id=REMOVE');
+ return new Promise(function(resolve, reject) {
+ function clickRemoveBug() {
box.onRemoveBug(new Event('click'));
- done();
- }, 10);
+ resolve();
+ }
+ setTimeout(clickRemoveBug, 10);
});
+ }, testOptions);
- test('An "untriaged" event is fired when the XHR completes.', function() {
- var box = document.getElementById('demo-box');
- window.XMLHttpRequest = new XMLHttpRequestMock('{"bug_id": "REMOVE"}');
- box.addEventListener('untriaged', function() {
- window.untriagedEventFired = true;
- });
- box.onRemoveBug(new Event('click'));
- assert.isTrue(window.untriagedEventFired);
+ test('onRemoveBug, an "untriaged" event is fired when the XHR completes.',
+ function() {
+ var box = document.createElement('alert-remove-box');
+ window.XMLHttpRequest = new XMLHttpRequestMock('{"bug_id": "REMOVE"}');
+ box.addEventListener('untriaged', function() {
+ window.untriagedEventFired = true;
});
- });
+ box.onRemoveBug(new Event('click'));
+ assert.isTrue(window.untriagedEventFired);
+ }, testOptions);
+
});
-
-mocha.run();
</script>
-</body>
-</html>
diff --git a/catapult/dashboard/dashboard/elements/alert-remove-box.html b/catapult/dashboard/dashboard/elements/alert-remove-box.html
index 9c7917f..f1c5949 100644
--- a/catapult/dashboard/dashboard/elements/alert-remove-box.html
+++ b/catapult/dashboard/dashboard/elements/alert-remove-box.html
@@ -2,8 +2,7 @@
The alert-remove-box element provides the functionality of dis-associating
an alert from an issue on the issue tracker.
-->
-<link rel="import" href="/dashboard/elements/xhr-element.html">
-<link rel="import" href="/third_party/polymer/components/paper-spinner/paper-spinner.html">
+<link rel="import" href="/components/paper-spinner/paper-spinner.html">
<link rel="import" href="xhr-element.html">
@@ -14,6 +13,7 @@
padding: 1px;
margin: 1px;
cursor: pointer;
+ display: inline-block;
}
.spinner {
diff --git a/catapult/dashboard/dashboard/elements/alerts-table.html b/catapult/dashboard/dashboard/elements/alerts-table.html
index 1155146..edce145 100644
--- a/catapult/dashboard/dashboard/elements/alerts-table.html
+++ b/catapult/dashboard/dashboard/elements/alerts-table.html
@@ -1,4 +1,4 @@
-<link rel="import" href="/third_party/polymer/components/paper-button/paper-button.html">
+<link rel="import" href="/components/paper-button/paper-button.html">
<link rel="import" href="bisect-status.html">
<link rel="import" href="bug-info-span.html">
diff --git a/catapult/dashboard/dashboard/elements/autocomplete-box.html b/catapult/dashboard/dashboard/elements/autocomplete-box.html
index 92df1ce..32da6b1 100644
--- a/catapult/dashboard/dashboard/elements/autocomplete-box.html
+++ b/catapult/dashboard/dashboard/elements/autocomplete-box.html
@@ -36,11 +36,11 @@
...
]
-->
-<link rel="import" href="/third_party/polymer/components/core-icon-button/core-icon-button.html">
-<link rel="import" href="/third_party/polymer/components/core-item/core-item.html">
-<link rel="import" href="/third_party/polymer/components/core-menu/core-menu.html">
-<link rel="import" href="/third_party/polymer/components/paper-input/paper-input-decorator.html">
-<link rel="import" href="/third_party/polymer/components/paper-shadow/paper-shadow.html">
+<link rel="import" href="/components/core-icon-button/core-icon-button.html">
+<link rel="import" href="/components/core-item/core-item.html">
+<link rel="import" href="/components/core-menu/core-menu.html">
+<link rel="import" href="/components/paper-input/paper-input-decorator.html">
+<link rel="import" href="/components/paper-shadow/paper-shadow.html">
<link rel="import" href="/static/autocomplete.html">
@@ -162,7 +162,6 @@
/**
* Handles typing text in the textbox and navigating drop-down menu with
* arrow keys.
- * @param {Event} event.
*/
onTextboxKeyup: function(event) {
var key = event.keyCode || event.charCode;
@@ -191,9 +190,6 @@
/**
* Handles item selected on drop-down menu.
- * @param {Event} event
- * @param {Object} detail
- * @param {Object} sender
*/
onDropdownSelect: function(event, detail, sender) {
this.$.textbox.focus();
@@ -423,7 +419,7 @@
this.$['dropdown-container'].hidden = true;
document.removeEventListener(
'click', this.hideDropdown.bind(this), true);
- },
+ }
});
</script>
</polymer-element>
diff --git a/catapult/dashboard/dashboard/elements/bisect-button.html b/catapult/dashboard/dashboard/elements/bisect-button.html
index ac04f47..cc2b41e 100644
--- a/catapult/dashboard/dashboard/elements/bisect-button.html
+++ b/catapult/dashboard/dashboard/elements/bisect-button.html
@@ -1,4 +1,4 @@
-<link rel="import" href="/third_party/polymer/components/paper-button/paper-button.html">
+<link rel="import" href="/components/paper-button/paper-button.html">
<link rel="import" href="bisect-form.html">
<link rel="import" href="/static/bisect_utils.html">
diff --git a/catapult/dashboard/dashboard/elements/bisect-form.html b/catapult/dashboard/dashboard/elements/bisect-form.html
index f981c9f..5a2a29b 100644
--- a/catapult/dashboard/dashboard/elements/bisect-form.html
+++ b/catapult/dashboard/dashboard/elements/bisect-form.html
@@ -2,9 +2,9 @@
The bisect-form element includes the form for all of the different stages of
the bisect process after the user clicks on the bisect button.
-->
-<link rel="import" href="/third_party/polymer/components/paper-button/paper-button.html">
-<link rel="import" href="/third_party/polymer/components/paper-dialog/paper-action-dialog.html">
-<link rel="import" href="/third_party/polymer/components/paper-spinner/paper-spinner.html">
+<link rel="import" href="/components/paper-button/paper-button.html">
+<link rel="import" href="/components/paper-dialog/paper-action-dialog.html">
+<link rel="import" href="/components/paper-spinner/paper-spinner.html">
<link rel="import" href="base-form.html">
<link rel="import" href="xhr-element.html">
@@ -128,6 +128,10 @@
</p>
</td>
</tr>
+ <tr>
+ <td>Bypass no-repro check:</td>
+ <td><input type="checkbox" checked="{{bypassNoRepro}}"></td>
+ </tr>
</table>
</form>
@@ -176,8 +180,8 @@
*/
show: function() {
this.canUseArchive = false,
+ this.bypassNoRepro = false,
this.useArchive = true,
- this.useRecipe = false,
this.loading = true;
this.open();
this.$.xhr.send('/start_try_job', this.xsrfToken,
@@ -221,6 +225,7 @@
'max_time_minutes': this.MAX_TIME_MINUTES,
'truncate_percent': this.TRUNCATE_PERCENT,
'use_archive': this.useArchive ? 'true' : '',
+ 'bypass_no_repro_check': this.bypassNoRepro ? 'true' : '',
'master': this.master,
'internal_only': this.internalOnly,
'bisect_mode': this.BISECT_MODE
diff --git a/catapult/dashboard/dashboard/elements/chart-container.html b/catapult/dashboard/dashboard/elements/chart-container.html
index 70f7ccb..8ed1984 100644
--- a/catapult/dashboard/dashboard/elements/chart-container.html
+++ b/catapult/dashboard/dashboard/elements/chart-container.html
@@ -4,10 +4,11 @@
chart, a revision range selecting mini-chart at the bottom, and all of the alert
triaging functionality in the chart.
-->
-<link rel="import" href="/third_party/polymer/components/core-collapse/core-collapse.html">
-<link rel="import" href="/third_party/polymer/components/core-icon/core-icon.html">
-<link rel="import" href="/third_party/polymer/components/paper-button/paper-button.html">
+<link rel="import" href="/components/core-collapse/core-collapse.html">
+<link rel="import" href="/components/core-icon/core-icon.html">
+<link rel="import" href="/components/paper-button/paper-button.html">
+<link rel="import" href="alert-icon.html">
<link rel="import" href="chart-legend.html">
<link rel="import" href="chart-slider.html">
<link rel="import" href="chart-title.html">
@@ -21,6 +22,7 @@
showCompact collapseLegend"
on-drop="{{onDrop}}"
on-dragover="{{allowDrop}}">
+
<template>
<style>
#container {
@@ -116,19 +118,13 @@
position: relative;
}
- .alert-icon {
+ alert-icon {
position: absolute;
margin-top: -5px;
- margin-left: -1px;
+ margin-left: -6px;
z-index: 1000;
}
- .alert-icon.highlighted {
- box-shadow: 0px 0px 5px #ffba02;
- border: 2px solid #ffba02;
- border-radius: 14px;
- }
-
#close-chart {
color: #e91e63;
}
@@ -142,6 +138,7 @@
width: 100%;
}
</style>
+
<div id="container" compact?="{{showCompact}}">
<div id="top-bar" horizontal layout>
<div flex horizontal center-justified layout>
@@ -160,6 +157,7 @@
<div id="alert-icon-container"></div>
<chart-tooltip id="tooltip"
xsrfToken="{{xsrfToken}}"></chart-tooltip>
+
<div id="plots-container" on-mouseleave="{{onMouseLeave}}">
<div id="plot">
<div id="loading-div">
@@ -1174,6 +1172,7 @@
var data = this.getDataForFlot();
if (data.length == 0) {
+ data = [[]];
this.chart = $.plot(this.$.plot, data, this.chartOptions);
this.clearAlertIcons();
return;
@@ -1380,7 +1379,6 @@
var minHeight = this.chart.getAxes().yaxis.min;
var maxHeight = this.chart.getAxes().yaxis.max;
var xOffset = this.chartOptions.yaxis.labelWidth;
-
var flotData = this.chart.getData();
var annotations = this.json.annotations;
for (var flotIndex = 0; flotIndex < flotData.length; flotIndex++) {
@@ -1397,16 +1395,20 @@
flotData[flotIndex].data[dataIndex][1] > maxHeight) {
continue;
}
- var alertIcon = this.addAlertIcon(
- annotations[jsonSeriesIndex][dataIndex]['g_anomaly']);
+
+ var flotPoint = flotData[flotIndex].data[dataIndex];
var left = xOffset + Math.round(
- flotData[flotIndex].xaxis.p2c(
- flotData[flotIndex].data[dataIndex][0]));
+ flotData[flotIndex].xaxis.p2c(flotPoint[0]));
var top = Math.round(
- flotData[flotIndex].yaxis.p2c(
- flotData[flotIndex].data[dataIndex][1]));
- alertIcon.style.left = left + 'px';
- alertIcon.style.top = top + 'px';
+ flotData[flotIndex].yaxis.p2c(flotPoint[1]));
+
+ var alertIcon = document.createElement('alert-icon');
+ alertIcon.initialize(
+ annotations[jsonSeriesIndex][dataIndex]['g_anomaly'],
+ this.alertKey);
+ this.$['alert-icon-container'].appendChild(alertIcon);
+ alertIcon.setPosition(top, left);
+
alertIcon.onmouseover = this.showTooltip.bind(
this, flotIndex, dataIndex);
alertIcon.onclick = this.onAlertClick.bind(
@@ -1419,43 +1421,6 @@
this.$['alert-icon-container'].innerHTML = '';
},
- addAlertIcon: function(alertAnnotation) {
- var bugId = alertAnnotation['bug_id'];
- var improvement = alertAnnotation['improvement'];
- var recovered = alertAnnotation['recovered'];
- var key = alertAnnotation['key'];
-
- var alertIcon = document.createElement('core-icon');
-
- var icon = 'report';
- var color = 'black';
- if (!bugId && !improvement) {
- color = 'red';
- } else if (!bugId && improvement) {
- color = 'green';
- icon = 'info';
- }
- alertIcon.style.color = color;
- alertIcon.icon = icon;
-
- if (bugId && bugId < 0 || recovered) {
- // Triaged as invalid, ignored, or recovered; lower opacity.
- alertIcon.style.opacity = 0.4;
- }
-
- alertIcon.classList.add('alert-icon');
- // alertKey is an optional attribute to specify that this chart
- // is associated with an alert. If this alert is the one alert that
- // this chart is meant to draw attention to, we want to distinguish
- // this alert from any others on the chart.
- if (this.alertKey == key) {
- alertIcon.classList.add('highlighted');
- }
-
- this.$['alert-icon-container'].appendChild(alertIcon);
- return alertIcon;
- },
-
/**
* Handler for 'onSeriesGroupClosed' event.
*/
diff --git a/catapult/dashboard/dashboard/elements/chart-legend.html b/catapult/dashboard/dashboard/elements/chart-legend.html
index 5c5a22c..09d1927 100644
--- a/catapult/dashboard/dashboard/elements/chart-legend.html
+++ b/catapult/dashboard/dashboard/elements/chart-legend.html
@@ -3,11 +3,11 @@
seriesGroupList: A list of trace names.
indicesToGraph: List of indices of traces that are selected.
-->
-<link rel="import" href="/third_party/polymer/components/core-selector/core-selector.html">
-<link rel="import" href="/third_party/polymer/components/core-icon-button/core-icon-button.html">
-<link rel="import" href="/third_party/polymer/components/paper-icon-button/paper-icon-button.html">
-<link rel="import" href="/third_party/polymer/components/paper-progress/paper-progress.html">
-<link rel="import" href="/third_party/polymer/components/paper-shadow/paper-shadow.html">
+<link rel="import" href="/components/core-selector/core-selector.html">
+<link rel="import" href="/components/core-icon-button/core-icon-button.html">
+<link rel="import" href="/components/paper-icon-button/paper-icon-button.html">
+<link rel="import" href="/components/paper-progress/paper-progress.html">
+<link rel="import" href="/components/paper-shadow/paper-shadow.html">
<link rel="import" href="tooltip-test-description.html">
diff --git a/catapult/dashboard/dashboard/elements/chart-slider.html b/catapult/dashboard/dashboard/elements/chart-slider.html
index 6ab2434..78ab88b 100644
--- a/catapult/dashboard/dashboard/elements/chart-slider.html
+++ b/catapult/dashboard/dashboard/elements/chart-slider.html
@@ -51,7 +51,7 @@
},
selection: {
mode: 'x',
- color: 'green',
+ color: 'green'
},
yaxis: {
show: false,
@@ -200,7 +200,7 @@
/**
* Determines what stage of a mouse drag selection action the user is in.
- * @param {MouseEvent} event
+ * @param {MouseEvent} event Mouse event object.
* @return {string} One of "start", "move", "end", or "none".
*/
getMouseDragType: function(event) {
@@ -244,12 +244,12 @@
/**
* Gets the position of the mouse selection relative to the chart.
- * @param {MouseEvent} event
+ * @param {MouseEvent} event Mouse event object.
*/
getGraphPosFromMouseEvent: function(event) {
- var offset = $(this.$.revisions_container).offset();
+ var boundingRect = this.$.revisions_container.getBoundingClientRect();
var plotOffset = this.chart.getPlotOffset();
- var posX = event.pageX - offset.left - plotOffset.left;
+ var posX = event.pageX - boundingRect.left - plotOffset.left;
posX = Math.max(0, posX);
posX = Math.min(posX, this.chart.width());
var axes = this.chart.getAxes();
@@ -266,7 +266,7 @@
/**
* Updates the selected revision range as the user moves the mouse.
- * @param {MouseEvent} event
+ * @param {MouseEvent} event Mouse event object.
*/
onMouseMove: function(event) {
// Stop Flot from handling the selection.
@@ -299,7 +299,7 @@
/**
* Sets the selection start when the user starts to drag.
- * @param {MouseEvent} event
+ * @param {MouseEvent} event Mouse event object.
*/
onMouseDown: function(event) {
// Stop Flot from handling the selection.
@@ -343,7 +343,7 @@
}
var detail = {
start_rev: this.startrev,
- end_rev: this.endrev,
+ end_rev: this.endrev
};
this.fire('revisionrange', detail);
},
diff --git a/catapult/dashboard/dashboard/elements/chart-tooltip.html b/catapult/dashboard/dashboard/elements/chart-tooltip.html
index 3ee8815..735ead2 100644
--- a/catapult/dashboard/dashboard/elements/chart-tooltip.html
+++ b/catapult/dashboard/dashboard/elements/chart-tooltip.html
@@ -3,7 +3,7 @@
on a point on a graph. It shows more detailed information about the point that
was just clicked.
-->
-<link rel="import" href="/third_party/polymer/components/paper-dialog/paper-action-dialog.html">
+<link rel="import" href="/components/paper-dialog/paper-action-dialog.html">
<link rel="import" href="alert-remove-box.html">
<link rel="import" href="bisect-button.html">
diff --git a/catapult/dashboard/dashboard/elements/custom-tooltip.html b/catapult/dashboard/dashboard/elements/custom-tooltip.html
index 3be8320..c8d1a8a 100644
--- a/catapult/dashboard/dashboard/elements/custom-tooltip.html
+++ b/catapult/dashboard/dashboard/elements/custom-tooltip.html
@@ -10,8 +10,8 @@
var tooltip = document.getElementById("tooltip");
tooltip.set('A tooltip message', bound.left, bound.top);
-->
-<link rel="import" href="/third_party/polymer/components/paper-shadow/paper-shadow.html">
-<link rel="import" href="/third_party/polymer/components/core-overlay/core-overlay.html">
+<link rel="import" href="/components/paper-shadow/paper-shadow.html">
+<link rel="import" href="/components/core-overlay/core-overlay.html">
<polymer-element
name="custom-tooltip"
attributes="autoCloseDisabled transition duration maxWidth">
diff --git a/catapult/dashboard/dashboard/elements/overlay-message.html b/catapult/dashboard/dashboard/elements/overlay-message.html
index 15d5df8..f25007f 100644
--- a/catapult/dashboard/dashboard/elements/overlay-message.html
+++ b/catapult/dashboard/dashboard/elements/overlay-message.html
@@ -22,8 +22,8 @@
}
-->
-<link rel="import" href="/third_party/polymer/components/core-overlay/core-overlay.html">
-<link rel="import" href="/third_party/polymer/components/paper-shadow/paper-shadow.html">
+<link rel="import" href="/components/core-overlay/core-overlay.html">
+<link rel="import" href="/components/paper-shadow/paper-shadow.html">
<polymer-element
name="overlay-message"
@@ -142,7 +142,7 @@
this.hideJob = this.job(this.hideJob, this.hide, this.duration);
}
this.opened = true;
- },
+ }
});
</script>
</polymer-element>
diff --git a/catapult/dashboard/dashboard/elements/quick-log.html b/catapult/dashboard/dashboard/elements/quick-log.html
index a5659ce..78ac770 100644
--- a/catapult/dashboard/dashboard/elements/quick-log.html
+++ b/catapult/dashboard/dashboard/elements/quick-log.html
@@ -1,4 +1,4 @@
-<link rel="import" href="/third_party/polymer/components/core-icon-button/core-icon-button.html">
+<link rel="import" href="/components/core-icon-button/core-icon-button.html">
<link rel="import" href="xhr-element.html">
diff --git a/catapult/dashboard/dashboard/elements/select-menu.html b/catapult/dashboard/dashboard/elements/select-menu.html
index f9df80a..a3ffbd6 100644
--- a/catapult/dashboard/dashboard/elements/select-menu.html
+++ b/catapult/dashboard/dashboard/elements/select-menu.html
@@ -1,7 +1,7 @@
-<link rel="import" href="/third_party/polymer/components/paper-dropdown-menu/paper-dropdown-menu.html">
-<link rel="import" href="/third_party/polymer/components/paper-dropdown/paper-dropdown.html">
-<link rel="import" href="/third_party/polymer/components/core-menu/core-menu.html">
-<link rel="import" href="/third_party/polymer/components/paper-item/paper-item.html">
+<link rel="import" href="/components/paper-dropdown-menu/paper-dropdown-menu.html">
+<link rel="import" href="/components/paper-dropdown/paper-dropdown.html">
+<link rel="import" href="/components/core-menu/core-menu.html">
+<link rel="import" href="/components/paper-item/paper-item.html">
<polymer-element name="select-menu" attributes="menuItems">
<template>
diff --git a/catapult/dashboard/dashboard/elements/test-picker.html b/catapult/dashboard/dashboard/elements/test-picker.html
index 696bfce..1067eea 100644
--- a/catapult/dashboard/dashboard/elements/test-picker.html
+++ b/catapult/dashboard/dashboard/elements/test-picker.html
@@ -1,5 +1,5 @@
-<link rel="import" href="/third_party/polymer/components/core-icon-button/core-icon-button.html">
-<link rel="import" href="/third_party/polymer/components/paper-button/paper-button.html">
+<link rel="import" href="/components/core-icon-button/core-icon-button.html">
+<link rel="import" href="/components/paper-button/paper-button.html">
<link rel="import" href="autocomplete-box.html">
<link rel="import" href="xhr-element.html">
diff --git a/catapult/dashboard/dashboard/elements/trace-button.html b/catapult/dashboard/dashboard/elements/trace-button.html
index 59cdd41..54513e5 100644
--- a/catapult/dashboard/dashboard/elements/trace-button.html
+++ b/catapult/dashboard/dashboard/elements/trace-button.html
@@ -1,4 +1,4 @@
-<link rel="import" href="/third_party/polymer/components/paper-button/paper-button.html">
+<link rel="import" href="/components/paper-button/paper-button.html">
<link rel="import" href="trace-form.html">
<link rel="import" href="/static/bisect_utils.html">
diff --git a/catapult/dashboard/dashboard/elements/trace-form.html b/catapult/dashboard/dashboard/elements/trace-form.html
index 92dc822..a609f94 100644
--- a/catapult/dashboard/dashboard/elements/trace-form.html
+++ b/catapult/dashboard/dashboard/elements/trace-form.html
@@ -2,9 +2,9 @@
The trace-form element includes the form for all of the different stages of
the trace process after the user clicks on the trace button.
-->
-<link rel="import" href="/third_party/polymer/components/paper-button/paper-button.html">
-<link rel="import" href="/third_party/polymer/components/paper-dialog/paper-action-dialog.html">
-<link rel="import" href="/third_party/polymer/components/paper-spinner/paper-spinner.html">
+<link rel="import" href="/components/paper-button/paper-button.html">
+<link rel="import" href="/components/paper-dialog/paper-action-dialog.html">
+<link rel="import" href="/components/paper-spinner/paper-spinner.html">
<link rel="import" href="base-form.html">
<link rel="import" href="xhr-element.html">
diff --git a/catapult/dashboard/dashboard/elements/triage-dialog.html b/catapult/dashboard/dashboard/elements/triage-dialog.html
index bb18acc..552a429 100644
--- a/catapult/dashboard/dashboard/elements/triage-dialog.html
+++ b/catapult/dashboard/dashboard/elements/triage-dialog.html
@@ -2,8 +2,8 @@
The triage-dialog element is the dialog box that is shown when a user clicks
on an alert, or clicks on a "triage" button on the alerts page. It allows the
-->
-<link rel="import" href="/third_party/polymer/components/paper-button/paper-button.html">
-<link rel="import" href="/third_party/polymer/components/paper-dialog/paper-action-dialog.html">
+<link rel="import" href="/components/paper-button/paper-button.html">
+<link rel="import" href="/components/paper-dialog/paper-action-dialog.html">
<link rel="import" href="base-form.html">
<link rel="import" href="xhr-element.html">
diff --git a/catapult/dashboard/dashboard/migrate_test_names.py b/catapult/dashboard/dashboard/migrate_test_names.py
index 779bfa3..3266f5c 100644
--- a/catapult/dashboard/dashboard/migrate_test_names.py
+++ b/catapult/dashboard/dashboard/migrate_test_names.py
@@ -4,21 +4,19 @@
"""Task queue task which migrates a Test and its Rows to a new name.
-A rename consists of:
-* Listing all Test entities which match the old_name pattern. For each:
- * Creating a new Test entity with the new name.
- * Re-parenting all Test entities from the old Test to the new Test.
- * Re-parenting all Row entities from the old Test to the new Test.
- * Updating all Anomaly entities to reference the new Test.
- * Deleting the old Test.
+A rename consists of listing all Test entities which match the old_name,
+and then, for each, completing these steps:
+ * Create a new Test entity with the new name.
+ * Re-parent all Test and Row entities from the old Test to the new Test.
+ * Update alerts to reference the new Test.
+ * Delete the old Test.
-For any rename, there could be hundreds of tests and many thousands of rows.
+For any rename, there could be hundreds of Tests and many thousands of Rows.
Datastore operations often time out after a few hundred puts(), so this task
is split up using the task queue.
-
-For examples, see the unit test.
"""
+import logging
import re
from google.appengine.api import mail
@@ -32,6 +30,7 @@
from dashboard import utils
from dashboard.models import anomaly
from dashboard.models import graph_data
+from dashboard.models import stoppage_alert
_MAX_DATASTORE_PUTS_PER_PUT_MULTI_CALL = 50
@@ -303,9 +302,8 @@
ndb.Future.wait_all(futures)
return False
- anomalies_futures = _MigrateAnomalies(old_test_key, new_test_key)
- if anomalies_futures:
- futures += anomalies_futures
+ futures += _MigrateAnomalies(old_test_key, new_test_key)
+ futures += _MigrateStoppageAlerts(old_test_key, new_test_key)
if not futures:
_SendNotificationEmail(old_test_key, new_test_key)
@@ -385,11 +383,11 @@
def _MigrateAnomalies(old_parent_key, new_parent_key):
- """Copies the Anomalies from one parent test to another.
+ """Copies the Anomaly entities from one test to another.
Args:
- old_parent_key: Test entity key of the test to move Anomalies from.
- new_parent_key: Test entity key of the test to move Anomalies to.
+ old_parent_key: Source Test entity key.
+ new_parent_key: Destination Test entity key.
Returns:
A list of Future objects for Anomaly entities to update.
@@ -404,6 +402,33 @@
return ndb.put_multi_async(anomalies_to_update)
+def _MigrateStoppageAlerts(old_parent_key, new_parent_key):
+ """Copies the StoppageAlert entities from one test to another.
+
+ Args:
+ old_parent_key: Source Test entity key.
+ new_parent_key: Destination Test entity key.
+
+ Returns:
+ A list of Future objects for StoppageAlert puts and deletes.
+ """
+ query = stoppage_alert.StoppageAlert.query(
+ stoppage_alert.StoppageAlert.test == old_parent_key)
+ alerts_to_update = query.fetch(limit=_MAX_DATASTORE_PUTS_PER_PUT_MULTI_CALL)
+ if not alerts_to_update:
+ return []
+ futures = []
+ for entity in alerts_to_update:
+ new_entity = stoppage_alert.StoppageAlert(
+ parent=ndb.Key('StoppageAlertParent', utils.TestPath(new_parent_key)),
+ id=entity.key.id(),
+ mail_sent=entity.mail_sent,
+ recovered=entity.recovered)
+ futures.append(entity.key.delete_async())
+ futures.append(new_entity.put_async())
+ return futures
+
+
def _SendNotificationEmail(old_test_key, new_test_key):
"""Send a notification email about the test migration.
diff --git a/catapult/dashboard/dashboard/migrate_test_names_test.py b/catapult/dashboard/dashboard/migrate_test_names_test.py
index 7abb67e..9fa54b1 100644
--- a/catapult/dashboard/dashboard/migrate_test_names_test.py
+++ b/catapult/dashboard/dashboard/migrate_test_names_test.py
@@ -15,6 +15,7 @@
from dashboard.models import anomaly
from dashboard.models import graph_data
from dashboard.models import sheriff
+from dashboard.models import stoppage_alert
# Masters, bots and test names to add to the mock datastore.
_MOCK_DATA = [
@@ -291,6 +292,30 @@
'migrated to ChromiumPerf/win7/moz/read_operations_browser', body)
self.assertIn('sheriffed by Perf Sheriff Win', body)
+ def testPost_MigratesStoppageAlerts(self):
+ testing_common.AddTests(['Master'], ['b'], {'suite': {'foo': {}}})
+ test_path = 'Master/b/suite/foo'
+ test_key = utils.TestKey(test_path)
+ test_container_key = utils.GetTestContainerKey(test_key)
+ row_key = graph_data.Row(id=100, parent=test_container_key, value=5).put()
+ stoppage_alert.CreateStoppageAlert(test_key.get(), row_key.get()).put()
+ self.assertIsNotNone(
+ stoppage_alert.GetStoppageAlert('Master/b/suite/foo', 100))
+ self.assertIsNone(
+ stoppage_alert.GetStoppageAlert('Master/b/suite/bar', 100))
+
+ self.testapp.post('/migrate_test_names', {
+ 'old_pattern': 'Master/b/suite/foo',
+ 'new_pattern': 'Master/b/suite/bar',
+ })
+ self.ExecuteTaskQueueTasks(
+ '/migrate_test_names', migrate_test_names._TASK_QUEUE_NAME)
+
+ self.assertIsNotNone(
+ stoppage_alert.GetStoppageAlert('Master/b/suite/bar', 100))
+ self.assertIsNone(
+ stoppage_alert.GetStoppageAlert('Master/b/suite/foo', 100))
+
def testGetNewTestPath_WithAsterisks(self):
self.assertEqual(
'A/b/c/X',
diff --git a/catapult/dashboard/dashboard/start_try_job.py b/catapult/dashboard/dashboard/start_try_job.py
index bbe0ff1..97316aa 100644
--- a/catapult/dashboard/dashboard/start_try_job.py
+++ b/catapult/dashboard/dashboard/start_try_job.py
@@ -13,6 +13,7 @@
import httplib2
from google.appengine.api import users
+from google.appengine.api import app_identity
from dashboard import buildbucket_job
from dashboard import buildbucket_service
@@ -116,7 +117,7 @@
master_name = self.request.get('master', 'ChromiumPerf')
internal_only = self.request.get('internal_only') == 'true'
bisect_bot = self.request.get('bisect_bot')
-
+ bypass_no_repro_check = self.request.get('bypass_no_repro_check') == 'true'
use_recipe = bool(GetBisectDirectorForTester(bisect_bot))
bisect_config = GetBisectConfig(
@@ -132,7 +133,8 @@
bug_id=bug_id,
use_archive=self.request.get('use_archive'),
bisect_mode=self.request.get('bisect_mode', 'mean'),
- use_buildbucket=use_recipe)
+ use_buildbucket=use_recipe,
+ bypass_no_repro_check=bypass_no_repro_check)
if 'error' in bisect_config:
return bisect_config
@@ -238,7 +240,7 @@
def GetBisectConfig(
bisect_bot, master_name, suite, metric, good_revision, bad_revision,
repeat_count, max_time_minutes, truncate_percent, bug_id, use_archive=None,
- bisect_mode='mean', use_buildbucket=False):
+ bisect_mode='mean', use_buildbucket=False, bypass_no_repro_check=False):
"""Fills in a JSON response with the filled-in config file.
Args:
@@ -302,6 +304,8 @@
}
if use_buildbucket:
config_dict['recipe_tester_name'] = bisect_bot
+ if bypass_no_repro_check:
+ config_dict['required_initial_confidence'] = '0'
return config_dict
@@ -413,46 +417,57 @@
def GuessCommand(
bisect_bot, suite, metric=None, rerun_option=None, use_buildbucket=False):
"""Returns a command to use in the bisect configuration."""
- platform = bisect_bot.split('_')[0]
if suite in _NON_TELEMETRY_TEST_COMMANDS:
- return _GuessCommandNonTelemetry(suite, platform)
+ return _GuessCommandNonTelemetry(suite, bisect_bot, use_buildbucket)
return _GuessCommandTelemetry(
- suite, platform, metric, rerun_option, use_buildbucket)
+ suite, bisect_bot, metric, rerun_option, use_buildbucket)
-def _GuessCommandNonTelemetry(suite, platform):
+def _GuessCommandNonTelemetry(suite, bisect_bot, use_buildbucket):
"""Returns a command string to use for non-Telemetry tests."""
if suite not in _NON_TELEMETRY_TEST_COMMANDS:
return None
- if suite == 'cc_perftests' and platform == 'android':
- return 'build/android/test_runner.py gtest --release -s cc_perftests'
+ if suite == 'cc_perftests' and bisect_bot.startswith('android'):
+ if use_buildbucket:
+ return 'src/build/android/test_runner.py gtest --release -s cc_perftests'
+ else:
+ return 'build/android/test_runner.py gtest --release -s cc_perftests'
- command = _NON_TELEMETRY_TEST_COMMANDS[suite]
- if platform.startswith('win'):
+ command = list(_NON_TELEMETRY_TEST_COMMANDS[suite])
+
+ if use_buildbucket and command[0].startswith('./out'):
+ command[0] = command[0].replace('./', './src/')
+
+ if bisect_bot.startswith('win'):
command[0] = command[0].replace('/', '\\')
command[0] += '.exe'
return ' '.join(command)
def _GuessCommandTelemetry(
- suite, platform, metric, # pylint: disable=unused-argument
+ suite, bisect_bot, metric, # pylint: disable=unused-argument
rerun_option, use_buildbucket):
"""Returns a command to use given that |suite| is a Telemetry benchmark."""
# TODO(qyearsley): Use metric to add a --story-filter flag for Telemetry.
# See: http://crbug.com/448628
command = []
- if platform.startswith('win'):
+ if bisect_bot.startswith('win'):
command.append('python')
+ if use_buildbucket:
+ test_cmd = 'src/tools/perf/run_benchmark'
+ else:
+ test_cmd = 'tools/perf/run_benchmark'
+
command.extend([
- 'tools/perf/run_benchmark',
+ test_cmd,
'-v',
- '--browser=%s' % _GuessBrowserName(platform),
+ '--browser=%s' % _GuessBrowserName(bisect_bot),
'--output-format=%s' % ('chartjson' if use_buildbucket else 'buildbot'),
'--also-run-disabled-tests',
])
- profile_dir = _GuessProfileDir(suite)
+ profile_dir = _GuessProfileDir(suite, use_buildbucket)
if profile_dir:
command.append('--profile-dir=%s' % profile_dir)
@@ -473,22 +488,29 @@
return ' '.join(command)
-def _GuessBrowserName(platform):
+def _GuessBrowserName(bisect_bot):
"""Returns a browser name string for Telemetry to use."""
- if platform == 'android':
+ if bisect_bot.startswith('android'):
return 'android-chromium'
- if platform == 'clankium':
+ if bisect_bot.startswith('clankium'):
return 'android-chrome'
+ if bisect_bot.startswith('win') and 'x64' in bisect_bot:
+ return 'release_x64'
+
return 'release'
-def _GuessProfileDir(suite):
+def _GuessProfileDir(suite, use_buildbucket):
"""Returns a profile directory string for Telemetry, or None."""
if (suite == 'startup.warm.dirty.blank_page' or
suite == 'startup.cold.dirty.blank_page' or
suite.startswith('session_restore')):
+ # Profile directory relative to build directory on slave.
+ if use_buildbucket:
+ return 'src/out/Release/generated_profile/small_profile'
# Profile directory relative to chromium/src.
- return 'out/Release/generated_profile/small_profile'
+ else:
+ return 'out/Release/generated_profile/small_profile'
return None
@@ -628,8 +650,8 @@
bisect_job.rietveld_issue_id = int(issue_id)
bisect_job.rietveld_patchset_id = int(patchset_id)
bisect_job.SetStarted()
- bug_comment = ('Bisect started; track progress at <a href="%s">%s</a>'
- % (issue_url, issue_url))
+ bug_comment = ('Bisect started; track progress at '
+ '<a href="%s">%s</a>' % (issue_url, issue_url))
LogBisectResult(bug_id, bug_comment)
return {'issue_id': issue_id, 'issue_url': issue_url}
return {'error': 'Error starting try job. Try to fix at %s' % issue_url}
@@ -700,12 +722,7 @@
def LogBisectResult(bug_id, comment):
- """Adds bisect results to log.
-
- Args:
- bug_id: ID of the issue.
- comment: Bisect results information.
- """
+ """Adds an entry to the bisect result log for a particular bug."""
if not bug_id or bug_id < 0:
return
formatter = quick_logger.Formatter()
@@ -733,6 +750,13 @@
raise request_handler.InvalidInputError(
'Recipe is only implemented for tests run on chromium.perf '
'(and chromium.perf.fyi).')
+
+ # Recipe bisect supports 'perf' and 'return_code' test types only.
+ # TODO (prasadv): Update bisect form on dashboard to support test_types.
+ test_type = 'perf'
+ if config.get('bisect_mode') == 'return_code':
+ test_type = config['bisect_mode']
+
return buildbucket_job.BisectJob(
bisect_director=GetBisectDirectorForTester(config['recipe_tester_name']),
good_revision=config['good_revision'],
@@ -745,6 +769,8 @@
bug_id=bisect_job.bug_id,
gs_bucket='chrome-perf',
recipe_tester_name=config['recipe_tester_name'],
+ test_type=test_type,
+ required_confidence=config.get('required_initial_confidence', '95')
)
@@ -753,9 +779,15 @@
bisect_job.buildbucket_job_id = buildbucket_service.PutJob(
_MakeBuildbucketBisectJob(bisect_job))
bisect_job.SetStarted()
+ hostname = app_identity.get_default_version_hostname()
+ job_id = bisect_job.buildbucket_job_id
+ issue_url = 'https://%s/buildbucket_job_status/%s' % (hostname, job_id)
+ bug_comment = ('Bisect started; track progress at '
+ '<a href="%s">%s</a>' % (issue_url, issue_url))
+ LogBisectResult(bisect_job.bug_id, bug_comment)
return {
- 'issue_id': bisect_job.buildbucket_job_id,
- 'issue_url': '/buildbucket_job_status/' + bisect_job.buildbucket_job_id,
+ 'issue_id': job_id,
+ 'issue_url': issue_url,
}
except httplib2.HttpLib2Error as e:
return {
diff --git a/catapult/dashboard/dashboard/start_try_job_test.py b/catapult/dashboard/dashboard/start_try_job_test.py
index 844bb4e..2367227 100644
--- a/catapult/dashboard/dashboard/start_try_job_test.py
+++ b/catapult/dashboard/dashboard/start_try_job_test.py
@@ -526,7 +526,7 @@
'use_buildbucket': True,
},
{
- 'command': ('tools/perf/run_benchmark -v '
+ 'command': ('src/tools/perf/run_benchmark -v '
'--browser=release --output-format=chartjson '
'--also-run-disabled-tests '
'page_cycler.moz'),
@@ -655,7 +655,8 @@
'max_time_minutes': '8',
'truncate_percent': '10',
'bug_id': '-1',
- 'use_archive': ''
+ 'use_archive': '',
+ 'use_buildbucket': False,
}, **params_to_override)
response = start_try_job.GetBisectConfig(**parameters)
self.assertEqual(expected_command, response.get('command'))
@@ -856,6 +857,9 @@
@mock.patch(
'google.appengine.api.urlfetch.fetch',
mock.MagicMock(side_effect=_MockFetch))
+ @mock.patch(
+ 'google.appengine.api.app_identity.get_default_version_hostname',
+ mock.MagicMock(return_value='my-dashboard.appspot.com'))
@mock.patch.object(start_try_job.buildbucket_service, 'PutJob',
mock.MagicMock(return_value='1234567'))
def testPerformBisectWithArchive(self):
@@ -881,7 +885,8 @@
response = self.testapp.post('/start_try_job', query_parameters)
self.assertEqual(
json.dumps({'issue_id': '1234567',
- 'issue_url': '/buildbucket_job_status/1234567'}),
+ 'issue_url': ('https://my-dashboard.appspot.com'
+ '/buildbucket_job_status/1234567')}),
response.body)
def testGetBisectconfig_UseArchive(self):
@@ -933,7 +938,7 @@
},
{
'command': ('python tools/perf/run_benchmark -v '
- '--browser=release --output-format=buildbot '
+ '--browser=release_x64 --output-format=buildbot '
'--also-run-disabled-tests '
'page_cycler.moz'),
'good_revision': '265549',
@@ -948,6 +953,69 @@
'bisect_mode': 'mean',
})
+ def testGetConfig_Usebuildbucket_AndroidTelemetryTest(self):
+ self._TestGetConfigCommand(
+ ('src/tools/perf/run_benchmark -v '
+ '--browser=android-chromium --output-format=chartjson '
+ '--also-run-disabled-tests '
+ 'page_cycler.morejs'),
+ bisect_bot='android_nexus7_perf_bisect',
+ suite='page_cycler.morejs',
+ use_buildbucket=True)
+
+ def testGetConfig_Usebuildbucket_CCPerftests(self):
+ self._TestGetConfigCommand(
+ ('./src/out/Release/cc_perftests '
+ '--test-launcher-print-test-stdio=always'),
+ bisect_bot='linux_perf_bisect',
+ suite='cc_perftests',
+ use_buildbucket=True)
+
+ def testGetConfig_Usebuildbucket_AndroidCCPerftests(self):
+ self._TestGetConfigCommand(
+ 'src/build/android/test_runner.py gtest --release -s cc_perftests',
+ bisect_bot='android_nexus7_perf_bisect',
+ suite='cc_perftests',
+ use_buildbucket=True)
+
+ def testGetConfig_Usebuildbucket_IdbPerf(self):
+ self._TestGetConfigCommand(
+ ('.\src\out\Release\performance_ui_tests.exe '
+ '--gtest_filter=IndexedDBTest.Perf'),
+ bisect_bot='win_perf_bisect',
+ suite='idb_perf',
+ use_buildbucket=True)
+
+ def testGetConfig_Usebuildbucket_Startup_ProfileDirFlagAdded(self):
+ self._TestGetConfigCommand(
+ ('python src/tools/perf/run_benchmark -v '
+ '--browser=release --output-format=chartjson '
+ '--also-run-disabled-tests '
+ '--profile-dir=src/out/Release/generated_profile/small_profile '
+ 'startup.cold.blank_page'),
+ bisect_bot='win_perf_bisect',
+ suite='startup.cold.dirty.blank_page',
+ use_buildbucket=True)
+
+ def testGetConfig_Usebuildbucket_SessionRestore_ProfileDirFlagAdded(self):
+ self._TestGetConfigCommand(
+ ('python src/tools/perf/run_benchmark -v '
+ '--browser=release --output-format=chartjson '
+ '--also-run-disabled-tests '
+ '--profile-dir=src/out/Release/generated_profile/small_profile '
+ 'session_restore.warm.typical_25'),
+ bisect_bot='win_perf_bisect',
+ suite='session_restore.warm.typical_25',
+ use_buildbucket=True)
+
+ def testGetConfig_Usebuildbucket_PerformanceBrowserTests(self):
+ self._TestGetConfigCommand(
+ ('./src/out/Release/performance_browser_tests '
+ '--test-launcher-print-test-stdio=always '
+ '--enable-gpu'),
+ bisect_bot='linux_perf_bisect',
+ suite='performance_browser_tests',
+ use_buildbucket=True)
if __name__ == '__main__':
unittest.main()
diff --git a/catapult/dashboard/dashboard/templates/alerts.html b/catapult/dashboard/dashboard/templates/alerts.html
index ba90190..169ed9e 100644
--- a/catapult/dashboard/dashboard/templates/alerts.html
+++ b/catapult/dashboard/dashboard/templates/alerts.html
@@ -62,8 +62,8 @@
<link rel="import" href="/static/alerts.html">
- <link rel="import" href="/third_party/polymer/components/polymer/polymer.html">
- <link rel="import" href="/third_party/polymer/components/paper-button/paper-button.html">
+ <link rel="import" href="/components/polymer/polymer.html">
+ <link rel="import" href="/components/paper-button/paper-button.html">
<link rel="import" href="/elements/select-menu.html">
<link rel="import" href="/elements/alerts-table.html">
<link rel="import" href="/elements/overlay-message.html">
diff --git a/catapult/dashboard/dashboard/templates/bisect_stats.html b/catapult/dashboard/dashboard/templates/bisect_stats.html
index 2cf56e5..0f2bdcc 100644
--- a/catapult/dashboard/dashboard/templates/bisect_stats.html
+++ b/catapult/dashboard/dashboard/templates/bisect_stats.html
@@ -17,7 +17,7 @@
}
</style>
- <link rel="import" href="/third_party/polymer/components/polymer/polymer.html">
+ <link rel="import" href="/components/polymer/polymer.html">
<link rel="import" href="/elements/quick-log.html">
{% endblock %}
diff --git a/catapult/dashboard/dashboard/templates/edit_test_owners.html b/catapult/dashboard/dashboard/templates/edit_test_owners.html
index 4c75799..d7dbfee 100644
--- a/catapult/dashboard/dashboard/templates/edit_test_owners.html
+++ b/catapult/dashboard/dashboard/templates/edit_test_owners.html
@@ -7,7 +7,7 @@
var XSRF_TOKEN = '{{xsrf_token}}';
</script>
- <link rel="import" href="/third_party/polymer/components/polymer/polymer.html">
+ <link rel="import" href="/components/polymer/polymer.html">
<link rel="import" href="/elements/editable-list.html">
<style>
diff --git a/catapult/dashboard/dashboard/templates/group_report.html b/catapult/dashboard/dashboard/templates/group_report.html
index 15a6ace..1395537 100644
--- a/catapult/dashboard/dashboard/templates/group_report.html
+++ b/catapult/dashboard/dashboard/templates/group_report.html
@@ -91,8 +91,8 @@
}
</style>
- <link rel="import" href="/third_party/polymer/components/polymer/polymer.html">
- <link rel="import" href="/third_party/polymer/components/paper-button/paper-button.html">
+ <link rel="import" href="/components/polymer/polymer.html">
+ <link rel="import" href="/components/paper-button/paper-button.html">
<link rel="import" href="/elements/alerts-table.html">
<link rel="import" href="/elements/bug-info.html">
@@ -112,7 +112,7 @@
<overlay-message id="warning-message" opened="true" autoCloseDisabled duration="-1">
{{warning_message}}
{% if warning_bug %}
- <a href="http://crbug.com/{{warning_bug}}">See bug {{warning_bug}}.</a>
+ <a href="https://github.com/catapult-project/catapult/issues/{{warning_bug}}">See bug #{{warning_bug}}.</a>
{% endif %}
</overlay-message>
{% endif %}
diff --git a/catapult/dashboard/dashboard/templates/nav.html b/catapult/dashboard/dashboard/templates/nav.html
index 5618698..6d575b6 100644
--- a/catapult/dashboard/dashboard/templates/nav.html
+++ b/catapult/dashboard/dashboard/templates/nav.html
@@ -109,8 +109,8 @@
}
</script>
-<link rel="import" href="/third_party/polymer/components/polymer/polymer.html">
-<link rel="import" href="/third_party/polymer/components/core-icons/core-icons.html">
+<link rel="import" href="/components/polymer/polymer.html">
+<link rel="import" href="/components/core-icons/core-icons.html">
<style>
#navbar {
diff --git a/catapult/dashboard/dashboard/templates/quick_log_viewer.html b/catapult/dashboard/dashboard/templates/quick_log_viewer.html
index a70148f..1e57c98 100644
--- a/catapult/dashboard/dashboard/templates/quick_log_viewer.html
+++ b/catapult/dashboard/dashboard/templates/quick_log_viewer.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{% block head %}
- <link rel="import" href="/third_party/polymer/components/polymer/polymer.html">
+ <link rel="import" href="/components/polymer/polymer.html">
<link rel="import" href="/elements/quick-log.html">
<style>
diff --git a/catapult/dashboard/dashboard/templates/report.html b/catapult/dashboard/dashboard/templates/report.html
index 1b7a34d..61986b2 100644
--- a/catapult/dashboard/dashboard/templates/report.html
+++ b/catapult/dashboard/dashboard/templates/report.html
@@ -37,7 +37,7 @@
};
</script>
- <link rel="import" href="/third_party/polymer/components/polymer/polymer.html">
+ <link rel="import" href="/components/polymer/polymer.html">
<link rel="import" href="/elements/chart-container.html">
<link rel="import" href="/elements/custom-tooltip.html">
<link rel="import" href="/elements/login-warning.html">
@@ -55,7 +55,7 @@
<overlay-message id="warning-message" opened="true" autoCloseDisabled duration="-1">
{{warning_message}}
{% if warning_bug %}
- <a href="http://crbug.com/{{warning_bug}}">See bug {{warning_bug}}.</a>
+ <a href="https://github.com/catapult-project/catapult/issues/{{warning_bug}}">See bug #{{warning_bug}}.</a>
{% endif %}
</overlay-message>
{% endif %}
diff --git a/catapult/dashboard/dashboard/templates/set_warning_message.html b/catapult/dashboard/dashboard/templates/set_warning_message.html
index 0f05252..5d32ee6 100644
--- a/catapult/dashboard/dashboard/templates/set_warning_message.html
+++ b/catapult/dashboard/dashboard/templates/set_warning_message.html
@@ -18,7 +18,7 @@
</td>
</tr>
<tr>
- <td><b>Bug ID:</b></td>
+ <td><b><a href="https://github.com/catapult-project/catapult/issues">Catapult Issue Tracker</a> Bug ID:</b></td>
<td>
<input name="warning_bug" size="7" value="{{warning_bug}}">
</td>
diff --git a/catapult/dashboard/dashboard/templates/stats.html b/catapult/dashboard/dashboard/templates/stats.html
index c3a59e5..3ea15ba 100644
--- a/catapult/dashboard/dashboard/templates/stats.html
+++ b/catapult/dashboard/dashboard/templates/stats.html
@@ -43,7 +43,7 @@
}
</style>
- <link rel="import" href="/third_party/polymer/components/polymer/polymer.html">
+ <link rel="import" href="/components/polymer/polymer.html">
{% endblock %}
{% block content %}
<h1>Chrome Performance Statistics</h1>
diff --git a/catapult/dashboard/dashboard/tests.html b/catapult/dashboard/dashboard/tests.html
new file mode 100644
index 0000000..cbe2ad2
--- /dev/null
+++ b/catapult/dashboard/dashboard/tests.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<html>
+<!--
+Copyright (c) 2015 The Chromium Authors. All rights reserved.
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file.
+-->
+<head>
+ <title>Dashboard Tests: loading...</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+
+ <link rel="shortcut icon" href="data:image/x-icon;base64,"
+ type="image/x-icon">
+
+ <script src="/components/webcomponentsjs/webcomponents.js"></script>
+
+ <link rel="import" href="/components/polymer/polymer.html">
+ <link rel="import" href="/tracing/base/unittest/interactive_test_runner.html">
+ <style>
+ html, body {
+ box-sizing: border-box;
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+ margin: 0px;
+ }
+ </style>
+</head>
+<body>
+ <script>
+ 'use strict';
+
+ window.addEventListener('load', function() {
+ tr.b.unittest.loadAndRunTests({
+ title: 'All Dashboard Tests',
+ getAllSuiteRelPathsAsync: function() {
+ return tr.b.getAsync('/dashboard/tests').then(function(json) {
+ return JSON.parse(json).test_relpaths;
+ }).catch (function(e) {
+ throw e;
+ });
+ },
+ testLinks: []
+ });
+ });
+
+ </script>
+</body>
+</html>
diff --git a/catapult/dashboard/dashboard/update_bug_with_results.py b/catapult/dashboard/dashboard/update_bug_with_results.py
index 16da6bf..27c3ec7 100644
--- a/catapult/dashboard/dashboard/update_bug_with_results.py
+++ b/catapult/dashboard/dashboard/update_bug_with_results.py
@@ -11,6 +11,7 @@
import sys
import urllib
+from google.appengine.api import app_identity
from google.appengine.api import mail
from google.appengine.api import urlfetch
from google.appengine.api import urlfetch_errors
@@ -277,8 +278,9 @@
if job.use_buildbucket:
try_job_info = _ValidateAndConvertBuildbucketResponse(
buildbucket_service.GetJobStatus(job.buildbucket_job_id))
- issue_url = '/buildbucket_job_status/' + str(
- job.buildbucket_job_id)
+ hostname = app_identity.get_default_version_hostname()
+ job_id = job.buildbucket_job_id
+ issue_url = 'https://%s/buildbucket_job_status/%s' % (hostname, job_id)
else:
response = _FetchURL(_RietveldIssueJSONURL(job))
issue_url = _RietveldIssueURL(job)
diff --git a/catapult/dashboard/dashboard_build/__init__.py b/catapult/dashboard/dashboard_build/__init__.py
new file mode 100644
index 0000000..7adca8a
--- /dev/null
+++ b/catapult/dashboard/dashboard_build/__init__.py
@@ -0,0 +1,10 @@
+# Copyright 2015 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+import os
+import sys
+
+import dashboard_project
+
+
+dashboard_project.UpdateSysPathIfNeeded()
diff --git a/catapult/dashboard/dashboard_build/dashboard_dev_server_config.py b/catapult/dashboard/dashboard_build/dashboard_dev_server_config.py
new file mode 100644
index 0000000..ad2eb01
--- /dev/null
+++ b/catapult/dashboard/dashboard_build/dashboard_dev_server_config.py
@@ -0,0 +1,56 @@
+# Copyright (c) 2015 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import json
+import os
+import sys
+
+import dashboard_project
+
+import webapp2
+from webapp2 import Route
+
+
+def _RelPathToUnixPath(p):
+ return p.replace(os.sep, '/')
+
+
+class TestListHandler(webapp2.RequestHandler):
+ def get(self, *args, **kwargs): # pylint: disable=unused-argument
+ project = dashboard_project.DashboardProject()
+ test_relpaths = ['/' + _RelPathToUnixPath(x)
+ for x in project.FindAllTestModuleRelPaths()]
+
+ tests = {'test_relpaths': test_relpaths}
+ tests_as_json = json.dumps(tests)
+ self.response.content_type = 'application/json'
+ return self.response.write(tests_as_json)
+
+
+class DashboardDevServerConfig(object):
+ def __init__(self):
+ self.project = dashboard_project.DashboardProject()
+
+ def GetName(self):
+ return 'dashboard'
+
+ def GetRunUnitTestsUrl(self):
+ return '/dashboard/tests.html'
+
+ def AddOptionstToArgParseGroup(self, g):
+ g.add_argument('--dashboard-data-dir',
+ default=self.project.dashboard_test_data_path)
+
+ def GetRoutes(self, args): # pylint: disable=unused-argument
+ return [
+ Route('/dashboard/tests', TestListHandler),
+ ]
+
+ def GetSourcePaths(self, args): # pylint: disable=unused-argument
+ return list(self.project.source_paths)
+
+ def GetTestDataPaths(self, args): # pylint: disable=unused-argument
+ return [
+ ('/dashboard/test_data/', args.data_dir),
+ ]
diff --git a/catapult/dashboard/dashboard_project.py b/catapult/dashboard/dashboard_project.py
new file mode 100644
index 0000000..774b1e0
--- /dev/null
+++ b/catapult/dashboard/dashboard_project.py
@@ -0,0 +1,91 @@
+# Copyright (c) 2015 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import sys
+import os
+import re
+
+
+def _AddToPathIfNeeded(path):
+ if path not in sys.path:
+ sys.path.insert(0, path)
+
+
+def UpdateSysPathIfNeeded():
+ p = DashboardProject()
+
+ _AddToPathIfNeeded(p.catapult_third_party_path)
+ _AddToPathIfNeeded(p.catapult_path)
+ _AddToPathIfNeeded(p.tracing_root_path)
+ import tracing_project
+ tracing_project.UpdateSysPathIfNeeded()
+
+
+def _FindAllFilesRecursive(source_paths):
+ assert isinstance(source_paths, list)
+ all_filenames = set()
+ for source_path in source_paths:
+ for dirpath, _, filenames in os.walk(source_path):
+ for f in filenames:
+ if f.startswith('.'):
+ continue
+ x = os.path.abspath(os.path.join(dirpath, f))
+ all_filenames.add(x)
+ return all_filenames
+
+
+def _IsFilenameATest(x):
+ # TODO(chrisphan): Add general test filters.
+ if x.endswith('alert-remove-box-test.html'):
+ return True
+
+ return False
+
+
+class DashboardProject(object):
+ catapult_path = os.path.abspath(
+ os.path.join(os.path.dirname(__file__), '..'))
+ catapult_third_party_path = os.path.abspath(
+ os.path.join(catapult_path, 'third_party'))
+
+ dashboard_root_path = os.path.abspath(
+ os.path.join(catapult_path, 'dashboard'))
+ dashboard_src_path = os.path.abspath(
+ os.path.join(dashboard_root_path, 'dashboard'))
+ dashboard_test_data_path = os.path.abspath(
+ os.path.join(dashboard_root_path, 'test_data'))
+ dashboard_polymer_path = os.path.abspath(
+ os.path.join(catapult_third_party_path, 'polymer'))
+
+ tracing_root_path = os.path.abspath(
+ os.path.join(catapult_path, 'tracing'))
+
+ def __init__(self):
+ self._source_paths = None
+
+ @property
+ def source_paths(self):
+ # We lazily init source_paths to resolve this cyclic dependency
+ # (See perf_insights_project.py).
+ if self._source_paths is None:
+ self._source_paths = []
+ self._source_paths.append(self.dashboard_root_path)
+ self._source_paths.append(self.dashboard_polymer_path)
+
+ import tracing_project as tracing_project_module
+ tracing_project = tracing_project_module.TracingProject()
+ self._source_paths.extend(tracing_project.source_paths)
+
+ return self._source_paths
+
+ def FindAllTestModuleRelPaths(self, pred=None):
+ if pred is None:
+ pred = lambda x: True
+ all_filenames = _FindAllFilesRecursive([self.dashboard_src_path])
+ test_module_filenames = [x for x in all_filenames if
+ _IsFilenameATest(x) and pred(x)]
+ test_module_filenames.sort()
+
+ return [os.path.relpath(x, self.dashboard_root_path)
+ for x in test_module_filenames]
diff --git a/catapult/infra/config/cq.cfg b/catapult/infra/config/cq.cfg
index efb5145..4c9f8bd 100644
--- a/catapult/infra/config/cq.cfg
+++ b/catapult/infra/config/cq.cfg
@@ -12,7 +12,7 @@
verifiers {
reviewer_lgtm {
- committer_list: "catapult"
+ committer_list: "project-catapult-committers"
}
try_job {
diff --git a/catapult/perf_insights/perf_insights/local_file_trace_handle.py b/catapult/perf_insights/perf_insights/local_file_trace_handle.py
index 732ca61..0b28efe 100644
--- a/catapult/perf_insights/perf_insights/local_file_trace_handle.py
+++ b/catapult/perf_insights/perf_insights/local_file_trace_handle.py
@@ -1,11 +1,6 @@
# Copyright (c) 2015 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import gzip
-import os
-import shutil
-import tempfile
-
from perf_insights import trace_handle
@@ -15,13 +10,4 @@
self.filename = filename
def Open(self):
- temp_trace_file = tempfile.NamedTemporaryFile(
- dir=os.path.dirname(self.filename))
- try:
- with gzip.GzipFile(self.filename) as unzipped:
- shutil.copyfileobj(unzipped, temp_trace_file)
- temp_trace_file.flush()
- return temp_trace_file
- except IOError:
- temp_trace_file.close()
- return open(self.filename, 'r')
+ return open(self.filename, 'r')
diff --git a/catapult/perf_insights/perf_insights/map_single_trace_cmdline.html b/catapult/perf_insights/perf_insights/map_single_trace_cmdline.html
index 5776c35..bb9d71a 100644
--- a/catapult/perf_insights/perf_insights/map_single_trace_cmdline.html
+++ b/catapult/perf_insights/perf_insights/map_single_trace_cmdline.html
@@ -97,7 +97,7 @@
results.didFinishAllRuns();
results.allValues.forEach(function(value) {
- valueAsDict = value.asDict();
+ var valueAsDict = value.asDict();
console.log('MAP_RESULT_VALUE: ' + JSON.stringify(valueAsDict));
});
return 0;
diff --git a/catapult/perf_insights/perf_insights/mappers/task_info_map_function.html b/catapult/perf_insights/perf_insights/mappers/task_info_map_function.html
index f706edc..ad87053 100644
--- a/catapult/perf_insights/perf_insights/mappers/task_info_map_function.html
+++ b/catapult/perf_insights/perf_insights/mappers/task_info_map_function.html
@@ -5,6 +5,7 @@
found in the LICENSE file.
-->
+<link rel="import" href="/perf_insights/mappers/thread_grouping.html">
<link rel="import" href="/perf_insights/map_function.html">
<link rel="import" href="/perf_insights/value/value.html">
<link rel="import" href="/tracing/base/units/histogram.html">
@@ -18,8 +19,10 @@
var NUM_BINS = 50;
function taskInfoMapFunction(results, run_info, model) {
- addTimeInQueue(results, run_info, model);
- addTopLevelTasksDuration(results, run_info, model);
+ var threadGrouping = new pi.wr.ThreadGrouping();
+ threadGrouping.autoInitUsingHelpers(model);
+ addTimeInQueue(results, run_info, model, threadGrouping);
+ addTopLevelTasksDuration(results, run_info, model, threadGrouping);
}
function eatTrailingDigits(str) {
@@ -34,7 +37,7 @@
}
}
- function addTimeInQueue(results, run_info, model) {
+ function addTimeInQueue(results, run_info, model, threadGrouping) {
var timeInQueue = {};
model.flowEvents.forEach(function(flowEvent) {
if (!flowEvent.endSlice instanceof tr.model.Slice)
@@ -46,7 +49,7 @@
if (!process)
return;
var threadName = eatTrailingDigits(thread.name) || 'Unknown';
- var processName = eatTrailingDigits(process.name) || 'Unknown';
+ var processName = threadGrouping.getGroupNameForThread(thread);
addToHistogram(timeInQueue, processName, threadName, flowEvent.duration);
});
histogramsToDict(timeInQueue);
@@ -56,7 +59,7 @@
timeInQueue));
}
- function addTopLevelTasksDuration(results, run_info, model) {
+ function addTopLevelTasksDuration(results, run_info, model, threadGrouping) {
var timeInTask = {};
var cpuTimeInTask = {};
model.getAllThreads().forEach(function(thread) {
@@ -64,7 +67,7 @@
if (!process)
return;
var threadName = eatTrailingDigits(thread.name) || thread.tid;
- var processName = eatTrailingDigits(process.name) || process.pid;
+ var processName = threadGrouping.getGroupNameForThread(thread);
if (!thread.sliceGroup.length)
return;
thread.sliceGroup.slices.forEach(function(slice) {
diff --git a/catapult/perf_insights/perf_insights/mappers/task_info_map_function_test.html b/catapult/perf_insights/perf_insights/mappers/task_info_map_function_test.html
index ff7b134..de6dd1c 100644
--- a/catapult/perf_insights/perf_insights/mappers/task_info_map_function_test.html
+++ b/catapult/perf_insights/perf_insights/mappers/task_info_map_function_test.html
@@ -23,7 +23,7 @@
var p1 = m.getOrCreateProcess(1);
p1.name = 'Process';
var t2 = p1.getOrCreateThread(2);
- t2.name = 'Thread';
+ t2.name = 'CrBrowserMain'; // To identify as browser process.
// t2_s0 is not a top-level, no incoming flow.
var t2_s0 = test_utils.newSliceEx(
{ start: 0, duration: 9.7, cpuStart: 0, cpuDuration: 5.3});
@@ -57,19 +57,22 @@
assert.equal(results.allValues.length, 3);
var value = results.allValues[0];
assert.equal(value.name, 'time_spent_in_queue');
- assert.equal(Object.keys(value.value['Process']).length, 1);
- var histogram = tr.b.u.Histogram.fromDict(value.value['Process']['Thread']);
+ assert.equal(Object.keys(value.value['browser']).length, 1);
+ var histogram = tr.b.u.Histogram.fromDict(
+ value.value['browser']['CrBrowserMain']);
assert.equal(histogram.getBinForValue(7.2).count, 1);
assert.equal(histogram.getBinForValue(18.1).count, 1);
value = results.allValues[1];
assert.equal(value.name, 'time_spent_in_top_level_task');
- assert.equal(Object.keys(value.value['Process']).length, 1);
- histogram = tr.b.u.Histogram.fromDict(value.value['Process']['Thread']);
+ assert.equal(Object.keys(value.value['browser']).length, 1);
+ histogram = tr.b.u.Histogram.fromDict(
+ value.value['browser']['CrBrowserMain']);
assert.equal(histogram.getBinForValue(10.4).count, 1);
value = results.allValues[2];
assert.equal(value.name, 'cpu_time_spent_in_top_level_task');
- assert.equal(Object.keys(value.value['Process']).length, 1);
- histogram = tr.b.u.Histogram.fromDict(value.value['Process']['Thread']);
+ assert.equal(Object.keys(value.value['browser']).length, 1);
+ histogram = tr.b.u.Histogram.fromDict(
+ value.value['browser']['CrBrowserMain']);
assert.equal(histogram.getBinForValue(3.0).count, 1);
});
});
diff --git a/catapult/perf_insights/perf_insights/mappers/thread_grouping.html b/catapult/perf_insights/perf_insights/mappers/thread_grouping.html
index 3d76038..c831a0e 100644
--- a/catapult/perf_insights/perf_insights/mappers/thread_grouping.html
+++ b/catapult/perf_insights/perf_insights/mappers/thread_grouping.html
@@ -45,18 +45,21 @@
// here, too.
},
+ getGroupNameForThread: function(thread) {
+ if (!(thread instanceof tr.model.EventContainer))
+ return 'error';
+
+ var groupName = this.groupNameForThreadGUID_[thread.guid];
+ if (groupName === undefined)
+ return 'other';
+ return groupName;
+ },
+
getGroupNameForEvent: function(event) {
var parentContainer = event.parentContainer;
if (parentContainer === undefined)
return 'unknown';
-
- if (!(parentContainer instanceof tr.model.EventContainer))
- return 'error';
-
- var groupName = this.groupNameForThreadGUID_[parentContainer.guid];
- if (groupName === undefined)
- return 'other';
- return groupName;
+ return this.getGroupNameForThread(parentContainer);
},
addThreadsInProcessToGroup_: function(process, groupName,
@@ -103,4 +106,4 @@
ThreadGrouping: ThreadGrouping
};
});
-</script>
\ No newline at end of file
+</script>
diff --git a/catapult/perf_insights/perf_insights/mappers/weather_report_map_function.html b/catapult/perf_insights/perf_insights/mappers/weather_report_map_function.html
index f1017fd..859ed50 100644
--- a/catapult/perf_insights/perf_insights/mappers/weather_report_map_function.html
+++ b/catapult/perf_insights/perf_insights/mappers/weather_report_map_function.html
@@ -4,6 +4,8 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
+<link rel="import" href="/tracing/base/units/units.html">
+<link rel="import" href="/tracing/base/units/histogram.html">
<link rel="import" href="/perf_insights/map_function.html">
<link rel="import" href="/perf_insights/value/value.html">
<link rel="import" href="/perf_insights/mappers/slice_cost.html">
@@ -18,18 +20,44 @@
tr.exportTo('pi.wr', function() {
function getWeatherReportFromModel(model) {
- var railIRs = model.interactionRecords.filter(function(ir) {
- return ir instanceof tr.e.rail.RAILInteractionRecord;
+ // Organize all RAIL IRs by type and name in a tree. A node of this tree is
+ // a dict with keys |overallScore|, |scores| and optionally |subTypes|.
+ // |overallScore| and |scores| are mutually exclusive. If |overallScore| is
+ // present it contains the overall rail score of all IRs under the tree. If
+ // |scores| is present it contains an array with the IR scores of all the
+ // IRs under the tree. |subTypes| is a map from a subType (IR type, IR name)
+ // to a node.
+ var irTree = {
+ overallScore: 0
+ };
+ var allIRs = [];
+ function addIRToNode(node, ir, path) {
+ if (node.overallScore === undefined) {
+ // For a node without overall rail score keep the individual IR scores.
+ node.irScores = node.irScores || [];
+ node.irScores.push(ir.railScore);
+ }
+ if (path.length === 0)
+ return;
+ var subType = path[0];
+ node.subTypes = node.subTypes || {};
+ node.subTypes[subType] = node.subTypes[subType] || {};
+ addIRToNode(node.subTypes[subType], ir, path.slice(1));
+ }
+ model.interactionRecords.forEach(function(ir) {
+ if (!(ir instanceof tr.e.rail.RAILInteractionRecord))
+ return;
+ allIRs.push(ir);
+ addIRToNode(irTree, ir, [ir.railTypeName, ir.name || 'Unknown name']);
});
+ irTree.overallScore = (new tr.e.rail.RAILScore(allIRs)).overallScore;
- var railTypeNameByGUID = getRAILTypeNameForEventsByGUID(model, railIRs);
-
+ var railTypeNameByGUID = getRAILTypeNameForEventsByGUID(model, allIRs);
var threadGrouping = new pi.wr.ThreadGrouping();
threadGrouping.autoInitUsingHelpers(model);
- var railScore = new tr.e.rail.RAILScore(railIRs);
var wr = {
- railScore: railScore.asDict(),
+ irTree: irTree,
irCoverage: tr.model.getIRCoverageFromModel(model),
sliceCosts: pi.wr.getSliceCostReport(model, threadGrouping,
railTypeNameByGUID)
@@ -56,7 +84,6 @@
return railTypeNameByGUID;
}
-
function weatherReportMapFunction(results, runInfo, model) {
var wr = pi.wr.getWeatherReportFromModel(model);
results.addValue(new pi.v.DictValue(runInfo, 'wr', wr));
diff --git a/catapult/perf_insights/perf_insights/results/gtest_progress_reporter.py b/catapult/perf_insights/perf_insights/results/gtest_progress_reporter.py
index 3c728e3..cf9d778 100644
--- a/catapult/perf_insights/perf_insights/results/gtest_progress_reporter.py
+++ b/catapult/perf_insights/perf_insights/results/gtest_progress_reporter.py
@@ -25,7 +25,7 @@
self._output_stream.flush()
elif isinstance(value, value_module.SkipValue):
print >> self._output_stream, '===== SKIPPING TEST %s: %s =====' % (
- value.run_info.display_name, value.reason)
+ value.run_info.display_name, value.description)
def DidRun(self, run_failed):
super(GTestRunReporter, self).DidRun(run_failed)
@@ -92,4 +92,4 @@
print >> self._output_stream, 'Skipped:\n%s\n' % ('\n'.join(
v.run_info.display_name for v in results.skip_values))
- self._output_stream.flush()
\ No newline at end of file
+ self._output_stream.flush()
diff --git a/catapult/perf_insights/perf_insights/timeline_based_measurement/rendering_frame.html b/catapult/perf_insights/perf_insights/timeline_based_measurement/rendering_frame.html
new file mode 100644
index 0000000..9465392
--- /dev/null
+++ b/catapult/perf_insights/perf_insights/timeline_based_measurement/rendering_frame.html
@@ -0,0 +1,116 @@
+<!DOCTYPE HTML>
+<!--
+Copyright (c) 2015 The Chromium Authors. All rights reserved.
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file.
+-->
+<link rel="import" href="/tracing/base/range.html">
+<link rel="import" href="/tracing/extras/chrome/cc/constants.html">
+<link rel="import" href="/tracing/model/slice.html">
+
+<script>
+'use strict';
+
+tr.exportTo('pi.tbm', function() {
+
+ var SEND_BEGIN_FRAME_EVENT = tr.e.cc.constants.SEND_BEGIN_FRAME_EVENT;
+ var BEGIN_MAIN_FRAME_EVENT = tr.e.cc.constants.BEGIN_MAIN_FRAME_EVENT;
+
+ /* Object with info about the triggering of a BeginMainFrame event.
+ * Do not construct this directly. Use RenderingFrame.fromEvents instead.
+ */
+ function RenderingFrame(sendBeginFrame, beginMainFrame) {
+ this.sendBeginFrame_ = sendBeginFrame;
+ this.beginMainFrame_ = beginMainFrame;
+
+ this.range_ = new tr.b.Range();
+ this.beginMainFrame_.addBoundsToRange(this.range_);
+ this.sendBeginFrame_.addBoundsToRange(this.range_);
+ }
+
+ /**
+ * Construct RenderingFrame from a list of events.
+ * Return undefined if data are missing.
+ */
+ function createRenderingFrameFromEvents(events) {
+ var allSendBeginFrameEvents = events.filter(function(e) {
+ return e.title === SEND_BEGIN_FRAME_EVENT;
+ });
+ if (allSendBeginFrameEvents.length !== 1)
+ return undefined;
+
+ var allBeginMainFrameEvents = events.filter(function(e) {
+ return e.title === BEGIN_MAIN_FRAME_EVENT;
+ });
+ if (allBeginMainFrameEvents.length === 0)
+ return undefined;
+
+ allBeginMainFrameEvents.sort(function(a, b) {
+ return a.start - b.start;
+ });
+ return new RenderingFrame(
+ allSendBeginFrameEvents[0],
+ allBeginMainFrameEvents[allBeginMainFrameEvents.length - 1]);
+ }
+
+ RenderingFrame.prototype = {
+ get range() {
+ return this.range_;
+ },
+
+ get queueDuration() {
+ return this.beginMainFrame_.start - this.sendBeginFrame_.start;
+ }
+ };
+
+ /* Returns RenderingFrames for all relevant events in the timelineRange. */
+ RenderingFrame.getFrameEventsInsideRange = function(
+ rendererProcess, timelineRange) {
+ if (!(timelineRange instanceof tr.b.Range))
+ throw new Error('timelineRange must is Range object');
+ // First filter all events from the rendererProcess and turn them into a
+ // dictonary from event ids -> events objects that are either
+ // send_begin_frame or begin_main_frame event.
+ // e.g:
+ // {132: [send_begin_frame, begin_main_frame, begin_main_frame],
+ // 213: [begin_main_frame, send_begin_frame],
+ // 9312: [send_begin_frame, begin_main_frame]}
+ var beginFrameEventsById = {};
+ rendererProcess.iterateAllEvents(function(event) {
+ var beginFrameId;
+ if (event instanceof tr.model.Slice &&
+ (event.title === SEND_BEGIN_FRAME_EVENT ||
+ event.title === BEGIN_MAIN_FRAME_EVENT)) {
+ beginFrameId = event.args['begin_frame_id'];
+ if (beginFrameId === undefined) {
+ throw new Error(
+ 'Event is missing a beginFrameId.');
+ }
+ }
+ beginFrameEventsById[beginFrameId] =
+ beginFrameEventsById[beginFrameId] || [];
+ beginFrameEventsById[beginFrameId].push(event);
+ });
+
+ // Now, create RenderingFrames for events wherever possible.
+ var frames = [];
+ for (var id in beginFrameEventsById) {
+ var events = beginFrameEventsById[id];
+ var frame = createRenderingFrameFromEvents(events);
+ if (frame === undefined)
+ continue;
+ if (frame.range.intersectsRange(timelineRange))
+ frames.push(frame);
+ frames.sort(function(a, b) {
+ return a.range.min - b.range.min;
+ });
+ }
+
+ return frames;
+ }
+
+ return {
+ RenderingFrame: RenderingFrame
+ };
+});
+</script>
diff --git a/catapult/perf_insights/perf_insights/timeline_based_measurement/rendering_frame_test.html b/catapult/perf_insights/perf_insights/timeline_based_measurement/rendering_frame_test.html
new file mode 100644
index 0000000..9afb906
--- /dev/null
+++ b/catapult/perf_insights/perf_insights/timeline_based_measurement/rendering_frame_test.html
@@ -0,0 +1,223 @@
+<!DOCTYPE html>
+<!--
+Copyright (c) 2015 The Chromium Authors. All rights reserved.
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file.
+-->
+
+<link rel="import"
+ href="/perf_insights/timeline_based_measurement/rendering_frame.html">
+
+<link rel="import" href="/tracing/base/range.html">
+<link rel="import" href="/tracing/base/statistics.html">
+<link rel="import" href="/tracing/core/test_utils.html">
+<link rel="import" href="/tracing/extras/chrome/cc/constants.html">
+<link rel="import" href="/tracing/extras/chrome/chrome_test_utils.html">
+<link rel="import" href="/tracing/model/model.html">
+
+<script>
+'use strict';
+
+tr.b.unittest.testSuite(function() {
+
+ var ThreadSlice = tr.model.ThreadSlice;
+ var RenderingFrame = pi.tbm.RenderingFrame;
+ var SEND_BEGIN_FRAME_EVENT = tr.e.cc.constants.SEND_BEGIN_FRAME_EVENT;
+ var BEGIN_MAIN_FRAME_EVENT = tr.e.cc.constants.BEGIN_MAIN_FRAME_EVENT;
+ var Range = tr.b.Range;
+
+ function RenderingFrameTestData() {
+ this.beginFrameId_ = 0;
+ this.events_ = [];
+ this.rendererProcess_ = (new tr.Model()).getOrCreateProcess(1);
+ this.mainThread_ = this.rendererProcess_.getOrCreateThread(11);
+ this.compositorThread_ = this.rendererProcess_.getOrCreateThread(12);
+ }
+
+ RenderingFrameTestData.prototype = {
+ get events() {
+ return this.events_;
+ },
+
+ get rendererProcess() {
+ return this.rendererProcess_;
+ },
+
+ get compositorThread() {
+ return this.compositorThread_;
+ },
+
+ addSendEvent: function(opt_ts, opt_duration) {
+ if (opt_ts === undefined)
+ opt_ts = 0;
+ if (opt_duration === undefined)
+ opt_duration = 1;
+ this.beginFrameId_ += 1;
+ var event = this.createEvent_(
+ SEND_BEGIN_FRAME_EVENT, opt_ts, opt_duration);
+ this.compositorThread_.sliceGroup.pushSlice(event);
+ },
+
+ addBeginMainFrameEvent: function(opt_ts, opt_duration) {
+ if (opt_ts === undefined)
+ opt_ts = 0;
+ if (opt_duration === undefined)
+ opt_duration = 1;
+ var event = this.createEvent_(
+ BEGIN_MAIN_FRAME_EVENT, opt_ts, opt_duration);
+ this.mainThread_.sliceGroup.pushSlice(event);
+ },
+
+ updateBounds: function() {
+ this.rendererProcess_.updateBounds();
+ },
+
+ createEvent_: function(eventTitle, ts, duration) {
+ var event = new ThreadSlice('cc,benchmark', eventTitle, 0, ts, {
+ 'begin_frame_id': this.beginFrameId_
+ }, duration);
+ this.events_.push(event);
+ return event;
+ }
+ };
+
+ function generateTimelineRange(opt_start, opt_end) {
+ if (opt_start === undefined)
+ opt_start = 0;
+ if (opt_end === undefined)
+ opt_end = 100;
+ var timelineRange = new tr.b.Range();
+ timelineRange.min = opt_start;
+ timelineRange.max = opt_end;
+ return timelineRange;
+ }
+
+ test('renderingFrameConstruction', function() {
+ var r = new RenderingFrameTestData();
+ r.addSendEvent(10);
+ r.addBeginMainFrameEvent(20);
+ r.updateBounds();
+ var frames = RenderingFrame.getFrameEventsInsideRange(
+ r.rendererProcess, Range.fromExplicitRange(0, 30));
+ assert.equal(1, frames.length);
+ assert.equal(10, frames[0].queueDuration);
+ });
+
+ test('renderingFrame_missingSendBeginFrameEvents', function() {
+ var r = new RenderingFrameTestData();
+ r.addBeginMainFrameEvent(10);
+ r.updateBounds();
+ var frames = RenderingFrame.getFrameEventsInsideRange(
+ r.rendererProcess, Range.fromExplicitRange(0, 30));
+ assert.equal(0, frames.length);
+ });
+
+ test('renderingFrame_duplicateSendBeginFrameEvents', function() {
+ var r = new RenderingFrameTestData();
+ r.addSendEvent(10);
+ r.addBeginMainFrameEvent(20);
+ var begin_frame_id = r.events[0].args['begin_frame_id'];
+ r.compositorThread.sliceGroup.pushSlice(new ThreadSlice(
+ 'cc,benchmark', SEND_BEGIN_FRAME_EVENT, 0, 30,
+ {'begin_frame_id': begin_frame_id}, 0));
+ r.updateBounds();
+ var frames = RenderingFrame.getFrameEventsInsideRange(
+ r.rendererProcess, Range.fromExplicitRange(0, 30));
+ assert.equal(0, frames.length);
+ });
+
+ test('renderingFrame_missingBeginMainFrameEvents', function() {
+ var r = new RenderingFrameTestData();
+ r.addSendEvent(10);
+ r.updateBounds();
+ var frames = RenderingFrame.getFrameEventsInsideRange(
+ r.rendererProcess, Range.fromExplicitRange(0, 30));
+ assert.equal(0, frames.length);
+ });
+
+ test('renderingFrame_duplicateBeginMainFrameEvents', function() {
+ var r = new RenderingFrameTestData();
+ r.addSendEvent(10);
+ r.addBeginMainFrameEvent(20);
+ r.addBeginMainFrameEvent(30);
+ r.addBeginMainFrameEvent(40);
+ r.updateBounds();
+
+ var frames = RenderingFrame.getFrameEventsInsideRange(
+ r.rendererProcess, Range.fromExplicitRange(0, 30));
+ assert.equal(1, frames.length);
+ assert.equal(30, frames[0].queueDuration);
+ });
+
+ test('renderingFrame_frameEventMissingBeginFrameId', function() {
+ var model = new tr.Model();
+ var process = model.getOrCreateProcess(1);
+ var main_thread = process.getOrCreateThread(11);
+ var model_range = {};
+
+ // Create an event without the begin_frame_id argument
+ var event = new ThreadSlice(
+ 'cc,benchmark', BEGIN_MAIN_FRAME_EVENT, 0, 0.0);
+ main_thread.sliceGroup.pushSlice(event);
+ process.updateBounds();
+ try {
+ RenderingFrame.getFrameEventsInsideRange(process, model_range);
+ assert.isFalse(true, 'Exception should have been thrown');
+ } catch (err) {
+ assert.equal(true, true);
+ }
+ });
+
+ /**
+ * Test a basic sequenece, with expected frame queueing delays A and B.
+ *
+ * |----A----| |--B--|
+ * Main: [1] [1] [2]
+ *
+ * Compositor: [1] [2]
+ **/
+ test('renderingFrame_getFrameEventsInsideRange', function() {
+ var r = new RenderingFrameTestData();
+ r.addSendEvent(10);
+ r.addBeginMainFrameEvent(20);
+ r.addBeginMainFrameEvent(30);
+ r.addSendEvent(40);
+ r.addBeginMainFrameEvent(50);
+ r.updateBounds();
+
+ var timelineRange = generateTimelineRange();
+ var frameEvents = RenderingFrame.getFrameEventsInsideRange(
+ r.rendererProcess, timelineRange);
+
+ assert.equal(2, frameEvents.length);
+ assert.equal(20, frameEvents[0].queueDuration);
+ assert.equal(10, frameEvents[1].queueDuration);
+ });
+
+ /**
+ * Test a sequenece missing an initial SendBeginFrame.
+ *
+ * Only one frame should be returned, with expected frame queueing delay A.
+ * |--A--|
+ * Main: [0] [0] [2]
+ *
+ * Compositor: [2]
+ **/
+ test('renderingFrame_frameEventsMissingDataNotIncluded', function() {
+ var r = new RenderingFrameTestData();
+ r.addBeginMainFrameEvent(20);
+ r.addBeginMainFrameEvent(30);
+ r.addSendEvent(40);
+ r.addBeginMainFrameEvent(50);
+ r.updateBounds();
+
+ var timelineRange = generateTimelineRange();
+ var frameEvents = RenderingFrame.getFrameEventsInsideRange(
+ r.rendererProcess, timelineRange);
+
+ assert.equal(1, frameEvents.length);
+ assert.equal(10, frameEvents[0].queueDuration);
+ });
+
+});
+</script>
diff --git a/catapult/perf_insights/perf_insights/ui/reports/rail_score_report.html b/catapult/perf_insights/perf_insights/ui/reports/rail_score_report.html
index 22d97db..e3be145 100644
--- a/catapult/perf_insights/perf_insights/ui/reports/rail_score_report.html
+++ b/catapult/perf_insights/perf_insights/ui/reports/rail_score_report.html
@@ -4,17 +4,21 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
-<link rel="import" href="/tracing/base/units/units.html">
<link rel="import" href="/tracing/base/units/histogram.html">
+<link rel="import" href="/tracing/base/units/scalar.html">
+<link rel="import" href="/tracing/base/units/units.html">
<link rel="import" href="/tracing/ui/base/dom_helpers.html">
<link rel="import" href="/tracing/ui/base/info_bar_group.html">
<link rel="import" href="/tracing/ui/base/overlay.html">
+<link rel="import" href="/tracing/ui/base/table.html">
<link rel="import" href="/tracing/ui/units/generic_table_view.html">
<link rel="import" href="/tracing/ui/units/histogram_span.html">
+<link rel="import" href="/tracing/ui/units/scalar_span.html">
<link rel="import" href="/perf_insights/results/results.html">
-<link rel="import" href="/perf_insights/ui/reports/pi_report.html">
-<link rel="import" href="/perf_insights/ui/grouping_table.html">
+<link rel="import" href="/perf_insights/ui/caching_column.html">
<link rel="import" href="/perf_insights/ui/generic_results_view.html">
+<link rel="import" href="/perf_insights/ui/grouping_table.html">
+<link rel="import" href="/perf_insights/ui/reports/pi_report.html">
<link rel="import" href="/perf_insights/mappers/slice_cost.html">
<polymer-element name="pi-ui-r-rail-score-report"
@@ -32,6 +36,9 @@
max-width: 400px;
}
</style>
+ <tr-ui-b-table id="table"></tr-ui-b-table>
+
+ <h1>Histogram</h1>
<tr-ui-u-histogram-span id="histogram"></tr-ui-u-histogram-span>
</template>
<script>
@@ -43,6 +50,10 @@
},
ready: function() {
+ this.$.table.addEventListener('selection-changed', function(tableEvent) {
+ tableEvent.stopPropagation();
+ this.setHistogramBasedOnSelection_();
+ }.bind(this));
},
get mapResults() {
@@ -55,25 +66,97 @@
},
updateContents_: function() {
- var table = this.$.table;
-
var results = this.mapResults_;
if (!results)
results = new tr.r.Results();
- var overallScoreHistogram = tr.b.u.Histogram.createLinear(
- tr.b.u.Units.normalizedPercentage,
- tr.b.Range.fromExplicitRange(0, 1),
- 10);
- results.allValuesFromFailureFreeRuns.map(function(v) {
- if (!v.value.railScore)
- return;
- var railScore = v.value.railScore;
- overallScoreHistogram.add(railScore.overallScore,
- v.runInfo.url);
- });
+ var table = this.$.table;
- this.$.histogram.histogram = overallScoreHistogram;
+ var columns = this.createColumns_();
+ table.tableColumns = columns;
+ table.sortColumnIndex = 1;
+ table.sortDescending = true;
+ table.supportsSelection = true;
+ table.rowHighlightEnabled = true;
+
+ var railScoreHistograms = {};
+ results.allValuesFromFailureFreeRuns.map(function(v) {
+ if (!v.value.irTree)
+ return;
+ this.addToHistograms_(railScoreHistograms, v.value.irTree,
+ v.runInfo.url);
+ }.bind(this));
+ var overallRow = this.convertToRowAndSubRows_(railScoreHistograms);
+ overallRow.title = 'Overall RAIL score';
+ table.tableRows = [overallRow];
+ },
+
+ createColumns_: function() {
+ var columns = [{
+ title: 'Title',
+ value: function(row) {
+ return row.title;
+ },
+ cmp: function(a, b) {
+ return a.title.localeCompare(b.title);
+ },
+ width: '500px'
+ },
+ {
+ title: 'Avg. RAIL score',
+ value: function(row) {
+ return tr.ui.units.createScalarSpan(
+ new tr.b.u.Scalar(row.histogram.average,
+ tr.b.u.Units.normalizedPercentage));
+ },
+ cmp: function(a, b) {
+ return a.histogram.average - b.histogram.average;
+ }
+ }
+ ];
+ return columns;
+ },
+
+ addToHistograms_: function(histograms, irTree, url) {
+ histograms.histogram = histograms.histogram ||
+ tr.b.u.Histogram.createLinear(
+ tr.b.u.Units.normalizedPercentage,
+ tr.b.Range.fromExplicitRange(0, 1),
+ 10);
+ if (irTree.overallScore !== undefined)
+ histograms.histogram.add(irTree.overallScore, url);
+ if (irTree.irScores) {
+ irTree.irScores.forEach(function(irScore) {
+ histograms.histogram.add(irScore, url);
+ });
+ }
+ if (!irTree.subTypes)
+ return;
+ histograms.subTypes = histograms.subTypes || {};
+ for (var subType in irTree.subTypes) {
+ histograms.subTypes[subType] = histograms.subTypes[subType] || {};
+ this.addToHistograms_(histograms.subTypes[subType],
+ irTree.subTypes[subType], url);
+ }
+ },
+
+ convertToRowAndSubRows_: function(histograms) {
+ var row = {
+ histogram: histograms.histogram
+ };
+ if (!histograms.subTypes)
+ return row;
+ row.subRows = [];
+ for (var subType in histograms.subTypes) {
+ var subRow = this.convertToRowAndSubRows_(histograms.subTypes[subType]);
+ subRow.title = subType;
+ row.subRows.push(subRow);
+ }
+ return row;
+ },
+
+ setHistogramBasedOnSelection_: function() {
+ this.$.histogram.histogram = this.$.table.selectedTableRow.histogram;
}
});
</script>
diff --git a/catapult/perf_insights/perf_insights/ui/reports/slice_cost_report.html b/catapult/perf_insights/perf_insights/ui/reports/slice_cost_report.html
index 4cad9b4..5661c21 100644
--- a/catapult/perf_insights/perf_insights/ui/reports/slice_cost_report.html
+++ b/catapult/perf_insights/perf_insights/ui/reports/slice_cost_report.html
@@ -9,6 +9,7 @@
<link rel="import" href="/tracing/ui/base/overlay.html">
<link rel="import" href="/tracing/ui/units/time_duration_span.html">
<link rel="import" href="/perf_insights/results/results.html">
+<link rel="import" href="/perf_insights/ui/caching_column.html">
<link rel="import" href="/perf_insights/ui/reports/pi_report.html">
<link rel="import" href="/perf_insights/ui/grouping_table.html">
<link rel="import" href="/perf_insights/ui/generic_results_view.html">
@@ -141,31 +142,6 @@
},
createColumns_: function() {
-
- function compareTimestamps(x, y) {
- return x - y;
- }
-
- function getStatsForRow(row) {
- if (row.stats_ === undefined) {
- var stats = {
- cpuSelfTime: tr.b.Statistics.mean(
- row.data,
- function(sliceCostInfo) {
- return sliceCostInfo.cpuSelfTime;
- }),
- selfTime: tr.b.Statistics.mean(
- row.data,
- function(sliceCostInfo) {
- return sliceCostInfo.selfTime;
- })
- };
- row.stats_ = stats;
- }
- return row.stats_;
- }
-
-
var columns = [
{
title: 'Title',
@@ -174,42 +150,33 @@
},
width: '500px'
},
- {
- title: 'Self time',
- value: function(row) {
- var stats = getStatsForRow(row);
- if (stats.selfTime === undefined)
- return;
- return tr.ui.units.createTimeDurationSpan(
- stats.selfTime);
- },
- cmp: function(a, b) {
- var sA = getStatsForRow(a);
- var sB = getStatsForRow(b);
- return tr.b.comparePossiblyUndefinedValues(
- sA.selfTime, sB.selfTime,
- compareTimestamps);
- }
- },
- {
- title: 'CPU Self time',
- value: function(row) {
- var stats = getStatsForRow(row);
- if (stats.cpuSelfTime === undefined)
- return;
- return tr.ui.units.createTimeDurationSpan(
- stats.cpuSelfTime);
- },
- cmp: function(a, b) {
- var sA = getStatsForRow(a);
- var sB = getStatsForRow(b);
- return tr.b.comparePossiblyUndefinedValues(
- sA.cpuSelfTime, sB.cpuSelfTime,
- compareTimestamps);
- }
- }
+ this.createCachingColumn_('Self time', function(sliceCostInfo) {
+ return sliceCostInfo.selfTime;
+ }),
+ this.createCachingColumn_('CPU Self time', function(sliceCostInfo) {
+ return sliceCostInfo.cpuSelfTime;
+ })
];
return columns;
+ },
+
+ createCachingColumn_(title, getDataFunction) {
+ function computeStats(sliceCostInfo) {
+ var mean = tr.b.Statistics.mean(sliceCostInfo, getDataFunction);
+ return mean === undefined ? undefined :
+ tr.ui.units.createTimeDurationSpan(mean);
+ }
+
+ var column = new pi.ui.CachingColumn(title, computeStats);
+ column.cmp = function(row0, row1) {
+ var value0 = column.value(row0);
+ var value1 = column.value(row1);
+ return tr.b.comparePossiblyUndefinedValues(value0, value1,
+ function(v0, v1) {
+ return v0.duration - v1.duration;
+ });
+ };
+ return column;
}
});
</script>
diff --git a/catapult/perf_insights/perf_insights/ui/reports/task_info_report.html b/catapult/perf_insights/perf_insights/ui/reports/task_info_report.html
index fafd232..4fe540c 100644
--- a/catapult/perf_insights/perf_insights/ui/reports/task_info_report.html
+++ b/catapult/perf_insights/perf_insights/ui/reports/task_info_report.html
@@ -9,14 +9,13 @@
<link rel="import" href="/tracing/ui/base/dom_helpers.html">
<link rel="import" href="/tracing/ui/base/info_bar_group.html">
<link rel="import" href="/tracing/ui/base/overlay.html">
-<link rel="import" href="/tracing/ui/base/table.html">
<link rel="import" href="/tracing/ui/units/histogram_span.html">
<link rel="import" href="/tracing/ui/units/time_duration_span.html">
<link rel="import" href="/perf_insights/results/results.html">
-<link rel="import" href="/perf_insights/ui/reports/pi_report.html">
-<link rel="import" href="/perf_insights/ui/generic_results_view.html">
<link rel="import" href="/perf_insights/ui/caching_column.html">
+<link rel="import" href="/perf_insights/ui/generic_results_view.html">
<link rel="import" href="/perf_insights/ui/grouping_table.html">
+<link rel="import" href="/perf_insights/ui/reports/pi_report.html">
<link rel="import" href="/perf_insights/mappers/reduce.html">
<link rel="import" href="/perf_insights/mappers/slice_cost.html">
@@ -108,8 +107,6 @@
groupBy.push(function(datum) {
return datum.thread;
});
- table.supportsSelection = true;
- table.groupBy = groupBy;
table.groupBy = groupBy;
table.dataToGroup = rows;
table.supportsSelection = true;
@@ -147,30 +144,13 @@
createColumns_: function() {
- function getStatsForRow(row) {
- if (row.stats_ === undefined) {
- row.stats_ = {};
- COLUMN_INFOS.forEach(function(info) {
- info.statSetter(row.stats_,
- averageFromHistograms(info.type, row.data));
- });
- }
- return row.stats_;
- }
-
var columns = [{
title: 'Title',
value: function(row) {
return row.title;
},
cmp: function(a, b) {
- var sA = a.title;
- var sB = b.title;
- if (sA < sB)
- return -1;
- if (sA > sB)
- return 1;
- return 0;
+ return a.title.localeCompare(b.title);
},
width: '500px'
},
@@ -184,7 +164,7 @@
return columns;
},
- createCachingColumn_(title, type) {
+ createCachingColumn_: function(title, type) {
function averageFromHistograms(data) {
var runningSum = 0;
diff --git a/catapult/third_party/vinn/bin/update_v8 b/catapult/third_party/vinn/bin/update_v8
new file mode 100755
index 0000000..fc43eac
--- /dev/null
+++ b/catapult/third_party/vinn/bin/update_v8
@@ -0,0 +1,162 @@
+#!/usr/bin/env python
+# Copyright 2015 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+"""Updates the 64 bit d8 binary for the current OS to match the v8 version used
+in the current version of the specified Chromium channel. If no channel is
+specified, we default to the 'stable' channel.
+
+This script assumes that git is installed and the computer meets all
+other prerequisites to build v8 normally (like having depot_tools installed and
+in $PATH).
+
+Example usage:
+$ tracing/bin/update_v8
+"""
+
+import json
+import os
+import platform
+import re
+import shutil
+import subprocess
+import sys
+import tempfile
+import urllib2
+
+OMAHAPROXY_VERSION_MAP_URL = 'https://omahaproxy.appspot.com/all.json'
+
+V8_PATH = os.path.join(
+ os.path.dirname(os.path.abspath(__file__)), os.path.pardir, 'third_party',
+ 'v8')
+V8_BINARY_PATH = os.path.join(V8_PATH, '{os}', '{arch}', 'd8')
+V8_README_PATH = os.path.join(V8_PATH, 'README.chromium')
+
+V8_CHECKOUT_BINARY_PATH = os.path.join(
+ '{v8_root}', 'v8', 'out', 'Release', 'd8')
+V8_GENERATE_GYP_CMD = os.path.join('build', 'gyp_v8') + ' -Dtarget_arch={arch}'
+V8_COMPILE_CMD = 'ninja -C {0} d8'.format(os.path.join('out', 'Release'))
+V8_STRIP_CMD = 'strip -x {0}'.format(os.path.join('out', 'Release', 'd8'))
+
+VALID_CHANNEL_LIST = ['stable', 'canary', 'beta', 'dev']
+# Dict from the acceptable return values for Python's platform.system() to the
+# corresponding Chromium OS name.
+PYTHON_SYSTEM_TO_CHROME_OS = {
+ 'Linux': 'linux',
+ 'Windows': 'win',
+ 'Darwin': 'mac'
+}
+# Dict from the acceptable return values for Python's platform.machine() to the
+# corresponding ninja architecture name.
+PYTHON_MACHINE_TO_NINJA_ARCH = {
+ 'x86_64': 'x64'
+}
+
+def Main(args):
+ if len(args) > 1:
+ print('Usage: update_v8 [TARGET_CHANNEL]')
+ return 1
+
+ target_channel = args[0] if len(args) == 1 else 'stable'
+ target_arch = platform.machine()
+
+ if target_channel not in VALID_CHANNEL_LIST:
+ print('Invalid target channel. Valid: {0}'.format(VALID_CHANNEL_LIST))
+ return 1
+
+ if platform.system() not in PYTHON_SYSTEM_TO_CHROME_OS:
+ print('System not supported. Valid: {0}'.format(
+ PYTHON_SYSTEM_TO_CHROME_OS.keys()))
+ return 1
+ target_os = PYTHON_SYSTEM_TO_CHROME_OS[platform.system()]
+
+ if target_arch not in PYTHON_MACHINE_TO_NINJA_ARCH:
+ print('Invalid target architecture. Valid: {0}'.format(
+ PYTHON_MACHINE_TO_NINJA_ARCH.keys()))
+ return 1
+
+ v8_version = GetV8Version(target_os, target_channel)
+ UpdateV8Binary(v8_version, target_os, target_arch)
+ UpdateReadmeFile(v8_version, target_os)
+
+ return 0
+
+def GetV8Version(target_os, target_channel):
+ """Returns the v8 version that corresponds to the specified OS and channel."""
+ # Fetch the current version map from omahaproxy.
+ response = urllib2.urlopen(OMAHAPROXY_VERSION_MAP_URL)
+ versions = json.loads(response.read())
+
+ # Return the v8 version that corresponds to the target OS and channel in the
+ # version map.
+ v8_version = None
+ for curr_os in versions:
+ for curr_version in curr_os['versions']:
+ if (curr_version['os'] == target_os and
+ curr_version['channel'] == target_channel):
+ return curr_version['v8_version']
+
+def UpdateV8Binary(v8_version, target_os, target_arch):
+ """Updates the catapult V8 binary for the specified OS to be the specified V8
+ version."""
+ # Clone v8, checkout the version that corresponds to our target OS and target
+ # channel, and build the d8 binary.
+ with TempDir() as v8_checkout_path:
+ with ChangeDirectory(v8_checkout_path):
+ subprocess.check_call('fetch v8', shell=True)
+ with ChangeDirectory('v8'):
+ subprocess.check_call('git checkout {0}'.format(v8_version), shell=True)
+
+ os.environ['GYP_DEFINES'] += ' v8_use_external_startup_data=0'
+ os.environ['GYP_GENERATORS'] = 'ninja'
+ ninja_arch = PYTHON_MACHINE_TO_NINJA_ARCH[target_arch]
+ subprocess.check_call(
+ V8_GENERATE_GYP_CMD.format(arch=ninja_arch), shell=True)
+ subprocess.check_call(V8_COMPILE_CMD, shell=True)
+ if target_os in ['linux', 'mac']:
+ subprocess.check_call(V8_STRIP_CMD, shell=True)
+
+ # Move the d8 binary into place.
+ d8_src = V8_CHECKOUT_BINARY_PATH.format(v8_root=v8_checkout_path)
+ d8_dst = V8_BINARY_PATH.format(os=target_os, arch=target_arch)
+
+ shutil.move(d8_src, d8_dst)
+
+def UpdateReadmeFile(v8_version, target_os):
+ """Updates the V8 version number in the V8 README.chromium file."""
+ # Get the contents of the new README file with the replaced version number.
+ new_readme_contents = ''
+ with open(V8_README_PATH, 'r') as v8_readme:
+ new_readme_contents = re.sub(r'[0-9\.]+ \({0}\)'.format(target_os),
+ r'{0} ({1})'.format(v8_version, target_os),
+ v8_readme.read())
+
+ # Overwrite the old README file with the new one.
+ with open(V8_README_PATH, 'w') as v8_readme:
+ v8_readme.write(new_readme_contents)
+
+class ChangeDirectory:
+ """A context manager that changes a directory while in scope."""
+ def __init__(self, newPath):
+ self.newPath = newPath
+
+ def __enter__(self):
+ self.oldPath = os.getcwd()
+ os.chdir(self.newPath)
+
+ def __exit__(self, etype, value, traceback):
+ os.chdir(self.oldPath)
+
+class TempDir:
+ """A context manager that creates a temporary directory while in scope."""
+ def __enter__(self):
+ self.path = tempfile.mkdtemp()
+ print "creating {0}".format(self.path)
+ return self.path
+
+ def __exit__(self, etype, value, traceback):
+ shutil.rmtree(self.path)
+
+if __name__ == '__main__':
+ sys.exit(Main(sys.argv[1:]))
diff --git a/catapult/third_party/vinn/third_party/v8/README.chromium b/catapult/third_party/vinn/third_party/v8/README.chromium
index 9f02cee..2e028c9 100644
--- a/catapult/third_party/vinn/third_party/v8/README.chromium
+++ b/catapult/third_party/vinn/third_party/v8/README.chromium
@@ -1,13 +1,11 @@
Name: Chrome d8 for executing javascript
Short Name: d8
URL: https://developers.google.com/v8/
-Version: 4.3.61
+Version: 4.5.103.29 (linux), 4.5.103.29 (mac)
License: BSD
License File: LICENSE, LICENSE.v8, LICENSE.strongtalk, LICENSE.valgrind
Security Critical: no
Description: d8 binaries is used for executing trace-viewer's trace analyzing
code.
Local modifications: We ignore the source code & only keep the d8 binaries. Use
-the instructions here to build the binary, after syncing v8 to the above
-version:
-https://code.google.com/p/v8-wiki/wiki/BuildingWithGYP
+tracing/bin/update_v8 to update the binary on your current OS.
diff --git a/catapult/third_party/vinn/third_party/v8/linux/x86_64/d8 b/catapult/third_party/vinn/third_party/v8/linux/x86_64/d8
index 09ae15e..baa0b7f 100755
--- a/catapult/third_party/vinn/third_party/v8/linux/x86_64/d8
+++ b/catapult/third_party/vinn/third_party/v8/linux/x86_64/d8
Binary files differ
diff --git a/catapult/third_party/vinn/third_party/v8/mac/x86_64/d8 b/catapult/third_party/vinn/third_party/v8/mac/x86_64/d8
index 733b794..8d6b42a 100755
--- a/catapult/third_party/vinn/third_party/v8/mac/x86_64/d8
+++ b/catapult/third_party/vinn/third_party/v8/mac/x86_64/d8
Binary files differ
diff --git a/catapult/third_party/vinn/vinn/d8_bootstrap.js b/catapult/third_party/vinn/vinn/d8_bootstrap.js
index 237a121..62e5f80 100644
--- a/catapult/third_party/vinn/vinn/d8_bootstrap.js
+++ b/catapult/third_party/vinn/vinn/d8_bootstrap.js
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+'use strict';
+
/**
* @fileoverview Boostrap for loading javascript/html files using d8_runner.
*/
@@ -209,7 +211,7 @@
pathPart = href.substring(1);
}
- candidates = [];
+ var candidates = [];
for (var i = 0; i < sourcePaths.length; i++) {
var candidate = d8_path_utils.join(sourcePaths[i], pathPart);
if (d8_path_utils.exists(candidate))
diff --git a/catapult/third_party/vinn/vinn/test_data/non_strict_error.html b/catapult/third_party/vinn/vinn/test_data/non_strict_error.html
new file mode 100644
index 0000000..7c8f45f
--- /dev/null
+++ b/catapult/third_party/vinn/vinn/test_data/non_strict_error.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<!--
+Copyright (c) 2015 The Chromium Authors. All rights reserved.
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file.
+-->
+
+<link rel='import' href='/foo.html'>
+
+<style>
+.div {
+ font-size: 3.1415em;
+}
+</style>
+
+<script>
+ non_defined_variable = 1;
+</script>
+
+<div>
+ This is load_simple.html.html
+</div>
diff --git a/catapult/third_party/vinn/vinn/vinn_unittest.py b/catapult/third_party/vinn/vinn/vinn_unittest.py
index 36a12ea..6dd999d 100644
--- a/catapult/third_party/vinn/vinn/vinn_unittest.py
+++ b/catapult/third_party/vinn/vinn/vinn_unittest.py
@@ -248,6 +248,18 @@
self.AssertHasNamedFrame('eval', 'load_js_error.html:22',
exception_message)
+ def testStrictError(self):
+ file_path = self.GetTestFilePath('non_strict_error.html')
+ with self.assertRaises(RuntimeError) as context:
+ d8_runner.ExecuteFile(file_path, source_paths=[self.test_data_dir])
+
+ # Assert error stack trace contain src files' info.
+ exception_message = context.exception.message
+
+ self.assertIn('non_defined_variable is not defined', exception_message)
+ self.AssertHasNamedFrame('eval', 'non_strict_error.html:17',
+ exception_message)
+
def testConsolePolyfill(self):
self.assertEquals(
d8_runner.ExcecuteJsString('console.log("hello", "world");'),
diff --git a/catapult/tracing/OWNERS b/catapult/tracing/OWNERS
index 72e8ffc..e34da9b 100644
--- a/catapult/tracing/OWNERS
+++ b/catapult/tracing/OWNERS
@@ -1 +1,12 @@
+# Owners: These folks have a very good understanding of the tracing
+# system and how the UI bits fit together. Good for reviews of large
+# architectual changes, or areas of the code where you may need more
+# information.
+nduca@chromium.org
+petrcermak@chromium.org
+dsinclair@chromium.org
+
+# Tracing, in general, doesn't require an owners stamp to commit. If you
+# don't think the complexity requires the review of the above you can use
+# any tracing committer.
*
diff --git a/catapult/tracing/bin/why_imported b/catapult/tracing/bin/why_imported
index 1a99600..e4ffef9 100755
--- a/catapult/tracing/bin/why_imported
+++ b/catapult/tracing/bin/why_imported
@@ -9,35 +9,37 @@
explains why given module names were included in a trace_viewer config.
Example usage:
-$ ./why_imported ui.analysis.analysis_view > ~/analysis_view.dot
+$ ./why_imported tracing.ui.analysis.analysis_view > ~/analysis_view.dot
This can then be converted to a graphical representation with the dot tool:
$ dot -Grankdir=LR -Tpng ~/analysis_view.dot -o ~/analysis_view.png
"""
import sys
-import optparse
+import argparse
import tracing_project
tracing_project.UpdateSysPathIfNeeded()
-def Main(args):
+
+def Main():
project = tracing_project.TracingProject()
- parser = optparse.OptionParser(
- usage='%prog <options> moduleNames', epilog=__doc__)
- parser.add_option(
- '--config', type='choice', choices=project.GetConfigNames())
- options, args = parser.parse_args(args)
+ parser = argparse.ArgumentParser(
+ usage='%(prog)s <options> moduleNames', epilog=__doc__)
+ parser.add_argument('--config', choices=project.GetConfigNames())
+ parser.add_argument('module_names', nargs='+')
+ args = parser.parse_args()
- if options.config:
+ if args.config:
names = [project.GetModuleNameForConfigName(options.config)]
vulcanizer = project.CreateVulcanizer()
load_sequence = vulcanizer.CalcLoadSequenceForModuleNames(names)
else:
- parser.error('Unsupported')
- print vulcanizer.GetDominatorGraphForModulesNamed(args, load_sequence)
+ parser.error('No config specified.')
+ print vulcanizer.GetDominatorGraphForModulesNamed(
+ args.module_names, load_sequence)
if __name__ == '__main__':
- sys.exit(Main(sys.argv[1:]))
+ sys.exit(Main())
diff --git a/catapult/tracing/test_data/google_cloud_trace.json b/catapult/tracing/test_data/google_cloud_trace.json
new file mode 100644
index 0000000..df46119
--- /dev/null
+++ b/catapult/tracing/test_data/google_cloud_trace.json
@@ -0,0 +1,49 @@
+{
+ "projectId": "My Google Cloud Project",
+ "traceId": "6ef9eae4acda422912f705b69539cec8",
+ "spans": [
+ {
+ "spanId": "13616474711799465301",
+ "kind": "RPC_CLIENT",
+ "name": "/endpoint",
+ "startTime": "2015-09-03T16:40:00.841654024Z",
+ "endTime": "2015-09-03T16:40:00.856599389Z",
+ "labels": {
+ "key1": "value1",
+ "key2": "value2"
+ }
+ },
+ {
+ "spanId": "1006609995974696303",
+ "kind": "RPC_SERVER",
+ "name": "/action1",
+ "startTime": "2015-09-03T16:40:00.842880028Z",
+ "endTime": "2015-09-03T16:40:00.851729538Z",
+ "parentSpanId": "13616474711799465301",
+ "labels": {
+ "key1": "testing",
+ "key2": "more testing"
+ }
+ },
+ {
+ "spanId": "8529136369770133851",
+ "kind": "RPC_SERVER",
+ "name": "/action2",
+ "startTime": "2015-09-03T16:40:00.852484163Z",
+ "endTime": "2015-09-03T16:40:00.853738268Z",
+ "parentSpanId": "13616474711799465301",
+ "labels": {
+ }
+ },
+ {
+ "spanId": "323284134707432301",
+ "kind": "RPC_SERVER",
+ "name": "/action3",
+ "startTime": "2015-09-03T16:40:00.854112894Z",
+ "endTime": "2015-09-03T16:40:00.855115940Z",
+ "parentSpanId": "13616474711799465301",
+ "labels": {
+ }
+ }
+ ]
+}
diff --git a/catapult/tracing/third_party/tvcm/tvcm/generate.py b/catapult/tracing/third_party/tvcm/tvcm/generate.py
index 37e3c1c..9a93c8e 100644
--- a/catapult/tracing/third_party/tvcm/tvcm/generate.py
+++ b/catapult/tracing/third_party/tvcm/tvcm/generate.py
@@ -22,7 +22,7 @@
"""
js_warning_message = """
-// Copyright (c) 2014 The Chromium Authors. All rights reserved.
+// Copyright 2015 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -33,7 +33,7 @@
"""
css_warning_message = """
-/* Copyright (c) 2014 The Chromium Authors. All rights reserved.
+/* Copyright 2015 The Chromium Authors. All rights reserved.
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file. */
@@ -90,26 +90,6 @@
return f.getvalue()
-def pt_parts(self):
- sl = ['unicode and 8-bit string parts of above page template']
- for x in self.buflist:
- if type(x) == type(''):
- maxcode = 0
- for c in x:
- maxcode = max(ord(c), maxcode)
- # show only unicode objects and non-ascii strings
- if type(x) == type('') and maxcode > 127:
- t = '****NonAsciiStr: '
- elif type(x) == type(u''):
- t = '*****UnicodeStr: '
- else:
- t = None
- if t:
- sl.append(t + repr(x))
- s = '\n'.join(sl)
- return s
-
-
def GenerateJSToFile(f,
load_sequence,
use_include_tags_for_scripts=False,
@@ -154,7 +134,7 @@
js = s.getvalue()
min_js_size = str(len(_MinifyJS(js)))
- # Print names for this module. Some domain-specific simplifciations
+ # Print names for this module. Some domain-specific simplifications
# are included to make pivoting more obvious.
parts = module.name.split('.')
if parts[:2] == ['base', 'ui']:
@@ -164,12 +144,13 @@
tln = parts[0]
sln = '.'.join(parts[:2])
- # Ouptut
+ # Output
print '%i\t%s\t%s\t%s\t%s' % (len(js), min_js_size, module.name, tln, sln)
sys.stdout.flush()
class ExtraScript(object):
+
def __init__(self, script_id=None, text_content=None, content_type=None):
if script_id is not None:
assert script_id[0] != '#'
@@ -229,18 +210,24 @@
minify=False,
report_sizes=False,
output_html_head_and_body=True):
+ """Writes a HTML file with the content of all modules in a load sequence.
+
+ The load_sequence is a list of (HTML or JS) Module objects; the order that
+ they're inserted into the file depends on their type and position in the load
+ sequence.
+ """
_AssertIsUTF8(output_file)
extra_scripts = extra_scripts or []
if output_html_head_and_body:
- output_file.write("""<!DOCTYPE HTML>
-<html>
- <head i18n-values="dir:textdirection;">
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- """)
+ output_file.write(
+ '<!DOCTYPE HTML>\n'
+ '<html>\n'
+ ' <head i18n-values="dir:textdirection;">\n'
+ ' <meta http-equiv="Content-Type" content="text/html;'
+ 'charset=utf-8">\n')
if title:
- output_file.write(""" <title>%s</title>
- """ % title)
+ output_file.write(' <title>%s</title>\n ' % title)
else:
assert title is None
@@ -269,23 +256,19 @@
return '<style>\n%s\n</style>' % text
for module in load_sequence:
- ctl = HTMLGenerationController(module)
- module.AppendHTMLContentsToFile(output_file, ctl, minify=minify)
+ controller = HTMLGenerationController(module)
+ module.AppendHTMLContentsToFile(output_file, controller, minify=minify)
if flattened_js_url:
output_file.write('<script src="%s"></script>\n' % flattened_js_url)
else:
output_file.write('<script>\n')
- x = GenerateJS(load_sequence, minify=minify, report_sizes=report_sizes)
- output_file.write(x)
+ js = GenerateJS(load_sequence, minify=minify, report_sizes=report_sizes)
+ output_file.write(js)
output_file.write('</script>\n')
for extra_script in extra_scripts:
extra_script.WriteToFile(output_file)
if output_html_head_and_body:
- output_file.write("""</head>
- <body>
- </body>
-</html>
-""")
+ output_file.write('</head>\n <body>\n </body>\n</html>\n')
diff --git a/catapult/tracing/third_party/tvcm/tvcm/generate_unittest.py b/catapult/tracing/third_party/tvcm/tvcm/generate_unittest.py
index 2dac4eb..658d4aa 100644
--- a/catapult/tracing/third_party/tvcm/tvcm/generate_unittest.py
+++ b/catapult/tracing/third_party/tvcm/tvcm/generate_unittest.py
@@ -14,26 +14,22 @@
def setUp(self):
self.fs = fake_fs.FakeFS()
- self.fs.AddFile('/x/foo/my_module.html', """
-<!DOCTYPE html>
-<link rel="import" href="/foo/other_module.html">
-""")
- self.fs.AddFile('/x/foo/other_module.html', """
-<!DOCTYPE html>
-<script src="/foo/raw/raw_script.js"></script>
-<script>
- 'use strict';
- HelloWorld();
-</script>
-""")
- self.fs.AddFile('/x/foo/raw/raw_script.js', """
-/* raw script */
-""")
- self.fs.AddFile('/x/components/polymer/polymer.min.js', """
-""")
+ self.fs.AddFile(
+ '/x/foo/my_module.html',
+ ('<!DOCTYPE html>\n'
+ '<link rel="import" href="/foo/other_module.html">\n'))
+ self.fs.AddFile(
+ '/x/foo/other_module.html',
+ ('<!DOCTYPE html>\n'
+ '<script src="/foo/raw/raw_script.js"></script>\n'
+ '<script>\n'
+ ' \'use strict\';\n'
+ ' HelloWorld();\n'
+ '</script>\n'))
+ self.fs.AddFile('/x/foo/raw/raw_script.js', '\n/* raw script */\n')
+ self.fs.AddFile('/x/components/polymer/polymer.min.js', '\n')
- self.project = project_module.Project(
- [os.path.normpath('/x')])
+ self.project = project_module.Project([os.path.normpath('/x')])
def testJSGeneration(self):
with self.fs:
@@ -45,8 +41,8 @@
with self.fs:
load_sequence = self.project.CalcLoadSequenceForModuleNames(
[os.path.normpath('foo.my_module')])
- res = generate.GenerateStandaloneHTMLAsString(load_sequence, 'Title')
- assert 'HelloWorld();' in res
+ result = generate.GenerateStandaloneHTMLAsString(load_sequence)
+ self.assertIn('HelloWorld();', result)
def testExtraScriptWithWriteContentsFunc(self):
with self.fs:
@@ -57,6 +53,6 @@
def WriteToFile(self, f):
f.write('<script>ExtraScript!</script>')
- res = generate.GenerateStandaloneHTMLAsString(
- load_sequence, 'Title', extra_scripts=[ExtraScript()])
- assert 'ExtraScript' in res
+ result = generate.GenerateStandaloneHTMLAsString(
+ load_sequence, title='Title', extra_scripts=[ExtraScript()])
+ self.assertIn('ExtraScript', result)
diff --git a/catapult/tracing/trace_viewer.gypi b/catapult/tracing/trace_viewer.gypi
index 4d81c0e..7ab3445 100644
--- a/catapult/tracing/trace_viewer.gypi
+++ b/catapult/tracing/trace_viewer.gypi
@@ -9,8 +9,6 @@
'tracing/ui/base/line_chart.css',
'tracing/ui/base/list_view.css',
'tracing/ui/base/pie_chart.css',
- 'tracing/ui/base/sortable_table.css',
- 'tracing/ui/base/sunburst_chart.css',
'tracing/ui/extras/about_tracing/common.css',
'tracing/ui/extras/chrome/cc/display_item_list_view.css',
'tracing/ui/extras/chrome/cc/layer_picker.css',
@@ -68,7 +66,6 @@
'tracing/base/units/units.html',
'tracing/base/utils.html',
'tracing/core/auditor.html',
- 'tracing/core/constants.html',
'tracing/core/filter.html',
'tracing/core/scripting_controller.html',
'tracing/core/scripting_object.html',
@@ -101,6 +98,7 @@
'tracing/extras/chrome/gpu/state.html',
'tracing/extras/chrome/layout_object.html',
'tracing/extras/chrome_config.html',
+ 'tracing/extras/importer/android/event_log_importer.html',
'tracing/extras/importer/battor_importer.html',
'tracing/extras/importer/ddms_importer.html',
'tracing/extras/importer/etw/etw_importer.html',
@@ -108,6 +106,7 @@
'tracing/extras/importer/etw/parser.html',
'tracing/extras/importer/etw/process_parser.html',
'tracing/extras/importer/etw/thread_parser.html',
+ 'tracing/extras/importer/gcloud_trace/gcloud_trace_importer.html',
'tracing/extras/importer/gzip_importer.html',
'tracing/extras/importer/jszip.html',
'tracing/extras/importer/linux_perf/android_parser.html',
@@ -167,6 +166,7 @@
'tracing/importer/import.html',
'tracing/importer/importer.html',
'tracing/importer/simple_line_reader.html',
+ 'tracing/model/activity.html',
'tracing/model/alert.html',
'tracing/model/annotation.html',
'tracing/model/async_slice.html',
@@ -268,6 +268,7 @@
'tracing/ui/analysis/single_interaction_record_sub_view.html',
'tracing/ui/analysis/single_object_instance_sub_view.html',
'tracing/ui/analysis/single_object_snapshot_sub_view.html',
+ 'tracing/ui/analysis/single_power_sample_sub_view.html',
'tracing/ui/analysis/single_process_memory_dump_sub_view.html',
'tracing/ui/analysis/single_sample_sub_view.html',
'tracing/ui/analysis/single_thread_slice_sub_view.html',
@@ -287,6 +288,7 @@
'tracing/ui/base/color_legend.html',
'tracing/ui/base/color_scheme.html',
'tracing/ui/base/color_utils.html',
+ 'tracing/ui/base/constants.html',
'tracing/ui/base/container_that_decorates_its_children.html',
'tracing/ui/base/d3.html',
'tracing/ui/base/deep_utils.html',
@@ -313,8 +315,6 @@
'tracing/ui/base/pie_chart.html',
'tracing/ui/base/polymer_utils.html',
'tracing/ui/base/quad_stack_view.html',
- 'tracing/ui/base/sortable_table.html',
- 'tracing/ui/base/sunburst_chart.html',
'tracing/ui/base/table.html',
'tracing/ui/base/timing_tool.html',
'tracing/ui/base/toolbar_button.html',
@@ -331,7 +331,7 @@
'tracing/ui/extras/about_tracing/record_selection_dialog.html',
'tracing/ui/extras/about_tracing/tracing_controller_client.html',
'tracing/ui/extras/about_tracing/xhr_based_tracing_controller_client.html',
- 'tracing/ui/extras/analysis/sampling_summary.html',
+ 'tracing/ui/extras/analysis/sampling_panel.html',
'tracing/ui/extras/chrome/cc/cc.html',
'tracing/ui/extras/chrome/cc/display_item_debugger.html',
'tracing/ui/extras/chrome/cc/display_item_list_view.html',
diff --git a/catapult/tracing/tracing/base/statistics.html b/catapult/tracing/tracing/base/statistics.html
index 2369e84..6fe440c 100644
--- a/catapult/tracing/tracing/base/statistics.html
+++ b/catapult/tracing/tracing/base/statistics.html
@@ -130,7 +130,7 @@
if (high - low === 0.0) {
// Samples is an array of 0.5 in this case.
samples = Array.apply(null, new Array(samples.length)).map(
- function(){ return 0.5;});
+ function() { return 0.5;});
return {
normalized_samples: samples,
scale: 1.0
@@ -172,15 +172,15 @@
// Generate list of equally spaced locations.
var sample_index = 0;
for (var i = 0; i < opt_location_count; i++) {
- var location = i / (opt_location_count-1);
+ var location = i / (opt_location_count - 1);
locations.push(location);
while (sample_index < samples.length &&
samples[sample_index] < location) {
sample_index += 1;
}
count_less.push(sample_index);
- while (sample_index < samples.length
- && samples[sample_index] <= location) {
+ while (sample_index < samples.length &&
+ samples[sample_index] <= location) {
sample_index += 1;
}
count_less_equal.push(sample_index);
@@ -195,7 +195,7 @@
for (var i = 0; i < samples.length; i++) {
locations.push(samples[i]);
count_less.push(i);
- count_less_equal.push(i+1);
+ count_less_equal.push(i + 1);
}
if (samples[-1] < 1.0) {
locations.push(1.0);
@@ -207,7 +207,7 @@
for (var i = 0; i < locations.length; i++) {
for (var j = i + 1; j < locations.length; j++) {
// Length of interval
- length = locations[j] - locations[i];
+ var length = locations[j] - locations[i];
// Local discrepancy for closed interval
var count_closed = count_less_equal[j] - count_less[i];
@@ -224,7 +224,7 @@
local_discrepancy_open, max_local_discrepancy);
}
}
- return max_local_discrepancy
+ return max_local_discrepancy;
};
/**
@@ -261,7 +261,7 @@
Statistics.timestampsDiscrepancy = function(timestamps, opt_absolute,
opt_location_count) {
if (timestamps.length === 0)
- return 0.0
+ return 0.0;
if (opt_absolute === undefined)
opt_absolute = true;
@@ -309,10 +309,10 @@
Statistics.durationsDiscrepancy = function(
durations, opt_absolute, opt_location_count) {
if (durations.length === 0)
- return 0.0
+ return 0.0;
var timestamps = durations.reduce(function(prev, curr, index, array) {
- prev.push(prev[prev.length-1] + curr);
+ prev.push(prev[prev.length - 1] + curr);
return prev;
}, [0]);
return Statistics.timestampsDiscrepancy(
diff --git a/catapult/tracing/tracing/base/units/units.html b/catapult/tracing/tracing/base/units/units.html
index e606831..d5252f9 100644
--- a/catapult/tracing/tracing/base/units/units.html
+++ b/catapult/tracing/tracing/base/units/units.html
@@ -6,6 +6,7 @@
-->
<link rel="import" href="/tracing/base/base.html">
+<link rel="import" href="/tracing/base/event.html">
<link rel="import" href="/tracing/base/event_target.html">
<link rel="import" href="/tracing/base/units/time_display_mode.html">
@@ -156,4 +157,4 @@
Units: Units
};
});
-</script>
\ No newline at end of file
+</script>
diff --git a/catapult/tracing/tracing/base/unittest/test_suite.html b/catapult/tracing/tracing/base/unittest/test_suite.html
index 0a99937..5f8114a 100644
--- a/catapult/tracing/tracing/base/unittest/test_suite.html
+++ b/catapult/tracing/tracing/base/unittest/test_suite.html
@@ -35,7 +35,7 @@
var testName = testCaseOrName;
var testFn = opt_testFn;
- var options = options || {};
+ var options = opt_options || {};
if (testFn == undefined)
throw new Error('Must provide opt_testFn');
diff --git a/catapult/tracing/tracing/extras/android/android_app.html b/catapult/tracing/tracing/extras/android/android_app.html
index 41b439b..348a048 100644
--- a/catapult/tracing/tracing/extras/android/android_app.html
+++ b/catapult/tracing/tracing/extras/android/android_app.html
@@ -20,10 +20,17 @@
var Frame = tr.model.Frame;
var Statistics = tr.b.Statistics;
- var UI_THREAD_DRAW_NAMES = {
- 'performTraversals': true,
- 'Choreographer#doFrame': true
+ var UI_DRAW_TYPE = {
+ NONE: 'none',
+ LEGACY: 'legacy',
+ MARSHMALLOW: 'marshmallow'
};
+
+ var UI_THREAD_DRAW_NAMES = {
+ 'performTraversals': UI_DRAW_TYPE.LEGACY,
+ 'Choreographer#doFrame': UI_DRAW_TYPE.MARSHMALLOW
+ };
+
var RENDER_THREAD_DRAW_NAME = 'DrawFrame';
var RENDER_THREAD_INDEP_DRAW_NAME = 'doFrame';
var THREAD_SYNC_NAME = 'syncFrameState';
@@ -121,7 +128,9 @@
if (!app.uiThread)
return [];
- var preTraversalWorkRanges = getPreTraversalWorkRanges(app.uiThread);
+ var preTraversalWorkRanges = [];
+ if (app.uiDrawType == UI_DRAW_TYPE.LEGACY)
+ preTraversalWorkRanges = getPreTraversalWorkRanges(app.uiThread);
var frames = [];
app.uiThread.sliceGroup.slices.forEach(function(slice) {
@@ -178,14 +187,17 @@
return frames;
}
- function hasUiDraw(uiThread) {
+ function getUiDrawType(uiThread) {
+ if (!uiThread)
+ return UI_DRAW_TYPE.NONE;
+
var slices = uiThread.sliceGroup.slices;
for (var i = 0; i < slices.length; i++) {
if (slices[i].title in UI_THREAD_DRAW_NAMES) {
- return uiThread;
+ return UI_THREAD_DRAW_NAMES[slices[i].title];
}
}
- return undefined;
+ return UI_DRAW_TYPE.NONE;
}
function getInputSamples(process) {
@@ -229,11 +241,13 @@
* Model for Android App specific data.
* @constructor
*/
- function AndroidApp(process, uiThread, renderThread, surfaceFlinger) {
+ function AndroidApp(process, uiThread, renderThread, surfaceFlinger,
+ uiDrawType) {
this.process = process;
this.uiThread = uiThread;
this.renderThread = renderThread;
this.surfaceFlinger = surfaceFlinger;
+ this.uiDrawType = uiDrawType;
this.frames_ = undefined;
this.inputs_ = undefined;
@@ -241,14 +255,16 @@
AndroidApp.createForProcessIfPossible = function(process, surfaceFlinger) {
var uiThread = process.getThread(process.pid);
- if (uiThread && !hasUiDraw(uiThread)) {
+ var uiDrawType = getUiDrawType(uiThread);
+ if (uiDrawType == UI_DRAW_TYPE.NONE) {
uiThread = undefined;
}
var renderThreads = process.findAllThreadsNamed('RenderThread');
var renderThread = renderThreads.length == 1 ? renderThreads[0] : undefined;
if (uiThread || renderThread) {
- return new AndroidApp(process, uiThread, renderThread, surfaceFlinger);
+ return new AndroidApp(process, uiThread, renderThread, surfaceFlinger,
+ uiDrawType);
}
}
diff --git a/catapult/tracing/tracing/extras/chrome/cc/constants.html b/catapult/tracing/tracing/extras/chrome/cc/constants.html
index f78a24b..c65adca 100644
--- a/catapult/tracing/tracing/extras/chrome/cc/constants.html
+++ b/catapult/tracing/tracing/extras/chrome/cc/constants.html
@@ -16,6 +16,10 @@
constants.HIGH_PRIORITY_BIN = 0;
constants.LOW_PRIORITY_BIN = 1;
+ constants.SEND_BEGIN_FRAME_EVENT =
+ 'ThreadProxy::ScheduledActionSendBeginMainFrame';
+ constants.BEGIN_MAIN_FRAME_EVENT = 'ThreadProxy::BeginMainFrame';
+
return {
constants: constants
};
diff --git a/catapult/tracing/tracing/extras/chrome/chrome_test_utils.html b/catapult/tracing/tracing/extras/chrome/chrome_test_utils.html
index 08396d5..17b1d07 100644
--- a/catapult/tracing/tracing/extras/chrome/chrome_test_utils.html
+++ b/catapult/tracing/tracing/extras/chrome/chrome_test_utils.html
@@ -21,7 +21,6 @@
ChromeTestUtils.newChromeModel = function(customizeModelCallback) {
return tr.c.TestUtils.newModel(function(model) {
- console.log(model);
model.browserProcess = model.getOrCreateProcess(1);
model.browserMain = model.browserProcess.getOrCreateThread(2);
model.browserMain.name = 'CrBrowserMain';
@@ -62,6 +61,14 @@
return slice;
}
+ ChromeTestUtils.addRenderingEvent = function(model, dict) {
+ dict.title = dict.title || 'DummyEvent';
+ dict.type = tr.model.ThreadSlice;
+ var slice = tr.c.TestUtils.newSliceEx(dict);
+ model.rendererMain.sliceGroup.pushSlice(slice);
+ return slice;
+ }
+
ChromeTestUtils.addFrameEvent = function(model, dict) {
dict.title = tr.e.audits.IMPL_RENDERING_STATS;
dict.type = tr.model.ThreadSlice;
diff --git a/catapult/tracing/tracing/extras/full_config.html b/catapult/tracing/tracing/extras/full_config.html
index 19315e5..4eab0d4 100644
--- a/catapult/tracing/tracing/extras/full_config.html
+++ b/catapult/tracing/tracing/extras/full_config.html
@@ -6,6 +6,7 @@
-->
<!-- The full config is all the configs slammed together. -->
+<link rel="import" href="/tracing/extras/importer/gcloud_trace/gcloud_trace_importer.html">
<link rel="import" href="/tracing/extras/chrome_config.html">
<link rel="import" href="/tracing/extras/systrace_config.html">
<link rel="import" href="/tracing/extras/lean_config.html">
diff --git a/catapult/tracing/tracing/extras/importer/android/event_log_importer.html b/catapult/tracing/tracing/extras/importer/android/event_log_importer.html
new file mode 100644
index 0000000..2c06113
--- /dev/null
+++ b/catapult/tracing/tracing/extras/importer/android/event_log_importer.html
@@ -0,0 +1,313 @@
+<!DOCTYPE html>
+<!--
+Copyright (c) 2015 The Chromium Authors. All rights reserved.
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file.
+-->
+
+<link rel="import" href="/tracing/importer/importer.html">
+<link rel="import" href="/tracing/importer/simple_line_reader.html">
+<link rel="import" href="/tracing/model/activity.html">
+<link rel="import" href="/tracing/model/model.html">
+
+
+<script>
+/**
+ * @fileoverview Imports android event log data into the trace model.
+ * Android event log data contains information about activities that
+ * are launched/paused, processes that are started, memory usage, etc.
+ *
+ * The current implementation only parses activity events, with the goal of
+ * determining which Activity is running in the foreground for a process.
+ *
+ * This importer assumes the events arrive as a string. The unit tests provide
+ * examples of the trace format.
+ */
+'use strict';
+
+tr.exportTo('tr.e.importer.android', function() {
+ var Importer = tr.importer.Importer;
+
+ var ACTIVITY_STATE = {
+ NONE: 'none',
+ CREATED: 'created',
+ STARTED: 'started',
+ RESUMED: 'resumed',
+ PAUSED: 'paused',
+ STOPPED: 'stopped',
+ DESTROYED: 'destroyed'
+ };
+
+ var activityMap = {};
+
+ /**
+ * Imports android event log data (adb logcat -b events)
+ * @constructor
+ */
+ function EventLogImporter(model, events) {
+ this.model_ = model;
+ this.events_ = events;
+ this.importPriority = 3;
+ }
+
+ // Generic format of event log entries.
+ // Sample event log entry that this matches (split over 2 lines):
+ // 08-11 13:12:31.405 880 2645 I am_focused_activity: [0,com.google.android.googlequicksearchbox/com.google.android.launcher.GEL] // @suppress longLineCheck
+ var eventLogActivityRE = new RegExp(
+ '(\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}.\\d+)' +
+ '\\s+(\\d+)\\s+(\\d+)\\s+([A-Z])\\s*' +
+ '(am_\\w+)\\s*:(.*)');
+
+ // 08-28 03:58:21.834 888 3177 I am_create_activity: [0,5972200,30,com.nxp.taginfolite/.activities.MainView,android.intent.action.MAIN,NULL,NULL,270532608] // @suppress longLineCheck
+ // Store the name of the created activity only
+ var amCreateRE = new RegExp('\s*\\[.*,.*,.*,(.*),.*,.*,.*,.*\\]');
+
+ // 07-22 12:22:19.504 920 2504 I am_focused_activity: [0,com.android.systemui/.recents.RecentsActivity] // @suppress longLineCheck
+ //Store the name of the focused activity only
+ var amFocusedRE = new RegExp('\s*\\[\\d+,(.*)\\]');
+
+ // 07-21 19:56:12.315 920 2261 I am_proc_start: [0,19942,10062,com.google.android.talk,broadcast,com.google.android.talk/com.google.android.apps.hangouts.realtimechat.RealTimeChatService$AlarmReceiver] // @suppress longLineCheck
+ // We care about proc starts on behalf of activities, and store the activity
+ var amProcStartRE = new RegExp('\s*\\[\\d+,\\d+,\\d+,.*,activity,(.*)\\]');
+
+ // 07-22 12:21:43.490 2893 2893 I am_on_resume_called: [0,com.google.android.launcher.GEL] // @suppress longLineCheck
+ // Store the activity name only
+ var amOnResumeRE = new RegExp('\s*\\[\\d+,(.*)\\]');
+
+ // 07-22 12:22:19.545 2893 2893 I am_on_paused_called: [0,com.google.android.launcher.GEL] // @suppress longLineCheck
+ // Store the activity name only
+ var amOnPauseRE = new RegExp('\s*\\[\\d+,(.*)\\]');
+
+ // 08-28 03:51:54.456 888 907 I am_activity_launch_time: [0,185307115,com.google.android.googlequicksearchbox/com.google.android.launcher.GEL,1174,1174] // @suppress longLineCheck
+ // Store the activity name and launch times
+ var amLaunchTimeRE = new RegExp('\s*\\[\\d+,\\d+,(.*),(\\d+),(\\d+)');
+
+ // 08-28 03:58:15.854 888 902 I am_destroy_activity: [0,203516597,29,com.android.chrome/com.google.android.apps.chrome.Main,finish-idle] // @suppress longLineCheck
+ // Store the activity name only
+ var amDestroyRE = new RegExp('\s*\\[\\d+,\\d+,\\d+,(.*)\\]');
+
+ /**
+ * @return {boolean} True when events is an android event log array.
+ */
+ EventLogImporter.canImport = function(events) {
+ if (!(typeof(events) === 'string' || events instanceof String))
+ return false;
+
+ return eventLogActivityRE.test(events);
+ };
+
+ EventLogImporter.prototype = {
+ __proto__: Importer.prototype,
+
+ get model() {
+ return this.model_;
+ },
+
+ /**
+ * @return {string} the full activity name (including package) from
+ * a component
+ */
+ getFullActivityName: function(component) {
+ var componentSplit = component.split('/');
+ if (componentSplit[1].startsWith('.'))
+ return componentSplit[0] + componentSplit[1];
+
+ return componentSplit[1];
+ },
+
+ /**
+ * @return {string} the process name of a component
+ */
+ getProcName: function(component) {
+ var componentSplit = component.split('/');
+ return componentSplit[0];
+ },
+
+ findOrCreateActivity: function(activityName) {
+ if (activityName in activityMap)
+ return activityMap[activityName];
+ var activity = {
+ state: ACTIVITY_STATE.NONE,
+ name: activityName
+ };
+ activityMap[activityName] = activity;
+ return activity;
+ },
+
+ deleteActivity: function(activityName) {
+ delete activityMap[activityName];
+ },
+
+ handleCreateActivity: function(ts, activityName) {
+ var activity = this.findOrCreateActivity(activityName);
+ activity.state = ACTIVITY_STATE.CREATED;
+ activity.createdTs = ts;
+ },
+
+ handleFocusActivity: function(ts, procName, activityName) {
+ var activity = this.findOrCreateActivity(activityName);
+ activity.lastFocusedTs = ts;
+ },
+
+ handleProcStartForActivity: function(ts, activityName) {
+ var activity = this.findOrCreateActivity(activityName);
+ activity.procStartTs = ts;
+ },
+
+ handleOnResumeCalled: function(ts, pid, activityName) {
+ var activity = this.findOrCreateActivity(activityName);
+ activity.state = ACTIVITY_STATE.RESUMED;
+ activity.lastResumeTs = ts;
+ // on_resume_called shows the actual PID; use this
+ // to link the activity up with a process later
+ activity.pid = pid;
+ },
+
+ handleOnPauseCalled: function(ts, activityName) {
+ var activity = this.findOrCreateActivity(activityName);
+ activity.state = ACTIVITY_STATE.PAUSED;
+ activity.lastPauseTs = ts;
+ // Create a new AndroidActivity representing the foreground state,
+ // but only if the pause happened within the model bounds
+ if (ts > this.model_.bounds.min && ts < this.model_.bounds.max)
+ this.addActivityToProcess(activity);
+ },
+
+ handleLaunchTime: function(ts, activityName, launchTime) {
+ var activity = this.findOrCreateActivity(activityName);
+ activity.launchTime = launchTime;
+ },
+
+ handleDestroyActivity: function(ts, activityName) {
+ this.deleteActivity(activityName);
+ },
+
+ addActivityToProcess: function(activity) {
+ if (activity.pid === undefined)
+ return;
+ var process = this.model_.getOrCreateProcess(activity.pid);
+ // The range of the activity is the time from resume to time
+ // of pause; limit the start time to the beginning of the model
+ var range = tr.b.Range.fromExplicitRange(
+ Math.max(this.model_.bounds.min, activity.lastResumeTs),
+ activity.lastPauseTs);
+ var newActivity = new tr.model.Activity(activity.name,
+ 'Android Activity', range,
+ {created: activity.createdTs,
+ procstart: activity.procStartTs,
+ lastfocus: activity.lastFocusedTs});
+ process.activities.push(newActivity);
+ },
+
+ parseAmLine_: function(line) {
+ var match = eventLogActivityRE.exec(line);
+ if (!match)
+ return;
+
+ // Possible activity life-cycles:
+ // 1) Launch from scratch:
+ // - am_create_activity
+ // - am_focused_activity
+ // - am_proc_start
+ // - am_proc_bound
+ // - am_restart_activity
+ // - am_on_resume_called
+ // 2) Re-open existing activity
+ // - am_focused_activity
+ // - am_on_resume_called
+
+ // HACK: event log date format is "MM-DD" and doesn't contain the year;
+ // to figure out the year, take the min bound of the model, convert
+ // to real-time and use that as the year.
+ // The Android event log will eventually contain the year once this
+ // CL is in a release:
+ // https://android-review.googlesource.com/#/c/168900
+ var first_realtime_ts = this.model_.bounds.min -
+ this.model_.realtime_to_monotonic_offset_ms;
+ var year = new Date(first_realtime_ts).getFullYear();
+ var ts = match[1].substring(0, 5) + '-' + year + ' ' +
+ match[1].substring(5, match[1].length);
+
+ var monotonic_ts = Date.parse(ts) +
+ this.model_.realtime_to_monotonic_offset_ms;
+
+ var pid = match[2];
+ var action = match[5];
+ var data = match[6];
+
+ if (action === 'am_create_activity') {
+ match = amCreateRE.exec(data);
+ if (match && match.length >= 2) {
+ this.handleCreateActivity(monotonic_ts,
+ this.getFullActivityName(match[1]));
+ }
+ } else if (action === 'am_focused_activity') {
+ match = amFocusedRE.exec(data);
+ if (match && match.length >= 2) {
+ this.handleFocusActivity(monotonic_ts,
+ this.getProcName(match[1]), this.getFullActivityName(match[1]));
+ }
+ } else if (action === 'am_proc_start') {
+ match = amProcStartRE.exec(data);
+ if (match && match.length >= 2) {
+ this.handleProcStartForActivity(monotonic_ts,
+ this.getFullActivityName(match[1]));
+ }
+ } else if (action === 'am_on_resume_called') {
+ match = amOnResumeRE.exec(data);
+ if (match && match.length >= 2)
+ this.handleOnResumeCalled(monotonic_ts, pid, match[1]);
+ } else if (action === 'am_on_paused_called') {
+ match = amOnPauseRE.exec(data);
+ if (match && match.length >= 2)
+ this.handleOnPauseCalled(monotonic_ts, match[1]);
+ } else if (action === 'am_activity_launch_time') {
+ match = amLaunchTimeRE.exec(data);
+ this.handleLaunchTime(monotonic_ts,
+ this.getFullActivityName(match[1]), match[2]);
+ } else if (action === 'am_destroy_activity') {
+ match = amDestroyRE.exec(data);
+ if (match && match.length == 2) {
+ this.handleDestroyActivity(monotonic_ts,
+ this.getFullActivityName(match[1]));
+ }
+ }
+ },
+
+ importEvents: function(isSecondaryImport) {
+ // Check if we have a mapping from real-time to CLOCK_MONOTONIC
+ if (isNaN(this.model_.realtime_to_monotonic_offset_ms)) {
+ this.model_.importWarning({
+ type: 'eveng_log_clock_sync',
+ message: 'Need a trace_event_clock_sync to map realtime to import.'
+ });
+ return;
+ }
+ // Since the event log typically spans a much larger timeframe
+ // than the ftrace data, we want to calculate the bounds of the existing
+ // model, and dump all event log data outside of those bounds
+ this.model_.updateBounds();
+
+ var lines = this.events_.split('\n');
+ lines.forEach(this.parseAmLine_, this);
+
+ // Iterate over all created activities that are not destroyed yet
+ for (var activityName in activityMap) {
+ var activity = activityMap[activityName];
+ // If we're still in the foreground, store the activity anyway
+ if (activity.state == ACTIVITY_STATE.RESUMED) {
+ // Set the pause timestamp to the end of the model bounds
+ activity.lastPauseTs = this.model_.bounds.max;
+ this.addActivityToProcess(activity);
+ }
+ }
+ }
+ };
+
+ Importer.register(EventLogImporter);
+
+ return {
+ EventLogImporter: EventLogImporter
+ };
+});
+</script>
diff --git a/catapult/tracing/tracing/extras/importer/gcloud_trace/gcloud_trace_importer.html b/catapult/tracing/tracing/extras/importer/gcloud_trace/gcloud_trace_importer.html
new file mode 100644
index 0000000..71a8353
--- /dev/null
+++ b/catapult/tracing/tracing/extras/importer/gcloud_trace/gcloud_trace_importer.html
@@ -0,0 +1,95 @@
+<!DOCTYPE html>
+<!--
+Copyright (c) 2015 The Chromium Authors. All rights reserved.
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file.
+-->
+
+<link rel="import" href="/tracing/importer/importer.html">
+
+<script>
+
+'use strict';
+
+/**
+ * @fileoverview GcloudTraceImporter imports JSON data from Google Cloud Trace.
+ */
+tr.exportTo('tr.e.importer.gcloud_trace', function() {
+ function GcloudTraceImporter(model, eventData) {
+ this.importPriority = 2;
+ this.eventData_ = eventData;
+ }
+
+ /**
+ * @return {boolean} Whether obj looks like the JSON output from Cloud Trace.
+ */
+ GcloudTraceImporter.canImport = function(eventData) {
+ if (typeof(eventData) !== 'string' && !(eventData instanceof String))
+ return false;
+
+ // Slice the data so we don't potentially do a replace on a gigantic string.
+ var normalizedEventData = eventData.slice(0, 20).replace(/\s/g, '');
+ if (normalizedEventData.length < 14)
+ return false;
+
+ return normalizedEventData.slice(0, 14) == '{"projectId":"';
+ };
+
+ GcloudTraceImporter.prototype = {
+
+ __proto__: tr.importer.Importer.prototype,
+
+ /**
+ * Called by the Model to extract subtraces from the event data. The
+ * subtraces are passed on to other importers that can recognize them.
+ */
+ extractSubtraces: function() {
+ var traceEvents = this.createEventsForTrace();
+ return traceEvents ? [traceEvents] : [];
+ },
+
+ createEventsForTrace: function() {
+ var events = [];
+ var trace = JSON.parse(this.eventData_);
+ var spanLength = trace.spans.length;
+ for (var i = 0; i < spanLength; i++) {
+ events.push(this.createEventForSpan(trace.traceId, trace.spans[i]));
+ }
+ return {
+ 'traceEvents': events
+ };
+ },
+
+ createEventForSpan: function(traceId, span) {
+ var newArgs = {};
+ if (span.labels) {
+ newArgs = JSON.parse(JSON.stringify(span.labels));
+ }
+ newArgs['Span ID'] = span.spanId;
+ newArgs['Start Time'] = span.startTime;
+ newArgs['End Time'] = span.endTime;
+ if (span.parentSpanId) {
+ newArgs['Parent Span ID'] = span.parentSpanId;
+ }
+ // The timestamps are ISO-standard strings, which are parsed to millis,
+ // then converted to the micros that the trace viewer expects.
+ return {
+ name: span.name,
+ args: newArgs,
+ pid: traceId,
+ ts: Date.parse(span.startTime) * 1000,
+ dur: (Date.parse(span.endTime) - Date.parse(span.startTime)) * 1000,
+ cat: 'tracespan',
+ tid: traceId,
+ ph: 'X'
+ };
+ }
+ };
+
+ tr.importer.Importer.register(GcloudTraceImporter);
+
+ return {
+ GcloudTraceImporter: GcloudTraceImporter
+ };
+});
+</script>
diff --git a/catapult/tracing/tracing/extras/importer/gcloud_trace/gcloud_trace_importer_test.html b/catapult/tracing/tracing/extras/importer/gcloud_trace/gcloud_trace_importer_test.html
new file mode 100644
index 0000000..2c229ff
--- /dev/null
+++ b/catapult/tracing/tracing/extras/importer/gcloud_trace/gcloud_trace_importer_test.html
@@ -0,0 +1,99 @@
+<!DOCTYPE html>
+<!--
+Copyright (c) 2015 The Chromium Authors. All rights reserved.
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file.
+-->
+
+<link rel="import" href="/tracing/core/test_utils.html">
+<link rel="import" href="/tracing/model/model.html">
+<link rel="import" href="/tracing/extras/importer/trace_event_importer.html">
+<link rel="import" href="/tracing/extras/importer/gcloud_trace/gcloud_trace_importer.html">
+
+<script>
+
+'use strict';
+
+tr.b.unittest.testSuite(function() {
+ var GcloudTraceImporter = tr.e.importer.gcloud_trace.GcloudTraceImporter;
+
+ test('noSpans', function() {
+ var trace = {projectId: 'My Project', traceId: '123', spans: []};
+
+ var model = new tr.Model();
+ var importer = new tr.e.importer.gcloud_trace.GcloudTraceImporter(model,
+ JSON.stringify(trace));
+ var subtraces = importer.extractSubtraces();
+ assert.equal(1, subtraces.length);
+ // Note there are, in fact, use cases for traces with no events (spans).
+ assert.deepEqual([], subtraces[0].traceEvents);
+ });
+
+ test('typicalTrace', function() {
+ var span1 = {
+ 'spanId': '1',
+ 'kind': 'RPC_CLIENT',
+ 'name': '/first',
+ 'startTime': '2015-09-03T16:40:00.841654024Z',
+ 'endTime': '2015-09-03T16:40:00.856599389Z',
+ 'labels': {
+ 'key1': 'value1',
+ 'key2': 'value2'
+ }
+ };
+ var span2 = {
+ 'spanId': '2',
+ 'kind': 'RPC_SERVER',
+ 'name': '/second',
+ 'startTime': '2015-09-03T16:40:00.842880028Z',
+ 'endTime': '2015-09-03T16:40:00.851729538Z',
+ 'parentSpanId': '1',
+ 'labels': {
+ 'key1': 'value3',
+ 'key2': 'value4'
+ }
+ };
+ var trace = {projectId: 'My Project', traceId: '123',
+ spans: [span1, span2]};
+
+ var model = new tr.Model();
+ var importer = new tr.e.importer.gcloud_trace.GcloudTraceImporter(model,
+ JSON.stringify(trace));
+ var subtraces = importer.extractSubtraces();
+ assert.equal(1, subtraces.length);
+ assert.equal(2, subtraces[0].traceEvents.length);
+
+ var span1Event = subtraces[0].traceEvents[0];
+ assert.equal('tracespan', span1Event.cat);
+ assert.equal('/first', span1Event.name);
+ assert.equal(1441298400841000, span1Event.ts);
+ assert.equal(15000, span1Event.dur);
+ assert.equal('123', span1Event.pid);
+ assert.equal('123', span1Event.tid);
+ assert.equal('2015-09-03T16:40:00.856599389Z', span1Event.args['End Time']);
+ assert.equal('1', span1Event.args['Span ID']);
+ assert.equal('value1', span1Event.args['key1']);
+ assert.equal('value2', span1Event.args['key2']);
+ assert.equal('2015-09-03T16:40:00.856599389Z', span1Event.args['End Time']);
+
+ var span2Event = subtraces[0].traceEvents[1];
+ assert.equal('tracespan', span2Event.cat);
+ assert.equal('/second', span2Event.name);
+ assert.equal(1441298400842000, span2Event.ts);
+ assert.equal(9000, span2Event.dur);
+ assert.equal('123', span2Event.pid);
+ assert.equal('123', span2Event.tid);
+ });
+
+ test('canImport', function() {
+ assert.isTrue(GcloudTraceImporter.canImport(
+ JSON.stringify({projectId: 'My Project'})));
+ assert.isTrue(GcloudTraceImporter.canImport(
+ JSON.stringify({projectId: '56', traceId: '34'})));
+ assert.isFalse(GcloudTraceImporter.canImport(
+ JSON.stringify({wrongjson: '33'})));
+ assert.isFalse(GcloudTraceImporter.canImport(''));
+ assert.isFalse(GcloudTraceImporter.canImport([]));
+ });
+});
+</script>
diff --git a/catapult/tracing/tracing/extras/importer/linux_perf/ftrace_importer.html b/catapult/tracing/tracing/extras/importer/linux_perf/ftrace_importer.html
index 2dbae1a..509a102 100644
--- a/catapult/tracing/tracing/extras/importer/linux_perf/ftrace_importer.html
+++ b/catapult/tracing/tracing/extras/importer/linux_perf/ftrace_importer.html
@@ -147,6 +147,7 @@
var traceEventClockSyncRE = /trace_event_clock_sync: parent_ts=(\d+\.?\d*)/;
TestExports.traceEventClockSyncRE = traceEventClockSyncRE;
+ var realTimeClockSyncRE = /trace_event_clock_sync: realtime_ts=(\d+)/;
var genericClockSyncRE = /trace_event_clock_sync: name=(\w+)/;
// Some kernel trace events are manually classified in slices and
@@ -750,6 +751,13 @@
return;
if (traceEventClockSyncRE.exec(eventBase.details))
this.traceClockSyncEvent(eventName, cpuNumber, pid, ts, eventBase);
+ if (realTimeClockSyncRE.exec(eventBase.details)) {
+ // This entry maps realtime to clock_monotonic; store in the model
+ // so that importers parsing files with realtime timestamps can
+ // map this back to monotonic.
+ var match = realTimeClockSyncRE.exec(eventBase.details);
+ this.model_.realtime_to_monotonic_offset_ms = ts - match[1];
+ }
if (genericClockSyncRE.exec(eventBase.details))
this.traceClockSyncEvent(eventName, cpuNumber, pid, ts, eventBase);
}.bind(this));
diff --git a/catapult/tracing/tracing/extras/importer/trace_code_entry.html b/catapult/tracing/tracing/extras/importer/trace_code_entry.html
index ce6c295..bd46aa0 100644
--- a/catapult/tracing/tracing/extras/importer/trace_code_entry.html
+++ b/catapult/tracing/tracing/extras/importer/trace_code_entry.html
@@ -18,42 +18,63 @@
*/
tr.exportTo('tr.e.importer', function() {
function TraceCodeEntry(size, name, scriptId) {
- var methodName = undefined;
- var script = undefined;
- var lineNum = -1;
- var isNative = false;
+ // Stolen from DevTools TimelineJSProfileProcessor._buildCallFrame
+ // Code states:
+ // (empty) -> compiled
+ // ~ -> optimizable
+ // * -> optimized
+ var rePrefix = /^(\w*:)?[*~]?(.*)$/m;
+ var tokens = rePrefix.exec(name);
+ var prefix = tokens[1];
+ var body = tokens[2];
- if (name.startsWith('LazyCompile:')) {
- var cleanName = name.replace(/LazyCompile:~?/, '');
- var idx = cleanName.lastIndexOf(' ');
- if (idx < 0) {
- methodName = cleanName;
- } else {
- methodName = cleanName.substring(0, idx);
- script = cleanName.substring(idx + 1);
-
- var matches = script.match(/(.*):(\d+)$/);
- if (matches !== null) {
- script = matches[1];
- lineNum = parseInt(matches[2]);
- }
- }
-
- if (methodName.endsWith(' native')) {
- isNative = true;
- methodName = methodName.replace(/\s+native$/, '');
- }
-
- if (methodName === '')
- methodName = 'unknown';
+ var rawName;
+ var rawUrl;
+ if (prefix === 'Script:') {
+ rawName = '';
+ rawUrl = body;
} else {
- methodName = name;
+ var spacePos = body.lastIndexOf(' ');
+ rawName = spacePos !== -1 ? body.substr(0, spacePos) : body;
+ rawUrl = spacePos !== -1 ? body.substr(spacePos + 1) : '';
}
- tr.e.importer.v8.CodeMap.CodeEntry.call(this, size, methodName);
+ function splitLineAndColumn(url) {
+ var lineColumnRegEx = /(?::(\d+))?(?::(\d+))?$/;
+ var lineColumnMatch = lineColumnRegEx.exec(url);
+ var lineNumber;
+ var columnNumber;
+
+ if (typeof(lineColumnMatch[1]) === 'string') {
+ lineNumber = parseInt(lineColumnMatch[1], 10);
+ // Immediately convert line and column to 0-based numbers.
+ lineNumber = isNaN(lineNumber) ? undefined : lineNumber - 1;
+ }
+ if (typeof(lineColumnMatch[2]) === 'string') {
+ columnNumber = parseInt(lineColumnMatch[2], 10);
+ columnNumber = isNaN(columnNumber) ? undefined : columnNumber - 1;
+ }
+
+ return {
+ url: url.substring(0, url.length - lineColumnMatch[0].length),
+ lineNumber: lineNumber,
+ columnNumber: columnNumber
+ };
+ }
+
+ var nativeSuffix = ' native';
+ var isNative = rawName.endsWith(nativeSuffix);
+ var functionName =
+ isNative ? rawName.slice(0, -nativeSuffix.length) : rawName;
+ var urlData = splitLineAndColumn(rawUrl);
+ var url = urlData.url || '';
+ var line = urlData.lineNumber || 0;
+ var column = urlData.columnNumber || 0;
+
+ tr.e.importer.v8.CodeMap.CodeEntry.call(this, size, functionName);
this.sourceInfo_ = new tr.model.source_info.JSSourceInfo(
- script, lineNum, isNative, scriptId);
+ url, line, column, isNative, scriptId);
};
TraceCodeEntry.prototype = {
diff --git a/catapult/tracing/tracing/extras/importer/trace_code_entry_test.html b/catapult/tracing/tracing/extras/importer/trace_code_entry_test.html
index 39c2c78..302ffad 100644
--- a/catapult/tracing/tracing/extras/importer/trace_code_entry_test.html
+++ b/catapult/tracing/tracing/extras/importer/trace_code_entry_test.html
@@ -14,9 +14,9 @@
test('lazy_compile_method', function() {
var tce = new tr.e.importer.TraceCodeEntry(10, 'Handler:timeStamp', 12);
assert.equal(tce.size, 10);
- assert.equal(tce.name, 'Handler:timeStamp');
+ assert.equal(tce.name, 'timeStamp');
assert.equal(tce.sourceInfo.isNative, false);
- assert.equal(tce.sourceInfo.file, undefined);
+ assert.equal(tce.sourceInfo.file, '');
assert.equal(tce.sourceInfo.line, -1);
assert.equal(tce.sourceInfo.scriptId, 12);
});
@@ -24,9 +24,9 @@
test('non_lazy_compile_method', function() {
var tce = new tr.e.importer.TraceCodeEntry(10, 'Handler:timeStamp', 12);
assert.equal(tce.size, 10);
- assert.equal(tce.name, 'Handler:timeStamp');
+ assert.equal(tce.name, 'timeStamp');
assert.equal(tce.sourceInfo.isNative, false);
- assert.equal(tce.sourceInfo.file, undefined);
+ assert.equal(tce.sourceInfo.file, '');
assert.equal(tce.sourceInfo.line, -1);
assert.equal(tce.sourceInfo.scriptId, 12);
});
@@ -38,7 +38,18 @@
assert.equal(tce.name, 'IsAccessorDescriptor');
assert.equal(tce.sourceInfo.isNative, true);
assert.equal(tce.sourceInfo.file, 'v8natives.js');
- assert.equal(tce.sourceInfo.line, 183);
+ assert.equal(tce.sourceInfo.line, 182);
+ assert.equal(tce.sourceInfo.scriptId, 12);
+ });
+
+ test('strips_*_from_name', function() {
+ var tce = new tr.e.importer.TraceCodeEntry(10,
+ 'LazyCompile:*IsAccessorDescriptor native v8natives.js:183', 12);
+ assert.equal(tce.size, 10);
+ assert.equal(tce.name, 'IsAccessorDescriptor');
+ assert.equal(tce.sourceInfo.isNative, true);
+ assert.equal(tce.sourceInfo.file, 'v8natives.js');
+ assert.equal(tce.sourceInfo.line, 182);
assert.equal(tce.sourceInfo.scriptId, 12);
});
@@ -49,7 +60,7 @@
assert.equal(tce.name, 'IsAccessorDescriptor');
assert.equal(tce.sourceInfo.isNative, false);
assert.equal(tce.sourceInfo.file, 'v8natives.js');
- assert.equal(tce.sourceInfo.line, 183);
+ assert.equal(tce.sourceInfo.line, 182);
assert.equal(tce.sourceInfo.scriptId, 12);
});
@@ -58,7 +69,7 @@
assert.equal(tce.size, 10);
assert.equal(tce.name, 'Object');
assert.equal(tce.sourceInfo.isNative, false);
- assert.equal(tce.sourceInfo.file, undefined);
+ assert.equal(tce.sourceInfo.file, '');
assert.equal(tce.sourceInfo.line, -1);
assert.equal(tce.sourceInfo.scriptId, 12);
});
@@ -70,34 +81,35 @@
assert.equal(tce.name, 'Object');
assert.equal(tce.sourceInfo.isNative, false);
assert.equal(tce.sourceInfo.file, '');
- assert.equal(tce.sourceInfo.line, 220);
+ assert.equal(tce.sourceInfo.line, 219);
assert.equal(tce.sourceInfo.scriptId, 12);
});
test('unknown_method_name', function() {
var tce = new tr.e.importer.TraceCodeEntry(10, 'LazyCompile:', 12);
assert.equal(tce.size, 10);
- assert.equal(tce.name, 'unknown');
+ assert.equal(tce.name, '');
assert.equal(tce.sourceInfo.isNative, false);
- assert.equal(tce.sourceInfo.file, undefined);
+ assert.equal(tce.sourceInfo.file, '');
assert.equal(tce.sourceInfo.line, -1);
assert.equal(tce.sourceInfo.scriptId, 12);
var tce = new tr.e.importer.TraceCodeEntry(10, 'LazyCompile:~ :37', 12);
assert.equal(tce.size, 10);
- assert.equal(tce.name, 'unknown');
+ assert.equal(tce.name, '');
assert.equal(tce.sourceInfo.isNative, false);
assert.equal(tce.sourceInfo.file, '');
- assert.equal(tce.sourceInfo.line, 37);
+ assert.equal(tce.sourceInfo.line, 36);
assert.equal(tce.sourceInfo.scriptId, 12);
var tce = new tr.e.importer.TraceCodeEntry(10,
- 'LazyCompile:~ native liveedit.js:37', 12);
+ 'LazyCompile:~ native liveedit.js:37:10', 12);
assert.equal(tce.size, 10);
- assert.equal(tce.name, 'unknown');
+ assert.equal(tce.name, '');
assert.equal(tce.sourceInfo.isNative, true);
assert.equal(tce.sourceInfo.file, 'liveedit.js');
- assert.equal(tce.sourceInfo.line, 37);
+ assert.equal(tce.sourceInfo.line, 36);
+ assert.equal(tce.sourceInfo.column, 9);
assert.equal(tce.sourceInfo.scriptId, 12);
});
});
diff --git a/catapult/tracing/tracing/extras/importer/trace_event_importer.html b/catapult/tracing/tracing/extras/importer/trace_event_importer.html
index cc605c3..f3ddcd7 100644
--- a/catapult/tracing/tracing/extras/importer/trace_event_importer.html
+++ b/catapult/tracing/tracing/extras/importer/trace_event_importer.html
@@ -364,6 +364,12 @@
},
processCompleteEvent: function(event) {
+ // TODO(fmeawad): Preventing the overhead slices from making it into
+ // the model until bug
+ // https://github.com/catapult-project/catapult/issues/1469 is addressed.
+ if (event.cat.indexOf('trace_event_overhead') > -1)
+ return undefined;
+
var thread = this.model_.getOrCreateProcess(event.pid)
.getOrCreateThread(event.tid);
@@ -446,8 +452,10 @@
// We won't know the name if we try to insert the code here.
}
} else {
- map.addCode(startAddr,
- new tr.e.importer.TraceCodeEntry(data.code_len, data.name));
+ var entry = new tr.e.importer.TraceCodeEntry(data.code_len, data.name);
+ // Hack to get around name de-duplication done by CodeMap::findEntry.
+ entry.nameUpdated_ = true;
+ map.addCode(startAddr, entry);
}
},
@@ -506,6 +514,10 @@
processV8Sample: function(event) {
var data = event.args.data;
+ // As-per DevTools, the backend sometimes creates bogus samples. Skip it.
+ if (data.vm_state === 'js' && !data.stack.length)
+ return;
+
var rootStackFrame = this.v8ProcessRootStackFrame_[event.pid];
if (!rootStackFrame) {
rootStackFrame = new tr.model.StackFrame(
@@ -684,7 +696,7 @@
// TODO(yuhaoz): If Chrome supports creating other events with flow,
// we will need to call processFlowEvent for them also.
// https://github.com/catapult-project/catapult/issues/1259
- if (event.bind_id !== undefined)
+ if (slice !== undefined && event.bind_id !== undefined)
this.processFlowEvent(event, slice);
} else if (event.ph === 'b' || event.ph === 'e' || event.ph === 'n' ||
@@ -1820,6 +1832,9 @@
var allMemoryAllocatorDumpsByGuid = {};
var globalMemoryAllocatorDumpsByFullName = {};
+ var LEVELS_OF_DETAIL = [undefined, 'light', 'detailed'];
+ var globalLevelOfDetailIndex = undefined;
+
events.process.forEach(function(processEvent) {
var pid = processEvent.pid;
if (pid in globalMemoryDump.processMemoryDumps) {
@@ -1846,19 +1861,81 @@
globalMemoryDump, process,
timestampFromUs(processEvent.ts));
- // Parse the totals, which are mandatory.
- if (dumps.process_totals === undefined ||
- dumps.process_totals.resident_set_bytes === undefined) {
+ // Determine the level of detail of the dump.
+ var processLevelOfDetail = dumps.level_of_detail;
+ var processLevelOfDetailIndex = LEVELS_OF_DETAIL.indexOf(
+ processLevelOfDetail);
+ if (processLevelOfDetailIndex < 0) {
+ this.model_.importWarning({
+ type: 'memory_dump_parse_error',
+ message: 'unknown level of detail \'' + processLevelOfDetail +
+ '\' of process memory dump for pid=' + pid +
+ ' and dump id=' + id + '.'
+ });
+ } else {
+ processMemoryDump.levelOfDetail = processLevelOfDetail;
+ if (globalLevelOfDetailIndex === undefined) {
+ globalLevelOfDetailIndex = processLevelOfDetailIndex;
+ } else if (globalLevelOfDetailIndex !== processLevelOfDetailIndex) {
+ // If the process memory dumps have different levels of detail,
+ // show a warning and use the highest level.
+ this.model_.importWarning({
+ type: 'memory_dump_parse_error',
+ message: 'diffent levels of detail of process memory dumps ' +
+ 'for dump id=' + id + '.'
+ });
+ globalLevelOfDetailIndex = Math.max(
+ globalLevelOfDetailIndex, processLevelOfDetailIndex);
+ }
+ }
+
+ // Parse the totals.
+ var rawTotals = dumps.process_totals;
+ if (rawTotals !== undefined) {
+ processMemoryDump.totals = {};
+
+ // Total resident bytes (mandatory).
+ if (rawTotals.resident_set_bytes !== undefined) {
+ processMemoryDump.totals.residentBytes = parseInt(
+ rawTotals.resident_set_bytes, 16);
+ }
+
+ // Peak resident bytes (optional).
+ if (rawTotals.peak_resident_set_bytes !== undefined) {
+ if (rawTotals.is_peak_rss_resetable === undefined) {
+ this.model_.importWarning({
+ type: 'memory_dump_parse_error',
+ message: 'Optional field peak_resident_set_bytes found' +
+ ' but is_peak_rss_resetable not found in' +
+ ' process memory dump for pid=' + pid +
+ ' and dump id=' + id + '.'
+ });
+ }
+ processMemoryDump.totals.peakResidentBytes = parseInt(
+ rawTotals.peak_resident_set_bytes, 16);
+ }
+ if (rawTotals.is_peak_rss_resetable !== undefined) {
+ if (rawTotals.peak_resident_set_bytes === undefined) {
+ this.model_.importWarning({
+ type: 'memory_dump_parse_error',
+ message: 'Optional field is_peak_rss_resetable found' +
+ ' but peak_resident_set_bytes not found in' +
+ ' process memory dump for pid=' + pid +
+ ' and dump id=' + id + '.'
+ });
+ }
+ processMemoryDump.totals.arePeakResidentBytesResettable =
+ !!rawTotals.is_peak_rss_resetable;
+ }
+ }
+ if (processMemoryDump.totals === undefined ||
+ processMemoryDump.totals.residentBytes === undefined) {
this.model_.importWarning({
type: 'memory_dump_parse_error',
message: 'Mandatory field resident_set_bytes not found in' +
' process memory dump for pid=' + pid +
' and dump id=' + id + '.'
});
- processMemoryDump.totalResidentBytes = undefined;
- } else {
- processMemoryDump.totalResidentBytes = parseInt(
- dumps.process_totals.resident_set_bytes, 16);
}
// Populate the vmRegions, if present.
@@ -1971,6 +2048,16 @@
// Add all new attributes to the memory allocator dump.
var attributes = rawAllocatorDump.attrs;
+ if (attributes === undefined) {
+ this.model_.importWarning({
+ type: 'memory_dump_parse_error',
+ message: 'Memory allocator dump ' + fullName +
+ ' from pid=' + pid + ' (GUID=' + guid + ') does not' +
+ ' have attributes.'
+ });
+ attributes = {};
+ }
+
tr.b.iterItems(attributes, function(attrName, attrArgs) {
if (attrName in allocatorDump.attributes) {
// Skip existing attributes of the memory allocator dump.
@@ -1999,6 +2086,9 @@
globalMemoryDump.processMemoryDumps[pid] = processMemoryDump;
}, this);
+ globalMemoryDump.levelOfDetail =
+ LEVELS_OF_DETAIL[globalLevelOfDetailIndex];
+
// Find the root allocator dumps and establish the parent links of
// the global memory dump.
globalMemoryDump.memoryAllocatorDumps =
diff --git a/catapult/tracing/tracing/extras/importer/trace_event_importer_test.html b/catapult/tracing/tracing/extras/importer/trace_event_importer_test.html
index 434f4b8..de32288 100644
--- a/catapult/tracing/tracing/extras/importer/trace_event_importer_test.html
+++ b/catapult/tracing/tracing/extras/importer/trace_event_importer_test.html
@@ -1918,7 +1918,7 @@
var sample = t.samples_[0];
assert.equal(sample.leafStackFrame.title,
- 'foo http://example.com/bar.js:23');
+ 'foo http://example.com/bar.js:22');
assert.equal(sample.leafStackFrame.parentFrame.title, 'bar');
var sample = t.samples_[1];
@@ -2910,7 +2910,41 @@
var p = m.getProcess(42);
var d = p.memoryDumps[0];
- assert.equal(d.totalResidentBytes, 9007199254740991);
+ assert.equal(d.totals.residentBytes, 9007199254740991);
+ assert.isUndefined(d.totals.peakResidentBytes);
+ assert.isUndefined(d.totals.arePeakResidentBytesResettable);
+ assert.isUndefined(d.mostRecentVmRegions);
+ assert.lengthOf(d.memoryAllocatorDumps, 0);
+ });
+
+ test('importMemoryDumps_withPeakResidentBytes', function() {
+ var events = [
+ {
+ name: 'some_dump_name',
+ pid: 42,
+ ts: 10,
+ cat: 'test',
+ tid: 53,
+ ph: 'v',
+ id: '0x01',
+ args: {
+ dumps: {
+ process_totals: {
+ resident_set_bytes: '1fffffffffffff',
+ peak_resident_set_bytes: '2fffffffffffff',
+ is_peak_rss_resetable: true
+ }
+ }
+ }
+ }
+ ];
+ var m = makeModel(events);
+ var p = m.getProcess(42);
+ var d = p.memoryDumps[0];
+
+ assert.equal(d.totals.residentBytes, 9007199254740991);
+ assert.equal(d.totals.peakResidentBytes, 13510798882111488);
+ assert.isTrue(d.totals.arePeakResidentBytesResettable);
assert.isUndefined(d.mostRecentVmRegions);
assert.lengthOf(d.memoryAllocatorDumps, 0);
});
@@ -2995,7 +3029,9 @@
assert.isUndefined(vr2.byteStats.sharedDirtyResident);
assert.equal(vr2.byteStats.swapped, 0);
- assert.equal(d.totalResidentBytes, 0);
+ assert.equal(d.totals.residentBytes, 0);
+ assert.isUndefined(d.totals.peakResidentBytes);
+ assert.isUndefined(d.totals.arePeakResidentBytesResettable);
assert.lengthOf(d.memoryAllocatorDumps, 0);
});
@@ -3107,7 +3143,9 @@
assert.isDefined(oilpanBucket1.parent.parent);
assert.strictEqual(oilpanBucket1.parent.parent, oilpanRoot);
- assert.equal(d.totalResidentBytes, 256);
+ assert.equal(d.totals.residentBytes, 256);
+ assert.isUndefined(d.totals.peakResidentBytes);
+ assert.isUndefined(d.totals.arePeakResidentBytesResettable);
assert.isUndefined(d.mostRecentVmRegions);
});
@@ -3198,7 +3236,9 @@
assert.isDefined(oilpanBucket1.parent.parent);
assert.strictEqual(oilpanBucket1.parent.parent, oilpanRoot);
- assert.equal(d.totalResidentBytes, 256);
+ assert.equal(d.totals.residentBytes, 256);
+ assert.isUndefined(d.totals.peakResidentBytes);
+ assert.isUndefined(d.totals.arePeakResidentBytesResettable);
assert.isUndefined(d.mostRecentVmRegions);
});
@@ -3250,8 +3290,10 @@
var gmd = m.globalMemoryDumps[0];
var pmd = p.memoryDumps[0];
- assert.isUndefined(gmd.totalResidentBytes);
- assert.equal(pmd.totalResidentBytes, 256);
+ assert.isUndefined(gmd.totals);
+ assert.equal(pmd.totals.residentBytes, 256);
+ assert.isUndefined(pmd.totals.peakResidentBytes);
+ assert.isUndefined(pmd.totals.arePeakResidentBytesResettable);
assert.isUndefined(gmd.mostRecentVmRegions);
assert.isUndefined(pmd.mostRecentVmRegions);
@@ -3575,6 +3617,75 @@
assert.equal(gpuDumpLocal2OwnsLink.importance, 1);
});
+ test('importMemoryDumps_memoryAllocatorDumpsMissingFields', function() {
+ var events = [
+ {
+ name: 'a',
+ pid: 42,
+ ts: 10,
+ ph: 'v',
+ id: '0x0001',
+ args: {
+ dumps: {
+ allocators: {
+ 'no_crash': {
+ /* Missing GUID and attributes. */
+ }
+ }
+ }
+ }
+ }
+ ];
+ var m = makeModel(events);
+ var p = m.getProcess(42);
+ var d = p.memoryDumps[0];
+
+ assert.equal(d.memoryAllocatorDumps.length, 1);
+ var noCrashRoot = d.getMemoryAllocatorDumpByFullName('no_crash');
+ assert.lengthOf(noCrashRoot.children, 0);
+ assert.deepEqual(noCrashRoot.attributes,
+ { size: undefined, effective_size: undefined });
+ assert.isUndefined(noCrashRoot.parent);
+ assert.isUndefined(noCrashRoot.guid);
+ });
+
+ test('importMemoryDumps_levelsOfDetail', function() {
+ function makeModelWithLevelsOfDetail(levelsOfDetail) {
+ return makeModel(levelsOfDetail.map(function(levelOfDetail, index) {
+ var dumps = {};
+ if (levelOfDetail !== undefined)
+ dumps.level_of_detail = levelOfDetail;
+ return {
+ name: 'process_' + index,
+ pid: index,
+ ts: 10,
+ ph: 'v',
+ id: '0x0001',
+ args: {
+ dumps: dumps
+ }
+ };
+ }));
+ }
+
+ var model = makeModelWithLevelsOfDetail([undefined]);
+ assert.isUndefined(model.globalMemoryDumps[0].levelOfDetail);
+
+ var model = makeModelWithLevelsOfDetail(['light', 'light']);
+ assert.equal(model.globalMemoryDumps[0].levelOfDetail, 'light');
+
+ var model = makeModelWithLevelsOfDetail(
+ ['detailed', 'detailed', 'detailed']);
+ assert.equal(model.globalMemoryDumps[0].levelOfDetail, 'detailed');
+
+ var model = makeModelWithLevelsOfDetail(
+ ['light', undefined, 'detailed', 'light']);
+ assert.equal(model.globalMemoryDumps[0].levelOfDetail, 'detailed');
+
+ var model = makeModelWithLevelsOfDetail(['invalid', 'light']);
+ assert.equal(model.globalMemoryDumps[0].levelOfDetail, 'light');
+ });
+
test('importThreadInstantSliceWithStackFrame', function() {
var eventData = {
traceEvents: [
diff --git a/catapult/tracing/tracing/extras/rail/animation_interaction_record.html b/catapult/tracing/tracing/extras/rail/animation_interaction_record.html
index 4b05f75..8f159a6 100644
--- a/catapult/tracing/tracing/extras/rail/animation_interaction_record.html
+++ b/catapult/tracing/tracing/extras/rail/animation_interaction_record.html
@@ -5,6 +5,7 @@
found in the LICENSE file.
-->
+<link rel="import" href="/tracing/base/statistics.html">
<link rel="import" href="/tracing/extras/chrome/chrome_process_helper.html">
<link rel="import" href="/tracing/extras/rail/rail_interaction_record.html">
@@ -45,6 +46,16 @@
// would maximize long-frame-pain.
var MIN_MAX_LONG_FRAMES = 2;
+ // Discrepancy is minimized at 0 when every frame is exactly the same length,
+ // but realistically, a tiny amount of jank will look just as good.
+ var PAIN_BEGINS_AT_JANK = 0.05;
+
+ // Discrepancy is maximized at 1 when there are thousands of ridiculously fast
+ // frames and 1 ridiculously long frame. But realistically, discrepancy might
+ // never be larger than 0.3, so discrepancy up to take advantage of the full
+ // range of pain.
+ var PAIN_PEAKS_AT_JANK = 0.3;
+
function AnimationInteractionRecord(start, duration) {
tr.e.rail.RAILInteractionRecord.call(
this, 'Animation', 'rail_animate',
@@ -71,7 +82,7 @@
get normalizedUserPain() {
return tr.e.rail.weightedAverage2(
- this.normalizedLongFramePain, this.normalizedFPSPain);
+ this.normalizedJankPain, this.normalizedFPSPain);
},
get normalizedFPSPain() {
@@ -85,29 +96,16 @@
});
},
- get normalizedLongFramePain() {
+ get normalizedJankPain() {
var frameTimestamps = this.frameEvents.toArray().map(function(event) {
return event.start;
});
-
- var longFrameCount = 0;
- var prevStart = frameTimestamps[0];
- for (var i = 1; i < frameTimestamps.length; ++i) {
- var frameStartMs = frameTimestamps[i];
- var frameMs = frameStartMs - prevStart;
- if (frameMs > LONG_FRAME_MS)
- ++longFrameCount;
- prevStart = frameStartMs;
- }
-
- // Long Frame Pain peaks at this fraction of the total number of frames.
- var maxLongFrames = (LONG_FRAME_PAIN_PEAK_FRACTION *
- frameTimestamps.length);
- maxLongFrames = Math.max(MIN_MAX_LONG_FRAMES, parseInt(maxLongFrames));
-
- return tr.e.rail.computeNormalizedPain(longFrameCount, {
- min: MIN_LONG_FRAMES,
- max: maxLongFrames,
+ var absolute = false;
+ var discrepancy = tr.b.Statistics.timestampsDiscrepancy(
+ frameTimestamps, absolute);
+ return tr.e.rail.computeNormalizedPain(discrepancy, {
+ min: PAIN_BEGINS_AT_JANK,
+ max: PAIN_PEAKS_AT_JANK,
power: PAIN_POWER
});
}
diff --git a/catapult/tracing/tracing/extras/rail/animation_interaction_record_test.html b/catapult/tracing/tracing/extras/rail/animation_interaction_record_test.html
index 7111b2f..32d36b1 100644
--- a/catapult/tracing/tracing/extras/rail/animation_interaction_record_test.html
+++ b/catapult/tracing/tracing/extras/rail/animation_interaction_record_test.html
@@ -23,12 +23,14 @@
end: (i * 10) + 1
}));
}
- assert.equal(0, animationIR.normalizedUserPain);
+ assert.closeTo(0, animationIR.normalizedJankPain, 1e-4);
+ assert.closeTo(0, animationIR.normalizedUserPain, 1e-3);
});
test('OneFPS', function() {
// Maximum pain is when at least max(2, frameCount/10) frames are longer
// than 50ms, and avgFPS <= 10.
+ // One frame-per-second causes FPS pain = 1.
var animationIR = new tr.e.rail.AnimationInteractionRecord(0, 2000);
animationIR.associatedEvents.push(tr.c.TestUtils.newAsyncSliceEx({
title: tr.e.audits.IMPL_RENDERING_STATS,
@@ -45,6 +47,30 @@
start: 1999,
end: 2000
}));
+ assert.equal(0, animationIR.normalizedJankPain);
+ assert.equal(1, animationIR.normalizedFPSPain);
+ assert.closeTo(0.2689, animationIR.normalizedUserPain, 1e-4);
+ });
+
+ test('jank', function() {
+ var animationIR = new tr.e.rail.AnimationInteractionRecord(0, 101000);
+ var timestamp = 0;
+ for (var i = 0; i < 100; ++i) {
+ timestamp += 16;
+ animationIR.associatedEvents.push(tr.c.TestUtils.newAsyncSliceEx({
+ title: tr.e.audits.IMPL_RENDERING_STATS,
+ start: timestamp,
+ end: timestamp + 1
+ }));
+ }
+ timestamp += 1000;
+ animationIR.associatedEvents.push(tr.c.TestUtils.newAsyncSliceEx({
+ title: tr.e.audits.IMPL_RENDERING_STATS,
+ start: timestamp,
+ end: timestamp + 1
+ }));
+ assert.equal(1, animationIR.normalizedJankPain);
+ assert.equal(1, animationIR.normalizedFPSPain);
assert.equal(1, animationIR.normalizedUserPain);
});
});
diff --git a/catapult/tracing/tracing/extras/rail/proto_ir.html b/catapult/tracing/tracing/extras/rail/proto_ir.html
index ef37ee1..6390418 100644
--- a/catapult/tracing/tracing/extras/rail/proto_ir.html
+++ b/catapult/tracing/tracing/extras/rail/proto_ir.html
@@ -110,10 +110,10 @@
},
// Merge the other ProtoIR into this one.
+ // The irTypes need not match: ignored ProtoIRs might be merged into
+ // overlapping ProtoIRs, and Touch-only Animations are merged into Tap
+ // Responses.
merge: function(other) {
- if (this.irType !== other.irType)
- console.error('Merging', this.debug(), other.debug());
-
other.names.forEach(function(name) { this.names.add(name); }.bind(this));
// Don't use pushEvent(), which would lose special start, end.
diff --git a/catapult/tracing/tracing/extras/rail/rail_ir_finder.html b/catapult/tracing/tracing/extras/rail/rail_ir_finder.html
index 06378e9..1e139e1 100644
--- a/catapult/tracing/tracing/extras/rail/rail_ir_finder.html
+++ b/catapult/tracing/tracing/extras/rail/rail_ir_finder.html
@@ -912,6 +912,7 @@
protoIRs = this.mergeIntersectingResponses(protoIRs);
protoIRs = this.mergeIntersectingAnimations(protoIRs);
protoIRs = this.fixResponseAnimationStarts(protoIRs);
+ protoIRs = this.fixTapResponseTouchAnimations(protoIRs);
return protoIRs;
},
@@ -1049,6 +1050,56 @@
return protoIRs;
},
+ // Merge Tap Responses that overlap Touch-only Animations.
+ // https://github.com/catapult-project/catapult/issues/1431
+ fixTapResponseTouchAnimations: function(protoIRs) {
+ function isTapResponse(pir) {
+ return (pir.irType === ProtoIR.RESPONSE_TYPE) &&
+ pir.containsTypeNames([INPUT_TYPE.TAP]);
+ }
+ function isTouchAnimation(pir) {
+ return (pir.irType === ProtoIR.ANIMATION_TYPE) &&
+ pir.containsTypeNames([INPUT_TYPE.TOUCH_MOVE]) &&
+ !pir.containsTypeNames([
+ INPUT_TYPE.SCROLL_UPDATE, INPUT_TYPE.PINCH_UPDATE]);
+ }
+ var newPIRs = [];
+ while (protoIRs.length) {
+ var pir = protoIRs.shift();
+ newPIRs.push(pir);
+
+ // protoIRs are sorted by start time, and we don't know whether the Tap
+ // Response or the Touch Animation will be first
+ var pirIsTapResponse = isTapResponse(pir);
+ var pirIsTouchAnimation = isTouchAnimation(pir);
+ if (!pirIsTapResponse && !pirIsTouchAnimation)
+ continue;
+
+ for (var i = 0; i < protoIRs.length; ++i) {
+ var otherPIR = protoIRs[i];
+
+ if (!otherPIR.intersects(pir))
+ continue;
+
+ if (pirIsTapResponse && !isTouchAnimation(otherPIR))
+ continue;
+
+ if (pirIsTouchAnimation && !isTapResponse(otherPIR))
+ continue;
+
+ // pir might be the Touch Animation, but the merged ProtoIR should be
+ // a Response.
+ pir.irType = ProtoIR.RESPONSE_TYPE;
+
+ pir.merge(otherPIR);
+ protoIRs.splice(i, 1);
+ // Don't skip the next otherPIR!
+ --i;
+ }
+ }
+ return newPIRs;
+ },
+
// Check that none of the handlers accidentally ignored an input event.
checkAllInputEventsHandled: function(protoIRs) {
var handledEvents = [];
diff --git a/catapult/tracing/tracing/extras/rail/rail_ir_finder_test.html b/catapult/tracing/tracing/extras/rail/rail_ir_finder_test.html
index 414d335..99c2952 100644
--- a/catapult/tracing/tracing/extras/rail/rail_ir_finder_test.html
+++ b/catapult/tracing/tracing/extras/rail/rail_ir_finder_test.html
@@ -66,7 +66,7 @@
verifier.verify();
});
- test('MouseEventResponses', function() {
+ test('mouseEventResponses', function() {
var verifier = new IRVerifier();
verifier.customizeModelCallback = function(model) {
var mouseDown = chrome_test_utils.addInputEvent(
@@ -90,7 +90,7 @@
verifier.verify();
});
- test('MouseEventsIgnored', function() {
+ test('mouseEventsIgnored', function() {
var verifier = new IRVerifier();
verifier.customizeModelCallback = function(model) {
chrome_test_utils.addInputEvent(model, INPUT_TYPE.MOUSE_MOVE,
@@ -126,7 +126,33 @@
verifier.verify();
});
- test('FlingFlingFling', function() {
+ test('overlappingIdleAndLoadCollectUnassociatedEvents', function() {
+ var verifier = new IRVerifier();
+ verifier.customizeModelCallback = function(model) {
+ chrome_test_utils.addFrameEvent(model, {start: 0, end: 10});
+ chrome_test_utils.addCommitLoadEvent(model, {start: 10, end: 20});
+ chrome_test_utils.addFrameEvent(model, {start: 25, end: 30});
+ chrome_test_utils.addFrameEvent(model, {start: 35, end: 40});
+ // 3 Idle events.
+ chrome_test_utils.addRenderingEvent(model, {start: 5, end: 15});
+ chrome_test_utils.addRenderingEvent(model, {start: 11, end: 15});
+ chrome_test_utils.addRenderingEvent(model, {start: 13, end: 15});
+ // 3 Load events.
+ chrome_test_utils.addRenderingEvent(model, {start: 15, end: 35});
+ chrome_test_utils.addRenderingEvent(model, {start: 21, end: 30});
+ chrome_test_utils.addRenderingEvent(model, {start: 20, end: 30});
+ // 1 Idle event.
+ chrome_test_utils.addRenderingEvent(model, {start: 35, end: 36});
+ };
+ verifier.expectedIRs = [
+ {title: 'Idle', start: 0, end: 10, eventCount: 3},
+ {title: 'Load', name: 'Succeeded', start: 10, end: 30, eventCount: 5},
+ {title: 'Idle', start: 30, end: 40, eventCount: 1}
+ ];
+ verifier.verify();
+ });
+
+ test('flingFlingFling', function() {
// This trace gave me so many different kinds of trouble that I'm just going
// to copy it straight in here, without trying to clarify it at all.
// measurmt-traces/mobile/cnet_fling_up_fling_down_motox_2013.json
@@ -357,7 +383,7 @@
verifier.verify();
});
- test('CSSAnimations', function() {
+ test('cssAnimations', function() {
// CSS Animations happen on the renderer process, not the browser process.
// They are merged if they overlap.
// They are merged with other kinds of animations.
@@ -408,7 +434,7 @@
verifier.verify();
});
- test('FlingFling', function() {
+ test('flingFling', function() {
// measurmt-traces/mobile/facebook_obama_scroll_dialog_box.html
var verifier = new IRVerifier();
verifier.customizeModelCallback = function(model) {
@@ -437,7 +463,7 @@
verifier.verify();
});
- test('Load', function() {
+ test('load', function() {
var verifier = new IRVerifier();
verifier.customizeModelCallback = function(model) {
chrome_test_utils.addCommitLoadEvent(model, {start: 0, end: 10});
@@ -449,7 +475,7 @@
verifier.verify();
});
- test('LoadFailed', function() {
+ test('loadFailed', function() {
var verifier = new IRVerifier();
verifier.customizeModelCallback = function(model) {
chrome_test_utils.addStartProvisionalLoadEvent(
@@ -463,7 +489,7 @@
verifier.verify();
});
- test('LoadMainRunner', function() {
+ test('loadMainRunner', function() {
var verifier = new IRVerifier();
verifier.customizeModelCallback = function(model) {
chrome_test_utils.addMainRunnerEvent(model, {start: 0, end: 10});
@@ -486,7 +512,7 @@
verifier.verify();
});
- test('MultipleIdles', function() {
+ test('multipleIdles', function() {
var verifier = new IRVerifier();
verifier.customizeModelCallback = function(model) {
chrome_test_utils.addFrameEvent(model, {start: 0, end: 1});
@@ -510,7 +536,7 @@
verifier.verify();
});
- test('TouchStartTouchEndTap', function() {
+ test('touchStartTouchEndTap', function() {
var verifier = new IRVerifier();
verifier.customizeModelCallback = function(model) {
chrome_test_utils.addInputEvent(model, INPUT_TYPE.TOUCH_START,
@@ -524,7 +550,7 @@
verifier.verify();
});
- test('TouchMoveResponseAnimation', function() {
+ test('touchMoveResponseAnimation', function() {
var verifier = new IRVerifier();
verifier.customizeModelCallback = function(model) {
chrome_test_utils.addInputEvent(model, INPUT_TYPE.TOUCH_START,
@@ -543,7 +569,7 @@
verifier.verify();
});
- test('TapEvents', function() {
+ test('tapEvents', function() {
var verifier = new IRVerifier();
verifier.customizeModelCallback = function(model) {
chrome_test_utils.addInputEvent(model, INPUT_TYPE.TAP,
@@ -561,7 +587,7 @@
verifier.verify();
});
- test('TapAndTapCancelResponses', function() {
+ test('tapAndTapCancelResponses', function() {
var verifier = new IRVerifier();
verifier.customizeModelCallback = function(model) {
chrome_test_utils.addInputEvent(model, INPUT_TYPE.TAP_DOWN,
@@ -577,7 +603,7 @@
verifier.verify();
});
- test('TapCancelResponse', function() {
+ test('tapCancelResponse', function() {
var verifier = new IRVerifier();
verifier.customizeModelCallback = function(model) {
chrome_test_utils.addInputEvent(model, INPUT_TYPE.TAP_DOWN,
@@ -591,7 +617,7 @@
verifier.verify();
});
- test('PinchResponseAnimation', function() {
+ test('pinchResponseAnimation', function() {
var verifier = new IRVerifier();
verifier.customizeModelCallback = function(model) {
chrome_test_utils.addFrameEvent(model, {start: 0, end: 10});
@@ -621,7 +647,7 @@
verifier.verify();
});
- test('TapThenScroll', function() {
+ test('tapThenScroll', function() {
// measurmt-traces/mobile/google_io_instrument_strumming.json
var verifier = new IRVerifier();
verifier.customizeModelCallback = function(model) {
@@ -644,7 +670,7 @@
verifier.verify();
});
- test('PinchFlingTapTouchEventsOverlap', function() {
+ test('pinchFlingTapTouchEventsOverlap', function() {
var verifier = new IRVerifier();
verifier.customizeModelCallback = function(model) {
chrome_test_utils.addFrameEvent(model, {start: 0, end: 10});
@@ -695,7 +721,7 @@
verifier.verify();
});
- test('ScrollThenFling', function() {
+ test('scrollThenFling', function() {
var verifier = new IRVerifier();
verifier.customizeModelCallback = function(model) {
chrome_test_utils.addInputEvent(model, INPUT_TYPE.SCROLL_UPDATE,
@@ -717,7 +743,7 @@
This test was generated from
/test_data/measurmt-traces/mobile/fling_HN_to_rest.json
*/
- test('fling_HN_to_rest', function() {
+ test('flingHNToRest', function() {
var verifier = new IRVerifier();
verifier.customizeModelCallback = function(model) {
chrome_test_utils.addEvent(model.browserMain,
@@ -772,5 +798,24 @@
];
verifier.verify();
});
+
+ test('TapResponseOverlappingTouchAnimation', function() {
+ var verifier = new IRVerifier();
+ verifier.customizeModelCallback = function(model) {
+ chrome_test_utils.addInputEvent(model, INPUT_TYPE.TOUCH_MOVE,
+ {start: 0, end: 10});
+ chrome_test_utils.addInputEvent(model, INPUT_TYPE.TOUCH_MOVE,
+ {start: 5, end: 15});
+ chrome_test_utils.addInputEvent(model, INPUT_TYPE.TOUCH_MOVE,
+ {start: 10, end: 20});
+ chrome_test_utils.addInputEvent(model, INPUT_TYPE.TAP,
+ {start: 15, end: 100});
+ };
+ verifier.expectedIRs = [
+ {title: 'Response', name: 'Tap,Touch', start: 0, end: 100,
+ eventCount: 4}
+ ];
+ verifier.verify();
+ });
});
</script>
diff --git a/catapult/tracing/tracing/extras/systrace_config.html b/catapult/tracing/tracing/extras/systrace_config.html
index 54efc9b..1525e7d 100644
--- a/catapult/tracing/tracing/extras/systrace_config.html
+++ b/catapult/tracing/tracing/extras/systrace_config.html
@@ -10,6 +10,7 @@
<!-- Features used by Android systrace. -->
<link rel="import" href="/tracing/importer/import.html">
+<link rel="import" href="/tracing/extras/importer/android/event_log_importer.html">
<link rel="import" href="/tracing/extras/importer/battor_importer.html">
<link rel="import" href="/tracing/extras/importer/ddms_importer.html">
<link rel="import" href="/tracing/extras/importer/linux_perf/ftrace_importer.html">
diff --git a/catapult/tracing/tracing/importer/import.html b/catapult/tracing/tracing/importer/import.html
index f36baa1..798b3f4 100644
--- a/catapult/tracing/tracing/importer/import.html
+++ b/catapult/tracing/tracing/importer/import.html
@@ -311,8 +311,10 @@
createImporter_: function(eventData) {
var importerConstructor = tr.importer.Importer.findImporterFor(eventData);
- if (!importerConstructor)
- throw new Error('Could create an importer for the provided eventData.');
+ if (!importerConstructor) {
+ throw new Error('Couldn\'t create an importer for the provided ' +
+ 'eventData.');
+ }
return new importerConstructor(this.model_, eventData);
},
diff --git a/catapult/tracing/tracing/model/activity.html b/catapult/tracing/tracing/model/activity.html
new file mode 100644
index 0000000..1f353b1
--- /dev/null
+++ b/catapult/tracing/tracing/model/activity.html
@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<!--
+Copyright (c) 2015 The Chromium Authors. All rights reserved.
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file.
+-->
+<link rel="import" href="/tracing/ui/base/color_scheme.html">
+
+<script>
+'use strict';
+
+/**
+ * @fileoverview Class representing a user activity that is running
+ * in the process.
+ * On the Android platform, activities are mapped to Android Activities
+ * running in the foreground of the process.
+ * On Windows/OS X this could for example represent
+ * the currently active window of the process.
+ */
+tr.exportTo('tr.model', function() {
+ /**
+ * @constructor
+ * @param {String} name Name of the activity
+ * @param {String} category Category of the activities
+ * @param {String} range The time range where the activity was running
+ * @param {String} args Additional arguments
+ */
+ function Activity(name, category, range, args) {
+ tr.model.TimedEvent.call(this, range.min);
+ this.title = name;
+ this.category = category;
+ this.colorId = tr.ui.b.getColorIdForGeneralPurposeString(name);
+ this.duration = range.duration;
+ this.args = args;
+ this.name = name;
+ };
+
+ Activity.prototype = {
+ __proto__: tr.model.TimedEvent.prototype,
+
+ shiftTimestampsForward: function(amount) {
+ this.start += amount;
+ },
+
+ addBoundsToRange: function(range) {
+ range.addValue(this.start);
+ range.addValue(this.end);
+ }
+ };
+ return {
+ Activity: Activity
+ };
+});
+</script>
diff --git a/catapult/tracing/tracing/model/attribute.html b/catapult/tracing/tracing/model/attribute.html
index 1618c29..39e60fb 100644
--- a/catapult/tracing/tracing/model/attribute.html
+++ b/catapult/tracing/tracing/model/attribute.html
@@ -259,7 +259,13 @@
// Corresponding memory allocator dump is owned by another MAD.
// TODO(petrcermak): Figure out if there's a better place to store this.
- MEMORY_OWNED: 4
+ MEMORY_OWNED: 4,
+
+ // Overall value (e.g. peak value since start process).
+ OVERALL_VALUE: 5,
+
+ // Recent value (e.g. peak value since the previous memory dump).
+ RECENT_VALUE: 6
};
return {
diff --git a/catapult/tracing/tracing/model/container_memory_dump.html b/catapult/tracing/tracing/model/container_memory_dump.html
index 232cf36..8bfc248 100644
--- a/catapult/tracing/tracing/model/container_memory_dump.html
+++ b/catapult/tracing/tracing/model/container_memory_dump.html
@@ -21,6 +21,11 @@
function ContainerMemoryDump(start) {
tr.model.TimedEvent.call(this, start);
+ // 'light' or 'detailed' memory dump. See
+ // base::trace_event::MemoryDumpLevelOfDetail in the Chromium
+ // repository.
+ this.levelOfDetail = undefined;
+
this.memoryAllocatorDumps_ = undefined;
this.memoryAllocatorDumpsByFullName_ = undefined;
};
diff --git a/catapult/tracing/tracing/model/event_set.html b/catapult/tracing/tracing/model/event_set.html
index 9247f7c..0c10f6f 100644
--- a/catapult/tracing/tracing/model/event_set.html
+++ b/catapult/tracing/tracing/model/event_set.html
@@ -26,12 +26,6 @@
* @constructor
*/
function EventSet(opt_events) {
- // sunburst_zoom_level is used by sunburst chart to remember
- // zoom level across event set changes.
- // TODO(gholap): get rid of this eventually when
- // event sets support frames.
- this.sunburst_zoom_level = undefined;
-
this.bounds_dirty_ = true;
this.bounds_ = new tr.b.Range();
this.length_ = 0;
@@ -143,9 +137,6 @@
var allTypeInfos = EventRegistry.getAllRegisteredTypeInfos();
allTypeInfos.forEach(function(eventTypeInfo) {
events[eventTypeInfo.metadata.name] = new EventSet();
- if (this.sunburst_zoom_level !== undefined)
- events[eventTypeInfo.metadata.name].sunburst_zoom_level =
- this.sunburst_zoom_level;
}, this);
this.forEach(function(event, i) {
diff --git a/catapult/tracing/tracing/model/global_memory_dump.html b/catapult/tracing/tracing/model/global_memory_dump.html
index 7a01c96..7406223 100644
--- a/catapult/tracing/tracing/model/global_memory_dump.html
+++ b/catapult/tracing/tracing/model/global_memory_dump.html
@@ -28,8 +28,9 @@
this.processMemoryDumps = {};
}
- var SIZE_ATTRIBUTE_NAME = 'size';
- var EFFECTIVE_SIZE_ATTRIBUTE_NAME = 'effective_size';
+ var SIZE_ATTRIBUTE_NAME = tr.model.MemoryAllocatorDump.SIZE_ATTRIBUTE_NAME;
+ var EFFECTIVE_SIZE_ATTRIBUTE_NAME =
+ tr.model.MemoryAllocatorDump.EFFECTIVE_SIZE_ATTRIBUTE_NAME;
function getSize(dump) {
var attr = dump.attributes[SIZE_ATTRIBUTE_NAME];
diff --git a/catapult/tracing/tracing/model/memory_allocator_dump.html b/catapult/tracing/tracing/model/memory_allocator_dump.html
index 516fc4b..0ccec72 100644
--- a/catapult/tracing/tracing/model/memory_allocator_dump.html
+++ b/catapult/tracing/tracing/model/memory_allocator_dump.html
@@ -38,6 +38,15 @@
this.guid = opt_guid;
};
+ /**
+ * Size attribute names. Please refer to the Memory Dump Graph Metric
+ * Calculation design document for more details (https://goo.gl/fKg0dt).
+ */
+ MemoryAllocatorDump.SIZE_ATTRIBUTE_NAME = 'size';
+ MemoryAllocatorDump.EFFECTIVE_SIZE_ATTRIBUTE_NAME = 'effective_size';
+ MemoryAllocatorDump.DISPLAYED_SIZE_ATTRIBUTE_NAME =
+ MemoryAllocatorDump.EFFECTIVE_SIZE_ATTRIBUTE_NAME;
+
MemoryAllocatorDump.prototype = {
get name() {
return this.fullName.substring(this.fullName.lastIndexOf('/') + 1);
diff --git a/catapult/tracing/tracing/model/power_sample.html b/catapult/tracing/tracing/model/power_sample.html
index 9967ef6..62de34a 100644
--- a/catapult/tracing/tracing/model/power_sample.html
+++ b/catapult/tracing/tracing/model/power_sample.html
@@ -63,7 +63,7 @@
{
name: 'powerSample',
pluralName: 'powerSamples',
- singleViewElementName: 'tr-ui-a-single-event-sub-view',
+ singleViewElementName: 'tr-ui-a-single-power-sample-sub-view',
multiViewElementName: 'tr-ui-a-multi-power-sample-sub-view'
});
diff --git a/catapult/tracing/tracing/model/process.html b/catapult/tracing/tracing/model/process.html
index c495cb5..59fc82f 100644
--- a/catapult/tracing/tracing/model/process.html
+++ b/catapult/tracing/tracing/model/process.html
@@ -37,6 +37,7 @@
this.instantEvents = [];
this.memoryDumps = [];
this.frames = [];
+ this.activities = [];
};
/**
@@ -134,6 +135,9 @@
for (var i = 0; i < this.memoryDumps.length; i++)
this.memoryDumps[i].shiftTimestampsForward(amount);
+ for (var i = 0; i < this.activities.length; i++)
+ this.activities[i].shiftTimestampsForward(amount);
+
tr.model.ProcessBase.prototype
.shiftTimestampsForward.apply(this, arguments);
},
@@ -146,6 +150,9 @@
for (var i = 0; i < this.memoryDumps.length; i++)
this.memoryDumps[i].addBoundsToRange(this.bounds);
+
+ for (var i = 0; i < this.activities.length; i++)
+ this.activities[i].addBoundsToRange(this.bounds);
},
sortMemoryDumps: function() {
diff --git a/catapult/tracing/tracing/model/process_memory_dump.html b/catapult/tracing/tracing/model/process_memory_dump.html
index b92231c..cba1fe4 100644
--- a/catapult/tracing/tracing/model/process_memory_dump.html
+++ b/catapult/tracing/tracing/model/process_memory_dump.html
@@ -22,6 +22,10 @@
// discounted.
var DISCOUNTED_ALLOCATOR_NAMES = ['winheap', 'malloc'];
+ var SIZE_ATTRIBUTE_NAME = tr.model.MemoryAllocatorDump.SIZE_ATTRIBUTE_NAME;
+ var EFFECTIVE_SIZE_ATTRIBUTE_NAME =
+ tr.model.MemoryAllocatorDump.EFFECTIVE_SIZE_ATTRIBUTE_NAME;
+
/**
* The ProcessMemoryDump represents a memory dump of a single process.
* @constructor
@@ -31,7 +35,7 @@
this.process = process;
this.globalMemoryDump = globalMemoryDump;
- this.totalResidentBytes = undefined;
+ this.totals = undefined;
this.vmRegions_ = undefined;
this.tracingMemoryDiscounted_ = false;
@@ -95,15 +99,20 @@
return sizeAttr.value;
}
- var discountedSize = getDiscountedSize('size');
- var discountedEffectiveSize = getDiscountedSize('effective_size');
+ var discountedSize = getDiscountedSize(SIZE_ATTRIBUTE_NAME);
+ var discountedEffectiveSize =
+ getDiscountedSize(EFFECTIVE_SIZE_ATTRIBUTE_NAME);
var discountedResidentSize = getDiscountedSize('resident_size');
// Subtract 'resident_size' from totals and VM regions stats.
if (discountedResidentSize > 0) {
- // Subtract the tracing size from the total.
- if (this.totalResidentBytes !== undefined)
- this.totalResidentBytes -= discountedResidentSize;
+ // Subtract the tracing size from the totals.
+ if (this.totals !== undefined) {
+ if (this.totals.residentBytes !== undefined)
+ this.totals.residentBytes -= discountedResidentSize;
+ if (this.totals.peakResidentBytes !== undefined)
+ this.totals.peakResidentBytes -= discountedResidentSize;
+ }
// Subtract the tracing size from VM regions.
if (this.vmRegions_ !== undefined) {
@@ -122,12 +131,12 @@
if (discountedSize > 0 || discountedEffectiveSize > 0) {
function discountSizeAndEffectiveSize(dump) {
var dumpSizeAttr = dump.getValidSizeAttributeOrUndefined(
- 'size', opt_model);
+ SIZE_ATTRIBUTE_NAME, opt_model);
if (dumpSizeAttr !== undefined)
dumpSizeAttr.value -= discountedSize;
var dumpEffectiveSizeAttr = dump.getValidSizeAttributeOrUndefined(
- 'effective_size', opt_model);
+ EFFECTIVE_SIZE_ATTRIBUTE_NAME, opt_model);
if (dumpEffectiveSizeAttr !== undefined)
dumpEffectiveSizeAttr.value -= discountedEffectiveSize;
}
@@ -157,9 +166,9 @@
var discountDump = new tr.model.MemoryAllocatorDump(
this, discountDumpName);
discountDump.parent = allocatedObjectsDump;
- discountDump.addAttribute('size',
+ discountDump.addAttribute(SIZE_ATTRIBUTE_NAME,
new tr.model.ScalarAttribute('bytes', -discountedSize));
- discountDump.addAttribute('effective_size',
+ discountDump.addAttribute(EFFECTIVE_SIZE_ATTRIBUTE_NAME,
new tr.model.ScalarAttribute('bytes', -discountedEffectiveSize));
allocatedObjectsDump.children.push(discountDump);
diff --git a/catapult/tracing/tracing/model/process_memory_dump_test.html b/catapult/tracing/tracing/model/process_memory_dump_test.html
index e3b4b3a..f62d953 100644
--- a/catapult/tracing/tracing/model/process_memory_dump_test.html
+++ b/catapult/tracing/tracing/model/process_memory_dump_test.html
@@ -251,7 +251,7 @@
pmd.memoryAllocatorDumps = [v8Dump, tracingDump];
});
- assert.isUndefined(pmd.totalResidentBytes);
+ assert.isUndefined(pmd.totals);
assert.isUndefined(
pmd.getMostRecentTotalVmRegionStat('proportionalResident'));
@@ -264,7 +264,7 @@
test('checkDiscountTracingOverhead_definedFields', function() {
var pmd = createFinalizedProcessMemoryDump(42, function(pmd) {
- pmd.totalResidentBytes = 10240;
+ pmd.totals = { residentBytes: 10240 };
pmd.vmRegions = [
VMRegion.fromDict({
@@ -306,7 +306,8 @@
pmd.memoryAllocatorDumps = [mallocDump, tracingDump, ownerDump];
});
- assert.equal(pmd.totalResidentBytes, 9240);
+ assert.equal(pmd.totals.residentBytes, 9240);
+ assert.isUndefined(pmd.totals.peakResidentBytes);
assert.equal(
pmd.getMostRecentTotalVmRegionStat('privateDirtyResident'), 3096);
@@ -351,7 +352,7 @@
pmd.memoryAllocatorDumps = [tracingDump, winheapDump];
});
- assert.isUndefined(pmd.totalResidentBytes);
+ assert.isUndefined(pmd.totals);
assert.isUndefined(
pmd.getMostRecentTotalVmRegionStat('privateDirtyResident'));
@@ -371,7 +372,7 @@
test('checkDiscountTracingOverhead_withMostRecentVmRegionsLinks', function() {
var pmds = createFinalizedProcessMemoryDumps([42, 90], function(pmds) {
- pmds[0].totalResidentBytes = 1000;
+ pmds[0].totals = { residentBytes: 1000, peakResidentBytes: 2000 };
pmds[0].vmRegions = [
VMRegion.fromDict({
startAddress: 256,
@@ -391,7 +392,7 @@
return [tracingDump];
})();
- pmds[1].totalResidentBytes = 2000;
+ pmds[1].totals = { peakResidentBytes: 3000 };
pmds[1].memoryAllocatorDumps = (function() {
var tracingDump = new MemoryAllocatorDump(pmds[0], 'tracing');
tracingDump.addAttribute(
@@ -402,14 +403,16 @@
// First PMD: Both total resident and private dirty resident size should be
// reduced by 100.
- assert.equal(pmds[0].totalResidentBytes, 900);
+ assert.equal(pmds[0].totals.residentBytes, 900);
+ assert.equal(pmds[0].totals.peakResidentBytes, 1900);
assert.equal(
pmds[0].getMostRecentTotalVmRegionStat('privateDirtyResident'), 3996);
// Second PMD: Total resident size should be reduced by 200, whereas private
// dirty resident size should be reduced by 100 (because it comes from
// the VM regions in the first dump).
- assert.equal(pmds[1].totalResidentBytes, 1800);
+ assert.isUndefined(pmds[1].totals.residentBytes);
+ assert.equal(pmds[1].totals.peakResidentBytes, 2800);
assert.equal(
pmds[1].getMostRecentTotalVmRegionStat('privateDirtyResident'), 3996);
});
diff --git a/catapult/tracing/tracing/model/source_info/js_source_info.html b/catapult/tracing/tracing/model/source_info/js_source_info.html
index 5a5b7e0..fa91802 100644
--- a/catapult/tracing/tracing/model/source_info/js_source_info.html
+++ b/catapult/tracing/tracing/model/source_info/js_source_info.html
@@ -11,8 +11,8 @@
'use strict';
tr.exportTo('tr.model.source_info', function() {
- function JSSourceInfo(file, line, isNative, scriptId) {
- tr.model.source_info.SourceInfo.call(this, file, line);
+ function JSSourceInfo(file, line, column, isNative, scriptId) {
+ tr.model.source_info.SourceInfo.call(this, file, line, column);
this.isNative_ = isNative;
this.scriptId_ = scriptId;
diff --git a/catapult/tracing/tracing/model/source_info/source_info.html b/catapult/tracing/tracing/model/source_info/source_info.html
index 4164391..19e36df 100644
--- a/catapult/tracing/tracing/model/source_info/source_info.html
+++ b/catapult/tracing/tracing/model/source_info/source_info.html
@@ -11,9 +11,10 @@
'use strict';
tr.exportTo('tr.model.source_info', function() {
- function SourceInfo(file, opt_line) {
+ function SourceInfo(file, opt_line, opt_column) {
this.file_ = file;
this.line_ = opt_line || -1;
+ this.column_ = opt_column || -1;
}
SourceInfo.prototype = {
@@ -25,6 +26,10 @@
return this.line_;
},
+ get column() {
+ return this.column_;
+ },
+
get domain() {
if (!this.file_)
return undefined;
@@ -34,10 +39,13 @@
toString: function() {
var str = '';
+
if (this.file_)
str += this.file_;
if (this.line_ > 0)
str += ':' + this.line_;
+ if (this.column_ > 0)
+ str += ':' + this.column_;
return str;
}
};
diff --git a/catapult/tracing/tracing/ui/analysis/analysis_view.html b/catapult/tracing/tracing/ui/analysis/analysis_view.html
index d353c67..6817eb0 100644
--- a/catapult/tracing/tracing/ui/analysis/analysis_view.html
+++ b/catapult/tracing/tracing/ui/analysis/analysis_view.html
@@ -58,6 +58,7 @@
href="/tracing/ui/analysis/single_global_memory_dump_sub_view.html">
<link rel="import" href="/tracing/ui/analysis/multi_global_memory_dump_sub_view.html">
+<link rel="import" href="/tracing/ui/analysis/single_power_sample_sub_view.html">
<link rel="import" href="/tracing/ui/analysis/multi_power_sample_sub_view.html">
<link rel="import" href="/tracing/ui/base/polymer_utils.html">
diff --git a/catapult/tracing/tracing/ui/analysis/memory_dump_allocator_details_pane.html b/catapult/tracing/tracing/ui/analysis/memory_dump_allocator_details_pane.html
index 57f3c09..a4c7ec8 100644
--- a/catapult/tracing/tracing/ui/analysis/memory_dump_allocator_details_pane.html
+++ b/catapult/tracing/tracing/ui/analysis/memory_dump_allocator_details_pane.html
@@ -5,6 +5,7 @@
found in the LICENSE file.
-->
+<link rel="import" href="/tracing/model/memory_allocator_dump.html">
<link rel="import" href="/tracing/ui/analysis/memory_dump_sub_view_util.html">
<link rel="import" href="/tracing/ui/analysis/stacked_pane.html">
<link rel="import" href="/tracing/ui/base/dom_helpers.html">
@@ -53,10 +54,14 @@
(function() {
var IMPORTANCE_RULES = [
{
- condition: 'size',
+ condition: tr.model.MemoryAllocatorDump.SIZE_ATTRIBUTE_NAME,
importance: 10
},
{
+ condition: tr.model.MemoryAllocatorDump.EFFECTIVE_SIZE_ATTRIBUTE_NAME,
+ importance: 9
+ },
+ {
condition: 'page_size',
importance: 0
},
diff --git a/catapult/tracing/tracing/ui/analysis/memory_dump_overview_pane.html b/catapult/tracing/tracing/ui/analysis/memory_dump_overview_pane.html
index e05b8f9..28c718c 100644
--- a/catapult/tracing/tracing/ui/analysis/memory_dump_overview_pane.html
+++ b/catapult/tracing/tracing/ui/analysis/memory_dump_overview_pane.html
@@ -5,6 +5,7 @@
found in the LICENSE file.
-->
+<link rel="import" href="/tracing/model/memory_allocator_dump.html">
<link rel="import" href="/tracing/ui/base/color_legend.html">
<link rel="import" href="/tracing/ui/base/color_scheme.html">
<link rel="import"
@@ -65,7 +66,11 @@
}
];
+ var DISPLAYED_SIZE_ATTRIBUTE_NAME =
+ tr.model.MemoryAllocatorDump.DISPLAYED_SIZE_ATTRIBUTE_NAME;
+
var LINK_SYMBOL = String.fromCharCode(9903);
+ var GREATER_THAN_OR_EQUAL_TO_SYMBOL = String.fromCharCode(8805);
Polymer({
created: function() {
@@ -127,12 +132,35 @@
// Used memory (total resident, PSS, ...).
var usedMemorySizes = {};
- var totalResident = processMemoryDump.totalResidentBytes;
- if (totalResident !== undefined) {
- var cell = new tr.ui.analysis.MemoryCell(
- new tr.model.ScalarAttribute('bytes', totalResident));
- cell.buildDetailsPane = buildVMRegionsPane;
- usedMemorySizes['Total resident'] = cell;
+ var totals = processMemoryDump.totals;
+ if (totals !== undefined) {
+ var totalResident = totals.residentBytes;
+ if (totalResident !== undefined) {
+ var cell = new tr.ui.analysis.MemoryCell(
+ new tr.model.ScalarAttribute('bytes', totalResident));
+ cell.buildDetailsPane = buildVMRegionsPane;
+ usedMemorySizes['Total resident'] = cell;
+ }
+
+ var peakTotalResident = totals.peakResidentBytes;
+ if (peakTotalResident !== undefined) {
+ var attr = new tr.model.ScalarAttribute(
+ 'bytes', peakTotalResident);
+ if (totals.arePeakResidentBytesResettable) {
+ attr.infos.push(new tr.model.AttributeInfo(
+ tr.model.AttributeInfoType.RECENT_VALUE,
+ 'Peak RSS since previous memory dump.'));
+ } else {
+ attr.infos.push(new tr.model.AttributeInfo(
+ tr.model.AttributeInfoType.OVERALL_VALUE,
+ 'Peak RSS since process startup. Finer grained peaks ' +
+ 'require a Linux kernel version ' +
+ GREATER_THAN_OR_EQUAL_TO_SYMBOL + ' 4.0.'));
+ }
+ var cell = new tr.ui.analysis.MemoryCell(attr);
+ cell.buildDetailsPane = buildVMRegionsPane;
+ usedMemorySizes['Peak total resident'] = cell;
+ }
}
function addByteStatCell(byteStatName, columnTitle) {
@@ -159,7 +187,7 @@
var allocatorSizes = {};
if (processMemoryDump.memoryAllocatorDumps !== undefined) {
processMemoryDump.memoryAllocatorDumps.forEach(function(dump) {
- var attr = dump.attributes['size'];
+ var attr = dump.attributes[DISPLAYED_SIZE_ATTRIBUTE_NAME];
var cell = new tr.ui.analysis.MemoryCell(attr);
cell.buildDetailsPane = function() {
var pane = document.createElement(
diff --git a/catapult/tracing/tracing/ui/analysis/memory_dump_overview_pane_test.html b/catapult/tracing/tracing/ui/analysis/memory_dump_overview_pane_test.html
index d3418cb..e63ed46 100644
--- a/catapult/tracing/tracing/ui/analysis/memory_dump_overview_pane_test.html
+++ b/catapult/tracing/tracing/ui/analysis/memory_dump_overview_pane_test.html
@@ -51,19 +51,21 @@
var columns = table.tableColumns;
assert.lengthOf(rows, 1);
assert.lengthOf(footerRows, 0);
- assert.lengthOf(columns, 8);
+ assert.lengthOf(columns, 9);
var titleColumn = columns[0];
var totalColumn = columns[1];
- var proportionalColumn = columns[2];
- var privateDirtyColumn = columns[3];
- var swappedColumn = columns[4];
- var mallocColumn = columns[5];
- var v8Column = columns[6];
- var tracingColumn = columns[7];
+ var peakTotalColumn = columns[2];
+ var proportionalColumn = columns[3];
+ var privateDirtyColumn = columns[4];
+ var swappedColumn = columns[5];
+ var mallocColumn = columns[6];
+ var v8Column = columns[7];
+ var tracingColumn = columns[8];
assert.equal(titleColumn.value(rows[0]).label, 'Process 2');
assert.equal(totalColumn.value(rows[0]).children[0].value, 19398656);
+ assert.equal(peakTotalColumn.value(rows[0]).children[0].value, 40370176);
assert.equal(
proportionalColumn.value(rows[0]).children[0].value, 14155776);
assert.equal(
@@ -88,23 +90,26 @@
var rows = table.tableRows;
var footerRows = table.footerRows;
var columns = table.tableColumns;
- assert.lengthOf(rows, 3);
+ assert.lengthOf(rows, 4);
assert.lengthOf(footerRows, 1);
- assert.lengthOf(columns, 9);
+ assert.lengthOf(columns, 10);
+ // TODO(petrcermak): Enforce consistent ordering of the used size columns.
var titleColumn = columns[0];
var totalColumn = columns[1];
var proportionalColumn = columns[2];
var privateDirtyColumn = columns[3];
var swappedColumn = columns[4];
- var mallocColumn = columns[5];
- var oilpanColumn = columns[6];
- var v8Column = columns[7];
- var tracingColumn = columns[8];
+ var peakTotalColumn = columns[5];
+ var mallocColumn = columns[6];
+ var oilpanColumn = columns[7];
+ var v8Column = columns[8];
+ var tracingColumn = columns[9];
// Check the rows of the table.
assert.equal(titleColumn.value(rows[0]).label, 'Process 1');
assert.equal(totalColumn.value(rows[0]).children[0].value, 31457280);
+ assert.equal(peakTotalColumn.value(rows[0]), '');
assert.equal(
proportionalColumn.value(rows[0]).children[0].value, 10485760);
assert.equal(
@@ -117,6 +122,7 @@
assert.equal(titleColumn.value(rows[1]).label, 'Process 2');
assert.equal(totalColumn.value(rows[1]).children[0].value, 19398656);
+ assert.equal(peakTotalColumn.value(rows[1]).children[0].value, 40370176);
assert.equal(
proportionalColumn.value(rows[1]).children[0].value, 14155776);
assert.equal(
@@ -129,19 +135,33 @@
assert.equal(titleColumn.value(rows[2]).label, 'Process 3');
assert.equal(totalColumn.value(rows[2]), '');
+ assert.equal(peakTotalColumn.value(rows[2]), '');
assert.equal(proportionalColumn.value(rows[2]), '');
assert.equal(privateDirtyColumn.value(rows[2]), '');
assert.equal(swappedColumn.value(rows[2]), '');
assert.equal(mallocColumn.value(rows[2]), '');
- assert.equal(v8Column.value(rows[2]).value, 1073741824);
- assert.equal(oilpanColumn.value(rows[2]).value, 2147483648);
+ assert.equal(v8Column.value(rows[2]).children[0].value, 1073741824);
+ assert.equal(oilpanColumn.value(rows[2]).children[0].value, 2147483648);
assert.equal(tracingColumn.value(rows[2]), '');
+ assert.equal(titleColumn.value(rows[3]).label, 'Process 4');
+ assert.equal(totalColumn.value(rows[3]), '');
+ assert.equal(peakTotalColumn.value(rows[3]).children[0].value, 17825792);
+ assert.equal(proportionalColumn.value(rows[3]), '');
+ assert.equal(privateDirtyColumn.value(rows[3]), '');
+ assert.equal(swappedColumn.value(rows[3]), '');
+ assert.equal(mallocColumn.value(rows[3]), '');
+ assert.equal(v8Column.value(rows[3]), '');
+ assert.equal(oilpanColumn.value(rows[3]), '');
+ assert.equal(tracingColumn.value(rows[3]), '');
+
// Check the footer row.
assert.equal(titleColumn.value(footerRows[0]), 'Total');
assert.equal(
totalColumn.value(footerRows[0]).children[0].value, 50855936);
assert.equal(
+ peakTotalColumn.value(footerRows[0]).children[0].value, 58195968);
+ assert.equal(
proportionalColumn.value(footerRows[0]).children[0].value, 24641536);
assert.equal(
privateDirtyColumn.value(footerRows[0]).children[0].value, 8388608);
diff --git a/catapult/tracing/tracing/ui/analysis/memory_dump_sub_view_test_utils.html b/catapult/tracing/tracing/ui/analysis/memory_dump_sub_view_test_utils.html
index 5969867..89ed213 100644
--- a/catapult/tracing/tracing/ui/analysis/memory_dump_sub_view_test_utils.html
+++ b/catapult/tracing/tracing/ui/analysis/memory_dump_sub_view_test_utils.html
@@ -21,6 +21,7 @@
var GlobalMemoryDump = tr.model.GlobalMemoryDump;
var ProcessMemoryDump = tr.model.ProcessMemoryDump;
var MemoryAllocatorDump = tr.model.MemoryAllocatorDump;
+ var MemoryAllocatorDumpLink = tr.model.MemoryAllocatorDumpLink;
var VMRegion = tr.model.VMRegion;
var VMRegionByteStats = tr.model.VMRegionByteStats;
var ScalarAttribute = tr.model.ScalarAttribute;
@@ -30,6 +31,7 @@
var p1 = model.getOrCreateProcess(1);
var p2 = model.getOrCreateProcess(2);
var p3 = model.getOrCreateProcess(3);
+ var p4 = model.getOrCreateProcess(4);
var gmd = new GlobalMemoryDump(model, 42);
model.globalMemoryDumps.push(gmd);
@@ -48,7 +50,7 @@
mostRecentGmd.processMemoryDumps[p1.pid] = mostRecentPmd1;
var pmd1 = addProcessMemoryDump(p1, 41);
- pmd1.totalResidentBytes = 31457280 /* 30 MiB */;
+ pmd1.totals = { residentBytes: 31457280 /* 30 MiB */ };
mostRecentPmd1.vmRegions = [
VMRegion.fromDict({
startAddress: 1024,
@@ -65,7 +67,11 @@
// One process with everything.
var pmd2 = addProcessMemoryDump(p2, 42);
- pmd2.totalResidentBytes = 20971520 /* 20 MiB */;
+ pmd2.totals = {
+ residentBytes: 20971520, /* 20 MiB */
+ peakResidentBytes: 41943040, /* 40 MiB */
+ arePeakResidentBytesResettable: false
+ };
pmd2.vmRegions = [
VMRegion.fromDict({
startAddress: 256,
@@ -103,7 +109,7 @@
pmd3.memoryAllocatorDumps = (function() {
var oilpanDump = new MemoryAllocatorDump(pmd3, 'oilpan');
oilpanDump.addAttribute('size',
- new ScalarAttribute('bytes', 2147483648) /* 2 GiB */);
+ new ScalarAttribute('bytes', 3221225472) /* 3 GiB */);
oilpanDump.addAttribute('inner_size',
new ScalarAttribute('bytes', 5242880) /* 5 MiB */);
oilpanDump.addAttribute('objects_count',
@@ -117,8 +123,18 @@
v8Dump.addAttribute('objects_count',
new ScalarAttribute('objects', 204));
+ var ownershipLink = new MemoryAllocatorDumpLink(v8Dump, oilpanDump);
+ v8Dump.owns = ownershipLink;
+ oilpanDump.ownedBy.push(ownershipLink);
+
return [oilpanDump, v8Dump];
})();
+
+ var pmd4 = addProcessMemoryDump(p4, 44);
+ pmd4.totals = {
+ peakResidentBytes: 17825792, /* 17 MiB */
+ arePeakResidentBytesResettable: true
+ };
});
return model.globalMemoryDumps[0];
diff --git a/catapult/tracing/tracing/ui/analysis/memory_dump_sub_view_util.html b/catapult/tracing/tracing/ui/analysis/memory_dump_sub_view_util.html
index e05f027..1ddad3c 100644
--- a/catapult/tracing/tracing/ui/analysis/memory_dump_sub_view_util.html
+++ b/catapult/tracing/tracing/ui/analysis/memory_dump_sub_view_util.html
@@ -178,6 +178,16 @@
symbol: String.fromCharCode(8701), // Left arrow.
color: 'green'
};
+ case tr.model.AttributeInfoType.OVERALL_VALUE:
+ return {
+ symbol: String.fromCharCode(8614) // Right arrow with a bar.
+ /* Don't modify the color. */
+ };
+ case tr.model.AttributeInfoType.RECENT_VALUE:
+ return {
+ symbol: String.fromCharCode(8618) // Right arrow with a hook.
+ /* Don't modify the color. */
+ };
default:
return {
symbol: String.fromCharCode(9432), // Circled small letter 'i'.
diff --git a/catapult/tracing/tracing/ui/analysis/memory_dump_view_test.html b/catapult/tracing/tracing/ui/analysis/memory_dump_view_test.html
index 57be37e..41bbe60 100644
--- a/catapult/tracing/tracing/ui/analysis/memory_dump_view_test.html
+++ b/catapult/tracing/tracing/ui/analysis/memory_dump_view_test.html
@@ -29,8 +29,8 @@
viewEl, 'tr-ui-a-memory-dump-overview-pane');
var overviewTable = tr.b.findDeepElementMatching(
overviewPane, 'tr-ui-b-table');
- assert.lengthOf(overviewTable.tableRows, 3);
- assert.lengthOf(overviewTable.tableColumns, 9);
+ assert.lengthOf(overviewTable.tableRows, 4);
+ assert.lengthOf(overviewTable.tableColumns, 10);
// Select totals of first process.
overviewTable.selectedTableRow = overviewTable.tableRows[0];
diff --git a/catapult/tracing/tracing/ui/analysis/multi_sample_sub_view.html b/catapult/tracing/tracing/ui/analysis/multi_sample_sub_view.html
index 1af9a1f..daa732c 100644
--- a/catapult/tracing/tracing/ui/analysis/multi_sample_sub_view.html
+++ b/catapult/tracing/tracing/ui/analysis/multi_sample_sub_view.html
@@ -6,45 +6,27 @@
-->
<link rel="import" href="/tracing/ui/analysis/analysis_sub_view.html">
+<link rel="import" href="/tracing/ui/extras/analysis/sampling_panel.html">
<polymer-element name="tr-ui-a-multi-sample-sub-view"
extends="tr-ui-a-sub-view">
<template>
<style>
- :host {
- display: block;
- }
+ :host { display: block; }
</style>
- <div id='content'></div>
+ <tr-ui-a-sampling-panel id='panel'></tr-ui-a-sampling-panel>
</template>
<script>
'use strict';
Polymer({
- created: function() {
- this.currentSelection_ = undefined;
- },
-
- get requiresTallView() {
- return true;
- },
-
set selection(selection) {
- this.$.content.textContent = '';
- this.currentSelection_ = selection;
-
- if (tr.isDefined('tr.ui.e.analysis.SamplingSummaryPanel')) {
- var panel = new tr.ui.e.analysis.SamplingSummaryPanel();
- this.$.content.appendChild(panel);
- panel.selection = selection;
- } else {
- this.$.content.textContent = 'SamplingSummaryPanel not installed. :(';
- }
+ this.$.panel.selection = selection;
},
get selection() {
- return this.currentSelection_;
+ return this.$.panel.selection;
}
});
</script>
diff --git a/catapult/tracing/tracing/ui/analysis/multi_sample_sub_view_test.html b/catapult/tracing/tracing/ui/analysis/multi_sample_sub_view_test.html
index 17894f9..0e2e918 100644
--- a/catapult/tracing/tracing/ui/analysis/multi_sample_sub_view_test.html
+++ b/catapult/tracing/tracing/ui/analysis/multi_sample_sub_view_test.html
@@ -9,7 +9,8 @@
<link rel="import" href="/tracing/model/event_set.html">
<link rel="import" href="/tracing/model/model.html">
<link rel="import" href="/tracing/ui/analysis/multi_sample_sub_view.html">
-<link rel='import' href='/tracing/ui/extras/analysis/sampling_summary.html'>
+<link rel='import'
+ href='/tracing/ui/extras/analysis/sampling_summary_panel.html'>
<script>
'use strict';
diff --git a/catapult/tracing/tracing/ui/analysis/single_power_sample_sub_view.html b/catapult/tracing/tracing/ui/analysis/single_power_sample_sub_view.html
new file mode 100644
index 0000000..fedd238
--- /dev/null
+++ b/catapult/tracing/tracing/ui/analysis/single_power_sample_sub_view.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!--
+Copyright 2015 The Chromium Authors. All rights reserved.
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file.
+-->
+
+<link rel="import" href="/tracing/ui/analysis/analysis_sub_view.html">
+<link rel="import" href="/tracing/ui/analysis/power_sample_table.html">
+
+<polymer-element name="tr-ui-a-single-power-sample-sub-view"
+ extends="tr-ui-a-sub-view">
+ <template>
+ <style>
+ :host { display: block; }
+ </style>
+ <tr-ui-a-power-sample-table id="samplesTable">
+ </tr-ui-a-power-sample-table>
+ </template>
+
+ <script>
+ 'use strict';
+
+ Polymer({
+ ready: function() {
+ this.currentSelection_ = undefined;
+ },
+
+ get selection() {
+ return this.currentSelection_;
+ },
+
+ set selection(selection) {
+ this.currentSelection_ = selection;
+ this.updateContents_();
+ },
+
+ updateContents_: function() {
+ this.$.samplesTable.samples = this.selection;
+ }
+ });
+ </script>
+</polymer-element>
diff --git a/catapult/tracing/tracing/ui/analysis/single_power_sample_sub_view_test.html b/catapult/tracing/tracing/ui/analysis/single_power_sample_sub_view_test.html
new file mode 100644
index 0000000..a6f6b24
--- /dev/null
+++ b/catapult/tracing/tracing/ui/analysis/single_power_sample_sub_view_test.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!--
+Copyright 2015 The Chromium Authors. All rights reserved.
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file.
+-->
+
+<link rel="import" href="/tracing/model/event_set.html">
+<link rel="import" href="/tracing/model/model.html">
+<link rel="import" href="/tracing/model/power_series.html">
+<link rel="import" href="/tracing/ui/analysis/single_power_sample_sub_view.html">
+
+<script>
+'use strict';
+
+tr.b.unittest.testSuite(function() {
+ test('instantiate', function() {
+ var model = new tr.Model();
+ var series = new tr.model.PowerSeries(model.device);
+ series.addPowerSample(1, 1000);
+
+ var view = document.createElement('tr-ui-a-single-power-sample-sub-view');
+ view.selection = new tr.model.EventSet(series.samples);
+
+ this.addHTMLOutput(view);
+ });
+
+ test('setSelection', function() {
+ var model = new tr.Model();
+ var series = new tr.model.PowerSeries(model.device);
+ series.addPowerSample(1, 1000);
+
+ var view = document.createElement('tr-ui-a-single-power-sample-sub-view');
+ var eventSet = new tr.model.EventSet(series.samples);
+ view.selection = eventSet;
+
+ assert.deepEqual(view.$.samplesTable.samples, eventSet);
+ });
+});
+</script>
diff --git a/catapult/tracing/tracing/ui/base/color_scheme.html b/catapult/tracing/tracing/ui/base/color_scheme.html
index 6c1122d..2d90dfb 100644
--- a/catapult/tracing/tracing/ui/base/color_scheme.html
+++ b/catapult/tracing/tracing/ui/base/color_scheme.html
@@ -58,7 +58,8 @@
thread_state_sleeping: {r: 240, g: 240, b: 240},
thread_state_unknown: {r: 199, g: 155, b: 125},
- memory_dump: {r: 0, g: 0, b: 180},
+ light_memory_dump: {r: 0, g: 0, b: 180},
+ detailed_memory_dump: {r: 180, g: 0, b: 180},
generic_work: {r: 125, g: 125, b: 125},
diff --git a/catapult/tracing/tracing/core/constants.html b/catapult/tracing/tracing/ui/base/constants.html
similarity index 90%
rename from catapult/tracing/tracing/core/constants.html
rename to catapult/tracing/tracing/ui/base/constants.html
index 7dee95b..1a41265 100644
--- a/catapult/tracing/tracing/core/constants.html
+++ b/catapult/tracing/tracing/ui/base/constants.html
@@ -8,7 +8,7 @@
<script>
'use strict';
-tr.exportTo('tr.c', function() {
+tr.exportTo('tr.ui.b', function() {
var constants = {
HEADING_WIDTH: 250
};
diff --git a/catapult/tracing/tracing/ui/base/dom_helpers.html b/catapult/tracing/tracing/ui/base/dom_helpers.html
index 7c2f01d..112416f 100644
--- a/catapult/tracing/tracing/ui/base/dom_helpers.html
+++ b/catapult/tracing/tracing/ui/base/dom_helpers.html
@@ -21,7 +21,10 @@
tr.exportTo('tr.ui.b', function() {
function createSpan(opt_dictionary) {
- var spanEl = document.createElement('span');
+ var ownerDocument = document;
+ if (opt_dictionary && opt_dictionary.ownerDocument)
+ ownerDocument = opt_dictionary.ownerDocument;
+ var spanEl = ownerDocument.createElement('span');
if (opt_dictionary) {
if (opt_dictionary.className)
spanEl.className = opt_dictionary.className;
diff --git a/catapult/tracing/tracing/ui/base/dom_helpers_test.html b/catapult/tracing/tracing/ui/base/dom_helpers_test.html
index d9e875c..64ba68b 100644
--- a/catapult/tracing/tracing/ui/base/dom_helpers_test.html
+++ b/catapult/tracing/tracing/ui/base/dom_helpers_test.html
@@ -26,6 +26,15 @@
eltInDocument.parentElement.removeChild(eltInDocument);
});
+ test('createSpan_ownerDocument', function() {
+ var spanEl = tr.ui.b.createSpan({
+ className: 'a-span-class',
+ bold: true,
+ ownerDocument: THIS_DOC
+ });
+ assert.strictEqual(spanEl.ownerDocument, THIS_DOC);
+ });
+
test('checkboxFromDefaults', function() {
var target = {foo: undefined};
var cb = tr.ui.b.createCheckBox(target, 'foo', 'myCheckBox', false, 'Foo');
diff --git a/catapult/tracing/tracing/ui/base/heading.html b/catapult/tracing/tracing/ui/base/heading.html
index 75ce98d..0c884b6 100644
--- a/catapult/tracing/tracing/ui/base/heading.html
+++ b/catapult/tracing/tracing/ui/base/heading.html
@@ -5,6 +5,8 @@
found in the LICENSE file.
-->
+<link rel='import' href='/tracing/ui/base/constants.html'>
+
<polymer-element name='tr-ui-heading'>
<template>
<style>
@@ -52,7 +54,7 @@
ready: function(viewport) {
// Minus 6 == 1px border + 5px padding right.
- this.style.width = (tr.c.constants.HEADING_WIDTH - 6) + 'px';
+ this.style.width = (tr.ui.b.constants.HEADING_WIDTH - 6) + 'px';
this.heading_ = '';
this.expanded_ = true;
diff --git a/catapult/tracing/tracing/ui/base/sortable_table.css b/catapult/tracing/tracing/ui/base/sortable_table.css
deleted file mode 100644
index 1bfee63..0000000
--- a/catapult/tracing/tracing/ui/base/sortable_table.css
+++ /dev/null
@@ -1,8 +0,0 @@
-/* Copyright (c) 2013 The Chromium Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-* /deep/ .sortable-table > thead > tr > td {
- cursor: pointer !important;
-}
diff --git a/catapult/tracing/tracing/ui/base/sortable_table.html b/catapult/tracing/tracing/ui/base/sortable_table.html
deleted file mode 100644
index 8466b7c..0000000
--- a/catapult/tracing/tracing/ui/base/sortable_table.html
+++ /dev/null
@@ -1,189 +0,0 @@
-<!DOCTYPE html>
-<!--
-Copyright (c) 2014 The Chromium Authors. All rights reserved.
-Use of this source code is governed by a BSD-style license that can be
-found in the LICENSE file.
--->
-
-<link rel="stylesheet" href="/tracing/ui/base/sortable_table.css">
-
-<link rel="import" href="/tracing/ui/base/ui.html">
-
-<script>
-'use strict';
-
-/**
- * @fileoverview A sortable table with history states.
- */
-tr.exportTo('tr.ui.b', function() {
- /**
- * @constructor
- */
- var SortableTable = tr.ui.b.define('sortable-table');
-
- var UNSORTED_ARROW = '▿';
- var SORT_ASCENDING_ARROW = '▾';
- var SORT_DESCENDING_ARROW = '▴';
- var SORT_DIR_ASCENDING = 'downward';
- var SORT_DIR_DESCENDING = 'upward';
-
- SortableTable.prototype = {
- __proto__: HTMLTableElement.prototype,
-
- decorate: function() {
- this.classList.add('sortable-table');
- if (!this.tHead)
- return;
- var headerRow = this.tHead.rows[0];
- var currentState = window.history.state;
- for (var i = 0; i < headerRow.cells.length; i++) {
- headerRow.cells[i].addEventListener('click',
- this.onItemClicked_, true);
- headerRow.cells[i].innerHTML += ' ' + UNSORTED_ARROW;
- }
-
- if (currentState && currentState.tableSorting) {
- var hashCode = this.sortingHashCode_();
- if (currentState.tableSorting[hashCode]) {
- this.sort(currentState.tableSorting[hashCode].col,
- currentState.tableSorting[hashCode].sortDirection);
- }
- }
- },
-
- onItemClicked_: function(e) {
- // 'this' refers to the table cell that has been clicked.
- var headerRow = this.parentNode;
- var table = headerRow.parentNode.parentNode;
- var colIndex = Array.prototype.slice.call(headerRow.cells).indexOf(this);
- var sortDirection = table.sort(colIndex);
- var currentState = history.state;
- if (!currentState.tableSorting)
- currentState.tableSorting = {};
- currentState.tableSorting[table.sortingHashCode_()] = {
- col: colIndex,
- sortDirection: sortDirection
- };
- window.history.pushState(currentState, '');
- },
-
- sort: function(colIndex, opt_sortDirection) {
- var headerRow = this.tHead.rows[0];
- var headerCell = headerRow.cells[colIndex];
-
- if (!headerCell.hasAttribute('sort')) {
- // we are either sorting a new column (not previously sorted),
- // or sorting based on a given sort direction (opt_sortDirection).
- return sortByColumn_(headerRow, headerCell, colIndex,
- opt_sortDirection);
- } else {
- // resort the current sort column in the other direction
- return reverseSortDirection_(headerRow, headerCell, opt_sortDirection);
- }
- return sortDirection;
- },
-
- // A very simple hash function, based only on the header row and
- // the table location. It is used to check that table loaded
- // can be sorted according to the given history information.
- sortingHashCode_: function() {
- if (this.sortingHashValue_)
- return this.sortingHashValue_;
- var headerText = this.tHead.rows[0].innerText;
- var hash = 0;
- for (var i = 0; i < headerText.length; i++) {
- if (headerText.charCodeAt(i) < 127)
- hash += headerText.charCodeAt(i);
- }
-
- // use the table index as well in case the same table
- // is displayed more than once on a single page.
- var tableIndex = Array.prototype.slice.call(
- document.getElementsByClassName('sortable-table')).indexOf(this);
- this.sortingHashValue_ = tableIndex + '' + hash;
- return this.sortingHashValue_;
- }
- };
-
- function compareAscending_(a, b) {
- return compare_(a, b);
- }
-
- function compareDescending_(a, b) {
- return compare_(b, a);
- }
-
- function compare_(a, b) {
- var a1 = parseFloat(a);
- var b1 = parseFloat(b);
- if (isNaN(a1) && isNaN(b1))
- return a.toString().localeCompare(b.toString());
- if (isNaN(a1))
- return -1;
- if (isNaN(b1))
- return 1;
- return a1 - b1;
- }
-
- function sortByColumn_(headerRow, headerCell, colIndex, opt_sortDirection) {
- var sortDirection = opt_sortDirection || SORT_DIR_ASCENDING;
- // remove sort attribute from other header elements.
- for (var i = 0; i < headerRow.cells.length; i++) {
- if (headerRow.cells[i].getAttribute('sort')) {
- headerRow.cells[i].removeAttribute('sort');
- var headerStr = headerRow.cells[i].innerHTML;
- headerRow.cells[i].innerHTML =
- headerStr.substr(0, headerStr.length - 2) + UNSORTED_ARROW;
- }
- }
-
- var headerStr = headerRow.cells[colIndex].innerHTML;
- headerCell.innerHTML = headerStr.substr(0, headerStr.length - 2) +
- (sortDirection == SORT_DIR_ASCENDING ?
- SORT_ASCENDING_ARROW : SORT_DESCENDING_ARROW);
-
- headerCell.setAttribute('sort', sortDirection);
- var rows = headerRow.parentNode.parentNode.tBodies[0].rows;
- var tempRows = [];
- for (var i = 0; i < rows.length; i++) {
- tempRows.push([rows[i].cells[colIndex].innerText, rows[i]]);
- }
-
- tempRows.sort(sortDirection == SORT_DIR_ASCENDING ?
- compareAscending_ : compareDescending_);
-
- for (var j = 0; j < tempRows.length; j++) {
- headerRow.parentNode.parentNode.tBodies[0].
- appendChild(tempRows[j][1]);
- }
- return sortDirection;
- }
-
- function reverseSortDirection_(headerRow, headerCell, opt_sortDirection) {
- var sortDirection = headerCell.getAttribute('sort');
- // if it is already sorted in the correct direction, do nothing.
- if (opt_sortDirection == sortDirection)
- return sortDirection;
- sortDirection = sortDirection == SORT_DIR_DESCENDING ?
- SORT_DIR_ASCENDING : SORT_DIR_DESCENDING;
- headerCell.setAttribute('sort', sortDirection);
- var headerStr = headerCell.innerHTML;
- headerCell.innerHTML = headerStr.substr(0, headerStr.length - 2) +
- (sortDirection == SORT_DIR_ASCENDING ?
- SORT_ASCENDING_ARROW : SORT_DESCENDING_ARROW);
- // instead of re-sorting, we reverse the sorted rows.
- var headerRow = headerCell.parentNode;
- var tbody = headerRow.parentNode.parentNode.tBodies[0];
- var tempRows = [];
- for (var i = 0; i < tbody.rows.length; i++)
- tempRows[tempRows.length] = tbody.rows[i];
- for (var i = tempRows.length - 1; i >= 0; i--)
- tbody.appendChild(tempRows[i]);
- return sortDirection;
- }
-
- return {
- SortableTable: SortableTable
- };
-});
-</script>
diff --git a/catapult/tracing/tracing/ui/base/sortable_table_test.html b/catapult/tracing/tracing/ui/base/sortable_table_test.html
deleted file mode 100644
index 503e11c..0000000
--- a/catapult/tracing/tracing/ui/base/sortable_table_test.html
+++ /dev/null
@@ -1,238 +0,0 @@
-<!DOCTYPE html>
-<!--
-Copyright (c) 2014 The Chromium Authors. All rights reserved.
-Use of this source code is governed by a BSD-style license that can be
-found in the LICENSE file.
--->
-
-<link rel="import" href="/tracing/base/utils.html">
-<link rel="import" href="/tracing/ui/base/ui.html">
-<link rel="import" href="/tracing/ui/base/sortable_table.html">
-
-<script>
-'use strict';
-
-tr.b.unittest.testSuite(function() {
- var SortableTable = tr.ui.b.SortableTable;
-
- function convertToHTML(s) {
- var res = '';
- for (var i = 0; i < s.length; i++) {
- res += s.charCodeAt(i) > 127 ?
- '&#x' + s.charCodeAt(i).toString(16).toUpperCase() + ';' :
- s.charAt(i);
- }
- return res;
- }
-
- function SimpleTable() {
- var table = document.createElement('table');
- var thead = table.createTHead();
- var tfoot = table.createTFoot();
- var tbody = table.createTBody();
- var headerRow = thead.insertRow(0);
- headerRow.insertCell(0).appendChild(document.createTextNode('Name'));
- headerRow.insertCell(1).appendChild(document.createTextNode('Value'));
- var row1 = tbody.insertRow(0);
- row1.insertCell(0).appendChild(document.createTextNode('First'));
- row1.insertCell(1).appendChild(document.createTextNode('2'));
- var row2 = tbody.insertRow(1);
- row2.insertCell(0).appendChild(document.createTextNode('Middle'));
- row2.insertCell(1).appendChild(document.createTextNode('18'));
- var row3 = tbody.insertRow(2);
- row3.insertCell(0).appendChild(document.createTextNode('Last'));
- row3.insertCell(1).appendChild(document.createTextNode('1'));
- var footerRow = tfoot.insertRow(0);
- footerRow.insertCell(0).appendChild(document.createTextNode('Average'));
- footerRow.insertCell(1).appendChild(document.createTextNode('7'));
- return table;
- }
-
- test('instantiate', function() {
- var table = SimpleTable();
- SortableTable.decorate(table);
- var headerRow = table.tHead.rows[0];
- assert.equal(convertToHTML(headerRow.cells[0].innerHTML),
- 'Name ▿');
- assert.equal(convertToHTML(headerRow.cells[1].innerHTML),
- 'Value ▿');
- var tableRows = table.tBodies[0].rows;
- assert.equal(tableRows[0].cells[0].innerText, 'First');
- assert.equal(tableRows[0].cells[1].innerText, '2');
- assert.equal(tableRows[1].cells[0].innerText, 'Middle');
- assert.equal(tableRows[1].cells[1].innerText, '18');
- assert.equal(tableRows[2].cells[0].innerText, 'Last');
- assert.equal(tableRows[2].cells[1].innerText, '1');
- // the footer should never change.
- var footerRow = table.tFoot.rows[0];
- assert.equal(footerRow.cells[0].innerText, 'Average');
- assert.equal(footerRow.cells[1].innerText, '7');
- });
-
- test('sortOnAlphabeticColumnAscending', function() {
- var table = SimpleTable();
- SortableTable.decorate(table);
- table.sort(0 /*, 'downward' */);
- var headerRow = table.tHead.rows[0];
- assert.equal(convertToHTML(headerRow.cells[0].innerHTML),
- 'Name ▾');
- assert.equal(convertToHTML(headerRow.cells[1].innerHTML),
- 'Value ▿');
- var tableRows = table.tBodies[0].rows;
- assert.equal(tableRows[0].cells[0].innerText, 'First');
- assert.equal(tableRows[0].cells[1].innerText, '2');
- assert.equal(tableRows[1].cells[0].innerText, 'Last');
- assert.equal(tableRows[1].cells[1].innerText, '1');
- assert.equal(tableRows[2].cells[0].innerText, 'Middle');
- assert.equal(tableRows[2].cells[1].innerText, '18');
- // the footer should never change.
- var footerRow = table.tFoot.rows[0];
- assert.equal(footerRow.cells[0].innerText, 'Average');
- assert.equal(footerRow.cells[1].innerText, '7');
- });
-
- test('sortOnAlphabeticColumnDescending', function() {
- var table = SimpleTable();
- SortableTable.decorate(table);
- table.sort(0 , 'upward');
- var headerRow = table.tHead.rows[0];
- assert.equal(convertToHTML(headerRow.cells[0].innerHTML),
- 'Name ▴');
- assert.equal(convertToHTML(headerRow.cells[1].innerHTML),
- 'Value ▿');
- var tableRows = table.tBodies[0].rows;
- assert.equal(tableRows[0].cells[0].innerText, 'Middle');
- assert.equal(tableRows[0].cells[1].innerText, '18');
- assert.equal(tableRows[1].cells[0].innerText, 'Last');
- assert.equal(tableRows[1].cells[1].innerText, '1');
- assert.equal(tableRows[2].cells[0].innerText, 'First');
- assert.equal(tableRows[2].cells[1].innerText, '2');
- // the footer should never change.
- var footerRow = table.tFoot.rows[0];
- assert.equal(footerRow.cells[0].innerText, 'Average');
- assert.equal(footerRow.cells[1].innerText, '7');
- });
-
- test('sortOnNumericColumnAscending', function() {
- var table = SimpleTable();
- SortableTable.decorate(table);
- table.sort(1 /*, 'downward' */);
- var headerRow = table.tHead.rows[0];
- assert.equal(convertToHTML(headerRow.cells[0].innerHTML),
- 'Name ▿');
- assert.equal(convertToHTML(headerRow.cells[1].innerHTML),
- 'Value ▾');
- var tableRows = table.tBodies[0].rows;
- assert.equal(tableRows[0].cells[0].innerText, 'Last');
- assert.equal(tableRows[0].cells[1].innerText, '1');
- assert.equal(tableRows[1].cells[0].innerText, 'First');
- assert.equal(tableRows[1].cells[1].innerText, '2');
- assert.equal(tableRows[2].cells[0].innerText, 'Middle');
- assert.equal(tableRows[2].cells[1].innerText, '18');
- // the footer should never change.
- var footerRow = table.tFoot.rows[0];
- assert.equal(footerRow.cells[0].innerText, 'Average');
- assert.equal(footerRow.cells[1].innerText, '7');
- });
-
- test('sortOnNumericColumnDescending', function() {
- var table = SimpleTable();
- SortableTable.decorate(table);
- table.sort(1 , 'upward');
- var headerRow = table.tHead.rows[0];
- assert.equal(convertToHTML(headerRow.cells[0].innerHTML),
- 'Name ▿');
- assert.equal(convertToHTML(headerRow.cells[1].innerHTML),
- 'Value ▴');
- var tableRows = table.tBodies[0].rows;
- assert.equal(tableRows[0].cells[0].innerText, 'Middle');
- assert.equal(tableRows[0].cells[1].innerText, '18');
- assert.equal(tableRows[1].cells[0].innerText, 'First');
- assert.equal(tableRows[1].cells[1].innerText, '2');
- assert.equal(tableRows[2].cells[0].innerText, 'Last');
- assert.equal(tableRows[2].cells[1].innerText, '1');
- // the footer should never change.
- var footerRow = table.tFoot.rows[0];
- assert.equal(footerRow.cells[0].innerText, 'Average');
- assert.equal(footerRow.cells[1].innerText, '7');
- });
-
- test('sortOnAColumnThenReverseIt', function() {
- var table = SimpleTable();
- SortableTable.decorate(table);
- table.sort(0);
- var headerRow = table.tHead.rows[0];
- assert.equal(convertToHTML(headerRow.cells[0].innerHTML),
- 'Name ▾');
- assert.equal(convertToHTML(headerRow.cells[1].innerHTML),
- 'Value ▿');
- var tableRows = table.tBodies[0].rows;
- assert.equal(tableRows[0].cells[0].innerText, 'First');
- assert.equal(tableRows[0].cells[1].innerText, '2');
- assert.equal(tableRows[1].cells[0].innerText, 'Last');
- assert.equal(tableRows[1].cells[1].innerText, '1');
- assert.equal(tableRows[2].cells[0].innerText, 'Middle');
- assert.equal(tableRows[2].cells[1].innerText, '18');
- // the footer should never change.
- var footerRow = table.tFoot.rows[0];
- assert.equal(footerRow.cells[0].innerText, 'Average');
- assert.equal(footerRow.cells[1].innerText, '7');
- table.sort(0);
- var headerRow = table.tHead.rows[0];
- assert.equal(convertToHTML(headerRow.cells[0].innerHTML),
- 'Name ▴');
- assert.equal(convertToHTML(headerRow.cells[1].innerHTML),
- 'Value ▿');
- var tableRows = table.tBodies[0].rows;
- assert.equal(tableRows[0].cells[0].innerText, 'Middle');
- assert.equal(tableRows[0].cells[1].innerText, '18');
- assert.equal(tableRows[1].cells[0].innerText, 'Last');
- assert.equal(tableRows[1].cells[1].innerText, '1');
- assert.equal(tableRows[2].cells[0].innerText, 'First');
- assert.equal(tableRows[2].cells[1].innerText, '2');
- // the footer should never change.
- var footerRow = table.tFoot.rows[0];
- assert.equal(footerRow.cells[0].innerText, 'Average');
- assert.equal(footerRow.cells[1].innerText, '7');
- });
-
- test('sortOnAColumnThenOnAnotherColumn', function() {
- var table = SimpleTable();
- SortableTable.decorate(table);
- table.sort(0 , 'upward');
- var headerRow = table.tHead.rows[0];
- assert.equal(convertToHTML(headerRow.cells[0].innerHTML),
- 'Name ▴');
- assert.equal(convertToHTML(headerRow.cells[1].innerHTML),
- 'Value ▿');
- var tableRows = table.tBodies[0].rows;
- assert.equal(tableRows[0].cells[0].innerText, 'Middle');
- assert.equal(tableRows[0].cells[1].innerText, '18');
- assert.equal(tableRows[1].cells[0].innerText, 'Last');
- assert.equal(tableRows[1].cells[1].innerText, '1');
- assert.equal(tableRows[2].cells[0].innerText, 'First');
- assert.equal(tableRows[2].cells[1].innerText, '2');
- // the footer should never change.
- var footerRow = table.tFoot.rows[0];
- assert.equal(footerRow.cells[0].innerText, 'Average');
- assert.equal(footerRow.cells[1].innerText, '7');
- table.sort(1 /*, 'downward' */);
- var headerRow = table.tHead.rows[0];
- assert.equal(convertToHTML(headerRow.cells[0].innerHTML),
- 'Name ▿');
- assert.equal(convertToHTML(headerRow.cells[1].innerHTML),
- 'Value ▾');
- var tableRows = table.tBodies[0].rows;
- assert.equal(tableRows[0].cells[0].innerText, 'Last');
- assert.equal(tableRows[0].cells[1].innerText, '1');
- assert.equal(tableRows[1].cells[0].innerText, 'First');
- assert.equal(tableRows[1].cells[1].innerText, '2');
- assert.equal(tableRows[2].cells[0].innerText, 'Middle');
- assert.equal(tableRows[2].cells[1].innerText, '18');
- // the footer should never change.
- var footerRow = table.tFoot.rows[0];
- assert.equal(footerRow.cells[0].innerText, 'Average');
- assert.equal(footerRow.cells[1].innerText, '7');
- });
-});
-</script>
diff --git a/catapult/tracing/tracing/ui/base/sunburst_chart.css b/catapult/tracing/tracing/ui/base/sunburst_chart.css
deleted file mode 100644
index 232365c..0000000
--- a/catapult/tracing/tracing/ui/base/sunburst_chart.css
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2014 The Chromium Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-* /deep/ .sunburst-chart .arc-text {
- font-size: 8pt;
-}
-
-* /deep/ .sunburst-chart .label {
- font-size: 10pt;
-}
-
-* /deep/ .sunburst-chart polyline {
- fill: none;
- stroke: black;
-}
-
-* /deep/ .sunburst-chart path {
- stroke: #fff;
-}
diff --git a/catapult/tracing/tracing/ui/base/sunburst_chart.html b/catapult/tracing/tracing/ui/base/sunburst_chart.html
deleted file mode 100644
index 250411e..0000000
--- a/catapult/tracing/tracing/ui/base/sunburst_chart.html
+++ /dev/null
@@ -1,449 +0,0 @@
-<!DOCTYPE html>
-<!--
-Copyright (c) 2014 The Chromium Authors. All rights reserved.
-Use of this source code is governed by a BSD-style license that can be
-found in the LICENSE file.
--->
-<link rel="import" href="/tracing/base/range.html">
-<link rel="import" href="/tracing/ui/base/d3.html">
-<link rel="import" href="/tracing/ui/base/dom_helpers.html">
-<link rel="import" href="/tracing/ui/base/chart_base.html">
-<link rel="stylesheet" href="/tracing/ui/base/sunburst_chart.css">
-<script>
-'use strict';
-
-tr.exportTo('tr.ui.b', function() {
- var ChartBase = tr.ui.b.ChartBase;
- var getColorOfKey = tr.ui.b.getColorOfKey;
-
- var MIN_RADIUS = 100;
-
- /**
- * @constructor
- */
- var SunburstChart = tr.ui.b.define('sunburst-chart', ChartBase);
-
- SunburstChart.prototype = {
- __proto__: ChartBase.prototype,
-
- decorate: function() {
- ChartBase.prototype.decorate.call(this);
- this.classList.add('sunburst-chart');
-
- this.data_ = undefined;
- this.seriesKeys_ = undefined;
-
- this.yDomainMin_ = 0.0;
- this.yDomainMax_ = 0.0;
- this.xDomainScale_ = undefined;
- this.yDomainScale_ = undefined;
- this.radius_ = undefined;
- this.arc_ = undefined;
- this.selectedNode_ = null;
- this.vis_ = undefined;
- this.nodes_ = undefined;
- this.minX_ = 0.0;
- this.maxX_ = 1.0;
- this.minY_ = 0.0;
- this.clickedY_ = 0;
-
- var chartAreaSel = d3.select(this.chartAreaElement);
- this.legendSel_ = chartAreaSel.append('g');
-
- var pieGroupSel = chartAreaSel.append('g')
- .attr('class', 'pie-group');
- this.pieGroup_ = pieGroupSel.node();
-
- this.backSel_ = pieGroupSel.append('g');
-
-
- this.pathsGroup_ = pieGroupSel.append('g')
- .attr('class', 'paths')
- .node();
- },
-
- get data() {
- return this.data_;
- },
-
-
- /**
- * @param {Data} Data for the chart, where data must be of the
- * form {category: str, name: str, (size: number or children: [])} .
- */
- set data(data) {
- this.data_ = data;
- this.updateContents_();
- },
-
- get margin() {
- var margin = {top: 0, right: 0, bottom: 0, left: 0};
- if (this.chartTitle_)
- margin.top += 40;
- return margin;
- },
-
- set selectedNodeID(id) {
- this.zoomToID_(id);
- },
-
- get selectedNodeID() {
- if (this.selectedNode_ != null)
- return this.selectedNode_.id;
- return null;
- },
-
- get selectedNode() {
- if (this.selectedNode_ != null)
- return this.selectedNode_;
- return null;
- },
-
- getMinSize: function() {
- if (!tr.ui.b.isElementAttachedToDocument(this))
- throw new Error('Cannot measure when unattached');
- this.updateContents_();
-
- var titleWidth = this.querySelector(
- '#title').getBoundingClientRect().width;
- var margin = this.margin;
- var marginWidth = margin.left + margin.right;
- var marginHeight = margin.top + margin.bottom;
-
- // TODO(vmiura): Calc this when we're done with layout.
- return {
- width: 600,
- height: 600
- };
- },
-
- getLegendKeys_: function() {
- // This class creates its own legend, instead of using ChartBase.
- return undefined;
- },
-
- updateScales_: function(width, height) {
- if (this.data_ === undefined)
- return;
- },
-
- // Interpolate the scales!
- arcTween_: function(minX, maxX, minY) {
- var that = this;
- var xd, yd, yr;
-
- if (minY > 0) {
- xd = d3.interpolate(that.xDomainScale_.domain(), [minX, maxX]);
- yd = d3.interpolate(
- that.yDomainScale_.domain(), [minY, that.yDomainMax_]);
- yr = d3.interpolate(that.yDomainScale_.range(), [50, that.radius_]);
- }
- else {
- xd = d3.interpolate(that.xDomainScale_.domain(), [minX, maxX]);
- yd = d3.interpolate(that.yDomainScale_.domain(),
- [that.yDomainMin_, that.yDomainMax_]);
- yr = d3.interpolate(that.yDomainScale_.range(), [50, that.radius_]);
- }
-
- return function(d, i) {
- return i ? function(t) { return that.arc_(d); }
- : function(t) {
- that.xDomainScale_.domain(xd(t));
- that.yDomainScale_.domain(yd(t)).range(yr(t));
- return that.arc_(d);
- };
- };
- },
-
- getNodeById_: function(id) {
- if (!this.nodes_)
- return null;
-
- if (id < 0 || id > this.nodes_.length)
- return null;
-
- return this.nodes_[id];
- },
-
- zoomOut_: function() {
- window.history.back();
- },
-
- // This function assumes that, till the given depth,
- // the tree is linear. (i.e, a single string with no branches.)
- zoomToDepth: function(depth) {
- var node = this.data_.nodes;
- while (node.depth !== depth) {
- if (node.children.length !== 1)
- throw new Error('zoomToDepth requires the tree to be linear ' +
- 'till the specified depth.');
- node = node.children[0];
- }
- return this.zoomToID_(node.id);
- },
-
- zoomToID_: function(id) {
- var d = this.getNodeById_(id);
-
- if (d) {
- this.clickedY_ = d.y;
- this.minX_ = d.x;
- this.maxX_ = d.x + d.dx;
- this.minY_ = d.y;
- }
- else {
- this.clickedY_ = -1;
- this.minX_ = 0.0;
- this.maxX_ = 1.0;
- this.minY_ = 0.0;
- }
-
- this.selectedNode_ = d;
- this.redrawSegments_(this.minX_, this.maxX_, this.minY_);
- var path = this.vis_.selectAll('path');
-
- path.transition()
- .duration(750)
- .attrTween('d', this.arcTween_(this.minX_, this.maxX_, this.minY_));
-
- this.showBreadcrumbs_(d);
-
- var e = new tr.b.Event('node-selected');
- e.node = d;
- this.dispatchEvent(e);
- },
-
- click_: function(d) {
- if (d3.event.shiftKey) {
- // Zoom partially onto the selected range
- var diff_x = (this.maxX_ - this.minX_) * 0.5;
- this.minX_ = d.x + d.dx * 0.5 - diff_x * 0.5;
- this.minX_ = this.minX_ < 0.0 ? 0.0 : this.minX_;
- this.maxX_ = this.minX_ + diff_x;
- this.maxX_ = this.maxX_ > 1.0 ? 1.0 : this.maxX_;
- this.minX_ = this.maxX_ - diff_x;
-
- this.selectedNode_ = d;
- this.redrawSegments_(this.minX_, this.maxX_, this.minY_);
-
- var path = this.vis_.selectAll('path');
- path.transition()
- .duration(750)
- .attrTween('d', this.arcTween_(this.minX_, this.maxX_, this.minY_));
-
- return;
- }
-
- this.selectedNodeID = d.id;
-
- var e = new tr.b.Event('node-clicked');
- e.node = d;
- this.dispatchEvent(e);
- },
-
- // Given a node in a partition layout, return an array of all of its
- // ancestor nodes, highest first, but excluding the root.
- getAncestors_: function(node) {
- var path = [];
- var current = node;
- while (current.parent) {
- path.unshift(current);
- current = current.parent;
- }
- return path;
- },
-
- showBreadcrumbs_: function(d) {
- var sequenceArray = this.getAncestors_(d);
-
- // Fade all the segments.
- this.vis_.selectAll('path')
- .style('opacity', function(d) {
- return sequenceArray.indexOf(d) >= 0 ? 0.7 : 1.0;
- });
-
- var e = new tr.b.Event('node-highlighted');
- e.node = d;
- this.dispatchEvent(e);
-
- //if (this.data_.onNodeHighlighted != undefined)
- // this.data_.onNodeHighlighted(this, d);
- },
-
- mouseOver_: function(d) {
- this.showBreadcrumbs_(d);
- },
-
- // Restore everything to full opacity when moving off the
- // visualization.
- mouseLeave_: function(d) {
- var that = this;
- // Hide the breadcrumb trail
- if (that.selectedNode_ != null)
- that.showBreadcrumbs_(that.selectedNode_);
- else {
- // Deactivate all segments during transition.
- that.vis_.selectAll('path')
- .on('mouseover', null);
-
- // Transition each segment to full opacity and then reactivate it.
- that.vis_.selectAll('path')
- .transition()
- .duration(300)
- .style('opacity', 1)
- .each('end', function() {
- d3.select(that).on('mouseover', function(d) {
- that.mouseOver_(d);
- });
- });
- }
- },
-
- // Update visible segments between new min/max ranges.
- redrawSegments_: function(minX, maxX, minY) {
- var that = this;
- var scale = maxX - minX;
- var visible_nodes = that.nodes_.filter(function(d) {
- return d.depth &&
- (d.y >= minY) &&
- (d.x < maxX) &&
- (d.x + d.dx > minX) &&
- (d.dx / scale > 0.001);
- });
- var path = that.vis_.data([that.data_.nodes]).selectAll('path')
- .data(visible_nodes, function(d) { return d.id; });
-
- path.enter().insert('svg:path')
- .attr('d', that.arc_)
- .attr('fill-rule', 'evenodd')
- .style('fill', function(dd) { return getColorOfKey(dd.category); })
- .style('opacity', 1.0)
- .on('mouseover', function(d) { that.mouseOver_(d); })
- .on('click', function(d) { that.click_(d); });
-
- path.exit().remove();
- return path;
- },
-
- updateContents_: function() {
- ChartBase.prototype.updateContents_.call(this);
- if (!this.data_)
- return;
-
- var that = this;
-
- // Partition data into d3 nodes.
- var partition = d3.layout.partition()
- .size([1, 1])
- .value(function(d) { return d.size; });
- that.nodes_ = partition.nodes(that.data_.nodes);
-
- // Allocate an id to each node. Gather all categories.
- var categoryDict = {};
- that.nodes_.forEach(function f(d, i) {
- d.id = i;
- categoryDict[d.category] = null;
- });
-
- // Create legend.
- var li = {
- w: 85, h: 20, s: 3, r: 3
- };
-
- var legend = that.legendSel_.append('svg:svg')
- .attr('width', li.w)
- .attr('height', d3.keys(categoryDict).length * (li.h + li.s));
-
- var g = legend.selectAll('g')
- .data(d3.keys(categoryDict))
- .enter().append('svg:g')
- .attr('transform', function(d, i) {
- return 'translate(0,' + i * (li.h + li.s) + ')';
- });
-
- g.append('svg:rect')
- .attr('rx', li.r)
- .attr('ry', li.r)
- .attr('width', li.w)
- .attr('height', li.h)
- .style('fill', function(d) { return getColorOfKey(d); });
-
- g.append('svg:text')
- .attr('x', li.w / 2)
- .attr('y', li.h / 2)
- .attr('dy', '0.35em')
- .attr('text-anchor', 'middle')
- .attr('fill', '#fff')
- .attr('font-size', '12px')
- .text(function(d) { return d; });
-
- // Create sunburst visualization.
- var width = that.chartAreaSize.width;
- var height = that.chartAreaSize.height;
- that.radius_ = Math.max(MIN_RADIUS, Math.min(width, height) / 2);
-
- d3.select(that.pieGroup_).attr(
- 'transform',
- 'translate(' + width / 2 + ',' + height / 2 + ')');
-
- that.selectedNode_ = null;
-
- var depth = 1.0 + d3.max(that.nodes_, function(d) { return d.depth; });
- that.yDomainMin_ = 1.0 / depth;
- that.yDomainMax_ = Math.min(Math.max(depth, 20), 50) / depth;
-
- that.xDomainScale_ = d3.scale.linear()
- .range([0, 2 * Math.PI]);
-
- that.yDomainScale_ = d3.scale.sqrt()
- .domain([that.yDomainMin_, that.yDomainMax_])
- .range([50, that.radius_]);
-
- that.arc_ = d3.svg.arc()
- .startAngle(function(d) {
- return Math.max(0, Math.min(2 * Math.PI, that.xDomainScale_(d.x)));
- })
- .endAngle(function(d) {
- return Math.max(0,
- Math.min(2 * Math.PI, that.xDomainScale_(d.x + d.dx)));
- })
- .innerRadius(function(d) {
- return Math.max(0, that.yDomainScale_((d.y)));
- })
- .outerRadius(function(d) {
- return Math.max(0, that.yDomainScale_((d.y + d.dy)));
- });
-
-
- // Bounding circle underneath the sunburst, to make it easier to detect
- // when the mouse leaves the parent g.
- that.backSel_.append('svg:circle')
- .attr('r', that.radius_)
- .style('opacity', 0.0)
- .on('click', function() { that.zoomOut_(); });
-
-
- that.vis_ = d3.select(that.pathsGroup_);
- that.selectedNodeID = 0;
- that.vis_.on('mouseleave', function(d) { that.mouseLeave_(d); });
- },
-
- updateHighlight_: function() {
- ChartBase.prototype.updateHighlight_.call(this);
- // Update color of pie segments.
- var pathsGroupSel = d3.select(this.pathsGroup_);
- var that = this;
- pathsGroupSel.selectAll('.arc').each(function(d, i) {
- var origData = that.data_[i];
- var highlighted = origData.label == that.currentHighlightedLegendKey;
- var color = getColorOfKey(origData.label, highlighted);
- this.style.fill = getColorOfKey(origData.label, highlighted);
- });
- }
- };
-
- return {
- SunburstChart: SunburstChart
- };
-});
-</script>
diff --git a/catapult/tracing/tracing/ui/base/sunburst_chart_test.html b/catapult/tracing/tracing/ui/base/sunburst_chart_test.html
deleted file mode 100644
index f2480c1..0000000
--- a/catapult/tracing/tracing/ui/base/sunburst_chart_test.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE html>
-<!--
-Copyright (c) 2014 The Chromium Authors. All rights reserved.
-Use of this source code is governed by a BSD-style license that can be
-found in the LICENSE file.
--->
-<link rel="import" href="/tracing/ui/base/sunburst_chart.html">
-<script>
-'use strict';
-
-tr.b.unittest.testSuite(function() {
- test('simple', function() {
- var chart = new tr.ui.b.SunburstChart();
- chart.width = 600;
- chart.height = 600;
- assert.equal(chart.getAttribute('width'), '600');
- assert.equal(chart.getAttribute('height'), '600');
- chart.chartTitle = 'Chart title';
- var nodes = {
- category: 'root',
- name: '<All Threads>',
- children: [
- {
- category: 'Thread',
- name: 'Thread 1',
- children: [
- {
- category: 'Chrome',
- name: 'foo()',
- children: [
- {
- category: 'Chrome',
- name: 'foo()',
- size: 150
- },
- {
- category: 'Chrome',
- name: 'bar()',
- size: 200
- }]
- },
- {
- category: 'Chrome',
- name: 'bar()',
- size: 200
- }]
- },
- {
- category: 'Thread',
- name: 'Thread 2',
- children: [
- {
- category: 'Java',
- name: 'Java',
- size: 100
- }]
- }]
- };
- chart.data = {
- nodes: nodes
- };
- this.addHTMLOutput(chart);
- });
-});
-</script>
diff --git a/catapult/tracing/tracing/ui/base/timing_tool.html b/catapult/tracing/tracing/ui/base/timing_tool.html
index f9a3aa8..d320382 100644
--- a/catapult/tracing/tracing/ui/base/timing_tool.html
+++ b/catapult/tracing/tracing/ui/base/timing_tool.html
@@ -6,7 +6,6 @@
-->
<link rel="import" href="/tracing/base/range.html">
-<link rel="import" href="/tracing/core/constants.html">
<link rel="import" href="/tracing/model/event_set.html">
<link rel="import" href="/tracing/model/slice.html">
<link rel="import" href="/tracing/ui/base/ui.html">
@@ -19,8 +18,6 @@
*/
tr.exportTo('tr.ui.b', function() {
- var constants = tr.c.constants;
-
/**
* Tool for taking time measurements in the TimelineTrackView using
* Viewportmarkers.
diff --git a/catapult/tracing/tracing/ui/extras/analysis/sampling_panel.html b/catapult/tracing/tracing/ui/extras/analysis/sampling_panel.html
new file mode 100644
index 0000000..b1f9e1b
--- /dev/null
+++ b/catapult/tracing/tracing/ui/extras/analysis/sampling_panel.html
@@ -0,0 +1,152 @@
+<!doctype html>
+<!--
+Copyright 2015 The Chromium Authors. All rights reserved.
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file.
+-->
+
+<link rel="import" href="/tracing/ui/analysis/analysis_sub_view.html">
+
+<polymer-element name="tr-ui-a-sampling-panel" extends="tr-ui-a-sub-view">
+ <template>
+ <style>
+ :host { display: block; }
+ </style>
+
+ <tr-ui-b-table id="table">
+ </tr-ui-b-table>
+ </template>
+
+ <script>
+ 'use strict';
+
+ (function() {
+ var SamplingTreeNode = function(frame) {
+ this.parent = undefined;
+ this.children = [];
+ this.childFrameMap = {};
+ this.frame = frame;
+ this.accumulatedSamplesCount = 0;
+ };
+
+ SamplingTreeNode.prototype = {
+ getOrCreateChild: function(frame) {
+ if (this.childFrameMap[frame.title] !== undefined)
+ return this.childFrameMap[frame.title];
+
+ var node = new SamplingTreeNode(frame);
+ node.parent = this;
+
+ this.childFrameMap[frame.title] = node;
+ this.children.push(node);
+
+ return node;
+ },
+
+ get subRows() {
+ return this.children;
+ },
+
+ get samplesCount() {
+ return this.accumulatedSamplesCount;
+ },
+
+ get name() {
+ return this.frame.title;
+ },
+
+ get category() {
+ return this.frame !== undefined ? this.frame.category : 'root';
+ }
+ };
+
+ Polymer({
+ ready: function() {
+ this.selection_ = undefined;
+ },
+
+ get selection() {
+ return this.selection_;
+ },
+
+ set selection(selection) {
+ this.selection_ = selection;
+ this.samplingData_ = this.createSamplingSummary_(selection);
+ this.updateContents_();
+ },
+
+ createSamplingSummary_: function(selection) {
+ var root = new SamplingTreeNode();
+ var samples = selection.getEventsOrganizedByBaseType().sample;
+
+ function addSample(sample) {
+ var stack = sample.stackTrace;
+
+ // Sort the stacks reverse so we can see the stacks in descending
+ // order.
+ stack.reverse();
+
+ var currentNode = root;
+ for (var i = 0; i < stack.length; i++) {
+ var frame = stack[i];
+ currentNode.accumulatedSamplesCount++;
+ currentNode = currentNode.getOrCreateChild(frame);
+ }
+ currentNode.accumulatedSamplesCount++;
+ }
+
+ for (var i = 0; i < samples.length; i++) {
+ addSample(samples[i]);
+ }
+
+ return root;
+ },
+
+ updateContents_: function() {
+ var columns = [
+ {
+ title: 'Percent',
+ value: function(row) {
+ var percent = row.samplesCount / this.samplingData_.samplesCount;
+
+ var span = document.createElement('tr-ui-u-scalar-span');
+ span.value = (percent * 100).toFixed(2);
+ span.percentage = percent;
+ span.unit = tr.b.u.Units.unitlessNumber;
+ return span;
+
+ }.bind(this),
+ width: '60px',
+ cmp: function(a, b) {
+ return a.samplesCount - b.samplesCount;
+ }
+ },
+ {
+ title: 'Samples',
+ value: function(row) { return row.samplesCount; },
+ width: '60px',
+ cmp: function(a, b) {
+ return a.samplesCount - b.samplesCount;
+ }
+ },
+ {
+ title: 'Symbol',
+ value: function(row) { return row.name; },
+ width: '250px',
+ cmp: function(a, b) {
+ return a.name.toString().localeCompare(b.name.toString());
+ },
+ showExpandButtons: true
+ }];
+
+ this.$.table.tableColumns = columns;
+ this.$.table.sortColumnIndex = 1;
+ this.$.table.sortDescending = true;
+ this.$.table.tableRows = this.samplingData_.subRows;
+ this.$.table.rebuild();
+ }
+ });
+ })();
+ </script>
+</polymer-element>
+
diff --git a/catapult/tracing/tracing/ui/extras/analysis/sampling_summary.html b/catapult/tracing/tracing/ui/extras/analysis/sampling_summary.html
deleted file mode 100644
index 4a6a583..0000000
--- a/catapult/tracing/tracing/ui/extras/analysis/sampling_summary.html
+++ /dev/null
@@ -1,565 +0,0 @@
-<!DOCTYPE html>
-<!--
-Copyright (c) 2014 The Chromium Authors. All rights reserved.
-Use of this source code is governed by a BSD-style license that can be
-found in the LICENSE file.
--->
-
-<link rel="import" href="/tracing/base/iteration_helpers.html">
-<link rel="import" href="/tracing/base/statistics.html">
-<link rel="import" href="/tracing/model/event_set.html">
-<link rel="import" href="/tracing/ui/base/dom_helpers.html">
-<link rel="import" href="/tracing/ui/base/pie_chart.html">
-<link rel="import" href="/tracing/ui/base/sortable_table.html">
-<link rel="import" href="/tracing/ui/base/sunburst_chart.html">
-<link rel="import" href="/tracing/ui/base/utils.html">
-
-<template id="x-sample-summary-panel-template">
- <style>
- .x-sample-summary-panel {
- display: block;
- overflow: auto;
- padding: 5px;
- }
- .x-sample-summary-panel > x-toolbar {
- display: block;
- border-bottom: 1px solid black;
- }
-
- .x-sample-summary-panel > x-left-panel {
- position: relative;
- width: 610px;
- left: 0;
- top: 0;
- height: 610px;
- padding: 5px;
- }
-
- .x-sample-summary-panel > x-left-panel > result-area {
- display: block;
- width: 610px;
- position: absolute;
- left: 0;
- top: 0;
- height: 610px;
- }
-
- .x-sample-summary-panel > x-left-panel > x-explanation {
- display: block;
- position: absolute;
- top: 300px;
- left: 250px;
- width: 100px;
- height: 100px;
- text-align: center;
- vertical-align:middle;
- color: #666;
- font-size: 12px;
- }
-
- .x-sample-summary-panel > x-right-panel {
- display: block;
- min-height: 610px;
- margin-left: 610px;
- padding: 5px;
- }
-
- .x-sample-summary-panel > x-right-panel td {
- color: #fff;
- padding: 1px 5px;
- font-size: 1.0em;
- white-space: nowrap;
- }
-
- .x-sample-summary-panel > x-right-panel > x-sequence {
- display: block;
- overflow: auto;
- width: 600px;
- height: 400px;
- font-size: 14px;
- margin: 10px;
- }
-
- .x-sample-summary-panel > x-right-panel > x-sequence table {
- min-width: 600px;
- }
-
- .x-sample-summary-panel > x-right-panel > x-callees {
- display: block;
- position: relative;
- width: 600px;
- height: auto;
- overflow: auto;
- font-size: 14px;
- margin: 10px;
- }
-
- .x-sample-summary-panel > x-right-panel > x-callees .x-col-numeric {
- width: 30px;
- }
-
- .x-sample-summary-panel > x-right-panel > x-callees .x-td-numeric {
- text-align: right;
- }
-
- .x-sample-summary-panel > x-right-panel > x-callees table {
- min-width: 600px;
- max-width: 600px;
- }
-
- .x-sample-summary-panel > x-right-panel > x-callees {
- display: block;
- overflow: auto;
- height: 300px;
- }
-
- </style>
-
- <x-toolbar></x-toolbar>
- <x-left-panel>
- <result-area></result-area>
- <x-explanation></x-explanation>
- </x-left-panel>
- <x-right-panel>
- <x-sequence></x-sequence>
- <x-callees></x-callees>
- </x-right-panel>
-</template>
-
-<script>
-'use strict';
-
-tr.exportTo('tr.ui.e.analysis', function() {
- var THIS_DOC = document.currentScript.ownerDocument;
-
- var RequestSelectionChangeEvent = tr.model.RequestSelectionChangeEvent;
- var getColorOfKey = tr.ui.b.getColorOfKey;
-
- /**
- * @constructor
- */
- var CallTreeNode = function(name, category) {
- this.parent = undefined;
- this.name = name;
- this.category = category;
- this.selfTime = 0.0;
- this.children = [];
-
- // Defined only for leaf nodes, leaf_node_id corresponds to
- // the id of the leaf stack frame.
- this.leaf_node_id = undefined;
- };
-
- CallTreeNode.prototype = {
- addChild: function(node) {
- this.children.push(node);
- node.parent = this;
- }
- };
-
- /**
- * @constructor
- */
- var Thread = function(thread) {
- this.thread = thread;
- this.rootNode = new CallTreeNode('root', 'root');
- this.rootCategories = {};
- this.sfToNode = {};
- this.sfToNode['__root'] = self.rootNode;
- };
-
- Thread.prototype = {
- getCallTreeNode: function(stackFrame) {
- if (stackFrame.id in this.sfToNode)
- return this.sfToNode[stackFrame.id];
-
- // Create & save the node.
- var newNode = new CallTreeNode(stackFrame.title, stackFrame.category);
- this.sfToNode[stackFrame.id] = newNode;
-
- // Add node to parent tree node.
- if (stackFrame.parentFrame) {
- var parentNode = this.getCallTreeNode(stackFrame.parentFrame);
-
- parentNode.addChild(newNode);
- } else {
- // Creating a root category node for each category helps group samples
- // that may be missing call stacks.
- var rootCategory = this.rootCategories[stackFrame.category];
- if (!rootCategory) {
- rootCategory =
- new CallTreeNode(stackFrame.category, stackFrame.category);
- this.rootNode.addChild(rootCategory);
- this.rootCategories[stackFrame.category] = rootCategory;
- }
- rootCategory.addChild(newNode);
- }
- return newNode;
- },
-
- addSample: function(sample) {
- var leaf_node = this.getCallTreeNode(sample.leafStackFrame);
- leaf_node.leaf_node_id = sample.leafStackFrame.id;
- leaf_node.selfTime += sample.weight;
- }
- };
-
- function genCallTree(node, isRoot) {
- var ret = {
- category: node.category,
- name: node.name,
- leaf_node_id: node.leaf_node_id
- };
-
- if (isRoot || node.children.length > 0) {
- ret.children = [];
- for (var c = 0; c < node.children.length; c++)
- ret.children.push(genCallTree(node.children[c], false));
- if (node.selfTime > 0.0) {
- // say, caller (r) calls callee (e) which calls callee2 (2)
- // and following are the samples
- // r r r r r r r
- // e e e
- // 2 2 2
- // In this case, r has a non-zero self time (4 samples to be precise)
- // The <self> node makes the representation resemble the following
- // where s denotes the selftime.
- // r r r r r r r
- // s e e e s s s
- // 2 2 2
- //
- // Among the obvious visualization benefit, this also creates the
- // invariance that a node can not simultaneously have samples and
- // children.
- ret.children.push({
- name: '<self>',
- category: ret.category,
- size: node.selfTime,
- leaf_node_id: node.leaf_node_id
- });
- delete ret.leaf_node_id; // ret is not a leaf node anymore.
- }
- }
- else {
- ret.size = node.selfTime;
- }
- if (isRoot)
- return ret.children;
- return ret;
- }
-
- function getSampleTypes(selection) {
- var sampleDict = {};
- var samples = selection.getEventsOrganizedByBaseType().sample;
- for (var i = 0; i < samples.length; i++) {
- sampleDict[samples[i].title] = null;
- }
- return Object.keys(sampleDict);
- }
-
- // Create sunburst data from the selection.
- function createSunburstData(selection, sampleType) {
- var threads = {};
- function getOrCreateThread(thread) {
- var ret = undefined;
- if (thread.tid in threads) {
- ret = threads[thread.tid];
- } else {
- ret = new Thread(thread);
- threads[thread.tid] = ret;
- }
- return ret;
- }
-
- // Process samples.
- var samples = selection.getEventsOrganizedByBaseType().sample;
- for (var i = 0; i < samples.length; i++) {
- var sample = samples[i];
- if (sample.title == sampleType)
- getOrCreateThread(sample.thread).addSample(sample);
- }
-
- // Generate sunburst data.
- var sunburstData = {
- name: '<All Threads>',
- category: 'root',
- children: []
- };
- for (var t in threads) {
- if (!threads.hasOwnProperty(t)) continue;
- var thread = threads[t];
- var threadData = {
- name: 'Thread ' + thread.thread.tid + ': ' + thread.thread.name,
- category: 'Thread',
- children: genCallTree(thread.rootNode, true)
- };
- sunburstData.children.push(threadData);
- }
- return sunburstData;
- }
-
- /**
- * @constructor
- */
- var SamplingSummaryPanel =
- tr.ui.b.define('x-sample-summary-panel');
- SamplingSummaryPanel.textLabel = 'Sampling Summary';
- SamplingSummaryPanel.supportsModel = function(m) {
- if (m == undefined) {
- return {
- supported: false,
- reason: 'Unknown tracing model'
- };
- }
-
- if (m.samples.length == 0) {
- return {
- supported: false,
- reason: 'No sampling data in trace'
- };
- }
-
- return {
- supported: true
- };
- };
-
- // Return a dict with keys as stack-frame ids
- // and values as selection objects which contain all the
- // samples whose leaf stack-frame id matches the key.
- function divideSamplesBasedOnLeafStackFrame(selection) {
- var stackFrameIdToSamples = {};
- for (var i = 0; i < selection.length; ++i) {
- var sample = selection[i];
- var id = sample.leafStackFrame.id;
- if (!stackFrameIdToSamples[id])
- stackFrameIdToSamples[id] = new tr.model.EventSet();
- stackFrameIdToSamples[id].push(sample);
- }
- return stackFrameIdToSamples;
- }
-
- SamplingSummaryPanel.prototype = {
- __proto__: HTMLUnknownElement.prototype,
-
- decorate: function() {
- this.classList.add('x-sample-summary-panel');
- this.appendChild(tr.ui.b.instantiateTemplate(
- '#x-sample-summary-panel-template', THIS_DOC));
-
- this.sampleType_ = undefined;
- this.sampleTypeSelector_ = undefined;
- this.chart_ = undefined;
- this.selection_ = undefined;
- },
-
- get selection() {
- return this.selection_;
- },
-
- set selection(selection) {
- this.selection_ = selection;
- this.stackFrameIdToSamples_ = divideSamplesBasedOnLeafStackFrame(
- selection);
- this.updateContents_();
- },
-
- get sampleType() {
- return this.sampleType_;
- },
-
- set sampleType(type) {
- this.sampleType_ = type;
- if (this.sampleTypeSelector_)
- this.sampleTypeSelector_.selectedValue = type;
- this.updateResultArea_();
- },
-
- updateCallees_: function(d) {
- // Update callee table.
- var that = this;
- var table = document.createElement('table');
-
- // Add column styles.
- var col0 = document.createElement('col');
- var col1 = document.createElement('col');
- col0.className += 'x-col-numeric';
- col1.className += 'x-col-numeric';
- table.appendChild(col0);
- table.appendChild(col1);
-
- // Add headers.
- var thead = table.createTHead();
- var headerRow = thead.insertRow(0);
- headerRow.style.backgroundColor = '#888';
- headerRow.insertCell(0).appendChild(document.createTextNode('Samples'));
- headerRow.insertCell(1).appendChild(document.createTextNode('Percent'));
- headerRow.insertCell(2).appendChild(document.createTextNode('Symbol'));
-
- // Add body.
- var tbody = table.createTBody();
- if (d.children) {
- for (var i = 0; i < d.children.length; i++) {
- var c = d.children[i];
- var row = tbody.insertRow(i);
- var bgColor = getColorOfKey(c.category);
- if (bgColor == undefined)
- bgColor = '#444444';
- row.style.backgroundColor = bgColor;
- var cell0 = row.insertCell(0);
- var cell1 = row.insertCell(1);
- var cell2 = row.insertCell(2);
- cell0.className += 'x-td-numeric';
- cell1.className += 'x-td-numeric';
- cell0.appendChild(document.createTextNode(c.value.toString()));
- cell1.appendChild(document.createTextNode(
- (100 * c.value / d.value).toFixed(2) + '%'));
- cell2.appendChild(document.createTextNode(c.name));
- }
- }
-
- // Make it sortable.
- tr.ui.b.SortableTable.decorate(table);
-
- var calleeArea = that.querySelector('x-callees');
- calleeArea.textContent = '';
- calleeArea.appendChild(table);
- },
-
- updateHighlight_: function(d) {
- var that = this;
-
- // Update explanation.
- var percent = 100.0;
- if (that.chart_.selectedNode != null)
- percent = 100.0 * d.value / that.chart_.selectedNode.value;
- that.querySelector('x-explanation').innerHTML =
- d.value + '<br>' + percent.toFixed(2) + '%';
-
- // Update call stack table.
- var table = document.createElement('table');
- var thead = table.createTHead();
- var tbody = table.createTBody();
- var headerRow = thead.insertRow(0);
- headerRow.style.backgroundColor = '#888';
- headerRow.insertCell(0).appendChild(
- document.createTextNode('Call Stack'));
-
- var callStack = [];
- var frame = d;
- while (frame && frame.id) {
- callStack.push(frame);
- frame = frame.parent;
- }
-
- for (var i = 0; i < callStack.length; i++) {
- var row = tbody.insertRow(i);
- var bgColor = getColorOfKey(callStack[i].category);
- if (bgColor == undefined)
- bgColor = '#444444';
- row.style.backgroundColor = bgColor;
- if (i == 0)
- row.style.fontWeight = 'bold';
- row.insertCell(0).appendChild(
- document.createTextNode(callStack[i].name));
- }
-
- var sequenceArea = that.querySelector('x-sequence');
- sequenceArea.textContent = '';
- sequenceArea.appendChild(table);
- },
-
- getSamplesFromNode_: function(node) {
- // A node has samples associated with it, if it's a leaf node.
- var selection = new tr.model.EventSet();
- if (node.leaf_node_id !== undefined) {
- selection.addEventSet(this.stackFrameIdToSamples_[node.leaf_node_id]);
- }
- else if (node.children === undefined ||
- node.children.length === 0) {
- throw new Error('A node should either have samples, or children');
- }
- else {
- for (var i = 0; i < node.children.length; ++i)
- selection.addEventSet(this.getSamplesFromNode_(node.children[i]));
- }
- return selection;
- },
-
- updateResultArea_: function() {
- if (this.selection_ === undefined)
- return;
-
- var resultArea = this.querySelector('result-area');
- this.chart_ = undefined;
- resultArea.textContent = '';
-
- var sunburstData =
- createSunburstData(this.selection_, this.sampleType_);
- this.chart_ = new tr.ui.b.SunburstChart();
- this.chart_.width = 600;
- this.chart_.height = 600;
- this.chart_.chartTitle = 'Sampling Summary';
-
- this.chart_.addEventListener('node-selected', (function(e) {
- this.updateCallees_(e.node);
- }).bind(this));
-
- this.chart_.addEventListener('node-clicked', (function(e) {
- var event = new RequestSelectionChangeEvent();
- var depth = e.node.depth;
- if (e.node.name === '<self>')
- depth--;
- event.selection = this.getSamplesFromNode_(e.node);
- event.selection.sunburst_zoom_level = depth;
- this.dispatchEvent(event);
- }).bind(this));
-
- this.chart_.addEventListener('node-highlighted', (function(e) {
- this.updateHighlight_(e.node);
- }).bind(this));
-
- this.chart_.data = {
- nodes: sunburstData
- };
-
- resultArea.appendChild(this.chart_);
- this.chart_.setSize(this.chart_.getMinSize());
-
- if (this.selection_.sunburst_zoom_level !== undefined) {
- this.chart_.zoomToDepth(this.selection_.sunburst_zoom_level);
- }
- },
-
- updateContents_: function() {
- if (this.selection_ === undefined || this.selection_.length == 0)
- return;
-
- // Get available sample types in range.
- var sampleTypes = getSampleTypes(this.selection_);
- if (sampleTypes.indexOf(this.sampleType_) == -1)
- this.sampleType_ = sampleTypes[0];
-
- // Create sample type dropdown.
- var sampleTypeOptions = [];
- for (var i = 0; i < sampleTypes.length; i++)
- sampleTypeOptions.push({label: sampleTypes[i], value: sampleTypes[i]});
-
- var toolbarEl = this.querySelector('x-toolbar');
- this.sampleTypeSelector_ = tr.ui.b.createSelector(
- this,
- 'sampleType',
- 'samplingSummaryPanel.sampleType',
- this.sampleType_,
- sampleTypeOptions);
- toolbarEl.textContent = 'Sample Type: ';
- toolbarEl.appendChild(this.sampleTypeSelector_);
- }
- };
-
- return {
- SamplingSummaryPanel: SamplingSummaryPanel,
- createSunburstData: createSunburstData
- };
-});
-</script>
diff --git a/catapult/tracing/tracing/ui/extras/analysis/sampling_summary_test.html b/catapult/tracing/tracing/ui/extras/analysis/sampling_summary_test.html
deleted file mode 100644
index 9a7c82e..0000000
--- a/catapult/tracing/tracing/ui/extras/analysis/sampling_summary_test.html
+++ /dev/null
@@ -1,226 +0,0 @@
-<!DOCTYPE html>
-<!--
-Copyright (c) 2014 The Chromium Authors. All rights reserved.
-Use of this source code is governed by a BSD-style license that can be
-found in the LICENSE file.
--->
-
-<link rel="import" href="/tracing/core/test_utils.html">
-<link rel="import" href="/tracing/model/event_set.html">
-<link rel="import" href="/tracing/model/model.html">
-<link rel="import" href="/tracing/model/source_info/js_source_info.html">
-<link rel="import" href="/tracing/ui/extras/analysis/sampling_summary.html">
-
-<script>
-'use strict';
-
-tr.b.unittest.testSuite(function() {
- var StackFrame = tr.model.StackFrame;
- var Sample = tr.model.Sample;
-
- var newSliceEx = tr.c.TestUtils.newSliceEx;
-
- function createSelection() {
- var selection = new tr.model.EventSet();
- var model = new tr.Model();
- var thread = model.getOrCreateProcess(1).getOrCreateThread(2);
- thread.name = 'The Thread';
-
- var fA = new StackFrame(undefined, 0, 'Chrome', 'a', 7);
- var fAB = new StackFrame(fA, 1, 'Chrome', 'b', 7);
- var fABC = new StackFrame(fAB, 2, 'Chrome', 'c', 7);
- var fAD = new StackFrame(fA, 4, 'GPU Driver', 'd', 7,
- new tr.model.source_info.JSSourceInfo(
- 'http://example.com/foo.js', 24, true));
-
- selection.push(new Sample(undefined, thread, 'cycles',
- 10, fABC, 10));
- selection.push(new Sample(undefined, thread, 'cycles',
- 20, fAB, 10));
- selection.push(new Sample(undefined, thread, 'cycles',
- 25, fAB, 10));
- selection.push(new Sample(undefined, thread, 'cycles',
- 30, fAB, 10));
- selection.push(new Sample(undefined, thread, 'cycles',
- 35, fAD, 10));
- selection.push(new Sample(undefined, thread, 'cycles',
- 35, fAD, 5));
- selection.push(new Sample(undefined, thread, 'cycles',
- 40, fAD, 5));
- selection.push(new Sample(undefined, thread, 'page_misses',
- 35, fAD, 7));
- selection.push(new Sample(undefined, thread, 'page_misses',
- 40, fAD, 9));
- return selection;
- }
-
- test('createSunburstDataBasic', function() {
- var s = createSelection();
-
- var expect = {
- name: '<All Threads>',
- category: 'root',
- children: [
- {
- name: 'Thread 2: The Thread',
- category: 'Thread',
- children: [
- {
- category: 'Chrome',
- name: 'Chrome',
- children: [
- {
- category: 'Chrome',
- name: 'a',
- children: [
- {
- category: 'Chrome',
- name: 'b',
- children: [
- {
- category: 'Chrome',
- name: 'c',
- leaf_node_id: 2,
- size: 10
- },
- {
- name: '<self>',
- category: 'Chrome',
- size: 30,
- leaf_node_id: 1
- }
- ]
- },
- {
- category: 'GPU Driver',
- name: 'd [native v8] http://example.com/foo.js:24',
- leaf_node_id: 4,
- size: 20
- }
- ]
- }
- ]
- }
- ]
- }
- ]
- };
-
- var sunburstData = tr.ui.e.analysis.createSunburstData(s, 'cycles');
- assert.equal(JSON.stringify(sunburstData), JSON.stringify(expect));
- });
-
- test('processOnlySamples', function() {
- var selection = new tr.model.EventSet();
- var model = new tr.Model();
- var thread = model.getOrCreateProcess(1).getOrCreateThread(2);
- thread.name = 'The Thread';
-
- var fA = new StackFrame(undefined, 1, 'Chrome', 'a', 7);
- var fAB = new StackFrame(fA, 2, 'Chrome', 'b', 7);
- var fABC = new StackFrame(fAB, 3, 'Chrome', 'c', 7);
- var fAD = new StackFrame(fA, 4, 'GPU Driver', 'd', 7,
- new tr.model.source_info.JSSourceInfo(
- 'http://example.com/foo.js', 24, true));
-
- selection.push(new Sample(undefined, thread, 'cycles',
- 10, fABC, 10));
- selection.push(new Sample(undefined, thread, 'cycles',
- 20, fAB, 10));
- selection.push(new Sample(undefined, thread, 'page_misses',
- 40, fAD, 9));
- var expect = {
- name: '<All Threads>',
- category: 'root',
- children: [
- {
- name: 'Thread 2: The Thread',
- category: 'Thread',
- children: [
- {
- category: 'Chrome',
- name: 'Chrome',
- children: [
- {
- category: 'Chrome',
- name: 'a',
- children: [
- {
- category: 'GPU Driver',
- name: 'd [native v8] http://example.com/foo.js:24',
- leaf_node_id: 4,
- size: 9
- }
- ]
- }
- ]
- }
- ]
- }
- ]
- };
-
- // Along with the samples, push some slices too.
- // The panel should completely ignore these.
- selection.push(newSliceEx({
- type: tr.model.ThreadSlice,
- title: 'a', start: 1, duration: 2
- }));
- selection.push(newSliceEx({
- type: tr.model.ThreadSlice,
- title: 'f', start: 9, duration: 7
- }));
-
- var sunburstData = tr.ui.e.analysis.createSunburstData(
- selection, 'page_misses');
- assert.equal(JSON.stringify(sunburstData), JSON.stringify(expect));
- });
-
- test('createSunburstDataSampleType', function() {
- var s = createSelection();
-
- var expect = {
- name: '<All Threads>',
- category: 'root',
- children: [
- {
- name: 'Thread 2: The Thread',
- category: 'Thread',
- children: [
- {
- category: 'Chrome',
- name: 'Chrome',
- children: [
- {
- category: 'Chrome',
- name: 'a',
- children: [
- {
- category: 'GPU Driver',
- name: 'd [native v8] http://example.com/foo.js:24',
- leaf_node_id: 4,
- size: 16
- }
- ]
- }
- ]
- }
- ]
- }
- ]
- };
-
- var sunburstData = tr.ui.e.analysis.createSunburstData(s, 'page_misses');
- assert.equal(JSON.stringify(sunburstData), JSON.stringify(expect));
- });
-
- test('instantiate', function() {
- var s = createSelection();
-
- var panel = new tr.ui.e.analysis.SamplingSummaryPanel();
- this.addHTMLOutput(panel);
- panel.style.border = '1px solid black';
- panel.selection = s;
- });
-});
-</script>
diff --git a/catapult/tracing/tracing/ui/extras/chrome_config.html b/catapult/tracing/tracing/ui/extras/chrome_config.html
index b67debf..206cf77 100644
--- a/catapult/tracing/tracing/ui/extras/chrome_config.html
+++ b/catapult/tracing/tracing/ui/extras/chrome_config.html
@@ -29,8 +29,5 @@
<link rel="import" href="/tracing/ui/extras/side_panel/input_latency_side_panel.html">
<link rel="import" href="/tracing/ui/extras/side_panel/time_summary_side_panel.html">
-<!-- Sample analysis is chrome-only because it brings in D3 which is HUGE -->
-<link rel="import" href="/tracing/ui/extras/analysis/sampling_summary.html">
-
<!-- RAIL is fun too -->
<link rel="import" href="/tracing/ui/extras/rail/rail_score_side_panel.html">
diff --git a/catapult/tracing/tracing/ui/extras/full_config.html b/catapult/tracing/tracing/ui/extras/full_config.html
index 2b55995..09fab1f 100644
--- a/catapult/tracing/tracing/ui/extras/full_config.html
+++ b/catapult/tracing/tracing/ui/extras/full_config.html
@@ -6,6 +6,7 @@
-->
<!-- The full config is all the configs slammed together. -->
+<link rel="import" href="/tracing/extras/importer/gcloud_trace/gcloud_trace_importer.html">
<link rel="import" href="/tracing/ui/extras/chrome_config.html">
<link rel="import" href="/tracing/ui/extras/systrace_config.html">
<link rel="import" href="/tracing/ui/extras/lean_config.html">
diff --git a/catapult/tracing/tracing/ui/extras/highlighter/vsync_highlighter.html b/catapult/tracing/tracing/ui/extras/highlighter/vsync_highlighter.html
index 2436f69..bb915d2 100644
--- a/catapult/tracing/tracing/ui/extras/highlighter/vsync_highlighter.html
+++ b/catapult/tracing/tracing/ui/extras/highlighter/vsync_highlighter.html
@@ -42,6 +42,9 @@
* Generate a zebra striping from a list of times.
*/
VSyncHighlighter.generateStripes = function(times, minTime, maxTime) {
+ if (times.length === 0)
+ return [];
+
var stripes = [];
// Find the lowest and highest index within the viewport.
@@ -49,9 +52,6 @@
times,
function(time) { return time; },
minTime);
- if (lowIndex > times.length) {
- lowIndex = times.length;
- }
var highIndex = lowIndex - 1;
while (times[highIndex + 1] <= maxTime) {
highIndex++;
diff --git a/catapult/tracing/tracing/ui/timeline_viewport_test.html b/catapult/tracing/tracing/ui/timeline_viewport_test.html
index 0e1f4cf..454fc7d 100644
--- a/catapult/tracing/tracing/ui/timeline_viewport_test.html
+++ b/catapult/tracing/tracing/ui/timeline_viewport_test.html
@@ -9,6 +9,7 @@
<link rel="import" href="/tracing/model/event_set.html">
<link rel="import" href="/tracing/model/location.html">
<link rel="import" href="/tracing/model/model.html">
+<link rel="import" href="/tracing/ui/base/constants.html">
<link rel="import" href="/tracing/ui/timeline_track_view.html">
<link rel="import" href="/tracing/ui/timeline_viewport.html">
<link rel="import" href="/tracing/ui/tracks/drawing_container.html">
@@ -100,7 +101,7 @@
},
addEventListener: function() {},
canvas: {
- offsetLeft: tr.c.constants.HEADING_WIDTH,
+ offsetLeft: tr.ui.b.constants.HEADING_WIDTH,
offsetTop: 0
}
};
diff --git a/catapult/tracing/tracing/ui/tracks/container_track.html b/catapult/tracing/tracing/ui/tracks/container_track.html
index 29b847e..13e1a07 100644
--- a/catapult/tracing/tracing/ui/tracks/container_track.html
+++ b/catapult/tracing/tracing/ui/tracks/container_track.html
@@ -35,18 +35,16 @@
get tracks_() {
var tracks = [];
for (var i = 0; i < this.children.length; i++) {
- if (this.children[i].classList.contains('track'))
+ if (this.children[i] instanceof tr.ui.tracks.Track)
tracks.push(this.children[i]);
}
return tracks;
},
drawTrack: function(type) {
- for (var i = 0; i < this.children.length; ++i) {
- if (!(this.children[i] instanceof tr.ui.tracks.Track))
- continue;
- this.children[i].drawTrack(type);
- }
+ this.tracks_.forEach(function(track) {
+ track.drawTrack(type);
+ });
},
/**
diff --git a/catapult/tracing/tracing/ui/tracks/device_track_test.html b/catapult/tracing/tracing/ui/tracks/device_track_test.html
index cba4589..2637cdd 100644
--- a/catapult/tracing/tracing/ui/tracks/device_track_test.html
+++ b/catapult/tracing/tracing/ui/tracks/device_track_test.html
@@ -5,9 +5,9 @@
found in the LICENSE file.
-->
-<link rel='import' href='/tracing/core/constants.html'>
<link rel='import' href='/tracing/model/device.html'>
<link rel='import' href='/tracing/model/model.html'>
+<link rel="import" href="/tracing/ui/base/constants.html">
<link rel='import' href='/tracing/ui/timeline_display_transform.html'>
<link rel='import' href='/tracing/ui/timeline_viewport.html'>
<link rel='import' href='/tracing/ui/tracks/device_track.html'>
@@ -46,7 +46,7 @@
var dt = new tr.ui.TimelineDisplayTransform();
var pixelRatio = window.devicePixelRatio || 1;
var chartPixelWidth =
- (window.innerWidth - tr.c.constants.HEADING_WIDTH) * pixelRatio;
+ (window.innerWidth - tr.ui.b.constants.HEADING_WIDTH) * pixelRatio;
dt.xSetWorldBounds(bounds.min, bounds.max, chartPixelWidth);
viewport.setDisplayTransformImmediately(dt);
};
diff --git a/catapult/tracing/tracing/ui/tracks/drawing_container.html b/catapult/tracing/tracing/ui/tracks/drawing_container.html
index e6650d8..53ee568 100644
--- a/catapult/tracing/tracing/ui/tracks/drawing_container.html
+++ b/catapult/tracing/tracing/ui/tracks/drawing_container.html
@@ -9,6 +9,7 @@
<link rel="import" href="/tracing/base/raf.html">
<link rel="import" href="/tracing/ui/tracks/track.html">
+<link rel="import" href="/tracing/ui/base/constants.html">
<link rel="import" href="/tracing/ui/base/ui.html">
<script>
@@ -38,7 +39,7 @@
this.canvas_ = document.createElement('canvas');
this.canvas_.className = 'drawing-container-canvas';
- this.canvas_.style.left = tr.c.constants.HEADING_WIDTH + 'px';
+ this.canvas_.style.left = tr.ui.b.constants.HEADING_WIDTH + 'px';
this.appendChild(this.canvas_);
this.ctx_ = this.canvas_.getContext('2d');
@@ -119,7 +120,7 @@
getBoundingClientRect();
var innerWidth = firstChildTrackBounds.width -
- tr.c.constants.HEADING_WIDTH;
+ tr.ui.b.constants.HEADING_WIDTH;
var innerHeight = lastChildTrackBounds.bottom - firstChildTrackBounds.top;
var pixelRatio = window.devicePixelRatio || 1;
diff --git a/catapult/tracing/tracing/ui/tracks/memory_dump_track_test_utils.html b/catapult/tracing/tracing/ui/tracks/memory_dump_track_test_utils.html
index bb1b9eb..50a87da 100644
--- a/catapult/tracing/tracing/ui/tracks/memory_dump_track_test_utils.html
+++ b/catapult/tracing/tracing/ui/tracks/memory_dump_track_test_utils.html
@@ -22,6 +22,7 @@
var ProcessMemoryDump = tr.model.ProcessMemoryDump;
var GlobalMemoryDump = tr.model.GlobalMemoryDump;
var MemoryAllocatorDump = tr.model.MemoryAllocatorDump;
+ var MemoryAllocatorDumpLink = tr.model.MemoryAllocatorDumpLink;
var VMRegion = tr.model.VMRegion;
var VMRegionByteStats = tr.model.VMRegionByteStats;
var ScalarAttribute = tr.model.ScalarAttribute;
@@ -43,23 +44,42 @@
});
}
- function createAllocatorDumps(memoryDump, dumpSizes) {
- var allocatorDumps = [];
- tr.b.iterItems(dumpSizes, function(allocatorName, size) {
+ function createAllocatorDumps(memoryDump, dumpData) {
+ // Create the individual allocator dumps.
+ var allocatorDumps = tr.b.mapItems(dumpData, function(allocatorName, data) {
+ var size = data.size;
+ assert.typeOf(size, 'number'); // Sanity check.
var dump = new MemoryAllocatorDump(memoryDump, allocatorName);
dump.addAttribute('size', new ScalarAttribute('bytes', size));
- allocatorDumps.push(dump);
+ return dump;
});
- return allocatorDumps;
+
+ // Add ownership links between them.
+ tr.b.iterItems(dumpData, function(allocatorName, data) {
+ var owns = data.owns;
+ if (owns === undefined)
+ return;
+
+ var ownerDump = allocatorDumps[allocatorName];
+ assert.isDefined(ownerDump); // Sanity check.
+ var ownedDump = allocatorDumps[owns];
+ assert.isDefined(ownedDump); // Sanity check.
+
+ var ownershipLink = new MemoryAllocatorDumpLink(ownerDump, ownedDump);
+ ownerDump.owns = ownershipLink;
+ ownedDump.ownedBy.push(ownershipLink);
+ });
+
+ return tr.b.dictionaryValues(allocatorDumps);
}
function addProcessMemoryDump(globalMemoryDump, process, start,
- opt_pssValues, opt_dumpSizes) {
+ opt_pssValues, opt_dumpData) {
var pmd = new ProcessMemoryDump(globalMemoryDump, process, start);
if (opt_pssValues !== undefined)
pmd.vmRegions = createVMRegions(opt_pssValues);
- if (opt_dumpSizes !== undefined)
- pmd.memoryAllocatorDumps = createAllocatorDumps(pmd, opt_dumpSizes);
+ if (opt_dumpData !== undefined)
+ pmd.memoryAllocatorDumps = createAllocatorDumps(pmd, opt_dumpData);
globalMemoryDump.processMemoryDumps[process.pid] = pmd;
process.memoryDumps.push(pmd);
}
@@ -68,8 +88,8 @@
var maybePssValues = function(pssValues) {
return withVMRegions ? pssValues : undefined;
};
- var maybeDumpSizes = function(dumpSizes) {
- return withAllocatorDumps ? dumpSizes : undefined;
+ var maybeDumpData = function(dumpData) {
+ return withAllocatorDumps ? dumpData : undefined;
};
return tr.c.TestUtils.newModel(function(model) {
// Construct a model with three processes.
@@ -78,27 +98,32 @@
var pc = model.getOrCreateProcess(9);
var gmd1 = new GlobalMemoryDump(model, 0);
+ // Intentionally undefined level of detail.
model.globalMemoryDumps.push(gmd1);
addProcessMemoryDump(gmd1, pa, 0, maybePssValues([111]));
addProcessMemoryDump(gmd1, pb, 0.2, undefined,
- maybeDumpSizes({oilpan: 1024}));
+ maybeDumpData({oilpan: {size: 1024}}));
var gmd2 = new GlobalMemoryDump(model, 5);
+ gmd2.levelOfDetail = 'detailed';
model.globalMemoryDumps.push(gmd2);
addProcessMemoryDump(gmd2, pa, 0);
addProcessMemoryDump(gmd2, pb, 4.99, maybePssValues([100, 50]),
- maybeDumpSizes({v8: 512}));
+ maybeDumpData({v8: {size: 512}}));
addProcessMemoryDump(gmd2, pc, 5.12, undefined,
- maybeDumpSizes({oilpan: 128, v8: 256, tracing: 65536}));
+ maybeDumpData({oilpan: {size: 128, owns: 'v8'},
+ v8: {size: 384, owns: 'tracing'}, tracing: {size: 65920}}));
var gmd3 = new GlobalMemoryDump(model, 15);
+ gmd3.levelOfDetail = 'detailed';
model.globalMemoryDumps.push(gmd3);
addProcessMemoryDump(gmd3, pa, 15.5, maybePssValues([]),
- maybeDumpSizes({v8: 768}));
+ maybeDumpData({v8: {size: 768}}));
addProcessMemoryDump(gmd3, pc, 14.5, maybePssValues([70, 70, 70]),
- maybeDumpSizes({oilpan: 512}));
+ maybeDumpData({oilpan: {size: 512}}));
var gmd4 = new GlobalMemoryDump(model, 18);
+ gmd4.levelOfDetail = 'light';
model.globalMemoryDumps.push(gmd4);
});
}
diff --git a/catapult/tracing/tracing/ui/tracks/memory_dump_track_util.html b/catapult/tracing/tracing/ui/tracks/memory_dump_track_util.html
index 286c27e..cf63fef 100644
--- a/catapult/tracing/tracing/ui/tracks/memory_dump_track_util.html
+++ b/catapult/tracing/tracing/ui/tracks/memory_dump_track_util.html
@@ -5,6 +5,7 @@
found in the LICENSE file.
-->
+<link rel="import" href="/tracing/model/memory_allocator_dump.html">
<link rel="import" href="/tracing/ui/tracks/chart_axis.html">
<link rel="import" href="/tracing/ui/tracks/chart_point.html">
<link rel="import" href="/tracing/ui/tracks/chart_series.html">
@@ -17,9 +18,8 @@
tr.exportTo('tr.ui.tracks', function() {
- // TODO(petrcermak): This constant is defined and/or used in many files. It
- // should be defined once only.
- var ALLOCATOR_SIZE_ATTRIBUTE_NAME = 'size';
+ var DISPLAYED_SIZE_ATTRIBUTE_NAME =
+ tr.model.MemoryAllocatorDump.DISPLAYED_SIZE_ATTRIBUTE_NAME;
/**
* Add numeric values from a source dictionary to the numeric values in
@@ -53,7 +53,7 @@
if (allocatorDump.fullName === 'tracing')
return;
var allocatorSize = allocatorDump.attributes[
- ALLOCATOR_SIZE_ATTRIBUTE_NAME];
+ DISPLAYED_SIZE_ATTRIBUTE_NAME];
if (allocatorSize === undefined)
return;
var allocatorSizeValue = allocatorSize.value;
@@ -132,8 +132,20 @@
* inside).
*/
function buildMemoryLetterDots(memoryDumps) {
- var memoryColorId = tr.ui.b.getColorIdForReservedName('memory_dump');
+ var lightMemoryColorId =
+ tr.ui.b.getColorIdForReservedName('light_memory_dump');
+ var detailedMemoryColorId =
+ tr.ui.b.getColorIdForReservedName('detailed_memory_dump');
return memoryDumps.map(function(memoryDump) {
+ var memoryColorId;
+ switch (memoryDump.levelOfDetail) {
+ case 'detailed':
+ memoryColorId = detailedMemoryColorId;
+ break;
+ case 'light':
+ default:
+ memoryColorId = lightMemoryColorId;
+ }
return new tr.ui.tracks.LetterDot(
memoryDump, 'M', memoryColorId, memoryDump.start);
});
diff --git a/catapult/tracing/tracing/ui/tracks/power_series_track_test.html b/catapult/tracing/tracing/ui/tracks/power_series_track_test.html
index 9d8c0b4..2999736 100644
--- a/catapult/tracing/tracing/ui/tracks/power_series_track_test.html
+++ b/catapult/tracing/tracing/ui/tracks/power_series_track_test.html
@@ -5,10 +5,10 @@
found in the LICENSE file.
-->
-<link rel='import' href='/tracing/core/constants.html'>
<link rel='import' href='/tracing/model/device.html'>
<link rel='import' href='/tracing/model/model.html'>
<link rel='import' href='/tracing/model/power_series.html'>
+<link rel='import' href='/tracing/ui/base/constants.html'>
<link rel='import' href='/tracing/ui/timeline_viewport.html'>
<link rel='import' href='/tracing/ui/tracks/container_to_track_map.html'>
<link rel='import' href='/tracing/ui/tracks/drawing_container.html'>
@@ -46,7 +46,7 @@
var dt = new tr.ui.TimelineDisplayTransform();
var pixelRatio = window.devicePixelRatio || 1;
var chartPixelWidth =
- (window.innerWidth - tr.c.constants.HEADING_WIDTH) * pixelRatio;
+ (window.innerWidth - tr.ui.b.constants.HEADING_WIDTH) * pixelRatio;
dt.xSetWorldBounds(bounds.min, bounds.max, chartPixelWidth);
viewport.setDisplayTransformImmediately(dt);
};
diff --git a/catapult/tracing/tracing/ui/tracks/ruler_track.html b/catapult/tracing/tracing/ui/tracks/ruler_track.html
index 2180f39..30ce44b 100644
--- a/catapult/tracing/tracing/ui/tracks/ruler_track.html
+++ b/catapult/tracing/tracing/ui/tracks/ruler_track.html
@@ -7,7 +7,6 @@
<link rel="stylesheet" href="/tracing/ui/tracks/ruler_track.css">
-<link rel="import" href="/tracing/core/constants.html">
<link rel="import" href="/tracing/ui/base/draw_helpers.html">
<link rel="import" href="/tracing/ui/base/heading.html">
<link rel="import" href="/tracing/ui/base/ui.html">
diff --git a/systrace_trace_viewer.html b/systrace_trace_viewer.html
index fc3e574..83de16d 100644
--- a/systrace_trace_viewer.html
+++ b/systrace_trace_viewer.html
@@ -917,14 +917,23 @@
<tr-ui-b-table id="content"></tr-ui-b-table>
</template>
+</polymer-element><polymer-element extends="tr-ui-a-sub-view" name="tr-ui-a-sampling-panel">
+ <template>
+ <style>
+ :host { display: block; }
+ </style>
+
+ <tr-ui-b-table id="table">
+ </tr-ui-b-table>
+ </template>
+
+
</polymer-element><polymer-element extends="tr-ui-a-sub-view" name="tr-ui-a-multi-sample-sub-view">
<template>
<style>
- :host {
- display: block;
- }
+ :host { display: block; }
</style>
- <div id="content"></div>
+ <tr-ui-a-sampling-panel id="panel"></tr-ui-a-sampling-panel>
</template>
@@ -1144,6 +1153,25 @@
</template>
+</polymer-element><polymer-element name="tr-ui-a-power-sample-table">
+ <template>
+ <style>
+ :host {
+ display: flex;
+ }
+ </style>
+ <tr-ui-b-table id="table"></tr-ui-b-table>
+ </template>
+</polymer-element><polymer-element extends="tr-ui-a-sub-view" name="tr-ui-a-single-power-sample-sub-view">
+ <template>
+ <style>
+ :host { display: block; }
+ </style>
+ <tr-ui-a-power-sample-table id="samplesTable">
+ </tr-ui-a-power-sample-table>
+ </template>
+
+
</polymer-element><style>
* /deep/ .chart-base #title {
font-size: 16pt;
@@ -1180,15 +1208,6 @@
<tr-ui-b-table id="table"></tr-ui-b-table>
</template>
-</polymer-element><polymer-element name="tr-ui-a-power-sample-table">
- <template>
- <style>
- :host {
- display: flex;
- }
- </style>
- <tr-ui-b-table id="table"></tr-ui-b-table>
- </template>
</polymer-element><polymer-element extends="tr-ui-a-sub-view" name="tr-ui-a-multi-power-sample-sub-view">
<template>
<style>
@@ -2067,7 +2086,7 @@
</polymer-element><script>
-// Copyright (c) 2014 The Chromium Authors. All rights reserved.
+// Copyright 2015 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -2364,7 +2383,7 @@
function desaturateColor(c){var value=boundChannel((c.r+c.g+c.b)/3);return{r:value,g:value,b:value};}
function colorToRGBString(c){return'rgb('+c.r+','+c.g+','+c.b+')';}
function colorToRGBAString(c,a){return'rgba('+c.r+','+c.g+','+c.b+','+a+')';}
-return{brightenColor:brightenColor,desaturateColor:desaturateColor,colorToRGBString:colorToRGBString,colorToRGBAString:colorToRGBAString};});'use strict';tr.exportTo('tr.ui.b',function(){var colorToRGBString=tr.ui.b.colorToRGBString;var colorToRGBAString=tr.ui.b.colorToRGBAString;var generalPurposeColors=[{r:138,g:113,b:152},{r:175,g:112,b:133},{r:127,g:135,b:225},{r:93,g:81,b:137},{r:116,g:143,b:119},{r:178,g:214,b:122},{r:87,g:109,b:147},{r:119,g:155,b:95},{r:114,g:180,b:160},{r:132,g:85,b:103},{r:157,g:210,b:150},{r:148,g:94,b:86},{r:164,g:108,b:138},{r:139,g:191,b:150},{r:110,g:99,b:145},{r:80,g:129,b:109},{r:125,g:140,b:149},{r:93,g:124,b:132},{r:140,g:85,b:140},{r:104,g:163,b:162},{r:132,g:141,b:178},{r:131,g:105,b:147},{r:135,g:183,b:98},{r:152,g:134,b:177},{r:141,g:188,b:141},{r:133,g:160,b:210},{r:126,g:186,b:148},{r:112,g:198,b:205},{r:180,g:122,b:195},{r:203,g:144,b:152}];var reservedColorsByName={thread_state_iowait:{r:182,g:125,b:143},thread_state_running:{r:126,g:200,b:148},thread_state_runnable:{r:133,g:160,b:210},thread_state_sleeping:{r:240,g:240,b:240},thread_state_unknown:{r:199,g:155,b:125},memory_dump:{r:0,g:0,b:180},generic_work:{r:125,g:125,b:125},good:{r:0,g:125,b:0},bad:{r:180,g:125,b:0},terrible:{r:180,g:0,b:0},black:{r:0,g:0,b:0},rail_response:{r:67,g:135,b:253},rail_animate:{r:244,g:74,b:63},rail_idle:{r:238,g:142,b:0},rail_load:{r:13,g:168,b:97},used_memory_column:{r:0,g:0,b:255},older_used_memory_column:{r:153,g:204,b:255},tracing_memory_column:{r:153,g:153,b:153},cq_build_running:{r:255,g:255,b:119},cq_build_passed:{r:153,g:238,b:102},cq_build_failed:{r:238,g:136,b:136},cq_build_abandoned:{r:187,g:187,b:187},cq_build_attempt_running:{r:222,g:222,b:75},cq_build_attempt_passed:{r:103,g:218,b:35},cq_build_attempt_failed:{r:197,g:81,b:81}};var numGeneralPurposeColorIds=generalPurposeColors.length;var numReservedColorIds=tr.b.dictionaryLength(reservedColorsByName);var paletteRaw=(function(){var paletteBase=[];paletteBase.push.apply(paletteBase,generalPurposeColors);paletteBase.push.apply(paletteBase,tr.b.dictionaryValues(reservedColorsByName));return paletteBase.concat(paletteBase.map(tr.ui.b.brightenColor),paletteBase.map(tr.ui.b.desaturateColor));})();var palette=paletteRaw.map(colorToRGBString);var highlightIdBoost=paletteRaw.length/3;var desaturateIdBoost=(paletteRaw.length/3)*2;var reservedColorNameToIdMap=(function(){var m={};var i=generalPurposeColors.length;tr.b.iterItems(reservedColorsByName,function(key,value){m[key]=i++;});return m;})();function getStringHash(name){var hash=0;for(var i=0;i<name.length;++i)
+return{brightenColor:brightenColor,desaturateColor:desaturateColor,colorToRGBString:colorToRGBString,colorToRGBAString:colorToRGBAString};});'use strict';tr.exportTo('tr.ui.b',function(){var colorToRGBString=tr.ui.b.colorToRGBString;var colorToRGBAString=tr.ui.b.colorToRGBAString;var generalPurposeColors=[{r:138,g:113,b:152},{r:175,g:112,b:133},{r:127,g:135,b:225},{r:93,g:81,b:137},{r:116,g:143,b:119},{r:178,g:214,b:122},{r:87,g:109,b:147},{r:119,g:155,b:95},{r:114,g:180,b:160},{r:132,g:85,b:103},{r:157,g:210,b:150},{r:148,g:94,b:86},{r:164,g:108,b:138},{r:139,g:191,b:150},{r:110,g:99,b:145},{r:80,g:129,b:109},{r:125,g:140,b:149},{r:93,g:124,b:132},{r:140,g:85,b:140},{r:104,g:163,b:162},{r:132,g:141,b:178},{r:131,g:105,b:147},{r:135,g:183,b:98},{r:152,g:134,b:177},{r:141,g:188,b:141},{r:133,g:160,b:210},{r:126,g:186,b:148},{r:112,g:198,b:205},{r:180,g:122,b:195},{r:203,g:144,b:152}];var reservedColorsByName={thread_state_iowait:{r:182,g:125,b:143},thread_state_running:{r:126,g:200,b:148},thread_state_runnable:{r:133,g:160,b:210},thread_state_sleeping:{r:240,g:240,b:240},thread_state_unknown:{r:199,g:155,b:125},light_memory_dump:{r:0,g:0,b:180},detailed_memory_dump:{r:180,g:0,b:180},generic_work:{r:125,g:125,b:125},good:{r:0,g:125,b:0},bad:{r:180,g:125,b:0},terrible:{r:180,g:0,b:0},black:{r:0,g:0,b:0},rail_response:{r:67,g:135,b:253},rail_animate:{r:244,g:74,b:63},rail_idle:{r:238,g:142,b:0},rail_load:{r:13,g:168,b:97},used_memory_column:{r:0,g:0,b:255},older_used_memory_column:{r:153,g:204,b:255},tracing_memory_column:{r:153,g:153,b:153},cq_build_running:{r:255,g:255,b:119},cq_build_passed:{r:153,g:238,b:102},cq_build_failed:{r:238,g:136,b:136},cq_build_abandoned:{r:187,g:187,b:187},cq_build_attempt_running:{r:222,g:222,b:75},cq_build_attempt_passed:{r:103,g:218,b:35},cq_build_attempt_failed:{r:197,g:81,b:81}};var numGeneralPurposeColorIds=generalPurposeColors.length;var numReservedColorIds=tr.b.dictionaryLength(reservedColorsByName);var paletteRaw=(function(){var paletteBase=[];paletteBase.push.apply(paletteBase,generalPurposeColors);paletteBase.push.apply(paletteBase,tr.b.dictionaryValues(reservedColorsByName));return paletteBase.concat(paletteBase.map(tr.ui.b.brightenColor),paletteBase.map(tr.ui.b.desaturateColor));})();var palette=paletteRaw.map(colorToRGBString);var highlightIdBoost=paletteRaw.length/3;var desaturateIdBoost=(paletteRaw.length/3)*2;var reservedColorNameToIdMap=(function(){var m={};var i=generalPurposeColors.length;tr.b.iterItems(reservedColorsByName,function(key,value){m[key]=i++;});return m;})();function getStringHash(name){var hash=0;for(var i=0;i<name.length;++i)
hash=(hash+37*hash+11*name.charCodeAt(i))%0xFFFFFFFF;return hash;}
function getColorPalette(){return palette;}
function getRawColorPalette(){return paletteRaw;}
@@ -2383,7 +2402,7 @@
if(metadata.multiViewElementName===undefined){throw new Error('Registered events must provide '+'multiViewElementName metadata');}});var eventsByTypeName=undefined;EventRegistry.getEventTypeInfoByTypeName=function(typeName){if(eventsByTypeName===undefined){eventsByTypeName={};EventRegistry.getAllRegisteredTypeInfos().forEach(function(typeInfo){eventsByTypeName[typeInfo.metadata.name]=typeInfo;});}
return eventsByTypeName[typeName];}
EventRegistry.addEventListener('registry-changed',function(){eventsByTypeName=undefined;});function convertCamelCaseToTitleCase(name){var result=name.replace(/[A-Z]/g,' $&');result=result.charAt(0).toUpperCase()+result.slice(1);return result;}
-EventRegistry.getUserFriendlySingularName=function(typeName){var typeInfo=EventRegistry.getEventTypeInfoByTypeName(typeName);var str=typeInfo.metadata.name;return convertCamelCaseToTitleCase(str);};EventRegistry.getUserFriendlyPluralName=function(typeName){var typeInfo=EventRegistry.getEventTypeInfoByTypeName(typeName);var str=typeInfo.metadata.pluralName;return convertCamelCaseToTitleCase(str);};return{EventRegistry:EventRegistry};});'use strict';tr.exportTo('tr.model',function(){var EventRegistry=tr.model.EventRegistry;var RequestSelectionChangeEvent=tr.b.Event.bind(undefined,'requestSelectionChange',true,false);function EventSet(opt_events){this.sunburst_zoom_level=undefined;this.bounds_dirty_=true;this.bounds_=new tr.b.Range();this.length_=0;this.guid_=tr.b.GUID.allocate();this.pushed_guids_={};if(opt_events){if(opt_events instanceof Array){for(var i=0;i<opt_events.length;i++)
+EventRegistry.getUserFriendlySingularName=function(typeName){var typeInfo=EventRegistry.getEventTypeInfoByTypeName(typeName);var str=typeInfo.metadata.name;return convertCamelCaseToTitleCase(str);};EventRegistry.getUserFriendlyPluralName=function(typeName){var typeInfo=EventRegistry.getEventTypeInfoByTypeName(typeName);var str=typeInfo.metadata.pluralName;return convertCamelCaseToTitleCase(str);};return{EventRegistry:EventRegistry};});'use strict';tr.exportTo('tr.model',function(){var EventRegistry=tr.model.EventRegistry;var RequestSelectionChangeEvent=tr.b.Event.bind(undefined,'requestSelectionChange',true,false);function EventSet(opt_events){this.bounds_dirty_=true;this.bounds_=new tr.b.Range();this.length_=0;this.guid_=tr.b.GUID.allocate();this.pushed_guids_={};if(opt_events){if(opt_events instanceof Array){for(var i=0;i<opt_events.length;i++)
this.push(opt_events[i]);}else if(opt_events instanceof EventSet){this.addEventSet(opt_events);}else{this.push(opt_events);}}}
EventSet.prototype={__proto__:Object.prototype,get bounds(){if(this.bounds_dirty_){this.bounds_.reset();for(var i=0;i<this.length_;i++)
this[i].addBoundsToRange(this.bounds_);this.bounds_dirty_=false;}
@@ -2397,8 +2416,7 @@
eventSet.push(this[i]);return eventSet;},intersectionIsEmpty:function(otherEventSet){return!this.some(function(event){return otherEventSet.contains(event);});},equals:function(that){if(this.length!==that.length)
return false;for(var i=0;i<this.length;i++){var event=this[i];if(that.pushed_guids_[event.guid]===undefined)
return false;}
-return true;},getEventsOrganizedByBaseType:function(opt_pruneEmpty){var events={};var allTypeInfos=EventRegistry.getAllRegisteredTypeInfos();allTypeInfos.forEach(function(eventTypeInfo){events[eventTypeInfo.metadata.name]=new EventSet();if(this.sunburst_zoom_level!==undefined)
-events[eventTypeInfo.metadata.name].sunburst_zoom_level=this.sunburst_zoom_level;},this);this.forEach(function(event,i){var maxEventIndex=-1;var maxEventTypeInfo=undefined;allTypeInfos.forEach(function(eventTypeInfo,eventIndex){if(!(event instanceof eventTypeInfo.constructor))
+return true;},getEventsOrganizedByBaseType:function(opt_pruneEmpty){var events={};var allTypeInfos=EventRegistry.getAllRegisteredTypeInfos();allTypeInfos.forEach(function(eventTypeInfo){events[eventTypeInfo.metadata.name]=new EventSet();},this);this.forEach(function(event,i){var maxEventIndex=-1;var maxEventTypeInfo=undefined;allTypeInfos.forEach(function(eventTypeInfo,eventIndex){if(!(event instanceof eventTypeInfo.constructor))
return;if(eventIndex>maxEventIndex){maxEventIndex=eventIndex;maxEventTypeInfo=eventTypeInfo;}});if(maxEventIndex==-1){console.log(event);throw new Error('Unrecognized event type');}
events[maxEventTypeInfo.metadata.name].push(event);});if(opt_pruneEmpty){var prunedEvents={};for(var eventType in events){if(events[eventType].length>0)
prunedEvents[eventType]=events[eventType];}
@@ -2429,7 +2447,7 @@
tr.b.u.TimeStamp.format(this.start);}};tr.model.EventRegistry.register(Alert,{name:'alert',pluralName:'alerts',singleViewElementName:'tr-ui-a-alert-sub-view',multiViewElementName:'tr-ui-a-alert-sub-view'});return{Alert:Alert};});'use strict';tr.exportTo('tr.model',function(){function EventContainer(){this.guid_=tr.b.GUID.allocate();this.important=true;this.bounds_=new tr.b.Range();}
EventContainer.prototype={get guid(){return this.guid_;},get stableId(){throw new Error('Not implemented');},get bounds(){return this.bounds_;},updateBounds:function(){throw new Error('Not implemented');},shiftTimestampsForward:function(amount){throw new Error('Not implemented');},iterateAllEventsInThisContainer:function(eventTypePredicate,callback,opt_this){throw new Error('Not implemented');},iterateAllChildEventContainers:function(callback,opt_this){throw new Error('Not implemented');},iterateAllEvents:function(callback,opt_this){this.iterateAllEventContainers(function(ec){ec.iterateAllEventsInThisContainer(function(eventType){return true;},callback,opt_this);});},iterateAllEventContainers:function(callback,opt_this){function visit(ec){callback.call(opt_this,ec);ec.iterateAllChildEventContainers(visit);}
visit(this);}};return{EventContainer:EventContainer};});'use strict';tr.exportTo('tr.model',function(){var Event=tr.model.Event;var EventRegistry=tr.model.EventRegistry;function PowerSample(series,start,power){Event.call(this);this.series_=series;this.start_=start;this.power_=power;}
-PowerSample.prototype={__proto__:Event.prototype,get series(){return this.series_;},get start(){return this.start_;},set start(value){this.start_=value;},get power(){return this.power_;},set power(value){this.power_=value;},addBoundsToRange:function(range){range.addValue(this.start);}};EventRegistry.register(PowerSample,{name:'powerSample',pluralName:'powerSamples',singleViewElementName:'tr-ui-a-single-event-sub-view',multiViewElementName:'tr-ui-a-multi-power-sample-sub-view'});return{PowerSample:PowerSample};});'use strict';tr.exportTo('tr.model',function(){var PowerSample=tr.model.PowerSample;function PowerSeries(device){tr.model.EventContainer.call(this);this.device_=device;this.samples_=[];}
+PowerSample.prototype={__proto__:Event.prototype,get series(){return this.series_;},get start(){return this.start_;},set start(value){this.start_=value;},get power(){return this.power_;},set power(value){this.power_=value;},addBoundsToRange:function(range){range.addValue(this.start);}};EventRegistry.register(PowerSample,{name:'powerSample',pluralName:'powerSamples',singleViewElementName:'tr-ui-a-single-power-sample-sub-view',multiViewElementName:'tr-ui-a-multi-power-sample-sub-view'});return{PowerSample:PowerSample};});'use strict';tr.exportTo('tr.model',function(){var PowerSample=tr.model.PowerSample;function PowerSeries(device){tr.model.EventContainer.call(this);this.device_=device;this.samples_=[];}
PowerSeries.prototype={__proto__:tr.model.EventContainer.prototype,get device(){return this.device_;},get samples(){return this.samples_;},get stableId(){return this.device_.stableId+'.PowerSeries';},addPowerSample:function(ts,val){var sample=new PowerSample(this,ts,val);this.samples_.push(sample);return sample;},getEnergyConsumed:function(start,end){var measurementRange=tr.b.Range.fromExplicitRange(start,end);var energyConsumed=0;for(var i=0;i<this.samples.length;i++){var sample=this.samples[i];var nextSample=this.samples[i+1];var sampleRange=new tr.b.Range();sampleRange.addValue(sample.start);sampleRange.addValue(nextSample?nextSample.start:Infinity);var timeIntersection=measurementRange.findIntersection(sampleRange);energyConsumed+=timeIntersection.duration/1000*sample.power;}
return energyConsumed;},shiftTimestampsForward:function(amount){for(var i=0;i<this.samples_.length;++i)
this.samples_[i].start+=amount;},updateBounds:function(){this.bounds.reset();if(this.samples_.length===0)
@@ -2462,15 +2480,13 @@
count_less_equal.push(sample_index);}}else{if(samples[0]>0.0){locations.push(0.0);count_less.push(0);count_less_equal.push(0);}
for(var i=0;i<samples.length;i++){locations.push(samples[i]);count_less.push(i);count_less_equal.push(i+1);}
if(samples[-1]<1.0){locations.push(1.0);count_less.push(samples.length);count_less_equal.push(samples.length);}}
-for(var i=0;i<locations.length;i++){for(var j=i+1;j<locations.length;j++){length=locations[j]-locations[i];var count_closed=count_less_equal[j]-count_less[i];var local_discrepancy_closed=Math.abs(count_closed*inv_sample_count-length);var max_local_discrepancy=Math.max(local_discrepancy_closed,max_local_discrepancy);var count_open=count_less[j]-count_less_equal[i];var local_discrepancy_open=Math.abs(count_open*inv_sample_count-length);var max_local_discrepancy=Math.max(local_discrepancy_open,max_local_discrepancy);}}
-return max_local_discrepancy};Statistics.timestampsDiscrepancy=function(timestamps,opt_absolute,opt_location_count){if(timestamps.length===0)
-return 0.0
-if(opt_absolute===undefined)
+for(var i=0;i<locations.length;i++){for(var j=i+1;j<locations.length;j++){var length=locations[j]-locations[i];var count_closed=count_less_equal[j]-count_less[i];var local_discrepancy_closed=Math.abs(count_closed*inv_sample_count-length);var max_local_discrepancy=Math.max(local_discrepancy_closed,max_local_discrepancy);var count_open=count_less[j]-count_less_equal[i];var local_discrepancy_open=Math.abs(count_open*inv_sample_count-length);var max_local_discrepancy=Math.max(local_discrepancy_open,max_local_discrepancy);}}
+return max_local_discrepancy;};Statistics.timestampsDiscrepancy=function(timestamps,opt_absolute,opt_location_count){if(timestamps.length===0)
+return 0.0;if(opt_absolute===undefined)
opt_absolute=true;if(Array.isArray(timestamps[0])){var range_discrepancies=timestamps.map(function(r){return Statistics.timestampsDiscrepancy(r);});return Math.max.apply(null,range_discrepancies);}
var s=Statistics.normalizeSamples(timestamps);var samples=s.normalized_samples;var sample_scale=s.scale;var discrepancy=Statistics.discrepancy(samples,opt_location_count);var inv_sample_count=1.0/samples.length;if(opt_absolute===true){discrepancy/=sample_scale;}else{discrepancy=Statistics.clamp((discrepancy-inv_sample_count)/(1.0-inv_sample_count));}
return discrepancy;};Statistics.durationsDiscrepancy=function(durations,opt_absolute,opt_location_count){if(durations.length===0)
-return 0.0
-var timestamps=durations.reduce(function(prev,curr,index,array){prev.push(prev[prev.length-1]+curr);return prev;},[0]);return Statistics.timestampsDiscrepancy(timestamps,opt_absolute,opt_location_count);}
+return 0.0;var timestamps=durations.reduce(function(prev,curr,index,array){prev.push(prev[prev.length-1]+curr);return prev;},[0]);return Statistics.timestampsDiscrepancy(timestamps,opt_absolute,opt_location_count);}
return{Statistics:Statistics};});'use strict';tr.exportTo('tr.model',function(){var Statistics=tr.b.Statistics;var FRAME_PERF_CLASS={GOOD:'good',BAD:'bad',TERRIBLE:'terrible',NEUTRAL:'generic_work'};function Frame(associatedEvents,threadTimeRanges,opt_args){tr.model.Event.call(this);this.threadTimeRanges=threadTimeRanges;this.associatedEvents=new tr.model.EventSet(associatedEvents);this.args=opt_args||{};this.title='Frame';this.start=Statistics.min(threadTimeRanges,function(x){return x.start;});this.end=Statistics.max(threadTimeRanges,function(x){return x.end;});this.totalDuration=Statistics.sum(threadTimeRanges,function(x){return x.end-x.start;});this.perfClass=FRAME_PERF_CLASS.NEUTRAL;};Frame.prototype={__proto__:tr.model.Event.prototype,set perfClass(perfClass){this.colorId=tr.ui.b.getColorIdForReservedName(perfClass);this.perfClass_=perfClass;},get perfClass(){return this.perfClass_;},shiftTimestampsForward:function(amount){this.start+=amount;this.end+=amount;for(var i=0;i<this.threadTimeRanges.length;i++){this.threadTimeRanges[i].start+=amount;this.threadTimeRanges[i].end+=amount;}},addBoundsToRange:function(range){range.addValue(this.start);range.addValue(this.end);}};tr.model.EventRegistry.register(Frame,{name:'frame',pluralName:'frames',singleViewElementName:'tr-ui-a-single-frame-sub-view',multiViewElementName:'tr-ui-a-multi-frame-sub-view'});return{Frame:Frame,FRAME_PERF_CLASS:FRAME_PERF_CLASS};});'use strict';tr.exportTo('tr.model',function(){function Attribute(units){this.units=units;this.infos=[];}
Attribute.fromDictIfPossible=function(dict,opt_model){var typeInfo=Attribute.findTypeInfoMatching(function(typeInfo){return typeInfo.metadata.type===dict.type;});if(typeInfo===undefined){if(opt_model){opt_model.importWarning({type:'attribute_parse_error',message:'Unknown attribute type \''+dict.type+'\'.'});}
return UnknownAttribute.fromDict(dict,opt_model);}
@@ -2491,9 +2507,9 @@
ScalarAttribute.prototype.__proto__=Attribute.prototype;Attribute.register(ScalarAttribute,{type:'scalar'});function StringAttribute(units,value){Attribute.call(this,units);this.value=value;}
StringAttribute.fromDict=function(dict){return new StringAttribute(dict.units,dict.value);};Attribute.register(StringAttribute,{type:'string'});function UnknownAttribute(units,opt_value){Attribute.call(this,units,opt_value);this.value=opt_value;}
UnknownAttribute.fromDict=function(dict){return new UnknownAttribute(dict.units);};UnknownAttribute.prototype.__proto__=Attribute.prototype;function AttributeInfo(type,message){this.type=type;this.message=message;}
-var AttributeInfoType={INFORMATION:0,WARNING:1,LINK:2,MEMORY_OWNER:3,MEMORY_OWNED:4};return{Attribute:Attribute,ScalarAttribute:ScalarAttribute,StringAttribute:StringAttribute,UnknownAttribute:UnknownAttribute,AttributeInfo:AttributeInfo,AttributeInfoType:AttributeInfoType};});'use strict';tr.exportTo('tr.model',function(){function ContainerMemoryDump(start){tr.model.TimedEvent.call(this,start);this.memoryAllocatorDumps_=undefined;this.memoryAllocatorDumpsByFullName_=undefined;};ContainerMemoryDump.prototype={__proto__:tr.model.TimedEvent.prototype,shiftTimestampsForward:function(amount){this.start+=amount;},get memoryAllocatorDumps(){return this.memoryAllocatorDumps_;},set memoryAllocatorDumps(memoryAllocatorDumps){this.memoryAllocatorDumps_=memoryAllocatorDumps;this.memoryAllocatorDumpsByFullName_=undefined;},getMemoryAllocatorDumpByFullName:function(fullName){if(this.memoryAllocatorDumps_===undefined)
+var AttributeInfoType={INFORMATION:0,WARNING:1,LINK:2,MEMORY_OWNER:3,MEMORY_OWNED:4,OVERALL_VALUE:5,RECENT_VALUE:6};return{Attribute:Attribute,ScalarAttribute:ScalarAttribute,StringAttribute:StringAttribute,UnknownAttribute:UnknownAttribute,AttributeInfo:AttributeInfo,AttributeInfoType:AttributeInfoType};});'use strict';tr.exportTo('tr.model',function(){function ContainerMemoryDump(start){tr.model.TimedEvent.call(this,start);this.levelOfDetail=undefined;this.memoryAllocatorDumps_=undefined;this.memoryAllocatorDumpsByFullName_=undefined;};ContainerMemoryDump.prototype={__proto__:tr.model.TimedEvent.prototype,shiftTimestampsForward:function(amount){this.start+=amount;},get memoryAllocatorDumps(){return this.memoryAllocatorDumps_;},set memoryAllocatorDumps(memoryAllocatorDumps){this.memoryAllocatorDumps_=memoryAllocatorDumps;this.memoryAllocatorDumpsByFullName_=undefined;},getMemoryAllocatorDumpByFullName:function(fullName){if(this.memoryAllocatorDumps_===undefined)
return undefined;if(this.memoryAllocatorDumpsByFullName_===undefined){var index={};function addDumpsToIndex(dumps){dumps.forEach(function(dump){index[dump.fullName]=dump;addDumpsToIndex(dump.children);});};addDumpsToIndex(this.memoryAllocatorDumps_);this.memoryAllocatorDumpsByFullName_=index;}
-return this.memoryAllocatorDumpsByFullName_[fullName];}};return{ContainerMemoryDump:ContainerMemoryDump};});'use strict';tr.exportTo('tr.model',function(){function MemoryAllocatorDump(containerMemoryDump,fullName,opt_guid){this.fullName=fullName;this.parent=undefined;this.children=[];this.attributes={};this.containerMemoryDump=containerMemoryDump;this.owns=undefined;this.ownedBy=[];this.retains=[];this.retainedBy=[];this.guid=opt_guid;};MemoryAllocatorDump.prototype={get name(){return this.fullName.substring(this.fullName.lastIndexOf('/')+1);},get quantifiedName(){return'\''+this.fullName+'\' in '+
+return this.memoryAllocatorDumpsByFullName_[fullName];}};return{ContainerMemoryDump:ContainerMemoryDump};});'use strict';tr.exportTo('tr.model',function(){function MemoryAllocatorDump(containerMemoryDump,fullName,opt_guid){this.fullName=fullName;this.parent=undefined;this.children=[];this.attributes={};this.containerMemoryDump=containerMemoryDump;this.owns=undefined;this.ownedBy=[];this.retains=[];this.retainedBy=[];this.guid=opt_guid;};MemoryAllocatorDump.SIZE_ATTRIBUTE_NAME='size';MemoryAllocatorDump.EFFECTIVE_SIZE_ATTRIBUTE_NAME='effective_size';MemoryAllocatorDump.DISPLAYED_SIZE_ATTRIBUTE_NAME=MemoryAllocatorDump.EFFECTIVE_SIZE_ATTRIBUTE_NAME;MemoryAllocatorDump.prototype={get name(){return this.fullName.substring(this.fullName.lastIndexOf('/')+1);},get quantifiedName(){return'\''+this.fullName+'\' in '+
this.containerMemoryDump.containerName;},isDescendantOf:function(otherDump){var dump=this;while(dump!==undefined){if(dump===otherDump)
return true;dump=dump.parent;}
return false;},addAttribute:function(name,value){if(name in this.attributes)
@@ -2502,7 +2518,7 @@
return undefined;}
return sizeAttr;}};function MemoryAllocatorDumpLink(source,target,opt_importance){this.source=source;this.target=target;this.importance=opt_importance;}
return{MemoryAllocatorDump:MemoryAllocatorDump,MemoryAllocatorDumpLink:MemoryAllocatorDumpLink};});'use strict';tr.exportTo('tr.model',function(){function GlobalMemoryDump(model,start){tr.model.ContainerMemoryDump.call(this,start);this.model=model;this.processMemoryDumps={};}
-var SIZE_ATTRIBUTE_NAME='size';var EFFECTIVE_SIZE_ATTRIBUTE_NAME='effective_size';function getSize(dump){var attr=dump.attributes[SIZE_ATTRIBUTE_NAME];if(attr===undefined)
+var SIZE_ATTRIBUTE_NAME=tr.model.MemoryAllocatorDump.SIZE_ATTRIBUTE_NAME;var EFFECTIVE_SIZE_ATTRIBUTE_NAME=tr.model.MemoryAllocatorDump.EFFECTIVE_SIZE_ATTRIBUTE_NAME;function getSize(dump){var attr=dump.attributes[SIZE_ATTRIBUTE_NAME];if(attr===undefined)
return 0;return attr.value;}
function hasSize(dump){return dump.attributes[SIZE_ATTRIBUTE_NAME]!==undefined;}
function optional(value,defaultValue){if(value===undefined)
@@ -2856,21 +2872,23 @@
this.flowEventsById_[fe.id].push(fe);}},this);}
ModelIndices.prototype={addEventWithId:function(id,event){if(!this.flowEventsById_.hasOwnProperty(id)){this.flowEventsById_[id]=new Array();}
this.flowEventsById_[id].push(event);},getFlowEventsWithId:function(id){if(!this.flowEventsById_.hasOwnProperty(id))
-return[];return this.flowEventsById_[id];}};return{ModelIndices:ModelIndices};});'use strict';tr.exportTo('tr.model',function(){var DISCOUNTED_ALLOCATOR_NAMES=['winheap','malloc'];function ProcessMemoryDump(globalMemoryDump,process,start){tr.model.ContainerMemoryDump.call(this,start);this.process=process;this.globalMemoryDump=globalMemoryDump;this.totalResidentBytes=undefined;this.vmRegions_=undefined;this.tracingMemoryDiscounted_=false;};ProcessMemoryDump.prototype={__proto__:tr.model.ContainerMemoryDump.prototype,get userFriendlyName(){return'Process memory dump at '+
+return[];return this.flowEventsById_[id];}};return{ModelIndices:ModelIndices};});'use strict';tr.exportTo('tr.model',function(){var DISCOUNTED_ALLOCATOR_NAMES=['winheap','malloc'];var SIZE_ATTRIBUTE_NAME=tr.model.MemoryAllocatorDump.SIZE_ATTRIBUTE_NAME;var EFFECTIVE_SIZE_ATTRIBUTE_NAME=tr.model.MemoryAllocatorDump.EFFECTIVE_SIZE_ATTRIBUTE_NAME;function ProcessMemoryDump(globalMemoryDump,process,start){tr.model.ContainerMemoryDump.call(this,start);this.process=process;this.globalMemoryDump=globalMemoryDump;this.totals=undefined;this.vmRegions_=undefined;this.tracingMemoryDiscounted_=false;};ProcessMemoryDump.prototype={__proto__:tr.model.ContainerMemoryDump.prototype,get userFriendlyName(){return'Process memory dump at '+
tr.b.u.TimeStamp.format(this.start);},get containerName(){return this.process.userFriendlyName;},get vmRegions(){throw new Error('VM regions must be accessed through the mostRecentVmRegions field');},set vmRegions(vmRegions){this.vmRegions_=vmRegions;},get hasOwnVmRegions(){return this.vmRegions_!==undefined;},getMostRecentTotalVmRegionStat:function(statName){if(this.mostRecentVmRegions===undefined)
return undefined;var total=0;this.mostRecentVmRegions.forEach(function(vmRegion){var statValue=vmRegion.byteStats[statName];if(statValue===undefined)
return;total+=statValue;});return total;},discountTracingOverhead:function(opt_model){if(this.tracingMemoryDiscounted_)
return;this.tracingMemoryDiscounted_=true;var tracingDump=this.getMemoryAllocatorDumpByFullName('tracing');if(tracingDump===undefined)
return;function getDiscountedSize(sizeAttrName){var sizeAttr=tracingDump.getValidSizeAttributeOrUndefined(sizeAttrName,opt_model);if(sizeAttr===undefined)
return 0;return sizeAttr.value;}
-var discountedSize=getDiscountedSize('size');var discountedEffectiveSize=getDiscountedSize('effective_size');var discountedResidentSize=getDiscountedSize('resident_size');if(discountedResidentSize>0){if(this.totalResidentBytes!==undefined)
-this.totalResidentBytes-=discountedResidentSize;if(this.vmRegions_!==undefined){this.vmRegions_.push(VMRegion.fromDict({mappedFile:'[discounted tracing overhead]',byteStats:{privateDirtyResident:-discountedResidentSize,proportionalResident:-discountedResidentSize}}));}}
-if(discountedSize>0||discountedEffectiveSize>0){function discountSizeAndEffectiveSize(dump){var dumpSizeAttr=dump.getValidSizeAttributeOrUndefined('size',opt_model);if(dumpSizeAttr!==undefined)
-dumpSizeAttr.value-=discountedSize;var dumpEffectiveSizeAttr=dump.getValidSizeAttributeOrUndefined('effective_size',opt_model);if(dumpEffectiveSizeAttr!==undefined)
+var discountedSize=getDiscountedSize(SIZE_ATTRIBUTE_NAME);var discountedEffectiveSize=getDiscountedSize(EFFECTIVE_SIZE_ATTRIBUTE_NAME);var discountedResidentSize=getDiscountedSize('resident_size');if(discountedResidentSize>0){if(this.totals!==undefined){if(this.totals.residentBytes!==undefined)
+this.totals.residentBytes-=discountedResidentSize;if(this.totals.peakResidentBytes!==undefined)
+this.totals.peakResidentBytes-=discountedResidentSize;}
+if(this.vmRegions_!==undefined){this.vmRegions_.push(VMRegion.fromDict({mappedFile:'[discounted tracing overhead]',byteStats:{privateDirtyResident:-discountedResidentSize,proportionalResident:-discountedResidentSize}}));}}
+if(discountedSize>0||discountedEffectiveSize>0){function discountSizeAndEffectiveSize(dump){var dumpSizeAttr=dump.getValidSizeAttributeOrUndefined(SIZE_ATTRIBUTE_NAME,opt_model);if(dumpSizeAttr!==undefined)
+dumpSizeAttr.value-=discountedSize;var dumpEffectiveSizeAttr=dump.getValidSizeAttributeOrUndefined(EFFECTIVE_SIZE_ATTRIBUTE_NAME,opt_model);if(dumpEffectiveSizeAttr!==undefined)
dumpEffectiveSizeAttr.value-=discountedEffectiveSize;}
var hasDiscountedFromAllocatorDumps=DISCOUNTED_ALLOCATOR_NAMES.some(function(allocatorName){var allocatorDump=this.getMemoryAllocatorDumpByFullName(allocatorName);if(allocatorDump===undefined)
return false;discountSizeAndEffectiveSize(allocatorDump);var allocatedObjectsDumpName=allocatorName+'/allocated_objects';var allocatedObjectsDump=this.getMemoryAllocatorDumpByFullName(allocatedObjectsDumpName);if(allocatedObjectsDump===undefined)
-return true;discountSizeAndEffectiveSize(allocatedObjectsDump);var discountDumpName=allocatedObjectsDumpName+'/discounted_tracing_overhead';var discountDump=new tr.model.MemoryAllocatorDump(this,discountDumpName);discountDump.parent=allocatedObjectsDump;discountDump.addAttribute('size',new tr.model.ScalarAttribute('bytes',-discountedSize));discountDump.addAttribute('effective_size',new tr.model.ScalarAttribute('bytes',-discountedEffectiveSize));allocatedObjectsDump.children.push(discountDump);return true;},this);if(hasDiscountedFromAllocatorDumps)
+return true;discountSizeAndEffectiveSize(allocatedObjectsDump);var discountDumpName=allocatedObjectsDumpName+'/discounted_tracing_overhead';var discountDump=new tr.model.MemoryAllocatorDump(this,discountDumpName);discountDump.parent=allocatedObjectsDump;discountDump.addAttribute(SIZE_ATTRIBUTE_NAME,new tr.model.ScalarAttribute('bytes',-discountedSize));discountDump.addAttribute(EFFECTIVE_SIZE_ATTRIBUTE_NAME,new tr.model.ScalarAttribute('bytes',-discountedEffectiveSize));allocatedObjectsDump.children.push(discountDump);return true;},this);if(hasDiscountedFromAllocatorDumps)
this.memoryAllocatorDumps=this.memoryAllocatorDumps;}}};ProcessMemoryDump.hookUpMostRecentVmRegionsLinks=function(processDumps){var mostRecentVmRegions=undefined;processDumps.forEach(function(processDump){if(processDump.vmRegions_!==undefined)
mostRecentVmRegions=processDump.vmRegions_;processDump.mostRecentVmRegions=mostRecentVmRegions;});};function VMRegion(startAddress,sizeInBytes,protectionFlags,mappedFile,byteStats){this.startAddress=startAddress;this.sizeInBytes=sizeInBytes;this.protectionFlags=protectionFlags;this.mappedFile=mappedFile;this.byteStats=byteStats;};VMRegion.PROTECTION_FLAG_READ=4;VMRegion.PROTECTION_FLAG_WRITE=2;VMRegion.PROTECTION_FLAG_EXECUTE=1;VMRegion.prototype={get protectionFlagsToString(){if(this.protectionFlags===undefined)
return undefined;return((this.protectionFlags&VMRegion.PROTECTION_FLAG_READ?'r':'-')+
@@ -2879,7 +2897,7 @@
VMRegionByteStats.fromDict=function(dict){return new VMRegionByteStats(dict.privateCleanResident,dict.privateDirtyResident,dict.sharedCleanResident,dict.sharedDirtyResident,dict.proportionalResident,dict.swapped);}
tr.model.EventRegistry.register(ProcessMemoryDump,{name:'processMemoryDump',pluralName:'processMemoryDumps',singleViewElementName:'tr-ui-a-single-process-memory-dump-sub-view',multiViewElementName:'tr-ui-a-multi-process-memory-dump-sub-view'});return{ProcessMemoryDump:ProcessMemoryDump,VMRegion:VMRegion,VMRegionByteStats:VMRegionByteStats};});'use strict';tr.exportTo('tr.model',function(){var ProcessBase=tr.model.ProcessBase;var ProcessInstantEvent=tr.model.ProcessInstantEvent;var Frame=tr.model.Frame;var ProcessMemoryDump=tr.model.ProcessMemoryDump;function Process(model,pid){if(model===undefined)
throw new Error('model must be provided');if(pid===undefined)
-throw new Error('pid must be provided');tr.model.ProcessBase.call(this,model);this.pid=pid;this.name=undefined;this.labels=[];this.instantEvents=[];this.memoryDumps=[];this.frames=[];};Process.compare=function(x,y){var tmp=tr.model.ProcessBase.compare(x,y);if(tmp)
+throw new Error('pid must be provided');tr.model.ProcessBase.call(this,model);this.pid=pid;this.name=undefined;this.labels=[];this.instantEvents=[];this.memoryDumps=[];this.frames=[];this.activities=[];};Process.compare=function(x,y){var tmp=tr.model.ProcessBase.compare(x,y);if(tmp)
return tmp;tmp=tr.b.comparePossiblyUndefinedValues(x.name,y.name,function(x,y){return x.localeCompare(y);});if(tmp)
return tmp;tmp=tr.b.compareArrays(x.labels,y.labels,function(x,y){return x.localeCompare(y);});if(tmp)
return tmp;return x.pid-y.pid;};Process.prototype={__proto__:tr.model.ProcessBase.prototype,get stableId(){return this.pid;},compareTo:function(that){return Process.compare(this,that);},iterateAllEventsInThisContainer:function(eventTypePredicate,callback,opt_this){ProcessBase.prototype.iterateAllEventsInThisContainer.call(this,eventTypePredicate,callback,opt_this);if(eventTypePredicate.call(opt_this,ProcessInstantEvent))
@@ -2896,9 +2914,11 @@
return'processes.'+this.name;return'processes.'+this.name+'.'+this.labels.join('.');},shiftTimestampsForward:function(amount){for(var id in this.instantEvents)
this.instantEvents[id].start+=amount;for(var i=0;i<this.frames.length;i++)
this.frames[i].shiftTimestampsForward(amount);for(var i=0;i<this.memoryDumps.length;i++)
-this.memoryDumps[i].shiftTimestampsForward(amount);tr.model.ProcessBase.prototype.shiftTimestampsForward.apply(this,arguments);},updateBounds:function(){tr.model.ProcessBase.prototype.updateBounds.apply(this);for(var i=0;i<this.frames.length;i++)
+this.memoryDumps[i].shiftTimestampsForward(amount);for(var i=0;i<this.activities.length;i++)
+this.activities[i].shiftTimestampsForward(amount);tr.model.ProcessBase.prototype.shiftTimestampsForward.apply(this,arguments);},updateBounds:function(){tr.model.ProcessBase.prototype.updateBounds.apply(this);for(var i=0;i<this.frames.length;i++)
this.frames[i].addBoundsToRange(this.bounds);for(var i=0;i<this.memoryDumps.length;i++)
-this.memoryDumps[i].addBoundsToRange(this.bounds);},sortMemoryDumps:function(){this.memoryDumps.sort(function(x,y){return x.start-y.start;});tr.model.ProcessMemoryDump.hookUpMostRecentVmRegionsLinks(this.memoryDumps);}};return{Process:Process};});'use strict';tr.exportTo('tr.model',function(){function Sample(cpu,thread,title,start,leafStackFrame,opt_weight,opt_args){tr.model.TimedEvent.call(this,start);this.title=title;this.cpu=cpu;this.thread=thread;this.leafStackFrame=leafStackFrame;this.weight=opt_weight;this.args=opt_args||{};}
+this.memoryDumps[i].addBoundsToRange(this.bounds);for(var i=0;i<this.activities.length;i++)
+this.activities[i].addBoundsToRange(this.bounds);},sortMemoryDumps:function(){this.memoryDumps.sort(function(x,y){return x.start-y.start;});tr.model.ProcessMemoryDump.hookUpMostRecentVmRegionsLinks(this.memoryDumps);}};return{Process:Process};});'use strict';tr.exportTo('tr.model',function(){function Sample(cpu,thread,title,start,leafStackFrame,opt_weight,opt_args){tr.model.TimedEvent.call(this,start);this.title=title;this.cpu=cpu;this.thread=thread;this.leafStackFrame=leafStackFrame;this.weight=opt_weight;this.args=opt_args||{};}
Sample.prototype={__proto__:tr.model.TimedEvent.prototype,get colorId(){return this.leafStackFrame.colorId;},get stackTrace(){return this.leafStackFrame.stackTrace;},getUserFriendlyStackTrace:function(){return this.leafStackFrame.getUserFriendlyStackTrace();},get userFriendlyName(){return'Sample at '+tr.b.u.TimeStamp.format(this.start);}};tr.model.EventRegistry.register(Sample,{name:'sample',pluralName:'samples',singleViewElementName:'tr-ui-a-single-sample-sub-view',multiViewElementName:'tr-ui-a-multi-sample-sub-view'});return{Sample:Sample};});'use strict';tr.exportTo('tr.model',function(){function StackFrame(parentFrame,id,category,title,colorId,opt_sourceInfo){if(id===undefined)
throw new Error('id must be given');this.parentFrame_=parentFrame;this.id=id;this.category=category||'';this.title_=title;this.colorId=colorId;this.children=[];this.sourceInfo_=opt_sourceInfo;if(this.parentFrame_)
this.parentFrame_.addChild(this);}
@@ -3019,11 +3039,28 @@
importers.sort(function(x,y){return x.importPriority-y.importPriority;});},this);lastTask=lastTask.after(function(task){importers.forEach(function(importer,index){task.subTask(function(){progressMeter.update('Importing '+(index+1)+' of '+importers.length);importer.importEvents();},this);},this);},this);if(this.importOptions_.customizeModelCallback){lastTask=lastTask.after(function(task){this.importOptions_.customizeModelCallback(this.model_);},this);}
lastTask=lastTask.after(function(task){importers.forEach(function(importer,index){progressMeter.update('Importing sample data '+(index+1)+'/'+importers.length);importer.importSampleData();},this);},this);lastTask=lastTask.after(function(){progressMeter.update('Autoclosing open slices...');this.model_.autoCloseOpenSlices();this.model_.createSubSlices();},this);lastTask=lastTask.after(function(task){importers.forEach(function(importer,index){progressMeter.update('Finalizing import '+(index+1)+'/'+importers.length);importer.finalizeImport();},this);},this);lastTask=lastTask.after(function(){progressMeter.update('Initializing objects (step 1/2)...');this.model_.preInitializeObjects();},this);if(this.importOptions_.pruneEmptyContainers){lastTask=lastTask.after(function(){progressMeter.update('Pruning empty containers...');this.model_.pruneEmptyContainers();},this);}
lastTask=lastTask.after(function(){progressMeter.update('Merging kernel with userland...');this.model_.mergeKernelWithUserland();},this);var auditors=[];lastTask=lastTask.after(function(){progressMeter.update('Adding arbitrary data to model...');auditors=this.importOptions_.auditorConstructors.map(function(auditorConstructor){return new auditorConstructor(this.model_);},this);auditors.forEach(function(auditor){auditor.runAnnotate();});},this);lastTask=lastTask.after(function(){progressMeter.update('Computing final world bounds...');this.model_.computeWorldBounds(this.importOptions_.shiftWorldToZero);},this);lastTask=lastTask.after(function(){progressMeter.update('Building flow event map...');this.model_.buildFlowEventIntervalTree();},this);lastTask=lastTask.after(function(){progressMeter.update('Joining object refs...');for(var i=0;i<importers.length;i++)
-importers[i].joinRefs();},this);lastTask=lastTask.after(function(){progressMeter.update('Cleaning up undeleted objects...');this.model_.cleanupUndeletedObjects();},this);lastTask=lastTask.after(function(){progressMeter.update('Sorting memory dumps...');this.model_.sortMemoryDumps();},this);lastTask=lastTask.after(function(){progressMeter.update('Calculating memory dump graph attributes...');this.model_.calculateMemoryGraphAttributes();},this);lastTask=lastTask.after(function(){progressMeter.update('Initializing objects (step 2/2)...');this.model_.initializeObjects();},this);lastTask=lastTask.after(function(){progressMeter.update('Building flow event indices...');this.model_.buildEventIndices();},this);lastTask=lastTask.after(function(){progressMeter.update('Running auditors...');auditors.forEach(function(auditor){auditor.runAudit();});},this);lastTask=lastTask.after(function(){progressMeter.update('Updating interaction records...');this.model_.sortInteractionRecords();},this);lastTask=lastTask.after(function(){progressMeter.update('Updating alerts...');this.model_.sortAlerts();},this);lastTask=lastTask.after(function(){progressMeter.update('Update bounds...');this.model_.updateBounds();},this);lastTask.after(function(){this.importing_=false;},this);return importTask;},createImporter_:function(eventData){var importerConstructor=tr.importer.Importer.findImporterFor(eventData);if(!importerConstructor)
-throw new Error('Could create an importer for the provided eventData.');return new importerConstructor(this.model_,eventData);},hasEventDataDecoder_:function(importers){if(importers.length===0)
+importers[i].joinRefs();},this);lastTask=lastTask.after(function(){progressMeter.update('Cleaning up undeleted objects...');this.model_.cleanupUndeletedObjects();},this);lastTask=lastTask.after(function(){progressMeter.update('Sorting memory dumps...');this.model_.sortMemoryDumps();},this);lastTask=lastTask.after(function(){progressMeter.update('Calculating memory dump graph attributes...');this.model_.calculateMemoryGraphAttributes();},this);lastTask=lastTask.after(function(){progressMeter.update('Initializing objects (step 2/2)...');this.model_.initializeObjects();},this);lastTask=lastTask.after(function(){progressMeter.update('Building flow event indices...');this.model_.buildEventIndices();},this);lastTask=lastTask.after(function(){progressMeter.update('Running auditors...');auditors.forEach(function(auditor){auditor.runAudit();});},this);lastTask=lastTask.after(function(){progressMeter.update('Updating interaction records...');this.model_.sortInteractionRecords();},this);lastTask=lastTask.after(function(){progressMeter.update('Updating alerts...');this.model_.sortAlerts();},this);lastTask=lastTask.after(function(){progressMeter.update('Update bounds...');this.model_.updateBounds();},this);lastTask.after(function(){this.importing_=false;},this);return importTask;},createImporter_:function(eventData){var importerConstructor=tr.importer.Importer.findImporterFor(eventData);if(!importerConstructor){throw new Error('Couldn\'t create an importer for the provided '+'eventData.');}
+return new importerConstructor(this.model_,eventData);},hasEventDataDecoder_:function(importers){if(importers.length===0)
return false;for(var i=0;i<importers.length;++i){if(!importers[i].isTraceDataContainer())
return true;}
-return false;}};return{ImportOptions:ImportOptions,Import:Import};});'use strict';tr.exportTo('tr.e.importer.battor',function(){function BattorImporter(model,events){this.importPriority=3;this.sampleRate_=undefined;this.model_=model;this.events_=events;}
+return false;}};return{ImportOptions:ImportOptions,Import:Import};});'use strict';tr.exportTo('tr.importer',function(){function SimpleLineReader(text){this.lines_=text.split('\n');this.curLine_=0;this.savedLines_=undefined;}
+SimpleLineReader.prototype={advanceToLineMatching:function(regex){for(;this.curLine_<this.lines_.length;this.curLine_++){var line=this.lines_[this.curLine_];if(this.savedLines_!==undefined)
+this.savedLines_.push(line);if(regex.test(line))
+return true;}
+return false;},get curLineNumber(){return this.curLine_;},beginSavingLines:function(){this.savedLines_=[];},endSavingLinesAndGetResult:function(){var tmp=this.savedLines_;this.savedLines_=undefined;return tmp;}};return{SimpleLineReader:SimpleLineReader};});'use strict';tr.exportTo('tr.model',function(){function Activity(name,category,range,args){tr.model.TimedEvent.call(this,range.min);this.title=name;this.category=category;this.colorId=tr.ui.b.getColorIdForGeneralPurposeString(name);this.duration=range.duration;this.args=args;this.name=name;};Activity.prototype={__proto__:tr.model.TimedEvent.prototype,shiftTimestampsForward:function(amount){this.start+=amount;},addBoundsToRange:function(range){range.addValue(this.start);range.addValue(this.end);}};return{Activity:Activity};});'use strict';tr.exportTo('tr.e.importer.android',function(){var Importer=tr.importer.Importer;var ACTIVITY_STATE={NONE:'none',CREATED:'created',STARTED:'started',RESUMED:'resumed',PAUSED:'paused',STOPPED:'stopped',DESTROYED:'destroyed'};var activityMap={};function EventLogImporter(model,events){this.model_=model;this.events_=events;this.importPriority=3;}
+var eventLogActivityRE=new RegExp('(\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}.\\d+)'+'\\s+(\\d+)\\s+(\\d+)\\s+([A-Z])\\s*'+'(am_\\w+)\\s*:(.*)');var amCreateRE=new RegExp('\s*\\[.*,.*,.*,(.*),.*,.*,.*,.*\\]');var amFocusedRE=new RegExp('\s*\\[\\d+,(.*)\\]');var amProcStartRE=new RegExp('\s*\\[\\d+,\\d+,\\d+,.*,activity,(.*)\\]');var amOnResumeRE=new RegExp('\s*\\[\\d+,(.*)\\]');var amOnPauseRE=new RegExp('\s*\\[\\d+,(.*)\\]');var amLaunchTimeRE=new RegExp('\s*\\[\\d+,\\d+,(.*),(\\d+),(\\d+)');var amDestroyRE=new RegExp('\s*\\[\\d+,\\d+,\\d+,(.*)\\]');EventLogImporter.canImport=function(events){if(!(typeof(events)==='string'||events instanceof String))
+return false;return eventLogActivityRE.test(events);};EventLogImporter.prototype={__proto__:Importer.prototype,get model(){return this.model_;},getFullActivityName:function(component){var componentSplit=component.split('/');if(componentSplit[1].startsWith('.'))
+return componentSplit[0]+componentSplit[1];return componentSplit[1];},getProcName:function(component){var componentSplit=component.split('/');return componentSplit[0];},findOrCreateActivity:function(activityName){if(activityName in activityMap)
+return activityMap[activityName];var activity={state:ACTIVITY_STATE.NONE,name:activityName};activityMap[activityName]=activity;return activity;},deleteActivity:function(activityName){delete activityMap[activityName];},handleCreateActivity:function(ts,activityName){var activity=this.findOrCreateActivity(activityName);activity.state=ACTIVITY_STATE.CREATED;activity.createdTs=ts;},handleFocusActivity:function(ts,procName,activityName){var activity=this.findOrCreateActivity(activityName);activity.lastFocusedTs=ts;},handleProcStartForActivity:function(ts,activityName){var activity=this.findOrCreateActivity(activityName);activity.procStartTs=ts;},handleOnResumeCalled:function(ts,pid,activityName){var activity=this.findOrCreateActivity(activityName);activity.state=ACTIVITY_STATE.RESUMED;activity.lastResumeTs=ts;activity.pid=pid;},handleOnPauseCalled:function(ts,activityName){var activity=this.findOrCreateActivity(activityName);activity.state=ACTIVITY_STATE.PAUSED;activity.lastPauseTs=ts;if(ts>this.model_.bounds.min&&ts<this.model_.bounds.max)
+this.addActivityToProcess(activity);},handleLaunchTime:function(ts,activityName,launchTime){var activity=this.findOrCreateActivity(activityName);activity.launchTime=launchTime;},handleDestroyActivity:function(ts,activityName){this.deleteActivity(activityName);},addActivityToProcess:function(activity){if(activity.pid===undefined)
+return;var process=this.model_.getOrCreateProcess(activity.pid);var range=tr.b.Range.fromExplicitRange(Math.max(this.model_.bounds.min,activity.lastResumeTs),activity.lastPauseTs);var newActivity=new tr.model.Activity(activity.name,'Android Activity',range,{created:activity.createdTs,procstart:activity.procStartTs,lastfocus:activity.lastFocusedTs});process.activities.push(newActivity);},parseAmLine_:function(line){var match=eventLogActivityRE.exec(line);if(!match)
+return;var first_realtime_ts=this.model_.bounds.min-
+this.model_.realtime_to_monotonic_offset_ms;var year=new Date(first_realtime_ts).getFullYear();var ts=match[1].substring(0,5)+'-'+year+' '+
+match[1].substring(5,match[1].length);var monotonic_ts=Date.parse(ts)+
+this.model_.realtime_to_monotonic_offset_ms;var pid=match[2];var action=match[5];var data=match[6];if(action==='am_create_activity'){match=amCreateRE.exec(data);if(match&&match.length>=2){this.handleCreateActivity(monotonic_ts,this.getFullActivityName(match[1]));}}else if(action==='am_focused_activity'){match=amFocusedRE.exec(data);if(match&&match.length>=2){this.handleFocusActivity(monotonic_ts,this.getProcName(match[1]),this.getFullActivityName(match[1]));}}else if(action==='am_proc_start'){match=amProcStartRE.exec(data);if(match&&match.length>=2){this.handleProcStartForActivity(monotonic_ts,this.getFullActivityName(match[1]));}}else if(action==='am_on_resume_called'){match=amOnResumeRE.exec(data);if(match&&match.length>=2)
+this.handleOnResumeCalled(monotonic_ts,pid,match[1]);}else if(action==='am_on_paused_called'){match=amOnPauseRE.exec(data);if(match&&match.length>=2)
+this.handleOnPauseCalled(monotonic_ts,match[1]);}else if(action==='am_activity_launch_time'){match=amLaunchTimeRE.exec(data);this.handleLaunchTime(monotonic_ts,this.getFullActivityName(match[1]),match[2]);}else if(action==='am_destroy_activity'){match=amDestroyRE.exec(data);if(match&&match.length==2){this.handleDestroyActivity(monotonic_ts,this.getFullActivityName(match[1]));}}},importEvents:function(isSecondaryImport){if(isNaN(this.model_.realtime_to_monotonic_offset_ms)){this.model_.importWarning({type:'eveng_log_clock_sync',message:'Need a trace_event_clock_sync to map realtime to import.'});return;}
+this.model_.updateBounds();var lines=this.events_.split('\n');lines.forEach(this.parseAmLine_,this);for(var activityName in activityMap){var activity=activityMap[activityName];if(activity.state==ACTIVITY_STATE.RESUMED){activity.lastPauseTs=this.model_.bounds.max;this.addActivityToProcess(activity);}}}};Importer.register(EventLogImporter);return{EventLogImporter:EventLogImporter};});'use strict';tr.exportTo('tr.e.importer.battor',function(){function BattorImporter(model,events){this.importPriority=3;this.sampleRate_=undefined;this.model_=model;this.events_=events;}
var TestExports={};var battorDataLineRE=/^(\d+\.\d+)\s+(\d+\.\d+)\s+(\d+\.\d+)$/;var battorHeaderLineRE=/^# BattOr/;var sampleRateLineRE=/^# sample_rate=(\d+)Hz/;BattorImporter.canImport=function(events){if(!(typeof(events)==='string'||events instanceof String))
return false;return battorHeaderLineRE.test(events);};BattorImporter.prototype={__proto__:tr.importer.Importer.prototype,get model(){return this.model_;},importEvents:function(isSecondaryImport){if(this.model_.device.powerSeries){this.model_.importWarning({type:'import_error',message:'Power counter exists, can not import BattOr power trace.'});return;}
var name='power';var series=new tr.model.PowerSeries(this.model_.device);this.importPowerSamples(series);var syncMarks=this.model_.getClockSyncRecordsNamed('battor');if(syncMarks.length<1){this.model_.importWarning({type:'clock_sync',message:'Cannot import BattOr power trace without a sync signal.'});return;}
@@ -3258,16 +3295,12 @@
var slice=slices.beginSlice(null,name,ts,{});return true;},traceKernelFuncReturnEvent:function(eventName,cpuNumber,pid,ts,eventBase){if(eventBase.tgid===undefined){return false;}
var tgid=parseInt(eventBase.tgid);var thread=this.model_.getOrCreateProcess(tgid).getOrCreateThread(pid);thread.name=eventBase.threadName;var slices=thread.kernelSliceGroup;if(!slices.isTimestampValidForBeginOrEnd(ts)){this.model_.importWarning({type:'parse_error',message:'Timestamps are moving backward.'});return false;}
if(slices.openSliceCount>0){slices.endSlice(ts);}
-return true;}};LinuxPerfParser.register(KernelFuncParser);return{KernelFuncParser:KernelFuncParser};});'use strict';tr.exportTo('tr.importer',function(){function SimpleLineReader(text){this.lines_=text.split('\n');this.curLine_=0;this.savedLines_=undefined;}
-SimpleLineReader.prototype={advanceToLineMatching:function(regex){for(;this.curLine_<this.lines_.length;this.curLine_++){var line=this.lines_[this.curLine_];if(this.savedLines_!==undefined)
-this.savedLines_.push(line);if(regex.test(line))
-return true;}
-return false;},get curLineNumber(){return this.curLine_;},beginSavingLines:function(){this.savedLines_=[];},endSavingLinesAndGetResult:function(){var tmp=this.savedLines_;this.savedLines_=undefined;return tmp;}};return{SimpleLineReader:SimpleLineReader};});'use strict';tr.exportTo('tr.e.importer.linux_perf',function(){var ClockSyncRecord=tr.ClockSyncRecord;function LinuxPerfImporter(model,events){this.importPriority=2;this.model_=model;this.events_=events;this.newlyAddedClockSyncRecords_=[];this.wakeups_=[];this.kernelThreadStates_={};this.buildMapFromLinuxPidsToThreads();this.lines_=[];this.pseudoThreadCounter=1;this.parsers_=[];this.eventHandlers_={};}
+return true;}};LinuxPerfParser.register(KernelFuncParser);return{KernelFuncParser:KernelFuncParser};});'use strict';tr.exportTo('tr.e.importer.linux_perf',function(){var ClockSyncRecord=tr.ClockSyncRecord;function LinuxPerfImporter(model,events){this.importPriority=2;this.model_=model;this.events_=events;this.newlyAddedClockSyncRecords_=[];this.wakeups_=[];this.kernelThreadStates_={};this.buildMapFromLinuxPidsToThreads();this.lines_=[];this.pseudoThreadCounter=1;this.parsers_=[];this.eventHandlers_={};}
var TestExports={};var lineREWithTGID=new RegExp('^\\s*(.+)-(\\d+)\\s+\\(\\s*(\\d+|-+)\\)\\s\\[(\\d+)\\]'+'\\s+[dX.][Nnp.][Hhs.][0-9a-f.]'+'\\s+(\\d+\\.\\d+):\\s+(\\S+):\\s(.*)$');var lineParserWithTGID=function(line){var groups=lineREWithTGID.exec(line);if(!groups){return groups;}
var tgid=groups[3];if(tgid[0]==='-')
tgid=undefined;return{threadName:groups[1],pid:groups[2],tgid:tgid,cpuNumber:groups[4],timestamp:groups[5],eventName:groups[6],details:groups[7]};};TestExports.lineParserWithTGID=lineParserWithTGID;var lineREWithIRQInfo=new RegExp('^\\s*(.+)-(\\d+)\\s+\\[(\\d+)\\]'+'\\s+[dX.][Nnp.][Hhs.][0-9a-f.]'+'\\s+(\\d+\\.\\d+):\\s+(\\S+):\\s(.*)$');var lineParserWithIRQInfo=function(line){var groups=lineREWithIRQInfo.exec(line);if(!groups){return groups;}
return{threadName:groups[1],pid:groups[2],cpuNumber:groups[3],timestamp:groups[4],eventName:groups[5],details:groups[6]};};TestExports.lineParserWithIRQInfo=lineParserWithIRQInfo;var lineREWithLegacyFmt=/^\s*(.+)-(\d+)\s+\[(\d+)\]\s*(\d+\.\d+):\s+(\S+):\s(.*)$/;var lineParserWithLegacyFmt=function(line){var groups=lineREWithLegacyFmt.exec(line);if(!groups){return groups;}
-return{threadName:groups[1],pid:groups[2],cpuNumber:groups[3],timestamp:groups[4],eventName:groups[5],details:groups[6]};};TestExports.lineParserWithLegacyFmt=lineParserWithLegacyFmt;var traceEventClockSyncRE=/trace_event_clock_sync: parent_ts=(\d+\.?\d*)/;TestExports.traceEventClockSyncRE=traceEventClockSyncRE;var genericClockSyncRE=/trace_event_clock_sync: name=(\w+)/;var pseudoKernelPID=0;function autoDetectLineParser(line){if(line[0]=='{')
+return{threadName:groups[1],pid:groups[2],cpuNumber:groups[3],timestamp:groups[4],eventName:groups[5],details:groups[6]};};TestExports.lineParserWithLegacyFmt=lineParserWithLegacyFmt;var traceEventClockSyncRE=/trace_event_clock_sync: parent_ts=(\d+\.?\d*)/;TestExports.traceEventClockSyncRE=traceEventClockSyncRE;var realTimeClockSyncRE=/trace_event_clock_sync: realtime_ts=(\d+)/;var genericClockSyncRE=/trace_event_clock_sync: name=(\w+)/;var pseudoKernelPID=0;function autoDetectLineParser(line){if(line[0]=='{')
return false;if(lineREWithTGID.test(line))
return lineParserWithTGID;if(lineREWithIRQInfo.test(line))
return lineParserWithIRQInfo;if(lineREWithLegacyFmt.test(line))
@@ -3323,7 +3356,8 @@
var writeEventName=eventName+':'+eventBase.subEventName;var handler=this.eventHandlers_[writeEventName];if(!handler){this.model_.importWarning({type:'parse_error',message:'Unknown trace_marking_write event '+writeEventName});return true;}
return handler(writeEventName,cpuNumber,pid,ts,eventBase,threadName);},importClockSyncRecords:function(){this.forEachLine(function(text,eventBase,cpuNumber,pid,ts){var eventName=eventBase.eventName;if(eventName!=='tracing_mark_write'&&eventName!=='0')
return;if(traceEventClockSyncRE.exec(eventBase.details))
-this.traceClockSyncEvent(eventName,cpuNumber,pid,ts,eventBase);if(genericClockSyncRE.exec(eventBase.details))
+this.traceClockSyncEvent(eventName,cpuNumber,pid,ts,eventBase);if(realTimeClockSyncRE.exec(eventBase.details)){var match=realTimeClockSyncRE.exec(eventBase.details);this.model_.realtime_to_monotonic_offset_ms=ts-match[1];}
+if(genericClockSyncRE.exec(eventBase.details))
this.traceClockSyncEvent(eventName,cpuNumber,pid,ts,eventBase);}.bind(this));},addClockSyncRecord:function(csr){this.newlyAddedClockSyncRecords_.push(csr);this.model_.clockSyncRecords.push(csr);},shiftNewlyAddedClockSyncRecords:function(timeShift){this.newlyAddedClockSyncRecords_.forEach(function(csr){csr.ts+=timeShift;});},importCpuData:function(timeShift){this.forEachLine(function(text,eventBase,cpuNumber,pid,ts){var eventName=eventBase.eventName;var handler=this.eventHandlers_[eventName];if(!handler){this.model_.importWarning({type:'parse_error',message:'Unknown event '+eventName+' ('+text+')'});return;}
ts+=timeShift;if(!handler(eventName,cpuNumber,pid,ts,eventBase)){this.model_.importWarning({type:'parse_error',message:'Malformed '+eventName+' event ('+text+')'});}}.bind(this));},parseLines:function(){var lines=[];var extractResult=LinuxPerfImporter._extractEventsFromSystraceHTML(this.events_,true);if(!extractResult.ok)
extractResult=LinuxPerfImporter._extractEventsFromSystraceMultiHTML(this.events_,true);var lines=extractResult.ok?extractResult.lines:this.events_.split('\n');var lineParser=null;for(var lineNumber=0;lineNumber<lines.length;++lineNumber){var line=lines[lineNumber].trim();if(line.length==0||/^#/.test(line))
@@ -3347,7 +3381,7 @@
continue;var other=inRanges[otherIndex];if(other.min>range.max){emptyRanges.push(tr.b.Range.fromExplicitRange(range.max,other.min));return;}
if(other.max>range.max){return;}}
if(opt_totalRange&&(range.max<opt_totalRange.max)){emptyRanges.push(tr.b.Range.fromExplicitRange(range.max,opt_totalRange.max));}});return emptyRanges;}
-return{convertEventsToRanges:convertEventsToRanges,findEmptyRangesBetweenRanges:findEmptyRangesBetweenRanges,mergeRanges:mergeRanges};});'use strict';tr.exportTo('tr.e.audits',function(){var Frame=tr.model.Frame;var Statistics=tr.b.Statistics;var UI_THREAD_DRAW_NAMES={'performTraversals':true,'Choreographer#doFrame':true};var RENDER_THREAD_DRAW_NAME='DrawFrame';var RENDER_THREAD_INDEP_DRAW_NAME='doFrame';var THREAD_SYNC_NAME='syncFrameState';function getSlicesForThreadTimeRanges(threadTimeRanges){var ret=[];threadTimeRanges.forEach(function(threadTimeRange){var slices=[];threadTimeRange.thread.sliceGroup.iterSlicesInTimeRange(function(slice){slices.push(slice);},threadTimeRange.start,threadTimeRange.end);ret.push.apply(ret,slices);});return ret;}
+return{convertEventsToRanges:convertEventsToRanges,findEmptyRangesBetweenRanges:findEmptyRangesBetweenRanges,mergeRanges:mergeRanges};});'use strict';tr.exportTo('tr.e.audits',function(){var Frame=tr.model.Frame;var Statistics=tr.b.Statistics;var UI_DRAW_TYPE={NONE:'none',LEGACY:'legacy',MARSHMALLOW:'marshmallow'};var UI_THREAD_DRAW_NAMES={'performTraversals':UI_DRAW_TYPE.LEGACY,'Choreographer#doFrame':UI_DRAW_TYPE.MARSHMALLOW};var RENDER_THREAD_DRAW_NAME='DrawFrame';var RENDER_THREAD_INDEP_DRAW_NAME='doFrame';var THREAD_SYNC_NAME='syncFrameState';function getSlicesForThreadTimeRanges(threadTimeRanges){var ret=[];threadTimeRanges.forEach(function(threadTimeRange){var slices=[];threadTimeRange.thread.sliceGroup.iterSlicesInTimeRange(function(slice){slices.push(slice);},threadTimeRange.start,threadTimeRange.end);ret.push.apply(ret,slices);});return ret;}
function makeFrame(threadTimeRanges,surfaceFlinger){var args={};if(surfaceFlinger&&surfaceFlinger.hasVsyncs){var start=Statistics.min(threadTimeRanges,function(threadTimeRanges){return threadTimeRanges.start;});args['deadline']=surfaceFlinger.getFrameDeadline(start);args['frameKickoff']=surfaceFlinger.getFrameKickoff(start);}
var events=getSlicesForThreadTimeRanges(threadTimeRanges);return new Frame(events,threadTimeRanges,args);}
function findOverlappingDrawFrame(renderThread,time){if(!renderThread)
@@ -3360,14 +3394,16 @@
function getFrameStartTime(traversalStart,preTraversalWorkRanges){var preTraversalWorkRange=tr.b.findClosestIntervalInSortedIntervals(preTraversalWorkRanges,function(range){return range.start},function(range){return range.end},traversalStart,3);if(preTraversalWorkRange)
return preTraversalWorkRange.start;return traversalStart;}
function getUiThreadDrivenFrames(app){if(!app.uiThread)
-return[];var preTraversalWorkRanges=getPreTraversalWorkRanges(app.uiThread);var frames=[];app.uiThread.sliceGroup.slices.forEach(function(slice){if(!(slice.title in UI_THREAD_DRAW_NAMES)){return;}
+return[];var preTraversalWorkRanges=[];if(app.uiDrawType==UI_DRAW_TYPE.LEGACY)
+preTraversalWorkRanges=getPreTraversalWorkRanges(app.uiThread);var frames=[];app.uiThread.sliceGroup.slices.forEach(function(slice){if(!(slice.title in UI_THREAD_DRAW_NAMES)){return;}
var threadTimeRanges=[];var uiThreadTimeRange={thread:app.uiThread,start:getFrameStartTime(slice.start,preTraversalWorkRanges),end:slice.end};threadTimeRanges.push(uiThreadTimeRange);var rtDrawSlice=findOverlappingDrawFrame(app.renderThread,slice.end);if(rtDrawSlice){var rtSyncSlice=rtDrawSlice.findDescendentSlice(THREAD_SYNC_NAME);if(rtSyncSlice){uiThreadTimeRange.end=Math.min(uiThreadTimeRange.end,rtSyncSlice.start);}
threadTimeRanges.push({thread:app.renderThread,start:rtDrawSlice.start,end:rtDrawSlice.end});}
frames.push(makeFrame(threadTimeRanges,app.surfaceFlinger));});return frames;}
function getRenderThreadDrivenFrames(app){if(!app.renderThread)
return[];var frames=[];app.renderThread.sliceGroup.getSlicesOfName(RENDER_THREAD_INDEP_DRAW_NAME).forEach(function(slice){var threadTimeRanges=[{thread:app.renderThread,start:slice.start,end:slice.end}];frames.push(makeFrame(threadTimeRanges,app.surfaceFlinger));});return frames;}
-function hasUiDraw(uiThread){var slices=uiThread.sliceGroup.slices;for(var i=0;i<slices.length;i++){if(slices[i].title in UI_THREAD_DRAW_NAMES){return uiThread;}}
-return undefined;}
+function getUiDrawType(uiThread){if(!uiThread)
+return UI_DRAW_TYPE.NONE;var slices=uiThread.sliceGroup.slices;for(var i=0;i<slices.length;i++){if(slices[i].title in UI_THREAD_DRAW_NAMES){return UI_THREAD_DRAW_NAMES[slices[i].title];}}
+return UI_DRAW_TYPE.NONE;}
function getInputSamples(process){var samples=undefined;for(var counterName in process.counters){if(/^android\.aq\:pending/.test(counterName)&&process.counters[counterName].numSeries==1){samples=process.counters[counterName].series[0].samples;break;}}
if(!samples)
return[];var inputSamples=[];var lastValue=0;samples.forEach(function(sample){if(sample.value>lastValue){inputSamples.push(sample);}
@@ -3375,8 +3411,8 @@
function getAnimationAsyncSlices(uiThread){if(!uiThread)
return[];var slices=[];uiThread.asyncSliceGroup.iterateAllEvents(function(slice){if(/^animator\:/.test(slice.title))
slices.push(slice);});return slices;}
-function AndroidApp(process,uiThread,renderThread,surfaceFlinger){this.process=process;this.uiThread=uiThread;this.renderThread=renderThread;this.surfaceFlinger=surfaceFlinger;this.frames_=undefined;this.inputs_=undefined;};AndroidApp.createForProcessIfPossible=function(process,surfaceFlinger){var uiThread=process.getThread(process.pid);if(uiThread&&!hasUiDraw(uiThread)){uiThread=undefined;}
-var renderThreads=process.findAllThreadsNamed('RenderThread');var renderThread=renderThreads.length==1?renderThreads[0]:undefined;if(uiThread||renderThread){return new AndroidApp(process,uiThread,renderThread,surfaceFlinger);}}
+function AndroidApp(process,uiThread,renderThread,surfaceFlinger,uiDrawType){this.process=process;this.uiThread=uiThread;this.renderThread=renderThread;this.surfaceFlinger=surfaceFlinger;this.uiDrawType=uiDrawType;this.frames_=undefined;this.inputs_=undefined;};AndroidApp.createForProcessIfPossible=function(process,surfaceFlinger){var uiThread=process.getThread(process.pid);var uiDrawType=getUiDrawType(uiThread);if(uiDrawType==UI_DRAW_TYPE.NONE){uiThread=undefined;}
+var renderThreads=process.findAllThreadsNamed('RenderThread');var renderThread=renderThreads.length==1?renderThreads[0]:undefined;if(uiThread||renderThread){return new AndroidApp(process,uiThread,renderThread,surfaceFlinger,uiDrawType);}}
AndroidApp.prototype={getFrames:function(){if(!this.frames_){var uiFrames=getUiThreadDrivenFrames(this);var rtFrames=getRenderThreadDrivenFrames(this);this.frames_=uiFrames.concat(rtFrames);this.frames_.sort(function(a,b){a.end-b.end});}
return this.frames_;},getInputSamples:function(){if(!this.inputs_){this.inputs_=getInputSamples(this.process);}
return this.inputs_;},getAnimationAsyncSlices:function(){if(!this.animations_){this.animations_=getAnimationAsyncSlices(this.uiThread);}
@@ -3551,7 +3587,8 @@
return;if(this.target_===undefined){this.activeAnimation_.didStopEarly(frameBeginTime,this.target_,false);return;}
var oldTargetState=this.target_.cloneAnimationState();var done=this.activeAnimation_.tick(frameBeginTime,this.target_);if(done)
this.activeAnimation_=undefined;if(this.activeAnimation_){this.tickScheduled_=true;tr.b.requestAnimationFrame(this.tickActiveAnimation_,this);}
-if(oldTargetState){var e=new tr.b.Event('didtick');e.oldTargetState=oldTargetState;this.dispatchEvent(e,false,false);}}};return{AnimationController:AnimationController};});'use strict';tr.exportTo('tr.ui.b',function(){function createSpan(opt_dictionary){var spanEl=document.createElement('span');if(opt_dictionary){if(opt_dictionary.className)
+if(oldTargetState){var e=new tr.b.Event('didtick');e.oldTargetState=oldTargetState;this.dispatchEvent(e,false,false);}}};return{AnimationController:AnimationController};});'use strict';tr.exportTo('tr.ui.b',function(){function createSpan(opt_dictionary){var ownerDocument=document;if(opt_dictionary&&opt_dictionary.ownerDocument)
+ownerDocument=opt_dictionary.ownerDocument;var spanEl=ownerDocument.createElement('span');if(opt_dictionary){if(opt_dictionary.className)
spanEl.className=opt_dictionary.className;if(opt_dictionary.textContent)
spanEl.textContent=opt_dictionary.textContent;if(opt_dictionary.tooltip)
spanEl.title=opt_dictionary.tooltip;if(opt_dictionary.parent)
@@ -4063,7 +4100,11 @@
throw new Error('Only supports object instances');this.textContent='';this.currentSelection_=selection;var snapshot=selection[0];var typeInfo=tr.ui.analysis.ObjectSnapshotView.getTypeInfo(snapshot.objectInstance.category,snapshot.objectInstance.typeName);if(typeInfo){var customView=new typeInfo.constructor();this.appendChild(customView);customView.modelEvent=snapshot;}else{this.appendGenericAnalysis_(snapshot);}},appendGenericAnalysis_:function(snapshot){var instance=snapshot.objectInstance;this.textContent='';var titleEl=document.createElement('div');titleEl.classList.add('title');titleEl.appendChild(document.createTextNode('Snapshot of '));this.appendChild(titleEl);var instanceLinkEl=document.createElement('tr-ui-a-analysis-link');instanceLinkEl.selection=new tr.model.EventSet(instance);titleEl.appendChild(instanceLinkEl);titleEl.appendChild(document.createTextNode(' @ '));titleEl.appendChild(tr.ui.units.createTimeStampSpan(snapshot.ts,{ownerDocument:this.ownerDocument}));var tableEl=document.createElement('table');this.appendChild(tableEl);var rowEl=document.createElement('tr');tableEl.appendChild(rowEl);var labelEl=document.createElement('td');labelEl.textContent='args:';rowEl.appendChild(labelEl);var argsEl=document.createElement('td');argsEl.id='args';rowEl.appendChild(argsEl);var objectViewEl=document.createElement('tr-ui-a-generic-object-view');objectViewEl.object=snapshot.args;argsEl.appendChild(objectViewEl);}});'use strict';Polymer('tr-ui-a-multi-object-sub-view',{created:function(){this.currentSelection_=undefined;},ready:function(){this.$.content.showHeader=false;},get selection(){return this.currentSelection_;},set selection(selection){this.currentSelection_=selection;var objectEvents=tr.b.asArray(selection).sort(tr.b.Range.compareByMinTimes);var timeSpanConfig={ownerDocument:this.ownerDocument};var table=this.$.content;table.tableColumns=[{title:'First',value:function(event){if(event instanceof tr.model.ObjectSnapshot)
return tr.ui.units.createTimeStampSpan(event.ts,timeSpanConfig);var spanEl=document.createElement('span');spanEl.appendChild(tr.ui.units.createTimeStampSpan(event.creationTs,timeSpanConfig));spanEl.appendChild(tr.ui.b.createSpan({textContent:'-',marginLeft:'4px',marginRight:'4px'}));if(event.deletionTs!=Number.MAX_VALUE){spanEl.appendChild(tr.ui.units.createTimeStampSpan(event.deletionTs,timeSpanConfig));}
return spanEl;},width:'200px'},{title:'Second',value:function(event){var linkEl=document.createElement('tr-ui-a-analysis-link');linkEl.setSelectionAndContent(function(){return new tr.model.EventSet(event);},event.userFriendlyName);return linkEl;},width:'100%'}];table.tableRows=objectEvents;table.rebuild();}});'use strict';Polymer('tr-ui-a-single-sample-sub-view',{created:function(){this.currentSelection_=undefined;},ready:function(){this.$.content.tableColumns=[{title:'FirstColumn',value:function(row){return row.title;},width:'250px'},{title:'SecondColumn',value:function(row){return row.value;},width:'100%'}];this.$.content.showHeader=false;},get selection(){return this.currentSelection_;},set selection(selection){this.currentSelection_=selection;if(this.currentSelection_===undefined){this.$.content.tableRows=[];return;}
-var sample=this.currentSelection_[0];var table=this.$.content;var rows=[];rows.push({title:'Title',value:sample.title});rows.push({title:'Sample time',value:tr.ui.units.createTimeStampSpan(sample.start,{ownerDocument:this.ownerDocument})});var sfEl=document.createElement('tr-ui-a-stack-frame');sfEl.stackFrame=sample.leafStackFrame;rows.push({title:'Stack trace',value:sfEl});table.tableRows=rows;table.rebuild();}});'use strict';Polymer('tr-ui-a-multi-sample-sub-view',{created:function(){this.currentSelection_=undefined;},get requiresTallView(){return true;},set selection(selection){this.$.content.textContent='';this.currentSelection_=selection;if(tr.isDefined('tr.ui.e.analysis.SamplingSummaryPanel')){var panel=new tr.ui.e.analysis.SamplingSummaryPanel();this.$.content.appendChild(panel);panel.selection=selection;}else{this.$.content.textContent='SamplingSummaryPanel not installed. :(';}},get selection(){return this.currentSelection_;}});'use strict';Polymer('tr-ui-a-single-interaction-record-sub-view',{created:function(){this.currentSelection_=undefined;},get selection(){return this.currentSelection_;},set selection(selection){this.textContent='';var realView=document.createElement('tr-ui-a-single-event-sub-view');this.appendChild(realView);realView.setSelectionWithoutErrorChecks(selection);this.currentSelection_=selection;},get relatedEventsToHighlight(){if(!this.currentSelection_)
+var sample=this.currentSelection_[0];var table=this.$.content;var rows=[];rows.push({title:'Title',value:sample.title});rows.push({title:'Sample time',value:tr.ui.units.createTimeStampSpan(sample.start,{ownerDocument:this.ownerDocument})});var sfEl=document.createElement('tr-ui-a-stack-frame');sfEl.stackFrame=sample.leafStackFrame;rows.push({title:'Stack trace',value:sfEl});table.tableRows=rows;table.rebuild();}});'use strict';(function(){var SamplingTreeNode=function(frame){this.parent=undefined;this.children=[];this.childFrameMap={};this.frame=frame;this.accumulatedSamplesCount=0;};SamplingTreeNode.prototype={getOrCreateChild:function(frame){if(this.childFrameMap[frame.title]!==undefined)
+return this.childFrameMap[frame.title];var node=new SamplingTreeNode(frame);node.parent=this;this.childFrameMap[frame.title]=node;this.children.push(node);return node;},get subRows(){return this.children;},get samplesCount(){return this.accumulatedSamplesCount;},get name(){return this.frame.title;},get category(){return this.frame!==undefined?this.frame.category:'root';}};Polymer('tr-ui-a-sampling-panel',{ready:function(){this.selection_=undefined;},get selection(){return this.selection_;},set selection(selection){this.selection_=selection;this.samplingData_=this.createSamplingSummary_(selection);this.updateContents_();},createSamplingSummary_:function(selection){var root=new SamplingTreeNode();var samples=selection.getEventsOrganizedByBaseType().sample;function addSample(sample){var stack=sample.stackTrace;stack.reverse();var currentNode=root;for(var i=0;i<stack.length;i++){var frame=stack[i];currentNode.accumulatedSamplesCount++;currentNode=currentNode.getOrCreateChild(frame);}
+currentNode.accumulatedSamplesCount++;}
+for(var i=0;i<samples.length;i++){addSample(samples[i]);}
+return root;},updateContents_:function(){var columns=[{title:'Percent',value:function(row){var percent=row.samplesCount/this.samplingData_.samplesCount;var span=document.createElement('tr-ui-u-scalar-span');span.value=(percent*100).toFixed(2);span.percentage=percent;span.unit=tr.b.u.Units.unitlessNumber;return span;}.bind(this),width:'60px',cmp:function(a,b){return a.samplesCount-b.samplesCount;}},{title:'Samples',value:function(row){return row.samplesCount;},width:'60px',cmp:function(a,b){return a.samplesCount-b.samplesCount;}},{title:'Symbol',value:function(row){return row.name;},width:'250px',cmp:function(a,b){return a.name.toString().localeCompare(b.name.toString());},showExpandButtons:true}];this.$.table.tableColumns=columns;this.$.table.sortColumnIndex=1;this.$.table.sortDescending=true;this.$.table.tableRows=this.samplingData_.subRows;this.$.table.rebuild();}});})();'use strict';Polymer('tr-ui-a-multi-sample-sub-view',{set selection(selection){this.$.panel.selection=selection;},get selection(){return this.$.panel.selection;}});'use strict';Polymer('tr-ui-a-single-interaction-record-sub-view',{created:function(){this.currentSelection_=undefined;},get selection(){return this.currentSelection_;},set selection(selection){this.textContent='';var realView=document.createElement('tr-ui-a-single-event-sub-view');this.appendChild(realView);realView.setSelectionWithoutErrorChecks(selection);this.currentSelection_=selection;},get relatedEventsToHighlight(){if(!this.currentSelection_)
return undefined;return this.currentSelection_[0].associatedEvents;}});'use strict';Polymer('tr-ui-a-multi-interaction-record-sub-view',{created:function(){this.currentSelection_=undefined;},set selection(selection){this.currentSelection_=selection;this.textContent='';var realView=document.createElement('tr-ui-a-multi-event-sub-view');this.appendChild(realView);realView.setSelectionWithoutErrorChecks(selection);this.currentSelection_=selection;},get selection(){return this.currentSelection_;},get relatedEventsToHighlight(){if(!this.currentSelection_)
return undefined;var selection=new tr.model.EventSet();this.currentSelection_.forEach(function(ir){ir.associatedEvents.forEach(function(event){selection.push(event);});});return selection;}});'use strict';Polymer('tr-ui-a-alert-sub-view',{ready:function(){this.currentSelection_=undefined;this.$.table.tableColumns=[{title:'Label',value:function(row){return row.name;},width:'150px'},{title:'Value',width:'100%',value:function(row){return row.value;}}];this.$.table.showHeader=false;},get selection(){return this.currentSelection_;},set selection(selection){this.currentSelection_=selection;this.updateContents_();},getRowsForSingleAlert_:function(alert){var rows=[];for(var argName in alert.args){var argView=document.createElement('tr-ui-a-generic-object-view');argView.object=alert.args[argName];rows.push({name:argName,value:argView});}
if(alert.associatedEvents.length){alert.associatedEvents.forEach(function(event,i){var linkEl=document.createElement('tr-ui-a-analysis-link');linkEl.setSelectionAndContent(function(){return event;},event.title);var valueString='';if(event instanceof tr.model.TimedEvent)
@@ -4084,7 +4125,7 @@
row.subRows.forEach(gatherTraits);};rows.forEach(gatherTraits);var titleBuilder=opt_titleBuilder||tr.b.identity;var columns=[];tr.b.iterItems(columnTraits,function(columnName,columnTraits){var cellGetter=fieldGetter(cellKey,columnName);var title=titleBuilder(columnName);columns.push(MemoryColumn.fromAttributeTraits(columnName,title,columnTraits,cellGetter));});return columns;};MemoryColumn.fromAttributeTraits=function(name,title,traits,cellGetter){var constructor;if(traits.constructor===tr.model.ScalarAttribute)
constructor=ScalarMemoryColumn;else
constructor=MemoryColumn;return new constructor(name,title,traits.units,cellGetter);};MemoryColumn.spaceEqually=function(columns){var columnWidth=(100/columns.length).toFixed(3)+'%';columns.forEach(function(column){column.width=columnWidth;});};MemoryColumn.sortByImportance=function(columns,importanceRules){var positions=columns.map(function(column,srcIndex){return{importance:column.getImportance(importanceRules),column:column};});positions.sort(function(a,b){if(a.importance===b.importance)
-return a.column.name.localeCompare(b.column.name);return b.importance-a.importance;});positions.forEach(function(position,dstIndex){columns[dstIndex]=position.column;});};MemoryColumn.iconFromAttributeInfoType=function(type){switch(type){case tr.model.AttributeInfoType.WARNING:return{symbol:String.fromCharCode(9888),color:'red'};case tr.model.AttributeInfoType.LINK:return{symbol:String.fromCharCode(9903)};case tr.model.AttributeInfoType.MEMORY_OWNER:return{symbol:String.fromCharCode(8702),color:'green'};case tr.model.AttributeInfoType.MEMORY_OWNED:return{symbol:String.fromCharCode(8701),color:'green'};default:return{symbol:String.fromCharCode(9432),color:'blue'};}
+return a.column.name.localeCompare(b.column.name);return b.importance-a.importance;});positions.forEach(function(position,dstIndex){columns[dstIndex]=position.column;});};MemoryColumn.iconFromAttributeInfoType=function(type){switch(type){case tr.model.AttributeInfoType.WARNING:return{symbol:String.fromCharCode(9888),color:'red'};case tr.model.AttributeInfoType.LINK:return{symbol:String.fromCharCode(9903)};case tr.model.AttributeInfoType.MEMORY_OWNER:return{symbol:String.fromCharCode(8702),color:'green'};case tr.model.AttributeInfoType.MEMORY_OWNED:return{symbol:String.fromCharCode(8701),color:'green'};case tr.model.AttributeInfoType.OVERALL_VALUE:return{symbol:String.fromCharCode(8614)};case tr.model.AttributeInfoType.RECENT_VALUE:return{symbol:String.fromCharCode(8618)};default:return{symbol:String.fromCharCode(9432),color:'blue'};}
throw new Error('Unreachable');};MemoryColumn.prototype={attr:function(row){var cell=this.cell(row);if(cell===undefined)
return undefined;return cell.attr;},value:function(row){var attr=this.attr(row);if(attr===undefined)
return'';return this.formatDefinedAttribute(attr);},formatDefinedAttribute:function(attr){var formattedValue=this.formatDefinedAttributeValue(attr);var color;if(typeof this.color==='function')
@@ -4119,7 +4160,7 @@
return undefined;return MemoryCell.extractAttribute(subRowCells[cellName]);},this);var existingRowCell=rowCells[cellName];var existingRowAttribute=MemoryCell.extractAttribute(existingRowCell);var aggregatedAttribute=tr.model.Attribute.aggregate(subRowAttributes,existingRowAttribute);if(existingRowCell!==undefined){existingRowCell.attr=aggregatedAttribute;}else{rowCells[cellName]=new MemoryCell(aggregatedAttribute);}});}
return{MemoryColumn:MemoryColumn,ScalarMemoryColumn:ScalarMemoryColumn,MemoryCell:MemoryCell,fieldGetter:fieldGetter,expandTableRowsRecursively:expandTableRowsRecursively,aggregateTableRowCellsRecursively:aggregateTableRowCellsRecursively,aggregateTableRowCells:aggregateTableRowCells};});'use strict';Polymer('tr-ui-a-stacked-pane',{rebuild:function(){if(!this.paneDirty_){return;}
this.paneDirty_=false;this.rebuildPane_();},scheduleRebuildPane_:function(){if(this.paneDirty_)
-return;this.paneDirty_=true;setTimeout(this.rebuild.bind(this),0);},rebuildPane_:function(){},set childPaneBuilder(childPaneBuilder){this.childPaneBuilder_=childPaneBuilder;this.dispatchEvent(new tr.b.Event('request-child-pane-change'));},get childPaneBuilder(){return this.childPaneBuilder_;},appended:function(){this.rebuild();}});'use strict';(function(){var IMPORTANCE_RULES=[{condition:'size',importance:10},{condition:'page_size',importance:0},{condition:/size/,importance:5},{importance:0}];Polymer('tr-ui-a-memory-dump-allocator-details-pane',{created:function(){this.memoryAllocatorDump_=undefined;},set memoryAllocatorDump(memoryAllocatorDump){this.memoryAllocatorDump_=memoryAllocatorDump;this.scheduleRebuildPane_();},get memoryAllocatorDump(){return this.memoryAllocatorDump_;},rebuildPane_:function(){this.$.contents.textContent='';if(this.memoryAllocatorDump_===undefined){var infoText=this.ownerDocument.createElement('div');this.$.contents.appendChild(infoText);infoText.classList.add('info-text');infoText.innerText='No memory allocator dump selected';return;}
+return;this.paneDirty_=true;setTimeout(this.rebuild.bind(this),0);},rebuildPane_:function(){},set childPaneBuilder(childPaneBuilder){this.childPaneBuilder_=childPaneBuilder;this.dispatchEvent(new tr.b.Event('request-child-pane-change'));},get childPaneBuilder(){return this.childPaneBuilder_;},appended:function(){this.rebuild();}});'use strict';(function(){var IMPORTANCE_RULES=[{condition:tr.model.MemoryAllocatorDump.SIZE_ATTRIBUTE_NAME,importance:10},{condition:tr.model.MemoryAllocatorDump.EFFECTIVE_SIZE_ATTRIBUTE_NAME,importance:9},{condition:'page_size',importance:0},{condition:/size/,importance:5},{importance:0}];Polymer('tr-ui-a-memory-dump-allocator-details-pane',{created:function(){this.memoryAllocatorDump_=undefined;},set memoryAllocatorDump(memoryAllocatorDump){this.memoryAllocatorDump_=memoryAllocatorDump;this.scheduleRebuildPane_();},get memoryAllocatorDump(){return this.memoryAllocatorDump_;},rebuildPane_:function(){this.$.contents.textContent='';if(this.memoryAllocatorDump_===undefined){var infoText=this.ownerDocument.createElement('div');this.$.contents.appendChild(infoText);infoText.classList.add('info-text');infoText.innerText='No memory allocator dump selected';return;}
var rows=this.createRows_();var columns=this.createColumns_(rows);var table=this.ownerDocument.createElement('tr-ui-b-table');this.$.contents.appendChild(table);table.supportsSelection=true;table.tableRows=rows;table.tableColumns=columns;table.rebuild();tr.ui.analysis.expandTableRowsRecursively(table);},createRows_:function(){var createAllocatorRow=function(allocatorDump){var cells=tr.b.mapItems(allocatorDump.attributes,function(attrName,attrValue){return new tr.ui.analysis.MemoryCell(attrValue);});var title=allocatorDump.name;if(title.startsWith('__')&&allocatorDump.ownedBy.length===1){var owner=allocatorDump.ownedBy[0].source;if(owner.containerMemoryDump===allocatorDump.containerMemoryDump){title=tr.ui.b.createSpan({textContent:'suballocation by '+owner.fullName,tooltip:'Suballocation name: '+allocatorDump.fullName,italic:true});}}
var row={title:title,cells:cells};if(allocatorDump.children.length>0)
row.subRows=allocatorDump.children.map(createAllocatorRow);return row;};var rows=[createAllocatorRow(this.memoryAllocatorDump_)];return rows;},createColumns_:function(rows){var titleColumn={title:'Allocator',value:function(row){return row.title;},width:'200px',cmp:function(rowA,rowB){return rowA.title.localeCompare(rowB.title);}};var attributeColumns=tr.ui.analysis.MemoryColumn.fromRows(rows,'cells');tr.ui.analysis.MemoryColumn.spaceEqually(attributeColumns);tr.ui.analysis.MemoryColumn.sortByImportance(attributeColumns,IMPORTANCE_RULES);var columns=[titleColumn].concat(attributeColumns);return columns;}});})();'use strict';(function(){var CLASSIFICATION_RULES={name:'Total',children:[{name:'Android',file:/^\/dev\/ashmem(?!\/libc malloc)/,children:[{name:'Java runtime',file:/^\/dev\/ashmem\/dalvik-/,children:[{name:'Spaces',file:/\/dalvik-(alloc|main|large object|non moving|zygote) space/,children:[{name:'Normal',file:/\/dalvik-(alloc|main)/},{name:'Large',file:/\/dalvik-large object/},{name:'Zygote',file:/\/dalvik-zygote/},{name:'Non-moving',file:/\/dalvik-non moving/}]},{name:'Linear Alloc',file:/\/dalvik-LinearAlloc/},{name:'Indirect Reference Table',file:/\/dalvik-indirect.ref/},{name:'Cache',file:/\/dalvik-jit-code-cache/},{name:'Accounting'}]},{name:'Cursor',file:/\/CursorWindow/},{name:'Ashmem'}]},{name:'Native heap',file:/^((\[heap\])|(\[anon:)|(\/dev\/ashmem\/libc malloc)|(\[discounted tracing overhead\])|$)/},{name:'Stack',file:/^\[stack/},{name:'Files',file:/\.((((jar)|(apk)|(ttf)|(odex)|(oat)|(arg))$)|(dex)|(so))/,children:[{name:'so',file:/\.so/},{name:'jar',file:/\.jar$/},{name:'apk',file:/\.apk$/},{name:'ttf',file:/\.ttf$/},{name:'dex',file:/\.((dex)|(odex$))/},{name:'oat',file:/\.oat$/},{name:'art',file:/\.art$/}]},{name:'Devices',file:/(^\/dev\/)|(anon_inode:dmabuf)/,children:[{name:'GPU',file:/\/((nv)|(mali)|(kgsl))/},{name:'DMA',file:/anon_inode:dmabuf/}]}]};function createEmptyRow(rule){var row={title:rule.name,rule:rule,cells:{},subRows:[]};if(rule.children!==undefined)
@@ -4140,14 +4181,17 @@
throw new Error('Element must have a view-id attribute!');var brushingStateController=tr.c.BrushingStateController.getControllerForElement(this);if(!brushingStateController)
return undefined;return brushingStateController.getViewSpecificBrushingState(viewId);},set:function(state){var viewId=this.viewId;if(!viewId)
throw new Error('Element must have a view-id attribute!');var brushingStateController=tr.c.BrushingStateController.getControllerForElement(this);if(!brushingStateController)
-return;brushingStateController.changeViewSpecificBrushingState(viewId,state);}});'use strict';(function(){var IMPORTANCE_RULES=[{condition:'tracing',importance:0},{importance:1}];var LINK_SYMBOL=String.fromCharCode(9903);Polymer('tr-ui-a-memory-dump-overview-pane',{created:function(){this.processMemoryDumps_=undefined;},ready:function(){this.$.table.supportsSelection=true;this.$.table.cellSelectionMode=true;this.$.table.rowHighlightEnabled=true;this.$.table.addEventListener('selection-changed',function(tableEvent){tableEvent.stopPropagation();this.changeChildPane_();}.bind(this));},set processMemoryDumps(processMemoryDumps){this.processMemoryDumps_=processMemoryDumps;this.scheduleRebuildPane_();},get processMemoryDumps(){return this.processMemoryDumps_;},get selectedMemoryCell(){var selectedTableRow=this.$.table.selectedTableRow;if(!selectedTableRow)
+return;brushingStateController.changeViewSpecificBrushingState(viewId,state);}});'use strict';(function(){var IMPORTANCE_RULES=[{condition:'tracing',importance:0},{importance:1}];var DISPLAYED_SIZE_ATTRIBUTE_NAME=tr.model.MemoryAllocatorDump.DISPLAYED_SIZE_ATTRIBUTE_NAME;var LINK_SYMBOL=String.fromCharCode(9903);var GREATER_THAN_OR_EQUAL_TO_SYMBOL=String.fromCharCode(8805);Polymer('tr-ui-a-memory-dump-overview-pane',{created:function(){this.processMemoryDumps_=undefined;},ready:function(){this.$.table.supportsSelection=true;this.$.table.cellSelectionMode=true;this.$.table.rowHighlightEnabled=true;this.$.table.addEventListener('selection-changed',function(tableEvent){tableEvent.stopPropagation();this.changeChildPane_();}.bind(this));},set processMemoryDumps(processMemoryDumps){this.processMemoryDumps_=processMemoryDumps;this.scheduleRebuildPane_();},get processMemoryDumps(){return this.processMemoryDumps_;},get selectedMemoryCell(){var selectedTableRow=this.$.table.selectedTableRow;if(!selectedTableRow)
return undefined;var selectedColumnIndex=this.$.table.selectedColumnIndex;if(selectedColumnIndex===undefined)
return undefined;var selectedColumn=this.$.table.tableColumns[selectedColumnIndex];var selectedMemoryCell=selectedColumn.cell(selectedTableRow);return selectedMemoryCell;},changeChildPane_:function(){this.storeSelection_();var builder=undefined;if(this.selectedMemoryCell!==undefined)
builder=this.selectedMemoryCell.buildDetailsPane;this.childPaneBuilder=builder;},rebuildPane_:function(){var processMemoryDumps=this.processMemoryDumps_||[];var rows=processMemoryDumps.map(function(processMemoryDump){function buildVMRegionsPane(){var pane=document.createElement('tr-ui-a-memory-dump-vm-regions-details-pane');pane.vmRegions=processMemoryDump.mostRecentVmRegions;return pane;}
-var usedMemorySizes={};var totalResident=processMemoryDump.totalResidentBytes;if(totalResident!==undefined){var cell=new tr.ui.analysis.MemoryCell(new tr.model.ScalarAttribute('bytes',totalResident));cell.buildDetailsPane=buildVMRegionsPane;usedMemorySizes['Total resident']=cell;}
+var usedMemorySizes={};var totals=processMemoryDump.totals;if(totals!==undefined){var totalResident=totals.residentBytes;if(totalResident!==undefined){var cell=new tr.ui.analysis.MemoryCell(new tr.model.ScalarAttribute('bytes',totalResident));cell.buildDetailsPane=buildVMRegionsPane;usedMemorySizes['Total resident']=cell;}
+var peakTotalResident=totals.peakResidentBytes;if(peakTotalResident!==undefined){var attr=new tr.model.ScalarAttribute('bytes',peakTotalResident);if(totals.arePeakResidentBytesResettable){attr.infos.push(new tr.model.AttributeInfo(tr.model.AttributeInfoType.RECENT_VALUE,'Peak RSS since previous memory dump.'));}else{attr.infos.push(new tr.model.AttributeInfo(tr.model.AttributeInfoType.OVERALL_VALUE,'Peak RSS since process startup. Finer grained peaks '+'require a Linux kernel version '+
+GREATER_THAN_OR_EQUAL_TO_SYMBOL+' 4.0.'));}
+var cell=new tr.ui.analysis.MemoryCell(attr);cell.buildDetailsPane=buildVMRegionsPane;usedMemorySizes['Peak total resident']=cell;}}
function addByteStatCell(byteStatName,columnTitle){var byteStat=processMemoryDump.getMostRecentTotalVmRegionStat(byteStatName);if(byteStat!==undefined){var attr=new tr.model.ScalarAttribute('bytes',byteStat);if(!processMemoryDump.hasOwnVmRegions){attr.infos.push(new tr.model.AttributeInfo(tr.model.AttributeInfoType.LINK,'Older value (process did not dump memory maps).'));attr.isOlderValue=true;}
var cell=new tr.ui.analysis.MemoryCell(attr);cell.buildDetailsPane=buildVMRegionsPane;usedMemorySizes[columnTitle]=cell;}}
-addByteStatCell('proportionalResident','PSS');addByteStatCell('privateDirtyResident','Private dirty');addByteStatCell('swapped','Swapped');var allocatorSizes={};if(processMemoryDump.memoryAllocatorDumps!==undefined){processMemoryDump.memoryAllocatorDumps.forEach(function(dump){var attr=dump.attributes['size'];var cell=new tr.ui.analysis.MemoryCell(attr);cell.buildDetailsPane=function(){var pane=document.createElement('tr-ui-a-memory-dump-allocator-details-pane');pane.memoryAllocatorDump=dump;return pane;};allocatorSizes[dump.fullName]=cell;},this);}
+addByteStatCell('proportionalResident','PSS');addByteStatCell('privateDirtyResident','Private dirty');addByteStatCell('swapped','Swapped');var allocatorSizes={};if(processMemoryDump.memoryAllocatorDumps!==undefined){processMemoryDump.memoryAllocatorDumps.forEach(function(dump){var attr=dump.attributes[DISPLAYED_SIZE_ATTRIBUTE_NAME];var cell=new tr.ui.analysis.MemoryCell(attr);cell.buildDetailsPane=function(){var pane=document.createElement('tr-ui-a-memory-dump-allocator-details-pane');pane.memoryAllocatorDump=dump;return pane;};allocatorSizes[dump.fullName]=cell;},this);}
return{title:processMemoryDump.process.userFriendlyName,usedMemorySizes:usedMemorySizes,allocatorSizes:allocatorSizes};},this);this.$.table.tableRows=rows;if(rows.length>1){var totalRow={title:'Total',noLegend:true};tr.ui.analysis.aggregateTableRowCells(totalRow,rows,'usedMemorySizes');tr.ui.analysis.aggregateTableRowCells(totalRow,rows,'allocatorSizes');this.$.table.footerRows=[totalRow];}
this.updateColumns_(rows);this.$.table.rebuild();this.restoreSelection_();},updateColumns_:function(rows){var titleColumn={title:'Process',value:function(row){if(row.noLegend)
return row.title;var titleEl=document.createElement('tr-ui-b-color-legend');titleEl.label=row.title;return titleEl;},width:'200px',cmp:function(rowA,rowB){return rowA.title.localeCompare(rowB.title);},supportsCellSelection:false};var usedMemorySizeColumns=tr.ui.analysis.MemoryColumn.fromRows(rows,'usedMemorySizes');var allocatorSizeColumns=tr.ui.analysis.MemoryColumn.fromRows(rows,'allocatorSizes',function(allocatorName){var titleEl=document.createElement('tr-ui-b-color-legend');titleEl.label=allocatorName;return titleEl;});tr.ui.analysis.MemoryColumn.sortByImportance(allocatorSizeColumns,IMPORTANCE_RULES);var tracingColumn=tr.b.findFirstInArray(allocatorSizeColumns,function(column){return column.name==='tracing';});if(tracingColumn!==undefined){var tracingColumnColor=tr.ui.b.getColorPalette()[tr.ui.b.getColorIdForReservedName('tracing_memory_column')];tracingColumn.title=tr.ui.b.createSpan({textContent:'tracing',color:tracingColumnColor});tracingColumn.color=tracingColumnColor;}
@@ -4171,7 +4215,7 @@
throw new Error('Only supports a single process memory dump');if(!(selection[0]instanceof tr.model.ProcessMemoryDump))
throw new Error('Only supports process memory dumps');this.currentSelection_=selection;this.$.memory_dump_view.processMemoryDumps=[selection[0]];},get selection(){return this.currentSelection_;},get requiresTallView(){return true;}});'use strict';Polymer('tr-ui-a-multi-process-memory-dump-sub-view',{created:function(){this.currentSelection_=undefined;},get selection(){return this.currentSelection_;},set selection(selection){this.currentSelection_=selection;selection=tr.b.asArray(selection).sort(tr.b.Range.compareByMinTimes);var ownerDocument=this.ownerDocument;var table=this.$.content;table.tableColumns=[{title:'Dump',value:function(row){var linkEl=document.createElement('tr-ui-a-analysis-link');linkEl.setSelectionAndContent(function(){return new tr.model.EventSet(row);});var spanEl=document.createElement('span');spanEl.textContent='Process memory dump at ';linkEl.appendChild(spanEl);linkEl.appendChild(tr.ui.units.createTimeStampSpan(row.start,{ownerDocument:ownerDocument}));return linkEl;}}];table.showHeader=false;table.tableRows=selection;table.rebuild();}});'use strict';Polymer('tr-ui-a-single-global-memory-dump-sub-view',{set selection(selection){if(selection.length!==1)
throw new Error('Only supports a single global memory dump');if(!(selection[0]instanceof tr.model.GlobalMemoryDump))
-throw new Error('Only supports global memory dumps');this.currentSelection_=selection;this.$.memory_dump_view.processMemoryDumps=tr.b.dictionaryValues(selection[0].processMemoryDumps);},get selection(){return this.currentSelection_;},get requiresTallView(){return true;}});'use strict';Polymer('tr-ui-a-multi-global-memory-dump-sub-view',{created:function(){this.currentSelection_=undefined;},get selection(){return this.currentSelection_;},set selection(selection){this.currentSelection_=selection;selection=tr.b.asArray(selection).sort(tr.b.Range.compareByMinTimes);var ownerDocument=this.ownerDocument;var table=this.$.content;table.tableColumns=[{title:'Dump',value:function(row){var linkEl=document.createElement('tr-ui-a-analysis-link');linkEl.setSelectionAndContent(function(){return new tr.model.EventSet(row);});var spanEl=document.createElement('span');spanEl.textContent='Global memory dump at ';linkEl.appendChild(spanEl);linkEl.appendChild(tr.ui.units.createTimeStampSpan(row.start,{ownerDocument:ownerDocument}));return linkEl;}}];table.showHeader=false;table.tableRows=selection;table.rebuild();}});!function(){function n(n){return null!=n&&!isNaN(n)}function t(n){return n.length}function e(n){for(var t=1;n*t%1;)t*=10;return t}function r(n,t){try{for(var e in t)Object.defineProperty(n.prototype,e,{value:t[e],enumerable:!1})}catch(r){n.prototype=t}}function u(){}function i(n){return aa+n in this}function o(n){return n=aa+n,n in this&&delete this[n]}function a(){var n=[];return this.forEach(function(t){n.push(t)}),n}function c(){var n=0;for(var t in this)t.charCodeAt(0)===ca&&++n;return n}function s(){for(var n in this)if(n.charCodeAt(0)===ca)return!1;return!0}function l(){}function f(n,t,e){return function(){var r=e.apply(t,arguments);return r===t?n:r}}function h(n,t){if(t in n)return t;t=t.charAt(0).toUpperCase()+t.substring(1);for(var e=0,r=sa.length;r>e;++e){var u=sa[e]+t;if(u in n)return u}}function g(){}function p(){}function v(n){function t(){for(var t,r=e,u=-1,i=r.length;++u<i;)(t=r[u].on)&&t.apply(this,arguments);return n}var e=[],r=new u;return t.on=function(t,u){var i,o=r.get(t);return arguments.length<2?o&&o.on:(o&&(o.on=null,e=e.slice(0,i=e.indexOf(o)).concat(e.slice(i+1)),r.remove(t)),u&&e.push(r.set(t,{on:u})),n)},t}function d(){Xo.event.preventDefault()}function m(){for(var n,t=Xo.event;n=t.sourceEvent;)t=n;return t}function y(n){for(var t=new p,e=0,r=arguments.length;++e<r;)t[arguments[e]]=v(t);return t.of=function(e,r){return function(u){try{var i=u.sourceEvent=Xo.event;u.target=n,Xo.event=u,t[u.type].apply(e,r)}finally{Xo.event=i}}},t}function x(n){return fa(n,da),n}function M(n){return"function"==typeof n?n:function(){return ha(n,this)}}function _(n){return"function"==typeof n?n:function(){return ga(n,this)}}function b(n,t){function e(){this.removeAttribute(n)}function r(){this.removeAttributeNS(n.space,n.local)}function u(){this.setAttribute(n,t)}function i(){this.setAttributeNS(n.space,n.local,t)}function o(){var e=t.apply(this,arguments);null==e?this.removeAttribute(n):this.setAttribute(n,e)}function a(){var e=t.apply(this,arguments);null==e?this.removeAttributeNS(n.space,n.local):this.setAttributeNS(n.space,n.local,e)}return n=Xo.ns.qualify(n),null==t?n.local?r:e:"function"==typeof t?n.local?a:o:n.local?i:u}function w(n){return n.trim().replace(/\s+/g," ")}function S(n){return new RegExp("(?:^|\\s+)"+Xo.requote(n)+"(?:\\s+|$)","g")}function k(n){return n.trim().split(/^|\s+/)}function E(n,t){function e(){for(var e=-1;++e<u;)n[e](this,t)}function r(){for(var e=-1,r=t.apply(this,arguments);++e<u;)n[e](this,r)}n=k(n).map(A);var u=n.length;return"function"==typeof t?r:e}function A(n){var t=S(n);return function(e,r){if(u=e.classList)return r?u.add(n):u.remove(n);var u=e.getAttribute("class")||"";r?(t.lastIndex=0,t.test(u)||e.setAttribute("class",w(u+" "+n))):e.setAttribute("class",w(u.replace(t," ")))}}function C(n,t,e){function r(){this.style.removeProperty(n)}function u(){this.style.setProperty(n,t,e)}function i(){var r=t.apply(this,arguments);null==r?this.style.removeProperty(n):this.style.setProperty(n,r,e)}return null==t?r:"function"==typeof t?i:u}function N(n,t){function e(){delete this[n]}function r(){this[n]=t}function u(){var e=t.apply(this,arguments);null==e?delete this[n]:this[n]=e}return null==t?e:"function"==typeof t?u:r}function L(n){return"function"==typeof n?n:(n=Xo.ns.qualify(n)).local?function(){return this.ownerDocument.createElementNS(n.space,n.local)}:function(){return this.ownerDocument.createElementNS(this.namespaceURI,n)}}function T(n){return{__data__:n}}function q(n){return function(){return va(this,n)}}function z(n){return arguments.length||(n=Xo.ascending),function(t,e){return t&&e?n(t.__data__,e.__data__):!t-!e}}function R(n,t){for(var e=0,r=n.length;r>e;e++)for(var u,i=n[e],o=0,a=i.length;a>o;o++)(u=i[o])&&t(u,o,e);return n}function D(n){return fa(n,ya),n}function P(n){var t,e;return function(r,u,i){var o,a=n[i].update,c=a.length;for(i!=e&&(e=i,t=0),u>=t&&(t=u+1);!(o=a[t])&&++t<c;);return o}}function U(){var n=this.__transition__;n&&++n.active}function j(n,t,e){function r(){var t=this[o];t&&(this.removeEventListener(n,t,t.$),delete this[o])}function u(){var u=c(t,Bo(arguments));r.call(this),this.addEventListener(n,this[o]=u,u.$=e),u._=t}function i(){var t,e=new RegExp("^__on([^.]+)"+Xo.requote(n)+"$");for(var r in this)if(t=r.match(e)){var u=this[r];this.removeEventListener(t[1],u,u.$),delete this[r]}}var o="__on"+n,a=n.indexOf("."),c=H;a>0&&(n=n.substring(0,a));var s=Ma.get(n);return s&&(n=s,c=F),a?t?u:r:t?g:i}function H(n,t){return function(e){var r=Xo.event;Xo.event=e,t[0]=this.__data__;try{n.apply(this,t)}finally{Xo.event=r}}}function F(n,t){var e=H(n,t);return function(n){var t=this,r=n.relatedTarget;r&&(r===t||8&r.compareDocumentPosition(t))||e.call(t,n)}}function O(){var n=".dragsuppress-"+ ++ba,t="click"+n,e=Xo.select(Go).on("touchmove"+n,d).on("dragstart"+n,d).on("selectstart"+n,d);if(_a){var r=Jo.style,u=r[_a];r[_a]="none"}return function(i){function o(){e.on(t,null)}e.on(n,null),_a&&(r[_a]=u),i&&(e.on(t,function(){d(),o()},!0),setTimeout(o,0))}}function Y(n,t){t.changedTouches&&(t=t.changedTouches[0]);var e=n.ownerSVGElement||n;if(e.createSVGPoint){var r=e.createSVGPoint();if(0>wa&&(Go.scrollX||Go.scrollY)){e=Xo.select("body").append("svg").style({position:"absolute",top:0,left:0,margin:0,padding:0,border:"none"},"important");var u=e[0][0].getScreenCTM();wa=!(u.f||u.e),e.remove()}return wa?(r.x=t.pageX,r.y=t.pageY):(r.x=t.clientX,r.y=t.clientY),r=r.matrixTransform(n.getScreenCTM().inverse()),[r.x,r.y]}var i=n.getBoundingClientRect();return[t.clientX-i.left-n.clientLeft,t.clientY-i.top-n.clientTop]}function I(n){return n>0?1:0>n?-1:0}function Z(n,t,e){return(t[0]-n[0])*(e[1]-n[1])-(t[1]-n[1])*(e[0]-n[0])}function V(n){return n>1?0:-1>n?Sa:Math.acos(n)}function X(n){return n>1?Ea:-1>n?-Ea:Math.asin(n)}function $(n){return((n=Math.exp(n))-1/n)/2}function B(n){return((n=Math.exp(n))+1/n)/2}function W(n){return((n=Math.exp(2*n))-1)/(n+1)}function J(n){return(n=Math.sin(n/2))*n}function G(){}function K(n,t,e){return new Q(n,t,e)}function Q(n,t,e){this.h=n,this.s=t,this.l=e}function nt(n,t,e){function r(n){return n>360?n-=360:0>n&&(n+=360),60>n?i+(o-i)*n/60:180>n?o:240>n?i+(o-i)*(240-n)/60:i}function u(n){return Math.round(255*r(n))}var i,o;return n=isNaN(n)?0:(n%=360)<0?n+360:n,t=isNaN(t)?0:0>t?0:t>1?1:t,e=0>e?0:e>1?1:e,o=.5>=e?e*(1+t):e+t-e*t,i=2*e-o,gt(u(n+120),u(n),u(n-120))}function tt(n,t,e){return new et(n,t,e)}function et(n,t,e){this.h=n,this.c=t,this.l=e}function rt(n,t,e){return isNaN(n)&&(n=0),isNaN(t)&&(t=0),ut(e,Math.cos(n*=Na)*t,Math.sin(n)*t)}function ut(n,t,e){return new it(n,t,e)}function it(n,t,e){this.l=n,this.a=t,this.b=e}function ot(n,t,e){var r=(n+16)/116,u=r+t/500,i=r-e/200;return u=ct(u)*Fa,r=ct(r)*Oa,i=ct(i)*Ya,gt(lt(3.2404542*u-1.5371385*r-.4985314*i),lt(-.969266*u+1.8760108*r+.041556*i),lt(.0556434*u-.2040259*r+1.0572252*i))}function at(n,t,e){return n>0?tt(Math.atan2(e,t)*La,Math.sqrt(t*t+e*e),n):tt(0/0,0/0,n)}function ct(n){return n>.206893034?n*n*n:(n-4/29)/7.787037}function st(n){return n>.008856?Math.pow(n,1/3):7.787037*n+4/29}function lt(n){return Math.round(255*(.00304>=n?12.92*n:1.055*Math.pow(n,1/2.4)-.055))}function ft(n){return gt(n>>16,255&n>>8,255&n)}function ht(n){return ft(n)+""}function gt(n,t,e){return new pt(n,t,e)}function pt(n,t,e){this.r=n,this.g=t,this.b=e}function vt(n){return 16>n?"0"+Math.max(0,n).toString(16):Math.min(255,n).toString(16)}function dt(n,t,e){var r,u,i,o,a=0,c=0,s=0;if(u=/([a-z]+)\((.*)\)/i.exec(n))switch(i=u[2].split(","),u[1]){case"hsl":return e(parseFloat(i[0]),parseFloat(i[1])/100,parseFloat(i[2])/100);case"rgb":return t(Mt(i[0]),Mt(i[1]),Mt(i[2]))}return(o=Va.get(n))?t(o.r,o.g,o.b):(null!=n&&"#"===n.charAt(0)&&(r=parseInt(n.substring(1),16),isNaN(r)||(4===n.length?(a=(3840&r)>>4,a=a>>4|a,c=240&r,c=c>>4|c,s=15&r,s=s<<4|s):7===n.length&&(a=(16711680&r)>>16,c=(65280&r)>>8,s=255&r))),t(a,c,s))}function mt(n,t,e){var r,u,i=Math.min(n/=255,t/=255,e/=255),o=Math.max(n,t,e),a=o-i,c=(o+i)/2;return a?(u=.5>c?a/(o+i):a/(2-o-i),r=n==o?(t-e)/a+(e>t?6:0):t==o?(e-n)/a+2:(n-t)/a+4,r*=60):(r=0/0,u=c>0&&1>c?0:r),K(r,u,c)}function yt(n,t,e){n=xt(n),t=xt(t),e=xt(e);var r=st((.4124564*n+.3575761*t+.1804375*e)/Fa),u=st((.2126729*n+.7151522*t+.072175*e)/Oa),i=st((.0193339*n+.119192*t+.9503041*e)/Ya);return ut(116*u-16,500*(r-u),200*(u-i))}function xt(n){return(n/=255)<=.04045?n/12.92:Math.pow((n+.055)/1.055,2.4)}function Mt(n){var t=parseFloat(n);return"%"===n.charAt(n.length-1)?Math.round(2.55*t):t}function _t(n){return"function"==typeof n?n:function(){return n}}function bt(n){return n}function wt(n){return function(t,e,r){return 2===arguments.length&&"function"==typeof e&&(r=e,e=null),St(t,e,n,r)}}function St(n,t,e,r){function u(){var n,t=c.status;if(!t&&c.responseText||t>=200&&300>t||304===t){try{n=e.call(i,c)}catch(r){return o.error.call(i,r),void 0}o.load.call(i,n)}else o.error.call(i,c)}var i={},o=Xo.dispatch("beforesend","progress","load","error"),a={},c=new XMLHttpRequest,s=null;return!Go.XDomainRequest||"withCredentials"in c||!/^(http(s)?:)?\/\//.test(n)||(c=new XDomainRequest),"onload"in c?c.onload=c.onerror=u:c.onreadystatechange=function(){c.readyState>3&&u()},c.onprogress=function(n){var t=Xo.event;Xo.event=n;try{o.progress.call(i,c)}finally{Xo.event=t}},i.header=function(n,t){return n=(n+"").toLowerCase(),arguments.length<2?a[n]:(null==t?delete a[n]:a[n]=t+"",i)},i.mimeType=function(n){return arguments.length?(t=null==n?null:n+"",i):t},i.responseType=function(n){return arguments.length?(s=n,i):s},i.response=function(n){return e=n,i},["get","post"].forEach(function(n){i[n]=function(){return i.send.apply(i,[n].concat(Bo(arguments)))}}),i.send=function(e,r,u){if(2===arguments.length&&"function"==typeof r&&(u=r,r=null),c.open(e,n,!0),null==t||"accept"in a||(a.accept=t+",*/*"),c.setRequestHeader)for(var l in a)c.setRequestHeader(l,a[l]);return null!=t&&c.overrideMimeType&&c.overrideMimeType(t),null!=s&&(c.responseType=s),null!=u&&i.on("error",u).on("load",function(n){u(null,n)}),o.beforesend.call(i,c),c.send(null==r?null:r),i},i.abort=function(){return c.abort(),i},Xo.rebind(i,o,"on"),null==r?i:i.get(kt(r))}function kt(n){return 1===n.length?function(t,e){n(null==t?e:null)}:n}function Et(){var n=At(),t=Ct()-n;t>24?(isFinite(t)&&(clearTimeout(Wa),Wa=setTimeout(Et,t)),Ba=0):(Ba=1,Ga(Et))}function At(){var n=Date.now();for(Ja=Xa;Ja;)n>=Ja.t&&(Ja.f=Ja.c(n-Ja.t)),Ja=Ja.n;return n}function Ct(){for(var n,t=Xa,e=1/0;t;)t.f?t=n?n.n=t.n:Xa=t.n:(t.t<e&&(e=t.t),t=(n=t).n);return $a=n,e}function Nt(n,t){return t-(n?Math.ceil(Math.log(n)/Math.LN10):1)}function Lt(n,t){var e=Math.pow(10,3*oa(8-t));return{scale:t>8?function(n){return n/e}:function(n){return n*e},symbol:n}}function Tt(n){var t=n.decimal,e=n.thousands,r=n.grouping,u=n.currency,i=r?function(n){for(var t=n.length,u=[],i=0,o=r[0];t>0&&o>0;)u.push(n.substring(t-=o,t+o)),o=r[i=(i+1)%r.length];return u.reverse().join(e)}:bt;return function(n){var e=Qa.exec(n),r=e[1]||" ",o=e[2]||">",a=e[3]||"",c=e[4]||"",s=e[5],l=+e[6],f=e[7],h=e[8],g=e[9],p=1,v="",d="",m=!1;switch(h&&(h=+h.substring(1)),(s||"0"===r&&"="===o)&&(s=r="0",o="=",f&&(l-=Math.floor((l-1)/4))),g){case"n":f=!0,g="g";break;case"%":p=100,d="%",g="f";break;case"p":p=100,d="%",g="r";break;case"b":case"o":case"x":case"X":"#"===c&&(v="0"+g.toLowerCase());case"c":case"d":m=!0,h=0;break;case"s":p=-1,g="r"}"$"===c&&(v=u[0],d=u[1]),"r"!=g||h||(g="g"),null!=h&&("g"==g?h=Math.max(1,Math.min(21,h)):("e"==g||"f"==g)&&(h=Math.max(0,Math.min(20,h)))),g=nc.get(g)||qt;var y=s&&f;return function(n){var e=d;if(m&&n%1)return"";var u=0>n||0===n&&0>1/n?(n=-n,"-"):a;if(0>p){var c=Xo.formatPrefix(n,h);n=c.scale(n),e=c.symbol+d}else n*=p;n=g(n,h);var x=n.lastIndexOf("."),M=0>x?n:n.substring(0,x),_=0>x?"":t+n.substring(x+1);!s&&f&&(M=i(M));var b=v.length+M.length+_.length+(y?0:u.length),w=l>b?new Array(b=l-b+1).join(r):"";return y&&(M=i(w+M)),u+=v,n=M+_,("<"===o?u+n+w:">"===o?w+u+n:"^"===o?w.substring(0,b>>=1)+u+n+w.substring(b):u+(y?n:w+n))+e}}}function qt(n){return n+""}function zt(){this._=new Date(arguments.length>1?Date.UTC.apply(this,arguments):arguments[0])}function Rt(n,t,e){function r(t){var e=n(t),r=i(e,1);return r-t>t-e?e:r}function u(e){return t(e=n(new ec(e-1)),1),e}function i(n,e){return t(n=new ec(+n),e),n}function o(n,r,i){var o=u(n),a=[];if(i>1)for(;r>o;)e(o)%i||a.push(new Date(+o)),t(o,1);else for(;r>o;)a.push(new Date(+o)),t(o,1);return a}function a(n,t,e){try{ec=zt;var r=new zt;return r._=n,o(r,t,e)}finally{ec=Date}}n.floor=n,n.round=r,n.ceil=u,n.offset=i,n.range=o;var c=n.utc=Dt(n);return c.floor=c,c.round=Dt(r),c.ceil=Dt(u),c.offset=Dt(i),c.range=a,n}function Dt(n){return function(t,e){try{ec=zt;var r=new zt;return r._=t,n(r,e)._}finally{ec=Date}}}function Pt(n){function t(n){function t(t){for(var e,u,i,o=[],a=-1,c=0;++a<r;)37===n.charCodeAt(a)&&(o.push(n.substring(c,a)),null!=(u=uc[e=n.charAt(++a)])&&(e=n.charAt(++a)),(i=C[e])&&(e=i(t,null==u?"e"===e?" ":"0":u)),o.push(e),c=a+1);return o.push(n.substring(c,a)),o.join("")}var r=n.length;return t.parse=function(t){var r={y:1900,m:0,d:1,H:0,M:0,S:0,L:0,Z:null},u=e(r,n,t,0);if(u!=t.length)return null;"p"in r&&(r.H=r.H%12+12*r.p);var i=null!=r.Z&&ec!==zt,o=new(i?zt:ec);return"j"in r?o.setFullYear(r.y,0,r.j):"w"in r&&("W"in r||"U"in r)?(o.setFullYear(r.y,0,1),o.setFullYear(r.y,0,"W"in r?(r.w+6)%7+7*r.W-(o.getDay()+5)%7:r.w+7*r.U-(o.getDay()+6)%7)):o.setFullYear(r.y,r.m,r.d),o.setHours(r.H+Math.floor(r.Z/100),r.M+r.Z%100,r.S,r.L),i?o._:o},t.toString=function(){return n},t}function e(n,t,e,r){for(var u,i,o,a=0,c=t.length,s=e.length;c>a;){if(r>=s)return-1;if(u=t.charCodeAt(a++),37===u){if(o=t.charAt(a++),i=N[o in uc?t.charAt(a++):o],!i||(r=i(n,e,r))<0)return-1}else if(u!=e.charCodeAt(r++))return-1}return r}function r(n,t,e){b.lastIndex=0;var r=b.exec(t.substring(e));return r?(n.w=w.get(r[0].toLowerCase()),e+r[0].length):-1}function u(n,t,e){M.lastIndex=0;var r=M.exec(t.substring(e));return r?(n.w=_.get(r[0].toLowerCase()),e+r[0].length):-1}function i(n,t,e){E.lastIndex=0;var r=E.exec(t.substring(e));return r?(n.m=A.get(r[0].toLowerCase()),e+r[0].length):-1}function o(n,t,e){S.lastIndex=0;var r=S.exec(t.substring(e));return r?(n.m=k.get(r[0].toLowerCase()),e+r[0].length):-1}function a(n,t,r){return e(n,C.c.toString(),t,r)}function c(n,t,r){return e(n,C.x.toString(),t,r)}function s(n,t,r){return e(n,C.X.toString(),t,r)}function l(n,t,e){var r=x.get(t.substring(e,e+=2).toLowerCase());return null==r?-1:(n.p=r,e)}var f=n.dateTime,h=n.date,g=n.time,p=n.periods,v=n.days,d=n.shortDays,m=n.months,y=n.shortMonths;t.utc=function(n){function e(n){try{ec=zt;var t=new ec;return t._=n,r(t)}finally{ec=Date}}var r=t(n);return e.parse=function(n){try{ec=zt;var t=r.parse(n);return t&&t._}finally{ec=Date}},e.toString=r.toString,e},t.multi=t.utc.multi=ee;var x=Xo.map(),M=jt(v),_=Ht(v),b=jt(d),w=Ht(d),S=jt(m),k=Ht(m),E=jt(y),A=Ht(y);p.forEach(function(n,t){x.set(n.toLowerCase(),t)});var C={a:function(n){return d[n.getDay()]},A:function(n){return v[n.getDay()]},b:function(n){return y[n.getMonth()]},B:function(n){return m[n.getMonth()]},c:t(f),d:function(n,t){return Ut(n.getDate(),t,2)},e:function(n,t){return Ut(n.getDate(),t,2)},H:function(n,t){return Ut(n.getHours(),t,2)},I:function(n,t){return Ut(n.getHours()%12||12,t,2)},j:function(n,t){return Ut(1+tc.dayOfYear(n),t,3)},L:function(n,t){return Ut(n.getMilliseconds(),t,3)},m:function(n,t){return Ut(n.getMonth()+1,t,2)},M:function(n,t){return Ut(n.getMinutes(),t,2)},p:function(n){return p[+(n.getHours()>=12)]},S:function(n,t){return Ut(n.getSeconds(),t,2)},U:function(n,t){return Ut(tc.sundayOfYear(n),t,2)},w:function(n){return n.getDay()},W:function(n,t){return Ut(tc.mondayOfYear(n),t,2)},x:t(h),X:t(g),y:function(n,t){return Ut(n.getFullYear()%100,t,2)},Y:function(n,t){return Ut(n.getFullYear()%1e4,t,4)},Z:ne,"%":function(){return"%"}},N={a:r,A:u,b:i,B:o,c:a,d:Bt,e:Bt,H:Jt,I:Jt,j:Wt,L:Qt,m:$t,M:Gt,p:l,S:Kt,U:Ot,w:Ft,W:Yt,x:c,X:s,y:Zt,Y:It,Z:Vt,"%":te};return t}function Ut(n,t,e){var r=0>n?"-":"",u=(r?-n:n)+"",i=u.length;return r+(e>i?new Array(e-i+1).join(t)+u:u)}function jt(n){return new RegExp("^(?:"+n.map(Xo.requote).join("|")+")","i")}function Ht(n){for(var t=new u,e=-1,r=n.length;++e<r;)t.set(n[e].toLowerCase(),e);return t}function Ft(n,t,e){ic.lastIndex=0;var r=ic.exec(t.substring(e,e+1));return r?(n.w=+r[0],e+r[0].length):-1}function Ot(n,t,e){ic.lastIndex=0;var r=ic.exec(t.substring(e));return r?(n.U=+r[0],e+r[0].length):-1}function Yt(n,t,e){ic.lastIndex=0;var r=ic.exec(t.substring(e));return r?(n.W=+r[0],e+r[0].length):-1}function It(n,t,e){ic.lastIndex=0;var r=ic.exec(t.substring(e,e+4));return r?(n.y=+r[0],e+r[0].length):-1}function Zt(n,t,e){ic.lastIndex=0;var r=ic.exec(t.substring(e,e+2));return r?(n.y=Xt(+r[0]),e+r[0].length):-1}function Vt(n,t,e){return/^[+-]\d{4}$/.test(t=t.substring(e,e+5))?(n.Z=+t,e+5):-1}function Xt(n){return n+(n>68?1900:2e3)}function $t(n,t,e){ic.lastIndex=0;var r=ic.exec(t.substring(e,e+2));return r?(n.m=r[0]-1,e+r[0].length):-1}function Bt(n,t,e){ic.lastIndex=0;var r=ic.exec(t.substring(e,e+2));return r?(n.d=+r[0],e+r[0].length):-1}function Wt(n,t,e){ic.lastIndex=0;var r=ic.exec(t.substring(e,e+3));return r?(n.j=+r[0],e+r[0].length):-1}function Jt(n,t,e){ic.lastIndex=0;var r=ic.exec(t.substring(e,e+2));return r?(n.H=+r[0],e+r[0].length):-1}function Gt(n,t,e){ic.lastIndex=0;var r=ic.exec(t.substring(e,e+2));return r?(n.M=+r[0],e+r[0].length):-1}function Kt(n,t,e){ic.lastIndex=0;var r=ic.exec(t.substring(e,e+2));return r?(n.S=+r[0],e+r[0].length):-1}function Qt(n,t,e){ic.lastIndex=0;var r=ic.exec(t.substring(e,e+3));return r?(n.L=+r[0],e+r[0].length):-1}function ne(n){var t=n.getTimezoneOffset(),e=t>0?"-":"+",r=~~(oa(t)/60),u=oa(t)%60;return e+Ut(r,"0",2)+Ut(u,"0",2)}function te(n,t,e){oc.lastIndex=0;var r=oc.exec(t.substring(e,e+1));return r?e+r[0].length:-1}function ee(n){for(var t=n.length,e=-1;++e<t;)n[e][0]=this(n[e][0]);return function(t){for(var e=0,r=n[e];!r[1](t);)r=n[++e];return r[0](t)}}function re(){}function ue(n,t,e){var r=e.s=n+t,u=r-n,i=r-u;e.t=n-i+(t-u)}function ie(n,t){n&&lc.hasOwnProperty(n.type)&&lc[n.type](n,t)}function oe(n,t,e){var r,u=-1,i=n.length-e;for(t.lineStart();++u<i;)r=n[u],t.point(r[0],r[1],r[2]);t.lineEnd()}function ae(n,t){var e=-1,r=n.length;for(t.polygonStart();++e<r;)oe(n[e],t,1);t.polygonEnd()}function ce(){function n(n,t){n*=Na,t=t*Na/2+Sa/4;var e=n-r,o=e>=0?1:-1,a=o*e,c=Math.cos(t),s=Math.sin(t),l=i*s,f=u*c+l*Math.cos(a),h=l*o*Math.sin(a);hc.add(Math.atan2(h,f)),r=n,u=c,i=s}var t,e,r,u,i;gc.point=function(o,a){gc.point=n,r=(t=o)*Na,u=Math.cos(a=(e=a)*Na/2+Sa/4),i=Math.sin(a)},gc.lineEnd=function(){n(t,e)}}function se(n){var t=n[0],e=n[1],r=Math.cos(e);return[r*Math.cos(t),r*Math.sin(t),Math.sin(e)]}function le(n,t){return n[0]*t[0]+n[1]*t[1]+n[2]*t[2]}function fe(n,t){return[n[1]*t[2]-n[2]*t[1],n[2]*t[0]-n[0]*t[2],n[0]*t[1]-n[1]*t[0]]}function he(n,t){n[0]+=t[0],n[1]+=t[1],n[2]+=t[2]}function ge(n,t){return[n[0]*t,n[1]*t,n[2]*t]}function pe(n){var t=Math.sqrt(n[0]*n[0]+n[1]*n[1]+n[2]*n[2]);n[0]/=t,n[1]/=t,n[2]/=t}function ve(n){return[Math.atan2(n[1],n[0]),X(n[2])]}function de(n,t){return oa(n[0]-t[0])<Aa&&oa(n[1]-t[1])<Aa}function me(n,t){n*=Na;var e=Math.cos(t*=Na);ye(e*Math.cos(n),e*Math.sin(n),Math.sin(t))}function ye(n,t,e){++pc,dc+=(n-dc)/pc,mc+=(t-mc)/pc,yc+=(e-yc)/pc}function xe(){function n(n,u){n*=Na;var i=Math.cos(u*=Na),o=i*Math.cos(n),a=i*Math.sin(n),c=Math.sin(u),s=Math.atan2(Math.sqrt((s=e*c-r*a)*s+(s=r*o-t*c)*s+(s=t*a-e*o)*s),t*o+e*a+r*c);vc+=s,xc+=s*(t+(t=o)),Mc+=s*(e+(e=a)),_c+=s*(r+(r=c)),ye(t,e,r)}var t,e,r;kc.point=function(u,i){u*=Na;var o=Math.cos(i*=Na);t=o*Math.cos(u),e=o*Math.sin(u),r=Math.sin(i),kc.point=n,ye(t,e,r)}}function Me(){kc.point=me}function _e(){function n(n,t){n*=Na;var e=Math.cos(t*=Na),o=e*Math.cos(n),a=e*Math.sin(n),c=Math.sin(t),s=u*c-i*a,l=i*o-r*c,f=r*a-u*o,h=Math.sqrt(s*s+l*l+f*f),g=r*o+u*a+i*c,p=h&&-V(g)/h,v=Math.atan2(h,g);bc+=p*s,wc+=p*l,Sc+=p*f,vc+=v,xc+=v*(r+(r=o)),Mc+=v*(u+(u=a)),_c+=v*(i+(i=c)),ye(r,u,i)}var t,e,r,u,i;kc.point=function(o,a){t=o,e=a,kc.point=n,o*=Na;var c=Math.cos(a*=Na);r=c*Math.cos(o),u=c*Math.sin(o),i=Math.sin(a),ye(r,u,i)},kc.lineEnd=function(){n(t,e),kc.lineEnd=Me,kc.point=me}}function be(){return!0}function we(n,t,e,r,u){var i=[],o=[];if(n.forEach(function(n){if(!((t=n.length-1)<=0)){var t,e=n[0],r=n[t];if(de(e,r)){u.lineStart();for(var a=0;t>a;++a)u.point((e=n[a])[0],e[1]);return u.lineEnd(),void 0}var c=new ke(e,n,null,!0),s=new ke(e,null,c,!1);c.o=s,i.push(c),o.push(s),c=new ke(r,n,null,!1),s=new ke(r,null,c,!0),c.o=s,i.push(c),o.push(s)}}),o.sort(t),Se(i),Se(o),i.length){for(var a=0,c=e,s=o.length;s>a;++a)o[a].e=c=!c;for(var l,f,h=i[0];;){for(var g=h,p=!0;g.v;)if((g=g.n)===h)return;l=g.z,u.lineStart();do{if(g.v=g.o.v=!0,g.e){if(p)for(var a=0,s=l.length;s>a;++a)u.point((f=l[a])[0],f[1]);else r(g.x,g.n.x,1,u);g=g.n}else{if(p){l=g.p.z;for(var a=l.length-1;a>=0;--a)u.point((f=l[a])[0],f[1])}else r(g.x,g.p.x,-1,u);g=g.p}g=g.o,l=g.z,p=!p}while(!g.v);u.lineEnd()}}}function Se(n){if(t=n.length){for(var t,e,r=0,u=n[0];++r<t;)u.n=e=n[r],e.p=u,u=e;u.n=e=n[0],e.p=u}}function ke(n,t,e,r){this.x=n,this.z=t,this.o=e,this.e=r,this.v=!1,this.n=this.p=null}function Ee(n,t,e,r){return function(u,i){function o(t,e){var r=u(t,e);n(t=r[0],e=r[1])&&i.point(t,e)}function a(n,t){var e=u(n,t);d.point(e[0],e[1])}function c(){y.point=a,d.lineStart()}function s(){y.point=o,d.lineEnd()}function l(n,t){v.push([n,t]);var e=u(n,t);M.point(e[0],e[1])}function f(){M.lineStart(),v=[]}function h(){l(v[0][0],v[0][1]),M.lineEnd();var n,t=M.clean(),e=x.buffer(),r=e.length;if(v.pop(),p.push(v),v=null,r){if(1&t){n=e[0];var u,r=n.length-1,o=-1;for(i.lineStart();++o<r;)i.point((u=n[o])[0],u[1]);return i.lineEnd(),void 0}r>1&&2&t&&e.push(e.pop().concat(e.shift())),g.push(e.filter(Ae))}}var g,p,v,d=t(i),m=u.invert(r[0],r[1]),y={point:o,lineStart:c,lineEnd:s,polygonStart:function(){y.point=l,y.lineStart=f,y.lineEnd=h,g=[],p=[],i.polygonStart()},polygonEnd:function(){y.point=o,y.lineStart=c,y.lineEnd=s,g=Xo.merge(g);var n=Le(m,p);g.length?we(g,Ne,n,e,i):n&&(i.lineStart(),e(null,null,1,i),i.lineEnd()),i.polygonEnd(),g=p=null},sphere:function(){i.polygonStart(),i.lineStart(),e(null,null,1,i),i.lineEnd(),i.polygonEnd()}},x=Ce(),M=t(x);return y}}function Ae(n){return n.length>1}function Ce(){var n,t=[];return{lineStart:function(){t.push(n=[])},point:function(t,e){n.push([t,e])},lineEnd:g,buffer:function(){var e=t;return t=[],n=null,e},rejoin:function(){t.length>1&&t.push(t.pop().concat(t.shift()))}}}function Ne(n,t){return((n=n.x)[0]<0?n[1]-Ea-Aa:Ea-n[1])-((t=t.x)[0]<0?t[1]-Ea-Aa:Ea-t[1])}function Le(n,t){var e=n[0],r=n[1],u=[Math.sin(e),-Math.cos(e),0],i=0,o=0;hc.reset();for(var a=0,c=t.length;c>a;++a){var s=t[a],l=s.length;if(l)for(var f=s[0],h=f[0],g=f[1]/2+Sa/4,p=Math.sin(g),v=Math.cos(g),d=1;;){d===l&&(d=0),n=s[d];var m=n[0],y=n[1]/2+Sa/4,x=Math.sin(y),M=Math.cos(y),_=m-h,b=_>=0?1:-1,w=b*_,S=w>Sa,k=p*x;if(hc.add(Math.atan2(k*b*Math.sin(w),v*M+k*Math.cos(w))),i+=S?_+b*ka:_,S^h>=e^m>=e){var E=fe(se(f),se(n));pe(E);var A=fe(u,E);pe(A);var C=(S^_>=0?-1:1)*X(A[2]);(r>C||r===C&&(E[0]||E[1]))&&(o+=S^_>=0?1:-1)}if(!d++)break;h=m,p=x,v=M,f=n}}return(-Aa>i||Aa>i&&0>hc)^1&o}function Te(n){var t,e=0/0,r=0/0,u=0/0;return{lineStart:function(){n.lineStart(),t=1},point:function(i,o){var a=i>0?Sa:-Sa,c=oa(i-e);oa(c-Sa)<Aa?(n.point(e,r=(r+o)/2>0?Ea:-Ea),n.point(u,r),n.lineEnd(),n.lineStart(),n.point(a,r),n.point(i,r),t=0):u!==a&&c>=Sa&&(oa(e-u)<Aa&&(e-=u*Aa),oa(i-a)<Aa&&(i-=a*Aa),r=qe(e,r,i,o),n.point(u,r),n.lineEnd(),n.lineStart(),n.point(a,r),t=0),n.point(e=i,r=o),u=a},lineEnd:function(){n.lineEnd(),e=r=0/0},clean:function(){return 2-t}}}function qe(n,t,e,r){var u,i,o=Math.sin(n-e);return oa(o)>Aa?Math.atan((Math.sin(t)*(i=Math.cos(r))*Math.sin(e)-Math.sin(r)*(u=Math.cos(t))*Math.sin(n))/(u*i*o)):(t+r)/2}function ze(n,t,e,r){var u;if(null==n)u=e*Ea,r.point(-Sa,u),r.point(0,u),r.point(Sa,u),r.point(Sa,0),r.point(Sa,-u),r.point(0,-u),r.point(-Sa,-u),r.point(-Sa,0),r.point(-Sa,u);else if(oa(n[0]-t[0])>Aa){var i=n[0]<t[0]?Sa:-Sa;u=e*i/2,r.point(-i,u),r.point(0,u),r.point(i,u)}else r.point(t[0],t[1])}function Re(n){function t(n,t){return Math.cos(n)*Math.cos(t)>i}function e(n){var e,i,c,s,l;return{lineStart:function(){s=c=!1,l=1},point:function(f,h){var g,p=[f,h],v=t(f,h),d=o?v?0:u(f,h):v?u(f+(0>f?Sa:-Sa),h):0;if(!e&&(s=c=v)&&n.lineStart(),v!==c&&(g=r(e,p),(de(e,g)||de(p,g))&&(p[0]+=Aa,p[1]+=Aa,v=t(p[0],p[1]))),v!==c)l=0,v?(n.lineStart(),g=r(p,e),n.point(g[0],g[1])):(g=r(e,p),n.point(g[0],g[1]),n.lineEnd()),e=g;else if(a&&e&&o^v){var m;d&i||!(m=r(p,e,!0))||(l=0,o?(n.lineStart(),n.point(m[0][0],m[0][1]),n.point(m[1][0],m[1][1]),n.lineEnd()):(n.point(m[1][0],m[1][1]),n.lineEnd(),n.lineStart(),n.point(m[0][0],m[0][1])))}!v||e&&de(e,p)||n.point(p[0],p[1]),e=p,c=v,i=d},lineEnd:function(){c&&n.lineEnd(),e=null},clean:function(){return l|(s&&c)<<1}}}function r(n,t,e){var r=se(n),u=se(t),o=[1,0,0],a=fe(r,u),c=le(a,a),s=a[0],l=c-s*s;if(!l)return!e&&n;var f=i*c/l,h=-i*s/l,g=fe(o,a),p=ge(o,f),v=ge(a,h);he(p,v);var d=g,m=le(p,d),y=le(d,d),x=m*m-y*(le(p,p)-1);if(!(0>x)){var M=Math.sqrt(x),_=ge(d,(-m-M)/y);if(he(_,p),_=ve(_),!e)return _;var b,w=n[0],S=t[0],k=n[1],E=t[1];w>S&&(b=w,w=S,S=b);var A=S-w,C=oa(A-Sa)<Aa,N=C||Aa>A;if(!C&&k>E&&(b=k,k=E,E=b),N?C?k+E>0^_[1]<(oa(_[0]-w)<Aa?k:E):k<=_[1]&&_[1]<=E:A>Sa^(w<=_[0]&&_[0]<=S)){var L=ge(d,(-m+M)/y);return he(L,p),[_,ve(L)]}}}function u(t,e){var r=o?n:Sa-n,u=0;return-r>t?u|=1:t>r&&(u|=2),-r>e?u|=4:e>r&&(u|=8),u}var i=Math.cos(n),o=i>0,a=oa(i)>Aa,c=cr(n,6*Na);return Ee(t,e,c,o?[0,-n]:[-Sa,n-Sa])}function De(n,t,e,r){return function(u){var i,o=u.a,a=u.b,c=o.x,s=o.y,l=a.x,f=a.y,h=0,g=1,p=l-c,v=f-s;if(i=n-c,p||!(i>0)){if(i/=p,0>p){if(h>i)return;g>i&&(g=i)}else if(p>0){if(i>g)return;i>h&&(h=i)}if(i=e-c,p||!(0>i)){if(i/=p,0>p){if(i>g)return;i>h&&(h=i)}else if(p>0){if(h>i)return;g>i&&(g=i)}if(i=t-s,v||!(i>0)){if(i/=v,0>v){if(h>i)return;g>i&&(g=i)}else if(v>0){if(i>g)return;i>h&&(h=i)}if(i=r-s,v||!(0>i)){if(i/=v,0>v){if(i>g)return;i>h&&(h=i)}else if(v>0){if(h>i)return;g>i&&(g=i)}return h>0&&(u.a={x:c+h*p,y:s+h*v}),1>g&&(u.b={x:c+g*p,y:s+g*v}),u}}}}}}function Pe(n,t,e,r){function u(r,u){return oa(r[0]-n)<Aa?u>0?0:3:oa(r[0]-e)<Aa?u>0?2:1:oa(r[1]-t)<Aa?u>0?1:0:u>0?3:2}function i(n,t){return o(n.x,t.x)}function o(n,t){var e=u(n,1),r=u(t,1);return e!==r?e-r:0===e?t[1]-n[1]:1===e?n[0]-t[0]:2===e?n[1]-t[1]:t[0]-n[0]}return function(a){function c(n){for(var t=0,e=d.length,r=n[1],u=0;e>u;++u)for(var i,o=1,a=d[u],c=a.length,s=a[0];c>o;++o)i=a[o],s[1]<=r?i[1]>r&&Z(s,i,n)>0&&++t:i[1]<=r&&Z(s,i,n)<0&&--t,s=i;return 0!==t}function s(i,a,c,s){var l=0,f=0;if(null==i||(l=u(i,c))!==(f=u(a,c))||o(i,a)<0^c>0){do s.point(0===l||3===l?n:e,l>1?r:t);while((l=(l+c+4)%4)!==f)}else s.point(a[0],a[1])}function l(u,i){return u>=n&&e>=u&&i>=t&&r>=i}function f(n,t){l(n,t)&&a.point(n,t)}function h(){N.point=p,d&&d.push(m=[]),S=!0,w=!1,_=b=0/0}function g(){v&&(p(y,x),M&&w&&A.rejoin(),v.push(A.buffer())),N.point=f,w&&a.lineEnd()}function p(n,t){n=Math.max(-Ac,Math.min(Ac,n)),t=Math.max(-Ac,Math.min(Ac,t));var e=l(n,t);if(d&&m.push([n,t]),S)y=n,x=t,M=e,S=!1,e&&(a.lineStart(),a.point(n,t));else if(e&&w)a.point(n,t);else{var r={a:{x:_,y:b},b:{x:n,y:t}};C(r)?(w||(a.lineStart(),a.point(r.a.x,r.a.y)),a.point(r.b.x,r.b.y),e||a.lineEnd(),k=!1):e&&(a.lineStart(),a.point(n,t),k=!1)}_=n,b=t,w=e}var v,d,m,y,x,M,_,b,w,S,k,E=a,A=Ce(),C=De(n,t,e,r),N={point:f,lineStart:h,lineEnd:g,polygonStart:function(){a=A,v=[],d=[],k=!0},polygonEnd:function(){a=E,v=Xo.merge(v);var t=c([n,r]),e=k&&t,u=v.length;(e||u)&&(a.polygonStart(),e&&(a.lineStart(),s(null,null,1,a),a.lineEnd()),u&&we(v,i,t,s,a),a.polygonEnd()),v=d=m=null}};return N}}function Ue(n,t){function e(e,r){return e=n(e,r),t(e[0],e[1])}return n.invert&&t.invert&&(e.invert=function(e,r){return e=t.invert(e,r),e&&n.invert(e[0],e[1])}),e}function je(n){var t=0,e=Sa/3,r=nr(n),u=r(t,e);return u.parallels=function(n){return arguments.length?r(t=n[0]*Sa/180,e=n[1]*Sa/180):[180*(t/Sa),180*(e/Sa)]},u}function He(n,t){function e(n,t){var e=Math.sqrt(i-2*u*Math.sin(t))/u;return[e*Math.sin(n*=u),o-e*Math.cos(n)]}var r=Math.sin(n),u=(r+Math.sin(t))/2,i=1+r*(2*u-r),o=Math.sqrt(i)/u;return e.invert=function(n,t){var e=o-t;return[Math.atan2(n,e)/u,X((i-(n*n+e*e)*u*u)/(2*u))]},e}function Fe(){function n(n,t){Nc+=u*n-r*t,r=n,u=t}var t,e,r,u;Rc.point=function(i,o){Rc.point=n,t=r=i,e=u=o},Rc.lineEnd=function(){n(t,e)}}function Oe(n,t){Lc>n&&(Lc=n),n>qc&&(qc=n),Tc>t&&(Tc=t),t>zc&&(zc=t)}function Ye(){function n(n,t){o.push("M",n,",",t,i)}function t(n,t){o.push("M",n,",",t),a.point=e}function e(n,t){o.push("L",n,",",t)}function r(){a.point=n}function u(){o.push("Z")}var i=Ie(4.5),o=[],a={point:n,lineStart:function(){a.point=t},lineEnd:r,polygonStart:function(){a.lineEnd=u},polygonEnd:function(){a.lineEnd=r,a.point=n},pointRadius:function(n){return i=Ie(n),a},result:function(){if(o.length){var n=o.join("");return o=[],n}}};return a}function Ie(n){return"m0,"+n+"a"+n+","+n+" 0 1,1 0,"+-2*n+"a"+n+","+n+" 0 1,1 0,"+2*n+"z"}function Ze(n,t){dc+=n,mc+=t,++yc}function Ve(){function n(n,r){var u=n-t,i=r-e,o=Math.sqrt(u*u+i*i);xc+=o*(t+n)/2,Mc+=o*(e+r)/2,_c+=o,Ze(t=n,e=r)}var t,e;Pc.point=function(r,u){Pc.point=n,Ze(t=r,e=u)}}function Xe(){Pc.point=Ze}function $e(){function n(n,t){var e=n-r,i=t-u,o=Math.sqrt(e*e+i*i);xc+=o*(r+n)/2,Mc+=o*(u+t)/2,_c+=o,o=u*n-r*t,bc+=o*(r+n),wc+=o*(u+t),Sc+=3*o,Ze(r=n,u=t)}var t,e,r,u;Pc.point=function(i,o){Pc.point=n,Ze(t=r=i,e=u=o)},Pc.lineEnd=function(){n(t,e)}}function Be(n){function t(t,e){n.moveTo(t,e),n.arc(t,e,o,0,ka)}function e(t,e){n.moveTo(t,e),a.point=r}function r(t,e){n.lineTo(t,e)}function u(){a.point=t}function i(){n.closePath()}var o=4.5,a={point:t,lineStart:function(){a.point=e},lineEnd:u,polygonStart:function(){a.lineEnd=i},polygonEnd:function(){a.lineEnd=u,a.point=t},pointRadius:function(n){return o=n,a},result:g};return a}function We(n){function t(n){return(a?r:e)(n)}function e(t){return Ke(t,function(e,r){e=n(e,r),t.point(e[0],e[1])})}function r(t){function e(e,r){e=n(e,r),t.point(e[0],e[1])}function r(){x=0/0,S.point=i,t.lineStart()}function i(e,r){var i=se([e,r]),o=n(e,r);u(x,M,y,_,b,w,x=o[0],M=o[1],y=e,_=i[0],b=i[1],w=i[2],a,t),t.point(x,M)}function o(){S.point=e,t.lineEnd()}function c(){r(),S.point=s,S.lineEnd=l}function s(n,t){i(f=n,h=t),g=x,p=M,v=_,d=b,m=w,S.point=i}function l(){u(x,M,y,_,b,w,g,p,f,v,d,m,a,t),S.lineEnd=o,o()}var f,h,g,p,v,d,m,y,x,M,_,b,w,S={point:e,lineStart:r,lineEnd:o,polygonStart:function(){t.polygonStart(),S.lineStart=c},polygonEnd:function(){t.polygonEnd(),S.lineStart=r}};return S}function u(t,e,r,a,c,s,l,f,h,g,p,v,d,m){var y=l-t,x=f-e,M=y*y+x*x;if(M>4*i&&d--){var _=a+g,b=c+p,w=s+v,S=Math.sqrt(_*_+b*b+w*w),k=Math.asin(w/=S),E=oa(oa(w)-1)<Aa||oa(r-h)<Aa?(r+h)/2:Math.atan2(b,_),A=n(E,k),C=A[0],N=A[1],L=C-t,T=N-e,q=x*L-y*T;(q*q/M>i||oa((y*L+x*T)/M-.5)>.3||o>a*g+c*p+s*v)&&(u(t,e,r,a,c,s,C,N,E,_/=S,b/=S,w,d,m),m.point(C,N),u(C,N,E,_,b,w,l,f,h,g,p,v,d,m))}}var i=.5,o=Math.cos(30*Na),a=16;return t.precision=function(n){return arguments.length?(a=(i=n*n)>0&&16,t):Math.sqrt(i)},t}function Je(n){var t=We(function(t,e){return n([t*La,e*La])});return function(n){return tr(t(n))}}function Ge(n){this.stream=n}function Ke(n,t){return{point:t,sphere:function(){n.sphere()},lineStart:function(){n.lineStart()},lineEnd:function(){n.lineEnd()},polygonStart:function(){n.polygonStart()},polygonEnd:function(){n.polygonEnd()}}}function Qe(n){return nr(function(){return n})()}function nr(n){function t(n){return n=a(n[0]*Na,n[1]*Na),[n[0]*h+c,s-n[1]*h]}function e(n){return n=a.invert((n[0]-c)/h,(s-n[1])/h),n&&[n[0]*La,n[1]*La]}function r(){a=Ue(o=ur(m,y,x),i);var n=i(v,d);return c=g-n[0]*h,s=p+n[1]*h,u()}function u(){return l&&(l.valid=!1,l=null),t}var i,o,a,c,s,l,f=We(function(n,t){return n=i(n,t),[n[0]*h+c,s-n[1]*h]}),h=150,g=480,p=250,v=0,d=0,m=0,y=0,x=0,M=Ec,_=bt,b=null,w=null;return t.stream=function(n){return l&&(l.valid=!1),l=tr(M(o,f(_(n)))),l.valid=!0,l},t.clipAngle=function(n){return arguments.length?(M=null==n?(b=n,Ec):Re((b=+n)*Na),u()):b},t.clipExtent=function(n){return arguments.length?(w=n,_=n?Pe(n[0][0],n[0][1],n[1][0],n[1][1]):bt,u()):w},t.scale=function(n){return arguments.length?(h=+n,r()):h},t.translate=function(n){return arguments.length?(g=+n[0],p=+n[1],r()):[g,p]},t.center=function(n){return arguments.length?(v=n[0]%360*Na,d=n[1]%360*Na,r()):[v*La,d*La]},t.rotate=function(n){return arguments.length?(m=n[0]%360*Na,y=n[1]%360*Na,x=n.length>2?n[2]%360*Na:0,r()):[m*La,y*La,x*La]},Xo.rebind(t,f,"precision"),function(){return i=n.apply(this,arguments),t.invert=i.invert&&e,r()}}function tr(n){return Ke(n,function(t,e){n.point(t*Na,e*Na)})}function er(n,t){return[n,t]}function rr(n,t){return[n>Sa?n-ka:-Sa>n?n+ka:n,t]}function ur(n,t,e){return n?t||e?Ue(or(n),ar(t,e)):or(n):t||e?ar(t,e):rr}function ir(n){return function(t,e){return t+=n,[t>Sa?t-ka:-Sa>t?t+ka:t,e]}}function or(n){var t=ir(n);return t.invert=ir(-n),t}function ar(n,t){function e(n,t){var e=Math.cos(t),a=Math.cos(n)*e,c=Math.sin(n)*e,s=Math.sin(t),l=s*r+a*u;return[Math.atan2(c*i-l*o,a*r-s*u),X(l*i+c*o)]}var r=Math.cos(n),u=Math.sin(n),i=Math.cos(t),o=Math.sin(t);return e.invert=function(n,t){var e=Math.cos(t),a=Math.cos(n)*e,c=Math.sin(n)*e,s=Math.sin(t),l=s*i-c*o;return[Math.atan2(c*i+s*o,a*r+l*u),X(l*r-a*u)]},e}function cr(n,t){var e=Math.cos(n),r=Math.sin(n);return function(u,i,o,a){var c=o*t;null!=u?(u=sr(e,u),i=sr(e,i),(o>0?i>u:u>i)&&(u+=o*ka)):(u=n+o*ka,i=n-.5*c);for(var s,l=u;o>0?l>i:i>l;l-=c)a.point((s=ve([e,-r*Math.cos(l),-r*Math.sin(l)]))[0],s[1])}}function sr(n,t){var e=se(t);e[0]-=n,pe(e);var r=V(-e[1]);return((-e[2]<0?-r:r)+2*Math.PI-Aa)%(2*Math.PI)}function lr(n,t,e){var r=Xo.range(n,t-Aa,e).concat(t);return function(n){return r.map(function(t){return[n,t]})}}function fr(n,t,e){var r=Xo.range(n,t-Aa,e).concat(t);return function(n){return r.map(function(t){return[t,n]})}}function hr(n){return n.source}function gr(n){return n.target}function pr(n,t,e,r){var u=Math.cos(t),i=Math.sin(t),o=Math.cos(r),a=Math.sin(r),c=u*Math.cos(n),s=u*Math.sin(n),l=o*Math.cos(e),f=o*Math.sin(e),h=2*Math.asin(Math.sqrt(J(r-t)+u*o*J(e-n))),g=1/Math.sin(h),p=h?function(n){var t=Math.sin(n*=h)*g,e=Math.sin(h-n)*g,r=e*c+t*l,u=e*s+t*f,o=e*i+t*a;return[Math.atan2(u,r)*La,Math.atan2(o,Math.sqrt(r*r+u*u))*La]}:function(){return[n*La,t*La]};return p.distance=h,p}function vr(){function n(n,u){var i=Math.sin(u*=Na),o=Math.cos(u),a=oa((n*=Na)-t),c=Math.cos(a);Uc+=Math.atan2(Math.sqrt((a=o*Math.sin(a))*a+(a=r*i-e*o*c)*a),e*i+r*o*c),t=n,e=i,r=o}var t,e,r;jc.point=function(u,i){t=u*Na,e=Math.sin(i*=Na),r=Math.cos(i),jc.point=n},jc.lineEnd=function(){jc.point=jc.lineEnd=g}}function dr(n,t){function e(t,e){var r=Math.cos(t),u=Math.cos(e),i=n(r*u);return[i*u*Math.sin(t),i*Math.sin(e)]}return e.invert=function(n,e){var r=Math.sqrt(n*n+e*e),u=t(r),i=Math.sin(u),o=Math.cos(u);return[Math.atan2(n*i,r*o),Math.asin(r&&e*i/r)]},e}function mr(n,t){function e(n,t){var e=oa(oa(t)-Ea)<Aa?0:o/Math.pow(u(t),i);return[e*Math.sin(i*n),o-e*Math.cos(i*n)]}var r=Math.cos(n),u=function(n){return Math.tan(Sa/4+n/2)},i=n===t?Math.sin(n):Math.log(r/Math.cos(t))/Math.log(u(t)/u(n)),o=r*Math.pow(u(n),i)/i;return i?(e.invert=function(n,t){var e=o-t,r=I(i)*Math.sqrt(n*n+e*e);return[Math.atan2(n,e)/i,2*Math.atan(Math.pow(o/r,1/i))-Ea]},e):xr}function yr(n,t){function e(n,t){var e=i-t;return[e*Math.sin(u*n),i-e*Math.cos(u*n)]}var r=Math.cos(n),u=n===t?Math.sin(n):(r-Math.cos(t))/(t-n),i=r/u+n;return oa(u)<Aa?er:(e.invert=function(n,t){var e=i-t;return[Math.atan2(n,e)/u,i-I(u)*Math.sqrt(n*n+e*e)]},e)}function xr(n,t){return[n,Math.log(Math.tan(Sa/4+t/2))]}function Mr(n){var t,e=Qe(n),r=e.scale,u=e.translate,i=e.clipExtent;return e.scale=function(){var n=r.apply(e,arguments);return n===e?t?e.clipExtent(null):e:n},e.translate=function(){var n=u.apply(e,arguments);return n===e?t?e.clipExtent(null):e:n},e.clipExtent=function(n){var o=i.apply(e,arguments);if(o===e){if(t=null==n){var a=Sa*r(),c=u();i([[c[0]-a,c[1]-a],[c[0]+a,c[1]+a]])}}else t&&(o=null);return o},e.clipExtent(null)}function _r(n,t){return[Math.log(Math.tan(Sa/4+t/2)),-n]}function br(n){return n[0]}function wr(n){return n[1]}function Sr(n){for(var t=n.length,e=[0,1],r=2,u=2;t>u;u++){for(;r>1&&Z(n[e[r-2]],n[e[r-1]],n[u])<=0;)--r;e[r++]=u}return e.slice(0,r)}function kr(n,t){return n[0]-t[0]||n[1]-t[1]}function Er(n,t,e){return(e[0]-t[0])*(n[1]-t[1])<(e[1]-t[1])*(n[0]-t[0])}function Ar(n,t,e,r){var u=n[0],i=e[0],o=t[0]-u,a=r[0]-i,c=n[1],s=e[1],l=t[1]-c,f=r[1]-s,h=(a*(c-s)-f*(u-i))/(f*o-a*l);return[u+h*o,c+h*l]}function Cr(n){var t=n[0],e=n[n.length-1];return!(t[0]-e[0]||t[1]-e[1])}function Nr(){Jr(this),this.edge=this.site=this.circle=null}function Lr(n){var t=Jc.pop()||new Nr;return t.site=n,t}function Tr(n){Or(n),$c.remove(n),Jc.push(n),Jr(n)}function qr(n){var t=n.circle,e=t.x,r=t.cy,u={x:e,y:r},i=n.P,o=n.N,a=[n];Tr(n);for(var c=i;c.circle&&oa(e-c.circle.x)<Aa&&oa(r-c.circle.cy)<Aa;)i=c.P,a.unshift(c),Tr(c),c=i;a.unshift(c),Or(c);for(var s=o;s.circle&&oa(e-s.circle.x)<Aa&&oa(r-s.circle.cy)<Aa;)o=s.N,a.push(s),Tr(s),s=o;a.push(s),Or(s);var l,f=a.length;for(l=1;f>l;++l)s=a[l],c=a[l-1],$r(s.edge,c.site,s.site,u);c=a[0],s=a[f-1],s.edge=Vr(c.site,s.site,null,u),Fr(c),Fr(s)}function zr(n){for(var t,e,r,u,i=n.x,o=n.y,a=$c._;a;)if(r=Rr(a,o)-i,r>Aa)a=a.L;else{if(u=i-Dr(a,o),!(u>Aa)){r>-Aa?(t=a.P,e=a):u>-Aa?(t=a,e=a.N):t=e=a;break}if(!a.R){t=a;break}a=a.R}var c=Lr(n);if($c.insert(t,c),t||e){if(t===e)return Or(t),e=Lr(t.site),$c.insert(c,e),c.edge=e.edge=Vr(t.site,c.site),Fr(t),Fr(e),void 0;if(!e)return c.edge=Vr(t.site,c.site),void 0;Or(t),Or(e);var s=t.site,l=s.x,f=s.y,h=n.x-l,g=n.y-f,p=e.site,v=p.x-l,d=p.y-f,m=2*(h*d-g*v),y=h*h+g*g,x=v*v+d*d,M={x:(d*y-g*x)/m+l,y:(h*x-v*y)/m+f};$r(e.edge,s,p,M),c.edge=Vr(s,n,null,M),e.edge=Vr(n,p,null,M),Fr(t),Fr(e)}}function Rr(n,t){var e=n.site,r=e.x,u=e.y,i=u-t;if(!i)return r;var o=n.P;if(!o)return-1/0;e=o.site;var a=e.x,c=e.y,s=c-t;if(!s)return a;var l=a-r,f=1/i-1/s,h=l/s;return f?(-h+Math.sqrt(h*h-2*f*(l*l/(-2*s)-c+s/2+u-i/2)))/f+r:(r+a)/2}function Dr(n,t){var e=n.N;if(e)return Rr(e,t);var r=n.site;return r.y===t?r.x:1/0}function Pr(n){this.site=n,this.edges=[]}function Ur(n){for(var t,e,r,u,i,o,a,c,s,l,f=n[0][0],h=n[1][0],g=n[0][1],p=n[1][1],v=Xc,d=v.length;d--;)if(i=v[d],i&&i.prepare())for(a=i.edges,c=a.length,o=0;c>o;)l=a[o].end(),r=l.x,u=l.y,s=a[++o%c].start(),t=s.x,e=s.y,(oa(r-t)>Aa||oa(u-e)>Aa)&&(a.splice(o,0,new Br(Xr(i.site,l,oa(r-f)<Aa&&p-u>Aa?{x:f,y:oa(t-f)<Aa?e:p}:oa(u-p)<Aa&&h-r>Aa?{x:oa(e-p)<Aa?t:h,y:p}:oa(r-h)<Aa&&u-g>Aa?{x:h,y:oa(t-h)<Aa?e:g}:oa(u-g)<Aa&&r-f>Aa?{x:oa(e-g)<Aa?t:f,y:g}:null),i.site,null)),++c)}function jr(n,t){return t.angle-n.angle}function Hr(){Jr(this),this.x=this.y=this.arc=this.site=this.cy=null}function Fr(n){var t=n.P,e=n.N;if(t&&e){var r=t.site,u=n.site,i=e.site;if(r!==i){var o=u.x,a=u.y,c=r.x-o,s=r.y-a,l=i.x-o,f=i.y-a,h=2*(c*f-s*l);if(!(h>=-Ca)){var g=c*c+s*s,p=l*l+f*f,v=(f*g-s*p)/h,d=(c*p-l*g)/h,f=d+a,m=Gc.pop()||new Hr;m.arc=n,m.site=u,m.x=v+o,m.y=f+Math.sqrt(v*v+d*d),m.cy=f,n.circle=m;for(var y=null,x=Wc._;x;)if(m.y<x.y||m.y===x.y&&m.x<=x.x){if(!x.L){y=x.P;break}x=x.L}else{if(!x.R){y=x;break}x=x.R}Wc.insert(y,m),y||(Bc=m)}}}}function Or(n){var t=n.circle;t&&(t.P||(Bc=t.N),Wc.remove(t),Gc.push(t),Jr(t),n.circle=null)}function Yr(n){for(var t,e=Vc,r=De(n[0][0],n[0][1],n[1][0],n[1][1]),u=e.length;u--;)t=e[u],(!Ir(t,n)||!r(t)||oa(t.a.x-t.b.x)<Aa&&oa(t.a.y-t.b.y)<Aa)&&(t.a=t.b=null,e.splice(u,1))}function Ir(n,t){var e=n.b;if(e)return!0;var r,u,i=n.a,o=t[0][0],a=t[1][0],c=t[0][1],s=t[1][1],l=n.l,f=n.r,h=l.x,g=l.y,p=f.x,v=f.y,d=(h+p)/2,m=(g+v)/2;if(v===g){if(o>d||d>=a)return;if(h>p){if(i){if(i.y>=s)return}else i={x:d,y:c};e={x:d,y:s}}else{if(i){if(i.y<c)return}else i={x:d,y:s};e={x:d,y:c}}}else if(r=(h-p)/(v-g),u=m-r*d,-1>r||r>1)if(h>p){if(i){if(i.y>=s)return}else i={x:(c-u)/r,y:c};e={x:(s-u)/r,y:s}}else{if(i){if(i.y<c)return}else i={x:(s-u)/r,y:s};e={x:(c-u)/r,y:c}}else if(v>g){if(i){if(i.x>=a)return}else i={x:o,y:r*o+u};e={x:a,y:r*a+u}}else{if(i){if(i.x<o)return}else i={x:a,y:r*a+u};e={x:o,y:r*o+u}}return n.a=i,n.b=e,!0}function Zr(n,t){this.l=n,this.r=t,this.a=this.b=null}function Vr(n,t,e,r){var u=new Zr(n,t);return Vc.push(u),e&&$r(u,n,t,e),r&&$r(u,t,n,r),Xc[n.i].edges.push(new Br(u,n,t)),Xc[t.i].edges.push(new Br(u,t,n)),u}function Xr(n,t,e){var r=new Zr(n,null);return r.a=t,r.b=e,Vc.push(r),r}function $r(n,t,e,r){n.a||n.b?n.l===e?n.b=r:n.a=r:(n.a=r,n.l=t,n.r=e)}function Br(n,t,e){var r=n.a,u=n.b;this.edge=n,this.site=t,this.angle=e?Math.atan2(e.y-t.y,e.x-t.x):n.l===t?Math.atan2(u.x-r.x,r.y-u.y):Math.atan2(r.x-u.x,u.y-r.y)}function Wr(){this._=null}function Jr(n){n.U=n.C=n.L=n.R=n.P=n.N=null}function Gr(n,t){var e=t,r=t.R,u=e.U;u?u.L===e?u.L=r:u.R=r:n._=r,r.U=u,e.U=r,e.R=r.L,e.R&&(e.R.U=e),r.L=e}function Kr(n,t){var e=t,r=t.L,u=e.U;u?u.L===e?u.L=r:u.R=r:n._=r,r.U=u,e.U=r,e.L=r.R,e.L&&(e.L.U=e),r.R=e}function Qr(n){for(;n.L;)n=n.L;return n}function nu(n,t){var e,r,u,i=n.sort(tu).pop();for(Vc=[],Xc=new Array(n.length),$c=new Wr,Wc=new Wr;;)if(u=Bc,i&&(!u||i.y<u.y||i.y===u.y&&i.x<u.x))(i.x!==e||i.y!==r)&&(Xc[i.i]=new Pr(i),zr(i),e=i.x,r=i.y),i=n.pop();else{if(!u)break;qr(u.arc)}t&&(Yr(t),Ur(t));var o={cells:Xc,edges:Vc};return $c=Wc=Vc=Xc=null,o}function tu(n,t){return t.y-n.y||t.x-n.x}function eu(n,t,e){return(n.x-e.x)*(t.y-n.y)-(n.x-t.x)*(e.y-n.y)}function ru(n){return n.x}function uu(n){return n.y}function iu(){return{leaf:!0,nodes:[],point:null,x:null,y:null}}function ou(n,t,e,r,u,i){if(!n(t,e,r,u,i)){var o=.5*(e+u),a=.5*(r+i),c=t.nodes;c[0]&&ou(n,c[0],e,r,o,a),c[1]&&ou(n,c[1],o,r,u,a),c[2]&&ou(n,c[2],e,a,o,i),c[3]&&ou(n,c[3],o,a,u,i)}}function au(n,t){n=Xo.rgb(n),t=Xo.rgb(t);var e=n.r,r=n.g,u=n.b,i=t.r-e,o=t.g-r,a=t.b-u;return function(n){return"#"+vt(Math.round(e+i*n))+vt(Math.round(r+o*n))+vt(Math.round(u+a*n))}}function cu(n,t){var e,r={},u={};for(e in n)e in t?r[e]=fu(n[e],t[e]):u[e]=n[e];for(e in t)e in n||(u[e]=t[e]);return function(n){for(e in r)u[e]=r[e](n);return u}}function su(n,t){return t-=n=+n,function(e){return n+t*e}}function lu(n,t){var e,r,u,i,o,a=0,c=0,s=[],l=[];for(n+="",t+="",Qc.lastIndex=0,r=0;e=Qc.exec(t);++r)e.index&&s.push(t.substring(a,c=e.index)),l.push({i:s.length,x:e[0]}),s.push(null),a=Qc.lastIndex;for(a<t.length&&s.push(t.substring(a)),r=0,i=l.length;(e=Qc.exec(n))&&i>r;++r)if(o=l[r],o.x==e[0]){if(o.i)if(null==s[o.i+1])for(s[o.i-1]+=o.x,s.splice(o.i,1),u=r+1;i>u;++u)l[u].i--;else for(s[o.i-1]+=o.x+s[o.i+1],s.splice(o.i,2),u=r+1;i>u;++u)l[u].i-=2;else if(null==s[o.i+1])s[o.i]=o.x;else for(s[o.i]=o.x+s[o.i+1],s.splice(o.i+1,1),u=r+1;i>u;++u)l[u].i--;l.splice(r,1),i--,r--}else o.x=su(parseFloat(e[0]),parseFloat(o.x));for(;i>r;)o=l.pop(),null==s[o.i+1]?s[o.i]=o.x:(s[o.i]=o.x+s[o.i+1],s.splice(o.i+1,1)),i--;return 1===s.length?null==s[0]?(o=l[0].x,function(n){return o(n)+""}):function(){return t}:function(n){for(r=0;i>r;++r)s[(o=l[r]).i]=o.x(n);return s.join("")}}function fu(n,t){for(var e,r=Xo.interpolators.length;--r>=0&&!(e=Xo.interpolators[r](n,t)););return e}function hu(n,t){var e,r=[],u=[],i=n.length,o=t.length,a=Math.min(n.length,t.length);for(e=0;a>e;++e)r.push(fu(n[e],t[e]));for(;i>e;++e)u[e]=n[e];for(;o>e;++e)u[e]=t[e];return function(n){for(e=0;a>e;++e)u[e]=r[e](n);return u}}function gu(n){return function(t){return 0>=t?0:t>=1?1:n(t)}}function pu(n){return function(t){return 1-n(1-t)}}function vu(n){return function(t){return.5*(.5>t?n(2*t):2-n(2-2*t))}}function du(n){return n*n}function mu(n){return n*n*n}function yu(n){if(0>=n)return 0;if(n>=1)return 1;var t=n*n,e=t*n;return 4*(.5>n?e:3*(n-t)+e-.75)}function xu(n){return function(t){return Math.pow(t,n)}}function Mu(n){return 1-Math.cos(n*Ea)}function _u(n){return Math.pow(2,10*(n-1))}function bu(n){return 1-Math.sqrt(1-n*n)}function wu(n,t){var e;return arguments.length<2&&(t=.45),arguments.length?e=t/ka*Math.asin(1/n):(n=1,e=t/4),function(r){return 1+n*Math.pow(2,-10*r)*Math.sin((r-e)*ka/t)}}function Su(n){return n||(n=1.70158),function(t){return t*t*((n+1)*t-n)}}function ku(n){return 1/2.75>n?7.5625*n*n:2/2.75>n?7.5625*(n-=1.5/2.75)*n+.75:2.5/2.75>n?7.5625*(n-=2.25/2.75)*n+.9375:7.5625*(n-=2.625/2.75)*n+.984375}function Eu(n,t){n=Xo.hcl(n),t=Xo.hcl(t);var e=n.h,r=n.c,u=n.l,i=t.h-e,o=t.c-r,a=t.l-u;return isNaN(o)&&(o=0,r=isNaN(r)?t.c:r),isNaN(i)?(i=0,e=isNaN(e)?t.h:e):i>180?i-=360:-180>i&&(i+=360),function(n){return rt(e+i*n,r+o*n,u+a*n)+""}}function Au(n,t){n=Xo.hsl(n),t=Xo.hsl(t);var e=n.h,r=n.s,u=n.l,i=t.h-e,o=t.s-r,a=t.l-u;return isNaN(o)&&(o=0,r=isNaN(r)?t.s:r),isNaN(i)?(i=0,e=isNaN(e)?t.h:e):i>180?i-=360:-180>i&&(i+=360),function(n){return nt(e+i*n,r+o*n,u+a*n)+""}}function Cu(n,t){n=Xo.lab(n),t=Xo.lab(t);var e=n.l,r=n.a,u=n.b,i=t.l-e,o=t.a-r,a=t.b-u;return function(n){return ot(e+i*n,r+o*n,u+a*n)+""}}function Nu(n,t){return t-=n,function(e){return Math.round(n+t*e)}}function Lu(n){var t=[n.a,n.b],e=[n.c,n.d],r=qu(t),u=Tu(t,e),i=qu(zu(e,t,-u))||0;t[0]*e[1]<e[0]*t[1]&&(t[0]*=-1,t[1]*=-1,r*=-1,u*=-1),this.rotate=(r?Math.atan2(t[1],t[0]):Math.atan2(-e[0],e[1]))*La,this.translate=[n.e,n.f],this.scale=[r,i],this.skew=i?Math.atan2(u,i)*La:0}function Tu(n,t){return n[0]*t[0]+n[1]*t[1]}function qu(n){var t=Math.sqrt(Tu(n,n));return t&&(n[0]/=t,n[1]/=t),t}function zu(n,t,e){return n[0]+=e*t[0],n[1]+=e*t[1],n}function Ru(n,t){var e,r=[],u=[],i=Xo.transform(n),o=Xo.transform(t),a=i.translate,c=o.translate,s=i.rotate,l=o.rotate,f=i.skew,h=o.skew,g=i.scale,p=o.scale;return a[0]!=c[0]||a[1]!=c[1]?(r.push("translate(",null,",",null,")"),u.push({i:1,x:su(a[0],c[0])},{i:3,x:su(a[1],c[1])})):c[0]||c[1]?r.push("translate("+c+")"):r.push(""),s!=l?(s-l>180?l+=360:l-s>180&&(s+=360),u.push({i:r.push(r.pop()+"rotate(",null,")")-2,x:su(s,l)})):l&&r.push(r.pop()+"rotate("+l+")"),f!=h?u.push({i:r.push(r.pop()+"skewX(",null,")")-2,x:su(f,h)}):h&&r.push(r.pop()+"skewX("+h+")"),g[0]!=p[0]||g[1]!=p[1]?(e=r.push(r.pop()+"scale(",null,",",null,")"),u.push({i:e-4,x:su(g[0],p[0])},{i:e-2,x:su(g[1],p[1])})):(1!=p[0]||1!=p[1])&&r.push(r.pop()+"scale("+p+")"),e=u.length,function(n){for(var t,i=-1;++i<e;)r[(t=u[i]).i]=t.x(n);return r.join("")}}function Du(n,t){return t=t-(n=+n)?1/(t-n):0,function(e){return(e-n)*t}}function Pu(n,t){return t=t-(n=+n)?1/(t-n):0,function(e){return Math.max(0,Math.min(1,(e-n)*t))}}function Uu(n){for(var t=n.source,e=n.target,r=Hu(t,e),u=[t];t!==r;)t=t.parent,u.push(t);for(var i=u.length;e!==r;)u.splice(i,0,e),e=e.parent;return u}function ju(n){for(var t=[],e=n.parent;null!=e;)t.push(n),n=e,e=e.parent;return t.push(n),t}function Hu(n,t){if(n===t)return n;for(var e=ju(n),r=ju(t),u=e.pop(),i=r.pop(),o=null;u===i;)o=u,u=e.pop(),i=r.pop();return o}function Fu(n){n.fixed|=2}function Ou(n){n.fixed&=-7}function Yu(n){n.fixed|=4,n.px=n.x,n.py=n.y}function Iu(n){n.fixed&=-5}function Zu(n,t,e){var r=0,u=0;if(n.charge=0,!n.leaf)for(var i,o=n.nodes,a=o.length,c=-1;++c<a;)i=o[c],null!=i&&(Zu(i,t,e),n.charge+=i.charge,r+=i.charge*i.cx,u+=i.charge*i.cy);if(n.point){n.leaf||(n.point.x+=Math.random()-.5,n.point.y+=Math.random()-.5);var s=t*e[n.point.index];n.charge+=n.pointCharge=s,r+=s*n.point.x,u+=s*n.point.y}n.cx=r/n.charge,n.cy=u/n.charge}function Vu(n,t){return Xo.rebind(n,t,"sort","children","value"),n.nodes=n,n.links=Wu,n}function Xu(n){return n.children}function $u(n){return n.value}function Bu(n,t){return t.value-n.value}function Wu(n){return Xo.merge(n.map(function(n){return(n.children||[]).map(function(t){return{source:n,target:t}})}))}function Ju(n){return n.x}function Gu(n){return n.y}function Ku(n,t,e){n.y0=t,n.y=e}function Qu(n){return Xo.range(n.length)}function ni(n){for(var t=-1,e=n[0].length,r=[];++t<e;)r[t]=0;return r}function ti(n){for(var t,e=1,r=0,u=n[0][1],i=n.length;i>e;++e)(t=n[e][1])>u&&(r=e,u=t);return r}function ei(n){return n.reduce(ri,0)}function ri(n,t){return n+t[1]}function ui(n,t){return ii(n,Math.ceil(Math.log(t.length)/Math.LN2+1))}function ii(n,t){for(var e=-1,r=+n[0],u=(n[1]-r)/t,i=[];++e<=t;)i[e]=u*e+r;return i}function oi(n){return[Xo.min(n),Xo.max(n)]}function ai(n,t){return n.parent==t.parent?1:2}function ci(n){var t=n.children;return t&&t.length?t[0]:n._tree.thread}function si(n){var t,e=n.children;return e&&(t=e.length)?e[t-1]:n._tree.thread}function li(n,t){var e=n.children;if(e&&(u=e.length))for(var r,u,i=-1;++i<u;)t(r=li(e[i],t),n)>0&&(n=r);return n}function fi(n,t){return n.x-t.x}function hi(n,t){return t.x-n.x}function gi(n,t){return n.depth-t.depth}function pi(n,t){function e(n,r){var u=n.children;if(u&&(o=u.length))for(var i,o,a=null,c=-1;++c<o;)i=u[c],e(i,a),a=i;t(n,r)}e(n,null)}function vi(n){for(var t,e=0,r=0,u=n.children,i=u.length;--i>=0;)t=u[i]._tree,t.prelim+=e,t.mod+=e,e+=t.shift+(r+=t.change)}function di(n,t,e){n=n._tree,t=t._tree;var r=e/(t.number-n.number);n.change+=r,t.change-=r,t.shift+=e,t.prelim+=e,t.mod+=e}function mi(n,t,e){return n._tree.ancestor.parent==t.parent?n._tree.ancestor:e}function yi(n,t){return n.value-t.value}function xi(n,t){var e=n._pack_next;n._pack_next=t,t._pack_prev=n,t._pack_next=e,e._pack_prev=t}function Mi(n,t){n._pack_next=t,t._pack_prev=n}function _i(n,t){var e=t.x-n.x,r=t.y-n.y,u=n.r+t.r;return.999*u*u>e*e+r*r}function bi(n){function t(n){l=Math.min(n.x-n.r,l),f=Math.max(n.x+n.r,f),h=Math.min(n.y-n.r,h),g=Math.max(n.y+n.r,g)}if((e=n.children)&&(s=e.length)){var e,r,u,i,o,a,c,s,l=1/0,f=-1/0,h=1/0,g=-1/0;if(e.forEach(wi),r=e[0],r.x=-r.r,r.y=0,t(r),s>1&&(u=e[1],u.x=u.r,u.y=0,t(u),s>2))for(i=e[2],Ei(r,u,i),t(i),xi(r,i),r._pack_prev=i,xi(i,u),u=r._pack_next,o=3;s>o;o++){Ei(r,u,i=e[o]);var p=0,v=1,d=1;for(a=u._pack_next;a!==u;a=a._pack_next,v++)if(_i(a,i)){p=1;break}if(1==p)for(c=r._pack_prev;c!==a._pack_prev&&!_i(c,i);c=c._pack_prev,d++);p?(d>v||v==d&&u.r<r.r?Mi(r,u=a):Mi(r=c,u),o--):(xi(r,i),u=i,t(i))}var m=(l+f)/2,y=(h+g)/2,x=0;for(o=0;s>o;o++)i=e[o],i.x-=m,i.y-=y,x=Math.max(x,i.r+Math.sqrt(i.x*i.x+i.y*i.y));n.r=x,e.forEach(Si)}}function wi(n){n._pack_next=n._pack_prev=n}function Si(n){delete n._pack_next,delete n._pack_prev}function ki(n,t,e,r){var u=n.children;if(n.x=t+=r*n.x,n.y=e+=r*n.y,n.r*=r,u)for(var i=-1,o=u.length;++i<o;)ki(u[i],t,e,r)}function Ei(n,t,e){var r=n.r+e.r,u=t.x-n.x,i=t.y-n.y;if(r&&(u||i)){var o=t.r+e.r,a=u*u+i*i;o*=o,r*=r;var c=.5+(r-o)/(2*a),s=Math.sqrt(Math.max(0,2*o*(r+a)-(r-=a)*r-o*o))/(2*a);e.x=n.x+c*u+s*i,e.y=n.y+c*i-s*u}else e.x=n.x+r,e.y=n.y}function Ai(n){return 1+Xo.max(n,function(n){return n.y})}function Ci(n){return n.reduce(function(n,t){return n+t.x},0)/n.length}function Ni(n){var t=n.children;return t&&t.length?Ni(t[0]):n}function Li(n){var t,e=n.children;return e&&(t=e.length)?Li(e[t-1]):n}function Ti(n){return{x:n.x,y:n.y,dx:n.dx,dy:n.dy}}function qi(n,t){var e=n.x+t[3],r=n.y+t[0],u=n.dx-t[1]-t[3],i=n.dy-t[0]-t[2];return 0>u&&(e+=u/2,u=0),0>i&&(r+=i/2,i=0),{x:e,y:r,dx:u,dy:i}}function zi(n){var t=n[0],e=n[n.length-1];return e>t?[t,e]:[e,t]}function Ri(n){return n.rangeExtent?n.rangeExtent():zi(n.range())}function Di(n,t,e,r){var u=e(n[0],n[1]),i=r(t[0],t[1]);return function(n){return i(u(n))}}function Pi(n,t){var e,r=0,u=n.length-1,i=n[r],o=n[u];return i>o&&(e=r,r=u,u=e,e=i,i=o,o=e),n[r]=t.floor(i),n[u]=t.ceil(o),n}function Ui(n){return n?{floor:function(t){return Math.floor(t/n)*n},ceil:function(t){return Math.ceil(t/n)*n}}:ls}function ji(n,t,e,r){var u=[],i=[],o=0,a=Math.min(n.length,t.length)-1;for(n[a]<n[0]&&(n=n.slice().reverse(),t=t.slice().reverse());++o<=a;)u.push(e(n[o-1],n[o])),i.push(r(t[o-1],t[o]));return function(t){var e=Xo.bisect(n,t,1,a)-1;return i[e](u[e](t))}}function Hi(n,t,e,r){function u(){var u=Math.min(n.length,t.length)>2?ji:Di,c=r?Pu:Du;return o=u(n,t,c,e),a=u(t,n,c,fu),i}function i(n){return o(n)}var o,a;return i.invert=function(n){return a(n)},i.domain=function(t){return arguments.length?(n=t.map(Number),u()):n},i.range=function(n){return arguments.length?(t=n,u()):t},i.rangeRound=function(n){return i.range(n).interpolate(Nu)},i.clamp=function(n){return arguments.length?(r=n,u()):r},i.interpolate=function(n){return arguments.length?(e=n,u()):e},i.ticks=function(t){return Ii(n,t)},i.tickFormat=function(t,e){return Zi(n,t,e)},i.nice=function(t){return Oi(n,t),u()},i.copy=function(){return Hi(n,t,e,r)},u()}function Fi(n,t){return Xo.rebind(n,t,"range","rangeRound","interpolate","clamp")}function Oi(n,t){return Pi(n,Ui(Yi(n,t)[2]))}function Yi(n,t){null==t&&(t=10);var e=zi(n),r=e[1]-e[0],u=Math.pow(10,Math.floor(Math.log(r/t)/Math.LN10)),i=t/r*u;return.15>=i?u*=10:.35>=i?u*=5:.75>=i&&(u*=2),e[0]=Math.ceil(e[0]/u)*u,e[1]=Math.floor(e[1]/u)*u+.5*u,e[2]=u,e}function Ii(n,t){return Xo.range.apply(Xo,Yi(n,t))}function Zi(n,t,e){var r=Yi(n,t);return Xo.format(e?e.replace(Qa,function(n,t,e,u,i,o,a,c,s,l){return[t,e,u,i,o,a,c,s||"."+Xi(l,r),l].join("")}):",."+Vi(r[2])+"f")}function Vi(n){return-Math.floor(Math.log(n)/Math.LN10+.01)}function Xi(n,t){var e=Vi(t[2]);return n in fs?Math.abs(e-Vi(Math.max(Math.abs(t[0]),Math.abs(t[1]))))+ +("e"!==n):e-2*("%"===n)}function $i(n,t,e,r){function u(n){return(e?Math.log(0>n?0:n):-Math.log(n>0?0:-n))/Math.log(t)}function i(n){return e?Math.pow(t,n):-Math.pow(t,-n)}function o(t){return n(u(t))}return o.invert=function(t){return i(n.invert(t))},o.domain=function(t){return arguments.length?(e=t[0]>=0,n.domain((r=t.map(Number)).map(u)),o):r},o.base=function(e){return arguments.length?(t=+e,n.domain(r.map(u)),o):t},o.nice=function(){var t=Pi(r.map(u),e?Math:gs);return n.domain(t),r=t.map(i),o},o.ticks=function(){var n=zi(r),o=[],a=n[0],c=n[1],s=Math.floor(u(a)),l=Math.ceil(u(c)),f=t%1?2:t;if(isFinite(l-s)){if(e){for(;l>s;s++)for(var h=1;f>h;h++)o.push(i(s)*h);o.push(i(s))}else for(o.push(i(s));s++<l;)for(var h=f-1;h>0;h--)o.push(i(s)*h);for(s=0;o[s]<a;s++);for(l=o.length;o[l-1]>c;l--);o=o.slice(s,l)}return o},o.tickFormat=function(n,t){if(!arguments.length)return hs;arguments.length<2?t=hs:"function"!=typeof t&&(t=Xo.format(t));var r,a=Math.max(.1,n/o.ticks().length),c=e?(r=1e-12,Math.ceil):(r=-1e-12,Math.floor);return function(n){return n/i(c(u(n)+r))<=a?t(n):""}},o.copy=function(){return $i(n.copy(),t,e,r)},Fi(o,n)}function Bi(n,t,e){function r(t){return n(u(t))}var u=Wi(t),i=Wi(1/t);return r.invert=function(t){return i(n.invert(t))},r.domain=function(t){return arguments.length?(n.domain((e=t.map(Number)).map(u)),r):e},r.ticks=function(n){return Ii(e,n)},r.tickFormat=function(n,t){return Zi(e,n,t)},r.nice=function(n){return r.domain(Oi(e,n))},r.exponent=function(o){return arguments.length?(u=Wi(t=o),i=Wi(1/t),n.domain(e.map(u)),r):t},r.copy=function(){return Bi(n.copy(),t,e)},Fi(r,n)}function Wi(n){return function(t){return 0>t?-Math.pow(-t,n):Math.pow(t,n)}}function Ji(n,t){function e(e){return o[((i.get(e)||"range"===t.t&&i.set(e,n.push(e)))-1)%o.length]}function r(t,e){return Xo.range(n.length).map(function(n){return t+e*n})}var i,o,a;return e.domain=function(r){if(!arguments.length)return n;n=[],i=new u;for(var o,a=-1,c=r.length;++a<c;)i.has(o=r[a])||i.set(o,n.push(o));return e[t.t].apply(e,t.a)},e.range=function(n){return arguments.length?(o=n,a=0,t={t:"range",a:arguments},e):o},e.rangePoints=function(u,i){arguments.length<2&&(i=0);var c=u[0],s=u[1],l=(s-c)/(Math.max(1,n.length-1)+i);return o=r(n.length<2?(c+s)/2:c+l*i/2,l),a=0,t={t:"rangePoints",a:arguments},e},e.rangeBands=function(u,i,c){arguments.length<2&&(i=0),arguments.length<3&&(c=i);var s=u[1]<u[0],l=u[s-0],f=u[1-s],h=(f-l)/(n.length-i+2*c);return o=r(l+h*c,h),s&&o.reverse(),a=h*(1-i),t={t:"rangeBands",a:arguments},e},e.rangeRoundBands=function(u,i,c){arguments.length<2&&(i=0),arguments.length<3&&(c=i);var s=u[1]<u[0],l=u[s-0],f=u[1-s],h=Math.floor((f-l)/(n.length-i+2*c)),g=f-l-(n.length-i)*h;return o=r(l+Math.round(g/2),h),s&&o.reverse(),a=Math.round(h*(1-i)),t={t:"rangeRoundBands",a:arguments},e},e.rangeBand=function(){return a},e.rangeExtent=function(){return zi(t.a[0])},e.copy=function(){return Ji(n,t)},e.domain(n)}function Gi(n,t){function e(){var e=0,i=t.length;for(u=[];++e<i;)u[e-1]=Xo.quantile(n,e/i);return r}function r(n){return isNaN(n=+n)?void 0:t[Xo.bisect(u,n)]}var u;return r.domain=function(t){return arguments.length?(n=t.filter(function(n){return!isNaN(n)}).sort(Xo.ascending),e()):n},r.range=function(n){return arguments.length?(t=n,e()):t},r.quantiles=function(){return u},r.invertExtent=function(e){return e=t.indexOf(e),0>e?[0/0,0/0]:[e>0?u[e-1]:n[0],e<u.length?u[e]:n[n.length-1]]},r.copy=function(){return Gi(n,t)},e()}function Ki(n,t,e){function r(t){return e[Math.max(0,Math.min(o,Math.floor(i*(t-n))))]}function u(){return i=e.length/(t-n),o=e.length-1,r}var i,o;return r.domain=function(e){return arguments.length?(n=+e[0],t=+e[e.length-1],u()):[n,t]},r.range=function(n){return arguments.length?(e=n,u()):e},r.invertExtent=function(t){return t=e.indexOf(t),t=0>t?0/0:t/i+n,[t,t+1/i]},r.copy=function(){return Ki(n,t,e)},u()}function Qi(n,t){function e(e){return e>=e?t[Xo.bisect(n,e)]:void 0}return e.domain=function(t){return arguments.length?(n=t,e):n},e.range=function(n){return arguments.length?(t=n,e):t},e.invertExtent=function(e){return e=t.indexOf(e),[n[e-1],n[e]]},e.copy=function(){return Qi(n,t)},e}function no(n){function t(n){return+n}return t.invert=t,t.domain=t.range=function(e){return arguments.length?(n=e.map(t),t):n},t.ticks=function(t){return Ii(n,t)},t.tickFormat=function(t,e){return Zi(n,t,e)},t.copy=function(){return no(n)},t}function to(n){return n.innerRadius}function eo(n){return n.outerRadius}function ro(n){return n.startAngle}function uo(n){return n.endAngle}function io(n){function t(t){function o(){s.push("M",i(n(l),a))}for(var c,s=[],l=[],f=-1,h=t.length,g=_t(e),p=_t(r);++f<h;)u.call(this,c=t[f],f)?l.push([+g.call(this,c,f),+p.call(this,c,f)]):l.length&&(o(),l=[]);return l.length&&o(),s.length?s.join(""):null}var e=br,r=wr,u=be,i=oo,o=i.key,a=.7;return t.x=function(n){return arguments.length?(e=n,t):e},t.y=function(n){return arguments.length?(r=n,t):r},t.defined=function(n){return arguments.length?(u=n,t):u},t.interpolate=function(n){return arguments.length?(o="function"==typeof n?i=n:(i=Ms.get(n)||oo).key,t):o},t.tension=function(n){return arguments.length?(a=n,t):a},t}function oo(n){return n.join("L")}function ao(n){return oo(n)+"Z"}function co(n){for(var t=0,e=n.length,r=n[0],u=[r[0],",",r[1]];++t<e;)u.push("H",(r[0]+(r=n[t])[0])/2,"V",r[1]);return e>1&&u.push("H",r[0]),u.join("")}function so(n){for(var t=0,e=n.length,r=n[0],u=[r[0],",",r[1]];++t<e;)u.push("V",(r=n[t])[1],"H",r[0]);return u.join("")}function lo(n){for(var t=0,e=n.length,r=n[0],u=[r[0],",",r[1]];++t<e;)u.push("H",(r=n[t])[0],"V",r[1]);return u.join("")}function fo(n,t){return n.length<4?oo(n):n[1]+po(n.slice(1,n.length-1),vo(n,t))}function ho(n,t){return n.length<3?oo(n):n[0]+po((n.push(n[0]),n),vo([n[n.length-2]].concat(n,[n[1]]),t))}function go(n,t){return n.length<3?oo(n):n[0]+po(n,vo(n,t))}function po(n,t){if(t.length<1||n.length!=t.length&&n.length!=t.length+2)return oo(n);var e=n.length!=t.length,r="",u=n[0],i=n[1],o=t[0],a=o,c=1;if(e&&(r+="Q"+(i[0]-2*o[0]/3)+","+(i[1]-2*o[1]/3)+","+i[0]+","+i[1],u=n[1],c=2),t.length>1){a=t[1],i=n[c],c++,r+="C"+(u[0]+o[0])+","+(u[1]+o[1])+","+(i[0]-a[0])+","+(i[1]-a[1])+","+i[0]+","+i[1];for(var s=2;s<t.length;s++,c++)i=n[c],a=t[s],r+="S"+(i[0]-a[0])+","+(i[1]-a[1])+","+i[0]+","+i[1]}if(e){var l=n[c];r+="Q"+(i[0]+2*a[0]/3)+","+(i[1]+2*a[1]/3)+","+l[0]+","+l[1]}return r}function vo(n,t){for(var e,r=[],u=(1-t)/2,i=n[0],o=n[1],a=1,c=n.length;++a<c;)e=i,i=o,o=n[a],r.push([u*(o[0]-e[0]),u*(o[1]-e[1])]);return r}function mo(n){if(n.length<3)return oo(n);var t=1,e=n.length,r=n[0],u=r[0],i=r[1],o=[u,u,u,(r=n[1])[0]],a=[i,i,i,r[1]],c=[u,",",i,"L",_o(ws,o),",",_o(ws,a)];for(n.push(n[e-1]);++t<=e;)r=n[t],o.shift(),o.push(r[0]),a.shift(),a.push(r[1]),bo(c,o,a);return n.pop(),c.push("L",r),c.join("")}function yo(n){if(n.length<4)return oo(n);for(var t,e=[],r=-1,u=n.length,i=[0],o=[0];++r<3;)t=n[r],i.push(t[0]),o.push(t[1]);for(e.push(_o(ws,i)+","+_o(ws,o)),--r;++r<u;)t=n[r],i.shift(),i.push(t[0]),o.shift(),o.push(t[1]),bo(e,i,o);return e.join("")}function xo(n){for(var t,e,r=-1,u=n.length,i=u+4,o=[],a=[];++r<4;)e=n[r%u],o.push(e[0]),a.push(e[1]);for(t=[_o(ws,o),",",_o(ws,a)],--r;++r<i;)e=n[r%u],o.shift(),o.push(e[0]),a.shift(),a.push(e[1]),bo(t,o,a);return t.join("")}function Mo(n,t){var e=n.length-1;if(e)for(var r,u,i=n[0][0],o=n[0][1],a=n[e][0]-i,c=n[e][1]-o,s=-1;++s<=e;)r=n[s],u=s/e,r[0]=t*r[0]+(1-t)*(i+u*a),r[1]=t*r[1]+(1-t)*(o+u*c);return mo(n)}function _o(n,t){return n[0]*t[0]+n[1]*t[1]+n[2]*t[2]+n[3]*t[3]}function bo(n,t,e){n.push("C",_o(_s,t),",",_o(_s,e),",",_o(bs,t),",",_o(bs,e),",",_o(ws,t),",",_o(ws,e))}function wo(n,t){return(t[1]-n[1])/(t[0]-n[0])}function So(n){for(var t=0,e=n.length-1,r=[],u=n[0],i=n[1],o=r[0]=wo(u,i);++t<e;)r[t]=(o+(o=wo(u=i,i=n[t+1])))/2;return r[t]=o,r}function ko(n){for(var t,e,r,u,i=[],o=So(n),a=-1,c=n.length-1;++a<c;)t=wo(n[a],n[a+1]),oa(t)<Aa?o[a]=o[a+1]=0:(e=o[a]/t,r=o[a+1]/t,u=e*e+r*r,u>9&&(u=3*t/Math.sqrt(u),o[a]=u*e,o[a+1]=u*r));for(a=-1;++a<=c;)u=(n[Math.min(c,a+1)][0]-n[Math.max(0,a-1)][0])/(6*(1+o[a]*o[a])),i.push([u||0,o[a]*u||0]);return i}function Eo(n){return n.length<3?oo(n):n[0]+po(n,ko(n))}function Ao(n){for(var t,e,r,u=-1,i=n.length;++u<i;)t=n[u],e=t[0],r=t[1]+ys,t[0]=e*Math.cos(r),t[1]=e*Math.sin(r);return n}function Co(n){function t(t){function c(){v.push("M",a(n(m),f),l,s(n(d.reverse()),f),"Z")}for(var h,g,p,v=[],d=[],m=[],y=-1,x=t.length,M=_t(e),_=_t(u),b=e===r?function(){return g}:_t(r),w=u===i?function(){return p}:_t(i);++y<x;)o.call(this,h=t[y],y)?(d.push([g=+M.call(this,h,y),p=+_.call(this,h,y)]),m.push([+b.call(this,h,y),+w.call(this,h,y)])):d.length&&(c(),d=[],m=[]);return d.length&&c(),v.length?v.join(""):null}var e=br,r=br,u=0,i=wr,o=be,a=oo,c=a.key,s=a,l="L",f=.7;return t.x=function(n){return arguments.length?(e=r=n,t):r},t.x0=function(n){return arguments.length?(e=n,t):e},t.x1=function(n){return arguments.length?(r=n,t):r},t.y=function(n){return arguments.length?(u=i=n,t):i},t.y0=function(n){return arguments.length?(u=n,t):u},t.y1=function(n){return arguments.length?(i=n,t):i},t.defined=function(n){return arguments.length?(o=n,t):o},t.interpolate=function(n){return arguments.length?(c="function"==typeof n?a=n:(a=Ms.get(n)||oo).key,s=a.reverse||a,l=a.closed?"M":"L",t):c},t.tension=function(n){return arguments.length?(f=n,t):f},t}function No(n){return n.radius}function Lo(n){return[n.x,n.y]}function To(n){return function(){var t=n.apply(this,arguments),e=t[0],r=t[1]+ys;return[e*Math.cos(r),e*Math.sin(r)]}}function qo(){return 64}function zo(){return"circle"}function Ro(n){var t=Math.sqrt(n/Sa);return"M0,"+t+"A"+t+","+t+" 0 1,1 0,"+-t+"A"+t+","+t+" 0 1,1 0,"+t+"Z"}function Do(n,t){return fa(n,Ns),n.id=t,n}function Po(n,t,e,r){var u=n.id;return R(n,"function"==typeof e?function(n,i,o){n.__transition__[u].tween.set(t,r(e.call(n,n.__data__,i,o)))}:(e=r(e),function(n){n.__transition__[u].tween.set(t,e)}))}function Uo(n){return null==n&&(n=""),function(){this.textContent=n}}function jo(n,t,e,r){var i=n.__transition__||(n.__transition__={active:0,count:0}),o=i[e];if(!o){var a=r.time;o=i[e]={tween:new u,time:a,ease:r.ease,delay:r.delay,duration:r.duration},++i.count,Xo.timer(function(r){function u(r){return i.active>e?s():(i.active=e,o.event&&o.event.start.call(n,l,t),o.tween.forEach(function(e,r){(r=r.call(n,l,t))&&v.push(r)}),Xo.timer(function(){return p.c=c(r||1)?be:c,1},0,a),void 0)}function c(r){if(i.active!==e)return s();for(var u=r/g,a=f(u),c=v.length;c>0;)v[--c].call(n,a);return u>=1?(o.event&&o.event.end.call(n,l,t),s()):void 0}function s(){return--i.count?delete i[e]:delete n.__transition__,1}var l=n.__data__,f=o.ease,h=o.delay,g=o.duration,p=Ja,v=[];return p.t=h+a,r>=h?u(r-h):(p.c=u,void 0)},0,a)}}function Ho(n,t){n.attr("transform",function(n){return"translate("+t(n)+",0)"})}function Fo(n,t){n.attr("transform",function(n){return"translate(0,"+t(n)+")"})}function Oo(n){return n.toISOString()}function Yo(n,t,e){function r(t){return n(t)}function u(n,e){var r=n[1]-n[0],u=r/e,i=Xo.bisect(js,u);return i==js.length?[t.year,Yi(n.map(function(n){return n/31536e6}),e)[2]]:i?t[u/js[i-1]<js[i]/u?i-1:i]:[Os,Yi(n,e)[2]]}return r.invert=function(t){return Io(n.invert(t))},r.domain=function(t){return arguments.length?(n.domain(t),r):n.domain().map(Io)},r.nice=function(n,t){function e(e){return!isNaN(e)&&!n.range(e,Io(+e+1),t).length}var i=r.domain(),o=zi(i),a=null==n?u(o,10):"number"==typeof n&&u(o,n);return a&&(n=a[0],t=a[1]),r.domain(Pi(i,t>1?{floor:function(t){for(;e(t=n.floor(t));)t=Io(t-1);return t},ceil:function(t){for(;e(t=n.ceil(t));)t=Io(+t+1);return t}}:n))},r.ticks=function(n,t){var e=zi(r.domain()),i=null==n?u(e,10):"number"==typeof n?u(e,n):!n.range&&[{range:n},t];return i&&(n=i[0],t=i[1]),n.range(e[0],Io(+e[1]+1),1>t?1:t)},r.tickFormat=function(){return e},r.copy=function(){return Yo(n.copy(),t,e)},Fi(r,n)}function Io(n){return new Date(n)}function Zo(n){return JSON.parse(n.responseText)}function Vo(n){var t=Wo.createRange();return t.selectNode(Wo.body),t.createContextualFragment(n.responseText)}var Xo={version:"3.4.3"};Date.now||(Date.now=function(){return+new Date});var $o=[].slice,Bo=function(n){return $o.call(n)},Wo=document,Jo=Wo.documentElement,Go=window;try{Bo(Jo.childNodes)[0].nodeType}catch(Ko){Bo=function(n){for(var t=n.length,e=new Array(t);t--;)e[t]=n[t];return e}}try{Wo.createElement("div").style.setProperty("opacity",0,"")}catch(Qo){var na=Go.Element.prototype,ta=na.setAttribute,ea=na.setAttributeNS,ra=Go.CSSStyleDeclaration.prototype,ua=ra.setProperty;na.setAttribute=function(n,t){ta.call(this,n,t+"")},na.setAttributeNS=function(n,t,e){ea.call(this,n,t,e+"")},ra.setProperty=function(n,t,e){ua.call(this,n,t+"",e)}}Xo.ascending=function(n,t){return t>n?-1:n>t?1:n>=t?0:0/0},Xo.descending=function(n,t){return n>t?-1:t>n?1:t>=n?0:0/0},Xo.min=function(n,t){var e,r,u=-1,i=n.length;if(1===arguments.length){for(;++u<i&&!(null!=(e=n[u])&&e>=e);)e=void 0;for(;++u<i;)null!=(r=n[u])&&e>r&&(e=r)}else{for(;++u<i&&!(null!=(e=t.call(n,n[u],u))&&e>=e);)e=void 0;for(;++u<i;)null!=(r=t.call(n,n[u],u))&&e>r&&(e=r)}return e},Xo.max=function(n,t){var e,r,u=-1,i=n.length;if(1===arguments.length){for(;++u<i&&!(null!=(e=n[u])&&e>=e);)e=void 0;for(;++u<i;)null!=(r=n[u])&&r>e&&(e=r)}else{for(;++u<i&&!(null!=(e=t.call(n,n[u],u))&&e>=e);)e=void 0;for(;++u<i;)null!=(r=t.call(n,n[u],u))&&r>e&&(e=r)}return e},Xo.extent=function(n,t){var e,r,u,i=-1,o=n.length;if(1===arguments.length){for(;++i<o&&!(null!=(e=u=n[i])&&e>=e);)e=u=void 0;for(;++i<o;)null!=(r=n[i])&&(e>r&&(e=r),r>u&&(u=r))}else{for(;++i<o&&!(null!=(e=u=t.call(n,n[i],i))&&e>=e);)e=void 0;for(;++i<o;)null!=(r=t.call(n,n[i],i))&&(e>r&&(e=r),r>u&&(u=r))}return[e,u]},Xo.sum=function(n,t){var e,r=0,u=n.length,i=-1;if(1===arguments.length)for(;++i<u;)isNaN(e=+n[i])||(r+=e);else for(;++i<u;)isNaN(e=+t.call(n,n[i],i))||(r+=e);return r},Xo.mean=function(t,e){var r,u=t.length,i=0,o=-1,a=0;if(1===arguments.length)for(;++o<u;)n(r=t[o])&&(i+=(r-i)/++a);else for(;++o<u;)n(r=e.call(t,t[o],o))&&(i+=(r-i)/++a);return a?i:void 0},Xo.quantile=function(n,t){var e=(n.length-1)*t+1,r=Math.floor(e),u=+n[r-1],i=e-r;return i?u+i*(n[r]-u):u},Xo.median=function(t,e){return arguments.length>1&&(t=t.map(e)),t=t.filter(n),t.length?Xo.quantile(t.sort(Xo.ascending),.5):void 0},Xo.bisector=function(n){return{left:function(t,e,r,u){for(arguments.length<3&&(r=0),arguments.length<4&&(u=t.length);u>r;){var i=r+u>>>1;n.call(t,t[i],i)<e?r=i+1:u=i}return r},right:function(t,e,r,u){for(arguments.length<3&&(r=0),arguments.length<4&&(u=t.length);u>r;){var i=r+u>>>1;e<n.call(t,t[i],i)?u=i:r=i+1}return r}}};var ia=Xo.bisector(function(n){return n});Xo.bisectLeft=ia.left,Xo.bisect=Xo.bisectRight=ia.right,Xo.shuffle=function(n){for(var t,e,r=n.length;r;)e=0|Math.random()*r--,t=n[r],n[r]=n[e],n[e]=t;return n},Xo.permute=function(n,t){for(var e=t.length,r=new Array(e);e--;)r[e]=n[t[e]];return r},Xo.pairs=function(n){for(var t,e=0,r=n.length-1,u=n[0],i=new Array(0>r?0:r);r>e;)i[e]=[t=u,u=n[++e]];return i},Xo.zip=function(){if(!(u=arguments.length))return[];for(var n=-1,e=Xo.min(arguments,t),r=new Array(e);++n<e;)for(var u,i=-1,o=r[n]=new Array(u);++i<u;)o[i]=arguments[i][n];return r},Xo.transpose=function(n){return Xo.zip.apply(Xo,n)},Xo.keys=function(n){var t=[];for(var e in n)t.push(e);return t},Xo.values=function(n){var t=[];for(var e in n)t.push(n[e]);return t},Xo.entries=function(n){var t=[];for(var e in n)t.push({key:e,value:n[e]});return t},Xo.merge=function(n){for(var t,e,r,u=n.length,i=-1,o=0;++i<u;)o+=n[i].length;for(e=new Array(o);--u>=0;)for(r=n[u],t=r.length;--t>=0;)e[--o]=r[t];return e};var oa=Math.abs;Xo.range=function(n,t,r){if(arguments.length<3&&(r=1,arguments.length<2&&(t=n,n=0)),1/0===(t-n)/r)throw new Error("infinite range");var u,i=[],o=e(oa(r)),a=-1;if(n*=o,t*=o,r*=o,0>r)for(;(u=n+r*++a)>t;)i.push(u/o);else for(;(u=n+r*++a)<t;)i.push(u/o);return i},Xo.map=function(n){var t=new u;if(n instanceof u)n.forEach(function(n,e){t.set(n,e)});else for(var e in n)t.set(e,n[e]);return t},r(u,{has:i,get:function(n){return this[aa+n]},set:function(n,t){return this[aa+n]=t},remove:o,keys:a,values:function(){var n=[];return this.forEach(function(t,e){n.push(e)}),n},entries:function(){var n=[];return this.forEach(function(t,e){n.push({key:t,value:e})}),n},size:c,empty:s,forEach:function(n){for(var t in this)t.charCodeAt(0)===ca&&n.call(this,t.substring(1),this[t])}});var aa="\x00",ca=aa.charCodeAt(0);Xo.nest=function(){function n(t,a,c){if(c>=o.length)return r?r.call(i,a):e?a.sort(e):a;for(var s,l,f,h,g=-1,p=a.length,v=o[c++],d=new u;++g<p;)(h=d.get(s=v(l=a[g])))?h.push(l):d.set(s,[l]);return t?(l=t(),f=function(e,r){l.set(e,n(t,r,c))}):(l={},f=function(e,r){l[e]=n(t,r,c)}),d.forEach(f),l}function t(n,e){if(e>=o.length)return n;var r=[],u=a[e++];return n.forEach(function(n,u){r.push({key:n,values:t(u,e)})}),u?r.sort(function(n,t){return u(n.key,t.key)}):r}var e,r,i={},o=[],a=[];return i.map=function(t,e){return n(e,t,0)},i.entries=function(e){return t(n(Xo.map,e,0),0)},i.key=function(n){return o.push(n),i},i.sortKeys=function(n){return a[o.length-1]=n,i},i.sortValues=function(n){return e=n,i},i.rollup=function(n){return r=n,i},i},Xo.set=function(n){var t=new l;if(n)for(var e=0,r=n.length;r>e;++e)t.add(n[e]);return t},r(l,{has:i,add:function(n){return this[aa+n]=!0,n},remove:function(n){return n=aa+n,n in this&&delete this[n]},values:a,size:c,empty:s,forEach:function(n){for(var t in this)t.charCodeAt(0)===ca&&n.call(this,t.substring(1))}}),Xo.behavior={},Xo.rebind=function(n,t){for(var e,r=1,u=arguments.length;++r<u;)n[e=arguments[r]]=f(n,t,t[e]);return n};var sa=["webkit","ms","moz","Moz","o","O"];Xo.dispatch=function(){for(var n=new p,t=-1,e=arguments.length;++t<e;)n[arguments[t]]=v(n);return n},p.prototype.on=function(n,t){var e=n.indexOf("."),r="";if(e>=0&&(r=n.substring(e+1),n=n.substring(0,e)),n)return arguments.length<2?this[n].on(r):this[n].on(r,t);if(2===arguments.length){if(null==t)for(n in this)this.hasOwnProperty(n)&&this[n].on(r,null);return this}},Xo.event=null,Xo.requote=function(n){return n.replace(la,"\\$&")};var la=/[\\\^\$\*\+\?\|\[\]\(\)\.\{\}]/g,fa={}.__proto__?function(n,t){n.__proto__=t}:function(n,t){for(var e in t)n[e]=t[e]},ha=function(n,t){return t.querySelector(n)},ga=function(n,t){return t.querySelectorAll(n)},pa=Jo[h(Jo,"matchesSelector")],va=function(n,t){return pa.call(n,t)};"function"==typeof Sizzle&&(ha=function(n,t){return Sizzle(n,t)[0]||null},ga=Sizzle,va=Sizzle.matchesSelector),Xo.selection=function(){return xa};var da=Xo.selection.prototype=[];da.select=function(n){var t,e,r,u,i=[];n=M(n);for(var o=-1,a=this.length;++o<a;){i.push(t=[]),t.parentNode=(r=this[o]).parentNode;for(var c=-1,s=r.length;++c<s;)(u=r[c])?(t.push(e=n.call(u,u.__data__,c,o)),e&&"__data__"in u&&(e.__data__=u.__data__)):t.push(null)}return x(i)},da.selectAll=function(n){var t,e,r=[];n=_(n);for(var u=-1,i=this.length;++u<i;)for(var o=this[u],a=-1,c=o.length;++a<c;)(e=o[a])&&(r.push(t=Bo(n.call(e,e.__data__,a,u))),t.parentNode=e);return x(r)};var ma={svg:"http://www.w3.org/2000/svg",xhtml:"http://www.w3.org/1999/xhtml",xlink:"http://www.w3.org/1999/xlink",xml:"http://www.w3.org/XML/1998/namespace",xmlns:"http://www.w3.org/2000/xmlns/"};Xo.ns={prefix:ma,qualify:function(n){var t=n.indexOf(":"),e=n;return t>=0&&(e=n.substring(0,t),n=n.substring(t+1)),ma.hasOwnProperty(e)?{space:ma[e],local:n}:n}},da.attr=function(n,t){if(arguments.length<2){if("string"==typeof n){var e=this.node();return n=Xo.ns.qualify(n),n.local?e.getAttributeNS(n.space,n.local):e.getAttribute(n)}for(t in n)this.each(b(t,n[t]));return this}return this.each(b(n,t))},da.classed=function(n,t){if(arguments.length<2){if("string"==typeof n){var e=this.node(),r=(n=k(n)).length,u=-1;if(t=e.classList){for(;++u<r;)if(!t.contains(n[u]))return!1}else for(t=e.getAttribute("class");++u<r;)if(!S(n[u]).test(t))return!1;return!0}for(t in n)this.each(E(t,n[t]));return this}return this.each(E(n,t))},da.style=function(n,t,e){var r=arguments.length;if(3>r){if("string"!=typeof n){2>r&&(t="");for(e in n)this.each(C(e,n[e],t));return this}if(2>r)return Go.getComputedStyle(this.node(),null).getPropertyValue(n);e=""}return this.each(C(n,t,e))},da.property=function(n,t){if(arguments.length<2){if("string"==typeof n)return this.node()[n];for(t in n)this.each(N(t,n[t]));return this}return this.each(N(n,t))},da.text=function(n){return arguments.length?this.each("function"==typeof n?function(){var t=n.apply(this,arguments);this.textContent=null==t?"":t}:null==n?function(){this.textContent=""}:function(){this.textContent=n}):this.node().textContent},da.html=function(n){return arguments.length?this.each("function"==typeof n?function(){var t=n.apply(this,arguments);this.innerHTML=null==t?"":t}:null==n?function(){this.innerHTML=""}:function(){this.innerHTML=n}):this.node().innerHTML},da.append=function(n){return n=L(n),this.select(function(){return this.appendChild(n.apply(this,arguments))})},da.insert=function(n,t){return n=L(n),t=M(t),this.select(function(){return this.insertBefore(n.apply(this,arguments),t.apply(this,arguments)||null)})},da.remove=function(){return this.each(function(){var n=this.parentNode;n&&n.removeChild(this)})},da.data=function(n,t){function e(n,e){var r,i,o,a=n.length,f=e.length,h=Math.min(a,f),g=new Array(f),p=new Array(f),v=new Array(a);if(t){var d,m=new u,y=new u,x=[];for(r=-1;++r<a;)d=t.call(i=n[r],i.__data__,r),m.has(d)?v[r]=i:m.set(d,i),x.push(d);for(r=-1;++r<f;)d=t.call(e,o=e[r],r),(i=m.get(d))?(g[r]=i,i.__data__=o):y.has(d)||(p[r]=T(o)),y.set(d,o),m.remove(d);for(r=-1;++r<a;)m.has(x[r])&&(v[r]=n[r])}else{for(r=-1;++r<h;)i=n[r],o=e[r],i?(i.__data__=o,g[r]=i):p[r]=T(o);for(;f>r;++r)p[r]=T(e[r]);for(;a>r;++r)v[r]=n[r]}p.update=g,p.parentNode=g.parentNode=v.parentNode=n.parentNode,c.push(p),s.push(g),l.push(v)}var r,i,o=-1,a=this.length;if(!arguments.length){for(n=new Array(a=(r=this[0]).length);++o<a;)(i=r[o])&&(n[o]=i.__data__);return n}var c=D([]),s=x([]),l=x([]);if("function"==typeof n)for(;++o<a;)e(r=this[o],n.call(r,r.parentNode.__data__,o));else for(;++o<a;)e(r=this[o],n);return s.enter=function(){return c},s.exit=function(){return l},s},da.datum=function(n){return arguments.length?this.property("__data__",n):this.property("__data__")},da.filter=function(n){var t,e,r,u=[];"function"!=typeof n&&(n=q(n));for(var i=0,o=this.length;o>i;i++){u.push(t=[]),t.parentNode=(e=this[i]).parentNode;for(var a=0,c=e.length;c>a;a++)(r=e[a])&&n.call(r,r.__data__,a,i)&&t.push(r)}return x(u)},da.order=function(){for(var n=-1,t=this.length;++n<t;)for(var e,r=this[n],u=r.length-1,i=r[u];--u>=0;)(e=r[u])&&(i&&i!==e.nextSibling&&i.parentNode.insertBefore(e,i),i=e);return this},da.sort=function(n){n=z.apply(this,arguments);for(var t=-1,e=this.length;++t<e;)this[t].sort(n);return this.order()},da.each=function(n){return R(this,function(t,e,r){n.call(t,t.__data__,e,r)})},da.call=function(n){var t=Bo(arguments);return n.apply(t[0]=this,t),this},da.empty=function(){return!this.node()},da.node=function(){for(var n=0,t=this.length;t>n;n++)for(var e=this[n],r=0,u=e.length;u>r;r++){var i=e[r];if(i)return i}return null},da.size=function(){var n=0;return this.each(function(){++n}),n};var ya=[];Xo.selection.enter=D,Xo.selection.enter.prototype=ya,ya.append=da.append,ya.empty=da.empty,ya.node=da.node,ya.call=da.call,ya.size=da.size,ya.select=function(n){for(var t,e,r,u,i,o=[],a=-1,c=this.length;++a<c;){r=(u=this[a]).update,o.push(t=[]),t.parentNode=u.parentNode;for(var s=-1,l=u.length;++s<l;)(i=u[s])?(t.push(r[s]=e=n.call(u.parentNode,i.__data__,s,a)),e.__data__=i.__data__):t.push(null)}return x(o)},ya.insert=function(n,t){return arguments.length<2&&(t=P(this)),da.insert.call(this,n,t)},da.transition=function(){for(var n,t,e=ks||++Ls,r=[],u=Es||{time:Date.now(),ease:yu,delay:0,duration:250},i=-1,o=this.length;++i<o;){r.push(n=[]);for(var a=this[i],c=-1,s=a.length;++c<s;)(t=a[c])&&jo(t,c,e,u),n.push(t)}return Do(r,e)},da.interrupt=function(){return this.each(U)},Xo.select=function(n){var t=["string"==typeof n?ha(n,Wo):n];return t.parentNode=Jo,x([t])},Xo.selectAll=function(n){var t=Bo("string"==typeof n?ga(n,Wo):n);return t.parentNode=Jo,x([t])};var xa=Xo.select(Jo);da.on=function(n,t,e){var r=arguments.length;if(3>r){if("string"!=typeof n){2>r&&(t=!1);for(e in n)this.each(j(e,n[e],t));return this}if(2>r)return(r=this.node()["__on"+n])&&r._;e=!1}return this.each(j(n,t,e))};var Ma=Xo.map({mouseenter:"mouseover",mouseleave:"mouseout"});Ma.forEach(function(n){"on"+n in Wo&&Ma.remove(n)});var _a="onselectstart"in Wo?null:h(Jo.style,"userSelect"),ba=0;Xo.mouse=function(n){return Y(n,m())};var wa=/WebKit/.test(Go.navigator.userAgent)?-1:0;Xo.touches=function(n,t){return arguments.length<2&&(t=m().touches),t?Bo(t).map(function(t){var e=Y(n,t);return e.identifier=t.identifier,e}):[]},Xo.behavior.drag=function(){function n(){this.on("mousedown.drag",o).on("touchstart.drag",a)}function t(){return Xo.event.changedTouches[0].identifier}function e(n,t){return Xo.touches(n).filter(function(n){return n.identifier===t})[0]}function r(n,t,e,r){return function(){function o(){var n=t(l,g),e=n[0]-v[0],r=n[1]-v[1];d|=e|r,v=n,f({type:"drag",x:n[0]+c[0],y:n[1]+c[1],dx:e,dy:r})}function a(){m.on(e+"."+p,null).on(r+"."+p,null),y(d&&Xo.event.target===h),f({type:"dragend"})}var c,s=this,l=s.parentNode,f=u.of(s,arguments),h=Xo.event.target,g=n(),p=null==g?"drag":"drag-"+g,v=t(l,g),d=0,m=Xo.select(Go).on(e+"."+p,o).on(r+"."+p,a),y=O();i?(c=i.apply(s,arguments),c=[c.x-v[0],c.y-v[1]]):c=[0,0],f({type:"dragstart"})}}var u=y(n,"drag","dragstart","dragend"),i=null,o=r(g,Xo.mouse,"mousemove","mouseup"),a=r(t,e,"touchmove","touchend");return n.origin=function(t){return arguments.length?(i=t,n):i},Xo.rebind(n,u,"on")};var Sa=Math.PI,ka=2*Sa,Ea=Sa/2,Aa=1e-6,Ca=Aa*Aa,Na=Sa/180,La=180/Sa,Ta=Math.SQRT2,qa=2,za=4;Xo.interpolateZoom=function(n,t){function e(n){var t=n*y;if(m){var e=B(v),o=i/(qa*h)*(e*W(Ta*t+v)-$(v));return[r+o*s,u+o*l,i*e/B(Ta*t+v)]}return[r+n*s,u+n*l,i*Math.exp(Ta*t)]}var r=n[0],u=n[1],i=n[2],o=t[0],a=t[1],c=t[2],s=o-r,l=a-u,f=s*s+l*l,h=Math.sqrt(f),g=(c*c-i*i+za*f)/(2*i*qa*h),p=(c*c-i*i-za*f)/(2*c*qa*h),v=Math.log(Math.sqrt(g*g+1)-g),d=Math.log(Math.sqrt(p*p+1)-p),m=d-v,y=(m||Math.log(c/i))/Ta;return e.duration=1e3*y,e},Xo.behavior.zoom=function(){function n(n){n.on(A,s).on(Pa+".zoom",f).on(C,h).on("dblclick.zoom",g).on(L,l)}function t(n){return[(n[0]-S.x)/S.k,(n[1]-S.y)/S.k]}function e(n){return[n[0]*S.k+S.x,n[1]*S.k+S.y]}function r(n){S.k=Math.max(E[0],Math.min(E[1],n))}function u(n,t){t=e(t),S.x+=n[0]-t[0],S.y+=n[1]-t[1]}function i(){_&&_.domain(M.range().map(function(n){return(n-S.x)/S.k}).map(M.invert)),w&&w.domain(b.range().map(function(n){return(n-S.y)/S.k}).map(b.invert))}function o(n){n({type:"zoomstart"})}function a(n){i(),n({type:"zoom",scale:S.k,translate:[S.x,S.y]})}function c(n){n({type:"zoomend"})}function s(){function n(){l=1,u(Xo.mouse(r),g),a(i)}function e(){f.on(C,Go===r?h:null).on(N,null),p(l&&Xo.event.target===s),c(i)}var r=this,i=T.of(r,arguments),s=Xo.event.target,l=0,f=Xo.select(Go).on(C,n).on(N,e),g=t(Xo.mouse(r)),p=O();U.call(r),o(i)}function l(){function n(){var n=Xo.touches(g);return h=S.k,n.forEach(function(n){n.identifier in v&&(v[n.identifier]=t(n))}),n}function e(){for(var t=Xo.event.changedTouches,e=0,i=t.length;i>e;++e)v[t[e].identifier]=null;var o=n(),c=Date.now();if(1===o.length){if(500>c-x){var s=o[0],l=v[s.identifier];r(2*S.k),u(s,l),d(),a(p)}x=c}else if(o.length>1){var s=o[0],f=o[1],h=s[0]-f[0],g=s[1]-f[1];m=h*h+g*g}}function i(){for(var n,t,e,i,o=Xo.touches(g),c=0,s=o.length;s>c;++c,i=null)if(e=o[c],i=v[e.identifier]){if(t)break;n=e,t=i}if(i){var l=(l=e[0]-n[0])*l+(l=e[1]-n[1])*l,f=m&&Math.sqrt(l/m);n=[(n[0]+e[0])/2,(n[1]+e[1])/2],t=[(t[0]+i[0])/2,(t[1]+i[1])/2],r(f*h)}x=null,u(n,t),a(p)}function f(){if(Xo.event.touches.length){for(var t=Xo.event.changedTouches,e=0,r=t.length;r>e;++e)delete v[t[e].identifier];for(var u in v)return void n()}b.on(M,null).on(_,null),w.on(A,s).on(L,l),k(),c(p)}var h,g=this,p=T.of(g,arguments),v={},m=0,y=Xo.event.changedTouches[0].identifier,M="touchmove.zoom-"+y,_="touchend.zoom-"+y,b=Xo.select(Go).on(M,i).on(_,f),w=Xo.select(g).on(A,null).on(L,e),k=O();U.call(g),e(),o(p)}function f(){var n=T.of(this,arguments);m?clearTimeout(m):(U.call(this),o(n)),m=setTimeout(function(){m=null,c(n)},50),d();var e=v||Xo.mouse(this);p||(p=t(e)),r(Math.pow(2,.002*Ra())*S.k),u(e,p),a(n)}function h(){p=null}function g(){var n=T.of(this,arguments),e=Xo.mouse(this),i=t(e),s=Math.log(S.k)/Math.LN2;o(n),r(Math.pow(2,Xo.event.shiftKey?Math.ceil(s)-1:Math.floor(s)+1)),u(e,i),a(n),c(n)}var p,v,m,x,M,_,b,w,S={x:0,y:0,k:1},k=[960,500],E=Da,A="mousedown.zoom",C="mousemove.zoom",N="mouseup.zoom",L="touchstart.zoom",T=y(n,"zoomstart","zoom","zoomend");return n.event=function(n){n.each(function(){var n=T.of(this,arguments),t=S;ks?Xo.select(this).transition().each("start.zoom",function(){S=this.__chart__||{x:0,y:0,k:1},o(n)}).tween("zoom:zoom",function(){var e=k[0],r=k[1],u=e/2,i=r/2,o=Xo.interpolateZoom([(u-S.x)/S.k,(i-S.y)/S.k,e/S.k],[(u-t.x)/t.k,(i-t.y)/t.k,e/t.k]);return function(t){var r=o(t),c=e/r[2];this.__chart__=S={x:u-r[0]*c,y:i-r[1]*c,k:c},a(n)}}).each("end.zoom",function(){c(n)}):(this.__chart__=S,o(n),a(n),c(n))})},n.translate=function(t){return arguments.length?(S={x:+t[0],y:+t[1],k:S.k},i(),n):[S.x,S.y]},n.scale=function(t){return arguments.length?(S={x:S.x,y:S.y,k:+t},i(),n):S.k},n.scaleExtent=function(t){return arguments.length?(E=null==t?Da:[+t[0],+t[1]],n):E},n.center=function(t){return arguments.length?(v=t&&[+t[0],+t[1]],n):v},n.size=function(t){return arguments.length?(k=t&&[+t[0],+t[1]],n):k},n.x=function(t){return arguments.length?(_=t,M=t.copy(),S={x:0,y:0,k:1},n):_},n.y=function(t){return arguments.length?(w=t,b=t.copy(),S={x:0,y:0,k:1},n):w},Xo.rebind(n,T,"on")};var Ra,Da=[0,1/0],Pa="onwheel"in Wo?(Ra=function(){return-Xo.event.deltaY*(Xo.event.deltaMode?120:1)},"wheel"):"onmousewheel"in Wo?(Ra=function(){return Xo.event.wheelDelta},"mousewheel"):(Ra=function(){return-Xo.event.detail},"MozMousePixelScroll");G.prototype.toString=function(){return this.rgb()+""},Xo.hsl=function(n,t,e){return 1===arguments.length?n instanceof Q?K(n.h,n.s,n.l):dt(""+n,mt,K):K(+n,+t,+e)};var Ua=Q.prototype=new G;Ua.brighter=function(n){return n=Math.pow(.7,arguments.length?n:1),K(this.h,this.s,this.l/n)},Ua.darker=function(n){return n=Math.pow(.7,arguments.length?n:1),K(this.h,this.s,n*this.l)},Ua.rgb=function(){return nt(this.h,this.s,this.l)},Xo.hcl=function(n,t,e){return 1===arguments.length?n instanceof et?tt(n.h,n.c,n.l):n instanceof it?at(n.l,n.a,n.b):at((n=yt((n=Xo.rgb(n)).r,n.g,n.b)).l,n.a,n.b):tt(+n,+t,+e)};var ja=et.prototype=new G;ja.brighter=function(n){return tt(this.h,this.c,Math.min(100,this.l+Ha*(arguments.length?n:1)))},ja.darker=function(n){return tt(this.h,this.c,Math.max(0,this.l-Ha*(arguments.length?n:1)))},ja.rgb=function(){return rt(this.h,this.c,this.l).rgb()},Xo.lab=function(n,t,e){return 1===arguments.length?n instanceof it?ut(n.l,n.a,n.b):n instanceof et?rt(n.l,n.c,n.h):yt((n=Xo.rgb(n)).r,n.g,n.b):ut(+n,+t,+e)};var Ha=18,Fa=.95047,Oa=1,Ya=1.08883,Ia=it.prototype=new G;Ia.brighter=function(n){return ut(Math.min(100,this.l+Ha*(arguments.length?n:1)),this.a,this.b)},Ia.darker=function(n){return ut(Math.max(0,this.l-Ha*(arguments.length?n:1)),this.a,this.b)},Ia.rgb=function(){return ot(this.l,this.a,this.b)},Xo.rgb=function(n,t,e){return 1===arguments.length?n instanceof pt?gt(n.r,n.g,n.b):dt(""+n,gt,nt):gt(~~n,~~t,~~e)};var Za=pt.prototype=new G;Za.brighter=function(n){n=Math.pow(.7,arguments.length?n:1);var t=this.r,e=this.g,r=this.b,u=30;return t||e||r?(t&&u>t&&(t=u),e&&u>e&&(e=u),r&&u>r&&(r=u),gt(Math.min(255,~~(t/n)),Math.min(255,~~(e/n)),Math.min(255,~~(r/n)))):gt(u,u,u)},Za.darker=function(n){return n=Math.pow(.7,arguments.length?n:1),gt(~~(n*this.r),~~(n*this.g),~~(n*this.b))},Za.hsl=function(){return mt(this.r,this.g,this.b)},Za.toString=function(){return"#"+vt(this.r)+vt(this.g)+vt(this.b)};var Va=Xo.map({aliceblue:15792383,antiquewhite:16444375,aqua:65535,aquamarine:8388564,azure:15794175,beige:16119260,bisque:16770244,black:0,blanchedalmond:16772045,blue:255,blueviolet:9055202,brown:10824234,burlywood:14596231,cadetblue:6266528,chartreuse:8388352,chocolate:13789470,coral:16744272,cornflowerblue:6591981,cornsilk:16775388,crimson:14423100,cyan:65535,darkblue:139,darkcyan:35723,darkgoldenrod:12092939,darkgray:11119017,darkgreen:25600,darkgrey:11119017,darkkhaki:12433259,darkmagenta:9109643,darkolivegreen:5597999,darkorange:16747520,darkorchid:10040012,darkred:9109504,darksalmon:15308410,darkseagreen:9419919,darkslateblue:4734347,darkslategray:3100495,darkslategrey:3100495,darkturquoise:52945,darkviolet:9699539,deeppink:16716947,deepskyblue:49151,dimgray:6908265,dimgrey:6908265,dodgerblue:2003199,firebrick:11674146,floralwhite:16775920,forestgreen:2263842,fuchsia:16711935,gainsboro:14474460,ghostwhite:16316671,gold:16766720,goldenrod:14329120,gray:8421504,green:32768,greenyellow:11403055,grey:8421504,honeydew:15794160,hotpink:16738740,indianred:13458524,indigo:4915330,ivory:16777200,khaki:15787660,lavender:15132410,lavenderblush:16773365,lawngreen:8190976,lemonchiffon:16775885,lightblue:11393254,lightcoral:15761536,lightcyan:14745599,lightgoldenrodyellow:16448210,lightgray:13882323,lightgreen:9498256,lightgrey:13882323,lightpink:16758465,lightsalmon:16752762,lightseagreen:2142890,lightskyblue:8900346,lightslategray:7833753,lightslategrey:7833753,lightsteelblue:11584734,lightyellow:16777184,lime:65280,limegreen:3329330,linen:16445670,magenta:16711935,maroon:8388608,mediumaquamarine:6737322,mediumblue:205,mediumorchid:12211667,mediumpurple:9662683,mediumseagreen:3978097,mediumslateblue:8087790,mediumspringgreen:64154,mediumturquoise:4772300,mediumvioletred:13047173,midnightblue:1644912,mintcream:16121850,mistyrose:16770273,moccasin:16770229,navajowhite:16768685,navy:128,oldlace:16643558,olive:8421376,olivedrab:7048739,orange:16753920,orangered:16729344,orchid:14315734,palegoldenrod:15657130,palegreen:10025880,paleturquoise:11529966,palevioletred:14381203,papayawhip:16773077,peachpuff:16767673,peru:13468991,pink:16761035,plum:14524637,powderblue:11591910,purple:8388736,red:16711680,rosybrown:12357519,royalblue:4286945,saddlebrown:9127187,salmon:16416882,sandybrown:16032864,seagreen:3050327,seashell:16774638,sienna:10506797,silver:12632256,skyblue:8900331,slateblue:6970061,slategray:7372944,slategrey:7372944,snow:16775930,springgreen:65407,steelblue:4620980,tan:13808780,teal:32896,thistle:14204888,tomato:16737095,turquoise:4251856,violet:15631086,wheat:16113331,white:16777215,whitesmoke:16119285,yellow:16776960,yellowgreen:10145074});Va.forEach(function(n,t){Va.set(n,ft(t))}),Xo.functor=_t,Xo.xhr=wt(bt),Xo.dsv=function(n,t){function e(n,e,i){arguments.length<3&&(i=e,e=null);var o=St(n,t,null==e?r:u(e),i);return o.row=function(n){return arguments.length?o.response(null==(e=n)?r:u(n)):e},o}function r(n){return e.parse(n.responseText)}function u(n){return function(t){return e.parse(t.responseText,n)}}function i(t){return t.map(o).join(n)}function o(n){return a.test(n)?'"'+n.replace(/\"/g,'""')+'"':n}var a=new RegExp('["'+n+"\n]"),c=n.charCodeAt(0);return e.parse=function(n,t){var r;return e.parseRows(n,function(n,e){if(r)return r(n,e-1);var u=new Function("d","return {"+n.map(function(n,t){return JSON.stringify(n)+": d["+t+"]"}).join(",")+"}");r=t?function(n,e){return t(u(n),e)}:u})},e.parseRows=function(n,t){function e(){if(l>=s)return o;if(u)return u=!1,i;var t=l;if(34===n.charCodeAt(t)){for(var e=t;e++<s;)if(34===n.charCodeAt(e)){if(34!==n.charCodeAt(e+1))break;++e}l=e+2;var r=n.charCodeAt(e+1);return 13===r?(u=!0,10===n.charCodeAt(e+2)&&++l):10===r&&(u=!0),n.substring(t+1,e).replace(/""/g,'"')}for(;s>l;){var r=n.charCodeAt(l++),a=1;if(10===r)u=!0;else if(13===r)u=!0,10===n.charCodeAt(l)&&(++l,++a);else if(r!==c)continue;return n.substring(t,l-a)}return n.substring(t)}for(var r,u,i={},o={},a=[],s=n.length,l=0,f=0;(r=e())!==o;){for(var h=[];r!==i&&r!==o;)h.push(r),r=e();(!t||(h=t(h,f++)))&&a.push(h)}return a},e.format=function(t){if(Array.isArray(t[0]))return e.formatRows(t);var r=new l,u=[];return t.forEach(function(n){for(var t in n)r.has(t)||u.push(r.add(t))}),[u.map(o).join(n)].concat(t.map(function(t){return u.map(function(n){return o(t[n])}).join(n)})).join("\n")},e.formatRows=function(n){return n.map(i).join("\n")},e},Xo.csv=Xo.dsv(",","text/csv"),Xo.tsv=Xo.dsv(" ","text/tab-separated-values");var Xa,$a,Ba,Wa,Ja,Ga=Go[h(Go,"requestAnimationFrame")]||function(n){setTimeout(n,17)};Xo.timer=function(n,t,e){var r=arguments.length;2>r&&(t=0),3>r&&(e=Date.now());var u=e+t,i={c:n,t:u,f:!1,n:null};$a?$a.n=i:Xa=i,$a=i,Ba||(Wa=clearTimeout(Wa),Ba=1,Ga(Et))},Xo.timer.flush=function(){At(),Ct()},Xo.round=function(n,t){return t?Math.round(n*(t=Math.pow(10,t)))/t:Math.round(n)};var Ka=["y","z","a","f","p","n","\xb5","m","","k","M","G","T","P","E","Z","Y"].map(Lt);Xo.formatPrefix=function(n,t){var e=0;return n&&(0>n&&(n*=-1),t&&(n=Xo.round(n,Nt(n,t))),e=1+Math.floor(1e-12+Math.log(n)/Math.LN10),e=Math.max(-24,Math.min(24,3*Math.floor((0>=e?e+1:e-1)/3)))),Ka[8+e/3]};var Qa=/(?:([^{])?([<>=^]))?([+\- ])?([$#])?(0)?(\d+)?(,)?(\.-?\d+)?([a-z%])?/i,nc=Xo.map({b:function(n){return n.toString(2)},c:function(n){return String.fromCharCode(n)},o:function(n){return n.toString(8)},x:function(n){return n.toString(16)},X:function(n){return n.toString(16).toUpperCase()},g:function(n,t){return n.toPrecision(t)},e:function(n,t){return n.toExponential(t)},f:function(n,t){return n.toFixed(t)},r:function(n,t){return(n=Xo.round(n,Nt(n,t))).toFixed(Math.max(0,Math.min(20,Nt(n*(1+1e-15),t))))}}),tc=Xo.time={},ec=Date;zt.prototype={getDate:function(){return this._.getUTCDate()},getDay:function(){return this._.getUTCDay()},getFullYear:function(){return this._.getUTCFullYear()},getHours:function(){return this._.getUTCHours()},getMilliseconds:function(){return this._.getUTCMilliseconds()},getMinutes:function(){return this._.getUTCMinutes()},getMonth:function(){return this._.getUTCMonth()},getSeconds:function(){return this._.getUTCSeconds()},getTime:function(){return this._.getTime()},getTimezoneOffset:function(){return 0},valueOf:function(){return this._.valueOf()},setDate:function(){rc.setUTCDate.apply(this._,arguments)},setDay:function(){rc.setUTCDay.apply(this._,arguments)},setFullYear:function(){rc.setUTCFullYear.apply(this._,arguments)},setHours:function(){rc.setUTCHours.apply(this._,arguments)},setMilliseconds:function(){rc.setUTCMilliseconds.apply(this._,arguments)},setMinutes:function(){rc.setUTCMinutes.apply(this._,arguments)},setMonth:function(){rc.setUTCMonth.apply(this._,arguments)},setSeconds:function(){rc.setUTCSeconds.apply(this._,arguments)},setTime:function(){rc.setTime.apply(this._,arguments)}};var rc=Date.prototype;tc.year=Rt(function(n){return n=tc.day(n),n.setMonth(0,1),n},function(n,t){n.setFullYear(n.getFullYear()+t)},function(n){return n.getFullYear()}),tc.years=tc.year.range,tc.years.utc=tc.year.utc.range,tc.day=Rt(function(n){var t=new ec(2e3,0);return t.setFullYear(n.getFullYear(),n.getMonth(),n.getDate()),t},function(n,t){n.setDate(n.getDate()+t)},function(n){return n.getDate()-1}),tc.days=tc.day.range,tc.days.utc=tc.day.utc.range,tc.dayOfYear=function(n){var t=tc.year(n);return Math.floor((n-t-6e4*(n.getTimezoneOffset()-t.getTimezoneOffset()))/864e5)},["sunday","monday","tuesday","wednesday","thursday","friday","saturday"].forEach(function(n,t){t=7-t;var e=tc[n]=Rt(function(n){return(n=tc.day(n)).setDate(n.getDate()-(n.getDay()+t)%7),n},function(n,t){n.setDate(n.getDate()+7*Math.floor(t))},function(n){var e=tc.year(n).getDay();return Math.floor((tc.dayOfYear(n)+(e+t)%7)/7)-(e!==t)});tc[n+"s"]=e.range,tc[n+"s"].utc=e.utc.range,tc[n+"OfYear"]=function(n){var e=tc.year(n).getDay();return Math.floor((tc.dayOfYear(n)+(e+t)%7)/7)}}),tc.week=tc.sunday,tc.weeks=tc.sunday.range,tc.weeks.utc=tc.sunday.utc.range,tc.weekOfYear=tc.sundayOfYear;var uc={"-":"",_:" ",0:"0"},ic=/^\s*\d+/,oc=/^%/;Xo.locale=function(n){return{numberFormat:Tt(n),timeFormat:Pt(n)}};var ac=Xo.locale({decimal:".",thousands:",",grouping:[3],currency:["$",""],dateTime:"%a %b %e %X %Y",date:"%m/%d/%Y",time:"%H:%M:%S",periods:["AM","PM"],days:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],shortDays:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],months:["January","February","March","April","May","June","July","August","September","October","November","December"],shortMonths:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"]});Xo.format=ac.numberFormat,Xo.geo={},re.prototype={s:0,t:0,add:function(n){ue(n,this.t,cc),ue(cc.s,this.s,this),this.s?this.t+=cc.t:this.s=cc.t},reset:function(){this.s=this.t=0},valueOf:function(){return this.s}};var cc=new re;Xo.geo.stream=function(n,t){n&&sc.hasOwnProperty(n.type)?sc[n.type](n,t):ie(n,t)};var sc={Feature:function(n,t){ie(n.geometry,t)},FeatureCollection:function(n,t){for(var e=n.features,r=-1,u=e.length;++r<u;)ie(e[r].geometry,t)}},lc={Sphere:function(n,t){t.sphere()},Point:function(n,t){n=n.coordinates,t.point(n[0],n[1],n[2])},MultiPoint:function(n,t){for(var e=n.coordinates,r=-1,u=e.length;++r<u;)n=e[r],t.point(n[0],n[1],n[2])},LineString:function(n,t){oe(n.coordinates,t,0)},MultiLineString:function(n,t){for(var e=n.coordinates,r=-1,u=e.length;++r<u;)oe(e[r],t,0)},Polygon:function(n,t){ae(n.coordinates,t)},MultiPolygon:function(n,t){for(var e=n.coordinates,r=-1,u=e.length;++r<u;)ae(e[r],t)},GeometryCollection:function(n,t){for(var e=n.geometries,r=-1,u=e.length;++r<u;)ie(e[r],t)}};Xo.geo.area=function(n){return fc=0,Xo.geo.stream(n,gc),fc};var fc,hc=new re,gc={sphere:function(){fc+=4*Sa},point:g,lineStart:g,lineEnd:g,polygonStart:function(){hc.reset(),gc.lineStart=ce},polygonEnd:function(){var n=2*hc;fc+=0>n?4*Sa+n:n,gc.lineStart=gc.lineEnd=gc.point=g}};Xo.geo.bounds=function(){function n(n,t){x.push(M=[l=n,h=n]),f>t&&(f=t),t>g&&(g=t)}function t(t,e){var r=se([t*Na,e*Na]);if(m){var u=fe(m,r),i=[u[1],-u[0],0],o=fe(i,u);pe(o),o=ve(o);var c=t-p,s=c>0?1:-1,v=o[0]*La*s,d=oa(c)>180;if(d^(v>s*p&&s*t>v)){var y=o[1]*La;y>g&&(g=y)}else if(v=(v+360)%360-180,d^(v>s*p&&s*t>v)){var y=-o[1]*La;f>y&&(f=y)}else f>e&&(f=e),e>g&&(g=e);d?p>t?a(l,t)>a(l,h)&&(h=t):a(t,h)>a(l,h)&&(l=t):h>=l?(l>t&&(l=t),t>h&&(h=t)):t>p?a(l,t)>a(l,h)&&(h=t):a(t,h)>a(l,h)&&(l=t)}else n(t,e);m=r,p=t}function e(){_.point=t}function r(){M[0]=l,M[1]=h,_.point=n,m=null}function u(n,e){if(m){var r=n-p;y+=oa(r)>180?r+(r>0?360:-360):r}else v=n,d=e;gc.point(n,e),t(n,e)}function i(){gc.lineStart()}function o(){u(v,d),gc.lineEnd(),oa(y)>Aa&&(l=-(h=180)),M[0]=l,M[1]=h,m=null}function a(n,t){return(t-=n)<0?t+360:t}function c(n,t){return n[0]-t[0]}function s(n,t){return t[0]<=t[1]?t[0]<=n&&n<=t[1]:n<t[0]||t[1]<n}var l,f,h,g,p,v,d,m,y,x,M,_={point:n,lineStart:e,lineEnd:r,polygonStart:function(){_.point=u,_.lineStart=i,_.lineEnd=o,y=0,gc.polygonStart()},polygonEnd:function(){gc.polygonEnd(),_.point=n,_.lineStart=e,_.lineEnd=r,0>hc?(l=-(h=180),f=-(g=90)):y>Aa?g=90:-Aa>y&&(f=-90),M[0]=l,M[1]=h}};return function(n){g=h=-(l=f=1/0),x=[],Xo.geo.stream(n,_);var t=x.length;if(t){x.sort(c);for(var e,r=1,u=x[0],i=[u];t>r;++r)e=x[r],s(e[0],u)||s(e[1],u)?(a(u[0],e[1])>a(u[0],u[1])&&(u[1]=e[1]),a(e[0],u[1])>a(u[0],u[1])&&(u[0]=e[0])):i.push(u=e);for(var o,e,p=-1/0,t=i.length-1,r=0,u=i[t];t>=r;u=e,++r)e=i[r],(o=a(u[1],e[0]))>p&&(p=o,l=e[0],h=u[1])}return x=M=null,1/0===l||1/0===f?[[0/0,0/0],[0/0,0/0]]:[[l,f],[h,g]]}}(),Xo.geo.centroid=function(n){pc=vc=dc=mc=yc=xc=Mc=_c=bc=wc=Sc=0,Xo.geo.stream(n,kc);var t=bc,e=wc,r=Sc,u=t*t+e*e+r*r;return Ca>u&&(t=xc,e=Mc,r=_c,Aa>vc&&(t=dc,e=mc,r=yc),u=t*t+e*e+r*r,Ca>u)?[0/0,0/0]:[Math.atan2(e,t)*La,X(r/Math.sqrt(u))*La]};var pc,vc,dc,mc,yc,xc,Mc,_c,bc,wc,Sc,kc={sphere:g,point:me,lineStart:xe,lineEnd:Me,polygonStart:function(){kc.lineStart=_e},polygonEnd:function(){kc.lineStart=xe}},Ec=Ee(be,Te,ze,[-Sa,-Sa/2]),Ac=1e9;Xo.geo.clipExtent=function(){var n,t,e,r,u,i,o={stream:function(n){return u&&(u.valid=!1),u=i(n),u.valid=!0,u},extent:function(a){return arguments.length?(i=Pe(n=+a[0][0],t=+a[0][1],e=+a[1][0],r=+a[1][1]),u&&(u.valid=!1,u=null),o):[[n,t],[e,r]]}};return o.extent([[0,0],[960,500]])},(Xo.geo.conicEqualArea=function(){return je(He)}).raw=He,Xo.geo.albers=function(){return Xo.geo.conicEqualArea().rotate([96,0]).center([-.6,38.7]).parallels([29.5,45.5]).scale(1070)},Xo.geo.albersUsa=function(){function n(n){var i=n[0],o=n[1];return t=null,e(i,o),t||(r(i,o),t)||u(i,o),t}var t,e,r,u,i=Xo.geo.albers(),o=Xo.geo.conicEqualArea().rotate([154,0]).center([-2,58.5]).parallels([55,65]),a=Xo.geo.conicEqualArea().rotate([157,0]).center([-3,19.9]).parallels([8,18]),c={point:function(n,e){t=[n,e]}};return n.invert=function(n){var t=i.scale(),e=i.translate(),r=(n[0]-e[0])/t,u=(n[1]-e[1])/t;return(u>=.12&&.234>u&&r>=-.425&&-.214>r?o:u>=.166&&.234>u&&r>=-.214&&-.115>r?a:i).invert(n)},n.stream=function(n){var t=i.stream(n),e=o.stream(n),r=a.stream(n);return{point:function(n,u){t.point(n,u),e.point(n,u),r.point(n,u)},sphere:function(){t.sphere(),e.sphere(),r.sphere()},lineStart:function(){t.lineStart(),e.lineStart(),r.lineStart()},lineEnd:function(){t.lineEnd(),e.lineEnd(),r.lineEnd()},polygonStart:function(){t.polygonStart(),e.polygonStart(),r.polygonStart()},polygonEnd:function(){t.polygonEnd(),e.polygonEnd(),r.polygonEnd()}}},n.precision=function(t){return arguments.length?(i.precision(t),o.precision(t),a.precision(t),n):i.precision()},n.scale=function(t){return arguments.length?(i.scale(t),o.scale(.35*t),a.scale(t),n.translate(i.translate())):i.scale()},n.translate=function(t){if(!arguments.length)return i.translate();var s=i.scale(),l=+t[0],f=+t[1];return e=i.translate(t).clipExtent([[l-.455*s,f-.238*s],[l+.455*s,f+.238*s]]).stream(c).point,r=o.translate([l-.307*s,f+.201*s]).clipExtent([[l-.425*s+Aa,f+.12*s+Aa],[l-.214*s-Aa,f+.234*s-Aa]]).stream(c).point,u=a.translate([l-.205*s,f+.212*s]).clipExtent([[l-.214*s+Aa,f+.166*s+Aa],[l-.115*s-Aa,f+.234*s-Aa]]).stream(c).point,n},n.scale(1070)};var Cc,Nc,Lc,Tc,qc,zc,Rc={point:g,lineStart:g,lineEnd:g,polygonStart:function(){Nc=0,Rc.lineStart=Fe},polygonEnd:function(){Rc.lineStart=Rc.lineEnd=Rc.point=g,Cc+=oa(Nc/2)}},Dc={point:Oe,lineStart:g,lineEnd:g,polygonStart:g,polygonEnd:g},Pc={point:Ze,lineStart:Ve,lineEnd:Xe,polygonStart:function(){Pc.lineStart=$e},polygonEnd:function(){Pc.point=Ze,Pc.lineStart=Ve,Pc.lineEnd=Xe}};Xo.geo.path=function(){function n(n){return n&&("function"==typeof a&&i.pointRadius(+a.apply(this,arguments)),o&&o.valid||(o=u(i)),Xo.geo.stream(n,o)),i.result()}function t(){return o=null,n}var e,r,u,i,o,a=4.5;return n.area=function(n){return Cc=0,Xo.geo.stream(n,u(Rc)),Cc},n.centroid=function(n){return dc=mc=yc=xc=Mc=_c=bc=wc=Sc=0,Xo.geo.stream(n,u(Pc)),Sc?[bc/Sc,wc/Sc]:_c?[xc/_c,Mc/_c]:yc?[dc/yc,mc/yc]:[0/0,0/0]},n.bounds=function(n){return qc=zc=-(Lc=Tc=1/0),Xo.geo.stream(n,u(Dc)),[[Lc,Tc],[qc,zc]]},n.projection=function(n){return arguments.length?(u=(e=n)?n.stream||Je(n):bt,t()):e},n.context=function(n){return arguments.length?(i=null==(r=n)?new Ye:new Be(n),"function"!=typeof a&&i.pointRadius(a),t()):r},n.pointRadius=function(t){return arguments.length?(a="function"==typeof t?t:(i.pointRadius(+t),+t),n):a},n.projection(Xo.geo.albersUsa()).context(null)},Xo.geo.transform=function(n){return{stream:function(t){var e=new Ge(t);for(var r in n)e[r]=n[r];return e}}},Ge.prototype={point:function(n,t){this.stream.point(n,t)},sphere:function(){this.stream.sphere()},lineStart:function(){this.stream.lineStart()},lineEnd:function(){this.stream.lineEnd()},polygonStart:function(){this.stream.polygonStart()},polygonEnd:function(){this.stream.polygonEnd()}},Xo.geo.projection=Qe,Xo.geo.projectionMutator=nr,(Xo.geo.equirectangular=function(){return Qe(er)}).raw=er.invert=er,Xo.geo.rotation=function(n){function t(t){return t=n(t[0]*Na,t[1]*Na),t[0]*=La,t[1]*=La,t}return n=ur(n[0]%360*Na,n[1]*Na,n.length>2?n[2]*Na:0),t.invert=function(t){return t=n.invert(t[0]*Na,t[1]*Na),t[0]*=La,t[1]*=La,t},t},rr.invert=er,Xo.geo.circle=function(){function n(){var n="function"==typeof r?r.apply(this,arguments):r,t=ur(-n[0]*Na,-n[1]*Na,0).invert,u=[];return e(null,null,1,{point:function(n,e){u.push(n=t(n,e)),n[0]*=La,n[1]*=La}}),{type:"Polygon",coordinates:[u]}}var t,e,r=[0,0],u=6;return n.origin=function(t){return arguments.length?(r=t,n):r},n.angle=function(r){return arguments.length?(e=cr((t=+r)*Na,u*Na),n):t},n.precision=function(r){return arguments.length?(e=cr(t*Na,(u=+r)*Na),n):u},n.angle(90)},Xo.geo.distance=function(n,t){var e,r=(t[0]-n[0])*Na,u=n[1]*Na,i=t[1]*Na,o=Math.sin(r),a=Math.cos(r),c=Math.sin(u),s=Math.cos(u),l=Math.sin(i),f=Math.cos(i);return Math.atan2(Math.sqrt((e=f*o)*e+(e=s*l-c*f*a)*e),c*l+s*f*a)},Xo.geo.graticule=function(){function n(){return{type:"MultiLineString",coordinates:t()}}function t(){return Xo.range(Math.ceil(i/d)*d,u,d).map(h).concat(Xo.range(Math.ceil(s/m)*m,c,m).map(g)).concat(Xo.range(Math.ceil(r/p)*p,e,p).filter(function(n){return oa(n%d)>Aa}).map(l)).concat(Xo.range(Math.ceil(a/v)*v,o,v).filter(function(n){return oa(n%m)>Aa}).map(f))}var e,r,u,i,o,a,c,s,l,f,h,g,p=10,v=p,d=90,m=360,y=2.5;return n.lines=function(){return t().map(function(n){return{type:"LineString",coordinates:n}})},n.outline=function(){return{type:"Polygon",coordinates:[h(i).concat(g(c).slice(1),h(u).reverse().slice(1),g(s).reverse().slice(1))]}},n.extent=function(t){return arguments.length?n.majorExtent(t).minorExtent(t):n.minorExtent()},n.majorExtent=function(t){return arguments.length?(i=+t[0][0],u=+t[1][0],s=+t[0][1],c=+t[1][1],i>u&&(t=i,i=u,u=t),s>c&&(t=s,s=c,c=t),n.precision(y)):[[i,s],[u,c]]},n.minorExtent=function(t){return arguments.length?(r=+t[0][0],e=+t[1][0],a=+t[0][1],o=+t[1][1],r>e&&(t=r,r=e,e=t),a>o&&(t=a,a=o,o=t),n.precision(y)):[[r,a],[e,o]]},n.step=function(t){return arguments.length?n.majorStep(t).minorStep(t):n.minorStep()},n.majorStep=function(t){return arguments.length?(d=+t[0],m=+t[1],n):[d,m]},n.minorStep=function(t){return arguments.length?(p=+t[0],v=+t[1],n):[p,v]},n.precision=function(t){return arguments.length?(y=+t,l=lr(a,o,90),f=fr(r,e,y),h=lr(s,c,90),g=fr(i,u,y),n):y},n.majorExtent([[-180,-90+Aa],[180,90-Aa]]).minorExtent([[-180,-80-Aa],[180,80+Aa]])},Xo.geo.greatArc=function(){function n(){return{type:"LineString",coordinates:[t||r.apply(this,arguments),e||u.apply(this,arguments)]}}var t,e,r=hr,u=gr;return n.distance=function(){return Xo.geo.distance(t||r.apply(this,arguments),e||u.apply(this,arguments))},n.source=function(e){return arguments.length?(r=e,t="function"==typeof e?null:e,n):r},n.target=function(t){return arguments.length?(u=t,e="function"==typeof t?null:t,n):u},n.precision=function(){return arguments.length?n:0},n},Xo.geo.interpolate=function(n,t){return pr(n[0]*Na,n[1]*Na,t[0]*Na,t[1]*Na)},Xo.geo.length=function(n){return Uc=0,Xo.geo.stream(n,jc),Uc};var Uc,jc={sphere:g,point:g,lineStart:vr,lineEnd:g,polygonStart:g,polygonEnd:g},Hc=dr(function(n){return Math.sqrt(2/(1+n))},function(n){return 2*Math.asin(n/2)});(Xo.geo.azimuthalEqualArea=function(){return Qe(Hc)}).raw=Hc;var Fc=dr(function(n){var t=Math.acos(n);return t&&t/Math.sin(t)},bt);(Xo.geo.azimuthalEquidistant=function(){return Qe(Fc)}).raw=Fc,(Xo.geo.conicConformal=function(){return je(mr)}).raw=mr,(Xo.geo.conicEquidistant=function(){return je(yr)}).raw=yr;var Oc=dr(function(n){return 1/n},Math.atan);(Xo.geo.gnomonic=function(){return Qe(Oc)}).raw=Oc,xr.invert=function(n,t){return[n,2*Math.atan(Math.exp(t))-Ea]},(Xo.geo.mercator=function(){return Mr(xr)}).raw=xr;var Yc=dr(function(){return 1},Math.asin);(Xo.geo.orthographic=function(){return Qe(Yc)}).raw=Yc;var Ic=dr(function(n){return 1/(1+n)},function(n){return 2*Math.atan(n)});(Xo.geo.stereographic=function(){return Qe(Ic)}).raw=Ic,_r.invert=function(n,t){return[-t,2*Math.atan(Math.exp(n))-Ea]},(Xo.geo.transverseMercator=function(){var n=Mr(_r),t=n.center,e=n.rotate;return n.center=function(n){return n?t([-n[1],n[0]]):(n=t(),[-n[1],n[0]])},n.rotate=function(n){return n?e([n[0],n[1],n.length>2?n[2]+90:90]):(n=e(),[n[0],n[1],n[2]-90])},n.rotate([0,0])}).raw=_r,Xo.geom={},Xo.geom.hull=function(n){function t(n){if(n.length<3)return[];var t,u=_t(e),i=_t(r),o=n.length,a=[],c=[];for(t=0;o>t;t++)a.push([+u.call(this,n[t],t),+i.call(this,n[t],t),t]);for(a.sort(kr),t=0;o>t;t++)c.push([a[t][0],-a[t][1]]);var s=Sr(a),l=Sr(c),f=l[0]===s[0],h=l[l.length-1]===s[s.length-1],g=[];for(t=s.length-1;t>=0;--t)g.push(n[a[s[t]][2]]);for(t=+f;t<l.length-h;++t)g.push(n[a[l[t]][2]]);return g}var e=br,r=wr;return arguments.length?t(n):(t.x=function(n){return arguments.length?(e=n,t):e},t.y=function(n){return arguments.length?(r=n,t):r},t)},Xo.geom.polygon=function(n){return fa(n,Zc),n};var Zc=Xo.geom.polygon.prototype=[];Zc.area=function(){for(var n,t=-1,e=this.length,r=this[e-1],u=0;++t<e;)n=r,r=this[t],u+=n[1]*r[0]-n[0]*r[1];return.5*u},Zc.centroid=function(n){var t,e,r=-1,u=this.length,i=0,o=0,a=this[u-1];for(arguments.length||(n=-1/(6*this.area()));++r<u;)t=a,a=this[r],e=t[0]*a[1]-a[0]*t[1],i+=(t[0]+a[0])*e,o+=(t[1]+a[1])*e;return[i*n,o*n]},Zc.clip=function(n){for(var t,e,r,u,i,o,a=Cr(n),c=-1,s=this.length-Cr(this),l=this[s-1];++c<s;){for(t=n.slice(),n.length=0,u=this[c],i=t[(r=t.length-a)-1],e=-1;++e<r;)o=t[e],Er(o,l,u)?(Er(i,l,u)||n.push(Ar(i,o,l,u)),n.push(o)):Er(i,l,u)&&n.push(Ar(i,o,l,u)),i=o;a&&n.push(n[0]),l=u}return n};var Vc,Xc,$c,Bc,Wc,Jc=[],Gc=[];Pr.prototype.prepare=function(){for(var n,t=this.edges,e=t.length;e--;)n=t[e].edge,n.b&&n.a||t.splice(e,1);return t.sort(jr),t.length},Br.prototype={start:function(){return this.edge.l===this.site?this.edge.a:this.edge.b},end:function(){return this.edge.l===this.site?this.edge.b:this.edge.a}},Wr.prototype={insert:function(n,t){var e,r,u;if(n){if(t.P=n,t.N=n.N,n.N&&(n.N.P=t),n.N=t,n.R){for(n=n.R;n.L;)n=n.L;n.L=t}else n.R=t;e=n}else this._?(n=Qr(this._),t.P=null,t.N=n,n.P=n.L=t,e=n):(t.P=t.N=null,this._=t,e=null);for(t.L=t.R=null,t.U=e,t.C=!0,n=t;e&&e.C;)r=e.U,e===r.L?(u=r.R,u&&u.C?(e.C=u.C=!1,r.C=!0,n=r):(n===e.R&&(Gr(this,e),n=e,e=n.U),e.C=!1,r.C=!0,Kr(this,r))):(u=r.L,u&&u.C?(e.C=u.C=!1,r.C=!0,n=r):(n===e.L&&(Kr(this,e),n=e,e=n.U),e.C=!1,r.C=!0,Gr(this,r))),e=n.U;this._.C=!1},remove:function(n){n.N&&(n.N.P=n.P),n.P&&(n.P.N=n.N),n.N=n.P=null;var t,e,r,u=n.U,i=n.L,o=n.R;if(e=i?o?Qr(o):i:o,u?u.L===n?u.L=e:u.R=e:this._=e,i&&o?(r=e.C,e.C=n.C,e.L=i,i.U=e,e!==o?(u=e.U,e.U=n.U,n=e.R,u.L=n,e.R=o,o.U=e):(e.U=u,u=e,n=e.R)):(r=n.C,n=e),n&&(n.U=u),!r){if(n&&n.C)return n.C=!1,void 0;do{if(n===this._)break;if(n===u.L){if(t=u.R,t.C&&(t.C=!1,u.C=!0,Gr(this,u),t=u.R),t.L&&t.L.C||t.R&&t.R.C){t.R&&t.R.C||(t.L.C=!1,t.C=!0,Kr(this,t),t=u.R),t.C=u.C,u.C=t.R.C=!1,Gr(this,u),n=this._;break}}else if(t=u.L,t.C&&(t.C=!1,u.C=!0,Kr(this,u),t=u.L),t.L&&t.L.C||t.R&&t.R.C){t.L&&t.L.C||(t.R.C=!1,t.C=!0,Gr(this,t),t=u.L),t.C=u.C,u.C=t.L.C=!1,Kr(this,u),n=this._;break}t.C=!0,n=u,u=u.U}while(!n.C);n&&(n.C=!1)}}},Xo.geom.voronoi=function(n){function t(n){var t=new Array(n.length),r=a[0][0],u=a[0][1],i=a[1][0],o=a[1][1];return nu(e(n),a).cells.forEach(function(e,a){var c=e.edges,s=e.site,l=t[a]=c.length?c.map(function(n){var t=n.start();return[t.x,t.y]}):s.x>=r&&s.x<=i&&s.y>=u&&s.y<=o?[[r,o],[i,o],[i,u],[r,u]]:[];l.point=n[a]}),t}function e(n){return n.map(function(n,t){return{x:Math.round(i(n,t)/Aa)*Aa,y:Math.round(o(n,t)/Aa)*Aa,i:t}})}var r=br,u=wr,i=r,o=u,a=Kc;return n?t(n):(t.links=function(n){return nu(e(n)).edges.filter(function(n){return n.l&&n.r}).map(function(t){return{source:n[t.l.i],target:n[t.r.i]}})},t.triangles=function(n){var t=[];return nu(e(n)).cells.forEach(function(e,r){for(var u,i,o=e.site,a=e.edges.sort(jr),c=-1,s=a.length,l=a[s-1].edge,f=l.l===o?l.r:l.l;++c<s;)u=l,i=f,l=a[c].edge,f=l.l===o?l.r:l.l,r<i.i&&r<f.i&&eu(o,i,f)<0&&t.push([n[r],n[i.i],n[f.i]])}),t},t.x=function(n){return arguments.length?(i=_t(r=n),t):r},t.y=function(n){return arguments.length?(o=_t(u=n),t):u},t.clipExtent=function(n){return arguments.length?(a=null==n?Kc:n,t):a===Kc?null:a},t.size=function(n){return arguments.length?t.clipExtent(n&&[[0,0],n]):a===Kc?null:a&&a[1]},t)};var Kc=[[-1e6,-1e6],[1e6,1e6]];Xo.geom.delaunay=function(n){return Xo.geom.voronoi().triangles(n)},Xo.geom.quadtree=function(n,t,e,r,u){function i(n){function i(n,t,e,r,u,i,o,a){if(!isNaN(e)&&!isNaN(r))if(n.leaf){var c=n.x,l=n.y;if(null!=c)if(oa(c-e)+oa(l-r)<.01)s(n,t,e,r,u,i,o,a);else{var f=n.point;n.x=n.y=n.point=null,s(n,f,c,l,u,i,o,a),s(n,t,e,r,u,i,o,a)}else n.x=e,n.y=r,n.point=t}else s(n,t,e,r,u,i,o,a)}function s(n,t,e,r,u,o,a,c){var s=.5*(u+a),l=.5*(o+c),f=e>=s,h=r>=l,g=(h<<1)+f;n.leaf=!1,n=n.nodes[g]||(n.nodes[g]=iu()),f?u=s:a=s,h?o=l:c=l,i(n,t,e,r,u,o,a,c)}var l,f,h,g,p,v,d,m,y,x=_t(a),M=_t(c);if(null!=t)v=t,d=e,m=r,y=u;else if(m=y=-(v=d=1/0),f=[],h=[],p=n.length,o)for(g=0;p>g;++g)l=n[g],l.x<v&&(v=l.x),l.y<d&&(d=l.y),l.x>m&&(m=l.x),l.y>y&&(y=l.y),f.push(l.x),h.push(l.y);else for(g=0;p>g;++g){var _=+x(l=n[g],g),b=+M(l,g);v>_&&(v=_),d>b&&(d=b),_>m&&(m=_),b>y&&(y=b),f.push(_),h.push(b)}var w=m-v,S=y-d;w>S?y=d+w:m=v+S;var k=iu();if(k.add=function(n){i(k,n,+x(n,++g),+M(n,g),v,d,m,y)},k.visit=function(n){ou(n,k,v,d,m,y)},g=-1,null==t){for(;++g<p;)i(k,n[g],f[g],h[g],v,d,m,y);--g}else n.forEach(k.add);return f=h=n=l=null,k}var o,a=br,c=wr;return(o=arguments.length)?(a=ru,c=uu,3===o&&(u=e,r=t,e=t=0),i(n)):(i.x=function(n){return arguments.length?(a=n,i):a},i.y=function(n){return arguments.length?(c=n,i):c},i.extent=function(n){return arguments.length?(null==n?t=e=r=u=null:(t=+n[0][0],e=+n[0][1],r=+n[1][0],u=+n[1][1]),i):null==t?null:[[t,e],[r,u]]},i.size=function(n){return arguments.length?(null==n?t=e=r=u=null:(t=e=0,r=+n[0],u=+n[1]),i):null==t?null:[r-t,u-e]},i)},Xo.interpolateRgb=au,Xo.interpolateObject=cu,Xo.interpolateNumber=su,Xo.interpolateString=lu;var Qc=/[-+]?(?:\d+\.?\d*|\.?\d+)(?:[eE][-+]?\d+)?/g;Xo.interpolate=fu,Xo.interpolators=[function(n,t){var e=typeof t;return("string"===e?Va.has(t)||/^(#|rgb\(|hsl\()/.test(t)?au:lu:t instanceof G?au:"object"===e?Array.isArray(t)?hu:cu:su)(n,t)}],Xo.interpolateArray=hu;var ns=function(){return bt},ts=Xo.map({linear:ns,poly:xu,quad:function(){return du},cubic:function(){return mu},sin:function(){return Mu},exp:function(){return _u},circle:function(){return bu},elastic:wu,back:Su,bounce:function(){return ku}}),es=Xo.map({"in":bt,out:pu,"in-out":vu,"out-in":function(n){return vu(pu(n))}});Xo.ease=function(n){var t=n.indexOf("-"),e=t>=0?n.substring(0,t):n,r=t>=0?n.substring(t+1):"in";return e=ts.get(e)||ns,r=es.get(r)||bt,gu(r(e.apply(null,$o.call(arguments,1))))},Xo.interpolateHcl=Eu,Xo.interpolateHsl=Au,Xo.interpolateLab=Cu,Xo.interpolateRound=Nu,Xo.transform=function(n){var t=Wo.createElementNS(Xo.ns.prefix.svg,"g");return(Xo.transform=function(n){if(null!=n){t.setAttribute("transform",n);var e=t.transform.baseVal.consolidate()}return new Lu(e?e.matrix:rs)})(n)},Lu.prototype.toString=function(){return"translate("+this.translate+")rotate("+this.rotate+")skewX("+this.skew+")scale("+this.scale+")"};var rs={a:1,b:0,c:0,d:1,e:0,f:0};Xo.interpolateTransform=Ru,Xo.layout={},Xo.layout.bundle=function(){return function(n){for(var t=[],e=-1,r=n.length;++e<r;)t.push(Uu(n[e]));return t}},Xo.layout.chord=function(){function n(){var n,s,f,h,g,p={},v=[],d=Xo.range(i),m=[];for(e=[],r=[],n=0,h=-1;++h<i;){for(s=0,g=-1;++g<i;)s+=u[h][g];v.push(s),m.push(Xo.range(i)),n+=s}for(o&&d.sort(function(n,t){return o(v[n],v[t])}),a&&m.forEach(function(n,t){n.sort(function(n,e){return a(u[t][n],u[t][e])})}),n=(ka-l*i)/n,s=0,h=-1;++h<i;){for(f=s,g=-1;++g<i;){var y=d[h],x=m[y][g],M=u[y][x],_=s,b=s+=M*n;p[y+"-"+x]={index:y,subindex:x,startAngle:_,endAngle:b,value:M}}r[y]={index:y,startAngle:f,endAngle:s,value:(s-f)/n},s+=l}for(h=-1;++h<i;)for(g=h-1;++g<i;){var w=p[h+"-"+g],S=p[g+"-"+h];(w.value||S.value)&&e.push(w.value<S.value?{source:S,target:w}:{source:w,target:S})}c&&t()}function t(){e.sort(function(n,t){return c((n.source.value+n.target.value)/2,(t.source.value+t.target.value)/2)})}var e,r,u,i,o,a,c,s={},l=0;return s.matrix=function(n){return arguments.length?(i=(u=n)&&u.length,e=r=null,s):u},s.padding=function(n){return arguments.length?(l=n,e=r=null,s):l},s.sortGroups=function(n){return arguments.length?(o=n,e=r=null,s):o},s.sortSubgroups=function(n){return arguments.length?(a=n,e=null,s):a},s.sortChords=function(n){return arguments.length?(c=n,e&&t(),s):c},s.chords=function(){return e||n(),e},s.groups=function(){return r||n(),r},s},Xo.layout.force=function(){function n(n){return function(t,e,r,u){if(t.point!==n){var i=t.cx-n.x,o=t.cy-n.y,a=u-e,c=i*i+o*o;if(c>a*a/d){if(p>c){var s=t.charge/c;n.px-=i*s,n.py-=o*s}return!0}if(t.point&&c&&p>c){var s=t.pointCharge/c;n.px-=i*s,n.py-=o*s}}return!t.charge}}function t(n){n.px=Xo.event.x,n.py=Xo.event.y,a.resume()}var e,r,u,i,o,a={},c=Xo.dispatch("start","tick","end"),s=[1,1],l=.9,f=us,h=is,g=-30,p=os,v=.1,d=.64,m=[],y=[];return a.tick=function(){if((r*=.99)<.005)return c.end({type:"end",alpha:r=0}),!0;var t,e,a,f,h,p,d,x,M,_=m.length,b=y.length;for(e=0;b>e;++e)a=y[e],f=a.source,h=a.target,x=h.x-f.x,M=h.y-f.y,(p=x*x+M*M)&&(p=r*i[e]*((p=Math.sqrt(p))-u[e])/p,x*=p,M*=p,h.x-=x*(d=f.weight/(h.weight+f.weight)),h.y-=M*d,f.x+=x*(d=1-d),f.y+=M*d);if((d=r*v)&&(x=s[0]/2,M=s[1]/2,e=-1,d))for(;++e<_;)a=m[e],a.x+=(x-a.x)*d,a.y+=(M-a.y)*d;if(g)for(Zu(t=Xo.geom.quadtree(m),r,o),e=-1;++e<_;)(a=m[e]).fixed||t.visit(n(a));for(e=-1;++e<_;)a=m[e],a.fixed?(a.x=a.px,a.y=a.py):(a.x-=(a.px-(a.px=a.x))*l,a.y-=(a.py-(a.py=a.y))*l);c.tick({type:"tick",alpha:r})},a.nodes=function(n){return arguments.length?(m=n,a):m},a.links=function(n){return arguments.length?(y=n,a):y},a.size=function(n){return arguments.length?(s=n,a):s},a.linkDistance=function(n){return arguments.length?(f="function"==typeof n?n:+n,a):f},a.distance=a.linkDistance,a.linkStrength=function(n){return arguments.length?(h="function"==typeof n?n:+n,a):h},a.friction=function(n){return arguments.length?(l=+n,a):l},a.charge=function(n){return arguments.length?(g="function"==typeof n?n:+n,a):g},a.chargeDistance=function(n){return arguments.length?(p=n*n,a):Math.sqrt(p)},a.gravity=function(n){return arguments.length?(v=+n,a):v},a.theta=function(n){return arguments.length?(d=n*n,a):Math.sqrt(d)},a.alpha=function(n){return arguments.length?(n=+n,r?r=n>0?n:0:n>0&&(c.start({type:"start",alpha:r=n}),Xo.timer(a.tick)),a):r},a.start=function(){function n(n,r){if(!e){for(e=new Array(c),a=0;c>a;++a)e[a]=[];for(a=0;s>a;++a){var u=y[a];e[u.source.index].push(u.target),e[u.target.index].push(u.source)}}for(var i,o=e[t],a=-1,s=o.length;++a<s;)if(!isNaN(i=o[a][n]))return i;return Math.random()*r}var t,e,r,c=m.length,l=y.length,p=s[0],v=s[1];for(t=0;c>t;++t)(r=m[t]).index=t,r.weight=0;for(t=0;l>t;++t)r=y[t],"number"==typeof r.source&&(r.source=m[r.source]),"number"==typeof r.target&&(r.target=m[r.target]),++r.source.weight,++r.target.weight;for(t=0;c>t;++t)r=m[t],isNaN(r.x)&&(r.x=n("x",p)),isNaN(r.y)&&(r.y=n("y",v)),isNaN(r.px)&&(r.px=r.x),isNaN(r.py)&&(r.py=r.y);if(u=[],"function"==typeof f)for(t=0;l>t;++t)u[t]=+f.call(this,y[t],t);else for(t=0;l>t;++t)u[t]=f;if(i=[],"function"==typeof h)for(t=0;l>t;++t)i[t]=+h.call(this,y[t],t);else for(t=0;l>t;++t)i[t]=h;if(o=[],"function"==typeof g)for(t=0;c>t;++t)o[t]=+g.call(this,m[t],t);else for(t=0;c>t;++t)o[t]=g;return a.resume()},a.resume=function(){return a.alpha(.1)},a.stop=function(){return a.alpha(0)},a.drag=function(){return e||(e=Xo.behavior.drag().origin(bt).on("dragstart.force",Fu).on("drag.force",t).on("dragend.force",Ou)),arguments.length?(this.on("mouseover.force",Yu).on("mouseout.force",Iu).call(e),void 0):e},Xo.rebind(a,c,"on")};var us=20,is=1,os=1/0;Xo.layout.hierarchy=function(){function n(t,o,a){var c=u.call(e,t,o);if(t.depth=o,a.push(t),c&&(s=c.length)){for(var s,l,f=-1,h=t.children=new Array(s),g=0,p=o+1;++f<s;)l=h[f]=n(c[f],p,a),l.parent=t,g+=l.value;r&&h.sort(r),i&&(t.value=g)}else delete t.children,i&&(t.value=+i.call(e,t,o)||0);return t}function t(n,r){var u=n.children,o=0;if(u&&(a=u.length))for(var a,c=-1,s=r+1;++c<a;)o+=t(u[c],s);else i&&(o=+i.call(e,n,r)||0);return i&&(n.value=o),o}function e(t){var e=[];return n(t,0,e),e}var r=Bu,u=Xu,i=$u;return e.sort=function(n){return arguments.length?(r=n,e):r},e.children=function(n){return arguments.length?(u=n,e):u},e.value=function(n){return arguments.length?(i=n,e):i},e.revalue=function(n){return t(n,0),n},e},Xo.layout.partition=function(){function n(t,e,r,u){var i=t.children;if(t.x=e,t.y=t.depth*u,t.dx=r,t.dy=u,i&&(o=i.length)){var o,a,c,s=-1;for(r=t.value?r/t.value:0;++s<o;)n(a=i[s],e,c=a.value*r,u),e+=c}}function t(n){var e=n.children,r=0;if(e&&(u=e.length))for(var u,i=-1;++i<u;)r=Math.max(r,t(e[i]));return 1+r}function e(e,i){var o=r.call(this,e,i);return n(o[0],0,u[0],u[1]/t(o[0])),o}var r=Xo.layout.hierarchy(),u=[1,1];return e.size=function(n){return arguments.length?(u=n,e):u},Vu(e,r)},Xo.layout.pie=function(){function n(i){var o=i.map(function(e,r){return+t.call(n,e,r)}),a=+("function"==typeof r?r.apply(this,arguments):r),c=(("function"==typeof u?u.apply(this,arguments):u)-a)/Xo.sum(o),s=Xo.range(i.length);null!=e&&s.sort(e===as?function(n,t){return o[t]-o[n]}:function(n,t){return e(i[n],i[t])});var l=[];return s.forEach(function(n){var t;l[n]={data:i[n],value:t=o[n],startAngle:a,endAngle:a+=t*c}}),l}var t=Number,e=as,r=0,u=ka;return n.value=function(e){return arguments.length?(t=e,n):t},n.sort=function(t){return arguments.length?(e=t,n):e},n.startAngle=function(t){return arguments.length?(r=t,n):r},n.endAngle=function(t){return arguments.length?(u=t,n):u},n};var as={};Xo.layout.stack=function(){function n(a,c){var s=a.map(function(e,r){return t.call(n,e,r)}),l=s.map(function(t){return t.map(function(t,e){return[i.call(n,t,e),o.call(n,t,e)]})}),f=e.call(n,l,c);s=Xo.permute(s,f),l=Xo.permute(l,f);var h,g,p,v=r.call(n,l,c),d=s.length,m=s[0].length;for(g=0;m>g;++g)for(u.call(n,s[0][g],p=v[g],l[0][g][1]),h=1;d>h;++h)u.call(n,s[h][g],p+=l[h-1][g][1],l[h][g][1]);return a}var t=bt,e=Qu,r=ni,u=Ku,i=Ju,o=Gu;return n.values=function(e){return arguments.length?(t=e,n):t},n.order=function(t){return arguments.length?(e="function"==typeof t?t:cs.get(t)||Qu,n):e},n.offset=function(t){return arguments.length?(r="function"==typeof t?t:ss.get(t)||ni,n):r},n.x=function(t){return arguments.length?(i=t,n):i},n.y=function(t){return arguments.length?(o=t,n):o},n.out=function(t){return arguments.length?(u=t,n):u},n};var cs=Xo.map({"inside-out":function(n){var t,e,r=n.length,u=n.map(ti),i=n.map(ei),o=Xo.range(r).sort(function(n,t){return u[n]-u[t]}),a=0,c=0,s=[],l=[];for(t=0;r>t;++t)e=o[t],c>a?(a+=i[e],s.push(e)):(c+=i[e],l.push(e));return l.reverse().concat(s)},reverse:function(n){return Xo.range(n.length).reverse()},"default":Qu}),ss=Xo.map({silhouette:function(n){var t,e,r,u=n.length,i=n[0].length,o=[],a=0,c=[];for(e=0;i>e;++e){for(t=0,r=0;u>t;t++)r+=n[t][e][1];r>a&&(a=r),o.push(r)}for(e=0;i>e;++e)c[e]=(a-o[e])/2;return c},wiggle:function(n){var t,e,r,u,i,o,a,c,s,l=n.length,f=n[0],h=f.length,g=[];for(g[0]=c=s=0,e=1;h>e;++e){for(t=0,u=0;l>t;++t)u+=n[t][e][1];for(t=0,i=0,a=f[e][0]-f[e-1][0];l>t;++t){for(r=0,o=(n[t][e][1]-n[t][e-1][1])/(2*a);t>r;++r)o+=(n[r][e][1]-n[r][e-1][1])/a;i+=o*n[t][e][1]}g[e]=c-=u?i/u*a:0,s>c&&(s=c)}for(e=0;h>e;++e)g[e]-=s;return g},expand:function(n){var t,e,r,u=n.length,i=n[0].length,o=1/u,a=[];for(e=0;i>e;++e){for(t=0,r=0;u>t;t++)r+=n[t][e][1];if(r)for(t=0;u>t;t++)n[t][e][1]/=r;else for(t=0;u>t;t++)n[t][e][1]=o}for(e=0;i>e;++e)a[e]=0;return a},zero:ni});Xo.layout.histogram=function(){function n(n,i){for(var o,a,c=[],s=n.map(e,this),l=r.call(this,s,i),f=u.call(this,l,s,i),i=-1,h=s.length,g=f.length-1,p=t?1:1/h;++i<g;)o=c[i]=[],o.dx=f[i+1]-(o.x=f[i]),o.y=0;if(g>0)for(i=-1;++i<h;)a=s[i],a>=l[0]&&a<=l[1]&&(o=c[Xo.bisect(f,a,1,g)-1],o.y+=p,o.push(n[i]));return c}var t=!0,e=Number,r=oi,u=ui;return n.value=function(t){return arguments.length?(e=t,n):e},n.range=function(t){return arguments.length?(r=_t(t),n):r},n.bins=function(t){return arguments.length?(u="number"==typeof t?function(n){return ii(n,t)}:_t(t),n):u},n.frequency=function(e){return arguments.length?(t=!!e,n):t},n},Xo.layout.tree=function(){function n(n,i){function o(n,t){var r=n.children,u=n._tree;if(r&&(i=r.length)){for(var i,a,s,l=r[0],f=l,h=-1;++h<i;)s=r[h],o(s,a),f=c(s,a,f),a=s;vi(n);var g=.5*(l._tree.prelim+s._tree.prelim);t?(u.prelim=t._tree.prelim+e(n,t),u.mod=u.prelim-g):u.prelim=g}else t&&(u.prelim=t._tree.prelim+e(n,t))}function a(n,t){n.x=n._tree.prelim+t;var e=n.children;if(e&&(r=e.length)){var r,u=-1;for(t+=n._tree.mod;++u<r;)a(e[u],t)}}function c(n,t,r){if(t){for(var u,i=n,o=n,a=t,c=n.parent.children[0],s=i._tree.mod,l=o._tree.mod,f=a._tree.mod,h=c._tree.mod;a=si(a),i=ci(i),a&&i;)c=ci(c),o=si(o),o._tree.ancestor=n,u=a._tree.prelim+f-i._tree.prelim-s+e(a,i),u>0&&(di(mi(a,n,r),n,u),s+=u,l+=u),f+=a._tree.mod,s+=i._tree.mod,h+=c._tree.mod,l+=o._tree.mod;a&&!si(o)&&(o._tree.thread=a,o._tree.mod+=f-l),i&&!ci(c)&&(c._tree.thread=i,c._tree.mod+=s-h,r=n)}return r}var s=t.call(this,n,i),l=s[0];pi(l,function(n,t){n._tree={ancestor:n,prelim:0,mod:0,change:0,shift:0,number:t?t._tree.number+1:0}}),o(l),a(l,-l._tree.prelim);var f=li(l,hi),h=li(l,fi),g=li(l,gi),p=f.x-e(f,h)/2,v=h.x+e(h,f)/2,d=g.depth||1;return pi(l,u?function(n){n.x*=r[0],n.y=n.depth*r[1],delete n._tree}:function(n){n.x=(n.x-p)/(v-p)*r[0],n.y=n.depth/d*r[1],delete n._tree}),s}var t=Xo.layout.hierarchy().sort(null).value(null),e=ai,r=[1,1],u=!1;return n.separation=function(t){return arguments.length?(e=t,n):e},n.size=function(t){return arguments.length?(u=null==(r=t),n):u?null:r},n.nodeSize=function(t){return arguments.length?(u=null!=(r=t),n):u?r:null},Vu(n,t)},Xo.layout.pack=function(){function n(n,i){var o=e.call(this,n,i),a=o[0],c=u[0],s=u[1],l=null==t?Math.sqrt:"function"==typeof t?t:function(){return t};if(a.x=a.y=0,pi(a,function(n){n.r=+l(n.value)}),pi(a,bi),r){var f=r*(t?1:Math.max(2*a.r/c,2*a.r/s))/2;pi(a,function(n){n.r+=f}),pi(a,bi),pi(a,function(n){n.r-=f})}return ki(a,c/2,s/2,t?1:1/Math.max(2*a.r/c,2*a.r/s)),o}var t,e=Xo.layout.hierarchy().sort(yi),r=0,u=[1,1];return n.size=function(t){return arguments.length?(u=t,n):u},n.radius=function(e){return arguments.length?(t=null==e||"function"==typeof e?e:+e,n):t},n.padding=function(t){return arguments.length?(r=+t,n):r},Vu(n,e)},Xo.layout.cluster=function(){function n(n,i){var o,a=t.call(this,n,i),c=a[0],s=0;pi(c,function(n){var t=n.children;t&&t.length?(n.x=Ci(t),n.y=Ai(t)):(n.x=o?s+=e(n,o):0,n.y=0,o=n)});var l=Ni(c),f=Li(c),h=l.x-e(l,f)/2,g=f.x+e(f,l)/2;return pi(c,u?function(n){n.x=(n.x-c.x)*r[0],n.y=(c.y-n.y)*r[1]}:function(n){n.x=(n.x-h)/(g-h)*r[0],n.y=(1-(c.y?n.y/c.y:1))*r[1]}),a}var t=Xo.layout.hierarchy().sort(null).value(null),e=ai,r=[1,1],u=!1;return n.separation=function(t){return arguments.length?(e=t,n):e},n.size=function(t){return arguments.length?(u=null==(r=t),n):u?null:r},n.nodeSize=function(t){return arguments.length?(u=null!=(r=t),n):u?r:null},Vu(n,t)},Xo.layout.treemap=function(){function n(n,t){for(var e,r,u=-1,i=n.length;++u<i;)r=(e=n[u]).value*(0>t?0:t),e.area=isNaN(r)||0>=r?0:r}function t(e){var i=e.children;if(i&&i.length){var o,a,c,s=f(e),l=[],h=i.slice(),p=1/0,v="slice"===g?s.dx:"dice"===g?s.dy:"slice-dice"===g?1&e.depth?s.dy:s.dx:Math.min(s.dx,s.dy);for(n(h,s.dx*s.dy/e.value),l.area=0;(c=h.length)>0;)l.push(o=h[c-1]),l.area+=o.area,"squarify"!==g||(a=r(l,v))<=p?(h.pop(),p=a):(l.area-=l.pop().area,u(l,v,s,!1),v=Math.min(s.dx,s.dy),l.length=l.area=0,p=1/0);l.length&&(u(l,v,s,!0),l.length=l.area=0),i.forEach(t)}}function e(t){var r=t.children;if(r&&r.length){var i,o=f(t),a=r.slice(),c=[];for(n(a,o.dx*o.dy/t.value),c.area=0;i=a.pop();)c.push(i),c.area+=i.area,null!=i.z&&(u(c,i.z?o.dx:o.dy,o,!a.length),c.length=c.area=0);r.forEach(e)}}function r(n,t){for(var e,r=n.area,u=0,i=1/0,o=-1,a=n.length;++o<a;)(e=n[o].area)&&(i>e&&(i=e),e>u&&(u=e));return r*=r,t*=t,r?Math.max(t*u*p/r,r/(t*i*p)):1/0}function u(n,t,e,r){var u,i=-1,o=n.length,a=e.x,s=e.y,l=t?c(n.area/t):0;if(t==e.dx){for((r||l>e.dy)&&(l=e.dy);++i<o;)u=n[i],u.x=a,u.y=s,u.dy=l,a+=u.dx=Math.min(e.x+e.dx-a,l?c(u.area/l):0);u.z=!0,u.dx+=e.x+e.dx-a,e.y+=l,e.dy-=l}else{for((r||l>e.dx)&&(l=e.dx);++i<o;)u=n[i],u.x=a,u.y=s,u.dx=l,s+=u.dy=Math.min(e.y+e.dy-s,l?c(u.area/l):0);u.z=!1,u.dy+=e.y+e.dy-s,e.x+=l,e.dx-=l}}function i(r){var u=o||a(r),i=u[0];return i.x=0,i.y=0,i.dx=s[0],i.dy=s[1],o&&a.revalue(i),n([i],i.dx*i.dy/i.value),(o?e:t)(i),h&&(o=u),u}var o,a=Xo.layout.hierarchy(),c=Math.round,s=[1,1],l=null,f=Ti,h=!1,g="squarify",p=.5*(1+Math.sqrt(5));return i.size=function(n){return arguments.length?(s=n,i):s},i.padding=function(n){function t(t){var e=n.call(i,t,t.depth);return null==e?Ti(t):qi(t,"number"==typeof e?[e,e,e,e]:e)}function e(t){return qi(t,n)}if(!arguments.length)return l;var r;return f=null==(l=n)?Ti:"function"==(r=typeof n)?t:"number"===r?(n=[n,n,n,n],e):e,i},i.round=function(n){return arguments.length?(c=n?Math.round:Number,i):c!=Number},i.sticky=function(n){return arguments.length?(h=n,o=null,i):h},i.ratio=function(n){return arguments.length?(p=n,i):p},i.mode=function(n){return arguments.length?(g=n+"",i):g},Vu(i,a)},Xo.random={normal:function(n,t){var e=arguments.length;return 2>e&&(t=1),1>e&&(n=0),function(){var e,r,u;do e=2*Math.random()-1,r=2*Math.random()-1,u=e*e+r*r;while(!u||u>1);return n+t*e*Math.sqrt(-2*Math.log(u)/u)}},logNormal:function(){var n=Xo.random.normal.apply(Xo,arguments);return function(){return Math.exp(n())}},bates:function(n){var t=Xo.random.irwinHall(n);return function(){return t()/n}},irwinHall:function(n){return function(){for(var t=0,e=0;n>e;e++)t+=Math.random();return t}}},Xo.scale={};var ls={floor:bt,ceil:bt};Xo.scale.linear=function(){return Hi([0,1],[0,1],fu,!1)};var fs={s:1,g:1,p:1,r:1,e:1};Xo.scale.log=function(){return $i(Xo.scale.linear().domain([0,1]),10,!0,[1,10])};var hs=Xo.format(".0e"),gs={floor:function(n){return-Math.ceil(-n)},ceil:function(n){return-Math.floor(-n)}};Xo.scale.pow=function(){return Bi(Xo.scale.linear(),1,[0,1])},Xo.scale.sqrt=function(){return Xo.scale.pow().exponent(.5)},Xo.scale.ordinal=function(){return Ji([],{t:"range",a:[[]]})},Xo.scale.category10=function(){return Xo.scale.ordinal().range(ps)},Xo.scale.category20=function(){return Xo.scale.ordinal().range(vs)},Xo.scale.category20b=function(){return Xo.scale.ordinal().range(ds)},Xo.scale.category20c=function(){return Xo.scale.ordinal().range(ms)};var ps=[2062260,16744206,2924588,14034728,9725885,9197131,14907330,8355711,12369186,1556175].map(ht),vs=[2062260,11454440,16744206,16759672,2924588,10018698,14034728,16750742,9725885,12955861,9197131,12885140,14907330,16234194,8355711,13092807,12369186,14408589,1556175,10410725].map(ht),ds=[3750777,5395619,7040719,10264286,6519097,9216594,11915115,13556636,9202993,12426809,15186514,15190932,8666169,11356490,14049643,15177372,8077683,10834324,13528509,14589654].map(ht),ms=[3244733,7057110,10406625,13032431,15095053,16616764,16625259,16634018,3253076,7652470,10607003,13101504,7695281,10394312,12369372,14342891,6513507,9868950,12434877,14277081].map(ht);Xo.scale.quantile=function(){return Gi([],[])},Xo.scale.quantize=function(){return Ki(0,1,[0,1])},Xo.scale.threshold=function(){return Qi([.5],[0,1])},Xo.scale.identity=function(){return no([0,1])},Xo.svg={},Xo.svg.arc=function(){function n(){var n=t.apply(this,arguments),i=e.apply(this,arguments),o=r.apply(this,arguments)+ys,a=u.apply(this,arguments)+ys,c=(o>a&&(c=o,o=a,a=c),a-o),s=Sa>c?"0":"1",l=Math.cos(o),f=Math.sin(o),h=Math.cos(a),g=Math.sin(a);return c>=xs?n?"M0,"+i+"A"+i+","+i+" 0 1,1 0,"+-i+"A"+i+","+i+" 0 1,1 0,"+i+"M0,"+n+"A"+n+","+n+" 0 1,0 0,"+-n+"A"+n+","+n+" 0 1,0 0,"+n+"Z":"M0,"+i+"A"+i+","+i+" 0 1,1 0,"+-i+"A"+i+","+i+" 0 1,1 0,"+i+"Z":n?"M"+i*l+","+i*f+"A"+i+","+i+" 0 "+s+",1 "+i*h+","+i*g+"L"+n*h+","+n*g+"A"+n+","+n+" 0 "+s+",0 "+n*l+","+n*f+"Z":"M"+i*l+","+i*f+"A"+i+","+i+" 0 "+s+",1 "+i*h+","+i*g+"L0,0"+"Z"}var t=to,e=eo,r=ro,u=uo;return n.innerRadius=function(e){return arguments.length?(t=_t(e),n):t},n.outerRadius=function(t){return arguments.length?(e=_t(t),n):e},n.startAngle=function(t){return arguments.length?(r=_t(t),n):r},n.endAngle=function(t){return arguments.length?(u=_t(t),n):u},n.centroid=function(){var n=(t.apply(this,arguments)+e.apply(this,arguments))/2,i=(r.apply(this,arguments)+u.apply(this,arguments))/2+ys;return[Math.cos(i)*n,Math.sin(i)*n]},n};var ys=-Ea,xs=ka-Aa;Xo.svg.line=function(){return io(bt)};var Ms=Xo.map({linear:oo,"linear-closed":ao,step:co,"step-before":so,"step-after":lo,basis:mo,"basis-open":yo,"basis-closed":xo,bundle:Mo,cardinal:go,"cardinal-open":fo,"cardinal-closed":ho,monotone:Eo});Ms.forEach(function(n,t){t.key=n,t.closed=/-closed$/.test(n)});var _s=[0,2/3,1/3,0],bs=[0,1/3,2/3,0],ws=[0,1/6,2/3,1/6];Xo.svg.line.radial=function(){var n=io(Ao);return n.radius=n.x,delete n.x,n.angle=n.y,delete n.y,n},so.reverse=lo,lo.reverse=so,Xo.svg.area=function(){return Co(bt)},Xo.svg.area.radial=function(){var n=Co(Ao);return n.radius=n.x,delete n.x,n.innerRadius=n.x0,delete n.x0,n.outerRadius=n.x1,delete n.x1,n.angle=n.y,delete n.y,n.startAngle=n.y0,delete n.y0,n.endAngle=n.y1,delete n.y1,n},Xo.svg.chord=function(){function n(n,a){var c=t(this,i,n,a),s=t(this,o,n,a);return"M"+c.p0+r(c.r,c.p1,c.a1-c.a0)+(e(c,s)?u(c.r,c.p1,c.r,c.p0):u(c.r,c.p1,s.r,s.p0)+r(s.r,s.p1,s.a1-s.a0)+u(s.r,s.p1,c.r,c.p0))+"Z"}function t(n,t,e,r){var u=t.call(n,e,r),i=a.call(n,u,r),o=c.call(n,u,r)+ys,l=s.call(n,u,r)+ys;return{r:i,a0:o,a1:l,p0:[i*Math.cos(o),i*Math.sin(o)],p1:[i*Math.cos(l),i*Math.sin(l)]}}function e(n,t){return n.a0==t.a0&&n.a1==t.a1}function r(n,t,e){return"A"+n+","+n+" 0 "+ +(e>Sa)+",1 "+t}function u(n,t,e,r){return"Q 0,0 "+r}var i=hr,o=gr,a=No,c=ro,s=uo;return n.radius=function(t){return arguments.length?(a=_t(t),n):a},n.source=function(t){return arguments.length?(i=_t(t),n):i},n.target=function(t){return arguments.length?(o=_t(t),n):o},n.startAngle=function(t){return arguments.length?(c=_t(t),n):c},n.endAngle=function(t){return arguments.length?(s=_t(t),n):s},n},Xo.svg.diagonal=function(){function n(n,u){var i=t.call(this,n,u),o=e.call(this,n,u),a=(i.y+o.y)/2,c=[i,{x:i.x,y:a},{x:o.x,y:a},o];return c=c.map(r),"M"+c[0]+"C"+c[1]+" "+c[2]+" "+c[3]}var t=hr,e=gr,r=Lo;return n.source=function(e){return arguments.length?(t=_t(e),n):t},n.target=function(t){return arguments.length?(e=_t(t),n):e},n.projection=function(t){return arguments.length?(r=t,n):r},n},Xo.svg.diagonal.radial=function(){var n=Xo.svg.diagonal(),t=Lo,e=n.projection;return n.projection=function(n){return arguments.length?e(To(t=n)):t},n},Xo.svg.symbol=function(){function n(n,r){return(Ss.get(t.call(this,n,r))||Ro)(e.call(this,n,r))}var t=zo,e=qo;return n.type=function(e){return arguments.length?(t=_t(e),n):t},n.size=function(t){return arguments.length?(e=_t(t),n):e},n};var Ss=Xo.map({circle:Ro,cross:function(n){var t=Math.sqrt(n/5)/2;return"M"+-3*t+","+-t+"H"+-t+"V"+-3*t+"H"+t+"V"+-t+"H"+3*t+"V"+t+"H"+t+"V"+3*t+"H"+-t+"V"+t+"H"+-3*t+"Z"},diamond:function(n){var t=Math.sqrt(n/(2*Cs)),e=t*Cs;return"M0,"+-t+"L"+e+",0"+" 0,"+t+" "+-e+",0"+"Z"},square:function(n){var t=Math.sqrt(n)/2;return"M"+-t+","+-t+"L"+t+","+-t+" "+t+","+t+" "+-t+","+t+"Z"},"triangle-down":function(n){var t=Math.sqrt(n/As),e=t*As/2;return"M0,"+e+"L"+t+","+-e+" "+-t+","+-e+"Z"},"triangle-up":function(n){var t=Math.sqrt(n/As),e=t*As/2;return"M0,"+-e+"L"+t+","+e+" "+-t+","+e+"Z"}});Xo.svg.symbolTypes=Ss.keys();var ks,Es,As=Math.sqrt(3),Cs=Math.tan(30*Na),Ns=[],Ls=0;Ns.call=da.call,Ns.empty=da.empty,Ns.node=da.node,Ns.size=da.size,Xo.transition=function(n){return arguments.length?ks?n.transition():n:xa.transition()},Xo.transition.prototype=Ns,Ns.select=function(n){var t,e,r,u=this.id,i=[];n=M(n);for(var o=-1,a=this.length;++o<a;){i.push(t=[]);for(var c=this[o],s=-1,l=c.length;++s<l;)(r=c[s])&&(e=n.call(r,r.__data__,s,o))?("__data__"in r&&(e.__data__=r.__data__),jo(e,s,u,r.__transition__[u]),t.push(e)):t.push(null)}return Do(i,u)},Ns.selectAll=function(n){var t,e,r,u,i,o=this.id,a=[];n=_(n);for(var c=-1,s=this.length;++c<s;)for(var l=this[c],f=-1,h=l.length;++f<h;)if(r=l[f]){i=r.__transition__[o],e=n.call(r,r.__data__,f,c),a.push(t=[]);for(var g=-1,p=e.length;++g<p;)(u=e[g])&&jo(u,g,o,i),t.push(u)}return Do(a,o)},Ns.filter=function(n){var t,e,r,u=[];"function"!=typeof n&&(n=q(n));for(var i=0,o=this.length;o>i;i++){u.push(t=[]);for(var e=this[i],a=0,c=e.length;c>a;a++)(r=e[a])&&n.call(r,r.__data__,a,i)&&t.push(r)}return Do(u,this.id)},Ns.tween=function(n,t){var e=this.id;return arguments.length<2?this.node().__transition__[e].tween.get(n):R(this,null==t?function(t){t.__transition__[e].tween.remove(n)}:function(r){r.__transition__[e].tween.set(n,t)})},Ns.attr=function(n,t){function e(){this.removeAttribute(a)}function r(){this.removeAttributeNS(a.space,a.local)}function u(n){return null==n?e:(n+="",function(){var t,e=this.getAttribute(a);return e!==n&&(t=o(e,n),function(n){this.setAttribute(a,t(n))})})}function i(n){return null==n?r:(n+="",function(){var t,e=this.getAttributeNS(a.space,a.local);return e!==n&&(t=o(e,n),function(n){this.setAttributeNS(a.space,a.local,t(n))})})}if(arguments.length<2){for(t in n)this.attr(t,n[t]);return this}var o="transform"==n?Ru:fu,a=Xo.ns.qualify(n);return Po(this,"attr."+n,t,a.local?i:u)},Ns.attrTween=function(n,t){function e(n,e){var r=t.call(this,n,e,this.getAttribute(u));return r&&function(n){this.setAttribute(u,r(n))}}function r(n,e){var r=t.call(this,n,e,this.getAttributeNS(u.space,u.local));return r&&function(n){this.setAttributeNS(u.space,u.local,r(n))}}var u=Xo.ns.qualify(n);return this.tween("attr."+n,u.local?r:e)},Ns.style=function(n,t,e){function r(){this.style.removeProperty(n)}function u(t){return null==t?r:(t+="",function(){var r,u=Go.getComputedStyle(this,null).getPropertyValue(n);return u!==t&&(r=fu(u,t),function(t){this.style.setProperty(n,r(t),e)})})}var i=arguments.length;if(3>i){if("string"!=typeof n){2>i&&(t="");for(e in n)this.style(e,n[e],t);return this}e=""}return Po(this,"style."+n,t,u)},Ns.styleTween=function(n,t,e){function r(r,u){var i=t.call(this,r,u,Go.getComputedStyle(this,null).getPropertyValue(n));return i&&function(t){this.style.setProperty(n,i(t),e)}}return arguments.length<3&&(e=""),this.tween("style."+n,r)},Ns.text=function(n){return Po(this,"text",n,Uo)},Ns.remove=function(){return this.each("end.transition",function(){var n;this.__transition__.count<2&&(n=this.parentNode)&&n.removeChild(this)})},Ns.ease=function(n){var t=this.id;return arguments.length<1?this.node().__transition__[t].ease:("function"!=typeof n&&(n=Xo.ease.apply(Xo,arguments)),R(this,function(e){e.__transition__[t].ease=n}))},Ns.delay=function(n){var t=this.id;return R(this,"function"==typeof n?function(e,r,u){e.__transition__[t].delay=+n.call(e,e.__data__,r,u)}:(n=+n,function(e){e.__transition__[t].delay=n}))},Ns.duration=function(n){var t=this.id;return R(this,"function"==typeof n?function(e,r,u){e.__transition__[t].duration=Math.max(1,n.call(e,e.__data__,r,u))}:(n=Math.max(1,n),function(e){e.__transition__[t].duration=n}))},Ns.each=function(n,t){var e=this.id;if(arguments.length<2){var r=Es,u=ks;ks=e,R(this,function(t,r,u){Es=t.__transition__[e],n.call(t,t.__data__,r,u)}),Es=r,ks=u}else R(this,function(r){var u=r.__transition__[e];(u.event||(u.event=Xo.dispatch("start","end"))).on(n,t)});return this},Ns.transition=function(){for(var n,t,e,r,u=this.id,i=++Ls,o=[],a=0,c=this.length;c>a;a++){o.push(n=[]);for(var t=this[a],s=0,l=t.length;l>s;s++)(e=t[s])&&(r=Object.create(e.__transition__[u]),r.delay+=r.duration,jo(e,s,i,r)),n.push(e)}return Do(o,i)},Xo.svg.axis=function(){function n(n){n.each(function(){var n,s=Xo.select(this),l=this.__chart__||e,f=this.__chart__=e.copy(),h=null==c?f.ticks?f.ticks.apply(f,a):f.domain():c,g=null==t?f.tickFormat?f.tickFormat.apply(f,a):bt:t,p=s.selectAll(".tick").data(h,f),v=p.enter().insert("g",".domain").attr("class","tick").style("opacity",Aa),d=Xo.transition(p.exit()).style("opacity",Aa).remove(),m=Xo.transition(p).style("opacity",1),y=Ri(f),x=s.selectAll(".domain").data([0]),M=(x.enter().append("path").attr("class","domain"),Xo.transition(x));v.append("line"),v.append("text");var _=v.select("line"),b=m.select("line"),w=p.select("text").text(g),S=v.select("text"),k=m.select("text");switch(r){case"bottom":n=Ho,_.attr("y2",u),S.attr("y",Math.max(u,0)+o),b.attr("x2",0).attr("y2",u),k.attr("x",0).attr("y",Math.max(u,0)+o),w.attr("dy",".71em").style("text-anchor","middle"),M.attr("d","M"+y[0]+","+i+"V0H"+y[1]+"V"+i);break;case"top":n=Ho,_.attr("y2",-u),S.attr("y",-(Math.max(u,0)+o)),b.attr("x2",0).attr("y2",-u),k.attr("x",0).attr("y",-(Math.max(u,0)+o)),w.attr("dy","0em").style("text-anchor","middle"),M.attr("d","M"+y[0]+","+-i+"V0H"+y[1]+"V"+-i);break;case"left":n=Fo,_.attr("x2",-u),S.attr("x",-(Math.max(u,0)+o)),b.attr("x2",-u).attr("y2",0),k.attr("x",-(Math.max(u,0)+o)).attr("y",0),w.attr("dy",".32em").style("text-anchor","end"),M.attr("d","M"+-i+","+y[0]+"H0V"+y[1]+"H"+-i);break;case"right":n=Fo,_.attr("x2",u),S.attr("x",Math.max(u,0)+o),b.attr("x2",u).attr("y2",0),k.attr("x",Math.max(u,0)+o).attr("y",0),w.attr("dy",".32em").style("text-anchor","start"),M.attr("d","M"+i+","+y[0]+"H0V"+y[1]+"H"+i)}if(f.rangeBand){var E=f,A=E.rangeBand()/2;l=f=function(n){return E(n)+A}}else l.rangeBand?l=f:d.call(n,f);v.call(n,l),m.call(n,f)})}var t,e=Xo.scale.linear(),r=Ts,u=6,i=6,o=3,a=[10],c=null;return n.scale=function(t){return arguments.length?(e=t,n):e},n.orient=function(t){return arguments.length?(r=t in qs?t+"":Ts,n):r},n.ticks=function(){return arguments.length?(a=arguments,n):a},n.tickValues=function(t){return arguments.length?(c=t,n):c},n.tickFormat=function(e){return arguments.length?(t=e,n):t},n.tickSize=function(t){var e=arguments.length;return e?(u=+t,i=+arguments[e-1],n):u},n.innerTickSize=function(t){return arguments.length?(u=+t,n):u},n.outerTickSize=function(t){return arguments.length?(i=+t,n):i},n.tickPadding=function(t){return arguments.length?(o=+t,n):o},n.tickSubdivide=function(){return arguments.length&&n},n};var Ts="bottom",qs={top:1,right:1,bottom:1,left:1};Xo.svg.brush=function(){function n(i){i.each(function(){var i=Xo.select(this).style("pointer-events","all").style("-webkit-tap-highlight-color","rgba(0,0,0,0)").on("mousedown.brush",u).on("touchstart.brush",u),o=i.selectAll(".background").data([0]);o.enter().append("rect").attr("class","background").style("visibility","hidden").style("cursor","crosshair"),i.selectAll(".extent").data([0]).enter().append("rect").attr("class","extent").style("cursor","move");var a=i.selectAll(".resize").data(p,bt);a.exit().remove(),a.enter().append("g").attr("class",function(n){return"resize "+n}).style("cursor",function(n){return zs[n]}).append("rect").attr("x",function(n){return/[ew]$/.test(n)?-3:null}).attr("y",function(n){return/^[ns]/.test(n)?-3:null}).attr("width",6).attr("height",6).style("visibility","hidden"),a.style("display",n.empty()?"none":null);var l,f=Xo.transition(i),h=Xo.transition(o);c&&(l=Ri(c),h.attr("x",l[0]).attr("width",l[1]-l[0]),e(f)),s&&(l=Ri(s),h.attr("y",l[0]).attr("height",l[1]-l[0]),r(f)),t(f)})}function t(n){n.selectAll(".resize").attr("transform",function(n){return"translate("+l[+/e$/.test(n)]+","+f[+/^s/.test(n)]+")"})}function e(n){n.select(".extent").attr("x",l[0]),n.selectAll(".extent,.n>rect,.s>rect").attr("width",l[1]-l[0])}function r(n){n.select(".extent").attr("y",f[0]),n.selectAll(".extent,.e>rect,.w>rect").attr("height",f[1]-f[0])}function u(){function u(){32==Xo.event.keyCode&&(C||(x=null,L[0]-=l[1],L[1]-=f[1],C=2),d())}function p(){32==Xo.event.keyCode&&2==C&&(L[0]+=l[1],L[1]+=f[1],C=0,d())}function v(){var n=Xo.mouse(_),u=!1;M&&(n[0]+=M[0],n[1]+=M[1]),C||(Xo.event.altKey?(x||(x=[(l[0]+l[1])/2,(f[0]+f[1])/2]),L[0]=l[+(n[0]<x[0])],L[1]=f[+(n[1]<x[1])]):x=null),E&&m(n,c,0)&&(e(S),u=!0),A&&m(n,s,1)&&(r(S),u=!0),u&&(t(S),w({type:"brush",mode:C?"move":"resize"}))}function m(n,t,e){var r,u,a=Ri(t),c=a[0],s=a[1],p=L[e],v=e?f:l,d=v[1]-v[0];return C&&(c-=p,s-=d+p),r=(e?g:h)?Math.max(c,Math.min(s,n[e])):n[e],C?u=(r+=p)+d:(x&&(p=Math.max(c,Math.min(s,2*x[e]-r))),r>p?(u=r,r=p):u=p),v[0]!=r||v[1]!=u?(e?o=null:i=null,v[0]=r,v[1]=u,!0):void 0}function y(){v(),S.style("pointer-events","all").selectAll(".resize").style("display",n.empty()?"none":null),Xo.select("body").style("cursor",null),T.on("mousemove.brush",null).on("mouseup.brush",null).on("touchmove.brush",null).on("touchend.brush",null).on("keydown.brush",null).on("keyup.brush",null),N(),w({type:"brushend"})}var x,M,_=this,b=Xo.select(Xo.event.target),w=a.of(_,arguments),S=Xo.select(_),k=b.datum(),E=!/^(n|s)$/.test(k)&&c,A=!/^(e|w)$/.test(k)&&s,C=b.classed("extent"),N=O(),L=Xo.mouse(_),T=Xo.select(Go).on("keydown.brush",u).on("keyup.brush",p);if(Xo.event.changedTouches?T.on("touchmove.brush",v).on("touchend.brush",y):T.on("mousemove.brush",v).on("mouseup.brush",y),S.interrupt().selectAll("*").interrupt(),C)L[0]=l[0]-L[0],L[1]=f[0]-L[1];else if(k){var q=+/w$/.test(k),z=+/^n/.test(k);M=[l[1-q]-L[0],f[1-z]-L[1]],L[0]=l[q],L[1]=f[z]}else Xo.event.altKey&&(x=L.slice());S.style("pointer-events","none").selectAll(".resize").style("display",null),Xo.select("body").style("cursor",b.style("cursor")),w({type:"brushstart"}),v()}var i,o,a=y(n,"brushstart","brush","brushend"),c=null,s=null,l=[0,0],f=[0,0],h=!0,g=!0,p=Rs[0];return n.event=function(n){n.each(function(){var n=a.of(this,arguments),t={x:l,y:f,i:i,j:o},e=this.__chart__||t;this.__chart__=t,ks?Xo.select(this).transition().each("start.brush",function(){i=e.i,o=e.j,l=e.x,f=e.y,n({type:"brushstart"})}).tween("brush:brush",function(){var e=hu(l,t.x),r=hu(f,t.y);return i=o=null,function(u){l=t.x=e(u),f=t.y=r(u),n({type:"brush",mode:"resize"})}}).each("end.brush",function(){i=t.i,o=t.j,n({type:"brush",mode:"resize"}),n({type:"brushend"})}):(n({type:"brushstart"}),n({type:"brush",mode:"resize"}),n({type:"brushend"}))})},n.x=function(t){return arguments.length?(c=t,p=Rs[!c<<1|!s],n):c},n.y=function(t){return arguments.length?(s=t,p=Rs[!c<<1|!s],n):s},n.clamp=function(t){return arguments.length?(c&&s?(h=!!t[0],g=!!t[1]):c?h=!!t:s&&(g=!!t),n):c&&s?[h,g]:c?h:s?g:null},n.extent=function(t){var e,r,u,a,h;return arguments.length?(c&&(e=t[0],r=t[1],s&&(e=e[0],r=r[0]),i=[e,r],c.invert&&(e=c(e),r=c(r)),e>r&&(h=e,e=r,r=h),(e!=l[0]||r!=l[1])&&(l=[e,r])),s&&(u=t[0],a=t[1],c&&(u=u[1],a=a[1]),o=[u,a],s.invert&&(u=s(u),a=s(a)),u>a&&(h=u,u=a,a=h),(u!=f[0]||a!=f[1])&&(f=[u,a])),n):(c&&(i?(e=i[0],r=i[1]):(e=l[0],r=l[1],c.invert&&(e=c.invert(e),r=c.invert(r)),e>r&&(h=e,e=r,r=h))),s&&(o?(u=o[0],a=o[1]):(u=f[0],a=f[1],s.invert&&(u=s.invert(u),a=s.invert(a)),u>a&&(h=u,u=a,a=h))),c&&s?[[e,u],[r,a]]:c?[e,r]:s&&[u,a])},n.clear=function(){return n.empty()||(l=[0,0],f=[0,0],i=o=null),n},n.empty=function(){return!!c&&l[0]==l[1]||!!s&&f[0]==f[1]},Xo.rebind(n,a,"on")};var zs={n:"ns-resize",e:"ew-resize",s:"ns-resize",w:"ew-resize",nw:"nwse-resize",ne:"nesw-resize",se:"nwse-resize",sw:"nesw-resize"},Rs=[["n","e","s","w","nw","ne","se","sw"],["e","w"],["n","s"],[]],Ds=tc.format=ac.timeFormat,Ps=Ds.utc,Us=Ps("%Y-%m-%dT%H:%M:%S.%LZ");Ds.iso=Date.prototype.toISOString&&+new Date("2000-01-01T00:00:00.000Z")?Oo:Us,Oo.parse=function(n){var t=new Date(n);return isNaN(t)?null:t},Oo.toString=Us.toString,tc.second=Rt(function(n){return new ec(1e3*Math.floor(n/1e3))},function(n,t){n.setTime(n.getTime()+1e3*Math.floor(t))},function(n){return n.getSeconds()}),tc.seconds=tc.second.range,tc.seconds.utc=tc.second.utc.range,tc.minute=Rt(function(n){return new ec(6e4*Math.floor(n/6e4))},function(n,t){n.setTime(n.getTime()+6e4*Math.floor(t))},function(n){return n.getMinutes()}),tc.minutes=tc.minute.range,tc.minutes.utc=tc.minute.utc.range,tc.hour=Rt(function(n){var t=n.getTimezoneOffset()/60;return new ec(36e5*(Math.floor(n/36e5-t)+t))},function(n,t){n.setTime(n.getTime()+36e5*Math.floor(t))},function(n){return n.getHours()}),tc.hours=tc.hour.range,tc.hours.utc=tc.hour.utc.range,tc.month=Rt(function(n){return n=tc.day(n),n.setDate(1),n},function(n,t){n.setMonth(n.getMonth()+t)},function(n){return n.getMonth()}),tc.months=tc.month.range,tc.months.utc=tc.month.utc.range;var js=[1e3,5e3,15e3,3e4,6e4,3e5,9e5,18e5,36e5,108e5,216e5,432e5,864e5,1728e5,6048e5,2592e6,7776e6,31536e6],Hs=[[tc.second,1],[tc.second,5],[tc.second,15],[tc.second,30],[tc.minute,1],[tc.minute,5],[tc.minute,15],[tc.minute,30],[tc.hour,1],[tc.hour,3],[tc.hour,6],[tc.hour,12],[tc.day,1],[tc.day,2],[tc.week,1],[tc.month,1],[tc.month,3],[tc.year,1]],Fs=Ds.multi([[".%L",function(n){return n.getMilliseconds()}],[":%S",function(n){return n.getSeconds()}],["%I:%M",function(n){return n.getMinutes()}],["%I %p",function(n){return n.getHours()}],["%a %d",function(n){return n.getDay()&&1!=n.getDate()}],["%b %d",function(n){return 1!=n.getDate()}],["%B",function(n){return n.getMonth()}],["%Y",be]]),Os={range:function(n,t,e){return Xo.range(Math.ceil(n/e)*e,+t,e).map(Io)},floor:bt,ceil:bt};Hs.year=tc.year,tc.scale=function(){return Yo(Xo.scale.linear(),Hs,Fs)};var Ys=Hs.map(function(n){return[n[0].utc,n[1]]}),Is=Ps.multi([[".%L",function(n){return n.getUTCMilliseconds()}],[":%S",function(n){return n.getUTCSeconds()}],["%I:%M",function(n){return n.getUTCMinutes()}],["%I %p",function(n){return n.getUTCHours()}],["%a %d",function(n){return n.getUTCDay()&&1!=n.getUTCDate()}],["%b %d",function(n){return 1!=n.getUTCDate()}],["%B",function(n){return n.getUTCMonth()}],["%Y",be]]);Ys.year=tc.year.utc,tc.scale.utc=function(){return Yo(Xo.scale.linear(),Ys,Is)},Xo.text=wt(function(n){return n.responseText}),Xo.json=function(n,t){return St(n,"application/json",Zo,t)},Xo.html=function(n,t){return St(n,"text/html",Vo,t)},Xo.xml=wt(function(n){return n.responseXML}),"function"==typeof define&&define.amd?define(Xo):"object"==typeof module&&module.exports?module.exports=Xo:this.d3=Xo}();'use strict';tr.exportTo('tr.ui.b',function(){var THIS_DOC=document.currentScript.ownerDocument;var svgNS='http://www.w3.org/2000/svg';var highlightIdBoost=tr.ui.b.getColorPaletteHighlightIdBoost();function getColorOfKey(key,selected){var id=tr.ui.b.getColorIdForGeneralPurposeString(key);if(selected)
+throw new Error('Only supports global memory dumps');this.currentSelection_=selection;this.$.memory_dump_view.processMemoryDumps=tr.b.dictionaryValues(selection[0].processMemoryDumps);},get selection(){return this.currentSelection_;},get requiresTallView(){return true;}});'use strict';Polymer('tr-ui-a-multi-global-memory-dump-sub-view',{created:function(){this.currentSelection_=undefined;},get selection(){return this.currentSelection_;},set selection(selection){this.currentSelection_=selection;selection=tr.b.asArray(selection).sort(tr.b.Range.compareByMinTimes);var ownerDocument=this.ownerDocument;var table=this.$.content;table.tableColumns=[{title:'Dump',value:function(row){var linkEl=document.createElement('tr-ui-a-analysis-link');linkEl.setSelectionAndContent(function(){return new tr.model.EventSet(row);});var spanEl=document.createElement('span');spanEl.textContent='Global memory dump at ';linkEl.appendChild(spanEl);linkEl.appendChild(tr.ui.units.createTimeStampSpan(row.start,{ownerDocument:ownerDocument}));return linkEl;}}];table.showHeader=false;table.tableRows=selection;table.rebuild();}});'use strict';var EventSet=tr.model.EventSet;Polymer('tr-ui-a-power-sample-table',{ready:function(){this.$.table.tableColumns=[{title:'Time',width:'100px',value:function(row){return tr.ui.units.createTimeStampSpan(row.start);}},{title:'Power (mW)',width:'100%',value:function(row){return row.power;}}];this.samples=new EventSet();},get samples(){return this.samples_;},set samples(samples){this.samples_=(samples===undefined)?new EventSet():samples;this.updateContents_();},updateContents_:function(){this.$.table.tableRows=this.samples.toArray();this.$.table.rebuild();}});'use strict';Polymer('tr-ui-a-single-power-sample-sub-view',{ready:function(){this.currentSelection_=undefined;},get selection(){return this.currentSelection_;},set selection(selection){this.currentSelection_=selection;this.updateContents_();},updateContents_:function(){this.$.samplesTable.samples=this.selection;}});!function(){function n(n){return null!=n&&!isNaN(n)}function t(n){return n.length}function e(n){for(var t=1;n*t%1;)t*=10;return t}function r(n,t){try{for(var e in t)Object.defineProperty(n.prototype,e,{value:t[e],enumerable:!1})}catch(r){n.prototype=t}}function u(){}function i(n){return aa+n in this}function o(n){return n=aa+n,n in this&&delete this[n]}function a(){var n=[];return this.forEach(function(t){n.push(t)}),n}function c(){var n=0;for(var t in this)t.charCodeAt(0)===ca&&++n;return n}function s(){for(var n in this)if(n.charCodeAt(0)===ca)return!1;return!0}function l(){}function f(n,t,e){return function(){var r=e.apply(t,arguments);return r===t?n:r}}function h(n,t){if(t in n)return t;t=t.charAt(0).toUpperCase()+t.substring(1);for(var e=0,r=sa.length;r>e;++e){var u=sa[e]+t;if(u in n)return u}}function g(){}function p(){}function v(n){function t(){for(var t,r=e,u=-1,i=r.length;++u<i;)(t=r[u].on)&&t.apply(this,arguments);return n}var e=[],r=new u;return t.on=function(t,u){var i,o=r.get(t);return arguments.length<2?o&&o.on:(o&&(o.on=null,e=e.slice(0,i=e.indexOf(o)).concat(e.slice(i+1)),r.remove(t)),u&&e.push(r.set(t,{on:u})),n)},t}function d(){Xo.event.preventDefault()}function m(){for(var n,t=Xo.event;n=t.sourceEvent;)t=n;return t}function y(n){for(var t=new p,e=0,r=arguments.length;++e<r;)t[arguments[e]]=v(t);return t.of=function(e,r){return function(u){try{var i=u.sourceEvent=Xo.event;u.target=n,Xo.event=u,t[u.type].apply(e,r)}finally{Xo.event=i}}},t}function x(n){return fa(n,da),n}function M(n){return"function"==typeof n?n:function(){return ha(n,this)}}function _(n){return"function"==typeof n?n:function(){return ga(n,this)}}function b(n,t){function e(){this.removeAttribute(n)}function r(){this.removeAttributeNS(n.space,n.local)}function u(){this.setAttribute(n,t)}function i(){this.setAttributeNS(n.space,n.local,t)}function o(){var e=t.apply(this,arguments);null==e?this.removeAttribute(n):this.setAttribute(n,e)}function a(){var e=t.apply(this,arguments);null==e?this.removeAttributeNS(n.space,n.local):this.setAttributeNS(n.space,n.local,e)}return n=Xo.ns.qualify(n),null==t?n.local?r:e:"function"==typeof t?n.local?a:o:n.local?i:u}function w(n){return n.trim().replace(/\s+/g," ")}function S(n){return new RegExp("(?:^|\\s+)"+Xo.requote(n)+"(?:\\s+|$)","g")}function k(n){return n.trim().split(/^|\s+/)}function E(n,t){function e(){for(var e=-1;++e<u;)n[e](this,t)}function r(){for(var e=-1,r=t.apply(this,arguments);++e<u;)n[e](this,r)}n=k(n).map(A);var u=n.length;return"function"==typeof t?r:e}function A(n){var t=S(n);return function(e,r){if(u=e.classList)return r?u.add(n):u.remove(n);var u=e.getAttribute("class")||"";r?(t.lastIndex=0,t.test(u)||e.setAttribute("class",w(u+" "+n))):e.setAttribute("class",w(u.replace(t," ")))}}function C(n,t,e){function r(){this.style.removeProperty(n)}function u(){this.style.setProperty(n,t,e)}function i(){var r=t.apply(this,arguments);null==r?this.style.removeProperty(n):this.style.setProperty(n,r,e)}return null==t?r:"function"==typeof t?i:u}function N(n,t){function e(){delete this[n]}function r(){this[n]=t}function u(){var e=t.apply(this,arguments);null==e?delete this[n]:this[n]=e}return null==t?e:"function"==typeof t?u:r}function L(n){return"function"==typeof n?n:(n=Xo.ns.qualify(n)).local?function(){return this.ownerDocument.createElementNS(n.space,n.local)}:function(){return this.ownerDocument.createElementNS(this.namespaceURI,n)}}function T(n){return{__data__:n}}function q(n){return function(){return va(this,n)}}function z(n){return arguments.length||(n=Xo.ascending),function(t,e){return t&&e?n(t.__data__,e.__data__):!t-!e}}function R(n,t){for(var e=0,r=n.length;r>e;e++)for(var u,i=n[e],o=0,a=i.length;a>o;o++)(u=i[o])&&t(u,o,e);return n}function D(n){return fa(n,ya),n}function P(n){var t,e;return function(r,u,i){var o,a=n[i].update,c=a.length;for(i!=e&&(e=i,t=0),u>=t&&(t=u+1);!(o=a[t])&&++t<c;);return o}}function U(){var n=this.__transition__;n&&++n.active}function j(n,t,e){function r(){var t=this[o];t&&(this.removeEventListener(n,t,t.$),delete this[o])}function u(){var u=c(t,Bo(arguments));r.call(this),this.addEventListener(n,this[o]=u,u.$=e),u._=t}function i(){var t,e=new RegExp("^__on([^.]+)"+Xo.requote(n)+"$");for(var r in this)if(t=r.match(e)){var u=this[r];this.removeEventListener(t[1],u,u.$),delete this[r]}}var o="__on"+n,a=n.indexOf("."),c=H;a>0&&(n=n.substring(0,a));var s=Ma.get(n);return s&&(n=s,c=F),a?t?u:r:t?g:i}function H(n,t){return function(e){var r=Xo.event;Xo.event=e,t[0]=this.__data__;try{n.apply(this,t)}finally{Xo.event=r}}}function F(n,t){var e=H(n,t);return function(n){var t=this,r=n.relatedTarget;r&&(r===t||8&r.compareDocumentPosition(t))||e.call(t,n)}}function O(){var n=".dragsuppress-"+ ++ba,t="click"+n,e=Xo.select(Go).on("touchmove"+n,d).on("dragstart"+n,d).on("selectstart"+n,d);if(_a){var r=Jo.style,u=r[_a];r[_a]="none"}return function(i){function o(){e.on(t,null)}e.on(n,null),_a&&(r[_a]=u),i&&(e.on(t,function(){d(),o()},!0),setTimeout(o,0))}}function Y(n,t){t.changedTouches&&(t=t.changedTouches[0]);var e=n.ownerSVGElement||n;if(e.createSVGPoint){var r=e.createSVGPoint();if(0>wa&&(Go.scrollX||Go.scrollY)){e=Xo.select("body").append("svg").style({position:"absolute",top:0,left:0,margin:0,padding:0,border:"none"},"important");var u=e[0][0].getScreenCTM();wa=!(u.f||u.e),e.remove()}return wa?(r.x=t.pageX,r.y=t.pageY):(r.x=t.clientX,r.y=t.clientY),r=r.matrixTransform(n.getScreenCTM().inverse()),[r.x,r.y]}var i=n.getBoundingClientRect();return[t.clientX-i.left-n.clientLeft,t.clientY-i.top-n.clientTop]}function I(n){return n>0?1:0>n?-1:0}function Z(n,t,e){return(t[0]-n[0])*(e[1]-n[1])-(t[1]-n[1])*(e[0]-n[0])}function V(n){return n>1?0:-1>n?Sa:Math.acos(n)}function X(n){return n>1?Ea:-1>n?-Ea:Math.asin(n)}function $(n){return((n=Math.exp(n))-1/n)/2}function B(n){return((n=Math.exp(n))+1/n)/2}function W(n){return((n=Math.exp(2*n))-1)/(n+1)}function J(n){return(n=Math.sin(n/2))*n}function G(){}function K(n,t,e){return new Q(n,t,e)}function Q(n,t,e){this.h=n,this.s=t,this.l=e}function nt(n,t,e){function r(n){return n>360?n-=360:0>n&&(n+=360),60>n?i+(o-i)*n/60:180>n?o:240>n?i+(o-i)*(240-n)/60:i}function u(n){return Math.round(255*r(n))}var i,o;return n=isNaN(n)?0:(n%=360)<0?n+360:n,t=isNaN(t)?0:0>t?0:t>1?1:t,e=0>e?0:e>1?1:e,o=.5>=e?e*(1+t):e+t-e*t,i=2*e-o,gt(u(n+120),u(n),u(n-120))}function tt(n,t,e){return new et(n,t,e)}function et(n,t,e){this.h=n,this.c=t,this.l=e}function rt(n,t,e){return isNaN(n)&&(n=0),isNaN(t)&&(t=0),ut(e,Math.cos(n*=Na)*t,Math.sin(n)*t)}function ut(n,t,e){return new it(n,t,e)}function it(n,t,e){this.l=n,this.a=t,this.b=e}function ot(n,t,e){var r=(n+16)/116,u=r+t/500,i=r-e/200;return u=ct(u)*Fa,r=ct(r)*Oa,i=ct(i)*Ya,gt(lt(3.2404542*u-1.5371385*r-.4985314*i),lt(-.969266*u+1.8760108*r+.041556*i),lt(.0556434*u-.2040259*r+1.0572252*i))}function at(n,t,e){return n>0?tt(Math.atan2(e,t)*La,Math.sqrt(t*t+e*e),n):tt(0/0,0/0,n)}function ct(n){return n>.206893034?n*n*n:(n-4/29)/7.787037}function st(n){return n>.008856?Math.pow(n,1/3):7.787037*n+4/29}function lt(n){return Math.round(255*(.00304>=n?12.92*n:1.055*Math.pow(n,1/2.4)-.055))}function ft(n){return gt(n>>16,255&n>>8,255&n)}function ht(n){return ft(n)+""}function gt(n,t,e){return new pt(n,t,e)}function pt(n,t,e){this.r=n,this.g=t,this.b=e}function vt(n){return 16>n?"0"+Math.max(0,n).toString(16):Math.min(255,n).toString(16)}function dt(n,t,e){var r,u,i,o,a=0,c=0,s=0;if(u=/([a-z]+)\((.*)\)/i.exec(n))switch(i=u[2].split(","),u[1]){case"hsl":return e(parseFloat(i[0]),parseFloat(i[1])/100,parseFloat(i[2])/100);case"rgb":return t(Mt(i[0]),Mt(i[1]),Mt(i[2]))}return(o=Va.get(n))?t(o.r,o.g,o.b):(null!=n&&"#"===n.charAt(0)&&(r=parseInt(n.substring(1),16),isNaN(r)||(4===n.length?(a=(3840&r)>>4,a=a>>4|a,c=240&r,c=c>>4|c,s=15&r,s=s<<4|s):7===n.length&&(a=(16711680&r)>>16,c=(65280&r)>>8,s=255&r))),t(a,c,s))}function mt(n,t,e){var r,u,i=Math.min(n/=255,t/=255,e/=255),o=Math.max(n,t,e),a=o-i,c=(o+i)/2;return a?(u=.5>c?a/(o+i):a/(2-o-i),r=n==o?(t-e)/a+(e>t?6:0):t==o?(e-n)/a+2:(n-t)/a+4,r*=60):(r=0/0,u=c>0&&1>c?0:r),K(r,u,c)}function yt(n,t,e){n=xt(n),t=xt(t),e=xt(e);var r=st((.4124564*n+.3575761*t+.1804375*e)/Fa),u=st((.2126729*n+.7151522*t+.072175*e)/Oa),i=st((.0193339*n+.119192*t+.9503041*e)/Ya);return ut(116*u-16,500*(r-u),200*(u-i))}function xt(n){return(n/=255)<=.04045?n/12.92:Math.pow((n+.055)/1.055,2.4)}function Mt(n){var t=parseFloat(n);return"%"===n.charAt(n.length-1)?Math.round(2.55*t):t}function _t(n){return"function"==typeof n?n:function(){return n}}function bt(n){return n}function wt(n){return function(t,e,r){return 2===arguments.length&&"function"==typeof e&&(r=e,e=null),St(t,e,n,r)}}function St(n,t,e,r){function u(){var n,t=c.status;if(!t&&c.responseText||t>=200&&300>t||304===t){try{n=e.call(i,c)}catch(r){return o.error.call(i,r),void 0}o.load.call(i,n)}else o.error.call(i,c)}var i={},o=Xo.dispatch("beforesend","progress","load","error"),a={},c=new XMLHttpRequest,s=null;return!Go.XDomainRequest||"withCredentials"in c||!/^(http(s)?:)?\/\//.test(n)||(c=new XDomainRequest),"onload"in c?c.onload=c.onerror=u:c.onreadystatechange=function(){c.readyState>3&&u()},c.onprogress=function(n){var t=Xo.event;Xo.event=n;try{o.progress.call(i,c)}finally{Xo.event=t}},i.header=function(n,t){return n=(n+"").toLowerCase(),arguments.length<2?a[n]:(null==t?delete a[n]:a[n]=t+"",i)},i.mimeType=function(n){return arguments.length?(t=null==n?null:n+"",i):t},i.responseType=function(n){return arguments.length?(s=n,i):s},i.response=function(n){return e=n,i},["get","post"].forEach(function(n){i[n]=function(){return i.send.apply(i,[n].concat(Bo(arguments)))}}),i.send=function(e,r,u){if(2===arguments.length&&"function"==typeof r&&(u=r,r=null),c.open(e,n,!0),null==t||"accept"in a||(a.accept=t+",*/*"),c.setRequestHeader)for(var l in a)c.setRequestHeader(l,a[l]);return null!=t&&c.overrideMimeType&&c.overrideMimeType(t),null!=s&&(c.responseType=s),null!=u&&i.on("error",u).on("load",function(n){u(null,n)}),o.beforesend.call(i,c),c.send(null==r?null:r),i},i.abort=function(){return c.abort(),i},Xo.rebind(i,o,"on"),null==r?i:i.get(kt(r))}function kt(n){return 1===n.length?function(t,e){n(null==t?e:null)}:n}function Et(){var n=At(),t=Ct()-n;t>24?(isFinite(t)&&(clearTimeout(Wa),Wa=setTimeout(Et,t)),Ba=0):(Ba=1,Ga(Et))}function At(){var n=Date.now();for(Ja=Xa;Ja;)n>=Ja.t&&(Ja.f=Ja.c(n-Ja.t)),Ja=Ja.n;return n}function Ct(){for(var n,t=Xa,e=1/0;t;)t.f?t=n?n.n=t.n:Xa=t.n:(t.t<e&&(e=t.t),t=(n=t).n);return $a=n,e}function Nt(n,t){return t-(n?Math.ceil(Math.log(n)/Math.LN10):1)}function Lt(n,t){var e=Math.pow(10,3*oa(8-t));return{scale:t>8?function(n){return n/e}:function(n){return n*e},symbol:n}}function Tt(n){var t=n.decimal,e=n.thousands,r=n.grouping,u=n.currency,i=r?function(n){for(var t=n.length,u=[],i=0,o=r[0];t>0&&o>0;)u.push(n.substring(t-=o,t+o)),o=r[i=(i+1)%r.length];return u.reverse().join(e)}:bt;return function(n){var e=Qa.exec(n),r=e[1]||" ",o=e[2]||">",a=e[3]||"",c=e[4]||"",s=e[5],l=+e[6],f=e[7],h=e[8],g=e[9],p=1,v="",d="",m=!1;switch(h&&(h=+h.substring(1)),(s||"0"===r&&"="===o)&&(s=r="0",o="=",f&&(l-=Math.floor((l-1)/4))),g){case"n":f=!0,g="g";break;case"%":p=100,d="%",g="f";break;case"p":p=100,d="%",g="r";break;case"b":case"o":case"x":case"X":"#"===c&&(v="0"+g.toLowerCase());case"c":case"d":m=!0,h=0;break;case"s":p=-1,g="r"}"$"===c&&(v=u[0],d=u[1]),"r"!=g||h||(g="g"),null!=h&&("g"==g?h=Math.max(1,Math.min(21,h)):("e"==g||"f"==g)&&(h=Math.max(0,Math.min(20,h)))),g=nc.get(g)||qt;var y=s&&f;return function(n){var e=d;if(m&&n%1)return"";var u=0>n||0===n&&0>1/n?(n=-n,"-"):a;if(0>p){var c=Xo.formatPrefix(n,h);n=c.scale(n),e=c.symbol+d}else n*=p;n=g(n,h);var x=n.lastIndexOf("."),M=0>x?n:n.substring(0,x),_=0>x?"":t+n.substring(x+1);!s&&f&&(M=i(M));var b=v.length+M.length+_.length+(y?0:u.length),w=l>b?new Array(b=l-b+1).join(r):"";return y&&(M=i(w+M)),u+=v,n=M+_,("<"===o?u+n+w:">"===o?w+u+n:"^"===o?w.substring(0,b>>=1)+u+n+w.substring(b):u+(y?n:w+n))+e}}}function qt(n){return n+""}function zt(){this._=new Date(arguments.length>1?Date.UTC.apply(this,arguments):arguments[0])}function Rt(n,t,e){function r(t){var e=n(t),r=i(e,1);return r-t>t-e?e:r}function u(e){return t(e=n(new ec(e-1)),1),e}function i(n,e){return t(n=new ec(+n),e),n}function o(n,r,i){var o=u(n),a=[];if(i>1)for(;r>o;)e(o)%i||a.push(new Date(+o)),t(o,1);else for(;r>o;)a.push(new Date(+o)),t(o,1);return a}function a(n,t,e){try{ec=zt;var r=new zt;return r._=n,o(r,t,e)}finally{ec=Date}}n.floor=n,n.round=r,n.ceil=u,n.offset=i,n.range=o;var c=n.utc=Dt(n);return c.floor=c,c.round=Dt(r),c.ceil=Dt(u),c.offset=Dt(i),c.range=a,n}function Dt(n){return function(t,e){try{ec=zt;var r=new zt;return r._=t,n(r,e)._}finally{ec=Date}}}function Pt(n){function t(n){function t(t){for(var e,u,i,o=[],a=-1,c=0;++a<r;)37===n.charCodeAt(a)&&(o.push(n.substring(c,a)),null!=(u=uc[e=n.charAt(++a)])&&(e=n.charAt(++a)),(i=C[e])&&(e=i(t,null==u?"e"===e?" ":"0":u)),o.push(e),c=a+1);return o.push(n.substring(c,a)),o.join("")}var r=n.length;return t.parse=function(t){var r={y:1900,m:0,d:1,H:0,M:0,S:0,L:0,Z:null},u=e(r,n,t,0);if(u!=t.length)return null;"p"in r&&(r.H=r.H%12+12*r.p);var i=null!=r.Z&&ec!==zt,o=new(i?zt:ec);return"j"in r?o.setFullYear(r.y,0,r.j):"w"in r&&("W"in r||"U"in r)?(o.setFullYear(r.y,0,1),o.setFullYear(r.y,0,"W"in r?(r.w+6)%7+7*r.W-(o.getDay()+5)%7:r.w+7*r.U-(o.getDay()+6)%7)):o.setFullYear(r.y,r.m,r.d),o.setHours(r.H+Math.floor(r.Z/100),r.M+r.Z%100,r.S,r.L),i?o._:o},t.toString=function(){return n},t}function e(n,t,e,r){for(var u,i,o,a=0,c=t.length,s=e.length;c>a;){if(r>=s)return-1;if(u=t.charCodeAt(a++),37===u){if(o=t.charAt(a++),i=N[o in uc?t.charAt(a++):o],!i||(r=i(n,e,r))<0)return-1}else if(u!=e.charCodeAt(r++))return-1}return r}function r(n,t,e){b.lastIndex=0;var r=b.exec(t.substring(e));return r?(n.w=w.get(r[0].toLowerCase()),e+r[0].length):-1}function u(n,t,e){M.lastIndex=0;var r=M.exec(t.substring(e));return r?(n.w=_.get(r[0].toLowerCase()),e+r[0].length):-1}function i(n,t,e){E.lastIndex=0;var r=E.exec(t.substring(e));return r?(n.m=A.get(r[0].toLowerCase()),e+r[0].length):-1}function o(n,t,e){S.lastIndex=0;var r=S.exec(t.substring(e));return r?(n.m=k.get(r[0].toLowerCase()),e+r[0].length):-1}function a(n,t,r){return e(n,C.c.toString(),t,r)}function c(n,t,r){return e(n,C.x.toString(),t,r)}function s(n,t,r){return e(n,C.X.toString(),t,r)}function l(n,t,e){var r=x.get(t.substring(e,e+=2).toLowerCase());return null==r?-1:(n.p=r,e)}var f=n.dateTime,h=n.date,g=n.time,p=n.periods,v=n.days,d=n.shortDays,m=n.months,y=n.shortMonths;t.utc=function(n){function e(n){try{ec=zt;var t=new ec;return t._=n,r(t)}finally{ec=Date}}var r=t(n);return e.parse=function(n){try{ec=zt;var t=r.parse(n);return t&&t._}finally{ec=Date}},e.toString=r.toString,e},t.multi=t.utc.multi=ee;var x=Xo.map(),M=jt(v),_=Ht(v),b=jt(d),w=Ht(d),S=jt(m),k=Ht(m),E=jt(y),A=Ht(y);p.forEach(function(n,t){x.set(n.toLowerCase(),t)});var C={a:function(n){return d[n.getDay()]},A:function(n){return v[n.getDay()]},b:function(n){return y[n.getMonth()]},B:function(n){return m[n.getMonth()]},c:t(f),d:function(n,t){return Ut(n.getDate(),t,2)},e:function(n,t){return Ut(n.getDate(),t,2)},H:function(n,t){return Ut(n.getHours(),t,2)},I:function(n,t){return Ut(n.getHours()%12||12,t,2)},j:function(n,t){return Ut(1+tc.dayOfYear(n),t,3)},L:function(n,t){return Ut(n.getMilliseconds(),t,3)},m:function(n,t){return Ut(n.getMonth()+1,t,2)},M:function(n,t){return Ut(n.getMinutes(),t,2)},p:function(n){return p[+(n.getHours()>=12)]},S:function(n,t){return Ut(n.getSeconds(),t,2)},U:function(n,t){return Ut(tc.sundayOfYear(n),t,2)},w:function(n){return n.getDay()},W:function(n,t){return Ut(tc.mondayOfYear(n),t,2)},x:t(h),X:t(g),y:function(n,t){return Ut(n.getFullYear()%100,t,2)},Y:function(n,t){return Ut(n.getFullYear()%1e4,t,4)},Z:ne,"%":function(){return"%"}},N={a:r,A:u,b:i,B:o,c:a,d:Bt,e:Bt,H:Jt,I:Jt,j:Wt,L:Qt,m:$t,M:Gt,p:l,S:Kt,U:Ot,w:Ft,W:Yt,x:c,X:s,y:Zt,Y:It,Z:Vt,"%":te};return t}function Ut(n,t,e){var r=0>n?"-":"",u=(r?-n:n)+"",i=u.length;return r+(e>i?new Array(e-i+1).join(t)+u:u)}function jt(n){return new RegExp("^(?:"+n.map(Xo.requote).join("|")+")","i")}function Ht(n){for(var t=new u,e=-1,r=n.length;++e<r;)t.set(n[e].toLowerCase(),e);return t}function Ft(n,t,e){ic.lastIndex=0;var r=ic.exec(t.substring(e,e+1));return r?(n.w=+r[0],e+r[0].length):-1}function Ot(n,t,e){ic.lastIndex=0;var r=ic.exec(t.substring(e));return r?(n.U=+r[0],e+r[0].length):-1}function Yt(n,t,e){ic.lastIndex=0;var r=ic.exec(t.substring(e));return r?(n.W=+r[0],e+r[0].length):-1}function It(n,t,e){ic.lastIndex=0;var r=ic.exec(t.substring(e,e+4));return r?(n.y=+r[0],e+r[0].length):-1}function Zt(n,t,e){ic.lastIndex=0;var r=ic.exec(t.substring(e,e+2));return r?(n.y=Xt(+r[0]),e+r[0].length):-1}function Vt(n,t,e){return/^[+-]\d{4}$/.test(t=t.substring(e,e+5))?(n.Z=+t,e+5):-1}function Xt(n){return n+(n>68?1900:2e3)}function $t(n,t,e){ic.lastIndex=0;var r=ic.exec(t.substring(e,e+2));return r?(n.m=r[0]-1,e+r[0].length):-1}function Bt(n,t,e){ic.lastIndex=0;var r=ic.exec(t.substring(e,e+2));return r?(n.d=+r[0],e+r[0].length):-1}function Wt(n,t,e){ic.lastIndex=0;var r=ic.exec(t.substring(e,e+3));return r?(n.j=+r[0],e+r[0].length):-1}function Jt(n,t,e){ic.lastIndex=0;var r=ic.exec(t.substring(e,e+2));return r?(n.H=+r[0],e+r[0].length):-1}function Gt(n,t,e){ic.lastIndex=0;var r=ic.exec(t.substring(e,e+2));return r?(n.M=+r[0],e+r[0].length):-1}function Kt(n,t,e){ic.lastIndex=0;var r=ic.exec(t.substring(e,e+2));return r?(n.S=+r[0],e+r[0].length):-1}function Qt(n,t,e){ic.lastIndex=0;var r=ic.exec(t.substring(e,e+3));return r?(n.L=+r[0],e+r[0].length):-1}function ne(n){var t=n.getTimezoneOffset(),e=t>0?"-":"+",r=~~(oa(t)/60),u=oa(t)%60;return e+Ut(r,"0",2)+Ut(u,"0",2)}function te(n,t,e){oc.lastIndex=0;var r=oc.exec(t.substring(e,e+1));return r?e+r[0].length:-1}function ee(n){for(var t=n.length,e=-1;++e<t;)n[e][0]=this(n[e][0]);return function(t){for(var e=0,r=n[e];!r[1](t);)r=n[++e];return r[0](t)}}function re(){}function ue(n,t,e){var r=e.s=n+t,u=r-n,i=r-u;e.t=n-i+(t-u)}function ie(n,t){n&&lc.hasOwnProperty(n.type)&&lc[n.type](n,t)}function oe(n,t,e){var r,u=-1,i=n.length-e;for(t.lineStart();++u<i;)r=n[u],t.point(r[0],r[1],r[2]);t.lineEnd()}function ae(n,t){var e=-1,r=n.length;for(t.polygonStart();++e<r;)oe(n[e],t,1);t.polygonEnd()}function ce(){function n(n,t){n*=Na,t=t*Na/2+Sa/4;var e=n-r,o=e>=0?1:-1,a=o*e,c=Math.cos(t),s=Math.sin(t),l=i*s,f=u*c+l*Math.cos(a),h=l*o*Math.sin(a);hc.add(Math.atan2(h,f)),r=n,u=c,i=s}var t,e,r,u,i;gc.point=function(o,a){gc.point=n,r=(t=o)*Na,u=Math.cos(a=(e=a)*Na/2+Sa/4),i=Math.sin(a)},gc.lineEnd=function(){n(t,e)}}function se(n){var t=n[0],e=n[1],r=Math.cos(e);return[r*Math.cos(t),r*Math.sin(t),Math.sin(e)]}function le(n,t){return n[0]*t[0]+n[1]*t[1]+n[2]*t[2]}function fe(n,t){return[n[1]*t[2]-n[2]*t[1],n[2]*t[0]-n[0]*t[2],n[0]*t[1]-n[1]*t[0]]}function he(n,t){n[0]+=t[0],n[1]+=t[1],n[2]+=t[2]}function ge(n,t){return[n[0]*t,n[1]*t,n[2]*t]}function pe(n){var t=Math.sqrt(n[0]*n[0]+n[1]*n[1]+n[2]*n[2]);n[0]/=t,n[1]/=t,n[2]/=t}function ve(n){return[Math.atan2(n[1],n[0]),X(n[2])]}function de(n,t){return oa(n[0]-t[0])<Aa&&oa(n[1]-t[1])<Aa}function me(n,t){n*=Na;var e=Math.cos(t*=Na);ye(e*Math.cos(n),e*Math.sin(n),Math.sin(t))}function ye(n,t,e){++pc,dc+=(n-dc)/pc,mc+=(t-mc)/pc,yc+=(e-yc)/pc}function xe(){function n(n,u){n*=Na;var i=Math.cos(u*=Na),o=i*Math.cos(n),a=i*Math.sin(n),c=Math.sin(u),s=Math.atan2(Math.sqrt((s=e*c-r*a)*s+(s=r*o-t*c)*s+(s=t*a-e*o)*s),t*o+e*a+r*c);vc+=s,xc+=s*(t+(t=o)),Mc+=s*(e+(e=a)),_c+=s*(r+(r=c)),ye(t,e,r)}var t,e,r;kc.point=function(u,i){u*=Na;var o=Math.cos(i*=Na);t=o*Math.cos(u),e=o*Math.sin(u),r=Math.sin(i),kc.point=n,ye(t,e,r)}}function Me(){kc.point=me}function _e(){function n(n,t){n*=Na;var e=Math.cos(t*=Na),o=e*Math.cos(n),a=e*Math.sin(n),c=Math.sin(t),s=u*c-i*a,l=i*o-r*c,f=r*a-u*o,h=Math.sqrt(s*s+l*l+f*f),g=r*o+u*a+i*c,p=h&&-V(g)/h,v=Math.atan2(h,g);bc+=p*s,wc+=p*l,Sc+=p*f,vc+=v,xc+=v*(r+(r=o)),Mc+=v*(u+(u=a)),_c+=v*(i+(i=c)),ye(r,u,i)}var t,e,r,u,i;kc.point=function(o,a){t=o,e=a,kc.point=n,o*=Na;var c=Math.cos(a*=Na);r=c*Math.cos(o),u=c*Math.sin(o),i=Math.sin(a),ye(r,u,i)},kc.lineEnd=function(){n(t,e),kc.lineEnd=Me,kc.point=me}}function be(){return!0}function we(n,t,e,r,u){var i=[],o=[];if(n.forEach(function(n){if(!((t=n.length-1)<=0)){var t,e=n[0],r=n[t];if(de(e,r)){u.lineStart();for(var a=0;t>a;++a)u.point((e=n[a])[0],e[1]);return u.lineEnd(),void 0}var c=new ke(e,n,null,!0),s=new ke(e,null,c,!1);c.o=s,i.push(c),o.push(s),c=new ke(r,n,null,!1),s=new ke(r,null,c,!0),c.o=s,i.push(c),o.push(s)}}),o.sort(t),Se(i),Se(o),i.length){for(var a=0,c=e,s=o.length;s>a;++a)o[a].e=c=!c;for(var l,f,h=i[0];;){for(var g=h,p=!0;g.v;)if((g=g.n)===h)return;l=g.z,u.lineStart();do{if(g.v=g.o.v=!0,g.e){if(p)for(var a=0,s=l.length;s>a;++a)u.point((f=l[a])[0],f[1]);else r(g.x,g.n.x,1,u);g=g.n}else{if(p){l=g.p.z;for(var a=l.length-1;a>=0;--a)u.point((f=l[a])[0],f[1])}else r(g.x,g.p.x,-1,u);g=g.p}g=g.o,l=g.z,p=!p}while(!g.v);u.lineEnd()}}}function Se(n){if(t=n.length){for(var t,e,r=0,u=n[0];++r<t;)u.n=e=n[r],e.p=u,u=e;u.n=e=n[0],e.p=u}}function ke(n,t,e,r){this.x=n,this.z=t,this.o=e,this.e=r,this.v=!1,this.n=this.p=null}function Ee(n,t,e,r){return function(u,i){function o(t,e){var r=u(t,e);n(t=r[0],e=r[1])&&i.point(t,e)}function a(n,t){var e=u(n,t);d.point(e[0],e[1])}function c(){y.point=a,d.lineStart()}function s(){y.point=o,d.lineEnd()}function l(n,t){v.push([n,t]);var e=u(n,t);M.point(e[0],e[1])}function f(){M.lineStart(),v=[]}function h(){l(v[0][0],v[0][1]),M.lineEnd();var n,t=M.clean(),e=x.buffer(),r=e.length;if(v.pop(),p.push(v),v=null,r){if(1&t){n=e[0];var u,r=n.length-1,o=-1;for(i.lineStart();++o<r;)i.point((u=n[o])[0],u[1]);return i.lineEnd(),void 0}r>1&&2&t&&e.push(e.pop().concat(e.shift())),g.push(e.filter(Ae))}}var g,p,v,d=t(i),m=u.invert(r[0],r[1]),y={point:o,lineStart:c,lineEnd:s,polygonStart:function(){y.point=l,y.lineStart=f,y.lineEnd=h,g=[],p=[],i.polygonStart()},polygonEnd:function(){y.point=o,y.lineStart=c,y.lineEnd=s,g=Xo.merge(g);var n=Le(m,p);g.length?we(g,Ne,n,e,i):n&&(i.lineStart(),e(null,null,1,i),i.lineEnd()),i.polygonEnd(),g=p=null},sphere:function(){i.polygonStart(),i.lineStart(),e(null,null,1,i),i.lineEnd(),i.polygonEnd()}},x=Ce(),M=t(x);return y}}function Ae(n){return n.length>1}function Ce(){var n,t=[];return{lineStart:function(){t.push(n=[])},point:function(t,e){n.push([t,e])},lineEnd:g,buffer:function(){var e=t;return t=[],n=null,e},rejoin:function(){t.length>1&&t.push(t.pop().concat(t.shift()))}}}function Ne(n,t){return((n=n.x)[0]<0?n[1]-Ea-Aa:Ea-n[1])-((t=t.x)[0]<0?t[1]-Ea-Aa:Ea-t[1])}function Le(n,t){var e=n[0],r=n[1],u=[Math.sin(e),-Math.cos(e),0],i=0,o=0;hc.reset();for(var a=0,c=t.length;c>a;++a){var s=t[a],l=s.length;if(l)for(var f=s[0],h=f[0],g=f[1]/2+Sa/4,p=Math.sin(g),v=Math.cos(g),d=1;;){d===l&&(d=0),n=s[d];var m=n[0],y=n[1]/2+Sa/4,x=Math.sin(y),M=Math.cos(y),_=m-h,b=_>=0?1:-1,w=b*_,S=w>Sa,k=p*x;if(hc.add(Math.atan2(k*b*Math.sin(w),v*M+k*Math.cos(w))),i+=S?_+b*ka:_,S^h>=e^m>=e){var E=fe(se(f),se(n));pe(E);var A=fe(u,E);pe(A);var C=(S^_>=0?-1:1)*X(A[2]);(r>C||r===C&&(E[0]||E[1]))&&(o+=S^_>=0?1:-1)}if(!d++)break;h=m,p=x,v=M,f=n}}return(-Aa>i||Aa>i&&0>hc)^1&o}function Te(n){var t,e=0/0,r=0/0,u=0/0;return{lineStart:function(){n.lineStart(),t=1},point:function(i,o){var a=i>0?Sa:-Sa,c=oa(i-e);oa(c-Sa)<Aa?(n.point(e,r=(r+o)/2>0?Ea:-Ea),n.point(u,r),n.lineEnd(),n.lineStart(),n.point(a,r),n.point(i,r),t=0):u!==a&&c>=Sa&&(oa(e-u)<Aa&&(e-=u*Aa),oa(i-a)<Aa&&(i-=a*Aa),r=qe(e,r,i,o),n.point(u,r),n.lineEnd(),n.lineStart(),n.point(a,r),t=0),n.point(e=i,r=o),u=a},lineEnd:function(){n.lineEnd(),e=r=0/0},clean:function(){return 2-t}}}function qe(n,t,e,r){var u,i,o=Math.sin(n-e);return oa(o)>Aa?Math.atan((Math.sin(t)*(i=Math.cos(r))*Math.sin(e)-Math.sin(r)*(u=Math.cos(t))*Math.sin(n))/(u*i*o)):(t+r)/2}function ze(n,t,e,r){var u;if(null==n)u=e*Ea,r.point(-Sa,u),r.point(0,u),r.point(Sa,u),r.point(Sa,0),r.point(Sa,-u),r.point(0,-u),r.point(-Sa,-u),r.point(-Sa,0),r.point(-Sa,u);else if(oa(n[0]-t[0])>Aa){var i=n[0]<t[0]?Sa:-Sa;u=e*i/2,r.point(-i,u),r.point(0,u),r.point(i,u)}else r.point(t[0],t[1])}function Re(n){function t(n,t){return Math.cos(n)*Math.cos(t)>i}function e(n){var e,i,c,s,l;return{lineStart:function(){s=c=!1,l=1},point:function(f,h){var g,p=[f,h],v=t(f,h),d=o?v?0:u(f,h):v?u(f+(0>f?Sa:-Sa),h):0;if(!e&&(s=c=v)&&n.lineStart(),v!==c&&(g=r(e,p),(de(e,g)||de(p,g))&&(p[0]+=Aa,p[1]+=Aa,v=t(p[0],p[1]))),v!==c)l=0,v?(n.lineStart(),g=r(p,e),n.point(g[0],g[1])):(g=r(e,p),n.point(g[0],g[1]),n.lineEnd()),e=g;else if(a&&e&&o^v){var m;d&i||!(m=r(p,e,!0))||(l=0,o?(n.lineStart(),n.point(m[0][0],m[0][1]),n.point(m[1][0],m[1][1]),n.lineEnd()):(n.point(m[1][0],m[1][1]),n.lineEnd(),n.lineStart(),n.point(m[0][0],m[0][1])))}!v||e&&de(e,p)||n.point(p[0],p[1]),e=p,c=v,i=d},lineEnd:function(){c&&n.lineEnd(),e=null},clean:function(){return l|(s&&c)<<1}}}function r(n,t,e){var r=se(n),u=se(t),o=[1,0,0],a=fe(r,u),c=le(a,a),s=a[0],l=c-s*s;if(!l)return!e&&n;var f=i*c/l,h=-i*s/l,g=fe(o,a),p=ge(o,f),v=ge(a,h);he(p,v);var d=g,m=le(p,d),y=le(d,d),x=m*m-y*(le(p,p)-1);if(!(0>x)){var M=Math.sqrt(x),_=ge(d,(-m-M)/y);if(he(_,p),_=ve(_),!e)return _;var b,w=n[0],S=t[0],k=n[1],E=t[1];w>S&&(b=w,w=S,S=b);var A=S-w,C=oa(A-Sa)<Aa,N=C||Aa>A;if(!C&&k>E&&(b=k,k=E,E=b),N?C?k+E>0^_[1]<(oa(_[0]-w)<Aa?k:E):k<=_[1]&&_[1]<=E:A>Sa^(w<=_[0]&&_[0]<=S)){var L=ge(d,(-m+M)/y);return he(L,p),[_,ve(L)]}}}function u(t,e){var r=o?n:Sa-n,u=0;return-r>t?u|=1:t>r&&(u|=2),-r>e?u|=4:e>r&&(u|=8),u}var i=Math.cos(n),o=i>0,a=oa(i)>Aa,c=cr(n,6*Na);return Ee(t,e,c,o?[0,-n]:[-Sa,n-Sa])}function De(n,t,e,r){return function(u){var i,o=u.a,a=u.b,c=o.x,s=o.y,l=a.x,f=a.y,h=0,g=1,p=l-c,v=f-s;if(i=n-c,p||!(i>0)){if(i/=p,0>p){if(h>i)return;g>i&&(g=i)}else if(p>0){if(i>g)return;i>h&&(h=i)}if(i=e-c,p||!(0>i)){if(i/=p,0>p){if(i>g)return;i>h&&(h=i)}else if(p>0){if(h>i)return;g>i&&(g=i)}if(i=t-s,v||!(i>0)){if(i/=v,0>v){if(h>i)return;g>i&&(g=i)}else if(v>0){if(i>g)return;i>h&&(h=i)}if(i=r-s,v||!(0>i)){if(i/=v,0>v){if(i>g)return;i>h&&(h=i)}else if(v>0){if(h>i)return;g>i&&(g=i)}return h>0&&(u.a={x:c+h*p,y:s+h*v}),1>g&&(u.b={x:c+g*p,y:s+g*v}),u}}}}}}function Pe(n,t,e,r){function u(r,u){return oa(r[0]-n)<Aa?u>0?0:3:oa(r[0]-e)<Aa?u>0?2:1:oa(r[1]-t)<Aa?u>0?1:0:u>0?3:2}function i(n,t){return o(n.x,t.x)}function o(n,t){var e=u(n,1),r=u(t,1);return e!==r?e-r:0===e?t[1]-n[1]:1===e?n[0]-t[0]:2===e?n[1]-t[1]:t[0]-n[0]}return function(a){function c(n){for(var t=0,e=d.length,r=n[1],u=0;e>u;++u)for(var i,o=1,a=d[u],c=a.length,s=a[0];c>o;++o)i=a[o],s[1]<=r?i[1]>r&&Z(s,i,n)>0&&++t:i[1]<=r&&Z(s,i,n)<0&&--t,s=i;return 0!==t}function s(i,a,c,s){var l=0,f=0;if(null==i||(l=u(i,c))!==(f=u(a,c))||o(i,a)<0^c>0){do s.point(0===l||3===l?n:e,l>1?r:t);while((l=(l+c+4)%4)!==f)}else s.point(a[0],a[1])}function l(u,i){return u>=n&&e>=u&&i>=t&&r>=i}function f(n,t){l(n,t)&&a.point(n,t)}function h(){N.point=p,d&&d.push(m=[]),S=!0,w=!1,_=b=0/0}function g(){v&&(p(y,x),M&&w&&A.rejoin(),v.push(A.buffer())),N.point=f,w&&a.lineEnd()}function p(n,t){n=Math.max(-Ac,Math.min(Ac,n)),t=Math.max(-Ac,Math.min(Ac,t));var e=l(n,t);if(d&&m.push([n,t]),S)y=n,x=t,M=e,S=!1,e&&(a.lineStart(),a.point(n,t));else if(e&&w)a.point(n,t);else{var r={a:{x:_,y:b},b:{x:n,y:t}};C(r)?(w||(a.lineStart(),a.point(r.a.x,r.a.y)),a.point(r.b.x,r.b.y),e||a.lineEnd(),k=!1):e&&(a.lineStart(),a.point(n,t),k=!1)}_=n,b=t,w=e}var v,d,m,y,x,M,_,b,w,S,k,E=a,A=Ce(),C=De(n,t,e,r),N={point:f,lineStart:h,lineEnd:g,polygonStart:function(){a=A,v=[],d=[],k=!0},polygonEnd:function(){a=E,v=Xo.merge(v);var t=c([n,r]),e=k&&t,u=v.length;(e||u)&&(a.polygonStart(),e&&(a.lineStart(),s(null,null,1,a),a.lineEnd()),u&&we(v,i,t,s,a),a.polygonEnd()),v=d=m=null}};return N}}function Ue(n,t){function e(e,r){return e=n(e,r),t(e[0],e[1])}return n.invert&&t.invert&&(e.invert=function(e,r){return e=t.invert(e,r),e&&n.invert(e[0],e[1])}),e}function je(n){var t=0,e=Sa/3,r=nr(n),u=r(t,e);return u.parallels=function(n){return arguments.length?r(t=n[0]*Sa/180,e=n[1]*Sa/180):[180*(t/Sa),180*(e/Sa)]},u}function He(n,t){function e(n,t){var e=Math.sqrt(i-2*u*Math.sin(t))/u;return[e*Math.sin(n*=u),o-e*Math.cos(n)]}var r=Math.sin(n),u=(r+Math.sin(t))/2,i=1+r*(2*u-r),o=Math.sqrt(i)/u;return e.invert=function(n,t){var e=o-t;return[Math.atan2(n,e)/u,X((i-(n*n+e*e)*u*u)/(2*u))]},e}function Fe(){function n(n,t){Nc+=u*n-r*t,r=n,u=t}var t,e,r,u;Rc.point=function(i,o){Rc.point=n,t=r=i,e=u=o},Rc.lineEnd=function(){n(t,e)}}function Oe(n,t){Lc>n&&(Lc=n),n>qc&&(qc=n),Tc>t&&(Tc=t),t>zc&&(zc=t)}function Ye(){function n(n,t){o.push("M",n,",",t,i)}function t(n,t){o.push("M",n,",",t),a.point=e}function e(n,t){o.push("L",n,",",t)}function r(){a.point=n}function u(){o.push("Z")}var i=Ie(4.5),o=[],a={point:n,lineStart:function(){a.point=t},lineEnd:r,polygonStart:function(){a.lineEnd=u},polygonEnd:function(){a.lineEnd=r,a.point=n},pointRadius:function(n){return i=Ie(n),a},result:function(){if(o.length){var n=o.join("");return o=[],n}}};return a}function Ie(n){return"m0,"+n+"a"+n+","+n+" 0 1,1 0,"+-2*n+"a"+n+","+n+" 0 1,1 0,"+2*n+"z"}function Ze(n,t){dc+=n,mc+=t,++yc}function Ve(){function n(n,r){var u=n-t,i=r-e,o=Math.sqrt(u*u+i*i);xc+=o*(t+n)/2,Mc+=o*(e+r)/2,_c+=o,Ze(t=n,e=r)}var t,e;Pc.point=function(r,u){Pc.point=n,Ze(t=r,e=u)}}function Xe(){Pc.point=Ze}function $e(){function n(n,t){var e=n-r,i=t-u,o=Math.sqrt(e*e+i*i);xc+=o*(r+n)/2,Mc+=o*(u+t)/2,_c+=o,o=u*n-r*t,bc+=o*(r+n),wc+=o*(u+t),Sc+=3*o,Ze(r=n,u=t)}var t,e,r,u;Pc.point=function(i,o){Pc.point=n,Ze(t=r=i,e=u=o)},Pc.lineEnd=function(){n(t,e)}}function Be(n){function t(t,e){n.moveTo(t,e),n.arc(t,e,o,0,ka)}function e(t,e){n.moveTo(t,e),a.point=r}function r(t,e){n.lineTo(t,e)}function u(){a.point=t}function i(){n.closePath()}var o=4.5,a={point:t,lineStart:function(){a.point=e},lineEnd:u,polygonStart:function(){a.lineEnd=i},polygonEnd:function(){a.lineEnd=u,a.point=t},pointRadius:function(n){return o=n,a},result:g};return a}function We(n){function t(n){return(a?r:e)(n)}function e(t){return Ke(t,function(e,r){e=n(e,r),t.point(e[0],e[1])})}function r(t){function e(e,r){e=n(e,r),t.point(e[0],e[1])}function r(){x=0/0,S.point=i,t.lineStart()}function i(e,r){var i=se([e,r]),o=n(e,r);u(x,M,y,_,b,w,x=o[0],M=o[1],y=e,_=i[0],b=i[1],w=i[2],a,t),t.point(x,M)}function o(){S.point=e,t.lineEnd()}function c(){r(),S.point=s,S.lineEnd=l}function s(n,t){i(f=n,h=t),g=x,p=M,v=_,d=b,m=w,S.point=i}function l(){u(x,M,y,_,b,w,g,p,f,v,d,m,a,t),S.lineEnd=o,o()}var f,h,g,p,v,d,m,y,x,M,_,b,w,S={point:e,lineStart:r,lineEnd:o,polygonStart:function(){t.polygonStart(),S.lineStart=c},polygonEnd:function(){t.polygonEnd(),S.lineStart=r}};return S}function u(t,e,r,a,c,s,l,f,h,g,p,v,d,m){var y=l-t,x=f-e,M=y*y+x*x;if(M>4*i&&d--){var _=a+g,b=c+p,w=s+v,S=Math.sqrt(_*_+b*b+w*w),k=Math.asin(w/=S),E=oa(oa(w)-1)<Aa||oa(r-h)<Aa?(r+h)/2:Math.atan2(b,_),A=n(E,k),C=A[0],N=A[1],L=C-t,T=N-e,q=x*L-y*T;(q*q/M>i||oa((y*L+x*T)/M-.5)>.3||o>a*g+c*p+s*v)&&(u(t,e,r,a,c,s,C,N,E,_/=S,b/=S,w,d,m),m.point(C,N),u(C,N,E,_,b,w,l,f,h,g,p,v,d,m))}}var i=.5,o=Math.cos(30*Na),a=16;return t.precision=function(n){return arguments.length?(a=(i=n*n)>0&&16,t):Math.sqrt(i)},t}function Je(n){var t=We(function(t,e){return n([t*La,e*La])});return function(n){return tr(t(n))}}function Ge(n){this.stream=n}function Ke(n,t){return{point:t,sphere:function(){n.sphere()},lineStart:function(){n.lineStart()},lineEnd:function(){n.lineEnd()},polygonStart:function(){n.polygonStart()},polygonEnd:function(){n.polygonEnd()}}}function Qe(n){return nr(function(){return n})()}function nr(n){function t(n){return n=a(n[0]*Na,n[1]*Na),[n[0]*h+c,s-n[1]*h]}function e(n){return n=a.invert((n[0]-c)/h,(s-n[1])/h),n&&[n[0]*La,n[1]*La]}function r(){a=Ue(o=ur(m,y,x),i);var n=i(v,d);return c=g-n[0]*h,s=p+n[1]*h,u()}function u(){return l&&(l.valid=!1,l=null),t}var i,o,a,c,s,l,f=We(function(n,t){return n=i(n,t),[n[0]*h+c,s-n[1]*h]}),h=150,g=480,p=250,v=0,d=0,m=0,y=0,x=0,M=Ec,_=bt,b=null,w=null;return t.stream=function(n){return l&&(l.valid=!1),l=tr(M(o,f(_(n)))),l.valid=!0,l},t.clipAngle=function(n){return arguments.length?(M=null==n?(b=n,Ec):Re((b=+n)*Na),u()):b},t.clipExtent=function(n){return arguments.length?(w=n,_=n?Pe(n[0][0],n[0][1],n[1][0],n[1][1]):bt,u()):w},t.scale=function(n){return arguments.length?(h=+n,r()):h},t.translate=function(n){return arguments.length?(g=+n[0],p=+n[1],r()):[g,p]},t.center=function(n){return arguments.length?(v=n[0]%360*Na,d=n[1]%360*Na,r()):[v*La,d*La]},t.rotate=function(n){return arguments.length?(m=n[0]%360*Na,y=n[1]%360*Na,x=n.length>2?n[2]%360*Na:0,r()):[m*La,y*La,x*La]},Xo.rebind(t,f,"precision"),function(){return i=n.apply(this,arguments),t.invert=i.invert&&e,r()}}function tr(n){return Ke(n,function(t,e){n.point(t*Na,e*Na)})}function er(n,t){return[n,t]}function rr(n,t){return[n>Sa?n-ka:-Sa>n?n+ka:n,t]}function ur(n,t,e){return n?t||e?Ue(or(n),ar(t,e)):or(n):t||e?ar(t,e):rr}function ir(n){return function(t,e){return t+=n,[t>Sa?t-ka:-Sa>t?t+ka:t,e]}}function or(n){var t=ir(n);return t.invert=ir(-n),t}function ar(n,t){function e(n,t){var e=Math.cos(t),a=Math.cos(n)*e,c=Math.sin(n)*e,s=Math.sin(t),l=s*r+a*u;return[Math.atan2(c*i-l*o,a*r-s*u),X(l*i+c*o)]}var r=Math.cos(n),u=Math.sin(n),i=Math.cos(t),o=Math.sin(t);return e.invert=function(n,t){var e=Math.cos(t),a=Math.cos(n)*e,c=Math.sin(n)*e,s=Math.sin(t),l=s*i-c*o;return[Math.atan2(c*i+s*o,a*r+l*u),X(l*r-a*u)]},e}function cr(n,t){var e=Math.cos(n),r=Math.sin(n);return function(u,i,o,a){var c=o*t;null!=u?(u=sr(e,u),i=sr(e,i),(o>0?i>u:u>i)&&(u+=o*ka)):(u=n+o*ka,i=n-.5*c);for(var s,l=u;o>0?l>i:i>l;l-=c)a.point((s=ve([e,-r*Math.cos(l),-r*Math.sin(l)]))[0],s[1])}}function sr(n,t){var e=se(t);e[0]-=n,pe(e);var r=V(-e[1]);return((-e[2]<0?-r:r)+2*Math.PI-Aa)%(2*Math.PI)}function lr(n,t,e){var r=Xo.range(n,t-Aa,e).concat(t);return function(n){return r.map(function(t){return[n,t]})}}function fr(n,t,e){var r=Xo.range(n,t-Aa,e).concat(t);return function(n){return r.map(function(t){return[t,n]})}}function hr(n){return n.source}function gr(n){return n.target}function pr(n,t,e,r){var u=Math.cos(t),i=Math.sin(t),o=Math.cos(r),a=Math.sin(r),c=u*Math.cos(n),s=u*Math.sin(n),l=o*Math.cos(e),f=o*Math.sin(e),h=2*Math.asin(Math.sqrt(J(r-t)+u*o*J(e-n))),g=1/Math.sin(h),p=h?function(n){var t=Math.sin(n*=h)*g,e=Math.sin(h-n)*g,r=e*c+t*l,u=e*s+t*f,o=e*i+t*a;return[Math.atan2(u,r)*La,Math.atan2(o,Math.sqrt(r*r+u*u))*La]}:function(){return[n*La,t*La]};return p.distance=h,p}function vr(){function n(n,u){var i=Math.sin(u*=Na),o=Math.cos(u),a=oa((n*=Na)-t),c=Math.cos(a);Uc+=Math.atan2(Math.sqrt((a=o*Math.sin(a))*a+(a=r*i-e*o*c)*a),e*i+r*o*c),t=n,e=i,r=o}var t,e,r;jc.point=function(u,i){t=u*Na,e=Math.sin(i*=Na),r=Math.cos(i),jc.point=n},jc.lineEnd=function(){jc.point=jc.lineEnd=g}}function dr(n,t){function e(t,e){var r=Math.cos(t),u=Math.cos(e),i=n(r*u);return[i*u*Math.sin(t),i*Math.sin(e)]}return e.invert=function(n,e){var r=Math.sqrt(n*n+e*e),u=t(r),i=Math.sin(u),o=Math.cos(u);return[Math.atan2(n*i,r*o),Math.asin(r&&e*i/r)]},e}function mr(n,t){function e(n,t){var e=oa(oa(t)-Ea)<Aa?0:o/Math.pow(u(t),i);return[e*Math.sin(i*n),o-e*Math.cos(i*n)]}var r=Math.cos(n),u=function(n){return Math.tan(Sa/4+n/2)},i=n===t?Math.sin(n):Math.log(r/Math.cos(t))/Math.log(u(t)/u(n)),o=r*Math.pow(u(n),i)/i;return i?(e.invert=function(n,t){var e=o-t,r=I(i)*Math.sqrt(n*n+e*e);return[Math.atan2(n,e)/i,2*Math.atan(Math.pow(o/r,1/i))-Ea]},e):xr}function yr(n,t){function e(n,t){var e=i-t;return[e*Math.sin(u*n),i-e*Math.cos(u*n)]}var r=Math.cos(n),u=n===t?Math.sin(n):(r-Math.cos(t))/(t-n),i=r/u+n;return oa(u)<Aa?er:(e.invert=function(n,t){var e=i-t;return[Math.atan2(n,e)/u,i-I(u)*Math.sqrt(n*n+e*e)]},e)}function xr(n,t){return[n,Math.log(Math.tan(Sa/4+t/2))]}function Mr(n){var t,e=Qe(n),r=e.scale,u=e.translate,i=e.clipExtent;return e.scale=function(){var n=r.apply(e,arguments);return n===e?t?e.clipExtent(null):e:n},e.translate=function(){var n=u.apply(e,arguments);return n===e?t?e.clipExtent(null):e:n},e.clipExtent=function(n){var o=i.apply(e,arguments);if(o===e){if(t=null==n){var a=Sa*r(),c=u();i([[c[0]-a,c[1]-a],[c[0]+a,c[1]+a]])}}else t&&(o=null);return o},e.clipExtent(null)}function _r(n,t){return[Math.log(Math.tan(Sa/4+t/2)),-n]}function br(n){return n[0]}function wr(n){return n[1]}function Sr(n){for(var t=n.length,e=[0,1],r=2,u=2;t>u;u++){for(;r>1&&Z(n[e[r-2]],n[e[r-1]],n[u])<=0;)--r;e[r++]=u}return e.slice(0,r)}function kr(n,t){return n[0]-t[0]||n[1]-t[1]}function Er(n,t,e){return(e[0]-t[0])*(n[1]-t[1])<(e[1]-t[1])*(n[0]-t[0])}function Ar(n,t,e,r){var u=n[0],i=e[0],o=t[0]-u,a=r[0]-i,c=n[1],s=e[1],l=t[1]-c,f=r[1]-s,h=(a*(c-s)-f*(u-i))/(f*o-a*l);return[u+h*o,c+h*l]}function Cr(n){var t=n[0],e=n[n.length-1];return!(t[0]-e[0]||t[1]-e[1])}function Nr(){Jr(this),this.edge=this.site=this.circle=null}function Lr(n){var t=Jc.pop()||new Nr;return t.site=n,t}function Tr(n){Or(n),$c.remove(n),Jc.push(n),Jr(n)}function qr(n){var t=n.circle,e=t.x,r=t.cy,u={x:e,y:r},i=n.P,o=n.N,a=[n];Tr(n);for(var c=i;c.circle&&oa(e-c.circle.x)<Aa&&oa(r-c.circle.cy)<Aa;)i=c.P,a.unshift(c),Tr(c),c=i;a.unshift(c),Or(c);for(var s=o;s.circle&&oa(e-s.circle.x)<Aa&&oa(r-s.circle.cy)<Aa;)o=s.N,a.push(s),Tr(s),s=o;a.push(s),Or(s);var l,f=a.length;for(l=1;f>l;++l)s=a[l],c=a[l-1],$r(s.edge,c.site,s.site,u);c=a[0],s=a[f-1],s.edge=Vr(c.site,s.site,null,u),Fr(c),Fr(s)}function zr(n){for(var t,e,r,u,i=n.x,o=n.y,a=$c._;a;)if(r=Rr(a,o)-i,r>Aa)a=a.L;else{if(u=i-Dr(a,o),!(u>Aa)){r>-Aa?(t=a.P,e=a):u>-Aa?(t=a,e=a.N):t=e=a;break}if(!a.R){t=a;break}a=a.R}var c=Lr(n);if($c.insert(t,c),t||e){if(t===e)return Or(t),e=Lr(t.site),$c.insert(c,e),c.edge=e.edge=Vr(t.site,c.site),Fr(t),Fr(e),void 0;if(!e)return c.edge=Vr(t.site,c.site),void 0;Or(t),Or(e);var s=t.site,l=s.x,f=s.y,h=n.x-l,g=n.y-f,p=e.site,v=p.x-l,d=p.y-f,m=2*(h*d-g*v),y=h*h+g*g,x=v*v+d*d,M={x:(d*y-g*x)/m+l,y:(h*x-v*y)/m+f};$r(e.edge,s,p,M),c.edge=Vr(s,n,null,M),e.edge=Vr(n,p,null,M),Fr(t),Fr(e)}}function Rr(n,t){var e=n.site,r=e.x,u=e.y,i=u-t;if(!i)return r;var o=n.P;if(!o)return-1/0;e=o.site;var a=e.x,c=e.y,s=c-t;if(!s)return a;var l=a-r,f=1/i-1/s,h=l/s;return f?(-h+Math.sqrt(h*h-2*f*(l*l/(-2*s)-c+s/2+u-i/2)))/f+r:(r+a)/2}function Dr(n,t){var e=n.N;if(e)return Rr(e,t);var r=n.site;return r.y===t?r.x:1/0}function Pr(n){this.site=n,this.edges=[]}function Ur(n){for(var t,e,r,u,i,o,a,c,s,l,f=n[0][0],h=n[1][0],g=n[0][1],p=n[1][1],v=Xc,d=v.length;d--;)if(i=v[d],i&&i.prepare())for(a=i.edges,c=a.length,o=0;c>o;)l=a[o].end(),r=l.x,u=l.y,s=a[++o%c].start(),t=s.x,e=s.y,(oa(r-t)>Aa||oa(u-e)>Aa)&&(a.splice(o,0,new Br(Xr(i.site,l,oa(r-f)<Aa&&p-u>Aa?{x:f,y:oa(t-f)<Aa?e:p}:oa(u-p)<Aa&&h-r>Aa?{x:oa(e-p)<Aa?t:h,y:p}:oa(r-h)<Aa&&u-g>Aa?{x:h,y:oa(t-h)<Aa?e:g}:oa(u-g)<Aa&&r-f>Aa?{x:oa(e-g)<Aa?t:f,y:g}:null),i.site,null)),++c)}function jr(n,t){return t.angle-n.angle}function Hr(){Jr(this),this.x=this.y=this.arc=this.site=this.cy=null}function Fr(n){var t=n.P,e=n.N;if(t&&e){var r=t.site,u=n.site,i=e.site;if(r!==i){var o=u.x,a=u.y,c=r.x-o,s=r.y-a,l=i.x-o,f=i.y-a,h=2*(c*f-s*l);if(!(h>=-Ca)){var g=c*c+s*s,p=l*l+f*f,v=(f*g-s*p)/h,d=(c*p-l*g)/h,f=d+a,m=Gc.pop()||new Hr;m.arc=n,m.site=u,m.x=v+o,m.y=f+Math.sqrt(v*v+d*d),m.cy=f,n.circle=m;for(var y=null,x=Wc._;x;)if(m.y<x.y||m.y===x.y&&m.x<=x.x){if(!x.L){y=x.P;break}x=x.L}else{if(!x.R){y=x;break}x=x.R}Wc.insert(y,m),y||(Bc=m)}}}}function Or(n){var t=n.circle;t&&(t.P||(Bc=t.N),Wc.remove(t),Gc.push(t),Jr(t),n.circle=null)}function Yr(n){for(var t,e=Vc,r=De(n[0][0],n[0][1],n[1][0],n[1][1]),u=e.length;u--;)t=e[u],(!Ir(t,n)||!r(t)||oa(t.a.x-t.b.x)<Aa&&oa(t.a.y-t.b.y)<Aa)&&(t.a=t.b=null,e.splice(u,1))}function Ir(n,t){var e=n.b;if(e)return!0;var r,u,i=n.a,o=t[0][0],a=t[1][0],c=t[0][1],s=t[1][1],l=n.l,f=n.r,h=l.x,g=l.y,p=f.x,v=f.y,d=(h+p)/2,m=(g+v)/2;if(v===g){if(o>d||d>=a)return;if(h>p){if(i){if(i.y>=s)return}else i={x:d,y:c};e={x:d,y:s}}else{if(i){if(i.y<c)return}else i={x:d,y:s};e={x:d,y:c}}}else if(r=(h-p)/(v-g),u=m-r*d,-1>r||r>1)if(h>p){if(i){if(i.y>=s)return}else i={x:(c-u)/r,y:c};e={x:(s-u)/r,y:s}}else{if(i){if(i.y<c)return}else i={x:(s-u)/r,y:s};e={x:(c-u)/r,y:c}}else if(v>g){if(i){if(i.x>=a)return}else i={x:o,y:r*o+u};e={x:a,y:r*a+u}}else{if(i){if(i.x<o)return}else i={x:a,y:r*a+u};e={x:o,y:r*o+u}}return n.a=i,n.b=e,!0}function Zr(n,t){this.l=n,this.r=t,this.a=this.b=null}function Vr(n,t,e,r){var u=new Zr(n,t);return Vc.push(u),e&&$r(u,n,t,e),r&&$r(u,t,n,r),Xc[n.i].edges.push(new Br(u,n,t)),Xc[t.i].edges.push(new Br(u,t,n)),u}function Xr(n,t,e){var r=new Zr(n,null);return r.a=t,r.b=e,Vc.push(r),r}function $r(n,t,e,r){n.a||n.b?n.l===e?n.b=r:n.a=r:(n.a=r,n.l=t,n.r=e)}function Br(n,t,e){var r=n.a,u=n.b;this.edge=n,this.site=t,this.angle=e?Math.atan2(e.y-t.y,e.x-t.x):n.l===t?Math.atan2(u.x-r.x,r.y-u.y):Math.atan2(r.x-u.x,u.y-r.y)}function Wr(){this._=null}function Jr(n){n.U=n.C=n.L=n.R=n.P=n.N=null}function Gr(n,t){var e=t,r=t.R,u=e.U;u?u.L===e?u.L=r:u.R=r:n._=r,r.U=u,e.U=r,e.R=r.L,e.R&&(e.R.U=e),r.L=e}function Kr(n,t){var e=t,r=t.L,u=e.U;u?u.L===e?u.L=r:u.R=r:n._=r,r.U=u,e.U=r,e.L=r.R,e.L&&(e.L.U=e),r.R=e}function Qr(n){for(;n.L;)n=n.L;return n}function nu(n,t){var e,r,u,i=n.sort(tu).pop();for(Vc=[],Xc=new Array(n.length),$c=new Wr,Wc=new Wr;;)if(u=Bc,i&&(!u||i.y<u.y||i.y===u.y&&i.x<u.x))(i.x!==e||i.y!==r)&&(Xc[i.i]=new Pr(i),zr(i),e=i.x,r=i.y),i=n.pop();else{if(!u)break;qr(u.arc)}t&&(Yr(t),Ur(t));var o={cells:Xc,edges:Vc};return $c=Wc=Vc=Xc=null,o}function tu(n,t){return t.y-n.y||t.x-n.x}function eu(n,t,e){return(n.x-e.x)*(t.y-n.y)-(n.x-t.x)*(e.y-n.y)}function ru(n){return n.x}function uu(n){return n.y}function iu(){return{leaf:!0,nodes:[],point:null,x:null,y:null}}function ou(n,t,e,r,u,i){if(!n(t,e,r,u,i)){var o=.5*(e+u),a=.5*(r+i),c=t.nodes;c[0]&&ou(n,c[0],e,r,o,a),c[1]&&ou(n,c[1],o,r,u,a),c[2]&&ou(n,c[2],e,a,o,i),c[3]&&ou(n,c[3],o,a,u,i)}}function au(n,t){n=Xo.rgb(n),t=Xo.rgb(t);var e=n.r,r=n.g,u=n.b,i=t.r-e,o=t.g-r,a=t.b-u;return function(n){return"#"+vt(Math.round(e+i*n))+vt(Math.round(r+o*n))+vt(Math.round(u+a*n))}}function cu(n,t){var e,r={},u={};for(e in n)e in t?r[e]=fu(n[e],t[e]):u[e]=n[e];for(e in t)e in n||(u[e]=t[e]);return function(n){for(e in r)u[e]=r[e](n);return u}}function su(n,t){return t-=n=+n,function(e){return n+t*e}}function lu(n,t){var e,r,u,i,o,a=0,c=0,s=[],l=[];for(n+="",t+="",Qc.lastIndex=0,r=0;e=Qc.exec(t);++r)e.index&&s.push(t.substring(a,c=e.index)),l.push({i:s.length,x:e[0]}),s.push(null),a=Qc.lastIndex;for(a<t.length&&s.push(t.substring(a)),r=0,i=l.length;(e=Qc.exec(n))&&i>r;++r)if(o=l[r],o.x==e[0]){if(o.i)if(null==s[o.i+1])for(s[o.i-1]+=o.x,s.splice(o.i,1),u=r+1;i>u;++u)l[u].i--;else for(s[o.i-1]+=o.x+s[o.i+1],s.splice(o.i,2),u=r+1;i>u;++u)l[u].i-=2;else if(null==s[o.i+1])s[o.i]=o.x;else for(s[o.i]=o.x+s[o.i+1],s.splice(o.i+1,1),u=r+1;i>u;++u)l[u].i--;l.splice(r,1),i--,r--}else o.x=su(parseFloat(e[0]),parseFloat(o.x));for(;i>r;)o=l.pop(),null==s[o.i+1]?s[o.i]=o.x:(s[o.i]=o.x+s[o.i+1],s.splice(o.i+1,1)),i--;return 1===s.length?null==s[0]?(o=l[0].x,function(n){return o(n)+""}):function(){return t}:function(n){for(r=0;i>r;++r)s[(o=l[r]).i]=o.x(n);return s.join("")}}function fu(n,t){for(var e,r=Xo.interpolators.length;--r>=0&&!(e=Xo.interpolators[r](n,t)););return e}function hu(n,t){var e,r=[],u=[],i=n.length,o=t.length,a=Math.min(n.length,t.length);for(e=0;a>e;++e)r.push(fu(n[e],t[e]));for(;i>e;++e)u[e]=n[e];for(;o>e;++e)u[e]=t[e];return function(n){for(e=0;a>e;++e)u[e]=r[e](n);return u}}function gu(n){return function(t){return 0>=t?0:t>=1?1:n(t)}}function pu(n){return function(t){return 1-n(1-t)}}function vu(n){return function(t){return.5*(.5>t?n(2*t):2-n(2-2*t))}}function du(n){return n*n}function mu(n){return n*n*n}function yu(n){if(0>=n)return 0;if(n>=1)return 1;var t=n*n,e=t*n;return 4*(.5>n?e:3*(n-t)+e-.75)}function xu(n){return function(t){return Math.pow(t,n)}}function Mu(n){return 1-Math.cos(n*Ea)}function _u(n){return Math.pow(2,10*(n-1))}function bu(n){return 1-Math.sqrt(1-n*n)}function wu(n,t){var e;return arguments.length<2&&(t=.45),arguments.length?e=t/ka*Math.asin(1/n):(n=1,e=t/4),function(r){return 1+n*Math.pow(2,-10*r)*Math.sin((r-e)*ka/t)}}function Su(n){return n||(n=1.70158),function(t){return t*t*((n+1)*t-n)}}function ku(n){return 1/2.75>n?7.5625*n*n:2/2.75>n?7.5625*(n-=1.5/2.75)*n+.75:2.5/2.75>n?7.5625*(n-=2.25/2.75)*n+.9375:7.5625*(n-=2.625/2.75)*n+.984375}function Eu(n,t){n=Xo.hcl(n),t=Xo.hcl(t);var e=n.h,r=n.c,u=n.l,i=t.h-e,o=t.c-r,a=t.l-u;return isNaN(o)&&(o=0,r=isNaN(r)?t.c:r),isNaN(i)?(i=0,e=isNaN(e)?t.h:e):i>180?i-=360:-180>i&&(i+=360),function(n){return rt(e+i*n,r+o*n,u+a*n)+""}}function Au(n,t){n=Xo.hsl(n),t=Xo.hsl(t);var e=n.h,r=n.s,u=n.l,i=t.h-e,o=t.s-r,a=t.l-u;return isNaN(o)&&(o=0,r=isNaN(r)?t.s:r),isNaN(i)?(i=0,e=isNaN(e)?t.h:e):i>180?i-=360:-180>i&&(i+=360),function(n){return nt(e+i*n,r+o*n,u+a*n)+""}}function Cu(n,t){n=Xo.lab(n),t=Xo.lab(t);var e=n.l,r=n.a,u=n.b,i=t.l-e,o=t.a-r,a=t.b-u;return function(n){return ot(e+i*n,r+o*n,u+a*n)+""}}function Nu(n,t){return t-=n,function(e){return Math.round(n+t*e)}}function Lu(n){var t=[n.a,n.b],e=[n.c,n.d],r=qu(t),u=Tu(t,e),i=qu(zu(e,t,-u))||0;t[0]*e[1]<e[0]*t[1]&&(t[0]*=-1,t[1]*=-1,r*=-1,u*=-1),this.rotate=(r?Math.atan2(t[1],t[0]):Math.atan2(-e[0],e[1]))*La,this.translate=[n.e,n.f],this.scale=[r,i],this.skew=i?Math.atan2(u,i)*La:0}function Tu(n,t){return n[0]*t[0]+n[1]*t[1]}function qu(n){var t=Math.sqrt(Tu(n,n));return t&&(n[0]/=t,n[1]/=t),t}function zu(n,t,e){return n[0]+=e*t[0],n[1]+=e*t[1],n}function Ru(n,t){var e,r=[],u=[],i=Xo.transform(n),o=Xo.transform(t),a=i.translate,c=o.translate,s=i.rotate,l=o.rotate,f=i.skew,h=o.skew,g=i.scale,p=o.scale;return a[0]!=c[0]||a[1]!=c[1]?(r.push("translate(",null,",",null,")"),u.push({i:1,x:su(a[0],c[0])},{i:3,x:su(a[1],c[1])})):c[0]||c[1]?r.push("translate("+c+")"):r.push(""),s!=l?(s-l>180?l+=360:l-s>180&&(s+=360),u.push({i:r.push(r.pop()+"rotate(",null,")")-2,x:su(s,l)})):l&&r.push(r.pop()+"rotate("+l+")"),f!=h?u.push({i:r.push(r.pop()+"skewX(",null,")")-2,x:su(f,h)}):h&&r.push(r.pop()+"skewX("+h+")"),g[0]!=p[0]||g[1]!=p[1]?(e=r.push(r.pop()+"scale(",null,",",null,")"),u.push({i:e-4,x:su(g[0],p[0])},{i:e-2,x:su(g[1],p[1])})):(1!=p[0]||1!=p[1])&&r.push(r.pop()+"scale("+p+")"),e=u.length,function(n){for(var t,i=-1;++i<e;)r[(t=u[i]).i]=t.x(n);return r.join("")}}function Du(n,t){return t=t-(n=+n)?1/(t-n):0,function(e){return(e-n)*t}}function Pu(n,t){return t=t-(n=+n)?1/(t-n):0,function(e){return Math.max(0,Math.min(1,(e-n)*t))}}function Uu(n){for(var t=n.source,e=n.target,r=Hu(t,e),u=[t];t!==r;)t=t.parent,u.push(t);for(var i=u.length;e!==r;)u.splice(i,0,e),e=e.parent;return u}function ju(n){for(var t=[],e=n.parent;null!=e;)t.push(n),n=e,e=e.parent;return t.push(n),t}function Hu(n,t){if(n===t)return n;for(var e=ju(n),r=ju(t),u=e.pop(),i=r.pop(),o=null;u===i;)o=u,u=e.pop(),i=r.pop();return o}function Fu(n){n.fixed|=2}function Ou(n){n.fixed&=-7}function Yu(n){n.fixed|=4,n.px=n.x,n.py=n.y}function Iu(n){n.fixed&=-5}function Zu(n,t,e){var r=0,u=0;if(n.charge=0,!n.leaf)for(var i,o=n.nodes,a=o.length,c=-1;++c<a;)i=o[c],null!=i&&(Zu(i,t,e),n.charge+=i.charge,r+=i.charge*i.cx,u+=i.charge*i.cy);if(n.point){n.leaf||(n.point.x+=Math.random()-.5,n.point.y+=Math.random()-.5);var s=t*e[n.point.index];n.charge+=n.pointCharge=s,r+=s*n.point.x,u+=s*n.point.y}n.cx=r/n.charge,n.cy=u/n.charge}function Vu(n,t){return Xo.rebind(n,t,"sort","children","value"),n.nodes=n,n.links=Wu,n}function Xu(n){return n.children}function $u(n){return n.value}function Bu(n,t){return t.value-n.value}function Wu(n){return Xo.merge(n.map(function(n){return(n.children||[]).map(function(t){return{source:n,target:t}})}))}function Ju(n){return n.x}function Gu(n){return n.y}function Ku(n,t,e){n.y0=t,n.y=e}function Qu(n){return Xo.range(n.length)}function ni(n){for(var t=-1,e=n[0].length,r=[];++t<e;)r[t]=0;return r}function ti(n){for(var t,e=1,r=0,u=n[0][1],i=n.length;i>e;++e)(t=n[e][1])>u&&(r=e,u=t);return r}function ei(n){return n.reduce(ri,0)}function ri(n,t){return n+t[1]}function ui(n,t){return ii(n,Math.ceil(Math.log(t.length)/Math.LN2+1))}function ii(n,t){for(var e=-1,r=+n[0],u=(n[1]-r)/t,i=[];++e<=t;)i[e]=u*e+r;return i}function oi(n){return[Xo.min(n),Xo.max(n)]}function ai(n,t){return n.parent==t.parent?1:2}function ci(n){var t=n.children;return t&&t.length?t[0]:n._tree.thread}function si(n){var t,e=n.children;return e&&(t=e.length)?e[t-1]:n._tree.thread}function li(n,t){var e=n.children;if(e&&(u=e.length))for(var r,u,i=-1;++i<u;)t(r=li(e[i],t),n)>0&&(n=r);return n}function fi(n,t){return n.x-t.x}function hi(n,t){return t.x-n.x}function gi(n,t){return n.depth-t.depth}function pi(n,t){function e(n,r){var u=n.children;if(u&&(o=u.length))for(var i,o,a=null,c=-1;++c<o;)i=u[c],e(i,a),a=i;t(n,r)}e(n,null)}function vi(n){for(var t,e=0,r=0,u=n.children,i=u.length;--i>=0;)t=u[i]._tree,t.prelim+=e,t.mod+=e,e+=t.shift+(r+=t.change)}function di(n,t,e){n=n._tree,t=t._tree;var r=e/(t.number-n.number);n.change+=r,t.change-=r,t.shift+=e,t.prelim+=e,t.mod+=e}function mi(n,t,e){return n._tree.ancestor.parent==t.parent?n._tree.ancestor:e}function yi(n,t){return n.value-t.value}function xi(n,t){var e=n._pack_next;n._pack_next=t,t._pack_prev=n,t._pack_next=e,e._pack_prev=t}function Mi(n,t){n._pack_next=t,t._pack_prev=n}function _i(n,t){var e=t.x-n.x,r=t.y-n.y,u=n.r+t.r;return.999*u*u>e*e+r*r}function bi(n){function t(n){l=Math.min(n.x-n.r,l),f=Math.max(n.x+n.r,f),h=Math.min(n.y-n.r,h),g=Math.max(n.y+n.r,g)}if((e=n.children)&&(s=e.length)){var e,r,u,i,o,a,c,s,l=1/0,f=-1/0,h=1/0,g=-1/0;if(e.forEach(wi),r=e[0],r.x=-r.r,r.y=0,t(r),s>1&&(u=e[1],u.x=u.r,u.y=0,t(u),s>2))for(i=e[2],Ei(r,u,i),t(i),xi(r,i),r._pack_prev=i,xi(i,u),u=r._pack_next,o=3;s>o;o++){Ei(r,u,i=e[o]);var p=0,v=1,d=1;for(a=u._pack_next;a!==u;a=a._pack_next,v++)if(_i(a,i)){p=1;break}if(1==p)for(c=r._pack_prev;c!==a._pack_prev&&!_i(c,i);c=c._pack_prev,d++);p?(d>v||v==d&&u.r<r.r?Mi(r,u=a):Mi(r=c,u),o--):(xi(r,i),u=i,t(i))}var m=(l+f)/2,y=(h+g)/2,x=0;for(o=0;s>o;o++)i=e[o],i.x-=m,i.y-=y,x=Math.max(x,i.r+Math.sqrt(i.x*i.x+i.y*i.y));n.r=x,e.forEach(Si)}}function wi(n){n._pack_next=n._pack_prev=n}function Si(n){delete n._pack_next,delete n._pack_prev}function ki(n,t,e,r){var u=n.children;if(n.x=t+=r*n.x,n.y=e+=r*n.y,n.r*=r,u)for(var i=-1,o=u.length;++i<o;)ki(u[i],t,e,r)}function Ei(n,t,e){var r=n.r+e.r,u=t.x-n.x,i=t.y-n.y;if(r&&(u||i)){var o=t.r+e.r,a=u*u+i*i;o*=o,r*=r;var c=.5+(r-o)/(2*a),s=Math.sqrt(Math.max(0,2*o*(r+a)-(r-=a)*r-o*o))/(2*a);e.x=n.x+c*u+s*i,e.y=n.y+c*i-s*u}else e.x=n.x+r,e.y=n.y}function Ai(n){return 1+Xo.max(n,function(n){return n.y})}function Ci(n){return n.reduce(function(n,t){return n+t.x},0)/n.length}function Ni(n){var t=n.children;return t&&t.length?Ni(t[0]):n}function Li(n){var t,e=n.children;return e&&(t=e.length)?Li(e[t-1]):n}function Ti(n){return{x:n.x,y:n.y,dx:n.dx,dy:n.dy}}function qi(n,t){var e=n.x+t[3],r=n.y+t[0],u=n.dx-t[1]-t[3],i=n.dy-t[0]-t[2];return 0>u&&(e+=u/2,u=0),0>i&&(r+=i/2,i=0),{x:e,y:r,dx:u,dy:i}}function zi(n){var t=n[0],e=n[n.length-1];return e>t?[t,e]:[e,t]}function Ri(n){return n.rangeExtent?n.rangeExtent():zi(n.range())}function Di(n,t,e,r){var u=e(n[0],n[1]),i=r(t[0],t[1]);return function(n){return i(u(n))}}function Pi(n,t){var e,r=0,u=n.length-1,i=n[r],o=n[u];return i>o&&(e=r,r=u,u=e,e=i,i=o,o=e),n[r]=t.floor(i),n[u]=t.ceil(o),n}function Ui(n){return n?{floor:function(t){return Math.floor(t/n)*n},ceil:function(t){return Math.ceil(t/n)*n}}:ls}function ji(n,t,e,r){var u=[],i=[],o=0,a=Math.min(n.length,t.length)-1;for(n[a]<n[0]&&(n=n.slice().reverse(),t=t.slice().reverse());++o<=a;)u.push(e(n[o-1],n[o])),i.push(r(t[o-1],t[o]));return function(t){var e=Xo.bisect(n,t,1,a)-1;return i[e](u[e](t))}}function Hi(n,t,e,r){function u(){var u=Math.min(n.length,t.length)>2?ji:Di,c=r?Pu:Du;return o=u(n,t,c,e),a=u(t,n,c,fu),i}function i(n){return o(n)}var o,a;return i.invert=function(n){return a(n)},i.domain=function(t){return arguments.length?(n=t.map(Number),u()):n},i.range=function(n){return arguments.length?(t=n,u()):t},i.rangeRound=function(n){return i.range(n).interpolate(Nu)},i.clamp=function(n){return arguments.length?(r=n,u()):r},i.interpolate=function(n){return arguments.length?(e=n,u()):e},i.ticks=function(t){return Ii(n,t)},i.tickFormat=function(t,e){return Zi(n,t,e)},i.nice=function(t){return Oi(n,t),u()},i.copy=function(){return Hi(n,t,e,r)},u()}function Fi(n,t){return Xo.rebind(n,t,"range","rangeRound","interpolate","clamp")}function Oi(n,t){return Pi(n,Ui(Yi(n,t)[2]))}function Yi(n,t){null==t&&(t=10);var e=zi(n),r=e[1]-e[0],u=Math.pow(10,Math.floor(Math.log(r/t)/Math.LN10)),i=t/r*u;return.15>=i?u*=10:.35>=i?u*=5:.75>=i&&(u*=2),e[0]=Math.ceil(e[0]/u)*u,e[1]=Math.floor(e[1]/u)*u+.5*u,e[2]=u,e}function Ii(n,t){return Xo.range.apply(Xo,Yi(n,t))}function Zi(n,t,e){var r=Yi(n,t);return Xo.format(e?e.replace(Qa,function(n,t,e,u,i,o,a,c,s,l){return[t,e,u,i,o,a,c,s||"."+Xi(l,r),l].join("")}):",."+Vi(r[2])+"f")}function Vi(n){return-Math.floor(Math.log(n)/Math.LN10+.01)}function Xi(n,t){var e=Vi(t[2]);return n in fs?Math.abs(e-Vi(Math.max(Math.abs(t[0]),Math.abs(t[1]))))+ +("e"!==n):e-2*("%"===n)}function $i(n,t,e,r){function u(n){return(e?Math.log(0>n?0:n):-Math.log(n>0?0:-n))/Math.log(t)}function i(n){return e?Math.pow(t,n):-Math.pow(t,-n)}function o(t){return n(u(t))}return o.invert=function(t){return i(n.invert(t))},o.domain=function(t){return arguments.length?(e=t[0]>=0,n.domain((r=t.map(Number)).map(u)),o):r},o.base=function(e){return arguments.length?(t=+e,n.domain(r.map(u)),o):t},o.nice=function(){var t=Pi(r.map(u),e?Math:gs);return n.domain(t),r=t.map(i),o},o.ticks=function(){var n=zi(r),o=[],a=n[0],c=n[1],s=Math.floor(u(a)),l=Math.ceil(u(c)),f=t%1?2:t;if(isFinite(l-s)){if(e){for(;l>s;s++)for(var h=1;f>h;h++)o.push(i(s)*h);o.push(i(s))}else for(o.push(i(s));s++<l;)for(var h=f-1;h>0;h--)o.push(i(s)*h);for(s=0;o[s]<a;s++);for(l=o.length;o[l-1]>c;l--);o=o.slice(s,l)}return o},o.tickFormat=function(n,t){if(!arguments.length)return hs;arguments.length<2?t=hs:"function"!=typeof t&&(t=Xo.format(t));var r,a=Math.max(.1,n/o.ticks().length),c=e?(r=1e-12,Math.ceil):(r=-1e-12,Math.floor);return function(n){return n/i(c(u(n)+r))<=a?t(n):""}},o.copy=function(){return $i(n.copy(),t,e,r)},Fi(o,n)}function Bi(n,t,e){function r(t){return n(u(t))}var u=Wi(t),i=Wi(1/t);return r.invert=function(t){return i(n.invert(t))},r.domain=function(t){return arguments.length?(n.domain((e=t.map(Number)).map(u)),r):e},r.ticks=function(n){return Ii(e,n)},r.tickFormat=function(n,t){return Zi(e,n,t)},r.nice=function(n){return r.domain(Oi(e,n))},r.exponent=function(o){return arguments.length?(u=Wi(t=o),i=Wi(1/t),n.domain(e.map(u)),r):t},r.copy=function(){return Bi(n.copy(),t,e)},Fi(r,n)}function Wi(n){return function(t){return 0>t?-Math.pow(-t,n):Math.pow(t,n)}}function Ji(n,t){function e(e){return o[((i.get(e)||"range"===t.t&&i.set(e,n.push(e)))-1)%o.length]}function r(t,e){return Xo.range(n.length).map(function(n){return t+e*n})}var i,o,a;return e.domain=function(r){if(!arguments.length)return n;n=[],i=new u;for(var o,a=-1,c=r.length;++a<c;)i.has(o=r[a])||i.set(o,n.push(o));return e[t.t].apply(e,t.a)},e.range=function(n){return arguments.length?(o=n,a=0,t={t:"range",a:arguments},e):o},e.rangePoints=function(u,i){arguments.length<2&&(i=0);var c=u[0],s=u[1],l=(s-c)/(Math.max(1,n.length-1)+i);return o=r(n.length<2?(c+s)/2:c+l*i/2,l),a=0,t={t:"rangePoints",a:arguments},e},e.rangeBands=function(u,i,c){arguments.length<2&&(i=0),arguments.length<3&&(c=i);var s=u[1]<u[0],l=u[s-0],f=u[1-s],h=(f-l)/(n.length-i+2*c);return o=r(l+h*c,h),s&&o.reverse(),a=h*(1-i),t={t:"rangeBands",a:arguments},e},e.rangeRoundBands=function(u,i,c){arguments.length<2&&(i=0),arguments.length<3&&(c=i);var s=u[1]<u[0],l=u[s-0],f=u[1-s],h=Math.floor((f-l)/(n.length-i+2*c)),g=f-l-(n.length-i)*h;return o=r(l+Math.round(g/2),h),s&&o.reverse(),a=Math.round(h*(1-i)),t={t:"rangeRoundBands",a:arguments},e},e.rangeBand=function(){return a},e.rangeExtent=function(){return zi(t.a[0])},e.copy=function(){return Ji(n,t)},e.domain(n)}function Gi(n,t){function e(){var e=0,i=t.length;for(u=[];++e<i;)u[e-1]=Xo.quantile(n,e/i);return r}function r(n){return isNaN(n=+n)?void 0:t[Xo.bisect(u,n)]}var u;return r.domain=function(t){return arguments.length?(n=t.filter(function(n){return!isNaN(n)}).sort(Xo.ascending),e()):n},r.range=function(n){return arguments.length?(t=n,e()):t},r.quantiles=function(){return u},r.invertExtent=function(e){return e=t.indexOf(e),0>e?[0/0,0/0]:[e>0?u[e-1]:n[0],e<u.length?u[e]:n[n.length-1]]},r.copy=function(){return Gi(n,t)},e()}function Ki(n,t,e){function r(t){return e[Math.max(0,Math.min(o,Math.floor(i*(t-n))))]}function u(){return i=e.length/(t-n),o=e.length-1,r}var i,o;return r.domain=function(e){return arguments.length?(n=+e[0],t=+e[e.length-1],u()):[n,t]},r.range=function(n){return arguments.length?(e=n,u()):e},r.invertExtent=function(t){return t=e.indexOf(t),t=0>t?0/0:t/i+n,[t,t+1/i]},r.copy=function(){return Ki(n,t,e)},u()}function Qi(n,t){function e(e){return e>=e?t[Xo.bisect(n,e)]:void 0}return e.domain=function(t){return arguments.length?(n=t,e):n},e.range=function(n){return arguments.length?(t=n,e):t},e.invertExtent=function(e){return e=t.indexOf(e),[n[e-1],n[e]]},e.copy=function(){return Qi(n,t)},e}function no(n){function t(n){return+n}return t.invert=t,t.domain=t.range=function(e){return arguments.length?(n=e.map(t),t):n},t.ticks=function(t){return Ii(n,t)},t.tickFormat=function(t,e){return Zi(n,t,e)},t.copy=function(){return no(n)},t}function to(n){return n.innerRadius}function eo(n){return n.outerRadius}function ro(n){return n.startAngle}function uo(n){return n.endAngle}function io(n){function t(t){function o(){s.push("M",i(n(l),a))}for(var c,s=[],l=[],f=-1,h=t.length,g=_t(e),p=_t(r);++f<h;)u.call(this,c=t[f],f)?l.push([+g.call(this,c,f),+p.call(this,c,f)]):l.length&&(o(),l=[]);return l.length&&o(),s.length?s.join(""):null}var e=br,r=wr,u=be,i=oo,o=i.key,a=.7;return t.x=function(n){return arguments.length?(e=n,t):e},t.y=function(n){return arguments.length?(r=n,t):r},t.defined=function(n){return arguments.length?(u=n,t):u},t.interpolate=function(n){return arguments.length?(o="function"==typeof n?i=n:(i=Ms.get(n)||oo).key,t):o},t.tension=function(n){return arguments.length?(a=n,t):a},t}function oo(n){return n.join("L")}function ao(n){return oo(n)+"Z"}function co(n){for(var t=0,e=n.length,r=n[0],u=[r[0],",",r[1]];++t<e;)u.push("H",(r[0]+(r=n[t])[0])/2,"V",r[1]);return e>1&&u.push("H",r[0]),u.join("")}function so(n){for(var t=0,e=n.length,r=n[0],u=[r[0],",",r[1]];++t<e;)u.push("V",(r=n[t])[1],"H",r[0]);return u.join("")}function lo(n){for(var t=0,e=n.length,r=n[0],u=[r[0],",",r[1]];++t<e;)u.push("H",(r=n[t])[0],"V",r[1]);return u.join("")}function fo(n,t){return n.length<4?oo(n):n[1]+po(n.slice(1,n.length-1),vo(n,t))}function ho(n,t){return n.length<3?oo(n):n[0]+po((n.push(n[0]),n),vo([n[n.length-2]].concat(n,[n[1]]),t))}function go(n,t){return n.length<3?oo(n):n[0]+po(n,vo(n,t))}function po(n,t){if(t.length<1||n.length!=t.length&&n.length!=t.length+2)return oo(n);var e=n.length!=t.length,r="",u=n[0],i=n[1],o=t[0],a=o,c=1;if(e&&(r+="Q"+(i[0]-2*o[0]/3)+","+(i[1]-2*o[1]/3)+","+i[0]+","+i[1],u=n[1],c=2),t.length>1){a=t[1],i=n[c],c++,r+="C"+(u[0]+o[0])+","+(u[1]+o[1])+","+(i[0]-a[0])+","+(i[1]-a[1])+","+i[0]+","+i[1];for(var s=2;s<t.length;s++,c++)i=n[c],a=t[s],r+="S"+(i[0]-a[0])+","+(i[1]-a[1])+","+i[0]+","+i[1]}if(e){var l=n[c];r+="Q"+(i[0]+2*a[0]/3)+","+(i[1]+2*a[1]/3)+","+l[0]+","+l[1]}return r}function vo(n,t){for(var e,r=[],u=(1-t)/2,i=n[0],o=n[1],a=1,c=n.length;++a<c;)e=i,i=o,o=n[a],r.push([u*(o[0]-e[0]),u*(o[1]-e[1])]);return r}function mo(n){if(n.length<3)return oo(n);var t=1,e=n.length,r=n[0],u=r[0],i=r[1],o=[u,u,u,(r=n[1])[0]],a=[i,i,i,r[1]],c=[u,",",i,"L",_o(ws,o),",",_o(ws,a)];for(n.push(n[e-1]);++t<=e;)r=n[t],o.shift(),o.push(r[0]),a.shift(),a.push(r[1]),bo(c,o,a);return n.pop(),c.push("L",r),c.join("")}function yo(n){if(n.length<4)return oo(n);for(var t,e=[],r=-1,u=n.length,i=[0],o=[0];++r<3;)t=n[r],i.push(t[0]),o.push(t[1]);for(e.push(_o(ws,i)+","+_o(ws,o)),--r;++r<u;)t=n[r],i.shift(),i.push(t[0]),o.shift(),o.push(t[1]),bo(e,i,o);return e.join("")}function xo(n){for(var t,e,r=-1,u=n.length,i=u+4,o=[],a=[];++r<4;)e=n[r%u],o.push(e[0]),a.push(e[1]);for(t=[_o(ws,o),",",_o(ws,a)],--r;++r<i;)e=n[r%u],o.shift(),o.push(e[0]),a.shift(),a.push(e[1]),bo(t,o,a);return t.join("")}function Mo(n,t){var e=n.length-1;if(e)for(var r,u,i=n[0][0],o=n[0][1],a=n[e][0]-i,c=n[e][1]-o,s=-1;++s<=e;)r=n[s],u=s/e,r[0]=t*r[0]+(1-t)*(i+u*a),r[1]=t*r[1]+(1-t)*(o+u*c);return mo(n)}function _o(n,t){return n[0]*t[0]+n[1]*t[1]+n[2]*t[2]+n[3]*t[3]}function bo(n,t,e){n.push("C",_o(_s,t),",",_o(_s,e),",",_o(bs,t),",",_o(bs,e),",",_o(ws,t),",",_o(ws,e))}function wo(n,t){return(t[1]-n[1])/(t[0]-n[0])}function So(n){for(var t=0,e=n.length-1,r=[],u=n[0],i=n[1],o=r[0]=wo(u,i);++t<e;)r[t]=(o+(o=wo(u=i,i=n[t+1])))/2;return r[t]=o,r}function ko(n){for(var t,e,r,u,i=[],o=So(n),a=-1,c=n.length-1;++a<c;)t=wo(n[a],n[a+1]),oa(t)<Aa?o[a]=o[a+1]=0:(e=o[a]/t,r=o[a+1]/t,u=e*e+r*r,u>9&&(u=3*t/Math.sqrt(u),o[a]=u*e,o[a+1]=u*r));for(a=-1;++a<=c;)u=(n[Math.min(c,a+1)][0]-n[Math.max(0,a-1)][0])/(6*(1+o[a]*o[a])),i.push([u||0,o[a]*u||0]);return i}function Eo(n){return n.length<3?oo(n):n[0]+po(n,ko(n))}function Ao(n){for(var t,e,r,u=-1,i=n.length;++u<i;)t=n[u],e=t[0],r=t[1]+ys,t[0]=e*Math.cos(r),t[1]=e*Math.sin(r);return n}function Co(n){function t(t){function c(){v.push("M",a(n(m),f),l,s(n(d.reverse()),f),"Z")}for(var h,g,p,v=[],d=[],m=[],y=-1,x=t.length,M=_t(e),_=_t(u),b=e===r?function(){return g}:_t(r),w=u===i?function(){return p}:_t(i);++y<x;)o.call(this,h=t[y],y)?(d.push([g=+M.call(this,h,y),p=+_.call(this,h,y)]),m.push([+b.call(this,h,y),+w.call(this,h,y)])):d.length&&(c(),d=[],m=[]);return d.length&&c(),v.length?v.join(""):null}var e=br,r=br,u=0,i=wr,o=be,a=oo,c=a.key,s=a,l="L",f=.7;return t.x=function(n){return arguments.length?(e=r=n,t):r},t.x0=function(n){return arguments.length?(e=n,t):e},t.x1=function(n){return arguments.length?(r=n,t):r},t.y=function(n){return arguments.length?(u=i=n,t):i},t.y0=function(n){return arguments.length?(u=n,t):u},t.y1=function(n){return arguments.length?(i=n,t):i},t.defined=function(n){return arguments.length?(o=n,t):o},t.interpolate=function(n){return arguments.length?(c="function"==typeof n?a=n:(a=Ms.get(n)||oo).key,s=a.reverse||a,l=a.closed?"M":"L",t):c},t.tension=function(n){return arguments.length?(f=n,t):f},t}function No(n){return n.radius}function Lo(n){return[n.x,n.y]}function To(n){return function(){var t=n.apply(this,arguments),e=t[0],r=t[1]+ys;return[e*Math.cos(r),e*Math.sin(r)]}}function qo(){return 64}function zo(){return"circle"}function Ro(n){var t=Math.sqrt(n/Sa);return"M0,"+t+"A"+t+","+t+" 0 1,1 0,"+-t+"A"+t+","+t+" 0 1,1 0,"+t+"Z"}function Do(n,t){return fa(n,Ns),n.id=t,n}function Po(n,t,e,r){var u=n.id;return R(n,"function"==typeof e?function(n,i,o){n.__transition__[u].tween.set(t,r(e.call(n,n.__data__,i,o)))}:(e=r(e),function(n){n.__transition__[u].tween.set(t,e)}))}function Uo(n){return null==n&&(n=""),function(){this.textContent=n}}function jo(n,t,e,r){var i=n.__transition__||(n.__transition__={active:0,count:0}),o=i[e];if(!o){var a=r.time;o=i[e]={tween:new u,time:a,ease:r.ease,delay:r.delay,duration:r.duration},++i.count,Xo.timer(function(r){function u(r){return i.active>e?s():(i.active=e,o.event&&o.event.start.call(n,l,t),o.tween.forEach(function(e,r){(r=r.call(n,l,t))&&v.push(r)}),Xo.timer(function(){return p.c=c(r||1)?be:c,1},0,a),void 0)}function c(r){if(i.active!==e)return s();for(var u=r/g,a=f(u),c=v.length;c>0;)v[--c].call(n,a);return u>=1?(o.event&&o.event.end.call(n,l,t),s()):void 0}function s(){return--i.count?delete i[e]:delete n.__transition__,1}var l=n.__data__,f=o.ease,h=o.delay,g=o.duration,p=Ja,v=[];return p.t=h+a,r>=h?u(r-h):(p.c=u,void 0)},0,a)}}function Ho(n,t){n.attr("transform",function(n){return"translate("+t(n)+",0)"})}function Fo(n,t){n.attr("transform",function(n){return"translate(0,"+t(n)+")"})}function Oo(n){return n.toISOString()}function Yo(n,t,e){function r(t){return n(t)}function u(n,e){var r=n[1]-n[0],u=r/e,i=Xo.bisect(js,u);return i==js.length?[t.year,Yi(n.map(function(n){return n/31536e6}),e)[2]]:i?t[u/js[i-1]<js[i]/u?i-1:i]:[Os,Yi(n,e)[2]]}return r.invert=function(t){return Io(n.invert(t))},r.domain=function(t){return arguments.length?(n.domain(t),r):n.domain().map(Io)},r.nice=function(n,t){function e(e){return!isNaN(e)&&!n.range(e,Io(+e+1),t).length}var i=r.domain(),o=zi(i),a=null==n?u(o,10):"number"==typeof n&&u(o,n);return a&&(n=a[0],t=a[1]),r.domain(Pi(i,t>1?{floor:function(t){for(;e(t=n.floor(t));)t=Io(t-1);return t},ceil:function(t){for(;e(t=n.ceil(t));)t=Io(+t+1);return t}}:n))},r.ticks=function(n,t){var e=zi(r.domain()),i=null==n?u(e,10):"number"==typeof n?u(e,n):!n.range&&[{range:n},t];return i&&(n=i[0],t=i[1]),n.range(e[0],Io(+e[1]+1),1>t?1:t)},r.tickFormat=function(){return e},r.copy=function(){return Yo(n.copy(),t,e)},Fi(r,n)}function Io(n){return new Date(n)}function Zo(n){return JSON.parse(n.responseText)}function Vo(n){var t=Wo.createRange();return t.selectNode(Wo.body),t.createContextualFragment(n.responseText)}var Xo={version:"3.4.3"};Date.now||(Date.now=function(){return+new Date});var $o=[].slice,Bo=function(n){return $o.call(n)},Wo=document,Jo=Wo.documentElement,Go=window;try{Bo(Jo.childNodes)[0].nodeType}catch(Ko){Bo=function(n){for(var t=n.length,e=new Array(t);t--;)e[t]=n[t];return e}}try{Wo.createElement("div").style.setProperty("opacity",0,"")}catch(Qo){var na=Go.Element.prototype,ta=na.setAttribute,ea=na.setAttributeNS,ra=Go.CSSStyleDeclaration.prototype,ua=ra.setProperty;na.setAttribute=function(n,t){ta.call(this,n,t+"")},na.setAttributeNS=function(n,t,e){ea.call(this,n,t,e+"")},ra.setProperty=function(n,t,e){ua.call(this,n,t+"",e)}}Xo.ascending=function(n,t){return t>n?-1:n>t?1:n>=t?0:0/0},Xo.descending=function(n,t){return n>t?-1:t>n?1:t>=n?0:0/0},Xo.min=function(n,t){var e,r,u=-1,i=n.length;if(1===arguments.length){for(;++u<i&&!(null!=(e=n[u])&&e>=e);)e=void 0;for(;++u<i;)null!=(r=n[u])&&e>r&&(e=r)}else{for(;++u<i&&!(null!=(e=t.call(n,n[u],u))&&e>=e);)e=void 0;for(;++u<i;)null!=(r=t.call(n,n[u],u))&&e>r&&(e=r)}return e},Xo.max=function(n,t){var e,r,u=-1,i=n.length;if(1===arguments.length){for(;++u<i&&!(null!=(e=n[u])&&e>=e);)e=void 0;for(;++u<i;)null!=(r=n[u])&&r>e&&(e=r)}else{for(;++u<i&&!(null!=(e=t.call(n,n[u],u))&&e>=e);)e=void 0;for(;++u<i;)null!=(r=t.call(n,n[u],u))&&r>e&&(e=r)}return e},Xo.extent=function(n,t){var e,r,u,i=-1,o=n.length;if(1===arguments.length){for(;++i<o&&!(null!=(e=u=n[i])&&e>=e);)e=u=void 0;for(;++i<o;)null!=(r=n[i])&&(e>r&&(e=r),r>u&&(u=r))}else{for(;++i<o&&!(null!=(e=u=t.call(n,n[i],i))&&e>=e);)e=void 0;for(;++i<o;)null!=(r=t.call(n,n[i],i))&&(e>r&&(e=r),r>u&&(u=r))}return[e,u]},Xo.sum=function(n,t){var e,r=0,u=n.length,i=-1;if(1===arguments.length)for(;++i<u;)isNaN(e=+n[i])||(r+=e);else for(;++i<u;)isNaN(e=+t.call(n,n[i],i))||(r+=e);return r},Xo.mean=function(t,e){var r,u=t.length,i=0,o=-1,a=0;if(1===arguments.length)for(;++o<u;)n(r=t[o])&&(i+=(r-i)/++a);else for(;++o<u;)n(r=e.call(t,t[o],o))&&(i+=(r-i)/++a);return a?i:void 0},Xo.quantile=function(n,t){var e=(n.length-1)*t+1,r=Math.floor(e),u=+n[r-1],i=e-r;return i?u+i*(n[r]-u):u},Xo.median=function(t,e){return arguments.length>1&&(t=t.map(e)),t=t.filter(n),t.length?Xo.quantile(t.sort(Xo.ascending),.5):void 0},Xo.bisector=function(n){return{left:function(t,e,r,u){for(arguments.length<3&&(r=0),arguments.length<4&&(u=t.length);u>r;){var i=r+u>>>1;n.call(t,t[i],i)<e?r=i+1:u=i}return r},right:function(t,e,r,u){for(arguments.length<3&&(r=0),arguments.length<4&&(u=t.length);u>r;){var i=r+u>>>1;e<n.call(t,t[i],i)?u=i:r=i+1}return r}}};var ia=Xo.bisector(function(n){return n});Xo.bisectLeft=ia.left,Xo.bisect=Xo.bisectRight=ia.right,Xo.shuffle=function(n){for(var t,e,r=n.length;r;)e=0|Math.random()*r--,t=n[r],n[r]=n[e],n[e]=t;return n},Xo.permute=function(n,t){for(var e=t.length,r=new Array(e);e--;)r[e]=n[t[e]];return r},Xo.pairs=function(n){for(var t,e=0,r=n.length-1,u=n[0],i=new Array(0>r?0:r);r>e;)i[e]=[t=u,u=n[++e]];return i},Xo.zip=function(){if(!(u=arguments.length))return[];for(var n=-1,e=Xo.min(arguments,t),r=new Array(e);++n<e;)for(var u,i=-1,o=r[n]=new Array(u);++i<u;)o[i]=arguments[i][n];return r},Xo.transpose=function(n){return Xo.zip.apply(Xo,n)},Xo.keys=function(n){var t=[];for(var e in n)t.push(e);return t},Xo.values=function(n){var t=[];for(var e in n)t.push(n[e]);return t},Xo.entries=function(n){var t=[];for(var e in n)t.push({key:e,value:n[e]});return t},Xo.merge=function(n){for(var t,e,r,u=n.length,i=-1,o=0;++i<u;)o+=n[i].length;for(e=new Array(o);--u>=0;)for(r=n[u],t=r.length;--t>=0;)e[--o]=r[t];return e};var oa=Math.abs;Xo.range=function(n,t,r){if(arguments.length<3&&(r=1,arguments.length<2&&(t=n,n=0)),1/0===(t-n)/r)throw new Error("infinite range");var u,i=[],o=e(oa(r)),a=-1;if(n*=o,t*=o,r*=o,0>r)for(;(u=n+r*++a)>t;)i.push(u/o);else for(;(u=n+r*++a)<t;)i.push(u/o);return i},Xo.map=function(n){var t=new u;if(n instanceof u)n.forEach(function(n,e){t.set(n,e)});else for(var e in n)t.set(e,n[e]);return t},r(u,{has:i,get:function(n){return this[aa+n]},set:function(n,t){return this[aa+n]=t},remove:o,keys:a,values:function(){var n=[];return this.forEach(function(t,e){n.push(e)}),n},entries:function(){var n=[];return this.forEach(function(t,e){n.push({key:t,value:e})}),n},size:c,empty:s,forEach:function(n){for(var t in this)t.charCodeAt(0)===ca&&n.call(this,t.substring(1),this[t])}});var aa="\x00",ca=aa.charCodeAt(0);Xo.nest=function(){function n(t,a,c){if(c>=o.length)return r?r.call(i,a):e?a.sort(e):a;for(var s,l,f,h,g=-1,p=a.length,v=o[c++],d=new u;++g<p;)(h=d.get(s=v(l=a[g])))?h.push(l):d.set(s,[l]);return t?(l=t(),f=function(e,r){l.set(e,n(t,r,c))}):(l={},f=function(e,r){l[e]=n(t,r,c)}),d.forEach(f),l}function t(n,e){if(e>=o.length)return n;var r=[],u=a[e++];return n.forEach(function(n,u){r.push({key:n,values:t(u,e)})}),u?r.sort(function(n,t){return u(n.key,t.key)}):r}var e,r,i={},o=[],a=[];return i.map=function(t,e){return n(e,t,0)},i.entries=function(e){return t(n(Xo.map,e,0),0)},i.key=function(n){return o.push(n),i},i.sortKeys=function(n){return a[o.length-1]=n,i},i.sortValues=function(n){return e=n,i},i.rollup=function(n){return r=n,i},i},Xo.set=function(n){var t=new l;if(n)for(var e=0,r=n.length;r>e;++e)t.add(n[e]);return t},r(l,{has:i,add:function(n){return this[aa+n]=!0,n},remove:function(n){return n=aa+n,n in this&&delete this[n]},values:a,size:c,empty:s,forEach:function(n){for(var t in this)t.charCodeAt(0)===ca&&n.call(this,t.substring(1))}}),Xo.behavior={},Xo.rebind=function(n,t){for(var e,r=1,u=arguments.length;++r<u;)n[e=arguments[r]]=f(n,t,t[e]);return n};var sa=["webkit","ms","moz","Moz","o","O"];Xo.dispatch=function(){for(var n=new p,t=-1,e=arguments.length;++t<e;)n[arguments[t]]=v(n);return n},p.prototype.on=function(n,t){var e=n.indexOf("."),r="";if(e>=0&&(r=n.substring(e+1),n=n.substring(0,e)),n)return arguments.length<2?this[n].on(r):this[n].on(r,t);if(2===arguments.length){if(null==t)for(n in this)this.hasOwnProperty(n)&&this[n].on(r,null);return this}},Xo.event=null,Xo.requote=function(n){return n.replace(la,"\\$&")};var la=/[\\\^\$\*\+\?\|\[\]\(\)\.\{\}]/g,fa={}.__proto__?function(n,t){n.__proto__=t}:function(n,t){for(var e in t)n[e]=t[e]},ha=function(n,t){return t.querySelector(n)},ga=function(n,t){return t.querySelectorAll(n)},pa=Jo[h(Jo,"matchesSelector")],va=function(n,t){return pa.call(n,t)};"function"==typeof Sizzle&&(ha=function(n,t){return Sizzle(n,t)[0]||null},ga=Sizzle,va=Sizzle.matchesSelector),Xo.selection=function(){return xa};var da=Xo.selection.prototype=[];da.select=function(n){var t,e,r,u,i=[];n=M(n);for(var o=-1,a=this.length;++o<a;){i.push(t=[]),t.parentNode=(r=this[o]).parentNode;for(var c=-1,s=r.length;++c<s;)(u=r[c])?(t.push(e=n.call(u,u.__data__,c,o)),e&&"__data__"in u&&(e.__data__=u.__data__)):t.push(null)}return x(i)},da.selectAll=function(n){var t,e,r=[];n=_(n);for(var u=-1,i=this.length;++u<i;)for(var o=this[u],a=-1,c=o.length;++a<c;)(e=o[a])&&(r.push(t=Bo(n.call(e,e.__data__,a,u))),t.parentNode=e);return x(r)};var ma={svg:"http://www.w3.org/2000/svg",xhtml:"http://www.w3.org/1999/xhtml",xlink:"http://www.w3.org/1999/xlink",xml:"http://www.w3.org/XML/1998/namespace",xmlns:"http://www.w3.org/2000/xmlns/"};Xo.ns={prefix:ma,qualify:function(n){var t=n.indexOf(":"),e=n;return t>=0&&(e=n.substring(0,t),n=n.substring(t+1)),ma.hasOwnProperty(e)?{space:ma[e],local:n}:n}},da.attr=function(n,t){if(arguments.length<2){if("string"==typeof n){var e=this.node();return n=Xo.ns.qualify(n),n.local?e.getAttributeNS(n.space,n.local):e.getAttribute(n)}for(t in n)this.each(b(t,n[t]));return this}return this.each(b(n,t))},da.classed=function(n,t){if(arguments.length<2){if("string"==typeof n){var e=this.node(),r=(n=k(n)).length,u=-1;if(t=e.classList){for(;++u<r;)if(!t.contains(n[u]))return!1}else for(t=e.getAttribute("class");++u<r;)if(!S(n[u]).test(t))return!1;return!0}for(t in n)this.each(E(t,n[t]));return this}return this.each(E(n,t))},da.style=function(n,t,e){var r=arguments.length;if(3>r){if("string"!=typeof n){2>r&&(t="");for(e in n)this.each(C(e,n[e],t));return this}if(2>r)return Go.getComputedStyle(this.node(),null).getPropertyValue(n);e=""}return this.each(C(n,t,e))},da.property=function(n,t){if(arguments.length<2){if("string"==typeof n)return this.node()[n];for(t in n)this.each(N(t,n[t]));return this}return this.each(N(n,t))},da.text=function(n){return arguments.length?this.each("function"==typeof n?function(){var t=n.apply(this,arguments);this.textContent=null==t?"":t}:null==n?function(){this.textContent=""}:function(){this.textContent=n}):this.node().textContent},da.html=function(n){return arguments.length?this.each("function"==typeof n?function(){var t=n.apply(this,arguments);this.innerHTML=null==t?"":t}:null==n?function(){this.innerHTML=""}:function(){this.innerHTML=n}):this.node().innerHTML},da.append=function(n){return n=L(n),this.select(function(){return this.appendChild(n.apply(this,arguments))})},da.insert=function(n,t){return n=L(n),t=M(t),this.select(function(){return this.insertBefore(n.apply(this,arguments),t.apply(this,arguments)||null)})},da.remove=function(){return this.each(function(){var n=this.parentNode;n&&n.removeChild(this)})},da.data=function(n,t){function e(n,e){var r,i,o,a=n.length,f=e.length,h=Math.min(a,f),g=new Array(f),p=new Array(f),v=new Array(a);if(t){var d,m=new u,y=new u,x=[];for(r=-1;++r<a;)d=t.call(i=n[r],i.__data__,r),m.has(d)?v[r]=i:m.set(d,i),x.push(d);for(r=-1;++r<f;)d=t.call(e,o=e[r],r),(i=m.get(d))?(g[r]=i,i.__data__=o):y.has(d)||(p[r]=T(o)),y.set(d,o),m.remove(d);for(r=-1;++r<a;)m.has(x[r])&&(v[r]=n[r])}else{for(r=-1;++r<h;)i=n[r],o=e[r],i?(i.__data__=o,g[r]=i):p[r]=T(o);for(;f>r;++r)p[r]=T(e[r]);for(;a>r;++r)v[r]=n[r]}p.update=g,p.parentNode=g.parentNode=v.parentNode=n.parentNode,c.push(p),s.push(g),l.push(v)}var r,i,o=-1,a=this.length;if(!arguments.length){for(n=new Array(a=(r=this[0]).length);++o<a;)(i=r[o])&&(n[o]=i.__data__);return n}var c=D([]),s=x([]),l=x([]);if("function"==typeof n)for(;++o<a;)e(r=this[o],n.call(r,r.parentNode.__data__,o));else for(;++o<a;)e(r=this[o],n);return s.enter=function(){return c},s.exit=function(){return l},s},da.datum=function(n){return arguments.length?this.property("__data__",n):this.property("__data__")},da.filter=function(n){var t,e,r,u=[];"function"!=typeof n&&(n=q(n));for(var i=0,o=this.length;o>i;i++){u.push(t=[]),t.parentNode=(e=this[i]).parentNode;for(var a=0,c=e.length;c>a;a++)(r=e[a])&&n.call(r,r.__data__,a,i)&&t.push(r)}return x(u)},da.order=function(){for(var n=-1,t=this.length;++n<t;)for(var e,r=this[n],u=r.length-1,i=r[u];--u>=0;)(e=r[u])&&(i&&i!==e.nextSibling&&i.parentNode.insertBefore(e,i),i=e);return this},da.sort=function(n){n=z.apply(this,arguments);for(var t=-1,e=this.length;++t<e;)this[t].sort(n);return this.order()},da.each=function(n){return R(this,function(t,e,r){n.call(t,t.__data__,e,r)})},da.call=function(n){var t=Bo(arguments);return n.apply(t[0]=this,t),this},da.empty=function(){return!this.node()},da.node=function(){for(var n=0,t=this.length;t>n;n++)for(var e=this[n],r=0,u=e.length;u>r;r++){var i=e[r];if(i)return i}return null},da.size=function(){var n=0;return this.each(function(){++n}),n};var ya=[];Xo.selection.enter=D,Xo.selection.enter.prototype=ya,ya.append=da.append,ya.empty=da.empty,ya.node=da.node,ya.call=da.call,ya.size=da.size,ya.select=function(n){for(var t,e,r,u,i,o=[],a=-1,c=this.length;++a<c;){r=(u=this[a]).update,o.push(t=[]),t.parentNode=u.parentNode;for(var s=-1,l=u.length;++s<l;)(i=u[s])?(t.push(r[s]=e=n.call(u.parentNode,i.__data__,s,a)),e.__data__=i.__data__):t.push(null)}return x(o)},ya.insert=function(n,t){return arguments.length<2&&(t=P(this)),da.insert.call(this,n,t)},da.transition=function(){for(var n,t,e=ks||++Ls,r=[],u=Es||{time:Date.now(),ease:yu,delay:0,duration:250},i=-1,o=this.length;++i<o;){r.push(n=[]);for(var a=this[i],c=-1,s=a.length;++c<s;)(t=a[c])&&jo(t,c,e,u),n.push(t)}return Do(r,e)},da.interrupt=function(){return this.each(U)},Xo.select=function(n){var t=["string"==typeof n?ha(n,Wo):n];return t.parentNode=Jo,x([t])},Xo.selectAll=function(n){var t=Bo("string"==typeof n?ga(n,Wo):n);return t.parentNode=Jo,x([t])};var xa=Xo.select(Jo);da.on=function(n,t,e){var r=arguments.length;if(3>r){if("string"!=typeof n){2>r&&(t=!1);for(e in n)this.each(j(e,n[e],t));return this}if(2>r)return(r=this.node()["__on"+n])&&r._;e=!1}return this.each(j(n,t,e))};var Ma=Xo.map({mouseenter:"mouseover",mouseleave:"mouseout"});Ma.forEach(function(n){"on"+n in Wo&&Ma.remove(n)});var _a="onselectstart"in Wo?null:h(Jo.style,"userSelect"),ba=0;Xo.mouse=function(n){return Y(n,m())};var wa=/WebKit/.test(Go.navigator.userAgent)?-1:0;Xo.touches=function(n,t){return arguments.length<2&&(t=m().touches),t?Bo(t).map(function(t){var e=Y(n,t);return e.identifier=t.identifier,e}):[]},Xo.behavior.drag=function(){function n(){this.on("mousedown.drag",o).on("touchstart.drag",a)}function t(){return Xo.event.changedTouches[0].identifier}function e(n,t){return Xo.touches(n).filter(function(n){return n.identifier===t})[0]}function r(n,t,e,r){return function(){function o(){var n=t(l,g),e=n[0]-v[0],r=n[1]-v[1];d|=e|r,v=n,f({type:"drag",x:n[0]+c[0],y:n[1]+c[1],dx:e,dy:r})}function a(){m.on(e+"."+p,null).on(r+"."+p,null),y(d&&Xo.event.target===h),f({type:"dragend"})}var c,s=this,l=s.parentNode,f=u.of(s,arguments),h=Xo.event.target,g=n(),p=null==g?"drag":"drag-"+g,v=t(l,g),d=0,m=Xo.select(Go).on(e+"."+p,o).on(r+"."+p,a),y=O();i?(c=i.apply(s,arguments),c=[c.x-v[0],c.y-v[1]]):c=[0,0],f({type:"dragstart"})}}var u=y(n,"drag","dragstart","dragend"),i=null,o=r(g,Xo.mouse,"mousemove","mouseup"),a=r(t,e,"touchmove","touchend");return n.origin=function(t){return arguments.length?(i=t,n):i},Xo.rebind(n,u,"on")};var Sa=Math.PI,ka=2*Sa,Ea=Sa/2,Aa=1e-6,Ca=Aa*Aa,Na=Sa/180,La=180/Sa,Ta=Math.SQRT2,qa=2,za=4;Xo.interpolateZoom=function(n,t){function e(n){var t=n*y;if(m){var e=B(v),o=i/(qa*h)*(e*W(Ta*t+v)-$(v));return[r+o*s,u+o*l,i*e/B(Ta*t+v)]}return[r+n*s,u+n*l,i*Math.exp(Ta*t)]}var r=n[0],u=n[1],i=n[2],o=t[0],a=t[1],c=t[2],s=o-r,l=a-u,f=s*s+l*l,h=Math.sqrt(f),g=(c*c-i*i+za*f)/(2*i*qa*h),p=(c*c-i*i-za*f)/(2*c*qa*h),v=Math.log(Math.sqrt(g*g+1)-g),d=Math.log(Math.sqrt(p*p+1)-p),m=d-v,y=(m||Math.log(c/i))/Ta;return e.duration=1e3*y,e},Xo.behavior.zoom=function(){function n(n){n.on(A,s).on(Pa+".zoom",f).on(C,h).on("dblclick.zoom",g).on(L,l)}function t(n){return[(n[0]-S.x)/S.k,(n[1]-S.y)/S.k]}function e(n){return[n[0]*S.k+S.x,n[1]*S.k+S.y]}function r(n){S.k=Math.max(E[0],Math.min(E[1],n))}function u(n,t){t=e(t),S.x+=n[0]-t[0],S.y+=n[1]-t[1]}function i(){_&&_.domain(M.range().map(function(n){return(n-S.x)/S.k}).map(M.invert)),w&&w.domain(b.range().map(function(n){return(n-S.y)/S.k}).map(b.invert))}function o(n){n({type:"zoomstart"})}function a(n){i(),n({type:"zoom",scale:S.k,translate:[S.x,S.y]})}function c(n){n({type:"zoomend"})}function s(){function n(){l=1,u(Xo.mouse(r),g),a(i)}function e(){f.on(C,Go===r?h:null).on(N,null),p(l&&Xo.event.target===s),c(i)}var r=this,i=T.of(r,arguments),s=Xo.event.target,l=0,f=Xo.select(Go).on(C,n).on(N,e),g=t(Xo.mouse(r)),p=O();U.call(r),o(i)}function l(){function n(){var n=Xo.touches(g);return h=S.k,n.forEach(function(n){n.identifier in v&&(v[n.identifier]=t(n))}),n}function e(){for(var t=Xo.event.changedTouches,e=0,i=t.length;i>e;++e)v[t[e].identifier]=null;var o=n(),c=Date.now();if(1===o.length){if(500>c-x){var s=o[0],l=v[s.identifier];r(2*S.k),u(s,l),d(),a(p)}x=c}else if(o.length>1){var s=o[0],f=o[1],h=s[0]-f[0],g=s[1]-f[1];m=h*h+g*g}}function i(){for(var n,t,e,i,o=Xo.touches(g),c=0,s=o.length;s>c;++c,i=null)if(e=o[c],i=v[e.identifier]){if(t)break;n=e,t=i}if(i){var l=(l=e[0]-n[0])*l+(l=e[1]-n[1])*l,f=m&&Math.sqrt(l/m);n=[(n[0]+e[0])/2,(n[1]+e[1])/2],t=[(t[0]+i[0])/2,(t[1]+i[1])/2],r(f*h)}x=null,u(n,t),a(p)}function f(){if(Xo.event.touches.length){for(var t=Xo.event.changedTouches,e=0,r=t.length;r>e;++e)delete v[t[e].identifier];for(var u in v)return void n()}b.on(M,null).on(_,null),w.on(A,s).on(L,l),k(),c(p)}var h,g=this,p=T.of(g,arguments),v={},m=0,y=Xo.event.changedTouches[0].identifier,M="touchmove.zoom-"+y,_="touchend.zoom-"+y,b=Xo.select(Go).on(M,i).on(_,f),w=Xo.select(g).on(A,null).on(L,e),k=O();U.call(g),e(),o(p)}function f(){var n=T.of(this,arguments);m?clearTimeout(m):(U.call(this),o(n)),m=setTimeout(function(){m=null,c(n)},50),d();var e=v||Xo.mouse(this);p||(p=t(e)),r(Math.pow(2,.002*Ra())*S.k),u(e,p),a(n)}function h(){p=null}function g(){var n=T.of(this,arguments),e=Xo.mouse(this),i=t(e),s=Math.log(S.k)/Math.LN2;o(n),r(Math.pow(2,Xo.event.shiftKey?Math.ceil(s)-1:Math.floor(s)+1)),u(e,i),a(n),c(n)}var p,v,m,x,M,_,b,w,S={x:0,y:0,k:1},k=[960,500],E=Da,A="mousedown.zoom",C="mousemove.zoom",N="mouseup.zoom",L="touchstart.zoom",T=y(n,"zoomstart","zoom","zoomend");return n.event=function(n){n.each(function(){var n=T.of(this,arguments),t=S;ks?Xo.select(this).transition().each("start.zoom",function(){S=this.__chart__||{x:0,y:0,k:1},o(n)}).tween("zoom:zoom",function(){var e=k[0],r=k[1],u=e/2,i=r/2,o=Xo.interpolateZoom([(u-S.x)/S.k,(i-S.y)/S.k,e/S.k],[(u-t.x)/t.k,(i-t.y)/t.k,e/t.k]);return function(t){var r=o(t),c=e/r[2];this.__chart__=S={x:u-r[0]*c,y:i-r[1]*c,k:c},a(n)}}).each("end.zoom",function(){c(n)}):(this.__chart__=S,o(n),a(n),c(n))})},n.translate=function(t){return arguments.length?(S={x:+t[0],y:+t[1],k:S.k},i(),n):[S.x,S.y]},n.scale=function(t){return arguments.length?(S={x:S.x,y:S.y,k:+t},i(),n):S.k},n.scaleExtent=function(t){return arguments.length?(E=null==t?Da:[+t[0],+t[1]],n):E},n.center=function(t){return arguments.length?(v=t&&[+t[0],+t[1]],n):v},n.size=function(t){return arguments.length?(k=t&&[+t[0],+t[1]],n):k},n.x=function(t){return arguments.length?(_=t,M=t.copy(),S={x:0,y:0,k:1},n):_},n.y=function(t){return arguments.length?(w=t,b=t.copy(),S={x:0,y:0,k:1},n):w},Xo.rebind(n,T,"on")};var Ra,Da=[0,1/0],Pa="onwheel"in Wo?(Ra=function(){return-Xo.event.deltaY*(Xo.event.deltaMode?120:1)},"wheel"):"onmousewheel"in Wo?(Ra=function(){return Xo.event.wheelDelta},"mousewheel"):(Ra=function(){return-Xo.event.detail},"MozMousePixelScroll");G.prototype.toString=function(){return this.rgb()+""},Xo.hsl=function(n,t,e){return 1===arguments.length?n instanceof Q?K(n.h,n.s,n.l):dt(""+n,mt,K):K(+n,+t,+e)};var Ua=Q.prototype=new G;Ua.brighter=function(n){return n=Math.pow(.7,arguments.length?n:1),K(this.h,this.s,this.l/n)},Ua.darker=function(n){return n=Math.pow(.7,arguments.length?n:1),K(this.h,this.s,n*this.l)},Ua.rgb=function(){return nt(this.h,this.s,this.l)},Xo.hcl=function(n,t,e){return 1===arguments.length?n instanceof et?tt(n.h,n.c,n.l):n instanceof it?at(n.l,n.a,n.b):at((n=yt((n=Xo.rgb(n)).r,n.g,n.b)).l,n.a,n.b):tt(+n,+t,+e)};var ja=et.prototype=new G;ja.brighter=function(n){return tt(this.h,this.c,Math.min(100,this.l+Ha*(arguments.length?n:1)))},ja.darker=function(n){return tt(this.h,this.c,Math.max(0,this.l-Ha*(arguments.length?n:1)))},ja.rgb=function(){return rt(this.h,this.c,this.l).rgb()},Xo.lab=function(n,t,e){return 1===arguments.length?n instanceof it?ut(n.l,n.a,n.b):n instanceof et?rt(n.l,n.c,n.h):yt((n=Xo.rgb(n)).r,n.g,n.b):ut(+n,+t,+e)};var Ha=18,Fa=.95047,Oa=1,Ya=1.08883,Ia=it.prototype=new G;Ia.brighter=function(n){return ut(Math.min(100,this.l+Ha*(arguments.length?n:1)),this.a,this.b)},Ia.darker=function(n){return ut(Math.max(0,this.l-Ha*(arguments.length?n:1)),this.a,this.b)},Ia.rgb=function(){return ot(this.l,this.a,this.b)},Xo.rgb=function(n,t,e){return 1===arguments.length?n instanceof pt?gt(n.r,n.g,n.b):dt(""+n,gt,nt):gt(~~n,~~t,~~e)};var Za=pt.prototype=new G;Za.brighter=function(n){n=Math.pow(.7,arguments.length?n:1);var t=this.r,e=this.g,r=this.b,u=30;return t||e||r?(t&&u>t&&(t=u),e&&u>e&&(e=u),r&&u>r&&(r=u),gt(Math.min(255,~~(t/n)),Math.min(255,~~(e/n)),Math.min(255,~~(r/n)))):gt(u,u,u)},Za.darker=function(n){return n=Math.pow(.7,arguments.length?n:1),gt(~~(n*this.r),~~(n*this.g),~~(n*this.b))},Za.hsl=function(){return mt(this.r,this.g,this.b)},Za.toString=function(){return"#"+vt(this.r)+vt(this.g)+vt(this.b)};var Va=Xo.map({aliceblue:15792383,antiquewhite:16444375,aqua:65535,aquamarine:8388564,azure:15794175,beige:16119260,bisque:16770244,black:0,blanchedalmond:16772045,blue:255,blueviolet:9055202,brown:10824234,burlywood:14596231,cadetblue:6266528,chartreuse:8388352,chocolate:13789470,coral:16744272,cornflowerblue:6591981,cornsilk:16775388,crimson:14423100,cyan:65535,darkblue:139,darkcyan:35723,darkgoldenrod:12092939,darkgray:11119017,darkgreen:25600,darkgrey:11119017,darkkhaki:12433259,darkmagenta:9109643,darkolivegreen:5597999,darkorange:16747520,darkorchid:10040012,darkred:9109504,darksalmon:15308410,darkseagreen:9419919,darkslateblue:4734347,darkslategray:3100495,darkslategrey:3100495,darkturquoise:52945,darkviolet:9699539,deeppink:16716947,deepskyblue:49151,dimgray:6908265,dimgrey:6908265,dodgerblue:2003199,firebrick:11674146,floralwhite:16775920,forestgreen:2263842,fuchsia:16711935,gainsboro:14474460,ghostwhite:16316671,gold:16766720,goldenrod:14329120,gray:8421504,green:32768,greenyellow:11403055,grey:8421504,honeydew:15794160,hotpink:16738740,indianred:13458524,indigo:4915330,ivory:16777200,khaki:15787660,lavender:15132410,lavenderblush:16773365,lawngreen:8190976,lemonchiffon:16775885,lightblue:11393254,lightcoral:15761536,lightcyan:14745599,lightgoldenrodyellow:16448210,lightgray:13882323,lightgreen:9498256,lightgrey:13882323,lightpink:16758465,lightsalmon:16752762,lightseagreen:2142890,lightskyblue:8900346,lightslategray:7833753,lightslategrey:7833753,lightsteelblue:11584734,lightyellow:16777184,lime:65280,limegreen:3329330,linen:16445670,magenta:16711935,maroon:8388608,mediumaquamarine:6737322,mediumblue:205,mediumorchid:12211667,mediumpurple:9662683,mediumseagreen:3978097,mediumslateblue:8087790,mediumspringgreen:64154,mediumturquoise:4772300,mediumvioletred:13047173,midnightblue:1644912,mintcream:16121850,mistyrose:16770273,moccasin:16770229,navajowhite:16768685,navy:128,oldlace:16643558,olive:8421376,olivedrab:7048739,orange:16753920,orangered:16729344,orchid:14315734,palegoldenrod:15657130,palegreen:10025880,paleturquoise:11529966,palevioletred:14381203,papayawhip:16773077,peachpuff:16767673,peru:13468991,pink:16761035,plum:14524637,powderblue:11591910,purple:8388736,red:16711680,rosybrown:12357519,royalblue:4286945,saddlebrown:9127187,salmon:16416882,sandybrown:16032864,seagreen:3050327,seashell:16774638,sienna:10506797,silver:12632256,skyblue:8900331,slateblue:6970061,slategray:7372944,slategrey:7372944,snow:16775930,springgreen:65407,steelblue:4620980,tan:13808780,teal:32896,thistle:14204888,tomato:16737095,turquoise:4251856,violet:15631086,wheat:16113331,white:16777215,whitesmoke:16119285,yellow:16776960,yellowgreen:10145074});Va.forEach(function(n,t){Va.set(n,ft(t))}),Xo.functor=_t,Xo.xhr=wt(bt),Xo.dsv=function(n,t){function e(n,e,i){arguments.length<3&&(i=e,e=null);var o=St(n,t,null==e?r:u(e),i);return o.row=function(n){return arguments.length?o.response(null==(e=n)?r:u(n)):e},o}function r(n){return e.parse(n.responseText)}function u(n){return function(t){return e.parse(t.responseText,n)}}function i(t){return t.map(o).join(n)}function o(n){return a.test(n)?'"'+n.replace(/\"/g,'""')+'"':n}var a=new RegExp('["'+n+"\n]"),c=n.charCodeAt(0);return e.parse=function(n,t){var r;return e.parseRows(n,function(n,e){if(r)return r(n,e-1);var u=new Function("d","return {"+n.map(function(n,t){return JSON.stringify(n)+": d["+t+"]"}).join(",")+"}");r=t?function(n,e){return t(u(n),e)}:u})},e.parseRows=function(n,t){function e(){if(l>=s)return o;if(u)return u=!1,i;var t=l;if(34===n.charCodeAt(t)){for(var e=t;e++<s;)if(34===n.charCodeAt(e)){if(34!==n.charCodeAt(e+1))break;++e}l=e+2;var r=n.charCodeAt(e+1);return 13===r?(u=!0,10===n.charCodeAt(e+2)&&++l):10===r&&(u=!0),n.substring(t+1,e).replace(/""/g,'"')}for(;s>l;){var r=n.charCodeAt(l++),a=1;if(10===r)u=!0;else if(13===r)u=!0,10===n.charCodeAt(l)&&(++l,++a);else if(r!==c)continue;return n.substring(t,l-a)}return n.substring(t)}for(var r,u,i={},o={},a=[],s=n.length,l=0,f=0;(r=e())!==o;){for(var h=[];r!==i&&r!==o;)h.push(r),r=e();(!t||(h=t(h,f++)))&&a.push(h)}return a},e.format=function(t){if(Array.isArray(t[0]))return e.formatRows(t);var r=new l,u=[];return t.forEach(function(n){for(var t in n)r.has(t)||u.push(r.add(t))}),[u.map(o).join(n)].concat(t.map(function(t){return u.map(function(n){return o(t[n])}).join(n)})).join("\n")},e.formatRows=function(n){return n.map(i).join("\n")},e},Xo.csv=Xo.dsv(",","text/csv"),Xo.tsv=Xo.dsv(" ","text/tab-separated-values");var Xa,$a,Ba,Wa,Ja,Ga=Go[h(Go,"requestAnimationFrame")]||function(n){setTimeout(n,17)};Xo.timer=function(n,t,e){var r=arguments.length;2>r&&(t=0),3>r&&(e=Date.now());var u=e+t,i={c:n,t:u,f:!1,n:null};$a?$a.n=i:Xa=i,$a=i,Ba||(Wa=clearTimeout(Wa),Ba=1,Ga(Et))},Xo.timer.flush=function(){At(),Ct()},Xo.round=function(n,t){return t?Math.round(n*(t=Math.pow(10,t)))/t:Math.round(n)};var Ka=["y","z","a","f","p","n","\xb5","m","","k","M","G","T","P","E","Z","Y"].map(Lt);Xo.formatPrefix=function(n,t){var e=0;return n&&(0>n&&(n*=-1),t&&(n=Xo.round(n,Nt(n,t))),e=1+Math.floor(1e-12+Math.log(n)/Math.LN10),e=Math.max(-24,Math.min(24,3*Math.floor((0>=e?e+1:e-1)/3)))),Ka[8+e/3]};var Qa=/(?:([^{])?([<>=^]))?([+\- ])?([$#])?(0)?(\d+)?(,)?(\.-?\d+)?([a-z%])?/i,nc=Xo.map({b:function(n){return n.toString(2)},c:function(n){return String.fromCharCode(n)},o:function(n){return n.toString(8)},x:function(n){return n.toString(16)},X:function(n){return n.toString(16).toUpperCase()},g:function(n,t){return n.toPrecision(t)},e:function(n,t){return n.toExponential(t)},f:function(n,t){return n.toFixed(t)},r:function(n,t){return(n=Xo.round(n,Nt(n,t))).toFixed(Math.max(0,Math.min(20,Nt(n*(1+1e-15),t))))}}),tc=Xo.time={},ec=Date;zt.prototype={getDate:function(){return this._.getUTCDate()},getDay:function(){return this._.getUTCDay()},getFullYear:function(){return this._.getUTCFullYear()},getHours:function(){return this._.getUTCHours()},getMilliseconds:function(){return this._.getUTCMilliseconds()},getMinutes:function(){return this._.getUTCMinutes()},getMonth:function(){return this._.getUTCMonth()},getSeconds:function(){return this._.getUTCSeconds()},getTime:function(){return this._.getTime()},getTimezoneOffset:function(){return 0},valueOf:function(){return this._.valueOf()},setDate:function(){rc.setUTCDate.apply(this._,arguments)},setDay:function(){rc.setUTCDay.apply(this._,arguments)},setFullYear:function(){rc.setUTCFullYear.apply(this._,arguments)},setHours:function(){rc.setUTCHours.apply(this._,arguments)},setMilliseconds:function(){rc.setUTCMilliseconds.apply(this._,arguments)},setMinutes:function(){rc.setUTCMinutes.apply(this._,arguments)},setMonth:function(){rc.setUTCMonth.apply(this._,arguments)},setSeconds:function(){rc.setUTCSeconds.apply(this._,arguments)},setTime:function(){rc.setTime.apply(this._,arguments)}};var rc=Date.prototype;tc.year=Rt(function(n){return n=tc.day(n),n.setMonth(0,1),n},function(n,t){n.setFullYear(n.getFullYear()+t)},function(n){return n.getFullYear()}),tc.years=tc.year.range,tc.years.utc=tc.year.utc.range,tc.day=Rt(function(n){var t=new ec(2e3,0);return t.setFullYear(n.getFullYear(),n.getMonth(),n.getDate()),t},function(n,t){n.setDate(n.getDate()+t)},function(n){return n.getDate()-1}),tc.days=tc.day.range,tc.days.utc=tc.day.utc.range,tc.dayOfYear=function(n){var t=tc.year(n);return Math.floor((n-t-6e4*(n.getTimezoneOffset()-t.getTimezoneOffset()))/864e5)},["sunday","monday","tuesday","wednesday","thursday","friday","saturday"].forEach(function(n,t){t=7-t;var e=tc[n]=Rt(function(n){return(n=tc.day(n)).setDate(n.getDate()-(n.getDay()+t)%7),n},function(n,t){n.setDate(n.getDate()+7*Math.floor(t))},function(n){var e=tc.year(n).getDay();return Math.floor((tc.dayOfYear(n)+(e+t)%7)/7)-(e!==t)});tc[n+"s"]=e.range,tc[n+"s"].utc=e.utc.range,tc[n+"OfYear"]=function(n){var e=tc.year(n).getDay();return Math.floor((tc.dayOfYear(n)+(e+t)%7)/7)}}),tc.week=tc.sunday,tc.weeks=tc.sunday.range,tc.weeks.utc=tc.sunday.utc.range,tc.weekOfYear=tc.sundayOfYear;var uc={"-":"",_:" ",0:"0"},ic=/^\s*\d+/,oc=/^%/;Xo.locale=function(n){return{numberFormat:Tt(n),timeFormat:Pt(n)}};var ac=Xo.locale({decimal:".",thousands:",",grouping:[3],currency:["$",""],dateTime:"%a %b %e %X %Y",date:"%m/%d/%Y",time:"%H:%M:%S",periods:["AM","PM"],days:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],shortDays:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],months:["January","February","March","April","May","June","July","August","September","October","November","December"],shortMonths:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"]});Xo.format=ac.numberFormat,Xo.geo={},re.prototype={s:0,t:0,add:function(n){ue(n,this.t,cc),ue(cc.s,this.s,this),this.s?this.t+=cc.t:this.s=cc.t},reset:function(){this.s=this.t=0},valueOf:function(){return this.s}};var cc=new re;Xo.geo.stream=function(n,t){n&&sc.hasOwnProperty(n.type)?sc[n.type](n,t):ie(n,t)};var sc={Feature:function(n,t){ie(n.geometry,t)},FeatureCollection:function(n,t){for(var e=n.features,r=-1,u=e.length;++r<u;)ie(e[r].geometry,t)}},lc={Sphere:function(n,t){t.sphere()},Point:function(n,t){n=n.coordinates,t.point(n[0],n[1],n[2])},MultiPoint:function(n,t){for(var e=n.coordinates,r=-1,u=e.length;++r<u;)n=e[r],t.point(n[0],n[1],n[2])},LineString:function(n,t){oe(n.coordinates,t,0)},MultiLineString:function(n,t){for(var e=n.coordinates,r=-1,u=e.length;++r<u;)oe(e[r],t,0)},Polygon:function(n,t){ae(n.coordinates,t)},MultiPolygon:function(n,t){for(var e=n.coordinates,r=-1,u=e.length;++r<u;)ae(e[r],t)},GeometryCollection:function(n,t){for(var e=n.geometries,r=-1,u=e.length;++r<u;)ie(e[r],t)}};Xo.geo.area=function(n){return fc=0,Xo.geo.stream(n,gc),fc};var fc,hc=new re,gc={sphere:function(){fc+=4*Sa},point:g,lineStart:g,lineEnd:g,polygonStart:function(){hc.reset(),gc.lineStart=ce},polygonEnd:function(){var n=2*hc;fc+=0>n?4*Sa+n:n,gc.lineStart=gc.lineEnd=gc.point=g}};Xo.geo.bounds=function(){function n(n,t){x.push(M=[l=n,h=n]),f>t&&(f=t),t>g&&(g=t)}function t(t,e){var r=se([t*Na,e*Na]);if(m){var u=fe(m,r),i=[u[1],-u[0],0],o=fe(i,u);pe(o),o=ve(o);var c=t-p,s=c>0?1:-1,v=o[0]*La*s,d=oa(c)>180;if(d^(v>s*p&&s*t>v)){var y=o[1]*La;y>g&&(g=y)}else if(v=(v+360)%360-180,d^(v>s*p&&s*t>v)){var y=-o[1]*La;f>y&&(f=y)}else f>e&&(f=e),e>g&&(g=e);d?p>t?a(l,t)>a(l,h)&&(h=t):a(t,h)>a(l,h)&&(l=t):h>=l?(l>t&&(l=t),t>h&&(h=t)):t>p?a(l,t)>a(l,h)&&(h=t):a(t,h)>a(l,h)&&(l=t)}else n(t,e);m=r,p=t}function e(){_.point=t}function r(){M[0]=l,M[1]=h,_.point=n,m=null}function u(n,e){if(m){var r=n-p;y+=oa(r)>180?r+(r>0?360:-360):r}else v=n,d=e;gc.point(n,e),t(n,e)}function i(){gc.lineStart()}function o(){u(v,d),gc.lineEnd(),oa(y)>Aa&&(l=-(h=180)),M[0]=l,M[1]=h,m=null}function a(n,t){return(t-=n)<0?t+360:t}function c(n,t){return n[0]-t[0]}function s(n,t){return t[0]<=t[1]?t[0]<=n&&n<=t[1]:n<t[0]||t[1]<n}var l,f,h,g,p,v,d,m,y,x,M,_={point:n,lineStart:e,lineEnd:r,polygonStart:function(){_.point=u,_.lineStart=i,_.lineEnd=o,y=0,gc.polygonStart()},polygonEnd:function(){gc.polygonEnd(),_.point=n,_.lineStart=e,_.lineEnd=r,0>hc?(l=-(h=180),f=-(g=90)):y>Aa?g=90:-Aa>y&&(f=-90),M[0]=l,M[1]=h}};return function(n){g=h=-(l=f=1/0),x=[],Xo.geo.stream(n,_);var t=x.length;if(t){x.sort(c);for(var e,r=1,u=x[0],i=[u];t>r;++r)e=x[r],s(e[0],u)||s(e[1],u)?(a(u[0],e[1])>a(u[0],u[1])&&(u[1]=e[1]),a(e[0],u[1])>a(u[0],u[1])&&(u[0]=e[0])):i.push(u=e);for(var o,e,p=-1/0,t=i.length-1,r=0,u=i[t];t>=r;u=e,++r)e=i[r],(o=a(u[1],e[0]))>p&&(p=o,l=e[0],h=u[1])}return x=M=null,1/0===l||1/0===f?[[0/0,0/0],[0/0,0/0]]:[[l,f],[h,g]]}}(),Xo.geo.centroid=function(n){pc=vc=dc=mc=yc=xc=Mc=_c=bc=wc=Sc=0,Xo.geo.stream(n,kc);var t=bc,e=wc,r=Sc,u=t*t+e*e+r*r;return Ca>u&&(t=xc,e=Mc,r=_c,Aa>vc&&(t=dc,e=mc,r=yc),u=t*t+e*e+r*r,Ca>u)?[0/0,0/0]:[Math.atan2(e,t)*La,X(r/Math.sqrt(u))*La]};var pc,vc,dc,mc,yc,xc,Mc,_c,bc,wc,Sc,kc={sphere:g,point:me,lineStart:xe,lineEnd:Me,polygonStart:function(){kc.lineStart=_e},polygonEnd:function(){kc.lineStart=xe}},Ec=Ee(be,Te,ze,[-Sa,-Sa/2]),Ac=1e9;Xo.geo.clipExtent=function(){var n,t,e,r,u,i,o={stream:function(n){return u&&(u.valid=!1),u=i(n),u.valid=!0,u},extent:function(a){return arguments.length?(i=Pe(n=+a[0][0],t=+a[0][1],e=+a[1][0],r=+a[1][1]),u&&(u.valid=!1,u=null),o):[[n,t],[e,r]]}};return o.extent([[0,0],[960,500]])},(Xo.geo.conicEqualArea=function(){return je(He)}).raw=He,Xo.geo.albers=function(){return Xo.geo.conicEqualArea().rotate([96,0]).center([-.6,38.7]).parallels([29.5,45.5]).scale(1070)},Xo.geo.albersUsa=function(){function n(n){var i=n[0],o=n[1];return t=null,e(i,o),t||(r(i,o),t)||u(i,o),t}var t,e,r,u,i=Xo.geo.albers(),o=Xo.geo.conicEqualArea().rotate([154,0]).center([-2,58.5]).parallels([55,65]),a=Xo.geo.conicEqualArea().rotate([157,0]).center([-3,19.9]).parallels([8,18]),c={point:function(n,e){t=[n,e]}};return n.invert=function(n){var t=i.scale(),e=i.translate(),r=(n[0]-e[0])/t,u=(n[1]-e[1])/t;return(u>=.12&&.234>u&&r>=-.425&&-.214>r?o:u>=.166&&.234>u&&r>=-.214&&-.115>r?a:i).invert(n)},n.stream=function(n){var t=i.stream(n),e=o.stream(n),r=a.stream(n);return{point:function(n,u){t.point(n,u),e.point(n,u),r.point(n,u)},sphere:function(){t.sphere(),e.sphere(),r.sphere()},lineStart:function(){t.lineStart(),e.lineStart(),r.lineStart()},lineEnd:function(){t.lineEnd(),e.lineEnd(),r.lineEnd()},polygonStart:function(){t.polygonStart(),e.polygonStart(),r.polygonStart()},polygonEnd:function(){t.polygonEnd(),e.polygonEnd(),r.polygonEnd()}}},n.precision=function(t){return arguments.length?(i.precision(t),o.precision(t),a.precision(t),n):i.precision()},n.scale=function(t){return arguments.length?(i.scale(t),o.scale(.35*t),a.scale(t),n.translate(i.translate())):i.scale()},n.translate=function(t){if(!arguments.length)return i.translate();var s=i.scale(),l=+t[0],f=+t[1];return e=i.translate(t).clipExtent([[l-.455*s,f-.238*s],[l+.455*s,f+.238*s]]).stream(c).point,r=o.translate([l-.307*s,f+.201*s]).clipExtent([[l-.425*s+Aa,f+.12*s+Aa],[l-.214*s-Aa,f+.234*s-Aa]]).stream(c).point,u=a.translate([l-.205*s,f+.212*s]).clipExtent([[l-.214*s+Aa,f+.166*s+Aa],[l-.115*s-Aa,f+.234*s-Aa]]).stream(c).point,n},n.scale(1070)};var Cc,Nc,Lc,Tc,qc,zc,Rc={point:g,lineStart:g,lineEnd:g,polygonStart:function(){Nc=0,Rc.lineStart=Fe},polygonEnd:function(){Rc.lineStart=Rc.lineEnd=Rc.point=g,Cc+=oa(Nc/2)}},Dc={point:Oe,lineStart:g,lineEnd:g,polygonStart:g,polygonEnd:g},Pc={point:Ze,lineStart:Ve,lineEnd:Xe,polygonStart:function(){Pc.lineStart=$e},polygonEnd:function(){Pc.point=Ze,Pc.lineStart=Ve,Pc.lineEnd=Xe}};Xo.geo.path=function(){function n(n){return n&&("function"==typeof a&&i.pointRadius(+a.apply(this,arguments)),o&&o.valid||(o=u(i)),Xo.geo.stream(n,o)),i.result()}function t(){return o=null,n}var e,r,u,i,o,a=4.5;return n.area=function(n){return Cc=0,Xo.geo.stream(n,u(Rc)),Cc},n.centroid=function(n){return dc=mc=yc=xc=Mc=_c=bc=wc=Sc=0,Xo.geo.stream(n,u(Pc)),Sc?[bc/Sc,wc/Sc]:_c?[xc/_c,Mc/_c]:yc?[dc/yc,mc/yc]:[0/0,0/0]},n.bounds=function(n){return qc=zc=-(Lc=Tc=1/0),Xo.geo.stream(n,u(Dc)),[[Lc,Tc],[qc,zc]]},n.projection=function(n){return arguments.length?(u=(e=n)?n.stream||Je(n):bt,t()):e},n.context=function(n){return arguments.length?(i=null==(r=n)?new Ye:new Be(n),"function"!=typeof a&&i.pointRadius(a),t()):r},n.pointRadius=function(t){return arguments.length?(a="function"==typeof t?t:(i.pointRadius(+t),+t),n):a},n.projection(Xo.geo.albersUsa()).context(null)},Xo.geo.transform=function(n){return{stream:function(t){var e=new Ge(t);for(var r in n)e[r]=n[r];return e}}},Ge.prototype={point:function(n,t){this.stream.point(n,t)},sphere:function(){this.stream.sphere()},lineStart:function(){this.stream.lineStart()},lineEnd:function(){this.stream.lineEnd()},polygonStart:function(){this.stream.polygonStart()},polygonEnd:function(){this.stream.polygonEnd()}},Xo.geo.projection=Qe,Xo.geo.projectionMutator=nr,(Xo.geo.equirectangular=function(){return Qe(er)}).raw=er.invert=er,Xo.geo.rotation=function(n){function t(t){return t=n(t[0]*Na,t[1]*Na),t[0]*=La,t[1]*=La,t}return n=ur(n[0]%360*Na,n[1]*Na,n.length>2?n[2]*Na:0),t.invert=function(t){return t=n.invert(t[0]*Na,t[1]*Na),t[0]*=La,t[1]*=La,t},t},rr.invert=er,Xo.geo.circle=function(){function n(){var n="function"==typeof r?r.apply(this,arguments):r,t=ur(-n[0]*Na,-n[1]*Na,0).invert,u=[];return e(null,null,1,{point:function(n,e){u.push(n=t(n,e)),n[0]*=La,n[1]*=La}}),{type:"Polygon",coordinates:[u]}}var t,e,r=[0,0],u=6;return n.origin=function(t){return arguments.length?(r=t,n):r},n.angle=function(r){return arguments.length?(e=cr((t=+r)*Na,u*Na),n):t},n.precision=function(r){return arguments.length?(e=cr(t*Na,(u=+r)*Na),n):u},n.angle(90)},Xo.geo.distance=function(n,t){var e,r=(t[0]-n[0])*Na,u=n[1]*Na,i=t[1]*Na,o=Math.sin(r),a=Math.cos(r),c=Math.sin(u),s=Math.cos(u),l=Math.sin(i),f=Math.cos(i);return Math.atan2(Math.sqrt((e=f*o)*e+(e=s*l-c*f*a)*e),c*l+s*f*a)},Xo.geo.graticule=function(){function n(){return{type:"MultiLineString",coordinates:t()}}function t(){return Xo.range(Math.ceil(i/d)*d,u,d).map(h).concat(Xo.range(Math.ceil(s/m)*m,c,m).map(g)).concat(Xo.range(Math.ceil(r/p)*p,e,p).filter(function(n){return oa(n%d)>Aa}).map(l)).concat(Xo.range(Math.ceil(a/v)*v,o,v).filter(function(n){return oa(n%m)>Aa}).map(f))}var e,r,u,i,o,a,c,s,l,f,h,g,p=10,v=p,d=90,m=360,y=2.5;return n.lines=function(){return t().map(function(n){return{type:"LineString",coordinates:n}})},n.outline=function(){return{type:"Polygon",coordinates:[h(i).concat(g(c).slice(1),h(u).reverse().slice(1),g(s).reverse().slice(1))]}},n.extent=function(t){return arguments.length?n.majorExtent(t).minorExtent(t):n.minorExtent()},n.majorExtent=function(t){return arguments.length?(i=+t[0][0],u=+t[1][0],s=+t[0][1],c=+t[1][1],i>u&&(t=i,i=u,u=t),s>c&&(t=s,s=c,c=t),n.precision(y)):[[i,s],[u,c]]},n.minorExtent=function(t){return arguments.length?(r=+t[0][0],e=+t[1][0],a=+t[0][1],o=+t[1][1],r>e&&(t=r,r=e,e=t),a>o&&(t=a,a=o,o=t),n.precision(y)):[[r,a],[e,o]]},n.step=function(t){return arguments.length?n.majorStep(t).minorStep(t):n.minorStep()},n.majorStep=function(t){return arguments.length?(d=+t[0],m=+t[1],n):[d,m]},n.minorStep=function(t){return arguments.length?(p=+t[0],v=+t[1],n):[p,v]},n.precision=function(t){return arguments.length?(y=+t,l=lr(a,o,90),f=fr(r,e,y),h=lr(s,c,90),g=fr(i,u,y),n):y},n.majorExtent([[-180,-90+Aa],[180,90-Aa]]).minorExtent([[-180,-80-Aa],[180,80+Aa]])},Xo.geo.greatArc=function(){function n(){return{type:"LineString",coordinates:[t||r.apply(this,arguments),e||u.apply(this,arguments)]}}var t,e,r=hr,u=gr;return n.distance=function(){return Xo.geo.distance(t||r.apply(this,arguments),e||u.apply(this,arguments))},n.source=function(e){return arguments.length?(r=e,t="function"==typeof e?null:e,n):r},n.target=function(t){return arguments.length?(u=t,e="function"==typeof t?null:t,n):u},n.precision=function(){return arguments.length?n:0},n},Xo.geo.interpolate=function(n,t){return pr(n[0]*Na,n[1]*Na,t[0]*Na,t[1]*Na)},Xo.geo.length=function(n){return Uc=0,Xo.geo.stream(n,jc),Uc};var Uc,jc={sphere:g,point:g,lineStart:vr,lineEnd:g,polygonStart:g,polygonEnd:g},Hc=dr(function(n){return Math.sqrt(2/(1+n))},function(n){return 2*Math.asin(n/2)});(Xo.geo.azimuthalEqualArea=function(){return Qe(Hc)}).raw=Hc;var Fc=dr(function(n){var t=Math.acos(n);return t&&t/Math.sin(t)},bt);(Xo.geo.azimuthalEquidistant=function(){return Qe(Fc)}).raw=Fc,(Xo.geo.conicConformal=function(){return je(mr)}).raw=mr,(Xo.geo.conicEquidistant=function(){return je(yr)}).raw=yr;var Oc=dr(function(n){return 1/n},Math.atan);(Xo.geo.gnomonic=function(){return Qe(Oc)}).raw=Oc,xr.invert=function(n,t){return[n,2*Math.atan(Math.exp(t))-Ea]},(Xo.geo.mercator=function(){return Mr(xr)}).raw=xr;var Yc=dr(function(){return 1},Math.asin);(Xo.geo.orthographic=function(){return Qe(Yc)}).raw=Yc;var Ic=dr(function(n){return 1/(1+n)},function(n){return 2*Math.atan(n)});(Xo.geo.stereographic=function(){return Qe(Ic)}).raw=Ic,_r.invert=function(n,t){return[-t,2*Math.atan(Math.exp(n))-Ea]},(Xo.geo.transverseMercator=function(){var n=Mr(_r),t=n.center,e=n.rotate;return n.center=function(n){return n?t([-n[1],n[0]]):(n=t(),[-n[1],n[0]])},n.rotate=function(n){return n?e([n[0],n[1],n.length>2?n[2]+90:90]):(n=e(),[n[0],n[1],n[2]-90])},n.rotate([0,0])}).raw=_r,Xo.geom={},Xo.geom.hull=function(n){function t(n){if(n.length<3)return[];var t,u=_t(e),i=_t(r),o=n.length,a=[],c=[];for(t=0;o>t;t++)a.push([+u.call(this,n[t],t),+i.call(this,n[t],t),t]);for(a.sort(kr),t=0;o>t;t++)c.push([a[t][0],-a[t][1]]);var s=Sr(a),l=Sr(c),f=l[0]===s[0],h=l[l.length-1]===s[s.length-1],g=[];for(t=s.length-1;t>=0;--t)g.push(n[a[s[t]][2]]);for(t=+f;t<l.length-h;++t)g.push(n[a[l[t]][2]]);return g}var e=br,r=wr;return arguments.length?t(n):(t.x=function(n){return arguments.length?(e=n,t):e},t.y=function(n){return arguments.length?(r=n,t):r},t)},Xo.geom.polygon=function(n){return fa(n,Zc),n};var Zc=Xo.geom.polygon.prototype=[];Zc.area=function(){for(var n,t=-1,e=this.length,r=this[e-1],u=0;++t<e;)n=r,r=this[t],u+=n[1]*r[0]-n[0]*r[1];return.5*u},Zc.centroid=function(n){var t,e,r=-1,u=this.length,i=0,o=0,a=this[u-1];for(arguments.length||(n=-1/(6*this.area()));++r<u;)t=a,a=this[r],e=t[0]*a[1]-a[0]*t[1],i+=(t[0]+a[0])*e,o+=(t[1]+a[1])*e;return[i*n,o*n]},Zc.clip=function(n){for(var t,e,r,u,i,o,a=Cr(n),c=-1,s=this.length-Cr(this),l=this[s-1];++c<s;){for(t=n.slice(),n.length=0,u=this[c],i=t[(r=t.length-a)-1],e=-1;++e<r;)o=t[e],Er(o,l,u)?(Er(i,l,u)||n.push(Ar(i,o,l,u)),n.push(o)):Er(i,l,u)&&n.push(Ar(i,o,l,u)),i=o;a&&n.push(n[0]),l=u}return n};var Vc,Xc,$c,Bc,Wc,Jc=[],Gc=[];Pr.prototype.prepare=function(){for(var n,t=this.edges,e=t.length;e--;)n=t[e].edge,n.b&&n.a||t.splice(e,1);return t.sort(jr),t.length},Br.prototype={start:function(){return this.edge.l===this.site?this.edge.a:this.edge.b},end:function(){return this.edge.l===this.site?this.edge.b:this.edge.a}},Wr.prototype={insert:function(n,t){var e,r,u;if(n){if(t.P=n,t.N=n.N,n.N&&(n.N.P=t),n.N=t,n.R){for(n=n.R;n.L;)n=n.L;n.L=t}else n.R=t;e=n}else this._?(n=Qr(this._),t.P=null,t.N=n,n.P=n.L=t,e=n):(t.P=t.N=null,this._=t,e=null);for(t.L=t.R=null,t.U=e,t.C=!0,n=t;e&&e.C;)r=e.U,e===r.L?(u=r.R,u&&u.C?(e.C=u.C=!1,r.C=!0,n=r):(n===e.R&&(Gr(this,e),n=e,e=n.U),e.C=!1,r.C=!0,Kr(this,r))):(u=r.L,u&&u.C?(e.C=u.C=!1,r.C=!0,n=r):(n===e.L&&(Kr(this,e),n=e,e=n.U),e.C=!1,r.C=!0,Gr(this,r))),e=n.U;this._.C=!1},remove:function(n){n.N&&(n.N.P=n.P),n.P&&(n.P.N=n.N),n.N=n.P=null;var t,e,r,u=n.U,i=n.L,o=n.R;if(e=i?o?Qr(o):i:o,u?u.L===n?u.L=e:u.R=e:this._=e,i&&o?(r=e.C,e.C=n.C,e.L=i,i.U=e,e!==o?(u=e.U,e.U=n.U,n=e.R,u.L=n,e.R=o,o.U=e):(e.U=u,u=e,n=e.R)):(r=n.C,n=e),n&&(n.U=u),!r){if(n&&n.C)return n.C=!1,void 0;do{if(n===this._)break;if(n===u.L){if(t=u.R,t.C&&(t.C=!1,u.C=!0,Gr(this,u),t=u.R),t.L&&t.L.C||t.R&&t.R.C){t.R&&t.R.C||(t.L.C=!1,t.C=!0,Kr(this,t),t=u.R),t.C=u.C,u.C=t.R.C=!1,Gr(this,u),n=this._;break}}else if(t=u.L,t.C&&(t.C=!1,u.C=!0,Kr(this,u),t=u.L),t.L&&t.L.C||t.R&&t.R.C){t.L&&t.L.C||(t.R.C=!1,t.C=!0,Gr(this,t),t=u.L),t.C=u.C,u.C=t.L.C=!1,Kr(this,u),n=this._;break}t.C=!0,n=u,u=u.U}while(!n.C);n&&(n.C=!1)}}},Xo.geom.voronoi=function(n){function t(n){var t=new Array(n.length),r=a[0][0],u=a[0][1],i=a[1][0],o=a[1][1];return nu(e(n),a).cells.forEach(function(e,a){var c=e.edges,s=e.site,l=t[a]=c.length?c.map(function(n){var t=n.start();return[t.x,t.y]}):s.x>=r&&s.x<=i&&s.y>=u&&s.y<=o?[[r,o],[i,o],[i,u],[r,u]]:[];l.point=n[a]}),t}function e(n){return n.map(function(n,t){return{x:Math.round(i(n,t)/Aa)*Aa,y:Math.round(o(n,t)/Aa)*Aa,i:t}})}var r=br,u=wr,i=r,o=u,a=Kc;return n?t(n):(t.links=function(n){return nu(e(n)).edges.filter(function(n){return n.l&&n.r}).map(function(t){return{source:n[t.l.i],target:n[t.r.i]}})},t.triangles=function(n){var t=[];return nu(e(n)).cells.forEach(function(e,r){for(var u,i,o=e.site,a=e.edges.sort(jr),c=-1,s=a.length,l=a[s-1].edge,f=l.l===o?l.r:l.l;++c<s;)u=l,i=f,l=a[c].edge,f=l.l===o?l.r:l.l,r<i.i&&r<f.i&&eu(o,i,f)<0&&t.push([n[r],n[i.i],n[f.i]])}),t},t.x=function(n){return arguments.length?(i=_t(r=n),t):r},t.y=function(n){return arguments.length?(o=_t(u=n),t):u},t.clipExtent=function(n){return arguments.length?(a=null==n?Kc:n,t):a===Kc?null:a},t.size=function(n){return arguments.length?t.clipExtent(n&&[[0,0],n]):a===Kc?null:a&&a[1]},t)};var Kc=[[-1e6,-1e6],[1e6,1e6]];Xo.geom.delaunay=function(n){return Xo.geom.voronoi().triangles(n)},Xo.geom.quadtree=function(n,t,e,r,u){function i(n){function i(n,t,e,r,u,i,o,a){if(!isNaN(e)&&!isNaN(r))if(n.leaf){var c=n.x,l=n.y;if(null!=c)if(oa(c-e)+oa(l-r)<.01)s(n,t,e,r,u,i,o,a);else{var f=n.point;n.x=n.y=n.point=null,s(n,f,c,l,u,i,o,a),s(n,t,e,r,u,i,o,a)}else n.x=e,n.y=r,n.point=t}else s(n,t,e,r,u,i,o,a)}function s(n,t,e,r,u,o,a,c){var s=.5*(u+a),l=.5*(o+c),f=e>=s,h=r>=l,g=(h<<1)+f;n.leaf=!1,n=n.nodes[g]||(n.nodes[g]=iu()),f?u=s:a=s,h?o=l:c=l,i(n,t,e,r,u,o,a,c)}var l,f,h,g,p,v,d,m,y,x=_t(a),M=_t(c);if(null!=t)v=t,d=e,m=r,y=u;else if(m=y=-(v=d=1/0),f=[],h=[],p=n.length,o)for(g=0;p>g;++g)l=n[g],l.x<v&&(v=l.x),l.y<d&&(d=l.y),l.x>m&&(m=l.x),l.y>y&&(y=l.y),f.push(l.x),h.push(l.y);else for(g=0;p>g;++g){var _=+x(l=n[g],g),b=+M(l,g);v>_&&(v=_),d>b&&(d=b),_>m&&(m=_),b>y&&(y=b),f.push(_),h.push(b)}var w=m-v,S=y-d;w>S?y=d+w:m=v+S;var k=iu();if(k.add=function(n){i(k,n,+x(n,++g),+M(n,g),v,d,m,y)},k.visit=function(n){ou(n,k,v,d,m,y)},g=-1,null==t){for(;++g<p;)i(k,n[g],f[g],h[g],v,d,m,y);--g}else n.forEach(k.add);return f=h=n=l=null,k}var o,a=br,c=wr;return(o=arguments.length)?(a=ru,c=uu,3===o&&(u=e,r=t,e=t=0),i(n)):(i.x=function(n){return arguments.length?(a=n,i):a},i.y=function(n){return arguments.length?(c=n,i):c},i.extent=function(n){return arguments.length?(null==n?t=e=r=u=null:(t=+n[0][0],e=+n[0][1],r=+n[1][0],u=+n[1][1]),i):null==t?null:[[t,e],[r,u]]},i.size=function(n){return arguments.length?(null==n?t=e=r=u=null:(t=e=0,r=+n[0],u=+n[1]),i):null==t?null:[r-t,u-e]},i)},Xo.interpolateRgb=au,Xo.interpolateObject=cu,Xo.interpolateNumber=su,Xo.interpolateString=lu;var Qc=/[-+]?(?:\d+\.?\d*|\.?\d+)(?:[eE][-+]?\d+)?/g;Xo.interpolate=fu,Xo.interpolators=[function(n,t){var e=typeof t;return("string"===e?Va.has(t)||/^(#|rgb\(|hsl\()/.test(t)?au:lu:t instanceof G?au:"object"===e?Array.isArray(t)?hu:cu:su)(n,t)}],Xo.interpolateArray=hu;var ns=function(){return bt},ts=Xo.map({linear:ns,poly:xu,quad:function(){return du},cubic:function(){return mu},sin:function(){return Mu},exp:function(){return _u},circle:function(){return bu},elastic:wu,back:Su,bounce:function(){return ku}}),es=Xo.map({"in":bt,out:pu,"in-out":vu,"out-in":function(n){return vu(pu(n))}});Xo.ease=function(n){var t=n.indexOf("-"),e=t>=0?n.substring(0,t):n,r=t>=0?n.substring(t+1):"in";return e=ts.get(e)||ns,r=es.get(r)||bt,gu(r(e.apply(null,$o.call(arguments,1))))},Xo.interpolateHcl=Eu,Xo.interpolateHsl=Au,Xo.interpolateLab=Cu,Xo.interpolateRound=Nu,Xo.transform=function(n){var t=Wo.createElementNS(Xo.ns.prefix.svg,"g");return(Xo.transform=function(n){if(null!=n){t.setAttribute("transform",n);var e=t.transform.baseVal.consolidate()}return new Lu(e?e.matrix:rs)})(n)},Lu.prototype.toString=function(){return"translate("+this.translate+")rotate("+this.rotate+")skewX("+this.skew+")scale("+this.scale+")"};var rs={a:1,b:0,c:0,d:1,e:0,f:0};Xo.interpolateTransform=Ru,Xo.layout={},Xo.layout.bundle=function(){return function(n){for(var t=[],e=-1,r=n.length;++e<r;)t.push(Uu(n[e]));return t}},Xo.layout.chord=function(){function n(){var n,s,f,h,g,p={},v=[],d=Xo.range(i),m=[];for(e=[],r=[],n=0,h=-1;++h<i;){for(s=0,g=-1;++g<i;)s+=u[h][g];v.push(s),m.push(Xo.range(i)),n+=s}for(o&&d.sort(function(n,t){return o(v[n],v[t])}),a&&m.forEach(function(n,t){n.sort(function(n,e){return a(u[t][n],u[t][e])})}),n=(ka-l*i)/n,s=0,h=-1;++h<i;){for(f=s,g=-1;++g<i;){var y=d[h],x=m[y][g],M=u[y][x],_=s,b=s+=M*n;p[y+"-"+x]={index:y,subindex:x,startAngle:_,endAngle:b,value:M}}r[y]={index:y,startAngle:f,endAngle:s,value:(s-f)/n},s+=l}for(h=-1;++h<i;)for(g=h-1;++g<i;){var w=p[h+"-"+g],S=p[g+"-"+h];(w.value||S.value)&&e.push(w.value<S.value?{source:S,target:w}:{source:w,target:S})}c&&t()}function t(){e.sort(function(n,t){return c((n.source.value+n.target.value)/2,(t.source.value+t.target.value)/2)})}var e,r,u,i,o,a,c,s={},l=0;return s.matrix=function(n){return arguments.length?(i=(u=n)&&u.length,e=r=null,s):u},s.padding=function(n){return arguments.length?(l=n,e=r=null,s):l},s.sortGroups=function(n){return arguments.length?(o=n,e=r=null,s):o},s.sortSubgroups=function(n){return arguments.length?(a=n,e=null,s):a},s.sortChords=function(n){return arguments.length?(c=n,e&&t(),s):c},s.chords=function(){return e||n(),e},s.groups=function(){return r||n(),r},s},Xo.layout.force=function(){function n(n){return function(t,e,r,u){if(t.point!==n){var i=t.cx-n.x,o=t.cy-n.y,a=u-e,c=i*i+o*o;if(c>a*a/d){if(p>c){var s=t.charge/c;n.px-=i*s,n.py-=o*s}return!0}if(t.point&&c&&p>c){var s=t.pointCharge/c;n.px-=i*s,n.py-=o*s}}return!t.charge}}function t(n){n.px=Xo.event.x,n.py=Xo.event.y,a.resume()}var e,r,u,i,o,a={},c=Xo.dispatch("start","tick","end"),s=[1,1],l=.9,f=us,h=is,g=-30,p=os,v=.1,d=.64,m=[],y=[];return a.tick=function(){if((r*=.99)<.005)return c.end({type:"end",alpha:r=0}),!0;var t,e,a,f,h,p,d,x,M,_=m.length,b=y.length;for(e=0;b>e;++e)a=y[e],f=a.source,h=a.target,x=h.x-f.x,M=h.y-f.y,(p=x*x+M*M)&&(p=r*i[e]*((p=Math.sqrt(p))-u[e])/p,x*=p,M*=p,h.x-=x*(d=f.weight/(h.weight+f.weight)),h.y-=M*d,f.x+=x*(d=1-d),f.y+=M*d);if((d=r*v)&&(x=s[0]/2,M=s[1]/2,e=-1,d))for(;++e<_;)a=m[e],a.x+=(x-a.x)*d,a.y+=(M-a.y)*d;if(g)for(Zu(t=Xo.geom.quadtree(m),r,o),e=-1;++e<_;)(a=m[e]).fixed||t.visit(n(a));for(e=-1;++e<_;)a=m[e],a.fixed?(a.x=a.px,a.y=a.py):(a.x-=(a.px-(a.px=a.x))*l,a.y-=(a.py-(a.py=a.y))*l);c.tick({type:"tick",alpha:r})},a.nodes=function(n){return arguments.length?(m=n,a):m},a.links=function(n){return arguments.length?(y=n,a):y},a.size=function(n){return arguments.length?(s=n,a):s},a.linkDistance=function(n){return arguments.length?(f="function"==typeof n?n:+n,a):f},a.distance=a.linkDistance,a.linkStrength=function(n){return arguments.length?(h="function"==typeof n?n:+n,a):h},a.friction=function(n){return arguments.length?(l=+n,a):l},a.charge=function(n){return arguments.length?(g="function"==typeof n?n:+n,a):g},a.chargeDistance=function(n){return arguments.length?(p=n*n,a):Math.sqrt(p)},a.gravity=function(n){return arguments.length?(v=+n,a):v},a.theta=function(n){return arguments.length?(d=n*n,a):Math.sqrt(d)},a.alpha=function(n){return arguments.length?(n=+n,r?r=n>0?n:0:n>0&&(c.start({type:"start",alpha:r=n}),Xo.timer(a.tick)),a):r},a.start=function(){function n(n,r){if(!e){for(e=new Array(c),a=0;c>a;++a)e[a]=[];for(a=0;s>a;++a){var u=y[a];e[u.source.index].push(u.target),e[u.target.index].push(u.source)}}for(var i,o=e[t],a=-1,s=o.length;++a<s;)if(!isNaN(i=o[a][n]))return i;return Math.random()*r}var t,e,r,c=m.length,l=y.length,p=s[0],v=s[1];for(t=0;c>t;++t)(r=m[t]).index=t,r.weight=0;for(t=0;l>t;++t)r=y[t],"number"==typeof r.source&&(r.source=m[r.source]),"number"==typeof r.target&&(r.target=m[r.target]),++r.source.weight,++r.target.weight;for(t=0;c>t;++t)r=m[t],isNaN(r.x)&&(r.x=n("x",p)),isNaN(r.y)&&(r.y=n("y",v)),isNaN(r.px)&&(r.px=r.x),isNaN(r.py)&&(r.py=r.y);if(u=[],"function"==typeof f)for(t=0;l>t;++t)u[t]=+f.call(this,y[t],t);else for(t=0;l>t;++t)u[t]=f;if(i=[],"function"==typeof h)for(t=0;l>t;++t)i[t]=+h.call(this,y[t],t);else for(t=0;l>t;++t)i[t]=h;if(o=[],"function"==typeof g)for(t=0;c>t;++t)o[t]=+g.call(this,m[t],t);else for(t=0;c>t;++t)o[t]=g;return a.resume()},a.resume=function(){return a.alpha(.1)},a.stop=function(){return a.alpha(0)},a.drag=function(){return e||(e=Xo.behavior.drag().origin(bt).on("dragstart.force",Fu).on("drag.force",t).on("dragend.force",Ou)),arguments.length?(this.on("mouseover.force",Yu).on("mouseout.force",Iu).call(e),void 0):e},Xo.rebind(a,c,"on")};var us=20,is=1,os=1/0;Xo.layout.hierarchy=function(){function n(t,o,a){var c=u.call(e,t,o);if(t.depth=o,a.push(t),c&&(s=c.length)){for(var s,l,f=-1,h=t.children=new Array(s),g=0,p=o+1;++f<s;)l=h[f]=n(c[f],p,a),l.parent=t,g+=l.value;r&&h.sort(r),i&&(t.value=g)}else delete t.children,i&&(t.value=+i.call(e,t,o)||0);return t}function t(n,r){var u=n.children,o=0;if(u&&(a=u.length))for(var a,c=-1,s=r+1;++c<a;)o+=t(u[c],s);else i&&(o=+i.call(e,n,r)||0);return i&&(n.value=o),o}function e(t){var e=[];return n(t,0,e),e}var r=Bu,u=Xu,i=$u;return e.sort=function(n){return arguments.length?(r=n,e):r},e.children=function(n){return arguments.length?(u=n,e):u},e.value=function(n){return arguments.length?(i=n,e):i},e.revalue=function(n){return t(n,0),n},e},Xo.layout.partition=function(){function n(t,e,r,u){var i=t.children;if(t.x=e,t.y=t.depth*u,t.dx=r,t.dy=u,i&&(o=i.length)){var o,a,c,s=-1;for(r=t.value?r/t.value:0;++s<o;)n(a=i[s],e,c=a.value*r,u),e+=c}}function t(n){var e=n.children,r=0;if(e&&(u=e.length))for(var u,i=-1;++i<u;)r=Math.max(r,t(e[i]));return 1+r}function e(e,i){var o=r.call(this,e,i);return n(o[0],0,u[0],u[1]/t(o[0])),o}var r=Xo.layout.hierarchy(),u=[1,1];return e.size=function(n){return arguments.length?(u=n,e):u},Vu(e,r)},Xo.layout.pie=function(){function n(i){var o=i.map(function(e,r){return+t.call(n,e,r)}),a=+("function"==typeof r?r.apply(this,arguments):r),c=(("function"==typeof u?u.apply(this,arguments):u)-a)/Xo.sum(o),s=Xo.range(i.length);null!=e&&s.sort(e===as?function(n,t){return o[t]-o[n]}:function(n,t){return e(i[n],i[t])});var l=[];return s.forEach(function(n){var t;l[n]={data:i[n],value:t=o[n],startAngle:a,endAngle:a+=t*c}}),l}var t=Number,e=as,r=0,u=ka;return n.value=function(e){return arguments.length?(t=e,n):t},n.sort=function(t){return arguments.length?(e=t,n):e},n.startAngle=function(t){return arguments.length?(r=t,n):r},n.endAngle=function(t){return arguments.length?(u=t,n):u},n};var as={};Xo.layout.stack=function(){function n(a,c){var s=a.map(function(e,r){return t.call(n,e,r)}),l=s.map(function(t){return t.map(function(t,e){return[i.call(n,t,e),o.call(n,t,e)]})}),f=e.call(n,l,c);s=Xo.permute(s,f),l=Xo.permute(l,f);var h,g,p,v=r.call(n,l,c),d=s.length,m=s[0].length;for(g=0;m>g;++g)for(u.call(n,s[0][g],p=v[g],l[0][g][1]),h=1;d>h;++h)u.call(n,s[h][g],p+=l[h-1][g][1],l[h][g][1]);return a}var t=bt,e=Qu,r=ni,u=Ku,i=Ju,o=Gu;return n.values=function(e){return arguments.length?(t=e,n):t},n.order=function(t){return arguments.length?(e="function"==typeof t?t:cs.get(t)||Qu,n):e},n.offset=function(t){return arguments.length?(r="function"==typeof t?t:ss.get(t)||ni,n):r},n.x=function(t){return arguments.length?(i=t,n):i},n.y=function(t){return arguments.length?(o=t,n):o},n.out=function(t){return arguments.length?(u=t,n):u},n};var cs=Xo.map({"inside-out":function(n){var t,e,r=n.length,u=n.map(ti),i=n.map(ei),o=Xo.range(r).sort(function(n,t){return u[n]-u[t]}),a=0,c=0,s=[],l=[];for(t=0;r>t;++t)e=o[t],c>a?(a+=i[e],s.push(e)):(c+=i[e],l.push(e));return l.reverse().concat(s)},reverse:function(n){return Xo.range(n.length).reverse()},"default":Qu}),ss=Xo.map({silhouette:function(n){var t,e,r,u=n.length,i=n[0].length,o=[],a=0,c=[];for(e=0;i>e;++e){for(t=0,r=0;u>t;t++)r+=n[t][e][1];r>a&&(a=r),o.push(r)}for(e=0;i>e;++e)c[e]=(a-o[e])/2;return c},wiggle:function(n){var t,e,r,u,i,o,a,c,s,l=n.length,f=n[0],h=f.length,g=[];for(g[0]=c=s=0,e=1;h>e;++e){for(t=0,u=0;l>t;++t)u+=n[t][e][1];for(t=0,i=0,a=f[e][0]-f[e-1][0];l>t;++t){for(r=0,o=(n[t][e][1]-n[t][e-1][1])/(2*a);t>r;++r)o+=(n[r][e][1]-n[r][e-1][1])/a;i+=o*n[t][e][1]}g[e]=c-=u?i/u*a:0,s>c&&(s=c)}for(e=0;h>e;++e)g[e]-=s;return g},expand:function(n){var t,e,r,u=n.length,i=n[0].length,o=1/u,a=[];for(e=0;i>e;++e){for(t=0,r=0;u>t;t++)r+=n[t][e][1];if(r)for(t=0;u>t;t++)n[t][e][1]/=r;else for(t=0;u>t;t++)n[t][e][1]=o}for(e=0;i>e;++e)a[e]=0;return a},zero:ni});Xo.layout.histogram=function(){function n(n,i){for(var o,a,c=[],s=n.map(e,this),l=r.call(this,s,i),f=u.call(this,l,s,i),i=-1,h=s.length,g=f.length-1,p=t?1:1/h;++i<g;)o=c[i]=[],o.dx=f[i+1]-(o.x=f[i]),o.y=0;if(g>0)for(i=-1;++i<h;)a=s[i],a>=l[0]&&a<=l[1]&&(o=c[Xo.bisect(f,a,1,g)-1],o.y+=p,o.push(n[i]));return c}var t=!0,e=Number,r=oi,u=ui;return n.value=function(t){return arguments.length?(e=t,n):e},n.range=function(t){return arguments.length?(r=_t(t),n):r},n.bins=function(t){return arguments.length?(u="number"==typeof t?function(n){return ii(n,t)}:_t(t),n):u},n.frequency=function(e){return arguments.length?(t=!!e,n):t},n},Xo.layout.tree=function(){function n(n,i){function o(n,t){var r=n.children,u=n._tree;if(r&&(i=r.length)){for(var i,a,s,l=r[0],f=l,h=-1;++h<i;)s=r[h],o(s,a),f=c(s,a,f),a=s;vi(n);var g=.5*(l._tree.prelim+s._tree.prelim);t?(u.prelim=t._tree.prelim+e(n,t),u.mod=u.prelim-g):u.prelim=g}else t&&(u.prelim=t._tree.prelim+e(n,t))}function a(n,t){n.x=n._tree.prelim+t;var e=n.children;if(e&&(r=e.length)){var r,u=-1;for(t+=n._tree.mod;++u<r;)a(e[u],t)}}function c(n,t,r){if(t){for(var u,i=n,o=n,a=t,c=n.parent.children[0],s=i._tree.mod,l=o._tree.mod,f=a._tree.mod,h=c._tree.mod;a=si(a),i=ci(i),a&&i;)c=ci(c),o=si(o),o._tree.ancestor=n,u=a._tree.prelim+f-i._tree.prelim-s+e(a,i),u>0&&(di(mi(a,n,r),n,u),s+=u,l+=u),f+=a._tree.mod,s+=i._tree.mod,h+=c._tree.mod,l+=o._tree.mod;a&&!si(o)&&(o._tree.thread=a,o._tree.mod+=f-l),i&&!ci(c)&&(c._tree.thread=i,c._tree.mod+=s-h,r=n)}return r}var s=t.call(this,n,i),l=s[0];pi(l,function(n,t){n._tree={ancestor:n,prelim:0,mod:0,change:0,shift:0,number:t?t._tree.number+1:0}}),o(l),a(l,-l._tree.prelim);var f=li(l,hi),h=li(l,fi),g=li(l,gi),p=f.x-e(f,h)/2,v=h.x+e(h,f)/2,d=g.depth||1;return pi(l,u?function(n){n.x*=r[0],n.y=n.depth*r[1],delete n._tree}:function(n){n.x=(n.x-p)/(v-p)*r[0],n.y=n.depth/d*r[1],delete n._tree}),s}var t=Xo.layout.hierarchy().sort(null).value(null),e=ai,r=[1,1],u=!1;return n.separation=function(t){return arguments.length?(e=t,n):e},n.size=function(t){return arguments.length?(u=null==(r=t),n):u?null:r},n.nodeSize=function(t){return arguments.length?(u=null!=(r=t),n):u?r:null},Vu(n,t)},Xo.layout.pack=function(){function n(n,i){var o=e.call(this,n,i),a=o[0],c=u[0],s=u[1],l=null==t?Math.sqrt:"function"==typeof t?t:function(){return t};if(a.x=a.y=0,pi(a,function(n){n.r=+l(n.value)}),pi(a,bi),r){var f=r*(t?1:Math.max(2*a.r/c,2*a.r/s))/2;pi(a,function(n){n.r+=f}),pi(a,bi),pi(a,function(n){n.r-=f})}return ki(a,c/2,s/2,t?1:1/Math.max(2*a.r/c,2*a.r/s)),o}var t,e=Xo.layout.hierarchy().sort(yi),r=0,u=[1,1];return n.size=function(t){return arguments.length?(u=t,n):u},n.radius=function(e){return arguments.length?(t=null==e||"function"==typeof e?e:+e,n):t},n.padding=function(t){return arguments.length?(r=+t,n):r},Vu(n,e)},Xo.layout.cluster=function(){function n(n,i){var o,a=t.call(this,n,i),c=a[0],s=0;pi(c,function(n){var t=n.children;t&&t.length?(n.x=Ci(t),n.y=Ai(t)):(n.x=o?s+=e(n,o):0,n.y=0,o=n)});var l=Ni(c),f=Li(c),h=l.x-e(l,f)/2,g=f.x+e(f,l)/2;return pi(c,u?function(n){n.x=(n.x-c.x)*r[0],n.y=(c.y-n.y)*r[1]}:function(n){n.x=(n.x-h)/(g-h)*r[0],n.y=(1-(c.y?n.y/c.y:1))*r[1]}),a}var t=Xo.layout.hierarchy().sort(null).value(null),e=ai,r=[1,1],u=!1;return n.separation=function(t){return arguments.length?(e=t,n):e},n.size=function(t){return arguments.length?(u=null==(r=t),n):u?null:r},n.nodeSize=function(t){return arguments.length?(u=null!=(r=t),n):u?r:null},Vu(n,t)},Xo.layout.treemap=function(){function n(n,t){for(var e,r,u=-1,i=n.length;++u<i;)r=(e=n[u]).value*(0>t?0:t),e.area=isNaN(r)||0>=r?0:r}function t(e){var i=e.children;if(i&&i.length){var o,a,c,s=f(e),l=[],h=i.slice(),p=1/0,v="slice"===g?s.dx:"dice"===g?s.dy:"slice-dice"===g?1&e.depth?s.dy:s.dx:Math.min(s.dx,s.dy);for(n(h,s.dx*s.dy/e.value),l.area=0;(c=h.length)>0;)l.push(o=h[c-1]),l.area+=o.area,"squarify"!==g||(a=r(l,v))<=p?(h.pop(),p=a):(l.area-=l.pop().area,u(l,v,s,!1),v=Math.min(s.dx,s.dy),l.length=l.area=0,p=1/0);l.length&&(u(l,v,s,!0),l.length=l.area=0),i.forEach(t)}}function e(t){var r=t.children;if(r&&r.length){var i,o=f(t),a=r.slice(),c=[];for(n(a,o.dx*o.dy/t.value),c.area=0;i=a.pop();)c.push(i),c.area+=i.area,null!=i.z&&(u(c,i.z?o.dx:o.dy,o,!a.length),c.length=c.area=0);r.forEach(e)}}function r(n,t){for(var e,r=n.area,u=0,i=1/0,o=-1,a=n.length;++o<a;)(e=n[o].area)&&(i>e&&(i=e),e>u&&(u=e));return r*=r,t*=t,r?Math.max(t*u*p/r,r/(t*i*p)):1/0}function u(n,t,e,r){var u,i=-1,o=n.length,a=e.x,s=e.y,l=t?c(n.area/t):0;if(t==e.dx){for((r||l>e.dy)&&(l=e.dy);++i<o;)u=n[i],u.x=a,u.y=s,u.dy=l,a+=u.dx=Math.min(e.x+e.dx-a,l?c(u.area/l):0);u.z=!0,u.dx+=e.x+e.dx-a,e.y+=l,e.dy-=l}else{for((r||l>e.dx)&&(l=e.dx);++i<o;)u=n[i],u.x=a,u.y=s,u.dx=l,s+=u.dy=Math.min(e.y+e.dy-s,l?c(u.area/l):0);u.z=!1,u.dy+=e.y+e.dy-s,e.x+=l,e.dx-=l}}function i(r){var u=o||a(r),i=u[0];return i.x=0,i.y=0,i.dx=s[0],i.dy=s[1],o&&a.revalue(i),n([i],i.dx*i.dy/i.value),(o?e:t)(i),h&&(o=u),u}var o,a=Xo.layout.hierarchy(),c=Math.round,s=[1,1],l=null,f=Ti,h=!1,g="squarify",p=.5*(1+Math.sqrt(5));return i.size=function(n){return arguments.length?(s=n,i):s},i.padding=function(n){function t(t){var e=n.call(i,t,t.depth);return null==e?Ti(t):qi(t,"number"==typeof e?[e,e,e,e]:e)}function e(t){return qi(t,n)}if(!arguments.length)return l;var r;return f=null==(l=n)?Ti:"function"==(r=typeof n)?t:"number"===r?(n=[n,n,n,n],e):e,i},i.round=function(n){return arguments.length?(c=n?Math.round:Number,i):c!=Number},i.sticky=function(n){return arguments.length?(h=n,o=null,i):h},i.ratio=function(n){return arguments.length?(p=n,i):p},i.mode=function(n){return arguments.length?(g=n+"",i):g},Vu(i,a)},Xo.random={normal:function(n,t){var e=arguments.length;return 2>e&&(t=1),1>e&&(n=0),function(){var e,r,u;do e=2*Math.random()-1,r=2*Math.random()-1,u=e*e+r*r;while(!u||u>1);return n+t*e*Math.sqrt(-2*Math.log(u)/u)}},logNormal:function(){var n=Xo.random.normal.apply(Xo,arguments);return function(){return Math.exp(n())}},bates:function(n){var t=Xo.random.irwinHall(n);return function(){return t()/n}},irwinHall:function(n){return function(){for(var t=0,e=0;n>e;e++)t+=Math.random();return t}}},Xo.scale={};var ls={floor:bt,ceil:bt};Xo.scale.linear=function(){return Hi([0,1],[0,1],fu,!1)};var fs={s:1,g:1,p:1,r:1,e:1};Xo.scale.log=function(){return $i(Xo.scale.linear().domain([0,1]),10,!0,[1,10])};var hs=Xo.format(".0e"),gs={floor:function(n){return-Math.ceil(-n)},ceil:function(n){return-Math.floor(-n)}};Xo.scale.pow=function(){return Bi(Xo.scale.linear(),1,[0,1])},Xo.scale.sqrt=function(){return Xo.scale.pow().exponent(.5)},Xo.scale.ordinal=function(){return Ji([],{t:"range",a:[[]]})},Xo.scale.category10=function(){return Xo.scale.ordinal().range(ps)},Xo.scale.category20=function(){return Xo.scale.ordinal().range(vs)},Xo.scale.category20b=function(){return Xo.scale.ordinal().range(ds)},Xo.scale.category20c=function(){return Xo.scale.ordinal().range(ms)};var ps=[2062260,16744206,2924588,14034728,9725885,9197131,14907330,8355711,12369186,1556175].map(ht),vs=[2062260,11454440,16744206,16759672,2924588,10018698,14034728,16750742,9725885,12955861,9197131,12885140,14907330,16234194,8355711,13092807,12369186,14408589,1556175,10410725].map(ht),ds=[3750777,5395619,7040719,10264286,6519097,9216594,11915115,13556636,9202993,12426809,15186514,15190932,8666169,11356490,14049643,15177372,8077683,10834324,13528509,14589654].map(ht),ms=[3244733,7057110,10406625,13032431,15095053,16616764,16625259,16634018,3253076,7652470,10607003,13101504,7695281,10394312,12369372,14342891,6513507,9868950,12434877,14277081].map(ht);Xo.scale.quantile=function(){return Gi([],[])},Xo.scale.quantize=function(){return Ki(0,1,[0,1])},Xo.scale.threshold=function(){return Qi([.5],[0,1])},Xo.scale.identity=function(){return no([0,1])},Xo.svg={},Xo.svg.arc=function(){function n(){var n=t.apply(this,arguments),i=e.apply(this,arguments),o=r.apply(this,arguments)+ys,a=u.apply(this,arguments)+ys,c=(o>a&&(c=o,o=a,a=c),a-o),s=Sa>c?"0":"1",l=Math.cos(o),f=Math.sin(o),h=Math.cos(a),g=Math.sin(a);return c>=xs?n?"M0,"+i+"A"+i+","+i+" 0 1,1 0,"+-i+"A"+i+","+i+" 0 1,1 0,"+i+"M0,"+n+"A"+n+","+n+" 0 1,0 0,"+-n+"A"+n+","+n+" 0 1,0 0,"+n+"Z":"M0,"+i+"A"+i+","+i+" 0 1,1 0,"+-i+"A"+i+","+i+" 0 1,1 0,"+i+"Z":n?"M"+i*l+","+i*f+"A"+i+","+i+" 0 "+s+",1 "+i*h+","+i*g+"L"+n*h+","+n*g+"A"+n+","+n+" 0 "+s+",0 "+n*l+","+n*f+"Z":"M"+i*l+","+i*f+"A"+i+","+i+" 0 "+s+",1 "+i*h+","+i*g+"L0,0"+"Z"}var t=to,e=eo,r=ro,u=uo;return n.innerRadius=function(e){return arguments.length?(t=_t(e),n):t},n.outerRadius=function(t){return arguments.length?(e=_t(t),n):e},n.startAngle=function(t){return arguments.length?(r=_t(t),n):r},n.endAngle=function(t){return arguments.length?(u=_t(t),n):u},n.centroid=function(){var n=(t.apply(this,arguments)+e.apply(this,arguments))/2,i=(r.apply(this,arguments)+u.apply(this,arguments))/2+ys;return[Math.cos(i)*n,Math.sin(i)*n]},n};var ys=-Ea,xs=ka-Aa;Xo.svg.line=function(){return io(bt)};var Ms=Xo.map({linear:oo,"linear-closed":ao,step:co,"step-before":so,"step-after":lo,basis:mo,"basis-open":yo,"basis-closed":xo,bundle:Mo,cardinal:go,"cardinal-open":fo,"cardinal-closed":ho,monotone:Eo});Ms.forEach(function(n,t){t.key=n,t.closed=/-closed$/.test(n)});var _s=[0,2/3,1/3,0],bs=[0,1/3,2/3,0],ws=[0,1/6,2/3,1/6];Xo.svg.line.radial=function(){var n=io(Ao);return n.radius=n.x,delete n.x,n.angle=n.y,delete n.y,n},so.reverse=lo,lo.reverse=so,Xo.svg.area=function(){return Co(bt)},Xo.svg.area.radial=function(){var n=Co(Ao);return n.radius=n.x,delete n.x,n.innerRadius=n.x0,delete n.x0,n.outerRadius=n.x1,delete n.x1,n.angle=n.y,delete n.y,n.startAngle=n.y0,delete n.y0,n.endAngle=n.y1,delete n.y1,n},Xo.svg.chord=function(){function n(n,a){var c=t(this,i,n,a),s=t(this,o,n,a);return"M"+c.p0+r(c.r,c.p1,c.a1-c.a0)+(e(c,s)?u(c.r,c.p1,c.r,c.p0):u(c.r,c.p1,s.r,s.p0)+r(s.r,s.p1,s.a1-s.a0)+u(s.r,s.p1,c.r,c.p0))+"Z"}function t(n,t,e,r){var u=t.call(n,e,r),i=a.call(n,u,r),o=c.call(n,u,r)+ys,l=s.call(n,u,r)+ys;return{r:i,a0:o,a1:l,p0:[i*Math.cos(o),i*Math.sin(o)],p1:[i*Math.cos(l),i*Math.sin(l)]}}function e(n,t){return n.a0==t.a0&&n.a1==t.a1}function r(n,t,e){return"A"+n+","+n+" 0 "+ +(e>Sa)+",1 "+t}function u(n,t,e,r){return"Q 0,0 "+r}var i=hr,o=gr,a=No,c=ro,s=uo;return n.radius=function(t){return arguments.length?(a=_t(t),n):a},n.source=function(t){return arguments.length?(i=_t(t),n):i},n.target=function(t){return arguments.length?(o=_t(t),n):o},n.startAngle=function(t){return arguments.length?(c=_t(t),n):c},n.endAngle=function(t){return arguments.length?(s=_t(t),n):s},n},Xo.svg.diagonal=function(){function n(n,u){var i=t.call(this,n,u),o=e.call(this,n,u),a=(i.y+o.y)/2,c=[i,{x:i.x,y:a},{x:o.x,y:a},o];return c=c.map(r),"M"+c[0]+"C"+c[1]+" "+c[2]+" "+c[3]}var t=hr,e=gr,r=Lo;return n.source=function(e){return arguments.length?(t=_t(e),n):t},n.target=function(t){return arguments.length?(e=_t(t),n):e},n.projection=function(t){return arguments.length?(r=t,n):r},n},Xo.svg.diagonal.radial=function(){var n=Xo.svg.diagonal(),t=Lo,e=n.projection;return n.projection=function(n){return arguments.length?e(To(t=n)):t},n},Xo.svg.symbol=function(){function n(n,r){return(Ss.get(t.call(this,n,r))||Ro)(e.call(this,n,r))}var t=zo,e=qo;return n.type=function(e){return arguments.length?(t=_t(e),n):t},n.size=function(t){return arguments.length?(e=_t(t),n):e},n};var Ss=Xo.map({circle:Ro,cross:function(n){var t=Math.sqrt(n/5)/2;return"M"+-3*t+","+-t+"H"+-t+"V"+-3*t+"H"+t+"V"+-t+"H"+3*t+"V"+t+"H"+t+"V"+3*t+"H"+-t+"V"+t+"H"+-3*t+"Z"},diamond:function(n){var t=Math.sqrt(n/(2*Cs)),e=t*Cs;return"M0,"+-t+"L"+e+",0"+" 0,"+t+" "+-e+",0"+"Z"},square:function(n){var t=Math.sqrt(n)/2;return"M"+-t+","+-t+"L"+t+","+-t+" "+t+","+t+" "+-t+","+t+"Z"},"triangle-down":function(n){var t=Math.sqrt(n/As),e=t*As/2;return"M0,"+e+"L"+t+","+-e+" "+-t+","+-e+"Z"},"triangle-up":function(n){var t=Math.sqrt(n/As),e=t*As/2;return"M0,"+-e+"L"+t+","+e+" "+-t+","+e+"Z"}});Xo.svg.symbolTypes=Ss.keys();var ks,Es,As=Math.sqrt(3),Cs=Math.tan(30*Na),Ns=[],Ls=0;Ns.call=da.call,Ns.empty=da.empty,Ns.node=da.node,Ns.size=da.size,Xo.transition=function(n){return arguments.length?ks?n.transition():n:xa.transition()},Xo.transition.prototype=Ns,Ns.select=function(n){var t,e,r,u=this.id,i=[];n=M(n);for(var o=-1,a=this.length;++o<a;){i.push(t=[]);for(var c=this[o],s=-1,l=c.length;++s<l;)(r=c[s])&&(e=n.call(r,r.__data__,s,o))?("__data__"in r&&(e.__data__=r.__data__),jo(e,s,u,r.__transition__[u]),t.push(e)):t.push(null)}return Do(i,u)},Ns.selectAll=function(n){var t,e,r,u,i,o=this.id,a=[];n=_(n);for(var c=-1,s=this.length;++c<s;)for(var l=this[c],f=-1,h=l.length;++f<h;)if(r=l[f]){i=r.__transition__[o],e=n.call(r,r.__data__,f,c),a.push(t=[]);for(var g=-1,p=e.length;++g<p;)(u=e[g])&&jo(u,g,o,i),t.push(u)}return Do(a,o)},Ns.filter=function(n){var t,e,r,u=[];"function"!=typeof n&&(n=q(n));for(var i=0,o=this.length;o>i;i++){u.push(t=[]);for(var e=this[i],a=0,c=e.length;c>a;a++)(r=e[a])&&n.call(r,r.__data__,a,i)&&t.push(r)}return Do(u,this.id)},Ns.tween=function(n,t){var e=this.id;return arguments.length<2?this.node().__transition__[e].tween.get(n):R(this,null==t?function(t){t.__transition__[e].tween.remove(n)}:function(r){r.__transition__[e].tween.set(n,t)})},Ns.attr=function(n,t){function e(){this.removeAttribute(a)}function r(){this.removeAttributeNS(a.space,a.local)}function u(n){return null==n?e:(n+="",function(){var t,e=this.getAttribute(a);return e!==n&&(t=o(e,n),function(n){this.setAttribute(a,t(n))})})}function i(n){return null==n?r:(n+="",function(){var t,e=this.getAttributeNS(a.space,a.local);return e!==n&&(t=o(e,n),function(n){this.setAttributeNS(a.space,a.local,t(n))})})}if(arguments.length<2){for(t in n)this.attr(t,n[t]);return this}var o="transform"==n?Ru:fu,a=Xo.ns.qualify(n);return Po(this,"attr."+n,t,a.local?i:u)},Ns.attrTween=function(n,t){function e(n,e){var r=t.call(this,n,e,this.getAttribute(u));return r&&function(n){this.setAttribute(u,r(n))}}function r(n,e){var r=t.call(this,n,e,this.getAttributeNS(u.space,u.local));return r&&function(n){this.setAttributeNS(u.space,u.local,r(n))}}var u=Xo.ns.qualify(n);return this.tween("attr."+n,u.local?r:e)},Ns.style=function(n,t,e){function r(){this.style.removeProperty(n)}function u(t){return null==t?r:(t+="",function(){var r,u=Go.getComputedStyle(this,null).getPropertyValue(n);return u!==t&&(r=fu(u,t),function(t){this.style.setProperty(n,r(t),e)})})}var i=arguments.length;if(3>i){if("string"!=typeof n){2>i&&(t="");for(e in n)this.style(e,n[e],t);return this}e=""}return Po(this,"style."+n,t,u)},Ns.styleTween=function(n,t,e){function r(r,u){var i=t.call(this,r,u,Go.getComputedStyle(this,null).getPropertyValue(n));return i&&function(t){this.style.setProperty(n,i(t),e)}}return arguments.length<3&&(e=""),this.tween("style."+n,r)},Ns.text=function(n){return Po(this,"text",n,Uo)},Ns.remove=function(){return this.each("end.transition",function(){var n;this.__transition__.count<2&&(n=this.parentNode)&&n.removeChild(this)})},Ns.ease=function(n){var t=this.id;return arguments.length<1?this.node().__transition__[t].ease:("function"!=typeof n&&(n=Xo.ease.apply(Xo,arguments)),R(this,function(e){e.__transition__[t].ease=n}))},Ns.delay=function(n){var t=this.id;return R(this,"function"==typeof n?function(e,r,u){e.__transition__[t].delay=+n.call(e,e.__data__,r,u)}:(n=+n,function(e){e.__transition__[t].delay=n}))},Ns.duration=function(n){var t=this.id;return R(this,"function"==typeof n?function(e,r,u){e.__transition__[t].duration=Math.max(1,n.call(e,e.__data__,r,u))}:(n=Math.max(1,n),function(e){e.__transition__[t].duration=n}))},Ns.each=function(n,t){var e=this.id;if(arguments.length<2){var r=Es,u=ks;ks=e,R(this,function(t,r,u){Es=t.__transition__[e],n.call(t,t.__data__,r,u)}),Es=r,ks=u}else R(this,function(r){var u=r.__transition__[e];(u.event||(u.event=Xo.dispatch("start","end"))).on(n,t)});return this},Ns.transition=function(){for(var n,t,e,r,u=this.id,i=++Ls,o=[],a=0,c=this.length;c>a;a++){o.push(n=[]);for(var t=this[a],s=0,l=t.length;l>s;s++)(e=t[s])&&(r=Object.create(e.__transition__[u]),r.delay+=r.duration,jo(e,s,i,r)),n.push(e)}return Do(o,i)},Xo.svg.axis=function(){function n(n){n.each(function(){var n,s=Xo.select(this),l=this.__chart__||e,f=this.__chart__=e.copy(),h=null==c?f.ticks?f.ticks.apply(f,a):f.domain():c,g=null==t?f.tickFormat?f.tickFormat.apply(f,a):bt:t,p=s.selectAll(".tick").data(h,f),v=p.enter().insert("g",".domain").attr("class","tick").style("opacity",Aa),d=Xo.transition(p.exit()).style("opacity",Aa).remove(),m=Xo.transition(p).style("opacity",1),y=Ri(f),x=s.selectAll(".domain").data([0]),M=(x.enter().append("path").attr("class","domain"),Xo.transition(x));v.append("line"),v.append("text");var _=v.select("line"),b=m.select("line"),w=p.select("text").text(g),S=v.select("text"),k=m.select("text");switch(r){case"bottom":n=Ho,_.attr("y2",u),S.attr("y",Math.max(u,0)+o),b.attr("x2",0).attr("y2",u),k.attr("x",0).attr("y",Math.max(u,0)+o),w.attr("dy",".71em").style("text-anchor","middle"),M.attr("d","M"+y[0]+","+i+"V0H"+y[1]+"V"+i);break;case"top":n=Ho,_.attr("y2",-u),S.attr("y",-(Math.max(u,0)+o)),b.attr("x2",0).attr("y2",-u),k.attr("x",0).attr("y",-(Math.max(u,0)+o)),w.attr("dy","0em").style("text-anchor","middle"),M.attr("d","M"+y[0]+","+-i+"V0H"+y[1]+"V"+-i);break;case"left":n=Fo,_.attr("x2",-u),S.attr("x",-(Math.max(u,0)+o)),b.attr("x2",-u).attr("y2",0),k.attr("x",-(Math.max(u,0)+o)).attr("y",0),w.attr("dy",".32em").style("text-anchor","end"),M.attr("d","M"+-i+","+y[0]+"H0V"+y[1]+"H"+-i);break;case"right":n=Fo,_.attr("x2",u),S.attr("x",Math.max(u,0)+o),b.attr("x2",u).attr("y2",0),k.attr("x",Math.max(u,0)+o).attr("y",0),w.attr("dy",".32em").style("text-anchor","start"),M.attr("d","M"+i+","+y[0]+"H0V"+y[1]+"H"+i)}if(f.rangeBand){var E=f,A=E.rangeBand()/2;l=f=function(n){return E(n)+A}}else l.rangeBand?l=f:d.call(n,f);v.call(n,l),m.call(n,f)})}var t,e=Xo.scale.linear(),r=Ts,u=6,i=6,o=3,a=[10],c=null;return n.scale=function(t){return arguments.length?(e=t,n):e},n.orient=function(t){return arguments.length?(r=t in qs?t+"":Ts,n):r},n.ticks=function(){return arguments.length?(a=arguments,n):a},n.tickValues=function(t){return arguments.length?(c=t,n):c},n.tickFormat=function(e){return arguments.length?(t=e,n):t},n.tickSize=function(t){var e=arguments.length;return e?(u=+t,i=+arguments[e-1],n):u},n.innerTickSize=function(t){return arguments.length?(u=+t,n):u},n.outerTickSize=function(t){return arguments.length?(i=+t,n):i},n.tickPadding=function(t){return arguments.length?(o=+t,n):o},n.tickSubdivide=function(){return arguments.length&&n},n};var Ts="bottom",qs={top:1,right:1,bottom:1,left:1};Xo.svg.brush=function(){function n(i){i.each(function(){var i=Xo.select(this).style("pointer-events","all").style("-webkit-tap-highlight-color","rgba(0,0,0,0)").on("mousedown.brush",u).on("touchstart.brush",u),o=i.selectAll(".background").data([0]);o.enter().append("rect").attr("class","background").style("visibility","hidden").style("cursor","crosshair"),i.selectAll(".extent").data([0]).enter().append("rect").attr("class","extent").style("cursor","move");var a=i.selectAll(".resize").data(p,bt);a.exit().remove(),a.enter().append("g").attr("class",function(n){return"resize "+n}).style("cursor",function(n){return zs[n]}).append("rect").attr("x",function(n){return/[ew]$/.test(n)?-3:null}).attr("y",function(n){return/^[ns]/.test(n)?-3:null}).attr("width",6).attr("height",6).style("visibility","hidden"),a.style("display",n.empty()?"none":null);var l,f=Xo.transition(i),h=Xo.transition(o);c&&(l=Ri(c),h.attr("x",l[0]).attr("width",l[1]-l[0]),e(f)),s&&(l=Ri(s),h.attr("y",l[0]).attr("height",l[1]-l[0]),r(f)),t(f)})}function t(n){n.selectAll(".resize").attr("transform",function(n){return"translate("+l[+/e$/.test(n)]+","+f[+/^s/.test(n)]+")"})}function e(n){n.select(".extent").attr("x",l[0]),n.selectAll(".extent,.n>rect,.s>rect").attr("width",l[1]-l[0])}function r(n){n.select(".extent").attr("y",f[0]),n.selectAll(".extent,.e>rect,.w>rect").attr("height",f[1]-f[0])}function u(){function u(){32==Xo.event.keyCode&&(C||(x=null,L[0]-=l[1],L[1]-=f[1],C=2),d())}function p(){32==Xo.event.keyCode&&2==C&&(L[0]+=l[1],L[1]+=f[1],C=0,d())}function v(){var n=Xo.mouse(_),u=!1;M&&(n[0]+=M[0],n[1]+=M[1]),C||(Xo.event.altKey?(x||(x=[(l[0]+l[1])/2,(f[0]+f[1])/2]),L[0]=l[+(n[0]<x[0])],L[1]=f[+(n[1]<x[1])]):x=null),E&&m(n,c,0)&&(e(S),u=!0),A&&m(n,s,1)&&(r(S),u=!0),u&&(t(S),w({type:"brush",mode:C?"move":"resize"}))}function m(n,t,e){var r,u,a=Ri(t),c=a[0],s=a[1],p=L[e],v=e?f:l,d=v[1]-v[0];return C&&(c-=p,s-=d+p),r=(e?g:h)?Math.max(c,Math.min(s,n[e])):n[e],C?u=(r+=p)+d:(x&&(p=Math.max(c,Math.min(s,2*x[e]-r))),r>p?(u=r,r=p):u=p),v[0]!=r||v[1]!=u?(e?o=null:i=null,v[0]=r,v[1]=u,!0):void 0}function y(){v(),S.style("pointer-events","all").selectAll(".resize").style("display",n.empty()?"none":null),Xo.select("body").style("cursor",null),T.on("mousemove.brush",null).on("mouseup.brush",null).on("touchmove.brush",null).on("touchend.brush",null).on("keydown.brush",null).on("keyup.brush",null),N(),w({type:"brushend"})}var x,M,_=this,b=Xo.select(Xo.event.target),w=a.of(_,arguments),S=Xo.select(_),k=b.datum(),E=!/^(n|s)$/.test(k)&&c,A=!/^(e|w)$/.test(k)&&s,C=b.classed("extent"),N=O(),L=Xo.mouse(_),T=Xo.select(Go).on("keydown.brush",u).on("keyup.brush",p);if(Xo.event.changedTouches?T.on("touchmove.brush",v).on("touchend.brush",y):T.on("mousemove.brush",v).on("mouseup.brush",y),S.interrupt().selectAll("*").interrupt(),C)L[0]=l[0]-L[0],L[1]=f[0]-L[1];else if(k){var q=+/w$/.test(k),z=+/^n/.test(k);M=[l[1-q]-L[0],f[1-z]-L[1]],L[0]=l[q],L[1]=f[z]}else Xo.event.altKey&&(x=L.slice());S.style("pointer-events","none").selectAll(".resize").style("display",null),Xo.select("body").style("cursor",b.style("cursor")),w({type:"brushstart"}),v()}var i,o,a=y(n,"brushstart","brush","brushend"),c=null,s=null,l=[0,0],f=[0,0],h=!0,g=!0,p=Rs[0];return n.event=function(n){n.each(function(){var n=a.of(this,arguments),t={x:l,y:f,i:i,j:o},e=this.__chart__||t;this.__chart__=t,ks?Xo.select(this).transition().each("start.brush",function(){i=e.i,o=e.j,l=e.x,f=e.y,n({type:"brushstart"})}).tween("brush:brush",function(){var e=hu(l,t.x),r=hu(f,t.y);return i=o=null,function(u){l=t.x=e(u),f=t.y=r(u),n({type:"brush",mode:"resize"})}}).each("end.brush",function(){i=t.i,o=t.j,n({type:"brush",mode:"resize"}),n({type:"brushend"})}):(n({type:"brushstart"}),n({type:"brush",mode:"resize"}),n({type:"brushend"}))})},n.x=function(t){return arguments.length?(c=t,p=Rs[!c<<1|!s],n):c},n.y=function(t){return arguments.length?(s=t,p=Rs[!c<<1|!s],n):s},n.clamp=function(t){return arguments.length?(c&&s?(h=!!t[0],g=!!t[1]):c?h=!!t:s&&(g=!!t),n):c&&s?[h,g]:c?h:s?g:null},n.extent=function(t){var e,r,u,a,h;return arguments.length?(c&&(e=t[0],r=t[1],s&&(e=e[0],r=r[0]),i=[e,r],c.invert&&(e=c(e),r=c(r)),e>r&&(h=e,e=r,r=h),(e!=l[0]||r!=l[1])&&(l=[e,r])),s&&(u=t[0],a=t[1],c&&(u=u[1],a=a[1]),o=[u,a],s.invert&&(u=s(u),a=s(a)),u>a&&(h=u,u=a,a=h),(u!=f[0]||a!=f[1])&&(f=[u,a])),n):(c&&(i?(e=i[0],r=i[1]):(e=l[0],r=l[1],c.invert&&(e=c.invert(e),r=c.invert(r)),e>r&&(h=e,e=r,r=h))),s&&(o?(u=o[0],a=o[1]):(u=f[0],a=f[1],s.invert&&(u=s.invert(u),a=s.invert(a)),u>a&&(h=u,u=a,a=h))),c&&s?[[e,u],[r,a]]:c?[e,r]:s&&[u,a])},n.clear=function(){return n.empty()||(l=[0,0],f=[0,0],i=o=null),n},n.empty=function(){return!!c&&l[0]==l[1]||!!s&&f[0]==f[1]},Xo.rebind(n,a,"on")};var zs={n:"ns-resize",e:"ew-resize",s:"ns-resize",w:"ew-resize",nw:"nwse-resize",ne:"nesw-resize",se:"nwse-resize",sw:"nesw-resize"},Rs=[["n","e","s","w","nw","ne","se","sw"],["e","w"],["n","s"],[]],Ds=tc.format=ac.timeFormat,Ps=Ds.utc,Us=Ps("%Y-%m-%dT%H:%M:%S.%LZ");Ds.iso=Date.prototype.toISOString&&+new Date("2000-01-01T00:00:00.000Z")?Oo:Us,Oo.parse=function(n){var t=new Date(n);return isNaN(t)?null:t},Oo.toString=Us.toString,tc.second=Rt(function(n){return new ec(1e3*Math.floor(n/1e3))},function(n,t){n.setTime(n.getTime()+1e3*Math.floor(t))},function(n){return n.getSeconds()}),tc.seconds=tc.second.range,tc.seconds.utc=tc.second.utc.range,tc.minute=Rt(function(n){return new ec(6e4*Math.floor(n/6e4))},function(n,t){n.setTime(n.getTime()+6e4*Math.floor(t))},function(n){return n.getMinutes()}),tc.minutes=tc.minute.range,tc.minutes.utc=tc.minute.utc.range,tc.hour=Rt(function(n){var t=n.getTimezoneOffset()/60;return new ec(36e5*(Math.floor(n/36e5-t)+t))},function(n,t){n.setTime(n.getTime()+36e5*Math.floor(t))},function(n){return n.getHours()}),tc.hours=tc.hour.range,tc.hours.utc=tc.hour.utc.range,tc.month=Rt(function(n){return n=tc.day(n),n.setDate(1),n},function(n,t){n.setMonth(n.getMonth()+t)},function(n){return n.getMonth()}),tc.months=tc.month.range,tc.months.utc=tc.month.utc.range;var js=[1e3,5e3,15e3,3e4,6e4,3e5,9e5,18e5,36e5,108e5,216e5,432e5,864e5,1728e5,6048e5,2592e6,7776e6,31536e6],Hs=[[tc.second,1],[tc.second,5],[tc.second,15],[tc.second,30],[tc.minute,1],[tc.minute,5],[tc.minute,15],[tc.minute,30],[tc.hour,1],[tc.hour,3],[tc.hour,6],[tc.hour,12],[tc.day,1],[tc.day,2],[tc.week,1],[tc.month,1],[tc.month,3],[tc.year,1]],Fs=Ds.multi([[".%L",function(n){return n.getMilliseconds()}],[":%S",function(n){return n.getSeconds()}],["%I:%M",function(n){return n.getMinutes()}],["%I %p",function(n){return n.getHours()}],["%a %d",function(n){return n.getDay()&&1!=n.getDate()}],["%b %d",function(n){return 1!=n.getDate()}],["%B",function(n){return n.getMonth()}],["%Y",be]]),Os={range:function(n,t,e){return Xo.range(Math.ceil(n/e)*e,+t,e).map(Io)},floor:bt,ceil:bt};Hs.year=tc.year,tc.scale=function(){return Yo(Xo.scale.linear(),Hs,Fs)};var Ys=Hs.map(function(n){return[n[0].utc,n[1]]}),Is=Ps.multi([[".%L",function(n){return n.getUTCMilliseconds()}],[":%S",function(n){return n.getUTCSeconds()}],["%I:%M",function(n){return n.getUTCMinutes()}],["%I %p",function(n){return n.getUTCHours()}],["%a %d",function(n){return n.getUTCDay()&&1!=n.getUTCDate()}],["%b %d",function(n){return 1!=n.getUTCDate()}],["%B",function(n){return n.getUTCMonth()}],["%Y",be]]);Ys.year=tc.year.utc,tc.scale.utc=function(){return Yo(Xo.scale.linear(),Ys,Is)},Xo.text=wt(function(n){return n.responseText}),Xo.json=function(n,t){return St(n,"application/json",Zo,t)},Xo.html=function(n,t){return St(n,"text/html",Vo,t)},Xo.xml=wt(function(n){return n.responseXML}),"function"==typeof define&&define.amd?define(Xo):"object"==typeof module&&module.exports?module.exports=Xo:this.d3=Xo}();'use strict';tr.exportTo('tr.ui.b',function(){var THIS_DOC=document.currentScript.ownerDocument;var svgNS='http://www.w3.org/2000/svg';var highlightIdBoost=tr.ui.b.getColorPaletteHighlightIdBoost();function getColorOfKey(key,selected){var id=tr.ui.b.getColorIdForGeneralPurposeString(key);if(selected)
id+=highlightIdBoost;return tr.ui.b.getColorPalette()[id];}
var ChartBase=tr.ui.b.define('svg',undefined,svgNS);ChartBase.prototype={__proto__:HTMLUnknownElement.prototype,decorate:function(){this.classList.add('chart-base');this.chartTitle_=undefined;this.seriesKeys_=undefined;this.width_=400;this.height_=300;var template=THIS_DOC.querySelector('#chart-base-template');var svgEl=template.content.querySelector('svg');for(var i=0;i<svgEl.children.length;i++)
this.appendChild(svgEl.children[i].cloneNode(true));Object.defineProperty(this,'width',{get:function(){return this.width_;},set:function(width){this.width_=width;this.updateContents_();}});Object.defineProperty(this,'height',{get:function(){return this.height_;},set:function(height){this.height_=height;this.updateContents_();}});},get chartTitle(){return this.chartTitle_;},set chartTitle(chartTitle){this.chartTitle_=chartTitle;this.updateContents_();},get chartAreaElement(){return this.querySelector('#chart-area');},setSize:function(size){this.width_=size.width;this.height_=size.height;this.updateContents_();},get margin(){var margin={top:20,right:20,bottom:30,left:50};if(this.chartTitle_)
@@ -4219,7 +4263,7 @@
return;this.samples_=(samples===undefined)?new tr.model.EventSet():samples;this.updateContents_();},updateContents_:function(){if(this.samples.length===0){this.$.table.tableRows=[];}else{this.$.table.tableRows=[{min:this.getMin(),max:this.getMax(),timeWeightedAverage:this.getTimeWeightedAverage(),energyConsumed:this.getEnergyConsumed(),sampleCount:this.samples.length}];}
this.$.table.rebuild();},getMin:function(){return Math.min.apply(null,this.samples.map(function(sample){return sample.power;}));},getMax:function(){return Math.max.apply(null,this.samples.map(function(sample){return sample.power;}));},getTimeWeightedAverage:function(){var energyConsumed=this.getEnergyConsumed();if(energyConsumed==='N/A')
return'N/A';return this.getEnergyConsumed()/this.samples.bounds.duration*1000;},getEnergyConsumed:function(){if(this.samples.length<2)
-return'N/A';var bounds=this.samples.bounds;return this.samples[0].series.getEnergyConsumed(bounds.min,bounds.max);}});'use strict';var EventSet=tr.model.EventSet;Polymer('tr-ui-a-power-sample-table',{ready:function(){this.$.table.tableColumns=[{title:'Time',width:'100px',value:function(row){return tr.ui.units.createTimeStampSpan(row.start);}},{title:'Power (mW)',width:'100%',value:function(row){return row.power;}}];this.samples=new EventSet();},get samples(){return this.samples_;},set samples(samples){this.samples_=(samples===undefined)?new EventSet():samples;this.updateContents_();},updateContents_:function(){this.$.table.tableRows=this.samples.toArray();this.$.table.rebuild();}});'use strict';Polymer('tr-ui-a-multi-power-sample-sub-view',{ready:function(){this.currentSelection_=undefined;},get selection(){return this.currentSelection_;},set selection(selection){this.currentSelection_=selection;this.updateContents_();},updateContents_:function(){var samples=this.selection;var vSyncTimestamps=(this.selection===undefined)?[]:this.selection[0].series.device.vSyncTimestamps;this.$.summaryTable.samples=samples;this.$.samplesTable.samples=samples;this.$.chart.setData(this.selection,vSyncTimestamps);}});'use strict';(function(){var EventRegistry=tr.model.EventRegistry;Polymer('tr-ui-a-analysis-view',{ready:function(){this.tabView_=document.createElement('tr-ui-a-tab-view');this.tabView_.style.flex='1 1 auto';this.appendChild(this.tabView_);this.brushingStateController_=undefined;this.onSelectedTabChange_=this.onSelectedTabChange_.bind(this);this.onSelectionChanged_=this.onSelectionChanged_.bind(this);this.lastSeenSelection_=new tr.model.EventSet();},set tallMode(value){if(value)
+return'N/A';var bounds=this.samples.bounds;return this.samples[0].series.getEnergyConsumed(bounds.min,bounds.max);}});'use strict';Polymer('tr-ui-a-multi-power-sample-sub-view',{ready:function(){this.currentSelection_=undefined;},get selection(){return this.currentSelection_;},set selection(selection){this.currentSelection_=selection;this.updateContents_();},updateContents_:function(){var samples=this.selection;var vSyncTimestamps=(this.selection===undefined)?[]:this.selection[0].series.device.vSyncTimestamps;this.$.summaryTable.samples=samples;this.$.samplesTable.samples=samples;this.$.chart.setData(this.selection,vSyncTimestamps);}});'use strict';(function(){var EventRegistry=tr.model.EventRegistry;Polymer('tr-ui-a-analysis-view',{ready:function(){this.tabView_=document.createElement('tr-ui-a-tab-view');this.tabView_.style.flex='1 1 auto';this.appendChild(this.tabView_);this.brushingStateController_=undefined;this.onSelectedTabChange_=this.onSelectedTabChange_.bind(this);this.onSelectionChanged_=this.onSelectionChanged_.bind(this);this.lastSeenSelection_=new tr.model.EventSet();},set tallMode(value){if(value)
this.classList.add('tall-mode');else
this.classList.remove('tall-mode');},get tallMode(){return this.classList.contains('tall-mode');},get tabView(){return this.tabView_;},get brushingStateController(){return this.brushingStateController_;},set brushingStateController(brushingStateController){if(this.brushingStateController){this.brushingStateController_.removeEventListener('change',this.onSelectionChanged_);}
this.brushingStateController_=brushingStateController;if(this.brushingStateController){this.brushingStateController_.addEventListener('change',this.onSelectionChanged_);}
@@ -4368,7 +4412,7 @@
tr.b.Settings.set(this.settingsKey_+'.pos',this.pos);},constrainPositionToBounds_:function(pos){var parent=this.offsetParent||document.body;var parentRect=tr.ui.b.windowRectForElement(parent);var top=0;var bottom=parentRect.height-this.offsetHeight;var left=0;var right=parentRect.width-this.offsetWidth;var res={};res.x=Math.max(pos.x,left);res.x=Math.min(res.x,right);res.y=Math.max(pos.y,top);res.y=Math.min(res.y,bottom);return res;},onDragHandleMouseDown_:function(e){e.preventDefault();e.stopImmediatePropagation();var mouseDownPos={x:e.clientX-this.offsetLeft,y:e.clientY-this.offsetTop};tr.ui.b.trackMouseMovesUntilMouseUp(function(e){var pos={};pos.x=e.clientX-mouseDownPos.x;pos.y=e.clientY-mouseDownPos.y;this.pos=pos;}.bind(this));},checkIsClick_:function(e){if(!this.isInteracting_||!this.isClick_)
return;var deltaX=this.mousePos_.x-this.mouseDownPos_.x;var deltaY=this.mousePos_.y-this.mouseDownPos_.y;var minDist=MIN_MOUSE_SELECTION_DISTANCE;if(deltaX*deltaX+deltaY*deltaY>minDist*minDist)
this.isClick_=false;},dispatchClickEvents_:function(e){if(!this.isClick_)
-return;var modeInfo=MOUSE_SELECTOR_MODE_INFOS[MOUSE_SELECTOR_MODE.SELECTION];var eventNames=modeInfo.eventNames;var mouseEvent=this.createEvent_(eventNames.begin);this.dispatchEvent(mouseEvent);mouseEvent=this.createEvent_(eventNames.end);this.dispatchEvent(mouseEvent);}});return{MIN_MOUSE_SELECTION_DISTANCE:MIN_MOUSE_SELECTION_DISTANCE,MODIFIER:MODIFIER};});'use strict';tr.exportTo('tr.c',function(){var constants={HEADING_WIDTH:250};return{constants:constants};});'use strict';tr.exportTo('tr.ui.b',function(){var constants=tr.c.constants;function TimingTool(viewport,targetElement){this.viewport_=viewport;this.onMouseMove_=this.onMouseMove_.bind(this);this.onDblClick_=this.onDblClick_.bind(this);this.targetElement_=targetElement;this.isMovingLeftEdge_=false;};TimingTool.prototype={onEnterTiming:function(e){this.targetElement_.addEventListener('mousemove',this.onMouseMove_);this.targetElement_.addEventListener('dblclick',this.onDblClick_);},onBeginTiming:function(e){if(!this.isTouchPointInsideTrackBounds_(e.clientX,e.clientY))
+return;var modeInfo=MOUSE_SELECTOR_MODE_INFOS[MOUSE_SELECTOR_MODE.SELECTION];var eventNames=modeInfo.eventNames;var mouseEvent=this.createEvent_(eventNames.begin);this.dispatchEvent(mouseEvent);mouseEvent=this.createEvent_(eventNames.end);this.dispatchEvent(mouseEvent);}});return{MIN_MOUSE_SELECTION_DISTANCE:MIN_MOUSE_SELECTION_DISTANCE,MODIFIER:MODIFIER};});'use strict';tr.exportTo('tr.ui.b',function(){function TimingTool(viewport,targetElement){this.viewport_=viewport;this.onMouseMove_=this.onMouseMove_.bind(this);this.onDblClick_=this.onDblClick_.bind(this);this.targetElement_=targetElement;this.isMovingLeftEdge_=false;};TimingTool.prototype={onEnterTiming:function(e){this.targetElement_.addEventListener('mousemove',this.onMouseMove_);this.targetElement_.addEventListener('dblclick',this.onDblClick_);},onBeginTiming:function(e){if(!this.isTouchPointInsideTrackBounds_(e.clientX,e.clientY))
return;var pt=this.getSnappedToEventPosition_(e);this.mouseDownAt_(pt.x,pt.y);this.updateSnapIndicators_(pt);},updateSnapIndicators_:function(pt){if(!pt.snapped)
return;var ir=this.viewport_.interestRange;if(ir.min===pt.x)
ir.leftSnapIndicator=new tr.ui.SnapIndicator(pt.y,pt.height);if(ir.max===pt.x)
@@ -4412,18 +4456,18 @@
throw new Error('Parent container does not support context() method.');return this.parentNode.context();},decorateChild_:function(childTrack){},undecorateChild_:function(childTrack){if(childTrack.detach)
childTrack.detach();},updateContents_:function(){},drawTrack:function(type){var ctx=this.context();var pixelRatio=window.devicePixelRatio||1;var bounds=this.getBoundingClientRect();var canvasBounds=ctx.canvas.getBoundingClientRect();ctx.save();ctx.translate(0,pixelRatio*(bounds.top-canvasBounds.top));var dt=this.viewport.currentDisplayTransform;var viewLWorld=dt.xViewToWorld(0);var viewRWorld=dt.xViewToWorld(bounds.width*pixelRatio);this.draw(type,viewLWorld,viewRWorld);ctx.restore();},draw:function(type,viewLWorld,viewRWorld){},addEventsToTrackMap:function(eventToTrackMap){},addContainersToTrackMap:function(containerToTrackMap){},addIntersectingEventsInRangeToSelection:function(loVX,hiVX,loVY,hiVY,selection){var pixelRatio=window.devicePixelRatio||1;var dt=this.viewport.currentDisplayTransform;var viewPixWidthWorld=dt.xViewVectorToWorld(1);var loWX=dt.xViewToWorld(loVX*pixelRatio);var hiWX=dt.xViewToWorld(hiVX*pixelRatio);var clientRect=this.getBoundingClientRect();var a=Math.max(loVY,clientRect.top);var b=Math.min(hiVY,clientRect.bottom);if(a>b)
return;this.addIntersectingEventsInRangeToSelectionInWorldSpace(loWX,hiWX,viewPixWidthWorld,selection);},addIntersectingEventsInRangeToSelectionInWorldSpace:function(loWX,hiWX,viewPixWidthWorld,selection){},addClosestEventToSelection:function(worldX,worldMaxDist,loY,hiY,selection){},addClosestInstantEventToSelection:function(instantEvents,worldX,worldMaxDist,selection){var instantEvent=tr.b.findClosestElementInSortedArray(instantEvents,function(x){return x.start;},worldX,worldMaxDist);if(!instantEvent)
-return;selection.push(instantEvent);}};return{Track:Track};});'use strict';tr.exportTo('tr.ui.tracks',function(){var DrawType={GENERAL_EVENT:1,INSTANT_EVENT:2,BACKGROUND:3,GRID:4,FLOW_ARROWS:5,MARKERS:6,HIGHLIGHTS:7,ANNOTATIONS:8};var DrawingContainer=tr.ui.b.define('drawing-container',tr.ui.tracks.Track);DrawingContainer.prototype={__proto__:tr.ui.tracks.Track.prototype,decorate:function(viewport){tr.ui.tracks.Track.prototype.decorate.call(this,viewport);this.classList.add('drawing-container');this.canvas_=document.createElement('canvas');this.canvas_.className='drawing-container-canvas';this.canvas_.style.left=tr.c.constants.HEADING_WIDTH+'px';this.appendChild(this.canvas_);this.ctx_=this.canvas_.getContext('2d');this.viewportChange_=this.viewportChange_.bind(this);this.viewport.addEventListener('change',this.viewportChange_);},get canvas(){return this.canvas_;},context:function(){return this.ctx_;},viewportChange_:function(){this.invalidate();},invalidate:function(){if(this.rafPending_)
+return;selection.push(instantEvent);}};return{Track:Track};});'use strict';tr.exportTo('tr.ui.b',function(){var constants={HEADING_WIDTH:250};return{constants:constants};});'use strict';tr.exportTo('tr.ui.tracks',function(){var DrawType={GENERAL_EVENT:1,INSTANT_EVENT:2,BACKGROUND:3,GRID:4,FLOW_ARROWS:5,MARKERS:6,HIGHLIGHTS:7,ANNOTATIONS:8};var DrawingContainer=tr.ui.b.define('drawing-container',tr.ui.tracks.Track);DrawingContainer.prototype={__proto__:tr.ui.tracks.Track.prototype,decorate:function(viewport){tr.ui.tracks.Track.prototype.decorate.call(this,viewport);this.classList.add('drawing-container');this.canvas_=document.createElement('canvas');this.canvas_.className='drawing-container-canvas';this.canvas_.style.left=tr.ui.b.constants.HEADING_WIDTH+'px';this.appendChild(this.canvas_);this.ctx_=this.canvas_.getContext('2d');this.viewportChange_=this.viewportChange_.bind(this);this.viewport.addEventListener('change',this.viewportChange_);},get canvas(){return this.canvas_;},context:function(){return this.ctx_;},viewportChange_:function(){this.invalidate();},invalidate:function(){if(this.rafPending_)
return;this.rafPending_=true;tr.b.requestPreAnimationFrame(this.preDraw_,this);},preDraw_:function(){this.rafPending_=false;this.updateCanvasSizeIfNeeded_();tr.b.requestAnimationFrameInThisFrameIfPossible(this.draw_,this);},draw_:function(){this.ctx_.clearRect(0,0,this.canvas_.width,this.canvas_.height);var typesToDraw=[DrawType.BACKGROUND,DrawType.HIGHLIGHTS,DrawType.GRID,DrawType.INSTANT_EVENT,DrawType.GENERAL_EVENT,DrawType.MARKERS,DrawType.ANNOTATIONS,DrawType.FLOW_ARROWS];for(var idx in typesToDraw){for(var i=0;i<this.children.length;++i){if(!(this.children[i]instanceof tr.ui.tracks.Track))
continue;this.children[i].drawTrack(typesToDraw[idx]);}}
var pixelRatio=window.devicePixelRatio||1;var bounds=this.canvas_.getBoundingClientRect();var dt=this.viewport.currentDisplayTransform;var viewLWorld=dt.xViewToWorld(0);var viewRWorld=dt.xViewToWorld(bounds.width*pixelRatio);this.viewport.drawGridLines(this.ctx_,viewLWorld,viewRWorld);},updateCanvasSizeIfNeeded_:function(){var visibleChildTracks=tr.b.asArray(this.children).filter(this.visibleFilter_);var thisBounds=this.getBoundingClientRect();var firstChildTrackBounds=visibleChildTracks[0].getBoundingClientRect();var lastChildTrackBounds=visibleChildTracks[visibleChildTracks.length-1].getBoundingClientRect();var innerWidth=firstChildTrackBounds.width-
-tr.c.constants.HEADING_WIDTH;var innerHeight=lastChildTrackBounds.bottom-firstChildTrackBounds.top;var pixelRatio=window.devicePixelRatio||1;if(this.canvas_.width!=innerWidth*pixelRatio){this.canvas_.width=innerWidth*pixelRatio;this.canvas_.style.width=innerWidth+'px';}
+tr.ui.b.constants.HEADING_WIDTH;var innerHeight=lastChildTrackBounds.bottom-firstChildTrackBounds.top;var pixelRatio=window.devicePixelRatio||1;if(this.canvas_.width!=innerWidth*pixelRatio){this.canvas_.width=innerWidth*pixelRatio;this.canvas_.style.width=innerWidth+'px';}
if(this.canvas_.height!=innerHeight*pixelRatio){this.canvas_.height=innerHeight*pixelRatio;this.canvas_.style.height=innerHeight+'px';}},visibleFilter_:function(element){if(!(element instanceof tr.ui.tracks.Track))
return false;return window.getComputedStyle(element).display!=='none';},addClosestEventToSelection:function(worldX,worldMaxDist,loY,hiY,selection){for(var i=0;i<this.children.length;++i){if(!(this.children[i]instanceof tr.ui.tracks.Track))
continue;var trackClientRect=this.children[i].getBoundingClientRect();var a=Math.max(loY,trackClientRect.top);var b=Math.min(hiY,trackClientRect.bottom);if(a<=b){this.children[i].addClosestEventToSelection(worldX,worldMaxDist,loY,hiY,selection);}}
tr.ui.tracks.Track.prototype.addClosestEventToSelection.apply(this,arguments);},addEventsToTrackMap:function(eventToTrackMap){for(var i=0;i<this.children.length;++i){if(!(this.children[i]instanceof tr.ui.tracks.Track))
continue;this.children[i].addEventsToTrackMap(eventToTrackMap);}},addContainersToTrackMap:function(containerToTrackMap){for(var i=0;i<this.children.length;++i){if(!(this.children[i]instanceof tr.ui.tracks.Track))
continue;this.children[i].addContainersToTrackMap(containerToTrackMap);}}};return{DrawingContainer:DrawingContainer,DrawType:DrawType};});'use strict';tr.exportTo('tr.model',function(){var SelectableItem=tr.model.SelectableItem;var SelectionState=tr.model.SelectionState;function ProxySelectableItem(modelItem){SelectableItem.call(this,modelItem);};ProxySelectableItem.prototype={__proto__:SelectableItem.prototype,get selectionState(){var modelItem=this.modelItem_;if(modelItem===undefined)
-return SelectionState.NONE;return modelItem.selectionState;}};return{ProxySelectableItem:ProxySelectableItem};});'use strict';Polymer('tr-ui-heading',{DOWN_ARROW:String.fromCharCode(0x25BE),RIGHT_ARROW:String.fromCharCode(0x25B8),ready:function(viewport){this.style.width=(tr.c.constants.HEADING_WIDTH-6)+'px';this.heading_='';this.expanded_=true;this.arrowVisible_=false;this.selectionGenerator_=undefined;this.updateContents_();},get heading(){return this.heading_;},set heading(text){if(this.heading_===text)
+return SelectionState.NONE;return modelItem.selectionState;}};return{ProxySelectableItem:ProxySelectableItem};});'use strict';Polymer('tr-ui-heading',{DOWN_ARROW:String.fromCharCode(0x25BE),RIGHT_ARROW:String.fromCharCode(0x25B8),ready:function(viewport){this.style.width=(tr.ui.b.constants.HEADING_WIDTH-6)+'px';this.heading_='';this.expanded_=true;this.arrowVisible_=false;this.selectionGenerator_=undefined;this.updateContents_();},get heading(){return this.heading_;},set heading(text){if(this.heading_===text)
return;this.heading_=text;this.updateContents_();},set arrowVisible(val){if(this.arrowVisible_===val)
return;this.arrowVisible_=!!val;this.updateContents_();},set tooltip(text){this.$.heading.title=text;},set selectionGenerator(generator){if(this.selectionGenerator_===generator)
return;this.selectionGenerator_=generator;this.updateContents_();},get expanded(){return this.expanded_;},set expanded(expanded){if(this.expanded_===expanded)
@@ -4441,10 +4485,9 @@
return false;},addAllEventsMatchingFilterToSelection:function(filter,selection){},addClosestEventToSelection:function(worldX,worldMaxDist,loY,hiY,selection){if(this.items_===undefined)
return;var item=tr.b.findClosestElementInSortedArray(this.items_,function(x){return x.start;},worldX,worldMaxDist);if(!item)
return;item.addToSelection(selection);}};function LetterDot(modelItem,dotLetter,colorId,start){tr.model.ProxySelectableItem.call(this,modelItem);this.dotLetter=dotLetter;this.colorId=colorId;this.start=start;};LetterDot.prototype={__proto__:tr.model.ProxySelectableItem.prototype};return{LetterDotTrack:LetterDotTrack,LetterDot:LetterDot};});'use strict';tr.exportTo('tr.ui.tracks',function(){var AlertTrack=tr.ui.b.define('alert-track',tr.ui.tracks.LetterDotTrack);AlertTrack.prototype={__proto__:tr.ui.tracks.LetterDotTrack.prototype,decorate:function(viewport){tr.ui.tracks.LetterDotTrack.prototype.decorate.call(this,viewport);this.heading='Alerts';this.alerts_=undefined;},get alerts(){return this.alerts_;},set alerts(alerts){this.alerts_=alerts;if(alerts===undefined){this.items=undefined;return;}
-this.items=this.alerts_.map(function(alert){return new tr.ui.tracks.LetterDot(alert,String.fromCharCode(9888),alert.colorId,alert.start);});}};return{AlertTrack:AlertTrack};});'use strict';tr.exportTo('tr.ui.tracks',function(){var Task=tr.b.Task;var ContainerTrack=tr.ui.b.define('container-track',tr.ui.tracks.Track);ContainerTrack.prototype={__proto__:tr.ui.tracks.Track.prototype,decorate:function(viewport){tr.ui.tracks.Track.prototype.decorate.call(this,viewport);},detach:function(){this.textContent='';},get tracks_(){var tracks=[];for(var i=0;i<this.children.length;i++){if(this.children[i].classList.contains('track'))
+this.items=this.alerts_.map(function(alert){return new tr.ui.tracks.LetterDot(alert,String.fromCharCode(9888),alert.colorId,alert.start);});}};return{AlertTrack:AlertTrack};});'use strict';tr.exportTo('tr.ui.tracks',function(){var Task=tr.b.Task;var ContainerTrack=tr.ui.b.define('container-track',tr.ui.tracks.Track);ContainerTrack.prototype={__proto__:tr.ui.tracks.Track.prototype,decorate:function(viewport){tr.ui.tracks.Track.prototype.decorate.call(this,viewport);},detach:function(){this.textContent='';},get tracks_(){var tracks=[];for(var i=0;i<this.children.length;i++){if(this.children[i]instanceof tr.ui.tracks.Track)
tracks.push(this.children[i]);}
-return tracks;},drawTrack:function(type){for(var i=0;i<this.children.length;++i){if(!(this.children[i]instanceof tr.ui.tracks.Track))
-continue;this.children[i].drawTrack(type);}},addIntersectingEventsInRangeToSelection:function(loVX,hiVX,loY,hiY,selection){for(var i=0;i<this.tracks_.length;i++){var trackClientRect=this.tracks_[i].getBoundingClientRect();var a=Math.max(loY,trackClientRect.top);var b=Math.min(hiY,trackClientRect.bottom);if(a<=b)
+return tracks;},drawTrack:function(type){this.tracks_.forEach(function(track){track.drawTrack(type);});},addIntersectingEventsInRangeToSelection:function(loVX,hiVX,loY,hiY,selection){for(var i=0;i<this.tracks_.length;i++){var trackClientRect=this.tracks_[i].getBoundingClientRect();var a=Math.max(loY,trackClientRect.top);var b=Math.min(hiY,trackClientRect.bottom);if(a<=b)
this.tracks_[i].addIntersectingEventsInRangeToSelection(loVX,hiVX,loY,hiY,selection);}
tr.ui.tracks.Track.prototype.addIntersectingEventsInRangeToSelection.apply(this,arguments);},addEventsToTrackMap:function(eventToTrackMap){for(var i=0;i<this.children.length;++i)
this.children[i].addEventsToTrackMap(eventToTrackMap);},addAllEventsMatchingFilterToSelection:function(filter,selection){for(var i=0;i<this.tracks_.length;i++)
@@ -4502,16 +4545,17 @@
var axisGuidToAxisData={};var topPadding=0;var bottomPadding=0;this.series_.forEach(function(series){var axis=series.axis;var axisGuid=axis.guid;if(!(axisGuid in axisGuidToAxisData)){axisGuidToAxisData[axisGuid]={axis:axis,series:[]};}
axisGuidToAxisData[axisGuid].series.push(series);topPadding=Math.max(topPadding,series.topPadding);bottomPadding=Math.max(bottomPadding,series.bottomPadding);},this);this.axisGuidToAxisData_=axisGuidToAxisData;this.topPadding_=topPadding;this.bottomPadding_=bottomPadding;},draw:function(type,viewLWorld,viewRWorld){switch(type){case tr.ui.tracks.DrawType.GENERAL_EVENT:this.drawChart_(viewLWorld,viewRWorld);break;}},drawChart_:function(viewLWorld,viewRWorld){if(!this.series_)
return;var ctx=this.context();var displayTransform=this.viewport.currentDisplayTransform;var pixelRatio=window.devicePixelRatio||1;var bounds=this.getBoundingClientRect();var highDetails=this.viewport.highDetails;var width=bounds.width*pixelRatio;var height=bounds.height*pixelRatio;var topPadding=this.topPadding_*pixelRatio;var bottomPadding=this.bottomPadding_*pixelRatio;ctx.save();ctx.beginPath();ctx.rect(0,0,width,height);ctx.clip();this.series_.forEach(function(series){var chartTransform=new tr.ui.tracks.ChartTransform(displayTransform,series.axis,width,height,topPadding,bottomPadding,pixelRatio);series.draw(ctx,chartTransform,highDetails);},this);ctx.restore();},addEventsToTrackMap:function(eventToTrackMap){this.series_.forEach(function(series){series.points.forEach(function(point){point.addToTrackMap(eventToTrackMap,this);},this);},this);},addIntersectingEventsInRangeToSelectionInWorldSpace:function(loWX,hiWX,viewPixWidthWorld,selection){this.series_.forEach(function(series){series.addIntersectingEventsInRangeToSelectionInWorldSpace(loWX,hiWX,viewPixWidthWorld,selection);},this);},addEventNearToProvidedEventToSelection:function(event,offset,selection){var foundItem=false;this.series_.forEach(function(series){foundItem=foundItem||series.addEventNearToProvidedEventToSelection(event,offset,selection);},this);return foundItem;},addAllEventsMatchingFilterToSelection:function(filter,selection){},addClosestEventToSelection:function(worldX,worldMaxDist,loY,hiY,selection){this.series_.forEach(function(series){series.addClosestEventToSelection(worldX,worldMaxDist,loY,hiY,selection);},this);},autoSetAllAxes:function(opt_config){tr.b.iterItems(this.axisGuidToAxisData_,function(axisGuid,axisData){var axis=axisData.axis;var series=axisData.series;axis.autoSetFromSeries(series,opt_config);},this);},autoSetAxis:function(axis,opt_config){var series=this.axisGuidToAxisData_[axis.guid].series;axis.autoSetFromSeries(series,opt_config);}};return{ChartTrack:ChartTrack};});'use strict';tr.exportTo('tr.ui.tracks',function(){var ChartTrack=tr.ui.tracks.ChartTrack;var PowerSeriesTrack=tr.ui.b.define('power-series-track',ChartTrack);PowerSeriesTrack.prototype={__proto__:ChartTrack.prototype,decorate:function(viewport){ChartTrack.prototype.decorate.call(this,viewport);this.classList.add('power-series-track');this.heading='Power';this.powerSeries_=undefined;},set powerSeries(powerSeries){this.powerSeries_=powerSeries;this.series=this.buildChartSeries_();this.autoSetAllAxes({expandMax:true});},get hasVisibleContent(){return(this.powerSeries_&&this.powerSeries_.samples.length>0);},addContainersToTrackMap:function(containerToTrackMap){containerToTrackMap.addContainer(this.powerSeries_,this);},buildChartSeries_:function(){if(!this.hasVisibleContent)
-return[];var axis=new tr.ui.tracks.ChartAxis(0,undefined);var pts=this.powerSeries_.samples.map(function(smpl){return new tr.ui.tracks.ChartPoint(smpl,smpl.start,smpl.power);});var renderingConfig={chartType:tr.ui.tracks.ChartSeriesType.AREA,colorId:tr.ui.b.getColorIdForGeneralPurposeString(this.heading)};return[new tr.ui.tracks.ChartSeries(pts,axis,renderingConfig)];}};return{PowerSeriesTrack:PowerSeriesTrack};});'use strict';tr.exportTo('tr.ui.tracks',function(){var SpacingTrack=tr.ui.b.define('spacing-track',tr.ui.tracks.Track);SpacingTrack.prototype={__proto__:tr.ui.tracks.Track.prototype,decorate:function(viewport){tr.ui.tracks.Track.prototype.decorate.call(this,viewport);this.classList.add('spacing-track');this.heading_=document.createElement('tr-ui-heading');this.appendChild(this.heading_);},draw:function(type,viewLWorld,viewRWorld){},addAllEventsMatchingFilterToSelection:function(filter,selection){}};return{SpacingTrack:SpacingTrack};});'use strict';tr.exportTo('tr.ui.tracks',function(){var ContainerTrack=tr.ui.tracks.ContainerTrack;var DeviceTrack=tr.ui.b.define('device-track',ContainerTrack);DeviceTrack.prototype={__proto__:ContainerTrack.prototype,decorate:function(viewport){ContainerTrack.prototype.decorate.call(this,viewport);this.classList.add('device-track');this.device_=undefined;this.powerSeriesTrack_=undefined;},get device(){return this.device_;},set device(device){this.device_=device;this.updateContents_();},get powerSeriesTrack(){return this.powerSeriesTrack_;},get hasVisibleContent(){return(this.powerSeriesTrack_&&this.powerSeriesTrack_.hasVisibleContent);},addContainersToTrackMap:function(containerToTrackMap){containerToTrackMap.addContainer(this.device,this);this.tracks_.forEach(function(track){track.addContainersToTrackMap(containerToTrackMap);});},addEventsToTrackMap:function(eventToTrackMap){this.tracks_.forEach(function(track){track.addEventsToTrackMap(eventToTrackMap);});},appendPowerSeriesTrack_:function(){this.powerSeriesTrack_=new tr.ui.tracks.PowerSeriesTrack(this.viewport);this.powerSeriesTrack_.powerSeries=this.device.powerSeries;if(this.powerSeriesTrack_.hasVisibleContent){this.appendChild(this.powerSeriesTrack_);this.appendChild(new tr.ui.tracks.SpacingTrack(this.viewport));}},updateContents_:function(){this.clearTracks_();this.appendPowerSeriesTrack_();}};return{DeviceTrack:DeviceTrack};});'use strict';tr.exportTo('tr.ui.tracks',function(){var ALLOCATOR_SIZE_ATTRIBUTE_NAME='size';function addDictionary(dstDict,srcDict){tr.b.iterItems(srcDict,function(key,value){var existingValue=dstDict[key];if(existingValue===undefined)
+return[];var axis=new tr.ui.tracks.ChartAxis(0,undefined);var pts=this.powerSeries_.samples.map(function(smpl){return new tr.ui.tracks.ChartPoint(smpl,smpl.start,smpl.power);});var renderingConfig={chartType:tr.ui.tracks.ChartSeriesType.AREA,colorId:tr.ui.b.getColorIdForGeneralPurposeString(this.heading)};return[new tr.ui.tracks.ChartSeries(pts,axis,renderingConfig)];}};return{PowerSeriesTrack:PowerSeriesTrack};});'use strict';tr.exportTo('tr.ui.tracks',function(){var SpacingTrack=tr.ui.b.define('spacing-track',tr.ui.tracks.Track);SpacingTrack.prototype={__proto__:tr.ui.tracks.Track.prototype,decorate:function(viewport){tr.ui.tracks.Track.prototype.decorate.call(this,viewport);this.classList.add('spacing-track');this.heading_=document.createElement('tr-ui-heading');this.appendChild(this.heading_);},draw:function(type,viewLWorld,viewRWorld){},addAllEventsMatchingFilterToSelection:function(filter,selection){}};return{SpacingTrack:SpacingTrack};});'use strict';tr.exportTo('tr.ui.tracks',function(){var ContainerTrack=tr.ui.tracks.ContainerTrack;var DeviceTrack=tr.ui.b.define('device-track',ContainerTrack);DeviceTrack.prototype={__proto__:ContainerTrack.prototype,decorate:function(viewport){ContainerTrack.prototype.decorate.call(this,viewport);this.classList.add('device-track');this.device_=undefined;this.powerSeriesTrack_=undefined;},get device(){return this.device_;},set device(device){this.device_=device;this.updateContents_();},get powerSeriesTrack(){return this.powerSeriesTrack_;},get hasVisibleContent(){return(this.powerSeriesTrack_&&this.powerSeriesTrack_.hasVisibleContent);},addContainersToTrackMap:function(containerToTrackMap){containerToTrackMap.addContainer(this.device,this);this.tracks_.forEach(function(track){track.addContainersToTrackMap(containerToTrackMap);});},addEventsToTrackMap:function(eventToTrackMap){this.tracks_.forEach(function(track){track.addEventsToTrackMap(eventToTrackMap);});},appendPowerSeriesTrack_:function(){this.powerSeriesTrack_=new tr.ui.tracks.PowerSeriesTrack(this.viewport);this.powerSeriesTrack_.powerSeries=this.device.powerSeries;if(this.powerSeriesTrack_.hasVisibleContent){this.appendChild(this.powerSeriesTrack_);this.appendChild(new tr.ui.tracks.SpacingTrack(this.viewport));}},updateContents_:function(){this.clearTracks_();this.appendPowerSeriesTrack_();}};return{DeviceTrack:DeviceTrack};});'use strict';tr.exportTo('tr.ui.tracks',function(){var DISPLAYED_SIZE_ATTRIBUTE_NAME=tr.model.MemoryAllocatorDump.DISPLAYED_SIZE_ATTRIBUTE_NAME;function addDictionary(dstDict,srcDict){tr.b.iterItems(srcDict,function(key,value){var existingValue=dstDict[key];if(existingValue===undefined)
existingValue=0;dstDict[key]=existingValue+value;});}
function getProcessMemoryDumpAllocatorSizes(processMemoryDump){var allocatorDumps=processMemoryDump.memoryAllocatorDumps;if(allocatorDumps===undefined)
return{};var allocatorSizes={};allocatorDumps.forEach(function(allocatorDump){if(allocatorDump.fullName==='tracing')
-return;var allocatorSize=allocatorDump.attributes[ALLOCATOR_SIZE_ATTRIBUTE_NAME];if(allocatorSize===undefined)
+return;var allocatorSize=allocatorDump.attributes[DISPLAYED_SIZE_ATTRIBUTE_NAME];if(allocatorSize===undefined)
return;var allocatorSizeValue=allocatorSize.value;if(allocatorSizeValue===undefined)
return;allocatorSizes[allocatorDump.fullName]=allocatorSizeValue;});return allocatorSizes;};function getGlobalMemoryDumpAllocatorSizes(globalMemoryDump){var globalAllocatorSizes={};tr.b.iterItems(globalMemoryDump.processMemoryDumps,function(pid,processMemoryDump){addDictionary(globalAllocatorSizes,getProcessMemoryDumpAllocatorSizes(processMemoryDump));});return globalAllocatorSizes;}
function buildAllocatedMemoryChartSeries(memoryDumps,memoryDumpToAllocatorSizesFn){var allocatorNameToPoints={};var dumpsData=memoryDumps.map(function(memoryDump){var allocatorSizes=memoryDumpToAllocatorSizesFn(memoryDump);tr.b.iterItems(allocatorSizes,function(allocatorName){allocatorNameToPoints[allocatorName]=[];});return{dump:memoryDump,sizes:allocatorSizes};});if(Object.keys(allocatorNameToPoints).length===0)
return undefined;dumpsData.forEach(function(dumpData){var memoryDump=dumpData.dump;var allocatorSizes=dumpData.sizes;tr.b.iterItems(allocatorNameToPoints,function(allocatorName,points){var allocatorSize=allocatorSizes[allocatorName]||0;points.push(new tr.ui.tracks.ChartPoint(memoryDump,memoryDump.start,allocatorSize));});});var axis=new tr.ui.tracks.ChartAxis(0);var series=[];tr.b.iterItems(allocatorNameToPoints,function(allocatorName,points){var colorId=tr.ui.b.getColorIdForGeneralPurposeString(allocatorName);var renderingConfig={chartType:tr.ui.tracks.ChartSeriesType.LINE,colorId:colorId};series.push(new tr.ui.tracks.ChartSeries(points,axis,renderingConfig));});return series;}
-function buildMemoryLetterDots(memoryDumps){var memoryColorId=tr.ui.b.getColorIdForReservedName('memory_dump');return memoryDumps.map(function(memoryDump){return new tr.ui.tracks.LetterDot(memoryDump,'M',memoryColorId,memoryDump.start);});}
+function buildMemoryLetterDots(memoryDumps){var lightMemoryColorId=tr.ui.b.getColorIdForReservedName('light_memory_dump');var detailedMemoryColorId=tr.ui.b.getColorIdForReservedName('detailed_memory_dump');return memoryDumps.map(function(memoryDump){var memoryColorId;switch(memoryDump.levelOfDetail){case'detailed':memoryColorId=detailedMemoryColorId;break;case'light':default:memoryColorId=lightMemoryColorId;}
+return new tr.ui.tracks.LetterDot(memoryDump,'M',memoryColorId,memoryDump.start);});}
function buildGlobalUsedMemoryChartSeries(globalMemoryDumps){var containsVmRegions=globalMemoryDumps.some(function(globalDump){for(var pid in globalDump.processMemoryDumps)
if(globalDump.processMemoryDumps[pid].mostRecentVmRegions)
return true;return false;});if(!containsVmRegions)
@@ -4923,8 +4967,8 @@
return;var panel=this.createAlertsTable_(this.model_.alerts);this.$.result_area.appendChild(panel);},supportsModel:function(m){if(m==undefined){return{supported:false,reason:'Unknown tracing model'};}else if(m.alerts.length===0){return{supported:false,reason:'No alerts in tracing model'};}
return{supported:true};},get textLabel(){return'Alerts';}});'use strict';tr.exportTo('tr.ui.e.highlighter',function(){var Highlighter=tr.ui.tracks.Highlighter;function VSyncHighlighter(viewport){Highlighter.call(this,viewport);this.times_=[];}
VSyncHighlighter.VSYNC_HIGHLIGHT_COLOR={r:0,g:0,b:255};VSyncHighlighter.VSYNC_HIGHLIGHT_ALPHA=0.1;VSyncHighlighter.VSYNC_DENSITY_TRANSPARENT=0.20;VSyncHighlighter.VSYNC_DENSITY_OPAQUE=0.10;VSyncHighlighter.VSYNC_DENSITY_RANGE=VSyncHighlighter.VSYNC_DENSITY_TRANSPARENT-
-VSyncHighlighter.VSYNC_DENSITY_OPAQUE;VSyncHighlighter.generateStripes=function(times,minTime,maxTime){var stripes=[];var lowIndex=tr.b.findLowIndexInSortedArray(times,function(time){return time;},minTime);if(lowIndex>times.length){lowIndex=times.length;}
-var highIndex=lowIndex-1;while(times[highIndex+1]<=maxTime){highIndex++;}
+VSyncHighlighter.VSYNC_DENSITY_OPAQUE;VSyncHighlighter.generateStripes=function(times,minTime,maxTime){if(times.length===0)
+return[];var stripes=[];var lowIndex=tr.b.findLowIndexInSortedArray(times,function(time){return time;},minTime);var highIndex=lowIndex-1;while(times[highIndex+1]<=maxTime){highIndex++;}
for(var i=lowIndex-(lowIndex%2);i<=highIndex;i+=2){var left=i<lowIndex?minTime:times[i];var right=i+1>highIndex?maxTime:times[i+1];stripes.push([left,right]);}
return stripes;}
VSyncHighlighter.prototype={__proto__:Highlighter.prototype,processModel:function(model){this.times_=model.device.vSyncTimestamps;},drawHighlight:function(ctx,dt,viewLWorld,viewRWorld,viewHeight){if(!this.viewport_.highlightVSync){return;}
