Skip to content

Commit dcbaec8

Browse files
0xalizk0xalizk
committed
new taxonomy, site refactor
1 parent cb697bb commit dcbaec8

File tree

3 files changed

+51
-25
lines changed

3 files changed

+51
-25
lines changed

‎docs/reported/charts.js‎

Lines changed: 39 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -868,7 +868,7 @@
868868
opacity: groups[g].marker.opacity,
869869
size: isMobile() ? groups[g].marker.size.map(function (s) { return Math.max(6, s * 0.7); }) : groups[g].marker.size,
870870
symbol: groups[g].marker.symbol,
871-
line: { width: 1, color: t.text }
871+
line: { width: 0 }
872872
}
873873
});
874874
});
@@ -1214,7 +1214,7 @@
12141214

12151215
var layout = baseLayout('Offline & Client Storage', {
12161216
barmode: 'group',
1217-
xaxis: { title: 'Size (MB)', gridcolor: t.grid },
1217+
xaxis: { title: 'Size (MB), log', type: 'log', gridcolor: t.grid },
12181218
yaxis: { tickfont: { size: 11 }, gridcolor: t.grid },
12191219
legend: { orientation: 'h', x: 0, y: -0.12, font: { size: 11 } },
12201220
margin: { l: barLeftMargin(), r: 60, t: 48, b: 100 },
@@ -1327,7 +1327,7 @@
13271327
barmode: 'group',
13281328
showlegend: false,
13291329
yaxis: { tickfont: { size: 11 }, gridcolor: t.grid },
1330-
xaxis: { title: { text: 'Time (ms)', standoff: 20 }, type: 'log', gridcolor: t.grid },
1330+
xaxis: { title: { text: 'Time (log)', standoff: 20 }, type: 'log', gridcolor: t.grid },
13311331
margin: { l: isMobile() ? 140 : 160, r: 80, t: 48, b: 50 },
13321332
height: Math.max(300, items.length * 30 + 80)
13331333
});
@@ -1431,13 +1431,13 @@
14311431
text: gItems.map(function (s) { return consolidatedName(s); }),
14321432
textposition: gItems.map(function (s) { return posMap[itemIdx[s.id + '|' + s.display_name]] || 'top center'; }),
14331433
cliponaxis: false,
1434-
textfont: { size: 9, color: t.muted },
1434+
textfont: { size: 11, color: t.muted },
14351435
marker: {
1436-
size: gItems.map(function (s) { return pareto.indexOf(s) >= 0 ? 14 : 8; }),
1436+
size: gItems.map(function (s) { return pareto.indexOf(s) >= 0 ? 18 : 12; }),
14371437
color: GROUP_COLORS[g],
14381438
symbol: gItems.map(function (s) { return pareto.indexOf(s) >= 0 ? 'star' : (s.data_tier === 3 ? 'diamond' : 'circle'); }),
14391439
opacity: gItems.map(function (s) { return TIER_OPACITY[s.data_tier]; }),
1440-
line: { width: 1, color: t.text }
1440+
line: { width: 0 }
14411441
},
14421442
hovertext: gItems.map(function (s) {
14431443
return consolidatedName(s) + (entrySizeLabel(s) ? ' (' + entrySizeLabel(s) + ' entries)' : '') + '<br>Total Comm: ' + formatNum(s._totalComm) + ' KB<br>Server: ' + formatNum(getVal(s, 'server_time_ms')) + ' ms' +
@@ -1533,11 +1533,11 @@
15331533
textposition: gItems.map(function (s) { return posMap[itemIdx[s.id + '|' + s.display_name]] || 'top center'; }), cliponaxis: false,
15341534
textfont: { size: 9, color: t.muted },
15351535
marker: {
1536-
size: gItems.map(function (s) { return pareto.indexOf(s) >= 0 ? 14 : 8; }),
1536+
size: gItems.map(function (s) { return pareto.indexOf(s) >= 0 ? 18 : 12; }),
15371537
color: GROUP_COLORS[g],
15381538
symbol: gItems.map(function (s) { return pareto.indexOf(s) >= 0 ? 'star' : (s.data_tier === 3 ? 'diamond' : 'circle'); }),
15391539
opacity: gItems.map(function (s) { return TIER_OPACITY[s.data_tier]; }),
1540-
line: { width: 1, color: t.text }
1540+
line: { width: 0 }
15411541
},
15421542
hovertext: gItems.map(function (s) {
15431543
return consolidatedName(s) + (entrySizeLabel(s) ? ' (' + entrySizeLabel(s) + ' entries)' : '') + '<br>Total Comm: ' + formatNum(s._totalComm) + ' KB<br>Client Storage: ' + formatNum(getVal(s, 'client_storage_mb')) + ' MB' + storageNote(s) +
@@ -1627,11 +1627,11 @@
16271627
textposition: gItems.map(function (s) { return posMap[itemIdx[s.id + '|' + s.display_name]] || 'top center'; }), cliponaxis: false,
16281628
textfont: { size: 9, color: t.muted },
16291629
marker: {
1630-
size: gItems.map(function (s) { return pareto.indexOf(s) >= 0 ? 14 : 8; }),
1630+
size: gItems.map(function (s) { return pareto.indexOf(s) >= 0 ? 18 : 12; }),
16311631
color: GROUP_COLORS[g],
16321632
symbol: gItems.map(function (s) { return pareto.indexOf(s) >= 0 ? 'star' : (s.data_tier === 3 ? 'diamond' : 'circle'); }),
16331633
opacity: gItems.map(function (s) { return TIER_OPACITY[s.data_tier]; }),
1634-
line: { width: 1, color: t.text }
1634+
line: { width: 0 }
16351635
},
16361636
hovertext: gItems.map(function (s) {
16371637
return consolidatedName(s) + (entrySizeLabel(s) ? ' (' + entrySizeLabel(s) + ' entries)' : '') + '<br>Total Comm: ' + formatNum(s._totalComm) + ' KB<br>Client Time: ' + formatNum(getVal(s, 'client_time_ms')) + ' ms' +
@@ -1718,11 +1718,11 @@
17181718
textposition: gItems.map(function (s) { return posMap[itemIdx[s.id + '|' + s.display_name]] || 'top center'; }), cliponaxis: false,
17191719
textfont: { size: 9, color: t.muted },
17201720
marker: {
1721-
size: gItems.map(function (s) { return pareto.indexOf(s) >= 0 ? 14 : 8; }),
1721+
size: gItems.map(function (s) { return pareto.indexOf(s) >= 0 ? 18 : 12; }),
17221722
color: GROUP_COLORS[g],
17231723
symbol: gItems.map(function (s) { return pareto.indexOf(s) >= 0 ? 'star' : (s.data_tier === 3 ? 'diamond' : 'circle'); }),
17241724
opacity: gItems.map(function (s) { return TIER_OPACITY[s.data_tier]; }),
1725-
line: { width: 1, color: t.text }
1725+
line: { width: 0 }
17261726
},
17271727
hovertext: gItems.map(function (s) {
17281728
return consolidatedName(s) + (entrySizeLabel(s) ? ' (' + entrySizeLabel(s) + ' entries)' : '') + '<br>Server Time: ' + formatNum(getVal(s, 'server_time_ms')) + ' ms<br>Client Time: ' + formatNum(getVal(s, 'client_time_ms')) + ' ms' +
@@ -1794,7 +1794,7 @@
17941794
traces.push({
17951795
x: [null], y: [null], z: [null], mode: 'markers', type: 'scatter3d',
17961796
name: GROUP_NAMES[g],
1797-
marker: { size: 8, color: GROUP_COLORS[g], symbol: GROUP_SYMBOLS_3D[g], line: { width: 1, color: t.text } },
1797+
marker: { size: 8, color: GROUP_COLORS[g], symbol: GROUP_SYMBOLS_3D[g], line: { width: 0 } },
17981798
hoverinfo: 'skip'
17991799
});
18001800
});
@@ -1810,13 +1810,13 @@
18101810
showlegend: false,
18111811
text: gItems.map(function (s) { return consolidatedName(s); }),
18121812
textposition: 'top center',
1813-
textfont: { size: 9, color: t.muted },
1813+
textfont: { size: 11, color: t.muted },
18141814
marker: {
1815-
size: 6,
1815+
size: 8,
18161816
color: GROUP_COLORS[g],
18171817
symbol: GROUP_SYMBOLS_3D[g],
18181818
opacity: gItems.map(function (s) { return TIER_OPACITY[s.data_tier]; }),
1819-
line: { width: 1, color: t.text }
1819+
line: { width: 0 }
18201820
},
18211821
hovertext: gItems.map(function (s) {
18221822
return consolidatedName(s) + (entrySizeLabel(s) ? ' (' + entrySizeLabel(s) + ' entries)' : '') + '<br>Comm: ' + formatNum(s._totalComm) + ' KB<br>Storage: ' + formatNum(getVal(s, 'client_storage_mb')) + ' MB' + storageNote(s) + '<br>Client: ' + formatNum(getVal(s, 'client_time_ms')) + ' ms' +
@@ -1884,7 +1884,7 @@
18841884
traces.push({
18851885
x: [null], y: [null], z: [null], mode: 'markers', type: 'scatter3d',
18861886
name: GROUP_NAMES[g],
1887-
marker: { size: 8, color: GROUP_COLORS[g], symbol: GROUP_SYMBOLS_3D[g], line: { width: 1, color: t.text } },
1887+
marker: { size: 8, color: GROUP_COLORS[g], symbol: GROUP_SYMBOLS_3D[g], line: { width: 0 } },
18881888
hoverinfo: 'skip'
18891889
});
18901890
});
@@ -1900,13 +1900,13 @@
19001900
showlegend: false,
19011901
text: gItems.map(function (s) { return consolidatedName(s); }),
19021902
textposition: 'top center',
1903-
textfont: { size: 9, color: t.muted },
1903+
textfont: { size: 11, color: t.muted },
19041904
marker: {
1905-
size: 6,
1905+
size: 8,
19061906
color: GROUP_COLORS[g],
19071907
symbol: GROUP_SYMBOLS_3D[g],
19081908
opacity: gItems.map(function (s) { return TIER_OPACITY[s.data_tier]; }),
1909-
line: { width: 1, color: t.text }
1909+
line: { width: 0 }
19101910
},
19111911
hovertext: gItems.map(function (s) {
19121912
return consolidatedName(s) + (entrySizeLabel(s) ? ' (' + entrySizeLabel(s) + ' entries)' : '') + '<br>Server: ' + formatNum(getVal(s, 'server_time_ms')) + ' ms<br>Storage: ' + formatNum(getVal(s, 'client_storage_mb')) + ' MB' + storageNote(s) + '<br>Client: ' + formatNum(getVal(s, 'client_time_ms')) + ' ms' +
@@ -2084,7 +2084,14 @@
20842084
return radarMetrics.some(function (m) { return isPos(getVal(s, m)); });
20852085
})
20862086
.sort(function (a, b) {
2087-
if (a.group !== b.group) return a.group.localeCompare(b.group);
2087+
var priorityIds = ['rms24', 'via', 'plinko', 'onionpirv2', 'inspire'];
2088+
var aPri = priorityIds.some(function (p) { return a.id.indexOf(p) === 0; }) ? 0 : 1;
2089+
var bPri = priorityIds.some(function (p) { return b.id.indexOf(p) === 0; }) ? 0 : 1;
2090+
if (aPri !== bPri) return aPri - bPri;
2091+
var radarGroupOrder = { '1b': 0, '2b': 1, '2a': 2, '1a': 3 };
2092+
var ga = radarGroupOrder[a.group] !== undefined ? radarGroupOrder[a.group] : 9;
2093+
var gb = radarGroupOrder[b.group] !== undefined ? radarGroupOrder[b.group] : 9;
2094+
if (ga !== gb) return ga - gb;
20882095
return a._composite - b._composite;
20892096
});
20902097

@@ -2383,7 +2390,7 @@
23832390
return Math.max(10, Math.min(40, 50 / Math.log10(comm + 1)));
23842391
}),
23852392
opacity: gItems.map(function (s) { return TIER_OPACITY[s.data_tier]; }),
2386-
line: { width: 1, color: t.text }
2393+
line: { width: 0 }
23872394
},
23882395
hovertext: gItems.map(function (s) {
23892396
var lines = s.display_name + ' (' + s.year + ')';
@@ -2540,9 +2547,13 @@
25402547
(s.db_size_categories && s.db_size_categories.some(function (c) { return activeDbSizes.has(c); }));
25412548
return groupOk && tierOk && implOk && dbOk;
25422549
});
2550+
var catalogPriorityIds = ['rms24', 'via', 'plinko', 'onionpirv2', 'inspire'];
2551+
function catalogPri(s) { return catalogPriorityIds.some(function (p) { return s.id.indexOf(p) === 0; }) ? 0 : 1; }
25432552
if (sortCol) {
25442553
var col = columns.filter(function (c) { return c.key === sortCol; })[0];
25452554
filtered.sort(function (a, b) {
2555+
var pa = catalogPri(a), pb = catalogPri(b);
2556+
if (pa !== pb) return pa - pb;
25462557
var va, vb;
25472558
if (col && col.metric) { va = getVal(a, sortCol); vb = getVal(b, sortCol); }
25482559
else if (sortCol === 'db_size') { va = (a.db_size_categories || []).length; vb = (b.db_size_categories || []).length; }
@@ -2553,7 +2564,11 @@
25532564
return sortAsc ? va - vb : vb - va;
25542565
});
25552566
} else {
2556-
filtered.sort(function (a, b) { return a._composite - b._composite; });
2567+
filtered.sort(function (a, b) {
2568+
var pa = catalogPri(a), pb = catalogPri(b);
2569+
if (pa !== pb) return pa - pb;
2570+
return a._composite - b._composite;
2571+
});
25572572
}
25582573
sorted = filtered;
25592574
renderRows(sorted);
@@ -3263,7 +3278,7 @@
32633278
});
32643279
traces.push({
32653280
x: x, y: y, mode: 'markers', type: 'scatter', name: KW_VARIANT_LABELS[variant] || variant,
3266-
marker: { color: KW_VARIANT_COLORS[variant] || '#999', size: 12, line: { width: 1, color: t.text } },
3281+
marker: { color: KW_VARIANT_COLORS[variant] || '#999', size: 12, line: { width: 0 } },
32673282
hovertext: text, hoverinfo: 'text'
32683283
});
32693284
});

‎docs/reported/db_config.js‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,20 @@
128128
return { footnotes: footnotes, schemeLabels: schemeLabels };
129129
}
130130

131+
function prioritySort(data) {
132+
var priorityIds = ['rms24', 'via', 'plinko', 'onionpirv2', 'inspire'];
133+
return data.slice().sort(function (a, b) {
134+
var aPri = priorityIds.some(function (p) { return a.id.indexOf(p) === 0; }) ? 0 : 1;
135+
var bPri = priorityIds.some(function (p) { return b.id.indexOf(p) === 0; }) ? 0 : 1;
136+
return aPri - bPri;
137+
});
138+
}
139+
131140
function renderTable(data) {
132141
var tbody = document.getElementById('configs-body');
133142
if (!tbody) return;
134143

144+
data = prioritySort(data);
135145
var fnData = collectFootnotes(data);
136146
var schemeNum = 0;
137147

‎docs/reported/pareto/index.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
<h2><a href="#pareto">Pareto Frontiers</a></h2>
3030
<p class="desc">
3131
Starred points are Pareto-optimal (no other scheme is better on all axes).
32-
Purple step-line connects 2D frontiers.
32+
Purple step-line connects 2D frontiers.<br>
33+
Communication = total comm (query + response).
3334
</p>
3435
<h4 id="pareto-comm-server"><a href="#pareto-comm-server">Communication vs Server Time:</a></h4>
3536
<div class="dim-tabs-container">

0 commit comments

Comments
 (0)