@eagleoutice/flowr 2.1.8 → 2.1.9

package/statistics/summarizer/post-process/post-process-output.js

@@ -14,6 +14,7 @@ const ansi_1 = require("../../../util/ansi");
 const feature_1 = require("../../features/feature");
 const decorate_1 = require("../../../r-bridge/lang-4.x/ast/model/processing/decorate");
 const file_provider_1 = require("../../output/file-provider");
+const arrays_1 = require("../../../util/arrays");
 /**
  * Post process the collections in a given folder, reducing them in a memory preserving way.
  *
@@ -79,7 +80,7 @@ function printClusterReport(report, limit = 1000) {
     const shortStats = [...report.valueInfoMap.entries()].map(([name, values]) => {
         return {
             name,
-            count: [...values.values()].reduce((a, b) => a + b, 0),
+            count: (0, arrays_1.arraySum)([...values.values()]),
             unique: values.size()
         };
     }).sort((a, b) => b.count - a.count).slice(0, limit);

package/statistics/summarizer/second-phase/process.js

@@ -50,7 +50,7 @@ function postProcessMeta(config, filepath, outputPath, logger, metaFeatureInform
     out.write(`file,successfulParsed,${(0, summarizer_1.summarizedMeasurement2CsvHeader)('processing')},failedRequests,${(0, summarizer_1.summarizedMeasurement2CsvHeader)('line-length')},${(0, summarizer_1.summarizedMeasurement2CsvHeader)('lines')},${(0, summarizer_1.summarizedMeasurement2CsvHeader)('characters')},numberOfNormalizedNodes\n`);
     for (const [file, info] of metaFeatureInformation) {
         // we could retrieve these by summing later as well :thinking: however, this makes it more explicit
-        const characters = (0, arrays_1.sum)(info.stats.lines[0]);
+        const characters = (0, arrays_1.arraySum)(info.stats.lines[0]);
         out.write(`${JSON.stringify(file)},${info.stats.successfulParsed},${(0, summarizer_1.summarizedMeasurement2Csv)((0, summarizer_1.summarizeMeasurement)(info.stats.processingTimeMs))},`
             + `${info.stats.failedRequests.length},${(0, summarizer_1.summarizedMeasurement2Csv)((0, summarizer_1.summarizeMeasurement)(info.stats.lines[0]))},${(0, summarizer_1.summarizedMeasurement2Csv)((0, summarizer_1.summarizeMeasurement)([info.stats.lines[0].length]))},${(0, summarizer_1.summarizedMeasurement2Csv)((0, summarizer_1.summarizeMeasurement)([characters]))},${info.stats.numberOfNormalizedNodes[0]}\n`);
         fileStatisticsSummary.successfulParsed.push(info.stats.successfulParsed);
@@ -60,8 +60,8 @@ function postProcessMeta(config, filepath, outputPath, logger, metaFeatureInform
         fileStatisticsSummary.characters.push(characters);
         fileStatisticsSummary.numberOfNormalizedNodes.push(info.stats.numberOfNormalizedNodes[0]);
     }
-    out.write(`all,${(0, arrays_1.sum)(fileStatisticsSummary.successfulParsed)},${(0, summarizer_1.summarizedMeasurement2Csv)((0, summarizer_1.summarizeMeasurement)(fileStatisticsSummary.processingTimeMs))},`
-        + `${(0, arrays_1.sum)(fileStatisticsSummary.failedRequests)},${(0, summarizer_1.summarizedMeasurement2Csv)((0, summarizer_1.summarizeMeasurement)(fileStatisticsSummary.lines.flat()))},${(0, summarizer_1.summarizedMeasurement2Csv)((0, summarizer_1.summarizeMeasurement)(fileStatisticsSummary.lines.map(l => l.length)))},${(0, summarizer_1.summarizedMeasurement2Csv)((0, summarizer_1.summarizeMeasurement)(fileStatisticsSummary.characters))},${(0, arrays_1.sum)(fileStatisticsSummary.numberOfNormalizedNodes)}\n`);
+    out.write(`all,${(0, arrays_1.arraySum)(fileStatisticsSummary.successfulParsed)},${(0, summarizer_1.summarizedMeasurement2Csv)((0, summarizer_1.summarizeMeasurement)(fileStatisticsSummary.processingTimeMs))},`
+        + `${(0, arrays_1.arraySum)(fileStatisticsSummary.failedRequests)},${(0, summarizer_1.summarizedMeasurement2Csv)((0, summarizer_1.summarizeMeasurement)(fileStatisticsSummary.lines.flat()))},${(0, summarizer_1.summarizedMeasurement2Csv)((0, summarizer_1.summarizeMeasurement)(fileStatisticsSummary.lines.map(l => l.length)))},${(0, summarizer_1.summarizedMeasurement2Csv)((0, summarizer_1.summarizeMeasurement)(fileStatisticsSummary.characters))},${(0, arrays_1.arraySum)(fileStatisticsSummary.numberOfNormalizedNodes)}\n`);
     out.close();
 }
 /**

package/util/arrays.d.ts

@@ -46,7 +46,7 @@ export declare function getUniqueCombinationsOfSize<T>(array: T[], minSize?: num
 /**
  * Returns the sum of all elements in the given array
  */
-export declare function sum(arr: number[]): number;
+export declare function arraySum(arr: readonly number[]): number;
 /**
  * Converts an array into a bag data-structure (in the form of a map mapping the entries/keys to their counts)
  */

package/util/arrays.js

@@ -5,7 +5,7 @@ exports.partitionArray = partitionArray;
 exports.allPermutations = allPermutations;
 exports.partition = partition;
 exports.getUniqueCombinationsOfSize = getUniqueCombinationsOfSize;
-exports.sum = sum;
+exports.arraySum = arraySum;
 exports.array2bag = array2bag;
 exports.arrayEqual = arrayEqual;
 const assert_1 = require("./assert");
@@ -143,7 +143,7 @@ function* getUniqueCombinationsOfSize(array, minSize = 0, maxSize = array.length
 /**
  * Returns the sum of all elements in the given array
  */
-function sum(arr) {
+function arraySum(arr) {
     let sum = 0;
     for (const elem of arr) {
         sum += elem;
@@ -167,7 +167,7 @@ function arrayEqual(a, b) {
     if (a.length !== b.length) {
         return false;
     }
-    for (let i = 0; i < a.length; ++i) {
+    for (let i = 0; i < a.length; i++) {
         if (a[i] !== b[i]) {
             return false;
         }

package/util/cfg/cfg.js

@@ -381,9 +381,11 @@ function cfgAccess(access, name, accessors) {
 }
 function cfgUnaryOp(unary, operand) {
     const graph = operand.graph;
-    const result = { ...operand, graph, exitPoints: [unary.info.id] };
     graph.addVertex({ id: unary.info.id, name: unary.type, type: "end-marker" /* CfgVertexType.EndMarker */ });
-    return result;
+    for (const entry of operand.exitPoints) {
+        graph.addEdge(unary.info.id, entry, { label: 'FD' });
+    }
+    return { ...operand, graph, exitPoints: [unary.info.id] };
 }
 function cfgExprList(_node, _grouping, expressions) {
     const result = { graph: new ControlFlowGraph(), breaks: [], nexts: [], returns: [], exitPoints: [], entryPoints: [] };

package/util/mermaid/cfg.js

@@ -16,7 +16,7 @@ function cfgToMermaid(cfg, normalizedAst, prefix = '') {
             output += `    n${id}[${name}]\n`;
         }
         else {
-            output += `    n${id}(( ))\n`;
+            output += String(id).endsWith('-exit') ? `    n${id}((${id}))\n` : `    n${id}[[${id}]]\n`;
         }
     }
     for (const [from, targets] of cfg.graph.edges()) {

package/util/summarizer.js

@@ -27,11 +27,11 @@ function summarizeMeasurement(data, totalNumberOfDataPoints) {
     const min = sorted[0];
     const max = sorted[sorted.length - 1];
     const median = sorted[Math.floor(sorted.length / 2)];
-    const total = (0, arrays_1.sum)(sorted);
+    const total = (0, arrays_1.arraySum)(sorted);
     const length = totalNumberOfDataPoints ?? sorted.length;
     const mean = total / length;
     // sqrt(sum(x-mean)^2 / n)
-    const std = Math.sqrt(sorted.map(x => (x - mean) ** 2).reduce((a, b) => a + b, 0) / length);
+    const std = Math.sqrt((0, arrays_1.arraySum)(sorted.map(x => (x - mean) ** 2)) / length);
     return { min, max, median, mean, std, total };
 }
 //# sourceMappingURL=summarizer.js.map

package/util/version.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.flowrVersion = flowrVersion;
 const semver_1 = require("semver");
 // this is automatically replaced with the current version by release-it
-const version = '2.1.8';
+const version = '2.1.9';
 function flowrVersion() {
     return new semver_1.SemVer(version);
 }