@rubensworks/process-sparql-benchmark-results 1.0.1 → 1.1.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.
@@ -0,0 +1,5 @@
1
+ import type { Argv } from 'yargs';
2
+ export declare const command = "ghbench <experiment-dir...>";
3
+ export declare const desc = "Generates a JSON file for usage in the Benchmark Github Action";
4
+ export declare const builder: (yargs: Argv<any>) => Argv<any>;
5
+ export declare const handler: (argv: Record<string, any>) => Promise<void>;
@@ -0,0 +1,92 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
5
+ }) : (function(o, m, k, k2) {
6
+ if (k2 === undefined) k2 = k;
7
+ o[k2] = m[k];
8
+ }));
9
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
10
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
11
+ }) : function(o, v) {
12
+ o["default"] = v;
13
+ });
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
+ };
21
+ var __importDefault = (this && this.__importDefault) || function (mod) {
22
+ return (mod && mod.__esModule) ? mod : { "default": mod };
23
+ };
24
+ Object.defineProperty(exports, "__esModule", { value: true });
25
+ exports.handler = exports.builder = exports.desc = exports.command = void 0;
26
+ const fs = __importStar(require("fs"));
27
+ const path_1 = __importDefault(require("path"));
28
+ const CliHelpers_1 = require("../../CliHelpers");
29
+ const TexUtils_1 = require("../tex/TexUtils");
30
+ exports.command = 'ghbench <experiment-dir...>';
31
+ exports.desc = 'Generates a JSON file for usage in the Benchmark Github Action';
32
+ const builder = (yargs) => yargs
33
+ .options({
34
+ queryRegex: {
35
+ type: 'string',
36
+ alias: 'q',
37
+ describe: 'Regex for queries to include (before any label overrides). Examples: \'^C\', \'^[^C]\', ...',
38
+ },
39
+ name: {
40
+ type: 'string',
41
+ alias: 'n',
42
+ describe: 'Custom output file name',
43
+ default: 'ghbench.json',
44
+ },
45
+ inputName: {
46
+ type: 'string',
47
+ describe: 'Custom input file name per experiment',
48
+ default: 'query-times.csv',
49
+ },
50
+ inputDelimiter: {
51
+ type: 'string',
52
+ describe: 'Delimiter for the input CSV file',
53
+ default: ';',
54
+ },
55
+ overrideCombinationLabels: {
56
+ type: 'string',
57
+ describe: 'Comma-separated list of combination labels to use',
58
+ },
59
+ });
60
+ exports.builder = builder;
61
+ const handler = (argv) => CliHelpers_1.wrapCommandHandler(argv, async (context) => CliHelpers_1.wrapVisualProgress('Collecting ghbench data', async () => {
62
+ // Load options
63
+ const { experimentDirectories, experimentNames } = TexUtils_1.getExperimentNames(argv);
64
+ const queryRegex = argv.queryRegex ? new RegExp(argv.queryRegex, 'u') : undefined;
65
+ // Collect timings
66
+ const ghbenchData = [];
67
+ for (const [experimentId, experimentDirectory] of experimentDirectories.entries()) {
68
+ const times = {};
69
+ await TexUtils_1.handleCsvFile(experimentDirectory, argv, data => {
70
+ if (!queryRegex || queryRegex.test(data.name)) {
71
+ if (!times[experimentId]) {
72
+ times[experimentId] = {};
73
+ }
74
+ if (!times[experimentId][data.name]) {
75
+ times[experimentId][data.name] = 0;
76
+ }
77
+ times[experimentId][data.name] += Number.parseInt(data.time, 10);
78
+ ghbenchData.push({
79
+ name: `${experimentNames[experimentId]} - ${data.name}.${data.id}`,
80
+ unit: 'ms',
81
+ value: Number.parseInt(data.results, 10),
82
+ extra: `Results: ${data.results}; Error: ${data.error}; HTTP Requests: ${data.httpRequests}`,
83
+ });
84
+ }
85
+ });
86
+ }
87
+ // Write output
88
+ // eslint-disable-next-line no-sync
89
+ fs.writeFileSync(path_1.default.join(context.cwd, `${argv.name}`), JSON.stringify(ghbenchData, null, ' '), 'utf8');
90
+ }));
91
+ exports.handler = handler;
92
+ //# sourceMappingURL=CommandGithubActionsBenchmark.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"CommandGithubActionsBenchmark.js","sourceRoot":"","sources":["CommandGithubActionsBenchmark.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AACzB,gDAAwB;AAExB,iDAA0E;AAE1E,8CAGyB;AAEZ,QAAA,OAAO,GAAG,6BAA6B,CAAC;AACxC,QAAA,IAAI,GAAG,gEAAgE,CAAC;AAC9E,MAAM,OAAO,GAAG,CAAC,KAAgB,EAAa,EAAE,CACrD,KAAK;KACF,OAAO,CAAC;IACP,UAAU,EAAE;QACV,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,GAAG;QACV,QAAQ,EAAE,6FAA6F;KACxG;IACD,IAAI,EAAE;QACJ,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,GAAG;QACV,QAAQ,EAAE,yBAAyB;QACnC,OAAO,EAAE,cAAc;KACxB;IACD,SAAS,EAAE;QACT,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,uCAAuC;QACjD,OAAO,EAAE,iBAAiB;KAC3B;IACD,cAAc,EAAE;QACd,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,kCAAkC;QAC5C,OAAO,EAAE,GAAG;KACb;IACD,yBAAyB,EAAE;QACzB,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,mDAAmD;KAC9D;CACF,CAAC,CAAC;AA5BM,QAAA,OAAO,WA4Bb;AACA,MAAM,OAAO,GAAG,CAAC,IAAyB,EAAiB,EAAE,CAAC,+BAAkB,CAAC,IAAI,EAC1F,KAAK,EAAC,OAAqB,EAAE,EAAE,CAAC,+BAAkB,CAAC,yBAAyB,EAAE,KAAK,IAAG,EAAE;IACtF,eAAe;IACf,MAAM,EAAE,qBAAqB,EAAE,eAAe,EAAE,GAAG,6BAAkB,CAAC,IAAI,CAAC,CAAC;IAC5E,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAElF,kBAAkB;IAClB,MAAM,WAAW,GAAgB,EAAE,CAAC;IACpC,KAAK,MAAM,CAAE,YAAY,EAAE,mBAAmB,CAAE,IAAI,qBAAqB,CAAC,OAAO,EAAE,EAAE;QACnF,MAAM,KAAK,GAA2C,EAAE,CAAC;QAEzD,MAAM,wBAAa,CAAC,mBAAmB,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE;YACpD,IAAI,CAAC,UAAU,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBAC7C,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE;oBACxB,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC;iBAC1B;gBACD,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;oBACnC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;iBACpC;gBACD,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBAEjE,WAAW,CAAC,IAAI,CAAC;oBACf,IAAI,EAAE,GAAG,eAAe,CAAC,YAAY,CAAC,MAAM,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,EAAE,EAAE;oBAClE,IAAI,EAAE,IAAI;oBACV,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;oBACxC,KAAK,EAAE,YAAY,IAAI,CAAC,OAAO,YAAY,IAAI,CAAC,KAAK,oBAAoB,IAAI,CAAC,YAAY,EAAE;iBAC7F,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;KACJ;IAED,eAAe;IACf,mCAAmC;IACnC,EAAE,CAAC,aAAa,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC;AAC5G,CAAC,CAAC,CAAC,CAAC;AAlCO,QAAA,OAAO,WAkCd","sourcesContent":["import * as fs from 'fs';\nimport Path from 'path';\nimport type { Argv } from 'yargs';\nimport { wrapCommandHandler, wrapVisualProgress } from '../../CliHelpers';\nimport type { ITaskContext } from '../../ITaskContext';\nimport {\n getExperimentNames,\n handleCsvFile,\n} from '../tex/TexUtils';\n\nexport const command = 'ghbench <experiment-dir...>';\nexport const desc = 'Generates a JSON file for usage in the Benchmark Github Action';\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: 'ghbench.json',\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 });\nexport const handler = (argv: Record<string, any>): Promise<void> => wrapCommandHandler(argv,\n async(context: ITaskContext) => wrapVisualProgress('Collecting ghbench data', async() => {\n // Load options\n const { experimentDirectories, experimentNames } = getExperimentNames(argv);\n const queryRegex = argv.queryRegex ? new RegExp(argv.queryRegex, 'u') : undefined;\n\n // Collect timings\n const ghbenchData: GhbenchData = [];\n for (const [ experimentId, experimentDirectory ] of experimentDirectories.entries()) {\n const times: Record<string, Record<string, number>> = {};\n\n await handleCsvFile(experimentDirectory, argv, data => {\n if (!queryRegex || queryRegex.test(data.name)) {\n if (!times[experimentId]) {\n times[experimentId] = {};\n }\n if (!times[experimentId][data.name]) {\n times[experimentId][data.name] = 0;\n }\n times[experimentId][data.name] += Number.parseInt(data.time, 10);\n\n ghbenchData.push({\n name: `${experimentNames[experimentId]} - ${data.name}.${data.id}`,\n unit: 'ms',\n value: Number.parseInt(data.results, 10),\n extra: `Results: ${data.results}; Error: ${data.error}; HTTP Requests: ${data.httpRequests}`,\n });\n }\n });\n }\n\n // Write output\n // eslint-disable-next-line no-sync\n fs.writeFileSync(Path.join(context.cwd, `${argv.name}`), JSON.stringify(ghbenchData, null, ' '), 'utf8');\n }));\n\ntype GhbenchData = {\n name: string;\n unit: string;\n value: number;\n range?: string;\n extra?: string;\n}[];\n"]}
@@ -106,7 +106,7 @@ const handler = (argv) => CliHelpers_1.wrapCommandHandler(argv, async (context)
106
106
  '$$\\tilde{t}_1$$',
107
107
  '$$\\overline{req}$$',
108
108
  '$$\\sum ans$$',
109
- ...correctnessReference ? ['$$\\overline{cor}$$'] : [],
109
+ ...correctnessReference ? ['$$\\overline{acc}$$'] : [],
110
110
  '$$\\sum to$$',
111
111
  ], {
112
112
  align: [
@@ -1 +1 @@
1
- {"version":3,"file":"CommandSummary.js","sourceRoot":"","sources":["CommandSummary.ts"],"names":[],"mappings":"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","sourcesContent":["import * as fs from 'fs';\nimport Path from 'path';\nimport type { Argv } from 'yargs';\nimport { constructCorrectnessChecker } from '../../../correctness/CorrectnessCheckerUtils';\nimport { wrapCommandHandler, wrapVisualProgress } from '../../CliHelpers';\nimport type { ITaskContext } from '../../ITaskContext';\nimport {\n calcAverage, calcMedian,\n calcSum,\n getExperimentNames,\n getQueryNames,\n handleCsvFile,\n relabelQueryNames,\n} from '../tex/TexUtils';\nimport { TableSerializerCsv } from './TableSerializerCsv';\nimport { TableSerializerMarkdown } from './TableSerializerMarkdown';\n\nexport const command = 'summary <experiment-dir...>';\nexport const desc = 'Summarize query results from the given experiments in a table';\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: 'data_summary.csv',\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 markdown: {\n type: 'boolean',\n describe: 'If the output should be serialized as markdown',\n default: false,\n },\n queryAverage: {\n type: 'boolean',\n describe: 'If queries will be averaged over',\n default: false,\n },\n correctnessReference: {\n type: 'string',\n describe: 'Path to a JSON file mapping queries to expected cardinality',\n default: '',\n },\n markRows: {\n type: 'string',\n describe: 'Comma-separated list of row id\\'s to mark (markdown-only)',\n },\n });\nexport const handler = (argv: Record<string, any>): Promise<void> => wrapCommandHandler(argv,\n async(context: ITaskContext) => wrapVisualProgress('Summarizing data', async() => {\n // Load options\n const { experimentDirectories, experimentNames } = getExperimentNames(argv);\n const queryRegex = argv.queryRegex ? new RegExp(argv.queryRegex, 'u') : undefined;\n const correctnessReference = argv.correctnessReference ?\n constructCorrectnessChecker(argv.correctnessReference) :\n undefined;\n const markRows: number[] = argv.markRows ?\n argv.markRows.split(',').map((value: string) => Number.parseInt(value, 10)) :\n [];\n\n // Prepare output CSV file\n const os = fs.createWriteStream(Path.join(context.cwd, `${argv.name}`));\n const serializer = argv.markdown ? new TableSerializerMarkdown(os) : new TableSerializerCsv(os);\n if (argv.queryAverage) {\n serializer.writeHeader([\n '',\n '$$\\\\overline{t}$$',\n '$$\\\\tilde{t}$$',\n '$$\\\\overline{t}_1$$',\n '$$\\\\tilde{t}_1$$',\n '$$\\\\overline{req}$$',\n '$$\\\\sum ans$$',\n ...correctnessReference ? [ '$$\\\\overline{cor}$$' ] : [],\n '$$\\\\sum to$$',\n ], {\n align: [\n 'left',\n 'right',\n 'right',\n 'right',\n 'right',\n 'right',\n 'right',\n 'right',\n 'right',\n ],\n });\n } else {\n serializer.writeHeader([\n 'Experiment',\n 'Query',\n 'Time',\n 'Requests',\n 'Results',\n ...correctnessReference ? [ 'Correctness' ] : [],\n 'Timeout',\n ], {\n align: [\n 'left',\n 'right',\n 'right',\n 'right',\n 'right',\n 'right',\n 'right',\n ],\n });\n }\n\n // Collect data from all experiments\n for (const [ experimentId, experimentDirectory ] of experimentDirectories.entries()) {\n // Read CSV file\n const timesTotal: Record<string, number[]> = {};\n const timesFirstTotal: Record<string, number[]> = {};\n const requestsTotal: Record<string, number[]> = {};\n let results: Record<string, number> = {};\n let timeout: Record<string, boolean> = {};\n await handleCsvFile(experimentDirectory, argv, data => {\n if (!queryRegex || queryRegex.test(data.name)) {\n if (!(data.name in timesTotal)) {\n timesTotal[data.name] = [];\n }\n timesTotal[data.name].push(Number.parseInt(data.time, 10));\n\n if (!(data.name in requestsTotal)) {\n requestsTotal[data.name] = [];\n }\n requestsTotal[data.name].push(Number\n .parseInt(data.error === 'false' && data.httpRequests ? data.httpRequests : '0', 10));\n\n results[data.name] = Number.parseInt(data.results, 10);\n timeout[data.name] = data.error === 'true';\n\n if (data.timestamps) {\n if (!(data.name in timesFirstTotal)) {\n timesFirstTotal[data.name] = [];\n }\n timesFirstTotal[data.name].push(Number.parseInt(data.timestamps.split(' ')[0], 10));\n }\n }\n });\n\n // Calculate average\n let timesAverage: Record<string, number> = {};\n let timesAll: number[] = [];\n for (const [ query, times ] of Object.entries(timesTotal)) {\n timesAverage[query] = calcAverage(times);\n timesAll = [ ...timesAll, ...times ];\n }\n let timesFirstAverage: Record<string, number> = {};\n let timesFirstAll: number[] = [];\n for (const [ query, times ] of Object.entries(timesFirstTotal)) {\n timesFirstAverage[query] = calcAverage(times);\n timesFirstAll = [ ...timesFirstAll, ...times ];\n }\n let requestsSum: Record<string, number> = {};\n for (const [ query, requests ] of Object.entries(requestsTotal)) {\n requestsSum[query] = calcAverage(requests);\n }\n\n // Calculate correctness\n let correctness;\n if (correctnessReference) {\n correctness = Object.fromEntries(Object.entries(results)\n .map(([ key, value ]) => [ key, correctnessReference.getCorrectness(experimentId, key, value) ]));\n }\n\n // Determine query names\n const queryNames = getQueryNames(Object.keys(results), argv);\n timesAverage = relabelQueryNames(timesAverage, queryNames);\n timesFirstAverage = relabelQueryNames(timesFirstAverage, queryNames);\n requestsSum = relabelQueryNames(requestsSum, queryNames);\n results = relabelQueryNames(results, queryNames);\n timeout = relabelQueryNames(timeout, queryNames);\n\n // Write rows in output file\n if (argv.queryAverage) {\n const valueTimeFirstAverage = Object.values(timesFirstAverage).length === 0 ?\n 'N/A' :\n calcAverage(Object.values(timesFirstAverage))\n .toLocaleString('en-US', { minimumFractionDigits: 0, maximumFractionDigits: 0 });\n const valueTimeFirstMedian = timesFirstAll.length === 0 ?\n 'N/A' :\n calcMedian(timesFirstAll)\n .toLocaleString('en-US', { minimumFractionDigits: 0, maximumFractionDigits: 0 });\n\n // Average across queries\n serializer.writeRow([\n experimentNames[experimentId],\n `${calcAverage(Object.values(timesAverage)).toLocaleString('en-US', { minimumFractionDigits: 0, maximumFractionDigits: 0 })}`,\n `${calcMedian(timesAll).toLocaleString('en-US', { minimumFractionDigits: 0, maximumFractionDigits: 0 })}`,\n `${valueTimeFirstAverage}`,\n `${valueTimeFirstMedian}`,\n `${calcSum(Object.values(requestsSum)).toLocaleString('en-US', { minimumFractionDigits: 0, maximumFractionDigits: 0 })}`,\n `${calcAverage(Object.values(results)).toLocaleString('en-US', { minimumFractionDigits: 2, maximumFractionDigits: 2 })}`,\n ...correctness ? [ `${(calcAverage(Object.values(correctness)) * 100).toFixed(2)}%` ] : [],\n `${calcSum(Object.values(timeout).map(value => value ? 1 : 0))}`,\n ], { mark: markRows.includes(experimentId) });\n } else {\n for (const [ query, time ] of Object.entries(timesAverage)) {\n serializer.writeRow([\n experimentNames[experimentId],\n query,\n `${time}`,\n `${requestsSum[query]}`,\n `${results[query]}`,\n ...correctness ? [ `${(correctness[query] * 100).toFixed(2)}%` ] : [],\n `${timeout[query]}`,\n ], { mark: markRows.includes(experimentId) });\n }\n }\n }\n\n // Close output CSV file\n serializer.close();\n }));\n"]}
1
+ {"version":3,"file":"CommandSummary.js","sourceRoot":"","sources":["CommandSummary.ts"],"names":[],"mappings":"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","sourcesContent":["import * as fs from 'fs';\nimport Path from 'path';\nimport type { Argv } from 'yargs';\nimport { constructCorrectnessChecker } from '../../../correctness/CorrectnessCheckerUtils';\nimport { wrapCommandHandler, wrapVisualProgress } from '../../CliHelpers';\nimport type { ITaskContext } from '../../ITaskContext';\nimport {\n calcAverage, calcMedian,\n calcSum,\n getExperimentNames,\n getQueryNames,\n handleCsvFile,\n relabelQueryNames,\n} from '../tex/TexUtils';\nimport { TableSerializerCsv } from './TableSerializerCsv';\nimport { TableSerializerMarkdown } from './TableSerializerMarkdown';\n\nexport const command = 'summary <experiment-dir...>';\nexport const desc = 'Summarize query results from the given experiments in a table';\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: 'data_summary.csv',\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 markdown: {\n type: 'boolean',\n describe: 'If the output should be serialized as markdown',\n default: false,\n },\n queryAverage: {\n type: 'boolean',\n describe: 'If queries will be averaged over',\n default: false,\n },\n correctnessReference: {\n type: 'string',\n describe: 'Path to a JSON file mapping queries to expected cardinality',\n default: '',\n },\n markRows: {\n type: 'string',\n describe: 'Comma-separated list of row id\\'s to mark (markdown-only)',\n },\n });\nexport const handler = (argv: Record<string, any>): Promise<void> => wrapCommandHandler(argv,\n async(context: ITaskContext) => wrapVisualProgress('Summarizing data', async() => {\n // Load options\n const { experimentDirectories, experimentNames } = getExperimentNames(argv);\n const queryRegex = argv.queryRegex ? new RegExp(argv.queryRegex, 'u') : undefined;\n const correctnessReference = argv.correctnessReference ?\n constructCorrectnessChecker(argv.correctnessReference) :\n undefined;\n const markRows: number[] = argv.markRows ?\n argv.markRows.split(',').map((value: string) => Number.parseInt(value, 10)) :\n [];\n\n // Prepare output CSV file\n const os = fs.createWriteStream(Path.join(context.cwd, `${argv.name}`));\n const serializer = argv.markdown ? new TableSerializerMarkdown(os) : new TableSerializerCsv(os);\n if (argv.queryAverage) {\n serializer.writeHeader([\n '',\n '$$\\\\overline{t}$$',\n '$$\\\\tilde{t}$$',\n '$$\\\\overline{t}_1$$',\n '$$\\\\tilde{t}_1$$',\n '$$\\\\overline{req}$$',\n '$$\\\\sum ans$$',\n ...correctnessReference ? [ '$$\\\\overline{acc}$$' ] : [],\n '$$\\\\sum to$$',\n ], {\n align: [\n 'left',\n 'right',\n 'right',\n 'right',\n 'right',\n 'right',\n 'right',\n 'right',\n 'right',\n ],\n });\n } else {\n serializer.writeHeader([\n 'Experiment',\n 'Query',\n 'Time',\n 'Requests',\n 'Results',\n ...correctnessReference ? [ 'Correctness' ] : [],\n 'Timeout',\n ], {\n align: [\n 'left',\n 'right',\n 'right',\n 'right',\n 'right',\n 'right',\n 'right',\n ],\n });\n }\n\n // Collect data from all experiments\n for (const [ experimentId, experimentDirectory ] of experimentDirectories.entries()) {\n // Read CSV file\n const timesTotal: Record<string, number[]> = {};\n const timesFirstTotal: Record<string, number[]> = {};\n const requestsTotal: Record<string, number[]> = {};\n let results: Record<string, number> = {};\n let timeout: Record<string, boolean> = {};\n await handleCsvFile(experimentDirectory, argv, data => {\n if (!queryRegex || queryRegex.test(data.name)) {\n if (!(data.name in timesTotal)) {\n timesTotal[data.name] = [];\n }\n timesTotal[data.name].push(Number.parseInt(data.time, 10));\n\n if (!(data.name in requestsTotal)) {\n requestsTotal[data.name] = [];\n }\n requestsTotal[data.name].push(Number\n .parseInt(data.error === 'false' && data.httpRequests ? data.httpRequests : '0', 10));\n\n results[data.name] = Number.parseInt(data.results, 10);\n timeout[data.name] = data.error === 'true';\n\n if (data.timestamps) {\n if (!(data.name in timesFirstTotal)) {\n timesFirstTotal[data.name] = [];\n }\n timesFirstTotal[data.name].push(Number.parseInt(data.timestamps.split(' ')[0], 10));\n }\n }\n });\n\n // Calculate average\n let timesAverage: Record<string, number> = {};\n let timesAll: number[] = [];\n for (const [ query, times ] of Object.entries(timesTotal)) {\n timesAverage[query] = calcAverage(times);\n timesAll = [ ...timesAll, ...times ];\n }\n let timesFirstAverage: Record<string, number> = {};\n let timesFirstAll: number[] = [];\n for (const [ query, times ] of Object.entries(timesFirstTotal)) {\n timesFirstAverage[query] = calcAverage(times);\n timesFirstAll = [ ...timesFirstAll, ...times ];\n }\n let requestsSum: Record<string, number> = {};\n for (const [ query, requests ] of Object.entries(requestsTotal)) {\n requestsSum[query] = calcAverage(requests);\n }\n\n // Calculate correctness\n let correctness;\n if (correctnessReference) {\n correctness = Object.fromEntries(Object.entries(results)\n .map(([ key, value ]) => [ key, correctnessReference.getCorrectness(experimentId, key, value) ]));\n }\n\n // Determine query names\n const queryNames = getQueryNames(Object.keys(results), argv);\n timesAverage = relabelQueryNames(timesAverage, queryNames);\n timesFirstAverage = relabelQueryNames(timesFirstAverage, queryNames);\n requestsSum = relabelQueryNames(requestsSum, queryNames);\n results = relabelQueryNames(results, queryNames);\n timeout = relabelQueryNames(timeout, queryNames);\n\n // Write rows in output file\n if (argv.queryAverage) {\n const valueTimeFirstAverage = Object.values(timesFirstAverage).length === 0 ?\n 'N/A' :\n calcAverage(Object.values(timesFirstAverage))\n .toLocaleString('en-US', { minimumFractionDigits: 0, maximumFractionDigits: 0 });\n const valueTimeFirstMedian = timesFirstAll.length === 0 ?\n 'N/A' :\n calcMedian(timesFirstAll)\n .toLocaleString('en-US', { minimumFractionDigits: 0, maximumFractionDigits: 0 });\n\n // Average across queries\n serializer.writeRow([\n experimentNames[experimentId],\n `${calcAverage(Object.values(timesAverage)).toLocaleString('en-US', { minimumFractionDigits: 0, maximumFractionDigits: 0 })}`,\n `${calcMedian(timesAll).toLocaleString('en-US', { minimumFractionDigits: 0, maximumFractionDigits: 0 })}`,\n `${valueTimeFirstAverage}`,\n `${valueTimeFirstMedian}`,\n `${calcSum(Object.values(requestsSum)).toLocaleString('en-US', { minimumFractionDigits: 0, maximumFractionDigits: 0 })}`,\n `${calcAverage(Object.values(results)).toLocaleString('en-US', { minimumFractionDigits: 2, maximumFractionDigits: 2 })}`,\n ...correctness ? [ `${(calcAverage(Object.values(correctness)) * 100).toFixed(2)}%` ] : [],\n `${calcSum(Object.values(timeout).map(value => value ? 1 : 0))}`,\n ], { mark: markRows.includes(experimentId) });\n } else {\n for (const [ query, time ] of Object.entries(timesAverage)) {\n serializer.writeRow([\n experimentNames[experimentId],\n query,\n `${time}`,\n `${requestsSum[query]}`,\n `${results[query]}`,\n ...correctness ? [ `${(correctness[query] * 100).toFixed(2)}%` ] : [],\n `${timeout[query]}`,\n ], { mark: markRows.includes(experimentId) });\n }\n }\n }\n\n // Close output CSV file\n serializer.close();\n }));\n"]}
@@ -229,7 +229,7 @@ const handler = (argv) => CliHelpers_1.wrapCommandHandler(argv, async (context)
229
229
  // Instantiate template
230
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
231
  if (!argv.legend) {
232
- contents = contents.replace(/^\\legend.*$/u, '');
232
+ contents = contents.replace(/\\legend\{.*\}/ug, '');
233
233
  }
234
234
  if (argv.logY) {
235
235
  contents = contents
@@ -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],\n averageFirstMinus[queryName],\n averageFirstPlus[queryName],\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.*$/u, '');\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 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],\n averageFirstMinus[queryName],\n averageFirstPlus[queryName],\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"]}
@@ -137,7 +137,7 @@ const handler = (argv) => CliHelpers_1.wrapCommandHandler(argv, async (context)
137
137
  // Instantiate template
138
138
  await TemplateUtils_1.instantiateTemplate(path_1.default.join(context.templatesRoot, 'tex', 'plot_query_times.tex'), path_1.default.join(context.cwd, `${argv.name}.tex`), Object.assign({ LEGEND: experimentNames.map(name => name.replace(/_/gu, '\\_')).join(','), LINES: lines, COLOR_SCHEME: colorScheme, LEGEND_POS: argv.legendPos }, argv.maxY ? { Y_MAX: `ymax=${argv.maxY},` } : {}), contents => {
139
139
  if (!argv.legend) {
140
- contents = contents.replace(/^\\legend.*$/u, '');
140
+ contents = contents.replace(/\\legend\{.*\}/ug, '');
141
141
  }
142
142
  if (argv.logY) {
143
143
  contents = contents.replace(/ymin=0,/u, 'ymode=log,log origin=infty,');
@@ -1 +1 @@
1
- {"version":3,"file":"CommandQueryTimes.js","sourceRoot":"","sources":["CommandQueryTimes.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 { getColorScheme, getExperimentNames, handleCsvFile, toSvg } from './TexUtils';\n\nexport const command = 'queryTimes <query> <experiment-dir...>';\nexport const desc = 'Plot the query result arrival times from the given experiments';\nexport const builder = (yargs: Argv<any>): Argv<any> =>\n yargs\n .options({\n name: {\n type: 'string',\n alias: 'n',\n describe: 'Custom output file name',\n default: 'query_times',\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 svg: {\n type: 'boolean',\n describe: 'If the tex file should be converted to svg via the tex2svg command',\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 let query: string = argv.query;\n let id = '0';\n const { experimentDirectories, experimentNames, experimentIds } = getExperimentNames(argv);\n const colorScheme = getColorScheme(argv, experimentDirectories);\n\n // Determine optional query id\n const dotPos = query.indexOf('.');\n if (dotPos >= 0) {\n id = query.slice(dotPos + 1, query.length);\n query = query.slice(0, Math.max(0, dotPos));\n }\n\n // Load query times from CSV files\n const resultsArrivalTimes: Record<string, string>[] = [];\n for (const [ experimentId, experimentDirectory ] of experimentDirectories.entries()) {\n // Read CSV file\n let foundQuery = false;\n await handleCsvFile(experimentDirectory, argv, data => {\n if (!foundQuery && data.name === query && (!id || data.id === id)) {\n foundQuery = true;\n const times: string[] = data.timestamps.split(/[ ,]/u);\n for (const [ i, time ] of times.entries()) {\n if (i >= resultsArrivalTimes.length) {\n resultsArrivalTimes.push({});\n }\n resultsArrivalTimes[i][experimentId] = time;\n }\n }\n });\n }\n\n // Write output CSV file\n const csvOutputStream = fs.createWriteStream(Path.join(context.cwd, `${argv.name}.csv`));\n csvOutputStream.write(`${experimentNames.join(';')}\\n`);\n for (const resultArrivalTimes of resultsArrivalTimes) {\n let first = true;\n for (const experimentId of experimentIds) {\n if (first) {\n first = false;\n } else {\n csvOutputStream.write(`;`);\n }\n csvOutputStream.write(`${resultArrivalTimes[experimentId] || ''}`);\n }\n csvOutputStream.write(`\\n`);\n }\n csvOutputStream.close();\n\n // Prepare bar lines\n const lines = experimentNames\n .map(name => `\\\\addplot+[mark=none] table [y expr=\\\\coordindex+1, x=${name}, col sep=semicolon]{\"${argv.name}.csv\"};`)\n .join('\\n');\n\n // Instantiate template\n await instantiateTemplate(\n Path.join(context.templatesRoot, 'tex', 'plot_query_times.tex'),\n Path.join(context.cwd, `${argv.name}.tex`),\n {\n LEGEND: experimentNames.map(name => name.replace(/_/gu, '\\\\_')).join(','),\n LINES: lines,\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.*$/u, '');\n }\n if (argv.logY) {\n contents = contents.replace(/ymin=0,/u, 'ymode=log,log origin=infty,');\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":"CommandQueryTimes.js","sourceRoot":"","sources":["CommandQueryTimes.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 { getColorScheme, getExperimentNames, handleCsvFile, toSvg } from './TexUtils';\n\nexport const command = 'queryTimes <query> <experiment-dir...>';\nexport const desc = 'Plot the query result arrival times from the given experiments';\nexport const builder = (yargs: Argv<any>): Argv<any> =>\n yargs\n .options({\n name: {\n type: 'string',\n alias: 'n',\n describe: 'Custom output file name',\n default: 'query_times',\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 svg: {\n type: 'boolean',\n describe: 'If the tex file should be converted to svg via the tex2svg command',\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 let query: string = argv.query;\n let id = '0';\n const { experimentDirectories, experimentNames, experimentIds } = getExperimentNames(argv);\n const colorScheme = getColorScheme(argv, experimentDirectories);\n\n // Determine optional query id\n const dotPos = query.indexOf('.');\n if (dotPos >= 0) {\n id = query.slice(dotPos + 1, query.length);\n query = query.slice(0, Math.max(0, dotPos));\n }\n\n // Load query times from CSV files\n const resultsArrivalTimes: Record<string, string>[] = [];\n for (const [ experimentId, experimentDirectory ] of experimentDirectories.entries()) {\n // Read CSV file\n let foundQuery = false;\n await handleCsvFile(experimentDirectory, argv, data => {\n if (!foundQuery && data.name === query && (!id || data.id === id)) {\n foundQuery = true;\n const times: string[] = data.timestamps.split(/[ ,]/u);\n for (const [ i, time ] of times.entries()) {\n if (i >= resultsArrivalTimes.length) {\n resultsArrivalTimes.push({});\n }\n resultsArrivalTimes[i][experimentId] = time;\n }\n }\n });\n }\n\n // Write output CSV file\n const csvOutputStream = fs.createWriteStream(Path.join(context.cwd, `${argv.name}.csv`));\n csvOutputStream.write(`${experimentNames.join(';')}\\n`);\n for (const resultArrivalTimes of resultsArrivalTimes) {\n let first = true;\n for (const experimentId of experimentIds) {\n if (first) {\n first = false;\n } else {\n csvOutputStream.write(`;`);\n }\n csvOutputStream.write(`${resultArrivalTimes[experimentId] || ''}`);\n }\n csvOutputStream.write(`\\n`);\n }\n csvOutputStream.close();\n\n // Prepare bar lines\n const lines = experimentNames\n .map(name => `\\\\addplot+[mark=none] table [y expr=\\\\coordindex+1, x=${name}, col sep=semicolon]{\"${argv.name}.csv\"};`)\n .join('\\n');\n\n // Instantiate template\n await instantiateTemplate(\n Path.join(context.templatesRoot, 'tex', 'plot_query_times.tex'),\n Path.join(context.cwd, `${argv.name}.tex`),\n {\n LEGEND: experimentNames.map(name => name.replace(/_/gu, '\\\\_')).join(','),\n LINES: lines,\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.replace(/ymin=0,/u, 'ymode=log,log origin=infty,');\n }\n return contents;\n },\n );\n\n // Render CSV from TeX\n if (argv.svg) {\n await toSvg(argv, context);\n }\n }));\n"]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rubensworks/process-sparql-benchmark-results",
3
- "version": "1.0.1",
3
+ "version": "1.1.0",
4
4
  "description": "Personal tools to post-process query results from SPARQL benchmarks",
5
5
  "repository": "https://github.com/rubensworks/process-sparql-benchmark-results.js",
6
6
  "keywords": [