@rubensworks/process-sparql-benchmark-results 1.4.1 → 1.4.2

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.
@@ -155,6 +155,10 @@ function handler(argv) {
155
155
  if (!(data.name in totals)) {
156
156
  totals[data.name] = [];
157
157
  }
158
+ // Failed queries have no execution time, so they are left out instead of counting as zero.
159
+ if (data.error === 'true') {
160
+ return;
161
+ }
158
162
  let value = Number.parseFloat(data[metric] || '0');
159
163
  value = Math.max(argv.zeroReplacement, value);
160
164
  totals[data.name].push(value);
@@ -171,6 +175,13 @@ function handler(argv) {
171
175
  const averageMinus = {};
172
176
  const averagePlus = {};
173
177
  for (const [query, times] of Object.entries(totals)) {
178
+ // Without successful executions, there is nothing to plot for this query.
179
+ if (times.length === 0) {
180
+ averages[query] = Number.NaN;
181
+ averageMinus[query] = Number.NaN;
182
+ averagePlus[query] = Number.NaN;
183
+ continue;
184
+ }
174
185
  const average = times.reduce((sum, current) => sum + current) / times.length;
175
186
  averages[query] = average;
176
187
  averageMinus[query] = average - times.reduce((minV, value) => Math.min(value, minV));
@@ -1 +1 @@
1
- {"version":3,"file":"CommandQuery.js","sourceRoot":"","sources":["CommandQuery.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAoBA,0BAwFC;AACD,0BAkLC;AA/RD,uCAAyB;AACzB,gDAAwB;AAGxB,0DAA6D;AAC7D,iDAA0E;AAG1E,yCAQoB;AAEP,QAAA,OAAO,GAAG,2BAA2B,CAAC;AACtC,QAAA,IAAI,GAAG,2DAA2D,CAAC;AAChF,SAAgB,OAAO,CAAC,KAAgB;IACtC,OAAO,KAAK;SACT,OAAO,CAAC;QACP,UAAU,EAAE;YACV,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,GAAG;YACV,QAAQ,EAAE,6FAA6F;SACxG;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,GAAG;YACV,QAAQ,EAAE,yBAAyB;YACnC,OAAO,EAAE,mBAAmB;SAC7B;QACD,KAAK,EAAE;YACL,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,GAAG;YACV,QAAQ,EAAE,yCAAyC;SACpD;QACD,cAAc,EAAE;YACd,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,gDAAgD;YAC1D,OAAO,EAAE,CAAC;SACX;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,4DAA4D;SACvE;QACD,MAAM,EAAE;YACN,IAAI,EAAE,SAAS;YACf,QAAQ,EAAE,gCAAgC;YAC1C,OAAO,EAAE,IAAI;SACd;QACD,SAAS,EAAE;YACT,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,6CAA6C;YACvD,OAAO,EAAE,SAAS;SACnB;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,SAAS;YACf,QAAQ,EAAE,qCAAqC;YAC/C,OAAO,EAAE,KAAK;SACf;QACD,SAAS,EAAE;YACT,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,uCAAuC;YACjD,OAAO,EAAE,iBAAiB;SAC3B;QACD,cAAc,EAAE;YACd,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,kCAAkC;YAC5C,OAAO,EAAE,GAAG;SACb;QACD,yBAAyB,EAAE;YACzB,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,mDAAmD;SAC9D;QACD,mBAAmB,EAAE;YACnB,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,6CAA6C;SACxD;QACD,eAAe,EAAE;YACf,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,gEAAgE;YAC1E,OAAO,EAAE,CAAC;SACX;QACD,GAAG,EAAE;YACH,IAAI,EAAE,SAAS;YACf,QAAQ,EAAE,oEAAoE;YAC9E,OAAO,EAAE,KAAK;SACf;QACD,MAAM,EAAE;YACN,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,oBAAoB;YAC9B,OAAO,EAAE,CAAE,MAAM,EAAE,cAAc,CAAE;YACnC,OAAO,EAAE,MAAM;SAChB;QACD,QAAQ,EAAE;YACR,IAAI,EAAE,SAAS;YACf,QAAQ,EAAE,gCAAgC;YAC1C,OAAO,EAAE,IAAI;SACd;QACD,QAAQ,EAAE;YACR,IAAI,EAAE,SAAS;YACf,QAAQ,EAAE,gGAAgG;YAC1G,OAAO,EAAE,KAAK;SACf;KACF,CAAC,CAAC;AACP,CAAC;AACD,SAAgB,OAAO,CAAC,IAAyB;IAC/C,OAAO,IAAA,+BAAkB,EAAC,IAAI,EAAE,KAAK,EAAC,OAAqB,EAAE,EAAE,CAAC,IAAA,+BAAkB,EAAC,eAAe,EAAE,KAAK,IAAG,EAAE;QAC5G,gBAAgB;QAChB,MAAM,EAAE,qBAAqB,EAAE,eAAe,EAAE,aAAa,EAAE,GAAG,IAAA,6BAAkB,EAAC,IAAI,CAAC,CAAC;QAC3F,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAClF,MAAM,WAAW,GAAG,IAAA,yBAAc,EAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;QAChE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAE3B,uDAAuD;QACvD,IAAI,UAAgC,CAAC;QACrC,IAAI,gBAAgB,GAA6B,EAAE,CAAC;QACpD,MAAM,cAAc,GAA2B,EAAE,CAAC;QAClD,KAAK,MAAM,mBAAmB,IAAI,qBAAqB,EAAE,CAAC;YACxD,gBAAgB;YAChB,MAAM,MAAM,GAA6B,EAAE,CAAC;YAC5C,MAAM,WAAW,GAA6B,EAAE,CAAC;YACjD,MAAM,IAAA,wBAAa,EAAC,mBAAmB,EAAE,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE;gBACtD,IAAI,CAAC,UAAU,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC9C,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,IAAI,MAAM,CAAC,EAAE,CAAC;wBAC3B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;oBACzB,CAAC;oBAED,IAAI,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,CAAC;oBACnD,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;oBAE9C,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBAE9B,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;wBACpB,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,IAAI,WAAW,CAAC,EAAE,CAAC;4BAChC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;wBAC9B,CAAC;wBACD,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBAChF,CAAC;gBACH,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,oBAAoB;YACpB,MAAM,QAAQ,GAA2B,EAAE,CAAC;YAC5C,MAAM,YAAY,GAA2B,EAAE,CAAC;YAChD,MAAM,WAAW,GAA2B,EAAE,CAAC;YAC/C,KAAK,MAAM,CAAE,KAAK,EAAE,KAAK,CAAE,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;gBACtD,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC;gBAC7E,QAAQ,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC;gBAC1B,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;gBACrF,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;gBACtE,WAAW,CAAC,KAAK,CAAC,GAAG,QAAQ,GAAG,OAAO,CAAC;gBAExC,IAAI,CAAC,CAAC,KAAK,IAAI,cAAc,CAAC,EAAE,CAAC;oBAC/B,cAAc,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC;gBACnC,CAAC;qBAAM,CAAC;oBACN,cAAc,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC,CAAC;gBACpE,CAAC;YACH,CAAC;YACD,MAAM,aAAa,GAA2B,EAAE,CAAC;YACjD,MAAM,iBAAiB,GAA2B,EAAE,CAAC;YACrD,MAAM,gBAAgB,GAA2B,EAAE,CAAC;YACpD,KAAK,MAAM,CAAE,KAAK,EAAE,KAAK,CAAE,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC3D,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC;gBAC7E,aAAa,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC;gBAC/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;gBAC1F,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;gBACtE,gBAAgB,CAAC,KAAK,CAAC,GAAG,QAAQ,GAAG,OAAO,CAAC;YAC/C,CAAC;YAED,4BAA4B;YAC5B,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACnC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;oBACnC,gBAAgB,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC;gBACnC,CAAC;YACH,CAAC;iBAAM,IAAI,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;gBACpE,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;YACzE,CAAC;YAED,sCAAsC;YACtC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;gBACnC,gBAAgB,CAAC,SAAS,CAAC,CAAC,IAAI,CAC9B,QAAQ,CAAC,SAAS,CAAC,EACnB,YAAY,CAAC,SAAS,CAAC,EACvB,WAAW,CAAC,SAAS,CAAC,CACvB,CAAC;gBACF,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;oBACtB,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;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;QACD,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAC/C,CAAC;QACD,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,iCAAiC;YACjC,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC;gBACtD,gBAAgB,CAAC,SAAS,CAAC,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC,CAAC;YAC5G,CAAC;QACH,CAAC;QACD,yBAAyB;QACzB,UAAU,GAAG,IAAA,wBAAa,EAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QAC7C,gBAAgB,GAAG,IAAA,4BAAiB,EAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC;QAEnE,wBAAwB;QACxB,MAAM,eAAe,GAAG,EAAE,CAAC,iBAAiB,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC;QACzF,eAAe,CAAC,KAAK,CAAC,SAAS,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;YACtD,IAAI,KAAK,GAAG,GAAG,EAAE,SAAS,EAAE,UAAU,EAAE,OAAO,CAAC;YAChD,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;gBACtB,KAAK,GAAG,GAAG,KAAK,IAAI,EAAE,eAAe,EAAE,gBAAgB,EAAE,aAAa,CAAC;YACzE,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAClB,KAAK,MAAM,CAAE,GAAG,EAAE,OAAO,CAAE,IAAI,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC;YAChE,eAAe,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACzD,CAAC;QACD,eAAe,CAAC,KAAK,EAAE,CAAC;QAExB,2CAA2C;QAC3C,MAAM,gBAAgB,GAAG,IAAI,CAAC,cAAc,GAAG,CAAC,CAAC,CAAC,CAAC,kCAAkC,IAAI,CAAC,cAAc,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;QAEnH,oBAAoB;QACpB,IAAI,QAAQ,GAAG,gBAAgB,GAAG,eAAe;aAC9C,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,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,kCAAkC,EAAE,SAAS,SAAS,oCAAoC,EAAE,UAAU,SAAS,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACzJ,OAAO,2BAA2B,MAAM,sCAAsC,CAAC,MAAM,0CAA0C,EAAE,SAAS,SAAS,IAAI,QAAQ,yBAAyB,IAAI,CAAC,IAAI,SAAS,CAAC;QAC7M,CAAC,CAAC;aACD,IAAI,CAAC,IAAI,CAAC,CAAC;QACd,IAAI,MAAM,KAAK,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACvC,MAAM,aAAa,GAAG,eAAe;iBAClC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE;gBAChB,MAAM,MAAM,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;gBAChE,MAAM,SAAS,GAAG,MAAM,KAAK,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;gBACvE,OAAO,gCAAgC,MAAM,uFAAuF,EAAE,eAAe,SAAS,0BAA0B,IAAI,CAAC,IAAI,SAAS,CAAC;YAC7M,CAAC,CAAC;iBACD,IAAI,CAAC,IAAI,CAAC,CAAC;YACd,QAAQ,GAAG,GAAG,QAAQ,KAAK,gBAAgB,GAAG,aAAa,EAAE,CAAC;QAChE,CAAC;QAED,uBAAuB;QACvB,MAAM,IAAA,mCAAmB,EACvB,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,CAAC,QAAQ,EAAE,EAAE;YACX,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACjB,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAC;YACtD,CAAC;YACD,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;gBACd,QAAQ,GAAG,QAAQ;qBAChB,OAAO,CAAC,UAAU,EAAE,4DAA4D,CAAC;qBACjF,OAAO,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;YAC9C,CAAC;YACD,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAClB,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,wBAAwB,EAAE,YAAY,CAAC,CAAC;YACtE,CAAC;YACD,IAAI,MAAM,KAAK,cAAc,EAAE,CAAC;gBAC9B,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,wBAAwB,EAAE,yBAAyB,CAAC,CAAC;YACnF,CAAC;YACD,OAAO,QAAQ,CAAC;QAClB,CAAC,CACF,CAAC;QAEF,sBAAsB;QACtB,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;YACb,MAAM,IAAA,gBAAK,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC,CAAC,CAAC,CAAC;AACN,CAAC","sourcesContent":["import * as fs from 'fs';\nimport Path from 'path';\n\nimport type { Argv } from 'yargs';\nimport { instantiateTemplate } from '../../../TemplateUtils';\nimport { wrapCommandHandler, wrapVisualProgress } from '../../CliHelpers';\n\nimport type { ITaskContext } from '../../ITaskContext';\nimport {\n\n getColorScheme,\n getExperimentNames,\n getQueryNames,\n handleCsvFile,\n relabelQueryNames,\n toSvg,\n} from './TexUtils';\n\nexport const command = 'query <experiment-dir...>';\nexport const desc = 'Plot the query execution times from the given experiments';\nexport function builder(yargs: Argv<any>): Argv<any> {\n return yargs\n .options({\n queryRegex: {\n type: 'string',\n alias: 'q',\n describe: 'Regex for queries to include (before any label overrides). Examples: \\'^C\\', \\'^[^C]\\', ...',\n },\n name: {\n type: 'string',\n alias: 'n',\n describe: 'Custom output file name',\n default: 'plot_queries_data',\n },\n color: {\n type: 'string',\n alias: 'c',\n describe: 'Color scheme name from colorbrewer2.org',\n },\n shiftColorList: {\n type: 'number',\n describe: 'How many color list elements should be skipped',\n default: 0,\n },\n maxY: {\n type: 'number',\n describe: 'The upper limit of the Y-axis. Defaults to maximum Y value',\n },\n legend: {\n type: 'boolean',\n describe: 'If a legend should be included',\n default: true,\n },\n legendPos: {\n type: 'string',\n describe: 'The legend position X,Y (anchor north-east)',\n default: '1.0,1.0',\n },\n logY: {\n type: 'boolean',\n describe: 'If the Y-Axis must have a log scale',\n default: false,\n },\n inputName: {\n type: 'string',\n describe: 'Custom input file name per experiment',\n default: 'query-times.csv',\n },\n inputDelimiter: {\n type: 'string',\n describe: 'Delimiter for the input CSV file',\n default: ';',\n },\n overrideCombinationLabels: {\n type: 'string',\n describe: 'Comma-separated list of combination labels to use',\n },\n overrideQueryLabels: {\n type: 'string',\n describe: 'Comma-separated list of query labels to use',\n },\n zeroReplacement: {\n type: 'number',\n describe: 'If zero values occur, what values they should be replaced with',\n default: 0,\n },\n svg: {\n type: 'boolean',\n describe: 'If the tex file should be converted to svg via the tex2svg command',\n default: false,\n },\n metric: {\n type: 'string',\n describe: 'The metric to plot',\n choices: [ 'time', 'httpRequests' ],\n default: 'time',\n },\n outliers: {\n type: 'boolean',\n describe: 'If outliers should be included',\n default: true,\n },\n relative: {\n type: 'boolean',\n describe: 'If the maximum value per query should be set to 1, and all other values made relative to that.',\n default: false,\n },\n });\n}\nexport function handler(argv: Record<string, any>): Promise<void> {\n return wrapCommandHandler(argv, async(context: ITaskContext) => wrapVisualProgress('Plotting data', async() => {\n // Load CLI args\n const { experimentDirectories, experimentNames, experimentIds } = getExperimentNames(argv);\n const queryRegex = argv.queryRegex ? new RegExp(argv.queryRegex, 'u') : undefined;\n const colorScheme = getColorScheme(argv, experimentDirectories);\n const metric = argv.metric;\n\n // Prepare query CSV file with averages per query group\n let queryNames: string[] | undefined;\n let outputCsvEntries: Record<string, number[]> = {};\n const maxQueryValues: Record<string, number> = {};\n for (const experimentDirectory of experimentDirectories) {\n // Read CSV file\n const totals: Record<string, number[]> = {};\n const totalsFirst: Record<string, number[]> = {};\n await handleCsvFile(experimentDirectory, argv, (data) => {\n if (!queryRegex || queryRegex.test(data.name)) {\n if (!(data.name in totals)) {\n totals[data.name] = [];\n }\n\n let value = Number.parseFloat(data[metric] || '0');\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.parseFloat(data.timestamps.split(' ')[0]));\n }\n }\n });\n\n // Calculate average\n const averages: Record<string, number> = {};\n const averageMinus: Record<string, number> = {};\n const averagePlus: Record<string, number> = {};\n for (const [ query, times ] of Object.entries(totals)) {\n const average = times.reduce((sum, current) => sum + current) / times.length;\n averages[query] = average;\n averageMinus[query] = average - times.reduce((minV, value) => Math.min(value, minV));\n const maxValue = times.reduce((maxV, value) => Math.max(value, maxV));\n averagePlus[query] = maxValue - average;\n\n if (!(query in maxQueryValues)) {\n maxQueryValues[query] = maxValue;\n } else {\n maxQueryValues[query] = Math.max(maxQueryValues[query], maxValue);\n }\n }\n const averagesFirst: Record<string, number> = {};\n const averageFirstMinus: Record<string, number> = {};\n const averageFirstPlus: Record<string, number> = {};\n for (const [ query, times ] of Object.entries(totalsFirst)) {\n const average = times.reduce((sum, current) => sum + current) / times.length;\n averagesFirst[query] = average;\n averageFirstMinus[query] = average - times.reduce((minV, value) => Math.min(value, minV));\n const maxValue = times.reduce((maxV, value) => Math.max(value, maxV));\n averageFirstPlus[query] = maxValue - average;\n }\n\n // Set query names and count\n if (!queryNames) {\n queryNames = Object.keys(averages);\n for (const queryName of queryNames) {\n outputCsvEntries[queryName] = [];\n }\n } else if (queryNames.join(',') !== Object.keys(averages).join(',')) {\n throw new Error(`Tried to plot experiments with different query sets`);\n }\n\n // Append average, min, and max result\n for (const queryName of queryNames) {\n outputCsvEntries[queryName].push(\n averages[queryName],\n averageMinus[queryName],\n averagePlus[queryName],\n );\n if (metric === 'time') {\n outputCsvEntries[queryName].push(\n averagesFirst[queryName] || Number.NaN,\n averageFirstMinus[queryName] || Number.NaN,\n averageFirstPlus[queryName] || Number.NaN,\n );\n }\n }\n }\n if (!queryNames) {\n throw new Error(`No queries could be found`);\n }\n if (argv.relative) {\n // Make values relative per query\n for (const queryName of Object.keys(outputCsvEntries)) {\n outputCsvEntries[queryName] = outputCsvEntries[queryName].map(value => value / maxQueryValues[queryName]);\n }\n }\n // Determine query labels\n queryNames = getQueryNames(queryNames, argv);\n outputCsvEntries = relabelQueryNames(outputCsvEntries, queryNames);\n\n // Write output CSV file\n const csvOutputStream = fs.createWriteStream(Path.join(context.cwd, `${argv.name}.csv`));\n csvOutputStream.write(`query;${experimentIds.map((id) => {\n let value = `${id}-mean;${id}-minus;${id}-plus`;\n if (metric === 'time') {\n value = `${value};${id}-first-mean;${id}-first-minus;${id}-first-plus`;\n }\n return value;\n }).join(';')}\\n`);\n for (const [ key, columns ] of Object.entries(outputCsvEntries)) {\n csvOutputStream.write(`${key};${columns.join(';')}\\n`);\n }\n csvOutputStream.close();\n\n // Shift color list by a number of elements\n const prependPlotLines = argv.shiftColorList > 0 ? `\\\\pgfplotsset{cycle list shift=${argv.shiftColorList}}\\n` : '';\n\n // Prepare bar lines\n let barLines = prependPlotLines + experimentNames\n .map((name, id) => {\n const offset = (id - ((experimentNames.length - 1) / 2)) * 2.75;\n const yModifier = metric === 'time' && !argv.relative ? ' / 1000' : '';\n const outliers = argv.outliers ? `, y error plus expr=(\\\\thisrow{${id}-plus}${yModifier}), y error minus expr=(\\\\thisrow{${id}-minus}${yModifier})` : '';\n return `\\\\addplot+[ybar, xshift=${offset}pt,legend image post style={xshift=${-offset}pt}] table [x=query, y expr=(\\\\thisrow{${id}-mean}${yModifier})${outliers}, col sep=semicolon]{\"${argv.name}.csv\"};`;\n })\n .join('\\n');\n if (metric === 'time' && argv.outliers) {\n const extraBarLines = experimentNames\n .map((name, id) => {\n const offset = (id - ((experimentNames.length - 1) / 2)) * 2.75;\n const yModifier = metric === 'time' && !argv.relative ? ' / 1000' : '';\n return `\\\\addplot+[only marks,xshift=${offset}pt,mark=star,mark options={color=gray,scale=0.5}] table [x=query, y expr=(\\\\thisrow{${id}-first-mean}${yModifier}), col sep=semicolon]{\"${argv.name}.csv\"};`;\n })\n .join('\\n');\n barLines = `${barLines}\\n${prependPlotLines}${extraBarLines}`;\n }\n\n // Instantiate template\n await instantiateTemplate(\n Path.join(context.templatesRoot, 'tex', 'plot_query_data.tex'),\n Path.join(context.cwd, `${argv.name}.tex`),\n {\n X_LIMITS: experimentDirectories.length * 2,\n WIDTH: queryNames.length * (experimentNames.length + 1) * 4,\n QUERIES: queryNames.join(','),\n LEGEND: experimentNames.map(name => name.replace(/_/gu, '\\\\_')).join(','),\n BARS: barLines,\n COLOR_SCHEME: colorScheme,\n LEGEND_POS: argv.legendPos,\n ...argv.maxY ? { Y_MAX: `ymax=${argv.maxY},` } : {},\n },\n (contents) => {\n if (!argv.legend) {\n contents = contents.replace(/\\\\legend\\{.*\\}/ug, '');\n }\n if (argv.logY) {\n contents = contents\n .replace(/ymin=0,/u, 'ymin=0.000001,ymode=log,log origin=infty,log basis y={10},')\n .replace(/ \\/ 1000\\)/ug, ' / 1000)+1e-5');\n }\n if (argv.relative) {\n contents = contents.replace('ylabel={Duration (s)},', 'ylabel={},');\n }\n if (metric === 'httpRequests') {\n contents = contents.replace('ylabel={Duration (s)},', 'ylabel={HTTP Requests},');\n }\n return contents;\n },\n );\n\n // Render CSV from TeX\n if (argv.svg) {\n await toSvg(argv, context);\n }\n }));\n}\n"]}
1
+ {"version":3,"file":"CommandQuery.js","sourceRoot":"","sources":["CommandQuery.ts"],"names":[],"mappings":"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","sourcesContent":["import * as fs from 'fs';\nimport Path from 'path';\n\nimport type { Argv } from 'yargs';\nimport { instantiateTemplate } from '../../../TemplateUtils';\nimport { wrapCommandHandler, wrapVisualProgress } from '../../CliHelpers';\n\nimport type { ITaskContext } from '../../ITaskContext';\nimport {\n\n getColorScheme,\n getExperimentNames,\n getQueryNames,\n handleCsvFile,\n relabelQueryNames,\n toSvg,\n} from './TexUtils';\n\nexport const command = 'query <experiment-dir...>';\nexport const desc = 'Plot the query execution times from the given experiments';\nexport function builder(yargs: Argv<any>): Argv<any> {\n return yargs\n .options({\n queryRegex: {\n type: 'string',\n alias: 'q',\n describe: 'Regex for queries to include (before any label overrides). Examples: \\'^C\\', \\'^[^C]\\', ...',\n },\n name: {\n type: 'string',\n alias: 'n',\n describe: 'Custom output file name',\n default: 'plot_queries_data',\n },\n color: {\n type: 'string',\n alias: 'c',\n describe: 'Color scheme name from colorbrewer2.org',\n },\n shiftColorList: {\n type: 'number',\n describe: 'How many color list elements should be skipped',\n default: 0,\n },\n maxY: {\n type: 'number',\n describe: 'The upper limit of the Y-axis. Defaults to maximum Y value',\n },\n legend: {\n type: 'boolean',\n describe: 'If a legend should be included',\n default: true,\n },\n legendPos: {\n type: 'string',\n describe: 'The legend position X,Y (anchor north-east)',\n default: '1.0,1.0',\n },\n logY: {\n type: 'boolean',\n describe: 'If the Y-Axis must have a log scale',\n default: false,\n },\n inputName: {\n type: 'string',\n describe: 'Custom input file name per experiment',\n default: 'query-times.csv',\n },\n inputDelimiter: {\n type: 'string',\n describe: 'Delimiter for the input CSV file',\n default: ';',\n },\n overrideCombinationLabels: {\n type: 'string',\n describe: 'Comma-separated list of combination labels to use',\n },\n overrideQueryLabels: {\n type: 'string',\n describe: 'Comma-separated list of query labels to use',\n },\n zeroReplacement: {\n type: 'number',\n describe: 'If zero values occur, what values they should be replaced with',\n default: 0,\n },\n svg: {\n type: 'boolean',\n describe: 'If the tex file should be converted to svg via the tex2svg command',\n default: false,\n },\n metric: {\n type: 'string',\n describe: 'The metric to plot',\n choices: [ 'time', 'httpRequests' ],\n default: 'time',\n },\n outliers: {\n type: 'boolean',\n describe: 'If outliers should be included',\n default: true,\n },\n relative: {\n type: 'boolean',\n describe: 'If the maximum value per query should be set to 1, and all other values made relative to that.',\n default: false,\n },\n });\n}\nexport function handler(argv: Record<string, any>): Promise<void> {\n return wrapCommandHandler(argv, async(context: ITaskContext) => wrapVisualProgress('Plotting data', async() => {\n // Load CLI args\n const { experimentDirectories, experimentNames, experimentIds } = getExperimentNames(argv);\n const queryRegex = argv.queryRegex ? new RegExp(argv.queryRegex, 'u') : undefined;\n const colorScheme = getColorScheme(argv, experimentDirectories);\n const metric = argv.metric;\n\n // Prepare query CSV file with averages per query group\n let queryNames: string[] | undefined;\n let outputCsvEntries: Record<string, number[]> = {};\n const maxQueryValues: Record<string, number> = {};\n for (const experimentDirectory of experimentDirectories) {\n // Read CSV file\n const totals: Record<string, number[]> = {};\n const totalsFirst: Record<string, number[]> = {};\n await handleCsvFile(experimentDirectory, argv, (data) => {\n if (!queryRegex || queryRegex.test(data.name)) {\n if (!(data.name in totals)) {\n totals[data.name] = [];\n }\n // Failed queries have no execution time, so they are left out instead of counting as zero.\n if (data.error === 'true') {\n return;\n }\n\n let value = Number.parseFloat(data[metric] || '0');\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.parseFloat(data.timestamps.split(' ')[0]));\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 // Without successful executions, there is nothing to plot for this query.\n if (times.length === 0) {\n averages[query] = Number.NaN;\n averageMinus[query] = Number.NaN;\n averagePlus[query] = Number.NaN;\n continue;\n }\n const average = times.reduce((sum, current) => sum + current) / times.length;\n averages[query] = average;\n averageMinus[query] = average - times.reduce((minV, value) => Math.min(value, minV));\n const maxValue = times.reduce((maxV, value) => Math.max(value, maxV));\n averagePlus[query] = maxValue - average;\n\n if (!(query in maxQueryValues)) {\n maxQueryValues[query] = maxValue;\n } else {\n maxQueryValues[query] = Math.max(maxQueryValues[query], maxValue);\n }\n }\n const averagesFirst: Record<string, number> = {};\n const averageFirstMinus: Record<string, number> = {};\n const averageFirstPlus: Record<string, number> = {};\n for (const [ query, times ] of Object.entries(totalsFirst)) {\n const average = times.reduce((sum, current) => sum + current) / times.length;\n averagesFirst[query] = average;\n averageFirstMinus[query] = average - times.reduce((minV, value) => Math.min(value, minV));\n const maxValue = times.reduce((maxV, value) => Math.max(value, maxV));\n averageFirstPlus[query] = maxValue - average;\n }\n\n // Set query names and count\n if (!queryNames) {\n queryNames = Object.keys(averages);\n for (const queryName of queryNames) {\n outputCsvEntries[queryName] = [];\n }\n } else if (queryNames.join(',') !== Object.keys(averages).join(',')) {\n throw new Error(`Tried to plot experiments with different query sets`);\n }\n\n // Append average, min, and max result\n for (const queryName of queryNames) {\n outputCsvEntries[queryName].push(\n averages[queryName],\n averageMinus[queryName],\n averagePlus[queryName],\n );\n if (metric === 'time') {\n outputCsvEntries[queryName].push(\n averagesFirst[queryName] || Number.NaN,\n averageFirstMinus[queryName] || Number.NaN,\n averageFirstPlus[queryName] || Number.NaN,\n );\n }\n }\n }\n if (!queryNames) {\n throw new Error(`No queries could be found`);\n }\n if (argv.relative) {\n // Make values relative per query\n for (const queryName of Object.keys(outputCsvEntries)) {\n outputCsvEntries[queryName] = outputCsvEntries[queryName].map(value => value / maxQueryValues[queryName]);\n }\n }\n // Determine query labels\n queryNames = getQueryNames(queryNames, argv);\n outputCsvEntries = relabelQueryNames(outputCsvEntries, queryNames);\n\n // Write output CSV file\n const csvOutputStream = fs.createWriteStream(Path.join(context.cwd, `${argv.name}.csv`));\n csvOutputStream.write(`query;${experimentIds.map((id) => {\n let value = `${id}-mean;${id}-minus;${id}-plus`;\n if (metric === 'time') {\n value = `${value};${id}-first-mean;${id}-first-minus;${id}-first-plus`;\n }\n return value;\n }).join(';')}\\n`);\n for (const [ key, columns ] of Object.entries(outputCsvEntries)) {\n csvOutputStream.write(`${key};${columns.join(';')}\\n`);\n }\n csvOutputStream.close();\n\n // Shift color list by a number of elements\n const prependPlotLines = argv.shiftColorList > 0 ? `\\\\pgfplotsset{cycle list shift=${argv.shiftColorList}}\\n` : '';\n\n // Prepare bar lines\n let barLines = prependPlotLines + experimentNames\n .map((name, id) => {\n const offset = (id - ((experimentNames.length - 1) / 2)) * 2.75;\n const yModifier = metric === 'time' && !argv.relative ? ' / 1000' : '';\n const outliers = argv.outliers ? `, y error plus expr=(\\\\thisrow{${id}-plus}${yModifier}), y error minus expr=(\\\\thisrow{${id}-minus}${yModifier})` : '';\n return `\\\\addplot+[ybar, xshift=${offset}pt,legend image post style={xshift=${-offset}pt}] table [x=query, y expr=(\\\\thisrow{${id}-mean}${yModifier})${outliers}, col sep=semicolon]{\"${argv.name}.csv\"};`;\n })\n .join('\\n');\n if (metric === 'time' && argv.outliers) {\n const extraBarLines = experimentNames\n .map((name, id) => {\n const offset = (id - ((experimentNames.length - 1) / 2)) * 2.75;\n const yModifier = metric === 'time' && !argv.relative ? ' / 1000' : '';\n return `\\\\addplot+[only marks,xshift=${offset}pt,mark=star,mark options={color=gray,scale=0.5}] table [x=query, y expr=(\\\\thisrow{${id}-first-mean}${yModifier}), col sep=semicolon]{\"${argv.name}.csv\"};`;\n })\n .join('\\n');\n barLines = `${barLines}\\n${prependPlotLines}${extraBarLines}`;\n }\n\n // Instantiate template\n await instantiateTemplate(\n Path.join(context.templatesRoot, 'tex', 'plot_query_data.tex'),\n Path.join(context.cwd, `${argv.name}.tex`),\n {\n X_LIMITS: experimentDirectories.length * 2,\n WIDTH: queryNames.length * (experimentNames.length + 1) * 4,\n QUERIES: queryNames.join(','),\n LEGEND: experimentNames.map(name => name.replace(/_/gu, '\\\\_')).join(','),\n BARS: barLines,\n COLOR_SCHEME: colorScheme,\n LEGEND_POS: argv.legendPos,\n ...argv.maxY ? { Y_MAX: `ymax=${argv.maxY},` } : {},\n },\n (contents) => {\n if (!argv.legend) {\n contents = contents.replace(/\\\\legend\\{.*\\}/ug, '');\n }\n if (argv.logY) {\n contents = contents\n .replace(/ymin=0,/u, 'ymin=0.000001,ymode=log,log origin=infty,log basis y={10},')\n .replace(/ \\/ 1000\\)/ug, ' / 1000)+1e-5');\n }\n if (argv.relative) {\n contents = contents.replace('ylabel={Duration (s)},', 'ylabel={},');\n }\n if (metric === 'httpRequests') {\n contents = contents.replace('ylabel={Duration (s)},', 'ylabel={HTTP Requests},');\n }\n return contents;\n },\n );\n\n // Render CSV from TeX\n if (argv.svg) {\n await toSvg(argv, context);\n }\n }));\n}\n"]}
@@ -51,7 +51,7 @@
51
51
 
52
52
  \newenvironment{resultAxis}{
53
53
  \begin{axis}[
54
- xtick=data,
54
+ xtick={%QUERIES%},
55
55
  width=%WIDTH%pt,
56
56
  height=96pt,
57
57
  ymin=0,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rubensworks/process-sparql-benchmark-results",
3
- "version": "1.4.1",
3
+ "version": "1.4.2",
4
4
  "description": "Personal tools to post-process query results from SPARQL benchmarks",
5
5
  "license": "MIT",
6
6
  "homepage": "https://github.com/rubensworks/process-sparql-benchmark-results.js#readme",