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

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 CHANGED
@@ -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
@@ -48,6 +48,11 @@ const builder = (yargs) => yargs
48
48
  alias: 'c',
49
49
  describe: 'Color scheme name from colorbrewer2.org',
50
50
  },
51
+ shiftColorList: {
52
+ type: 'number',
53
+ describe: 'How many color list elements should be skipped',
54
+ default: 0,
55
+ },
51
56
  maxY: {
52
57
  type: 'number',
53
58
  describe: 'The upper limit of the Y-axis. Defaults to maximum Y value',
@@ -101,6 +106,11 @@ const builder = (yargs) => yargs
101
106
  choices: ['time', 'httpRequests'],
102
107
  default: 'time',
103
108
  },
109
+ outliers: {
110
+ type: 'boolean',
111
+ describe: 'If outliers should be included',
112
+ default: true,
113
+ },
104
114
  relative: {
105
115
  type: 'boolean',
106
116
  describe: 'If the maximum value per query should be set to 1, and all other values made relative to that.',
@@ -208,15 +218,18 @@ const handler = (argv) => CliHelpers_1.wrapCommandHandler(argv, async (context)
208
218
  csvOutputStream.write(`${key};${columns.join(';')}\n`);
209
219
  }
210
220
  csvOutputStream.close();
221
+ // Shift color list by a number of elements
222
+ const prependPlotLines = argv.shiftColorList > 0 ? `\\pgfplotsset{cycle list shift=${argv.shiftColorList}}\n` : '';
211
223
  // Prepare bar lines
212
- let barLines = experimentNames
224
+ let barLines = prependPlotLines + experimentNames
213
225
  .map((name, id) => {
214
226
  const offset = (id - ((experimentNames.length - 1) / 2)) * 2.75;
215
227
  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"};`;
228
+ const outliers = argv.outliers ? `, y error plus expr=(\\thisrow{${id}-plus}${yModifier}), y error minus expr=(\\thisrow{${id}-minus}${yModifier})` : '';
229
+ 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"};`;
217
230
  })
218
231
  .join('\n');
219
- if (metric === 'time') {
232
+ if (metric === 'time' && argv.outliers) {
220
233
  const extraBarLines = experimentNames
221
234
  .map((name, id) => {
222
235
  const offset = (id - ((experimentNames.length - 1) / 2)) * 2.75;
@@ -224,7 +237,7 @@ const handler = (argv) => CliHelpers_1.wrapCommandHandler(argv, async (context)
224
237
  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"};`;
225
238
  })
226
239
  .join('\n');
227
- barLines = `${barLines}\n${extraBarLines}`;
240
+ barLines = `${barLines}\n${prependPlotLines}${extraBarLines}`;
228
241
  }
229
242
  // Instantiate template
230
243
  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 => {
@@ -1 +1 @@
1
- {"version":3,"file":"CommandQuery.js","sourceRoot":"","sources":["CommandQuery.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AACzB,gDAAwB;AAGxB,0DAA6D;AAC7D,iDAA0E;AAG1E,yCAQoB;AAEP,QAAA,OAAO,GAAG,2BAA2B,CAAC;AACtC,QAAA,IAAI,GAAG,2DAA2D,CAAC;AACzE,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,mBAAmB;KAC7B;IACD,KAAK,EAAE;QACL,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,GAAG;QACV,QAAQ,EAAE,yCAAyC;KACpD;IACD,IAAI,EAAE;QACJ,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,4DAA4D;KACvE;IACD,MAAM,EAAE;QACN,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,gCAAgC;QAC1C,OAAO,EAAE,IAAI;KACd;IACD,SAAS,EAAE;QACT,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,6CAA6C;QACvD,OAAO,EAAE,SAAS;KACnB;IACD,IAAI,EAAE;QACJ,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,qCAAqC;QAC/C,OAAO,EAAE,KAAK;KACf;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;IACD,mBAAmB,EAAE;QACnB,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,6CAA6C;KACxD;IACD,eAAe,EAAE;QACf,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,gEAAgE;QAC1E,OAAO,EAAE,CAAC;KACX;IACD,GAAG,EAAE;QACH,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,oEAAoE;QAC9E,OAAO,EAAE,KAAK;KACf;IACD,MAAM,EAAE;QACN,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,oBAAoB;QAC9B,OAAO,EAAE,CAAE,MAAM,EAAE,cAAc,CAAE;QACnC,OAAO,EAAE,MAAM;KAChB;IACD,QAAQ,EAAE;QACR,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,gGAAgG;QAC1G,OAAO,EAAE,KAAK;KACf;CACF,CAAC,CAAC;AA7EM,QAAA,OAAO,WA6Eb;AACA,MAAM,OAAO,GAAG,CAAC,IAAyB,EAAiB,EAAE,CAAC,+BAAkB,CAAC,IAAI,EAC1F,KAAK,EAAC,OAAqB,EAAE,EAAE,CAAC,+BAAkB,CAAC,eAAe,EAAE,KAAK,IAAG,EAAE;IAC5E,gBAAgB;IAChB,MAAM,EAAE,qBAAqB,EAAE,eAAe,EAAE,aAAa,EAAE,GAAG,6BAAkB,CAAC,IAAI,CAAC,CAAC;IAC3F,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAClF,MAAM,WAAW,GAAG,yBAAc,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;IAChE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IAE3B,uDAAuD;IACvD,IAAI,UAAgC,CAAC;IACrC,IAAI,gBAAgB,GAA6B,EAAE,CAAC;IACpD,MAAM,cAAc,GAA2B,EAAE,CAAC;IAClD,KAAK,MAAM,mBAAmB,IAAI,qBAAqB,EAAE;QACvD,gBAAgB;QAChB,MAAM,MAAM,GAA6B,EAAE,CAAC;QAC5C,MAAM,WAAW,GAA6B,EAAE,CAAC;QACjD,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,CAAC,IAAI,CAAC,IAAI,IAAI,MAAM,CAAC,EAAE;oBAC1B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;iBACxB;gBAED,IAAI,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,EAAE,EAAE,CAAC,CAAC;gBACrD,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;gBAE9C,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAE9B,IAAI,IAAI,CAAC,UAAU,EAAE;oBACnB,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,IAAI,WAAW,CAAC,EAAE;wBAC/B,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;qBAC7B;oBACD,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;iBACjF;aACF;QACH,CAAC,CAAC,CAAC;QAEH,oBAAoB;QACpB,MAAM,QAAQ,GAA2B,EAAE,CAAC;QAC5C,MAAM,YAAY,GAA2B,EAAE,CAAC;QAChD,MAAM,WAAW,GAA2B,EAAE,CAAC;QAC/C,KAAK,MAAM,CAAE,KAAK,EAAE,KAAK,CAAE,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YACrD,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC;YAC7E,QAAQ,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC;YAC1B,YAAY,CAAC,KAAK,CAAC,GAAG,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;YACrF,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;YACtE,WAAW,CAAC,KAAK,CAAC,GAAG,QAAQ,GAAG,OAAO,CAAC;YAExC,IAAI,CAAC,CAAC,KAAK,IAAI,cAAc,CAAC,EAAE;gBAC9B,cAAc,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC;aAClC;iBAAM;gBACL,cAAc,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC,CAAC;aACnE;SACF;QACD,MAAM,aAAa,GAA2B,EAAE,CAAC;QACjD,MAAM,iBAAiB,GAA2B,EAAE,CAAC;QACrD,MAAM,gBAAgB,GAA2B,EAAE,CAAC;QACpD,KAAK,MAAM,CAAE,KAAK,EAAE,KAAK,CAAE,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;YAC1D,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC;YAC7E,aAAa,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC;YAC/B,iBAAiB,CAAC,KAAK,CAAC,GAAG,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;YAC1F,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;YACtE,gBAAgB,CAAC,KAAK,CAAC,GAAG,QAAQ,GAAG,OAAO,CAAC;SAC9C;QAED,4BAA4B;QAC5B,IAAI,CAAC,UAAU,EAAE;YACf,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACnC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;gBAClC,gBAAgB,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC;aAClC;SACF;aAAM,IAAI,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YACnE,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;SACxE;QAED,sCAAsC;QACtC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;YAClC,gBAAgB,CAAC,SAAS,CAAC,CAAC,IAAI,CAC9B,QAAQ,CAAC,SAAS,CAAC,EACnB,YAAY,CAAC,SAAS,CAAC,EACvB,WAAW,CAAC,SAAS,CAAC,CACvB,CAAC;YACF,IAAI,MAAM,KAAK,MAAM,EAAE;gBACrB,gBAAgB,CAAC,SAAS,CAAC,CAAC,IAAI,CAC9B,aAAa,CAAC,SAAS,CAAC,IAAI,MAAM,CAAC,GAAG,EACtC,iBAAiB,CAAC,SAAS,CAAC,IAAI,MAAM,CAAC,GAAG,EAC1C,gBAAgB,CAAC,SAAS,CAAC,IAAI,MAAM,CAAC,GAAG,CAC1C,CAAC;aACH;SACF;KACF;IACD,IAAI,CAAC,UAAU,EAAE;QACf,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;KAC9C;IACD,IAAI,IAAI,CAAC,QAAQ,EAAE;QACjB,iCAAiC;QACjC,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE;YACrD,gBAAgB,CAAC,SAAS,CAAC,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC,CAAC;SAC3G;KACF;IACD,yBAAyB;IACzB,UAAU,GAAG,wBAAa,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC7C,gBAAgB,GAAG,4BAAiB,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC;IAEnE,wBAAwB;IACxB,MAAM,eAAe,GAAG,EAAE,CAAC,iBAAiB,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC;IACzF,eAAe,CAAC,KAAK,CAAC,SAAS,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;QACpD,IAAI,KAAK,GAAG,GAAG,EAAE,SAAS,EAAE,UAAU,EAAE,OAAO,CAAC;QAChD,IAAI,MAAM,KAAK,MAAM,EAAE;YACrB,KAAK,GAAG,GAAG,KAAK,IAAI,EAAE,eAAe,EAAE,gBAAgB,EAAE,aAAa,CAAC;SACxE;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAClB,KAAK,MAAM,CAAE,GAAG,EAAE,OAAO,CAAE,IAAI,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE;QAC/D,eAAe,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;KACxD;IACD,eAAe,CAAC,KAAK,EAAE,CAAC;IAExB,oBAAoB;IACpB,IAAI,QAAQ,GAAG,eAAe;SAC3B,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE;QAChB,MAAM,MAAM,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;QAChE,MAAM,SAAS,GAAG,MAAM,KAAK,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;QACvE,OAAO,2BAA2B,MAAM,sCAAsC,CAAC,MAAM,0CAA0C,EAAE,SAAS,SAAS,mCAAmC,EAAE,SAAS,SAAS,oCAAoC,EAAE,UAAU,SAAS,0BAA0B,IAAI,CAAC,IAAI,SAAS,CAAC;IAClT,CAAC,CAAC;SACD,IAAI,CAAC,IAAI,CAAC,CAAC;IACd,IAAI,MAAM,KAAK,MAAM,EAAE;QACrB,MAAM,aAAa,GAAG,eAAe;aAClC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE;YAChB,MAAM,MAAM,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;YAChE,MAAM,SAAS,GAAG,MAAM,KAAK,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;YACvE,OAAO,gCAAgC,MAAM,uFAAuF,EAAE,eAAe,SAAS,0BAA0B,IAAI,CAAC,IAAI,SAAS,CAAC;QAC7M,CAAC,CAAC;aACD,IAAI,CAAC,IAAI,CAAC,CAAC;QACd,QAAQ,GAAG,GAAG,QAAQ,KAAK,aAAa,EAAE,CAAC;KAC5C;IAED,uBAAuB;IACvB,MAAM,mCAAmB,CACvB,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,KAAK,EAAE,qBAAqB,CAAC,EAC9D,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,IAAI,MAAM,CAAC,kBAExC,QAAQ,EAAE,qBAAqB,CAAC,MAAM,GAAG,CAAC,EAC1C,KAAK,EAAE,UAAU,CAAC,MAAM,GAAG,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,EAC3D,OAAO,EAAE,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,EAC7B,MAAM,EAAE,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EACzE,IAAI,EAAE,QAAQ,EACd,YAAY,EAAE,WAAW,EACzB,UAAU,EAAE,IAAI,CAAC,SAAS,IACvB,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,GAErD,QAAQ,CAAC,EAAE;QACT,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YAChB,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAC;SACrD;QACD,IAAI,IAAI,CAAC,IAAI,EAAE;YACb,QAAQ,GAAG,QAAQ;iBAChB,OAAO,CAAC,UAAU,EAAE,4DAA4D,CAAC;iBACjF,OAAO,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;SAC7C;QACD,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,wBAAwB,EAAE,YAAY,CAAC,CAAC;SACrE;QACD,IAAI,MAAM,KAAK,cAAc,EAAE;YAC7B,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,wBAAwB,EAAE,yBAAyB,CAAC,CAAC;SAClF;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC,CACF,CAAC;IAEF,sBAAsB;IACtB,IAAI,IAAI,CAAC,GAAG,EAAE;QACZ,MAAM,gBAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KAC5B;AACH,CAAC,CAAC,CAAC,CAAC;AA7KO,QAAA,OAAO,WA6Kd","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":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AACzB,gDAAwB;AAGxB,0DAA6D;AAC7D,iDAA0E;AAG1E,yCAQoB;AAEP,QAAA,OAAO,GAAG,2BAA2B,CAAC;AACtC,QAAA,IAAI,GAAG,2DAA2D,CAAC;AACzE,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,mBAAmB;KAC7B;IACD,KAAK,EAAE;QACL,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,GAAG;QACV,QAAQ,EAAE,yCAAyC;KACpD;IACD,cAAc,EAAE;QACd,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,gDAAgD;QAC1D,OAAO,EAAE,CAAC;KACX;IACD,IAAI,EAAE;QACJ,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,4DAA4D;KACvE;IACD,MAAM,EAAE;QACN,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,gCAAgC;QAC1C,OAAO,EAAE,IAAI;KACd;IACD,SAAS,EAAE;QACT,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,6CAA6C;QACvD,OAAO,EAAE,SAAS;KACnB;IACD,IAAI,EAAE;QACJ,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,qCAAqC;QAC/C,OAAO,EAAE,KAAK;KACf;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;IACD,mBAAmB,EAAE;QACnB,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,6CAA6C;KACxD;IACD,eAAe,EAAE;QACf,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,gEAAgE;QAC1E,OAAO,EAAE,CAAC;KACX;IACD,GAAG,EAAE;QACH,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,oEAAoE;QAC9E,OAAO,EAAE,KAAK;KACf;IACD,MAAM,EAAE;QACN,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,oBAAoB;QAC9B,OAAO,EAAE,CAAE,MAAM,EAAE,cAAc,CAAE;QACnC,OAAO,EAAE,MAAM;KAChB;IACD,QAAQ,EAAE;QACR,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,gCAAgC;QAC1C,OAAO,EAAE,IAAI;KACd;IACD,QAAQ,EAAE;QACR,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,gGAAgG;QAC1G,OAAO,EAAE,KAAK;KACf;CACF,CAAC,CAAC;AAvFM,QAAA,OAAO,WAuFb;AACA,MAAM,OAAO,GAAG,CAAC,IAAyB,EAAiB,EAAE,CAAC,+BAAkB,CAAC,IAAI,EAC1F,KAAK,EAAC,OAAqB,EAAE,EAAE,CAAC,+BAAkB,CAAC,eAAe,EAAE,KAAK,IAAG,EAAE;IAC5E,gBAAgB;IAChB,MAAM,EAAE,qBAAqB,EAAE,eAAe,EAAE,aAAa,EAAE,GAAG,6BAAkB,CAAC,IAAI,CAAC,CAAC;IAC3F,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAClF,MAAM,WAAW,GAAG,yBAAc,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;IAChE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IAE3B,uDAAuD;IACvD,IAAI,UAAgC,CAAC;IACrC,IAAI,gBAAgB,GAA6B,EAAE,CAAC;IACpD,MAAM,cAAc,GAA2B,EAAE,CAAC;IAClD,KAAK,MAAM,mBAAmB,IAAI,qBAAqB,EAAE;QACvD,gBAAgB;QAChB,MAAM,MAAM,GAA6B,EAAE,CAAC;QAC5C,MAAM,WAAW,GAA6B,EAAE,CAAC;QACjD,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,CAAC,IAAI,CAAC,IAAI,IAAI,MAAM,CAAC,EAAE;oBAC1B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;iBACxB;gBAED,IAAI,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,EAAE,EAAE,CAAC,CAAC;gBACrD,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;gBAE9C,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAE9B,IAAI,IAAI,CAAC,UAAU,EAAE;oBACnB,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,IAAI,WAAW,CAAC,EAAE;wBAC/B,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;qBAC7B;oBACD,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;iBACjF;aACF;QACH,CAAC,CAAC,CAAC;QAEH,oBAAoB;QACpB,MAAM,QAAQ,GAA2B,EAAE,CAAC;QAC5C,MAAM,YAAY,GAA2B,EAAE,CAAC;QAChD,MAAM,WAAW,GAA2B,EAAE,CAAC;QAC/C,KAAK,MAAM,CAAE,KAAK,EAAE,KAAK,CAAE,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YACrD,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC;YAC7E,QAAQ,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC;YAC1B,YAAY,CAAC,KAAK,CAAC,GAAG,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;YACrF,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;YACtE,WAAW,CAAC,KAAK,CAAC,GAAG,QAAQ,GAAG,OAAO,CAAC;YAExC,IAAI,CAAC,CAAC,KAAK,IAAI,cAAc,CAAC,EAAE;gBAC9B,cAAc,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC;aAClC;iBAAM;gBACL,cAAc,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC,CAAC;aACnE;SACF;QACD,MAAM,aAAa,GAA2B,EAAE,CAAC;QACjD,MAAM,iBAAiB,GAA2B,EAAE,CAAC;QACrD,MAAM,gBAAgB,GAA2B,EAAE,CAAC;QACpD,KAAK,MAAM,CAAE,KAAK,EAAE,KAAK,CAAE,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;YAC1D,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC;YAC7E,aAAa,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC;YAC/B,iBAAiB,CAAC,KAAK,CAAC,GAAG,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;YAC1F,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;YACtE,gBAAgB,CAAC,KAAK,CAAC,GAAG,QAAQ,GAAG,OAAO,CAAC;SAC9C;QAED,4BAA4B;QAC5B,IAAI,CAAC,UAAU,EAAE;YACf,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACnC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;gBAClC,gBAAgB,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC;aAClC;SACF;aAAM,IAAI,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YACnE,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;SACxE;QAED,sCAAsC;QACtC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;YAClC,gBAAgB,CAAC,SAAS,CAAC,CAAC,IAAI,CAC9B,QAAQ,CAAC,SAAS,CAAC,EACnB,YAAY,CAAC,SAAS,CAAC,EACvB,WAAW,CAAC,SAAS,CAAC,CACvB,CAAC;YACF,IAAI,MAAM,KAAK,MAAM,EAAE;gBACrB,gBAAgB,CAAC,SAAS,CAAC,CAAC,IAAI,CAC9B,aAAa,CAAC,SAAS,CAAC,IAAI,MAAM,CAAC,GAAG,EACtC,iBAAiB,CAAC,SAAS,CAAC,IAAI,MAAM,CAAC,GAAG,EAC1C,gBAAgB,CAAC,SAAS,CAAC,IAAI,MAAM,CAAC,GAAG,CAC1C,CAAC;aACH;SACF;KACF;IACD,IAAI,CAAC,UAAU,EAAE;QACf,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;KAC9C;IACD,IAAI,IAAI,CAAC,QAAQ,EAAE;QACjB,iCAAiC;QACjC,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE;YACrD,gBAAgB,CAAC,SAAS,CAAC,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC,CAAC;SAC3G;KACF;IACD,yBAAyB;IACzB,UAAU,GAAG,wBAAa,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC7C,gBAAgB,GAAG,4BAAiB,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC;IAEnE,wBAAwB;IACxB,MAAM,eAAe,GAAG,EAAE,CAAC,iBAAiB,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC;IACzF,eAAe,CAAC,KAAK,CAAC,SAAS,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;QACpD,IAAI,KAAK,GAAG,GAAG,EAAE,SAAS,EAAE,UAAU,EAAE,OAAO,CAAC;QAChD,IAAI,MAAM,KAAK,MAAM,EAAE;YACrB,KAAK,GAAG,GAAG,KAAK,IAAI,EAAE,eAAe,EAAE,gBAAgB,EAAE,aAAa,CAAC;SACxE;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAClB,KAAK,MAAM,CAAE,GAAG,EAAE,OAAO,CAAE,IAAI,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE;QAC/D,eAAe,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;KACxD;IACD,eAAe,CAAC,KAAK,EAAE,CAAC;IAExB,2CAA2C;IAC3C,MAAM,gBAAgB,GAAG,IAAI,CAAC,cAAc,GAAG,CAAC,CAAC,CAAC,CAAC,kCAAkC,IAAI,CAAC,cAAc,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IAEnH,oBAAoB;IACpB,IAAI,QAAQ,GAAG,gBAAgB,GAAG,eAAe;SAC9C,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE;QAChB,MAAM,MAAM,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;QAChE,MAAM,SAAS,GAAG,MAAM,KAAK,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;QACvE,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,kCAAkC,EAAE,SAAS,SAAS,oCAAoC,EAAE,UAAU,SAAS,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACzJ,OAAO,2BAA2B,MAAM,sCAAsC,CAAC,MAAM,0CAA0C,EAAE,SAAS,SAAS,IAAI,QAAQ,yBAAyB,IAAI,CAAC,IAAI,SAAS,CAAC;IAC7M,CAAC,CAAC;SACD,IAAI,CAAC,IAAI,CAAC,CAAC;IACd,IAAI,MAAM,KAAK,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE;QACtC,MAAM,aAAa,GAAG,eAAe;aAClC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE;YAChB,MAAM,MAAM,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;YAChE,MAAM,SAAS,GAAG,MAAM,KAAK,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;YACvE,OAAO,gCAAgC,MAAM,uFAAuF,EAAE,eAAe,SAAS,0BAA0B,IAAI,CAAC,IAAI,SAAS,CAAC;QAC7M,CAAC,CAAC;aACD,IAAI,CAAC,IAAI,CAAC,CAAC;QACd,QAAQ,GAAG,GAAG,QAAQ,KAAK,gBAAgB,GAAG,aAAa,EAAE,CAAC;KAC/D;IAED,uBAAuB;IACvB,MAAM,mCAAmB,CACvB,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,KAAK,EAAE,qBAAqB,CAAC,EAC9D,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,IAAI,MAAM,CAAC,kBAExC,QAAQ,EAAE,qBAAqB,CAAC,MAAM,GAAG,CAAC,EAC1C,KAAK,EAAE,UAAU,CAAC,MAAM,GAAG,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,EAC3D,OAAO,EAAE,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,EAC7B,MAAM,EAAE,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EACzE,IAAI,EAAE,QAAQ,EACd,YAAY,EAAE,WAAW,EACzB,UAAU,EAAE,IAAI,CAAC,SAAS,IACvB,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,GAErD,QAAQ,CAAC,EAAE;QACT,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YAChB,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAC;SACrD;QACD,IAAI,IAAI,CAAC,IAAI,EAAE;YACb,QAAQ,GAAG,QAAQ;iBAChB,OAAO,CAAC,UAAU,EAAE,4DAA4D,CAAC;iBACjF,OAAO,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;SAC7C;QACD,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,wBAAwB,EAAE,YAAY,CAAC,CAAC;SACrE;QACD,IAAI,MAAM,KAAK,cAAc,EAAE;YAC7B,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,wBAAwB,EAAE,yBAAyB,CAAC,CAAC;SAClF;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC,CACF,CAAC;IAEF,sBAAsB;IACtB,IAAI,IAAI,CAAC,GAAG,EAAE;QACZ,MAAM,gBAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KAC5B;AACH,CAAC,CAAC,CAAC,CAAC;AAjLO,QAAA,OAAO,WAiLd","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 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 });\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 // 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"]}
@@ -101,7 +101,7 @@ exports.calcSum = calcSum;
101
101
  async function handleCsvFile(experimentDirectory, argv, handler) {
102
102
  const csvFile = path_1.default.join(experimentDirectory, argv.inputName);
103
103
  await new Promise((resolve, reject) => {
104
- const parser = csv_parse_1.default({ delimiter: argv.inputDelimiter, columns: true, relax: true });
104
+ const parser = csv_parse_1.default({ delimiter: argv.inputDelimiter, columns: true, relax: true, relax_column_count: true });
105
105
  parser.on('data', handler);
106
106
  parser.on('error', reject);
107
107
  parser.on('end', resolve);
@@ -1 +1 @@
1
- {"version":3,"file":"TexUtils.js","sourceRoot":"","sources":["TexUtils.ts"],"names":[],"mappings":"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","sourcesContent":["import fs from 'fs';\nimport Path from 'path';\nimport * as spawn from 'cross-spawn';\nimport parse from 'csv-parse';\nimport { ErrorHandled } from '../../ErrorHandled';\nimport type { ITaskContext } from '../../ITaskContext';\n\n/**\n * Determine experiment labels\n * @param argv CLI args\n */\nexport function getExperimentNames(argv: Record<string, any>): {\n experimentDirectories: string[];\n experimentNames: string[];\n experimentIds: number[];\n} {\n const experimentDirectories: string[] = argv.experimentDir;\n let experimentNames = experimentDirectories.map((dir, index) => {\n const lastSlash = dir.lastIndexOf(Path.sep);\n if (lastSlash >= 0) {\n dir = dir.slice(lastSlash + 1);\n }\n if (!dir) {\n return `experiment_${index}`;\n }\n return dir;\n });\n\n if (argv.overrideCombinationLabels) {\n const overrideCombinationLabels = argv.overrideCombinationLabels.split(',');\n if (overrideCombinationLabels.length !== experimentNames.length) {\n throw new Error(`Invalid combination labels override, expected ${experimentNames.length} labels while ${overrideCombinationLabels.length} where given`);\n }\n experimentNames = overrideCombinationLabels;\n }\n\n const experimentIds = experimentNames.map((name, id) => id);\n\n return {\n experimentDirectories,\n experimentNames,\n experimentIds,\n };\n}\n\nexport function getQueryNames(queryNames: string[], argv: Record<string, any>): string[] {\n if (argv.overrideQueryLabels) {\n const overrideQueryLabels: string[] = argv.overrideQueryLabels.split(',');\n if (overrideQueryLabels.length !== queryNames.length) {\n throw new Error(`Invalid query labels override, expected ${queryNames.length} labels while ${overrideQueryLabels.length} where given`);\n }\n queryNames = overrideQueryLabels;\n }\n return queryNames;\n}\n\nexport function relabelQueryNames<T>(record: Record<string, T>, queryNames: string[]): Record<string, T> {\n for (const [ i, queryNameOld ] of Object.keys(record).entries()) {\n const averages = record[queryNameOld];\n delete record[queryNameOld];\n record[queryNames[i]] = averages;\n }\n return record;\n}\n\nexport function calcAverage(data: number[]): number {\n return data.reduce((sum, current) => sum + current) / data.length;\n}\n\nexport function calcMedian(data: number[]): number {\n data = [ ...data ].sort((left, right) => left - right);\n return data[Math.floor(data.length / 2)];\n}\n\nexport function calcSum(data: number[]): number {\n return data.reduce((sum, current) => sum + current);\n}\n\n/**\n * Read a CSV file and handle each row.\n * @param experimentDirectory An experiment directory.\n * @param argv CLI args\n * @param handler A callback for each row.\n */\nexport async function handleCsvFile(\n experimentDirectory: string,\n argv: Record<string, any>,\n handler: (data: any) => void,\n): Promise<void> {\n const csvFile = Path.join(experimentDirectory, argv.inputName);\n await new Promise((resolve, reject) => {\n const parser = parse({ delimiter: argv.inputDelimiter, columns: true, relax: true });\n parser.on('data', handler);\n parser.on('error', reject);\n parser.on('end', resolve);\n\n fs.createReadStream(csvFile).pipe(parser);\n });\n}\n\n/**\n * Determine the color scheme.\n * @param argv CLI args\n * @param experimentDirectories The array of experiment directories.\n */\nexport function getColorScheme(argv: Record<string, any>, experimentDirectories: string[]): string {\n let colorScheme: string;\n if (argv.color) {\n colorScheme = argv.color;\n } else {\n // We only allow even indexes, as uneven spectral schemes have a yellow tint that is hard to read on screens\n const colorSchemeIndex = Math.max(3, (Math.round(experimentDirectories.length + 2 - 1) / 2) * 2);\n colorScheme = `Spectral-${colorSchemeIndex}`;\n }\n return colorScheme;\n}\n\n/**\n * Create an SVG file from a TeX file by invoking 'tex2svg'.\n * @param argv CLI args\n * @param context The task context.\n */\nexport async function toSvg(argv: Record<string, any>, context: ITaskContext): Promise<void> {\n const { error, status, stdout, stderr } = spawn.sync('tex2svg', [ `${argv.name}.tex` ], {\n stdio: 'pipe',\n encoding: 'utf8',\n cwd: context.cwd,\n });\n if (error) {\n throw error;\n }\n if (status !== 0) {\n throw new ErrorHandled(`tex2svg failed}:\\n${stdout + stderr}`);\n }\n}\n"]}
1
+ {"version":3,"file":"TexUtils.js","sourceRoot":"","sources":["TexUtils.ts"],"names":[],"mappings":"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","sourcesContent":["import fs from 'fs';\nimport Path from 'path';\nimport * as spawn from 'cross-spawn';\nimport parse from 'csv-parse';\nimport { ErrorHandled } from '../../ErrorHandled';\nimport type { ITaskContext } from '../../ITaskContext';\n\n/**\n * Determine experiment labels\n * @param argv CLI args\n */\nexport function getExperimentNames(argv: Record<string, any>): {\n experimentDirectories: string[];\n experimentNames: string[];\n experimentIds: number[];\n} {\n const experimentDirectories: string[] = argv.experimentDir;\n let experimentNames = experimentDirectories.map((dir, index) => {\n const lastSlash = dir.lastIndexOf(Path.sep);\n if (lastSlash >= 0) {\n dir = dir.slice(lastSlash + 1);\n }\n if (!dir) {\n return `experiment_${index}`;\n }\n return dir;\n });\n\n if (argv.overrideCombinationLabels) {\n const overrideCombinationLabels = argv.overrideCombinationLabels.split(',');\n if (overrideCombinationLabels.length !== experimentNames.length) {\n throw new Error(`Invalid combination labels override, expected ${experimentNames.length} labels while ${overrideCombinationLabels.length} where given`);\n }\n experimentNames = overrideCombinationLabels;\n }\n\n const experimentIds = experimentNames.map((name, id) => id);\n\n return {\n experimentDirectories,\n experimentNames,\n experimentIds,\n };\n}\n\nexport function getQueryNames(queryNames: string[], argv: Record<string, any>): string[] {\n if (argv.overrideQueryLabels) {\n const overrideQueryLabels: string[] = argv.overrideQueryLabels.split(',');\n if (overrideQueryLabels.length !== queryNames.length) {\n throw new Error(`Invalid query labels override, expected ${queryNames.length} labels while ${overrideQueryLabels.length} where given`);\n }\n queryNames = overrideQueryLabels;\n }\n return queryNames;\n}\n\nexport function relabelQueryNames<T>(record: Record<string, T>, queryNames: string[]): Record<string, T> {\n for (const [ i, queryNameOld ] of Object.keys(record).entries()) {\n const averages = record[queryNameOld];\n delete record[queryNameOld];\n record[queryNames[i]] = averages;\n }\n return record;\n}\n\nexport function calcAverage(data: number[]): number {\n return data.reduce((sum, current) => sum + current) / data.length;\n}\n\nexport function calcMedian(data: number[]): number {\n data = [ ...data ].sort((left, right) => left - right);\n return data[Math.floor(data.length / 2)];\n}\n\nexport function calcSum(data: number[]): number {\n return data.reduce((sum, current) => sum + current);\n}\n\n/**\n * Read a CSV file and handle each row.\n * @param experimentDirectory An experiment directory.\n * @param argv CLI args\n * @param handler A callback for each row.\n */\nexport async function handleCsvFile(\n experimentDirectory: string,\n argv: Record<string, any>,\n handler: (data: any) => void,\n): Promise<void> {\n const csvFile = Path.join(experimentDirectory, argv.inputName);\n await new Promise((resolve, reject) => {\n const parser = parse({ delimiter: argv.inputDelimiter, columns: true, relax: true, relax_column_count: true });\n parser.on('data', handler);\n parser.on('error', reject);\n parser.on('end', resolve);\n\n fs.createReadStream(csvFile).pipe(parser);\n });\n}\n\n/**\n * Determine the color scheme.\n * @param argv CLI args\n * @param experimentDirectories The array of experiment directories.\n */\nexport function getColorScheme(argv: Record<string, any>, experimentDirectories: string[]): string {\n let colorScheme: string;\n if (argv.color) {\n colorScheme = argv.color;\n } else {\n // We only allow even indexes, as uneven spectral schemes have a yellow tint that is hard to read on screens\n const colorSchemeIndex = Math.max(3, (Math.round(experimentDirectories.length + 2 - 1) / 2) * 2);\n colorScheme = `Spectral-${colorSchemeIndex}`;\n }\n return colorScheme;\n}\n\n/**\n * Create an SVG file from a TeX file by invoking 'tex2svg'.\n * @param argv CLI args\n * @param context The task context.\n */\nexport async function toSvg(argv: Record<string, any>, context: ITaskContext): Promise<void> {\n const { error, status, stdout, stderr } = spawn.sync('tex2svg', [ `${argv.name}.tex` ], {\n stdio: 'pipe',\n encoding: 'utf8',\n cwd: context.cwd,\n });\n if (error) {\n throw error;\n }\n if (status !== 0) {\n throw new ErrorHandled(`tex2svg failed}:\\n${stdout + stderr}`);\n }\n}\n"]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rubensworks/process-sparql-benchmark-results",
3
- "version": "1.3.4",
3
+ "version": "1.3.5",
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": [
@@ -97,5 +97,6 @@
97
97
  "streamify-array": "^1.0.1",
98
98
  "ts-jest": "^26.4.3",
99
99
  "typescript": "^4.2.4"
100
- }
100
+ },
101
+ "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
101
102
  }