@rubensworks/process-sparql-benchmark-results 1.3.4 → 1.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (54) hide show
  1. package/README.md +10 -1
  2. package/bin/psbr.js +4 -1
  3. package/bin/psbr.js.map +1 -1
  4. package/index.js +5 -1
  5. package/index.js.map +1 -1
  6. package/lib/TemplateUtils.js +23 -10
  7. package/lib/TemplateUtils.js.map +1 -1
  8. package/lib/cli/CliHelpers.js +27 -14
  9. package/lib/cli/CliHelpers.js.map +1 -1
  10. package/lib/cli/CliRunner.d.ts +1 -1
  11. package/lib/cli/CliRunner.js +5 -5
  12. package/lib/cli/CliRunner.js.map +1 -1
  13. package/lib/cli/ITaskContext.js.map +1 -1
  14. package/lib/cli/commands/CommandCsv.d.ts +1 -1
  15. package/lib/cli/commands/CommandCsv.js +7 -5
  16. package/lib/cli/commands/CommandCsv.js.map +1 -1
  17. package/lib/cli/commands/CommandStats.d.ts +1 -1
  18. package/lib/cli/commands/CommandStats.js +7 -5
  19. package/lib/cli/commands/CommandStats.js.map +1 -1
  20. package/lib/cli/commands/CommandTex.d.ts +1 -1
  21. package/lib/cli/commands/CommandTex.js +7 -5
  22. package/lib/cli/commands/CommandTex.js.map +1 -1
  23. package/lib/cli/commands/csv/CommandBsbm.d.ts +2 -2
  24. package/lib/cli/commands/csv/CommandBsbm.js +103 -85
  25. package/lib/cli/commands/csv/CommandBsbm.js.map +1 -1
  26. package/lib/cli/commands/csv/CommandGithubActionsBenchmark.d.ts +2 -2
  27. package/lib/cli/commands/csv/CommandGithubActionsBenchmark.js +149 -102
  28. package/lib/cli/commands/csv/CommandGithubActionsBenchmark.js.map +1 -1
  29. package/lib/cli/commands/csv/CommandQuery.d.ts +2 -2
  30. package/lib/cli/commands/csv/CommandQuery.js +111 -93
  31. package/lib/cli/commands/csv/CommandQuery.js.map +1 -1
  32. package/lib/cli/commands/csv/CommandSummary.d.ts +2 -2
  33. package/lib/cli/commands/csv/CommandSummary.js +230 -212
  34. package/lib/cli/commands/csv/CommandSummary.js.map +1 -1
  35. package/lib/cli/commands/csv/CommandWins.d.ts +2 -2
  36. package/lib/cli/commands/csv/CommandWins.js +134 -119
  37. package/lib/cli/commands/csv/CommandWins.js.map +1 -1
  38. package/lib/cli/commands/csv/TableSerializerCsv.d.ts +0 -1
  39. package/lib/cli/commands/csv/TableSerializerMarkdown.d.ts +0 -1
  40. package/lib/cli/commands/csv/TableSerializerMarkdown.js.map +1 -1
  41. package/lib/cli/commands/stats/CommandDocker.d.ts +2 -2
  42. package/lib/cli/commands/stats/CommandDocker.js +66 -48
  43. package/lib/cli/commands/stats/CommandDocker.js.map +1 -1
  44. package/lib/cli/commands/tex/CommandQuery.d.ts +2 -2
  45. package/lib/cli/commands/tex/CommandQuery.js +241 -210
  46. package/lib/cli/commands/tex/CommandQuery.js.map +1 -1
  47. package/lib/cli/commands/tex/CommandQueryTimes.d.ts +2 -2
  48. package/lib/cli/commands/tex/CommandQueryTimes.js +141 -123
  49. package/lib/cli/commands/tex/CommandQueryTimes.js.map +1 -1
  50. package/lib/cli/commands/tex/TexUtils.js +38 -20
  51. package/lib/cli/commands/tex/TexUtils.js.map +1 -1
  52. package/lib/correctness/CorrectnessCheckerUtils.js +2 -3
  53. package/lib/correctness/CorrectnessCheckerUtils.js.map +1 -1
  54. package/package.json +46 -49
@@ -1,7 +1,11 @@
1
1
  "use strict";
2
2
  var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
3
  if (k2 === undefined) k2 = k;
4
- Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
5
9
  }) : (function(o, m, k, k2) {
6
10
  if (k2 === undefined) k2 = k;
7
11
  o[k2] = m[k];
@@ -11,18 +15,30 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
11
15
  }) : function(o, v) {
12
16
  o["default"] = v;
13
17
  });
14
- var __importStar = (this && this.__importStar) || function (mod) {
15
- if (mod && mod.__esModule) return mod;
16
- var result = {};
17
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
18
- __setModuleDefault(result, mod);
19
- return result;
20
- };
18
+ var __importStar = (this && this.__importStar) || (function () {
19
+ var ownKeys = function(o) {
20
+ ownKeys = Object.getOwnPropertyNames || function (o) {
21
+ var ar = [];
22
+ for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23
+ return ar;
24
+ };
25
+ return ownKeys(o);
26
+ };
27
+ return function (mod) {
28
+ if (mod && mod.__esModule) return mod;
29
+ var result = {};
30
+ if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31
+ __setModuleDefault(result, mod);
32
+ return result;
33
+ };
34
+ })();
21
35
  var __importDefault = (this && this.__importDefault) || function (mod) {
22
36
  return (mod && mod.__esModule) ? mod : { "default": mod };
23
37
  };
24
38
  Object.defineProperty(exports, "__esModule", { value: true });
25
- exports.handler = exports.builder = exports.desc = exports.command = void 0;
39
+ exports.desc = exports.command = void 0;
40
+ exports.builder = builder;
41
+ exports.handler = handler;
26
42
  const fs = __importStar(require("fs"));
27
43
  const path_1 = __importDefault(require("path"));
28
44
  const TemplateUtils_1 = require("../../../TemplateUtils");
@@ -30,224 +46,239 @@ const CliHelpers_1 = require("../../CliHelpers");
30
46
  const TexUtils_1 = require("./TexUtils");
31
47
  exports.command = 'query <experiment-dir...>';
32
48
  exports.desc = 'Plot the query execution times from the given experiments';
33
- const builder = (yargs) => yargs
34
- .options({
35
- queryRegex: {
36
- type: 'string',
37
- alias: 'q',
38
- describe: 'Regex for queries to include (before any label overrides). Examples: \'^C\', \'^[^C]\', ...',
39
- },
40
- name: {
41
- type: 'string',
42
- alias: 'n',
43
- describe: 'Custom output file name',
44
- default: 'plot_queries_data',
45
- },
46
- color: {
47
- type: 'string',
48
- alias: 'c',
49
- describe: 'Color scheme name from colorbrewer2.org',
50
- },
51
- maxY: {
52
- type: 'number',
53
- describe: 'The upper limit of the Y-axis. Defaults to maximum Y value',
54
- },
55
- legend: {
56
- type: 'boolean',
57
- describe: 'If a legend should be included',
58
- default: true,
59
- },
60
- legendPos: {
61
- type: 'string',
62
- describe: 'The legend position X,Y (anchor north-east)',
63
- default: '1.0,1.0',
64
- },
65
- logY: {
66
- type: 'boolean',
67
- describe: 'If the Y-Axis must have a log scale',
68
- default: false,
69
- },
70
- inputName: {
71
- type: 'string',
72
- describe: 'Custom input file name per experiment',
73
- default: 'query-times.csv',
74
- },
75
- inputDelimiter: {
76
- type: 'string',
77
- describe: 'Delimiter for the input CSV file',
78
- default: ';',
79
- },
80
- overrideCombinationLabels: {
81
- type: 'string',
82
- describe: 'Comma-separated list of combination labels to use',
83
- },
84
- overrideQueryLabels: {
85
- type: 'string',
86
- describe: 'Comma-separated list of query labels to use',
87
- },
88
- zeroReplacement: {
89
- type: 'number',
90
- describe: 'If zero values occur, what values they should be replaced with',
91
- default: 0,
92
- },
93
- svg: {
94
- type: 'boolean',
95
- describe: 'If the tex file should be converted to svg via the tex2svg command',
96
- default: false,
97
- },
98
- metric: {
99
- type: 'string',
100
- describe: 'The metric to plot',
101
- choices: ['time', 'httpRequests'],
102
- default: 'time',
103
- },
104
- relative: {
105
- type: 'boolean',
106
- describe: 'If the maximum value per query should be set to 1, and all other values made relative to that.',
107
- default: false,
108
- },
109
- });
110
- exports.builder = builder;
111
- const handler = (argv) => CliHelpers_1.wrapCommandHandler(argv, async (context) => CliHelpers_1.wrapVisualProgress('Plotting data', async () => {
112
- // Load CLI args
113
- const { experimentDirectories, experimentNames, experimentIds } = TexUtils_1.getExperimentNames(argv);
114
- const queryRegex = argv.queryRegex ? new RegExp(argv.queryRegex, 'u') : undefined;
115
- const colorScheme = TexUtils_1.getColorScheme(argv, experimentDirectories);
116
- const metric = argv.metric;
117
- // Prepare query CSV file with averages per query group
118
- let queryNames;
119
- let outputCsvEntries = {};
120
- const maxQueryValues = {};
121
- for (const experimentDirectory of experimentDirectories) {
122
- // Read CSV file
123
- const totals = {};
124
- const totalsFirst = {};
125
- await TexUtils_1.handleCsvFile(experimentDirectory, argv, data => {
126
- if (!queryRegex || queryRegex.test(data.name)) {
127
- if (!(data.name in totals)) {
128
- totals[data.name] = [];
129
- }
130
- let value = Number.parseInt(data[metric] || '0', 10);
131
- value = Math.max(argv.zeroReplacement, value);
132
- totals[data.name].push(value);
133
- if (data.timestamps) {
134
- if (!(data.name in totalsFirst)) {
135
- totalsFirst[data.name] = [];
49
+ function builder(yargs) {
50
+ return yargs
51
+ .options({
52
+ queryRegex: {
53
+ type: 'string',
54
+ alias: 'q',
55
+ describe: 'Regex for queries to include (before any label overrides). Examples: \'^C\', \'^[^C]\', ...',
56
+ },
57
+ name: {
58
+ type: 'string',
59
+ alias: 'n',
60
+ describe: 'Custom output file name',
61
+ default: 'plot_queries_data',
62
+ },
63
+ color: {
64
+ type: 'string',
65
+ alias: 'c',
66
+ describe: 'Color scheme name from colorbrewer2.org',
67
+ },
68
+ shiftColorList: {
69
+ type: 'number',
70
+ describe: 'How many color list elements should be skipped',
71
+ default: 0,
72
+ },
73
+ maxY: {
74
+ type: 'number',
75
+ describe: 'The upper limit of the Y-axis. Defaults to maximum Y value',
76
+ },
77
+ legend: {
78
+ type: 'boolean',
79
+ describe: 'If a legend should be included',
80
+ default: true,
81
+ },
82
+ legendPos: {
83
+ type: 'string',
84
+ describe: 'The legend position X,Y (anchor north-east)',
85
+ default: '1.0,1.0',
86
+ },
87
+ logY: {
88
+ type: 'boolean',
89
+ describe: 'If the Y-Axis must have a log scale',
90
+ default: false,
91
+ },
92
+ inputName: {
93
+ type: 'string',
94
+ describe: 'Custom input file name per experiment',
95
+ default: 'query-times.csv',
96
+ },
97
+ inputDelimiter: {
98
+ type: 'string',
99
+ describe: 'Delimiter for the input CSV file',
100
+ default: ';',
101
+ },
102
+ overrideCombinationLabels: {
103
+ type: 'string',
104
+ describe: 'Comma-separated list of combination labels to use',
105
+ },
106
+ overrideQueryLabels: {
107
+ type: 'string',
108
+ describe: 'Comma-separated list of query labels to use',
109
+ },
110
+ zeroReplacement: {
111
+ type: 'number',
112
+ describe: 'If zero values occur, what values they should be replaced with',
113
+ default: 0,
114
+ },
115
+ svg: {
116
+ type: 'boolean',
117
+ describe: 'If the tex file should be converted to svg via the tex2svg command',
118
+ default: false,
119
+ },
120
+ metric: {
121
+ type: 'string',
122
+ describe: 'The metric to plot',
123
+ choices: ['time', 'httpRequests'],
124
+ default: 'time',
125
+ },
126
+ outliers: {
127
+ type: 'boolean',
128
+ describe: 'If outliers should be included',
129
+ default: true,
130
+ },
131
+ relative: {
132
+ type: 'boolean',
133
+ describe: 'If the maximum value per query should be set to 1, and all other values made relative to that.',
134
+ default: false,
135
+ },
136
+ });
137
+ }
138
+ function handler(argv) {
139
+ return (0, CliHelpers_1.wrapCommandHandler)(argv, async (context) => (0, CliHelpers_1.wrapVisualProgress)('Plotting data', async () => {
140
+ // Load CLI args
141
+ const { experimentDirectories, experimentNames, experimentIds } = (0, TexUtils_1.getExperimentNames)(argv);
142
+ const queryRegex = argv.queryRegex ? new RegExp(argv.queryRegex, 'u') : undefined;
143
+ const colorScheme = (0, TexUtils_1.getColorScheme)(argv, experimentDirectories);
144
+ const metric = argv.metric;
145
+ // Prepare query CSV file with averages per query group
146
+ let queryNames;
147
+ let outputCsvEntries = {};
148
+ const maxQueryValues = {};
149
+ for (const experimentDirectory of experimentDirectories) {
150
+ // Read CSV file
151
+ const totals = {};
152
+ const totalsFirst = {};
153
+ await (0, TexUtils_1.handleCsvFile)(experimentDirectory, argv, (data) => {
154
+ if (!queryRegex || queryRegex.test(data.name)) {
155
+ if (!(data.name in totals)) {
156
+ totals[data.name] = [];
157
+ }
158
+ let value = Number.parseInt(data[metric] || '0', 10);
159
+ value = Math.max(argv.zeroReplacement, value);
160
+ totals[data.name].push(value);
161
+ if (data.timestamps) {
162
+ if (!(data.name in totalsFirst)) {
163
+ totalsFirst[data.name] = [];
164
+ }
165
+ totalsFirst[data.name].push(Number.parseInt(data.timestamps.split(' ')[0], 10));
136
166
  }
137
- totalsFirst[data.name].push(Number.parseInt(data.timestamps.split(' ')[0], 10));
167
+ }
168
+ });
169
+ // Calculate average
170
+ const averages = {};
171
+ const averageMinus = {};
172
+ const averagePlus = {};
173
+ for (const [query, times] of Object.entries(totals)) {
174
+ const average = times.reduce((sum, current) => sum + current) / times.length;
175
+ averages[query] = average;
176
+ averageMinus[query] = average - times.reduce((minV, value) => Math.min(value, minV));
177
+ const maxValue = times.reduce((maxV, value) => Math.max(value, maxV));
178
+ averagePlus[query] = maxValue - average;
179
+ if (!(query in maxQueryValues)) {
180
+ maxQueryValues[query] = maxValue;
181
+ }
182
+ else {
183
+ maxQueryValues[query] = Math.max(maxQueryValues[query], maxValue);
138
184
  }
139
185
  }
140
- });
141
- // Calculate average
142
- const averages = {};
143
- const averageMinus = {};
144
- const averagePlus = {};
145
- for (const [query, times] of Object.entries(totals)) {
146
- const average = times.reduce((sum, current) => sum + current) / times.length;
147
- averages[query] = average;
148
- averageMinus[query] = average - times.reduce((minV, value) => Math.min(value, minV));
149
- const maxValue = times.reduce((maxV, value) => Math.max(value, maxV));
150
- averagePlus[query] = maxValue - average;
151
- if (!(query in maxQueryValues)) {
152
- maxQueryValues[query] = maxValue;
186
+ const averagesFirst = {};
187
+ const averageFirstMinus = {};
188
+ const averageFirstPlus = {};
189
+ for (const [query, times] of Object.entries(totalsFirst)) {
190
+ const average = times.reduce((sum, current) => sum + current) / times.length;
191
+ averagesFirst[query] = average;
192
+ averageFirstMinus[query] = average - times.reduce((minV, value) => Math.min(value, minV));
193
+ const maxValue = times.reduce((maxV, value) => Math.max(value, maxV));
194
+ averageFirstPlus[query] = maxValue - average;
153
195
  }
154
- else {
155
- maxQueryValues[query] = Math.max(maxQueryValues[query], maxValue);
196
+ // Set query names and count
197
+ if (!queryNames) {
198
+ queryNames = Object.keys(averages);
199
+ for (const queryName of queryNames) {
200
+ outputCsvEntries[queryName] = [];
201
+ }
156
202
  }
157
- }
158
- const averagesFirst = {};
159
- const averageFirstMinus = {};
160
- const averageFirstPlus = {};
161
- for (const [query, times] of Object.entries(totalsFirst)) {
162
- const average = times.reduce((sum, current) => sum + current) / times.length;
163
- averagesFirst[query] = average;
164
- averageFirstMinus[query] = average - times.reduce((minV, value) => Math.min(value, minV));
165
- const maxValue = times.reduce((maxV, value) => Math.max(value, maxV));
166
- averageFirstPlus[query] = maxValue - average;
167
- }
168
- // Set query names and count
169
- if (!queryNames) {
170
- queryNames = Object.keys(averages);
203
+ else if (queryNames.join(',') !== Object.keys(averages).join(',')) {
204
+ throw new Error(`Tried to plot experiments with different query sets`);
205
+ }
206
+ // Append average, min, and max result
171
207
  for (const queryName of queryNames) {
172
- outputCsvEntries[queryName] = [];
208
+ outputCsvEntries[queryName].push(averages[queryName], averageMinus[queryName], averagePlus[queryName]);
209
+ if (metric === 'time') {
210
+ outputCsvEntries[queryName].push(averagesFirst[queryName] || Number.NaN, averageFirstMinus[queryName] || Number.NaN, averageFirstPlus[queryName] || Number.NaN);
211
+ }
173
212
  }
174
213
  }
175
- else if (queryNames.join(',') !== Object.keys(averages).join(',')) {
176
- throw new Error(`Tried to plot experiments with different query sets`);
214
+ if (!queryNames) {
215
+ throw new Error(`No queries could be found`);
177
216
  }
178
- // Append average, min, and max result
179
- for (const queryName of queryNames) {
180
- outputCsvEntries[queryName].push(averages[queryName], averageMinus[queryName], averagePlus[queryName]);
181
- if (metric === 'time') {
182
- outputCsvEntries[queryName].push(averagesFirst[queryName] || Number.NaN, averageFirstMinus[queryName] || Number.NaN, averageFirstPlus[queryName] || Number.NaN);
217
+ if (argv.relative) {
218
+ // Make values relative per query
219
+ for (const queryName of Object.keys(outputCsvEntries)) {
220
+ outputCsvEntries[queryName] = outputCsvEntries[queryName].map(value => value / maxQueryValues[queryName]);
183
221
  }
184
222
  }
185
- }
186
- if (!queryNames) {
187
- throw new Error(`No queries could be found`);
188
- }
189
- if (argv.relative) {
190
- // Make values relative per query
191
- for (const queryName of Object.keys(outputCsvEntries)) {
192
- outputCsvEntries[queryName] = outputCsvEntries[queryName].map(value => value / maxQueryValues[queryName]);
193
- }
194
- }
195
- // Determine query labels
196
- queryNames = TexUtils_1.getQueryNames(queryNames, argv);
197
- outputCsvEntries = TexUtils_1.relabelQueryNames(outputCsvEntries, queryNames);
198
- // Write output CSV file
199
- const csvOutputStream = fs.createWriteStream(path_1.default.join(context.cwd, `${argv.name}.csv`));
200
- csvOutputStream.write(`query;${experimentIds.map(id => {
201
- let value = `${id}-mean;${id}-minus;${id}-plus`;
202
- if (metric === 'time') {
203
- value = `${value};${id}-first-mean;${id}-first-minus;${id}-first-plus`;
223
+ // Determine query labels
224
+ queryNames = (0, TexUtils_1.getQueryNames)(queryNames, argv);
225
+ outputCsvEntries = (0, TexUtils_1.relabelQueryNames)(outputCsvEntries, queryNames);
226
+ // Write output CSV file
227
+ const csvOutputStream = fs.createWriteStream(path_1.default.join(context.cwd, `${argv.name}.csv`));
228
+ csvOutputStream.write(`query;${experimentIds.map((id) => {
229
+ let value = `${id}-mean;${id}-minus;${id}-plus`;
230
+ if (metric === 'time') {
231
+ value = `${value};${id}-first-mean;${id}-first-minus;${id}-first-plus`;
232
+ }
233
+ return value;
234
+ }).join(';')}\n`);
235
+ for (const [key, columns] of Object.entries(outputCsvEntries)) {
236
+ csvOutputStream.write(`${key};${columns.join(';')}\n`);
204
237
  }
205
- return value;
206
- }).join(';')}\n`);
207
- for (const [key, columns] of Object.entries(outputCsvEntries)) {
208
- csvOutputStream.write(`${key};${columns.join(';')}\n`);
209
- }
210
- csvOutputStream.close();
211
- // Prepare bar lines
212
- let barLines = experimentNames
213
- .map((name, id) => {
214
- const offset = (id - ((experimentNames.length - 1) / 2)) * 2.75;
215
- const yModifier = metric === 'time' && !argv.relative ? ' / 1000' : '';
216
- return `\\addplot+[ybar, xshift=${offset}pt,legend image post style={xshift=${-offset}pt}] table [x=query, y expr=(\\thisrow{${id}-mean}${yModifier}), y error plus expr=(\\thisrow{${id}-plus}${yModifier}), y error minus expr=(\\thisrow{${id}-minus}${yModifier}), col sep=semicolon]{"${argv.name}.csv"};`;
217
- })
218
- .join('\n');
219
- if (metric === 'time') {
220
- const extraBarLines = experimentNames
238
+ csvOutputStream.close();
239
+ // Shift color list by a number of elements
240
+ const prependPlotLines = argv.shiftColorList > 0 ? `\\pgfplotsset{cycle list shift=${argv.shiftColorList}}\n` : '';
241
+ // Prepare bar lines
242
+ let barLines = prependPlotLines + experimentNames
221
243
  .map((name, id) => {
222
244
  const offset = (id - ((experimentNames.length - 1) / 2)) * 2.75;
223
245
  const yModifier = metric === 'time' && !argv.relative ? ' / 1000' : '';
224
- return `\\addplot+[only marks,xshift=${offset}pt,mark=star,mark options={color=gray,scale=0.5}] table [x=query, y expr=(\\thisrow{${id}-first-mean}${yModifier}), col sep=semicolon]{"${argv.name}.csv"};`;
246
+ const outliers = argv.outliers ? `, y error plus expr=(\\thisrow{${id}-plus}${yModifier}), y error minus expr=(\\thisrow{${id}-minus}${yModifier})` : '';
247
+ return `\\addplot+[ybar, xshift=${offset}pt,legend image post style={xshift=${-offset}pt}] table [x=query, y expr=(\\thisrow{${id}-mean}${yModifier})${outliers}, col sep=semicolon]{"${argv.name}.csv"};`;
225
248
  })
226
249
  .join('\n');
227
- barLines = `${barLines}\n${extraBarLines}`;
228
- }
229
- // Instantiate template
230
- await TemplateUtils_1.instantiateTemplate(path_1.default.join(context.templatesRoot, 'tex', 'plot_query_data.tex'), path_1.default.join(context.cwd, `${argv.name}.tex`), Object.assign({ X_LIMITS: experimentDirectories.length * 2, WIDTH: queryNames.length * (experimentNames.length + 1) * 4, QUERIES: queryNames.join(','), LEGEND: experimentNames.map(name => name.replace(/_/gu, '\\_')).join(','), BARS: barLines, COLOR_SCHEME: colorScheme, LEGEND_POS: argv.legendPos }, argv.maxY ? { Y_MAX: `ymax=${argv.maxY},` } : {}), contents => {
231
- if (!argv.legend) {
232
- contents = contents.replace(/\\legend\{.*\}/ug, '');
233
- }
234
- if (argv.logY) {
235
- contents = contents
236
- .replace(/ymin=0,/u, 'ymin=0.000001,ymode=log,log origin=infty,log basis y={10},')
237
- .replace(/ \/ 1000\)/ug, ' / 1000)+1e-5');
238
- }
239
- if (argv.relative) {
240
- contents = contents.replace('ylabel={Duration (s)},', 'ylabel={},');
250
+ if (metric === 'time' && argv.outliers) {
251
+ const extraBarLines = experimentNames
252
+ .map((name, id) => {
253
+ const offset = (id - ((experimentNames.length - 1) / 2)) * 2.75;
254
+ const yModifier = metric === 'time' && !argv.relative ? ' / 1000' : '';
255
+ return `\\addplot+[only marks,xshift=${offset}pt,mark=star,mark options={color=gray,scale=0.5}] table [x=query, y expr=(\\thisrow{${id}-first-mean}${yModifier}), col sep=semicolon]{"${argv.name}.csv"};`;
256
+ })
257
+ .join('\n');
258
+ barLines = `${barLines}\n${prependPlotLines}${extraBarLines}`;
241
259
  }
242
- if (metric === 'httpRequests') {
243
- contents = contents.replace('ylabel={Duration (s)},', 'ylabel={HTTP Requests},');
260
+ // Instantiate template
261
+ await (0, TemplateUtils_1.instantiateTemplate)(path_1.default.join(context.templatesRoot, 'tex', 'plot_query_data.tex'), path_1.default.join(context.cwd, `${argv.name}.tex`), Object.assign({ X_LIMITS: experimentDirectories.length * 2, WIDTH: queryNames.length * (experimentNames.length + 1) * 4, QUERIES: queryNames.join(','), LEGEND: experimentNames.map(name => name.replace(/_/gu, '\\_')).join(','), BARS: barLines, COLOR_SCHEME: colorScheme, LEGEND_POS: argv.legendPos }, argv.maxY ? { Y_MAX: `ymax=${argv.maxY},` } : {}), (contents) => {
262
+ if (!argv.legend) {
263
+ contents = contents.replace(/\\legend\{.*\}/ug, '');
264
+ }
265
+ if (argv.logY) {
266
+ contents = contents
267
+ .replace(/ymin=0,/u, 'ymin=0.000001,ymode=log,log origin=infty,log basis y={10},')
268
+ .replace(/ \/ 1000\)/ug, ' / 1000)+1e-5');
269
+ }
270
+ if (argv.relative) {
271
+ contents = contents.replace('ylabel={Duration (s)},', 'ylabel={},');
272
+ }
273
+ if (metric === 'httpRequests') {
274
+ contents = contents.replace('ylabel={Duration (s)},', 'ylabel={HTTP Requests},');
275
+ }
276
+ return contents;
277
+ });
278
+ // Render CSV from TeX
279
+ if (argv.svg) {
280
+ await (0, TexUtils_1.toSvg)(argv, context);
244
281
  }
245
- return contents;
246
- });
247
- // Render CSV from TeX
248
- if (argv.svg) {
249
- await TexUtils_1.toSvg(argv, context);
250
- }
251
- }));
252
- exports.handler = handler;
282
+ }));
283
+ }
253
284
  //# sourceMappingURL=CommandQuery.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"CommandQuery.js","sourceRoot":"","sources":["CommandQuery.ts"],"names":[],"mappings":"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","sourcesContent":["import * as fs from 'fs';\nimport Path from 'path';\n\nimport type { Argv } from 'yargs';\nimport { instantiateTemplate } from '../../../TemplateUtils';\nimport { wrapCommandHandler, wrapVisualProgress } from '../../CliHelpers';\n\nimport type { ITaskContext } from '../../ITaskContext';\nimport {\n\n getColorScheme,\n getExperimentNames,\n getQueryNames,\n handleCsvFile,\n relabelQueryNames,\n toSvg,\n} from './TexUtils';\n\nexport const command = 'query <experiment-dir...>';\nexport const desc = 'Plot the query execution times from the given experiments';\nexport const builder = (yargs: Argv<any>): Argv<any> =>\n yargs\n .options({\n queryRegex: {\n type: 'string',\n alias: 'q',\n describe: 'Regex for queries to include (before any label overrides). Examples: \\'^C\\', \\'^[^C]\\', ...',\n },\n name: {\n type: 'string',\n alias: 'n',\n describe: 'Custom output file name',\n default: 'plot_queries_data',\n },\n color: {\n type: 'string',\n alias: 'c',\n describe: 'Color scheme name from colorbrewer2.org',\n },\n maxY: {\n type: 'number',\n describe: 'The upper limit of the Y-axis. Defaults to maximum Y value',\n },\n legend: {\n type: 'boolean',\n describe: 'If a legend should be included',\n default: true,\n },\n legendPos: {\n type: 'string',\n describe: 'The legend position X,Y (anchor north-east)',\n default: '1.0,1.0',\n },\n logY: {\n type: 'boolean',\n describe: 'If the Y-Axis must have a log scale',\n default: false,\n },\n inputName: {\n type: 'string',\n describe: 'Custom input file name per experiment',\n default: 'query-times.csv',\n },\n inputDelimiter: {\n type: 'string',\n describe: 'Delimiter for the input CSV file',\n default: ';',\n },\n overrideCombinationLabels: {\n type: 'string',\n describe: 'Comma-separated list of combination labels to use',\n },\n overrideQueryLabels: {\n type: 'string',\n describe: 'Comma-separated list of query labels to use',\n },\n zeroReplacement: {\n type: 'number',\n describe: 'If zero values occur, what values they should be replaced with',\n default: 0,\n },\n svg: {\n type: 'boolean',\n describe: 'If the tex file should be converted to svg via the tex2svg command',\n default: false,\n },\n metric: {\n type: 'string',\n describe: 'The metric to plot',\n choices: [ 'time', 'httpRequests' ],\n default: 'time',\n },\n relative: {\n type: 'boolean',\n describe: 'If the maximum value per query should be set to 1, and all other values made relative to that.',\n default: false,\n },\n });\nexport const handler = (argv: Record<string, any>): Promise<void> => wrapCommandHandler(argv,\n async(context: ITaskContext) => wrapVisualProgress('Plotting data', async() => {\n // Load CLI args\n const { experimentDirectories, experimentNames, experimentIds } = getExperimentNames(argv);\n const queryRegex = argv.queryRegex ? new RegExp(argv.queryRegex, 'u') : undefined;\n const colorScheme = getColorScheme(argv, experimentDirectories);\n const metric = argv.metric;\n\n // Prepare query CSV file with averages per query group\n let queryNames: string[] | undefined;\n let outputCsvEntries: Record<string, number[]> = {};\n const maxQueryValues: Record<string, number> = {};\n for (const experimentDirectory of experimentDirectories) {\n // Read CSV file\n const totals: Record<string, number[]> = {};\n const totalsFirst: Record<string, number[]> = {};\n await handleCsvFile(experimentDirectory, argv, data => {\n if (!queryRegex || queryRegex.test(data.name)) {\n if (!(data.name in totals)) {\n totals[data.name] = [];\n }\n\n let value = Number.parseInt(data[metric] || '0', 10);\n value = Math.max(argv.zeroReplacement, value);\n\n totals[data.name].push(value);\n\n if (data.timestamps) {\n if (!(data.name in totalsFirst)) {\n totalsFirst[data.name] = [];\n }\n totalsFirst[data.name].push(Number.parseInt(data.timestamps.split(' ')[0], 10));\n }\n }\n });\n\n // Calculate average\n const averages: Record<string, number> = {};\n const averageMinus: Record<string, number> = {};\n const averagePlus: Record<string, number> = {};\n for (const [ query, times ] of Object.entries(totals)) {\n const average = times.reduce((sum, current) => sum + current) / times.length;\n averages[query] = average;\n averageMinus[query] = average - times.reduce((minV, value) => Math.min(value, minV));\n const maxValue = times.reduce((maxV, value) => Math.max(value, maxV));\n averagePlus[query] = maxValue - average;\n\n if (!(query in maxQueryValues)) {\n maxQueryValues[query] = maxValue;\n } else {\n maxQueryValues[query] = Math.max(maxQueryValues[query], maxValue);\n }\n }\n const averagesFirst: Record<string, number> = {};\n const averageFirstMinus: Record<string, number> = {};\n const averageFirstPlus: Record<string, number> = {};\n for (const [ query, times ] of Object.entries(totalsFirst)) {\n const average = times.reduce((sum, current) => sum + current) / times.length;\n averagesFirst[query] = average;\n averageFirstMinus[query] = average - times.reduce((minV, value) => Math.min(value, minV));\n const maxValue = times.reduce((maxV, value) => Math.max(value, maxV));\n averageFirstPlus[query] = maxValue - average;\n }\n\n // Set query names and count\n if (!queryNames) {\n queryNames = Object.keys(averages);\n for (const queryName of queryNames) {\n outputCsvEntries[queryName] = [];\n }\n } else if (queryNames.join(',') !== Object.keys(averages).join(',')) {\n throw new Error(`Tried to plot experiments with different query sets`);\n }\n\n // Append average, min, and max result\n for (const queryName of queryNames) {\n outputCsvEntries[queryName].push(\n averages[queryName],\n averageMinus[queryName],\n averagePlus[queryName],\n );\n if (metric === 'time') {\n outputCsvEntries[queryName].push(\n averagesFirst[queryName] || Number.NaN,\n averageFirstMinus[queryName] || Number.NaN,\n averageFirstPlus[queryName] || Number.NaN,\n );\n }\n }\n }\n if (!queryNames) {\n throw new Error(`No queries could be found`);\n }\n if (argv.relative) {\n // Make values relative per query\n for (const queryName of Object.keys(outputCsvEntries)) {\n outputCsvEntries[queryName] = outputCsvEntries[queryName].map(value => value / maxQueryValues[queryName]);\n }\n }\n // Determine query labels\n queryNames = getQueryNames(queryNames, argv);\n outputCsvEntries = relabelQueryNames(outputCsvEntries, queryNames);\n\n // Write output CSV file\n const csvOutputStream = fs.createWriteStream(Path.join(context.cwd, `${argv.name}.csv`));\n csvOutputStream.write(`query;${experimentIds.map(id => {\n let value = `${id}-mean;${id}-minus;${id}-plus`;\n if (metric === 'time') {\n value = `${value};${id}-first-mean;${id}-first-minus;${id}-first-plus`;\n }\n return value;\n }).join(';')}\\n`);\n for (const [ key, columns ] of Object.entries(outputCsvEntries)) {\n csvOutputStream.write(`${key};${columns.join(';')}\\n`);\n }\n csvOutputStream.close();\n\n // Prepare bar lines\n let barLines = experimentNames\n .map((name, id) => {\n const offset = (id - ((experimentNames.length - 1) / 2)) * 2.75;\n const yModifier = metric === 'time' && !argv.relative ? ' / 1000' : '';\n return `\\\\addplot+[ybar, xshift=${offset}pt,legend image post style={xshift=${-offset}pt}] table [x=query, y expr=(\\\\thisrow{${id}-mean}${yModifier}), y error plus expr=(\\\\thisrow{${id}-plus}${yModifier}), y error minus expr=(\\\\thisrow{${id}-minus}${yModifier}), col sep=semicolon]{\"${argv.name}.csv\"};`;\n })\n .join('\\n');\n if (metric === 'time') {\n const extraBarLines = experimentNames\n .map((name, id) => {\n const offset = (id - ((experimentNames.length - 1) / 2)) * 2.75;\n const yModifier = metric === 'time' && !argv.relative ? ' / 1000' : '';\n return `\\\\addplot+[only marks,xshift=${offset}pt,mark=star,mark options={color=gray,scale=0.5}] table [x=query, y expr=(\\\\thisrow{${id}-first-mean}${yModifier}), col sep=semicolon]{\"${argv.name}.csv\"};`;\n })\n .join('\\n');\n barLines = `${barLines}\\n${extraBarLines}`;\n }\n\n // Instantiate template\n await instantiateTemplate(\n Path.join(context.templatesRoot, 'tex', 'plot_query_data.tex'),\n Path.join(context.cwd, `${argv.name}.tex`),\n {\n X_LIMITS: experimentDirectories.length * 2,\n WIDTH: queryNames.length * (experimentNames.length + 1) * 4,\n QUERIES: queryNames.join(','),\n LEGEND: experimentNames.map(name => name.replace(/_/gu, '\\\\_')).join(','),\n BARS: barLines,\n COLOR_SCHEME: colorScheme,\n LEGEND_POS: argv.legendPos,\n ...argv.maxY ? { Y_MAX: `ymax=${argv.maxY},` } : {},\n },\n contents => {\n if (!argv.legend) {\n contents = contents.replace(/\\\\legend\\{.*\\}/ug, '');\n }\n if (argv.logY) {\n contents = contents\n .replace(/ymin=0,/u, 'ymin=0.000001,ymode=log,log origin=infty,log basis y={10},')\n .replace(/ \\/ 1000\\)/ug, ' / 1000)+1e-5');\n }\n if (argv.relative) {\n contents = contents.replace('ylabel={Duration (s)},', 'ylabel={},');\n }\n if (metric === 'httpRequests') {\n contents = contents.replace('ylabel={Duration (s)},', 'ylabel={HTTP Requests},');\n }\n return contents;\n },\n );\n\n // Render CSV from TeX\n if (argv.svg) {\n await toSvg(argv, context);\n }\n }));\n"]}
1
+ {"version":3,"file":"CommandQuery.js","sourceRoot":"","sources":["CommandQuery.ts"],"names":[],"mappings":"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","sourcesContent":["import * as fs from 'fs';\nimport Path from 'path';\n\nimport type { Argv } from 'yargs';\nimport { instantiateTemplate } from '../../../TemplateUtils';\nimport { wrapCommandHandler, wrapVisualProgress } from '../../CliHelpers';\n\nimport type { ITaskContext } from '../../ITaskContext';\nimport {\n\n getColorScheme,\n getExperimentNames,\n getQueryNames,\n handleCsvFile,\n relabelQueryNames,\n toSvg,\n} from './TexUtils';\n\nexport const command = 'query <experiment-dir...>';\nexport const desc = 'Plot the query execution times from the given experiments';\nexport function builder(yargs: Argv<any>): Argv<any> {\n return yargs\n .options({\n queryRegex: {\n type: 'string',\n alias: 'q',\n describe: 'Regex for queries to include (before any label overrides). Examples: \\'^C\\', \\'^[^C]\\', ...',\n },\n name: {\n type: 'string',\n alias: 'n',\n describe: 'Custom output file name',\n default: 'plot_queries_data',\n },\n color: {\n type: 'string',\n alias: 'c',\n describe: 'Color scheme name from colorbrewer2.org',\n },\n shiftColorList: {\n type: 'number',\n describe: 'How many color list elements should be skipped',\n default: 0,\n },\n maxY: {\n type: 'number',\n describe: 'The upper limit of the Y-axis. Defaults to maximum Y value',\n },\n legend: {\n type: 'boolean',\n describe: 'If a legend should be included',\n default: true,\n },\n legendPos: {\n type: 'string',\n describe: 'The legend position X,Y (anchor north-east)',\n default: '1.0,1.0',\n },\n logY: {\n type: 'boolean',\n describe: 'If the Y-Axis must have a log scale',\n default: false,\n },\n inputName: {\n type: 'string',\n describe: 'Custom input file name per experiment',\n default: 'query-times.csv',\n },\n inputDelimiter: {\n type: 'string',\n describe: 'Delimiter for the input CSV file',\n default: ';',\n },\n overrideCombinationLabels: {\n type: 'string',\n describe: 'Comma-separated list of combination labels to use',\n },\n overrideQueryLabels: {\n type: 'string',\n describe: 'Comma-separated list of query labels to use',\n },\n zeroReplacement: {\n type: 'number',\n describe: 'If zero values occur, what values they should be replaced with',\n default: 0,\n },\n svg: {\n type: 'boolean',\n describe: 'If the tex file should be converted to svg via the tex2svg command',\n default: false,\n },\n metric: {\n type: 'string',\n describe: 'The metric to plot',\n choices: [ 'time', 'httpRequests' ],\n default: 'time',\n },\n outliers: {\n type: 'boolean',\n describe: 'If outliers should be included',\n default: true,\n },\n relative: {\n type: 'boolean',\n describe: 'If the maximum value per query should be set to 1, and all other values made relative to that.',\n default: false,\n },\n });\n}\nexport function handler(argv: Record<string, any>): Promise<void> {\n return wrapCommandHandler(argv, async(context: ITaskContext) => wrapVisualProgress('Plotting data', async() => {\n // Load CLI args\n const { experimentDirectories, experimentNames, experimentIds } = getExperimentNames(argv);\n const queryRegex = argv.queryRegex ? new RegExp(argv.queryRegex, 'u') : undefined;\n const colorScheme = getColorScheme(argv, experimentDirectories);\n const metric = argv.metric;\n\n // Prepare query CSV file with averages per query group\n let queryNames: string[] | undefined;\n let outputCsvEntries: Record<string, number[]> = {};\n const maxQueryValues: Record<string, number> = {};\n for (const experimentDirectory of experimentDirectories) {\n // Read CSV file\n const totals: Record<string, number[]> = {};\n const totalsFirst: Record<string, number[]> = {};\n await handleCsvFile(experimentDirectory, argv, (data) => {\n if (!queryRegex || queryRegex.test(data.name)) {\n if (!(data.name in totals)) {\n totals[data.name] = [];\n }\n\n let value = Number.parseInt(data[metric] || '0', 10);\n value = Math.max(argv.zeroReplacement, value);\n\n totals[data.name].push(value);\n\n if (data.timestamps) {\n if (!(data.name in totalsFirst)) {\n totalsFirst[data.name] = [];\n }\n totalsFirst[data.name].push(Number.parseInt(data.timestamps.split(' ')[0], 10));\n }\n }\n });\n\n // Calculate average\n const averages: Record<string, number> = {};\n const averageMinus: Record<string, number> = {};\n const averagePlus: Record<string, number> = {};\n for (const [ query, times ] of Object.entries(totals)) {\n const average = times.reduce((sum, current) => sum + current) / times.length;\n averages[query] = average;\n averageMinus[query] = average - times.reduce((minV, value) => Math.min(value, minV));\n const maxValue = times.reduce((maxV, value) => Math.max(value, maxV));\n averagePlus[query] = maxValue - average;\n\n if (!(query in maxQueryValues)) {\n maxQueryValues[query] = maxValue;\n } else {\n maxQueryValues[query] = Math.max(maxQueryValues[query], maxValue);\n }\n }\n const averagesFirst: Record<string, number> = {};\n const averageFirstMinus: Record<string, number> = {};\n const averageFirstPlus: Record<string, number> = {};\n for (const [ query, times ] of Object.entries(totalsFirst)) {\n const average = times.reduce((sum, current) => sum + current) / times.length;\n averagesFirst[query] = average;\n averageFirstMinus[query] = average - times.reduce((minV, value) => Math.min(value, minV));\n const maxValue = times.reduce((maxV, value) => Math.max(value, maxV));\n averageFirstPlus[query] = maxValue - average;\n }\n\n // Set query names and count\n if (!queryNames) {\n queryNames = Object.keys(averages);\n for (const queryName of queryNames) {\n outputCsvEntries[queryName] = [];\n }\n } else if (queryNames.join(',') !== Object.keys(averages).join(',')) {\n throw new Error(`Tried to plot experiments with different query sets`);\n }\n\n // Append average, min, and max result\n for (const queryName of queryNames) {\n outputCsvEntries[queryName].push(\n averages[queryName],\n averageMinus[queryName],\n averagePlus[queryName],\n );\n if (metric === 'time') {\n outputCsvEntries[queryName].push(\n averagesFirst[queryName] || Number.NaN,\n averageFirstMinus[queryName] || Number.NaN,\n averageFirstPlus[queryName] || Number.NaN,\n );\n }\n }\n }\n if (!queryNames) {\n throw new Error(`No queries could be found`);\n }\n if (argv.relative) {\n // Make values relative per query\n for (const queryName of Object.keys(outputCsvEntries)) {\n outputCsvEntries[queryName] = outputCsvEntries[queryName].map(value => value / maxQueryValues[queryName]);\n }\n }\n // Determine query labels\n queryNames = getQueryNames(queryNames, argv);\n outputCsvEntries = relabelQueryNames(outputCsvEntries, queryNames);\n\n // Write output CSV file\n const csvOutputStream = fs.createWriteStream(Path.join(context.cwd, `${argv.name}.csv`));\n csvOutputStream.write(`query;${experimentIds.map((id) => {\n let value = `${id}-mean;${id}-minus;${id}-plus`;\n if (metric === 'time') {\n value = `${value};${id}-first-mean;${id}-first-minus;${id}-first-plus`;\n }\n return value;\n }).join(';')}\\n`);\n for (const [ key, columns ] of Object.entries(outputCsvEntries)) {\n csvOutputStream.write(`${key};${columns.join(';')}\\n`);\n }\n csvOutputStream.close();\n\n // Shift color list by a number of elements\n const prependPlotLines = argv.shiftColorList > 0 ? `\\\\pgfplotsset{cycle list shift=${argv.shiftColorList}}\\n` : '';\n\n // Prepare bar lines\n let barLines = prependPlotLines + experimentNames\n .map((name, id) => {\n const offset = (id - ((experimentNames.length - 1) / 2)) * 2.75;\n const yModifier = metric === 'time' && !argv.relative ? ' / 1000' : '';\n const outliers = argv.outliers ? `, y error plus expr=(\\\\thisrow{${id}-plus}${yModifier}), y error minus expr=(\\\\thisrow{${id}-minus}${yModifier})` : '';\n return `\\\\addplot+[ybar, xshift=${offset}pt,legend image post style={xshift=${-offset}pt}] table [x=query, y expr=(\\\\thisrow{${id}-mean}${yModifier})${outliers}, col sep=semicolon]{\"${argv.name}.csv\"};`;\n })\n .join('\\n');\n if (metric === 'time' && argv.outliers) {\n const extraBarLines = experimentNames\n .map((name, id) => {\n const offset = (id - ((experimentNames.length - 1) / 2)) * 2.75;\n const yModifier = metric === 'time' && !argv.relative ? ' / 1000' : '';\n return `\\\\addplot+[only marks,xshift=${offset}pt,mark=star,mark options={color=gray,scale=0.5}] table [x=query, y expr=(\\\\thisrow{${id}-first-mean}${yModifier}), col sep=semicolon]{\"${argv.name}.csv\"};`;\n })\n .join('\\n');\n barLines = `${barLines}\\n${prependPlotLines}${extraBarLines}`;\n }\n\n // Instantiate template\n await instantiateTemplate(\n Path.join(context.templatesRoot, 'tex', 'plot_query_data.tex'),\n Path.join(context.cwd, `${argv.name}.tex`),\n {\n X_LIMITS: experimentDirectories.length * 2,\n WIDTH: queryNames.length * (experimentNames.length + 1) * 4,\n QUERIES: queryNames.join(','),\n LEGEND: experimentNames.map(name => name.replace(/_/gu, '\\\\_')).join(','),\n BARS: barLines,\n COLOR_SCHEME: colorScheme,\n LEGEND_POS: argv.legendPos,\n ...argv.maxY ? { Y_MAX: `ymax=${argv.maxY},` } : {},\n },\n (contents) => {\n if (!argv.legend) {\n contents = contents.replace(/\\\\legend\\{.*\\}/ug, '');\n }\n if (argv.logY) {\n contents = contents\n .replace(/ymin=0,/u, 'ymin=0.000001,ymode=log,log origin=infty,log basis y={10},')\n .replace(/ \\/ 1000\\)/ug, ' / 1000)+1e-5');\n }\n if (argv.relative) {\n contents = contents.replace('ylabel={Duration (s)},', 'ylabel={},');\n }\n if (metric === 'httpRequests') {\n contents = contents.replace('ylabel={Duration (s)},', 'ylabel={HTTP Requests},');\n }\n return contents;\n },\n );\n\n // Render CSV from TeX\n if (argv.svg) {\n await toSvg(argv, context);\n }\n }));\n}\n"]}
@@ -1,5 +1,5 @@
1
1
  import type { Argv } from 'yargs';
2
2
  export declare const command = "queryTimes <query> <experiment-dir...>";
3
3
  export declare const desc = "Plot the query result arrival times from the given experiments";
4
- export declare const builder: (yargs: Argv<any>) => Argv<any>;
5
- export declare const handler: (argv: Record<string, any>) => Promise<void>;
4
+ export declare function builder(yargs: Argv<any>): Argv<any>;
5
+ export declare function handler(argv: Record<string, any>): Promise<void>;