Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add sweep displays #106

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Add sweep displays #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
efe8508
Better displays when we have a sweep.
rcurtin Jul 19, 2017
4e3541f
Add sweep comparison view.
rcurtin Aug 16, 2017
11b96bf
Partially-finished metric sweep.
rcurtin Aug 16, 2017
91c74a0
Updates on metric comparison view.
rcurtin Aug 16, 2017
f8a3689
Finish sweep metric comparison view.
rcurtin Aug 18, 2017
f0e1191
Add clear() function.
rcurtin Aug 18, 2017
2eccb6d
Merge remote-tracking branch 'upstream/master'
rcurtin Aug 18, 2017
84df40a
Add the actual view I wanted to make.
rcurtin Sep 21, 2017
cf24b62
Better formatting of library names.
rcurtin Sep 21, 2017
79ca3c2
Updates to views.
rcurtin Oct 9, 2017
26eda05
Merge remote-tracking branch 'upstream/master'
rcurtin Oct 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions reports/css/d3-style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@ fill: steelblue;

.d3-tip {
line-height: 1;
font-weight: bold;
padding: 12px;
border: 2px solid;
font-size: 12px;
padding: 6px;
background: rgba(0, 0, 0, 0.9);
color: #fff;
border-radius: 2px;
Expand All @@ -35,7 +36,7 @@ fill: steelblue;
.d3-tip:after {
box-sizing: border-box;
display: inline;
font-size: 10px;
font-size: 8px;
width: 100%;
line-height: 1;
color: rgba(0, 0, 0, 0.9);
Expand Down Expand Up @@ -69,6 +70,7 @@ svg text {
}

.library-select-div {
clear: both;
min-width: 140px;
float: left;
height: 20px;
Expand Down Expand Up @@ -156,14 +158,15 @@ svg text {
padding: 10px;
}

.method-select-label, .param-select-label, .main-dataset-select-label {
.method-select-label, .param-select-label, .main-dataset-select-label,
.sweep-select-label, .metric-select-label {
float: left;
font-size: 75%;
color: #ffffff;
margin-right: 8px;
}

#method_select, #param_select, #main_dataset_select,
#method_select, #param_select, #sweep_select, #main_dataset_select,
#metric_select, #option_select {
float: left;
margin-right: 20px;
Expand Down
21 changes: 20 additions & 1 deletion reports/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,23 @@
<input class="chart-type-radio" type="radio" name="chart-type" value="metric-multiple-parameter-comparison" id="chart-type-radio-6" onclick="chartTypeSelect()">
<label for="chart-type-radio-6" class="chart-type-radio-label">Metric analysis with multiple parameters for an algorithm/dataset combination</label>
</div>

<div>
<input class="chart-type-radio" type="radio" name="chart-type"
value="sweep-runtime-comparison" id="chart-type-radio-7"
onclick="chartTypeSelect()">
<label for="chart-type-radio-7" class="chart-type-radio-label">Runtime
plots for parameter sweeps</label>
</div>
<div>
<input class="chart-type-radio" type="radio" name="chart-type" value="sweep-metric-comparison" id="chart-type-radio-8" onclick="chartTypeSelect()">
<label for="chart-type-radio-8" class="chart-type-radio-label">Metric
plots for parameter sweeps</label>
</div>
<div>
<input class="chart-type-radio" type="radio" name="chart-type" value="all-sweep-metric-comparison" id="chart-type-radio-9" onclick="chartTypeSelect()">
<label for="chart-type-radio-9" class="chart-type-radio-label">All metric
plots for parameter sweeps</label>
</div>

<div class="selectholder" id="selectholder"></div>
<div class="clear"></div>
Expand All @@ -67,5 +83,8 @@
<script src='js/benchmarks/metric-comparison-view.js'></script>
<script src='js/benchmarks/highest_metric-comparison-view.js'></script>
<script src='js/benchmarks/metric-multiple-parameter-comparison-view.js'></script>
<script src='js/benchmarks/sweep-comparison-view.js'></script>
<script src='js/benchmarks/sweep-metric-comparison-view.js'></script>
<script src='js/benchmarks/all-params-metric-comparison-view.js'></script>
</body>
</html>
6 changes: 5 additions & 1 deletion reports/js/benchmarks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ var color = d3.scale.ordinal().range(["#98abc5", "#8a89a6", "#7b6888", "#6b486b"
*/
function mapRuntime(runtime, max)
{
if (runtime == ">9000") { return max; }
if (String(runtime).indexOf(">") != -1) { return max; }
else if (runtime == "timeout") { return max; }
else if (runtime == "failure") { return 0; }
else { return runtime; }
}
Expand Down Expand Up @@ -140,6 +141,9 @@ function chartTypeSelect()
else if (chartType == "dataset-comparison") { activeChartType = dc; }
else if (chartType == "metric-comparison") { activeChartType = mc; }
else if (chartType == "highest-metric-comparison") { activeChartType = hmc; }
else if (chartType == "sweep-runtime-comparison") { activeChartType = sc; }
else if (chartType == "sweep-metric-comparison") { activeChartType = smc; }
else if (chartType == "all-sweep-metric-comparison") { activeChartType = apmc; }

activeChartType.onTypeSelect();
}
Loading