@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.
- package/README.md +10 -1
- package/bin/psbr.js +4 -1
- package/bin/psbr.js.map +1 -1
- package/index.js +5 -1
- package/index.js.map +1 -1
- package/lib/TemplateUtils.js +23 -10
- package/lib/TemplateUtils.js.map +1 -1
- package/lib/cli/CliHelpers.js +27 -14
- package/lib/cli/CliHelpers.js.map +1 -1
- package/lib/cli/CliRunner.d.ts +1 -1
- package/lib/cli/CliRunner.js +5 -5
- package/lib/cli/CliRunner.js.map +1 -1
- package/lib/cli/ITaskContext.js.map +1 -1
- package/lib/cli/commands/CommandCsv.d.ts +1 -1
- package/lib/cli/commands/CommandCsv.js +7 -5
- package/lib/cli/commands/CommandCsv.js.map +1 -1
- package/lib/cli/commands/CommandStats.d.ts +1 -1
- package/lib/cli/commands/CommandStats.js +7 -5
- package/lib/cli/commands/CommandStats.js.map +1 -1
- package/lib/cli/commands/CommandTex.d.ts +1 -1
- package/lib/cli/commands/CommandTex.js +7 -5
- package/lib/cli/commands/CommandTex.js.map +1 -1
- package/lib/cli/commands/csv/CommandBsbm.d.ts +2 -2
- package/lib/cli/commands/csv/CommandBsbm.js +103 -85
- package/lib/cli/commands/csv/CommandBsbm.js.map +1 -1
- package/lib/cli/commands/csv/CommandGithubActionsBenchmark.d.ts +2 -2
- package/lib/cli/commands/csv/CommandGithubActionsBenchmark.js +149 -102
- package/lib/cli/commands/csv/CommandGithubActionsBenchmark.js.map +1 -1
- package/lib/cli/commands/csv/CommandQuery.d.ts +2 -2
- package/lib/cli/commands/csv/CommandQuery.js +111 -93
- package/lib/cli/commands/csv/CommandQuery.js.map +1 -1
- package/lib/cli/commands/csv/CommandSummary.d.ts +2 -2
- package/lib/cli/commands/csv/CommandSummary.js +230 -212
- package/lib/cli/commands/csv/CommandSummary.js.map +1 -1
- package/lib/cli/commands/csv/CommandWins.d.ts +2 -2
- package/lib/cli/commands/csv/CommandWins.js +134 -119
- package/lib/cli/commands/csv/CommandWins.js.map +1 -1
- package/lib/cli/commands/csv/TableSerializerCsv.d.ts +0 -1
- package/lib/cli/commands/csv/TableSerializerMarkdown.d.ts +0 -1
- package/lib/cli/commands/csv/TableSerializerMarkdown.js.map +1 -1
- package/lib/cli/commands/stats/CommandDocker.d.ts +2 -2
- package/lib/cli/commands/stats/CommandDocker.js +66 -48
- package/lib/cli/commands/stats/CommandDocker.js.map +1 -1
- package/lib/cli/commands/tex/CommandQuery.d.ts +2 -2
- package/lib/cli/commands/tex/CommandQuery.js +241 -210
- package/lib/cli/commands/tex/CommandQuery.js.map +1 -1
- package/lib/cli/commands/tex/CommandQueryTimes.d.ts +2 -2
- package/lib/cli/commands/tex/CommandQueryTimes.js +141 -123
- package/lib/cli/commands/tex/CommandQueryTimes.js.map +1 -1
- package/lib/cli/commands/tex/TexUtils.js +38 -20
- package/lib/cli/commands/tex/TexUtils.js.map +1 -1
- package/lib/correctness/CorrectnessCheckerUtils.js +2 -3
- package/lib/correctness/CorrectnessCheckerUtils.js.map +1 -1
- package/package.json +46 -49
package/README.md
CHANGED
|
@@ -18,7 +18,7 @@ Most of these tools work on output produced by [jbr](https://github.com/rubenswo
|
|
|
18
18
|
$ npm install -g @rubensworks/sparql-benchmark-runner
|
|
19
19
|
```
|
|
20
20
|
|
|
21
|
-
or
|
|
21
|
+
or
|
|
22
22
|
|
|
23
23
|
```bash
|
|
24
24
|
$ yarn global add @rubensworks/sparql-benchmark-runner
|
|
@@ -97,6 +97,8 @@ Options:
|
|
|
97
97
|
[string] [default: "plot_queries_data"]
|
|
98
98
|
-c, --color Color scheme name from colorbrewer2.org
|
|
99
99
|
[string]
|
|
100
|
+
--shiftColorList How many color list elements should be
|
|
101
|
+
skipped [number] [default: 0]
|
|
100
102
|
--maxY The upper limit of the Y-axis. Defaults to
|
|
101
103
|
maximum Y value [number]
|
|
102
104
|
--legend If a legend should be included
|
|
@@ -113,9 +115,16 @@ Options:
|
|
|
113
115
|
use [string]
|
|
114
116
|
--overrideQueryLabels Comma-separated list of query labels to use
|
|
115
117
|
[string]
|
|
118
|
+
--zeroReplacement If zero values occur, what values they should
|
|
119
|
+
be replaced with [number] [default: 0]
|
|
116
120
|
--svg If the tex file should be converted to svg
|
|
117
121
|
via the tex2svg command
|
|
118
122
|
[boolean] [default: false]
|
|
123
|
+
--metric The metric to plot
|
|
124
|
+
[string] [choices: "time", "httpRequests"] [default: "time"]
|
|
125
|
+
--relative If the maximum value per query should be set
|
|
126
|
+
to 1, and all other values made relative to
|
|
127
|
+
that. [boolean] [default: false]
|
|
119
128
|
```
|
|
120
129
|
|
|
121
130
|
#### 2.1.2. Query result arrival times
|
package/bin/psbr.js
CHANGED
|
@@ -2,5 +2,8 @@
|
|
|
2
2
|
"use strict";
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
4
|
const CliRunner_1 = require("../lib/cli/CliRunner");
|
|
5
|
-
CliRunner_1.runCli(process.cwd(), process.argv)
|
|
5
|
+
(0, CliRunner_1.runCli)(process.cwd(), process.argv).catch((error) => {
|
|
6
|
+
process.stderr.write(`${String(error)}\n`);
|
|
7
|
+
process.exitCode = 1;
|
|
8
|
+
});
|
|
6
9
|
//# sourceMappingURL=psbr.js.map
|
package/bin/psbr.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"psbr.js","sourceRoot":"","sources":["psbr.ts"],"names":[],"mappings":";;;AACA,oDAA8C;
|
|
1
|
+
{"version":3,"file":"psbr.js","sourceRoot":"","sources":["psbr.ts"],"names":[],"mappings":";;;AACA,oDAA8C;AAE9C,IAAA,kBAAM,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;IAC3D,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC3C,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;AACvB,CAAC,CAAC,CAAC","sourcesContent":["#!/usr/bin/env node\nimport { runCli } from '../lib/cli/CliRunner';\n\nrunCli(process.cwd(), process.argv).catch((error: unknown) => {\n process.stderr.write(`${String(error)}\\n`);\n process.exitCode = 1;\n});\n"]}
|
package/index.js
CHANGED
|
@@ -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.
|
|
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];
|
package/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,uDAAqC;AACrC,sDAAoC;AACpC,yDAAuC","sourcesContent":["export * from './lib/cli/CliHelpers';\nexport * from './lib/cli/CliRunner';\nexport * from './lib/cli/ITaskContext';\n"]}
|
package/lib/TemplateUtils.js
CHANGED
|
@@ -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.
|
|
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,15 +15,25 @@ 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 (
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
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
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
22
|
-
exports.instantiateTemplate =
|
|
36
|
+
exports.instantiateTemplate = instantiateTemplate;
|
|
23
37
|
const fs = __importStar(require("fs-extra"));
|
|
24
38
|
async function instantiateTemplate(templatePath, outPath, values, modifier) {
|
|
25
39
|
let contents = await fs.readFile(templatePath, 'utf8');
|
|
@@ -31,5 +45,4 @@ async function instantiateTemplate(templatePath, outPath, values, modifier) {
|
|
|
31
45
|
}
|
|
32
46
|
await fs.writeFile(outPath, contents);
|
|
33
47
|
}
|
|
34
|
-
exports.instantiateTemplate = instantiateTemplate;
|
|
35
48
|
//# sourceMappingURL=TemplateUtils.js.map
|
package/lib/TemplateUtils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TemplateUtils.js","sourceRoot":"","sources":["TemplateUtils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"TemplateUtils.js","sourceRoot":"","sources":["TemplateUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,kDAcC;AAhBD,6CAA+B;AAExB,KAAK,UAAU,mBAAmB,CACvC,YAAoB,EACpB,OAAe,EACf,MAAuC,EACvC,QAAuC;IAEvC,IAAI,QAAQ,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;IACvD,KAAK,MAAM,CAAE,GAAG,EAAE,KAAK,CAAE,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QACpD,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,IAAI,GAAG,GAAG,EAAE,IAAI,CAAC,EAAE,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC;IAC5G,CAAC;IACD,IAAI,QAAQ,EAAE,CAAC;QACb,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAChC,CAAC;IACD,MAAM,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;AACxC,CAAC","sourcesContent":["import * as fs from 'fs-extra';\n\nexport async function instantiateTemplate(\n templatePath: string,\n outPath: string,\n values: Record<string, string | number>,\n modifier?: (contents: string) => string,\n): Promise<void> {\n let contents = await fs.readFile(templatePath, 'utf8');\n for (const [ key, value ] of Object.entries(values)) {\n contents = contents.replace(new RegExp(`%${key}%`, 'gu'), typeof value === 'string' ? value : `${value}`);\n }\n if (modifier) {\n contents = modifier(contents);\n }\n await fs.writeFile(outPath, contents);\n}\n"]}
|
package/lib/cli/CliHelpers.js
CHANGED
|
@@ -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.
|
|
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 (
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
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.
|
|
39
|
+
exports.wrapCommandHandler = wrapCommandHandler;
|
|
40
|
+
exports.wrapVisualProgress = wrapVisualProgress;
|
|
41
|
+
exports.createCliLogger = createCliLogger;
|
|
26
42
|
const path_1 = __importDefault(require("path"));
|
|
27
43
|
const util = __importStar(require("util"));
|
|
28
44
|
const ora_1 = __importDefault(require("ora"));
|
|
@@ -63,9 +79,8 @@ async function wrapCommandHandler(argv, handler) {
|
|
|
63
79
|
}
|
|
64
80
|
}
|
|
65
81
|
}
|
|
66
|
-
exports.wrapCommandHandler = wrapCommandHandler;
|
|
67
82
|
async function wrapVisualProgress(label, handler) {
|
|
68
|
-
const spinner = ora_1.default(label).start();
|
|
83
|
+
const spinner = (0, ora_1.default)(label).start();
|
|
69
84
|
try {
|
|
70
85
|
return await handler();
|
|
71
86
|
}
|
|
@@ -73,9 +88,8 @@ async function wrapVisualProgress(label, handler) {
|
|
|
73
88
|
spinner.stop();
|
|
74
89
|
}
|
|
75
90
|
}
|
|
76
|
-
exports.wrapVisualProgress = wrapVisualProgress;
|
|
77
91
|
function createCliLogger(logLevel) {
|
|
78
|
-
return winston_1.createLogger({
|
|
92
|
+
return (0, winston_1.createLogger)({
|
|
79
93
|
level: logLevel,
|
|
80
94
|
format: winston_1.format.combine(winston_1.format.colorize({ all: true, colors: { info: 'white' } }), winston_1.format.timestamp(), winston_1.format.printf(({ message }) => `${message}`)),
|
|
81
95
|
transports: [new winston_1.transports.Console({
|
|
@@ -83,5 +97,4 @@ function createCliLogger(logLevel) {
|
|
|
83
97
|
})],
|
|
84
98
|
});
|
|
85
99
|
}
|
|
86
|
-
exports.createCliLogger = createCliLogger;
|
|
87
100
|
//# sourceMappingURL=CliHelpers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CliHelpers.js","sourceRoot":"","sources":["CliHelpers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"CliHelpers.js","sourceRoot":"","sources":["CliHelpers.ts"],"names":[],"mappings":"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","sourcesContent":["import Path from 'path';\nimport * as util from 'util';\nimport ora from 'ora';\nimport type { Logger } from 'winston';\nimport { createLogger, format, transports } from 'winston';\nimport type { ITaskContext } from './ITaskContext';\n\nexport async function wrapCommandHandler(\n argv: Record<string, any>,\n handler: (context: ITaskContext) => Promise<void>,\n): Promise<void> {\n const startTime = process.hrtime();\n\n // Create context\n const context: ITaskContext = {\n cwd: argv.cwd,\n verbose: argv.verbose,\n logger: createCliLogger(argv.verbose ? 'verbose' : 'info'),\n templatesRoot: Path.join(__dirname, '..', 'templates'),\n };\n\n // Run handler\n let completed = false;\n try {\n await handler(context);\n completed = true;\n } catch (error: unknown) {\n if ('handled' in (<Error>error)) {\n context.logger.error(`${(<Error>error).message}`);\n } else {\n context.logger.error(`${util.format(error)}`);\n }\n } finally {\n const endTime = process.hrtime(startTime);\n const seconds = (endTime[0] + endTime[1] / 1_000_000_000).toFixed(2);\n if (completed) {\n context.logger.info(`✨ Done in ${seconds}s`);\n } else {\n context.logger.info(`🚨 Errored in ${seconds}s`);\n // eslint-disable-next-line unicorn/no-process-exit\n process.exit(1);\n }\n }\n}\n\nexport async function wrapVisualProgress<T>(label: string, handler: () => Promise<T>): Promise<T> {\n const spinner = ora(label).start();\n try {\n return await handler();\n } finally {\n spinner.stop();\n }\n}\n\nexport function createCliLogger(logLevel: string): Logger {\n return createLogger({\n level: logLevel,\n format: format.combine(\n format.colorize({ all: true, colors: { info: 'white' }}),\n format.timestamp(),\n format.printf(({ message }: Record<string, any>): string => `${message}`),\n ),\n transports: [ new transports.Console({\n stderrLevels: [ 'error', 'warn', 'info', 'verbose', 'debug', 'silly' ],\n }) ],\n });\n}\n"]}
|
package/lib/cli/CliRunner.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare function runCli(cwd: string, argv: string[]): void
|
|
1
|
+
export declare function runCli(cwd: string, argv: string[]): Promise<void>;
|
package/lib/cli/CliRunner.js
CHANGED
|
@@ -3,11 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.runCli =
|
|
6
|
+
exports.runCli = runCli;
|
|
7
7
|
const yargs_1 = __importDefault(require("yargs"));
|
|
8
8
|
const helpers_1 = require("yargs/helpers");
|
|
9
|
-
function runCli(cwd, argv) {
|
|
10
|
-
|
|
9
|
+
async function runCli(cwd, argv) {
|
|
10
|
+
await (0, yargs_1.default)((0, helpers_1.hideBin)(argv))
|
|
11
11
|
.options({
|
|
12
12
|
cwd: { type: 'string', default: cwd, describe: 'The current working directory', defaultDescription: '.' },
|
|
13
13
|
verbose: {
|
|
@@ -18,7 +18,7 @@ function runCli(cwd, argv) {
|
|
|
18
18
|
})
|
|
19
19
|
.commandDir('commands')
|
|
20
20
|
.demandCommand()
|
|
21
|
-
.help()
|
|
21
|
+
.help()
|
|
22
|
+
.parse();
|
|
22
23
|
}
|
|
23
|
-
exports.runCli = runCli;
|
|
24
24
|
//# sourceMappingURL=CliRunner.js.map
|
package/lib/cli/CliRunner.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CliRunner.js","sourceRoot":"","sources":["CliRunner.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"CliRunner.js","sourceRoot":"","sources":["CliRunner.ts"],"names":[],"mappings":";;;;;AAGA,wBAcC;AAjBD,kDAA0B;AAC1B,2CAAwC;AAEjC,KAAK,UAAU,MAAM,CAAC,GAAW,EAAE,IAAc;IACtD,MAAM,IAAA,eAAK,EAAC,IAAA,iBAAO,EAAC,IAAI,CAAC,CAAC;SACvB,OAAO,CAAC;QACP,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,+BAA+B,EAAE,kBAAkB,EAAE,GAAG,EAAE;QACzG,OAAO,EAAE;YACP,IAAI,EAAE,SAAS;YACf,KAAK,EAAE,GAAG;YACV,QAAQ,EAAE,4CAA4C;SACvD;KACF,CAAC;SACD,UAAU,CAAC,UAAU,CAAC;SACtB,aAAa,EAAE;SACf,IAAI,EAAE;SACN,KAAK,EAAE,CAAC;AACb,CAAC","sourcesContent":["import yargs from 'yargs';\nimport { hideBin } from 'yargs/helpers';\n\nexport async function runCli(cwd: string, argv: string[]): Promise<void> {\n await yargs(hideBin(argv))\n .options({\n cwd: { type: 'string', default: cwd, describe: 'The current working directory', defaultDescription: '.' },\n verbose: {\n type: 'boolean',\n alias: 'v',\n describe: 'If more logging output should be generated',\n },\n })\n .commandDir('commands')\n .demandCommand()\n .help()\n .parse();\n}\n"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ITaskContext.js","sourceRoot":"","sources":["ITaskContext.ts"],"names":[],"mappings":"","sourcesContent":["import type { Logger } from 'winston';\n/**\n * Common data when running a task.\n */\nexport interface ITaskContext {\n cwd: string;\n verbose: boolean;\n logger: Logger;\n templatesRoot: string;\n}\n"]}
|
|
1
|
+
{"version":3,"file":"ITaskContext.js","sourceRoot":"","sources":["ITaskContext.ts"],"names":[],"mappings":"","sourcesContent":["import type { Logger } from 'winston';\n\n/**\n * Common data when running a task.\n */\nexport interface ITaskContext {\n cwd: string;\n verbose: boolean;\n logger: Logger;\n templatesRoot: string;\n}\n"]}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.desc = exports.command = void 0;
|
|
4
|
+
exports.builder = builder;
|
|
4
5
|
exports.command = 'csv';
|
|
5
6
|
exports.desc = 'Creates CSV files';
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
7
|
+
function builder(yargs) {
|
|
8
|
+
return yargs
|
|
9
|
+
.commandDir('csv')
|
|
10
|
+
.demandCommand();
|
|
11
|
+
}
|
|
10
12
|
//# sourceMappingURL=CommandCsv.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommandCsv.js","sourceRoot":"","sources":["CommandCsv.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"CommandCsv.js","sourceRoot":"","sources":["CommandCsv.ts"],"names":[],"mappings":";;;AAIA,0BAIC;AANY,QAAA,OAAO,GAAG,KAAK,CAAC;AAChB,QAAA,IAAI,GAAG,mBAAmB,CAAC;AACxC,SAAgB,OAAO,CAAC,KAAgB;IACtC,OAAO,KAAK;SACT,UAAU,CAAC,KAAK,CAAC;SACjB,aAAa,EAAE,CAAC;AACrB,CAAC","sourcesContent":["import type { Argv } from 'yargs';\n\nexport const command = 'csv';\nexport const desc = 'Creates CSV files';\nexport function builder(yargs: Argv<any>): Argv<any> {\n return yargs\n .commandDir('csv')\n .demandCommand();\n}\n"]}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { Argv } from 'yargs';
|
|
2
2
|
export declare const command = "stats";
|
|
3
3
|
export declare const desc = "Derive statistics from experiments";
|
|
4
|
-
export declare
|
|
4
|
+
export declare function builder(yargs: Argv<any>): Argv<any>;
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.desc = exports.command = void 0;
|
|
4
|
+
exports.builder = builder;
|
|
4
5
|
exports.command = 'stats';
|
|
5
6
|
exports.desc = 'Derive statistics from experiments';
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
7
|
+
function builder(yargs) {
|
|
8
|
+
return yargs
|
|
9
|
+
.commandDir('stats')
|
|
10
|
+
.demandCommand();
|
|
11
|
+
}
|
|
10
12
|
//# sourceMappingURL=CommandStats.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommandStats.js","sourceRoot":"","sources":["CommandStats.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"CommandStats.js","sourceRoot":"","sources":["CommandStats.ts"],"names":[],"mappings":";;;AAIA,0BAIC;AANY,QAAA,OAAO,GAAG,OAAO,CAAC;AAClB,QAAA,IAAI,GAAG,oCAAoC,CAAC;AACzD,SAAgB,OAAO,CAAC,KAAgB;IACtC,OAAO,KAAK;SACT,UAAU,CAAC,OAAO,CAAC;SACnB,aAAa,EAAE,CAAC;AACrB,CAAC","sourcesContent":["import type { Argv } from 'yargs';\n\nexport const command = 'stats';\nexport const desc = 'Derive statistics from experiments';\nexport function builder(yargs: Argv<any>): Argv<any> {\n return yargs\n .commandDir('stats')\n .demandCommand();\n}\n"]}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.desc = exports.command = void 0;
|
|
4
|
+
exports.builder = builder;
|
|
4
5
|
exports.command = 'tex';
|
|
5
6
|
exports.desc = 'Creates a LaTeX TikZ plot file';
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
7
|
+
function builder(yargs) {
|
|
8
|
+
return yargs
|
|
9
|
+
.commandDir('tex')
|
|
10
|
+
.demandCommand();
|
|
11
|
+
}
|
|
10
12
|
//# sourceMappingURL=CommandTex.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommandTex.js","sourceRoot":"","sources":["CommandTex.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"CommandTex.js","sourceRoot":"","sources":["CommandTex.ts"],"names":[],"mappings":";;;AAIA,0BAIC;AANY,QAAA,OAAO,GAAG,KAAK,CAAC;AAChB,QAAA,IAAI,GAAG,gCAAgC,CAAC;AACrD,SAAgB,OAAO,CAAC,KAAgB;IACtC,OAAO,KAAK;SACT,UAAU,CAAC,KAAK,CAAC;SACjB,aAAa,EAAE,CAAC;AACrB,CAAC","sourcesContent":["import type { Argv } from 'yargs';\n\nexport const command = 'tex';\nexport const desc = 'Creates a LaTeX TikZ plot file';\nexport function builder(yargs: Argv<any>): Argv<any> {\n return yargs\n .commandDir('tex')\n .demandCommand();\n}\n"]}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { Argv } from 'yargs';
|
|
2
2
|
export declare const command = "bsbm <experiment-dir...>";
|
|
3
3
|
export declare const desc = "Convert BSBM output files to CSV";
|
|
4
|
-
export declare
|
|
5
|
-
export declare
|
|
4
|
+
export declare function builder(yargs: Argv<any>): Argv<any>;
|
|
5
|
+
export declare function handler(argv: Record<string, any>): Promise<void>;
|
|
@@ -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.
|
|
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 (
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
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.
|
|
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 stream_1 = require("stream");
|
|
@@ -32,83 +48,85 @@ const TexUtils_1 = require("../tex/TexUtils");
|
|
|
32
48
|
const TableSerializerCsv_1 = require("./TableSerializerCsv");
|
|
33
49
|
exports.command = 'bsbm <experiment-dir...>';
|
|
34
50
|
exports.desc = 'Convert BSBM output files to CSV';
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
}
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
//
|
|
56
|
-
const
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
const
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
tagName = tag.name;
|
|
76
|
-
}
|
|
77
|
-
});
|
|
78
|
-
parser.on('text', text => {
|
|
79
|
-
if (query && text) {
|
|
80
|
-
if (tagName === 'aqetg' && query.time === undefined) {
|
|
81
|
-
query.time = Number.parseFloat(text) * 1000;
|
|
51
|
+
function builder(yargs) {
|
|
52
|
+
return yargs
|
|
53
|
+
.options({
|
|
54
|
+
name: {
|
|
55
|
+
type: 'string',
|
|
56
|
+
alias: 'n',
|
|
57
|
+
describe: 'Custom output file name',
|
|
58
|
+
default: 'query-times.csv',
|
|
59
|
+
},
|
|
60
|
+
inputName: {
|
|
61
|
+
type: 'string',
|
|
62
|
+
describe: 'Custom input file name per experiment',
|
|
63
|
+
default: 'bsbm.xml',
|
|
64
|
+
},
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
function handler(argv) {
|
|
68
|
+
return (0, CliHelpers_1.wrapCommandHandler)(argv, async (_) => (0, CliHelpers_1.wrapVisualProgress)('Listing data', async () => {
|
|
69
|
+
// Load options
|
|
70
|
+
const { experimentDirectories } = (0, TexUtils_1.getExperimentNames)(argv);
|
|
71
|
+
// Read XML files
|
|
72
|
+
for (const experimentDirectory of experimentDirectories) {
|
|
73
|
+
// Prepare output CSV file
|
|
74
|
+
const os = fs.createWriteStream(path_1.default.join(experimentDirectory, `${argv.name}`));
|
|
75
|
+
const serializer = new TableSerializerCsv_1.TableSerializerCsv(os);
|
|
76
|
+
serializer.writeHeader([
|
|
77
|
+
'name',
|
|
78
|
+
'id',
|
|
79
|
+
'results',
|
|
80
|
+
'time',
|
|
81
|
+
]);
|
|
82
|
+
// Read XML file
|
|
83
|
+
const xmlFile = path_1.default.join(experimentDirectory, argv.inputName);
|
|
84
|
+
await new Promise((resolve, reject) => {
|
|
85
|
+
const parser = new saxes_1.SaxesParser();
|
|
86
|
+
let query;
|
|
87
|
+
let tagName;
|
|
88
|
+
parser.on('opentag', (tag) => {
|
|
89
|
+
if (tag.name === 'query') {
|
|
90
|
+
query = { name: tag.attributes.nr };
|
|
82
91
|
}
|
|
83
|
-
|
|
84
|
-
|
|
92
|
+
if (query) {
|
|
93
|
+
tagName = tag.name;
|
|
85
94
|
}
|
|
86
|
-
}
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
'
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
}
|
|
95
|
+
});
|
|
96
|
+
parser.on('text', (text) => {
|
|
97
|
+
if (query && text) {
|
|
98
|
+
if (tagName === 'aqetg' && query.time === undefined) {
|
|
99
|
+
query.time = Number.parseFloat(text) * 1000;
|
|
100
|
+
}
|
|
101
|
+
else if (tagName === 'avgresults' && query.results === undefined) {
|
|
102
|
+
query.results = Number.parseFloat(text);
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
});
|
|
106
|
+
parser.on('closetag', (tag) => {
|
|
107
|
+
if (tag.name === 'query' && query) {
|
|
108
|
+
serializer.writeRow([
|
|
109
|
+
query.name,
|
|
110
|
+
'0',
|
|
111
|
+
String(query.results),
|
|
112
|
+
String(query.time),
|
|
113
|
+
]);
|
|
114
|
+
}
|
|
115
|
+
});
|
|
116
|
+
parser.on('error', reject);
|
|
117
|
+
fs.createReadStream(xmlFile)
|
|
118
|
+
.on('end', resolve)
|
|
119
|
+
.pipe(new stream_1.Transform({
|
|
120
|
+
objectMode: true,
|
|
121
|
+
transform(chunk, encoding, callback) {
|
|
122
|
+
parser.write(chunk);
|
|
123
|
+
callback();
|
|
124
|
+
},
|
|
125
|
+
}));
|
|
97
126
|
});
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
transform(chunk, encoding, callback) {
|
|
104
|
-
parser.write(chunk);
|
|
105
|
-
callback();
|
|
106
|
-
},
|
|
107
|
-
}));
|
|
108
|
-
});
|
|
109
|
-
// Close output CSV file
|
|
110
|
-
serializer.close();
|
|
111
|
-
}
|
|
112
|
-
}));
|
|
113
|
-
exports.handler = handler;
|
|
127
|
+
// Close output CSV file
|
|
128
|
+
serializer.close();
|
|
129
|
+
}
|
|
130
|
+
}));
|
|
131
|
+
}
|
|
114
132
|
//# sourceMappingURL=CommandBsbm.js.map
|