@eagleoutice/flowr 2.6.3 → 2.7.2

package/abstract-interpretation/domains/singleton-domain.d.ts

@@ -25,10 +25,10 @@ export declare class SingletonDomain<T, Value extends SingletonLift<T> = Singlet
     bottom(): this & SingletonDomain<T, SingletonBottom>;
     equals(other: this): boolean;
     leq(other: this): boolean;
-    join(other: this): this;
     join(other: SingletonLift<T>): this;
-    meet(other: this): this;
+    join(other: this): this;
     meet(other: SingletonLift<T>): this;
+    meet(other: this): this;
     widen(other: this): this;
     narrow(other: this): this;
     concretize(): ReadonlySet<T> | typeof Top;

package/abstract-interpretation/domains/singleton-domain.js

@@ -109,10 +109,10 @@ class SingletonDomain extends abstract_domain_1.AbstractDomain {
     }
     toString() {
         if (this.value === lattice_1.Top) {
-            return '⊤';
+            return lattice_1.TopSymbol;
         }
         else if (this.value === lattice_1.Bottom) {
-            return '⊥';
+            return lattice_1.BottomSymbol;
         }
         return (0, abstract_domain_1.domainElementToString)(this.value);
     }

package/benchmark/slicer.d.ts

@@ -106,7 +106,8 @@ export declare class BenchmarkSlicer {
      * @returns The statistics of the data frame shape inference
      */
     inferDataFrameShapes(): SlicerStatsDfShape;
-    private getInferredSize;
+    private getInferredRange;
+    private getInferredNumber;
     /** Bridging the gap between the new internal and the old names for the benchmarking */
     private measureCommonStep;
     private measureSimpleStep;

package/benchmark/slicer.js

@@ -26,8 +26,9 @@ const vertex_1 = require("../dataflow/graph/vertex");
 const arrays_1 = require("../util/collections/arrays");
 const config_1 = require("../config");
 const extract_cfg_1 = require("../control-flow/extract-cfg");
-const absint_info_1 = require("../abstract-interpretation/data-frame/absint-info");
 const shape_inference_1 = require("../abstract-interpretation/data-frame/shape-inference");
+const lattice_1 = require("../abstract-interpretation/domains/lattice");
+const set_range_domain_1 = require("../abstract-interpretation/domains/set-range-domain");
 const fs_1 = __importDefault(require("fs"));
 const flowr_analyzer_context_1 = require("../project/context/flowr-analyzer-context");
 /**
@@ -117,10 +118,10 @@ class BenchmarkSlicer {
         for (const [n, info] of vertices) {
             const outgoingEdges = this.dataflow.graph.outgoingEdges(n);
             numberOfEdges += outgoingEdges?.size ?? 0;
-            if (info.tag === 'function-call') {
+            if (info.tag === vertex_1.VertexType.FunctionCall) {
                 numberOfCalls++;
             }
-            else if (info.tag === 'function-definition') {
+            else if (info.tag === vertex_1.VertexType.FunctionDefinition) {
                 numberOfDefinitions++;
             }
         }
@@ -163,7 +164,7 @@ class BenchmarkSlicer {
                 numberOfNormalizedTokensNoComments: nodesNoComments
             },
             dataflow: {
-                numberOfNodes: [...this.dataflow.graph.vertices(true)].length,
+                numberOfNodes: this.dataflow.graph.vertices(true).toArray().length,
                 numberOfEdges: numberOfEdges,
                 numberOfCalls: numberOfCalls,
                 numberOfFunctionDefinitions: numberOfDefinitions,
@@ -257,7 +258,7 @@ class BenchmarkSlicer {
             }).join('')}`);
         }
         // if it is not in the dataflow graph it was kept to be safe and should not count to the included nodes
-        stats.numberOfDataflowNodesSliced = [...slicedOutput.result].filter(id => results.dataflow.graph.hasVertex(id, false)).length;
+        stats.numberOfDataflowNodesSliced = Array.from(slicedOutput.result).filter(id => results.dataflow.graph.hasVertex(id, false)).length;
         stats.timesHitThreshold = slicedOutput.timesHitThreshold;
         stats.measurements = measurements.get();
         return {
@@ -289,7 +290,7 @@ class BenchmarkSlicer {
         (0, assert_1.guard)(this.normalizedAst !== undefined, 'normalizedAst should be defined for data frame shape inference');
         (0, assert_1.guard)(this.dataflow !== undefined, 'dataflow should be defined for data frame shape inference');
         (0, assert_1.guard)(this.controlFlow !== undefined, 'controlFlow should be defined for data frame shape inference');
-        (0, assert_1.guard)(this.config !== undefined, 'config should be defined for data frame shape inference');
+        (0, assert_1.guard)(this.context !== undefined, 'context should be defined for data frame shape inference');
         const ast = this.normalizedAst;
         const dfg = this.dataflow.graph;
         const cfinfo = this.controlFlow;
@@ -298,15 +299,17 @@ class BenchmarkSlicer {
             numberOfNonDataFrameFiles: 0,
             numberOfResultConstraints: 0,
             numberOfResultingValues: 0,
-            numberOfResultingTop: 0,
             numberOfResultingBottom: 0,
+            numberOfResultingTop: 0,
             numberOfEmptyNodes: 0,
             numberOfOperationNodes: 0,
             numberOfValueNodes: 0,
             sizeOfInfo: 0,
             perNodeStats: new Map()
         };
-        const result = this.measureSimpleStep('infer data frame shapes', () => (0, shape_inference_1.inferDataFrameShapes)(cfinfo, dfg, ast, this.context));
+        const inference = new shape_inference_1.DataFrameShapeInferenceVisitor({ controlFlow: cfinfo, dfg, normalizedAst: ast, ctx: this.context });
+        this.measureSimpleStep('infer data frame shapes', () => inference.start());
+        const result = inference.getEndState();
         stats.numberOfResultConstraints = result.value.size;
         for (const value of result.value.values()) {
             if (value.isTop()) {
@@ -319,30 +322,29 @@ class BenchmarkSlicer {
                 stats.numberOfResultingValues++;
             }
         }
-        (0, visitor_1.visitAst)(this.normalizedAst.ast.files.map(f => f.root), (node) => {
-            if (node.info.dataFrame === undefined) {
-                return;
-            }
-            stats.sizeOfInfo += (0, size_of_1.safeSizeOf)([node.info.dataFrame]);
-            const expression = (0, absint_info_1.hasDataFrameExpressionInfo)(node) ? node.info.dataFrame : undefined;
-            const value = node.info.dataFrame.domain?.get(node.info.id);
+        (0, visitor_1.visitAst)(this.normalizedAst.ast.files.map(file => file.root), node => {
+            const operations = inference.getAbstractOperations(node.info.id);
+            const value = inference.getAbstractValue(node.info.id);
             // Only store per-node information for nodes representing expressions or nodes with abstract values
-            if (expression === undefined && value === undefined) {
+            if (operations === undefined && value === undefined) {
                 stats.numberOfEmptyNodes++;
                 return;
             }
+            const state = inference.getAbstractState(node.info.id);
+            stats.sizeOfInfo += (0, size_of_1.safeSizeOf)([state]);
             const nodeStats = {
-                numberOfEntries: node.info.dataFrame?.domain?.value.size ?? 0
+                numberOfEntries: state?.value.size ?? 0
             };
-            if (expression !== undefined) {
-                nodeStats.mappedOperations = expression.operations.map(op => op.operation);
+            if (operations !== undefined) {
+                nodeStats.mappedOperations = operations.map(op => op.operation);
                 stats.numberOfOperationNodes++;
                 if (value !== undefined) {
-                    nodeStats.inferredColNames = value.colnames.isValue() ? value.colnames.value.size : value.colnames.isTop() ? 'top' : 'bottom';
-                    nodeStats.inferredColCount = this.getInferredSize(value.cols);
-                    nodeStats.inferredRowCount = this.getInferredSize(value.rows);
-                    nodeStats.approxRangeColCount = value.cols.isValue() ? value.cols.value[1] - value.cols.value[0] : 0;
-                    nodeStats.approxRangeRowCount = value.rows.isValue() ? value.rows.value[1] - value.rows.value[0] : 0;
+                    nodeStats.inferredColNames = this.getInferredNumber(value.colnames);
+                    nodeStats.inferredColCount = this.getInferredNumber(value.cols);
+                    nodeStats.inferredRowCount = this.getInferredNumber(value.rows);
+                    nodeStats.approxRangeColNames = this.getInferredRange(value.colnames);
+                    nodeStats.approxRangeColCount = this.getInferredRange(value.cols);
+                    nodeStats.approxRangeRowCount = this.getInferredRange(value.rows);
                 }
             }
             if (value !== undefined) {
@@ -359,15 +361,34 @@ class BenchmarkSlicer {
         this.stats.dataFrameShape = stats;
         return stats;
     }
-    getInferredSize(value) {
+    getInferredRange(value) {
+        if (value.isValue()) {
+            if (value instanceof set_range_domain_1.SetRangeDomain) {
+                return value.value.range === lattice_1.Top ? Infinity : value.value.range.size;
+            }
+            else {
+                return value.value[1] - value.value[0];
+            }
+        }
+        return 0;
+    }
+    getInferredNumber(value) {
         if (value.isTop()) {
             return 'top';
         }
-        else if (value.isValue() && !isFinite(value.value[1])) {
-            return 'infinite';
-        }
         else if (value.isValue()) {
-            return Math.floor((value.value[0] + value.value[1]) / 2);
+            if (value instanceof set_range_domain_1.SetRangeDomain) {
+                if (value.value.range === lattice_1.Top) {
+                    return 'infinite';
+                }
+                return Math.floor(value.value.min.size + (value.value.range.size / 2));
+            }
+            else {
+                if (!isFinite(value.value[1])) {
+                    return 'infinite';
+                }
+                return Math.floor((value.value[0] + value.value[1]) / 2);
+            }
         }
         return 'bottom';
     }

package/benchmark/stats/print.js

@@ -176,15 +176,16 @@ Dataframe shape inference:
   Number of total top:            ${pad(stats.dataFrameShape.numberOfTotalTop)}
   Inferred column names per node: ${pad(stats.dataFrameShape.inferredColNames.mean)}
   Number of column names values:  ${pad(stats.dataFrameShape.numberOfColNamesValues)}
-  Number of column names Top:     ${pad(stats.dataFrameShape.numberOfColNamesTop)}
+  Number of column names infinite:${pad(stats.dataFrameShape.numberOfColNamesInfinite)}
+  Number of column names top:     ${pad(stats.dataFrameShape.numberOfColNamesTop)}
   Inferred column count per node: ${pad(stats.dataFrameShape.inferredColCount.mean)}
   Number of column count values:  ${pad(stats.dataFrameShape.numberOfColCountValues)}
-  Number of column count Top:     ${pad(stats.dataFrameShape.numberOfColCountTop)}
   Number of column count infinite:${pad(stats.dataFrameShape.numberOfColCountInfinite)}
+  Number of column count top:     ${pad(stats.dataFrameShape.numberOfColCountTop)}
   Inferred row count per node:    ${pad(stats.dataFrameShape.inferredRowCount.mean)}
   Number of row count values:     ${pad(stats.dataFrameShape.numberOfRowCountValues)}
-  Number of row count Top:        ${pad(stats.dataFrameShape.numberOfRowCountTop)}
   Number of row count infinite:   ${pad(stats.dataFrameShape.numberOfRowCountInfinite)}
+  Number of row count top:        ${pad(stats.dataFrameShape.numberOfRowCountTop)}
   Size of data frame shape info:  ${convertNumberToNiceBytes(stats.dataFrameShape.sizeOfInfo)}`;
     }
     return result;
@@ -276,18 +277,20 @@ Dataframe shape inference:
   Number of total values:         ${formatSummarizedMeasure(stats.dataFrameShape.numberOfTotalValues)}
   Number of total top:            ${formatSummarizedMeasure(stats.dataFrameShape.numberOfTotalTop)}
   Inferred column names per node: ${formatSummarizedMeasure(stats.dataFrameShape.inferredColNames)}
+  Number of column names exact:   ${formatSummarizedMeasure(stats.dataFrameShape.numberOfColNamesExact)}
   Number of column names values:  ${formatSummarizedMeasure(stats.dataFrameShape.numberOfColNamesValues)}
+  Number of column names infinite:${formatSummarizedMeasure(stats.dataFrameShape.numberOfColNamesInfinite)}
   Number of column names top:     ${formatSummarizedMeasure(stats.dataFrameShape.numberOfColNamesTop)}
   Inferred column count per node: ${formatSummarizedMeasure(stats.dataFrameShape.inferredColCount)}
   Number of column count exact:   ${formatSummarizedMeasure(stats.dataFrameShape.numberOfColCountExact)}
   Number of column count values:  ${formatSummarizedMeasure(stats.dataFrameShape.numberOfColCountValues)}
-  Number of column count top:     ${formatSummarizedMeasure(stats.dataFrameShape.numberOfColCountTop)}
   Number of column count infinite:${formatSummarizedMeasure(stats.dataFrameShape.numberOfColCountInfinite)}
+  Number of column count top:     ${formatSummarizedMeasure(stats.dataFrameShape.numberOfColCountTop)}
   Inferred row count per node:    ${formatSummarizedMeasure(stats.dataFrameShape.inferredRowCount)}
   Number of row count exact:      ${formatSummarizedMeasure(stats.dataFrameShape.numberOfRowCountExact)}
   Number of row count values:     ${formatSummarizedMeasure(stats.dataFrameShape.numberOfRowCountValues)}
-  Number of row count top:        ${formatSummarizedMeasure(stats.dataFrameShape.numberOfRowCountTop)}
   Number of row count infinite:   ${formatSummarizedMeasure(stats.dataFrameShape.numberOfRowCountInfinite)}
+  Number of row count top:        ${formatSummarizedMeasure(stats.dataFrameShape.numberOfRowCountTop)}
   Size of data frame shape info:  ${formatSummarizedMeasure(stats.dataFrameShape.sizeOfInfo, convertNumberToNiceBytes)}`;
     }
     return result;

package/benchmark/stats/stats.d.ts

@@ -49,8 +49,8 @@ export interface SlicerStatsDfShape<T = number> {
     numberOfNonDataFrameFiles: T extends number ? 0 | 1 : number;
     numberOfResultConstraints: T;
     numberOfResultingValues: T;
-    numberOfResultingTop: T;
     numberOfResultingBottom: T;
+    numberOfResultingTop: T;
     numberOfEmptyNodes: T;
     numberOfOperationNodes: T;
     numberOfValueNodes: T;
@@ -60,10 +60,11 @@ export interface SlicerStatsDfShape<T = number> {
 export interface PerNodeStatsDfShape<T = number> {
     numberOfEntries: T;
     mappedOperations?: DataFrameOperationName[];
-    inferredColNames?: T | 'bottom' | 'top';
+    inferredColNames?: T | 'bottom' | 'infinite' | 'top';
     inferredColCount?: T | 'bottom' | 'infinite' | 'top';
     inferredRowCount?: T | 'bottom' | 'infinite' | 'top';
     /** difference between upper and lower bound of interval domain (to estimate approximation) */
+    approxRangeColNames?: T;
     approxRangeColCount?: T;
     approxRangeRowCount?: T;
 }

package/benchmark/summarizer/data.d.ts

@@ -84,25 +84,28 @@ export interface SummarizedDfShapeStats<T = number> extends Omit<SlicerStatsDfSh
     numberOfEntriesPerNode: SummarizedMeasurement;
     numberOfOperations: T;
     numberOfTotalValues: T;
-    numberOfTotalTop: T;
     numberOfTotalBottom: T;
+    numberOfTotalTop: T;
     inferredColNames: SummarizedMeasurement;
+    approxRangeColNames: SummarizedMeasurement;
+    numberOfColNamesExact: T;
     numberOfColNamesValues: T;
-    numberOfColNamesTop: T;
     numberOfColNamesBottom: T;
+    numberOfColNamesInfinite: T;
+    numberOfColNamesTop: T;
     inferredColCount: SummarizedMeasurement;
+    approxRangeColCount: SummarizedMeasurement;
     numberOfColCountExact: T;
     numberOfColCountValues: T;
-    numberOfColCountTop: T;
-    numberOfColCountInfinite: T;
     numberOfColCountBottom: T;
-    approxRangeColCount: SummarizedMeasurement;
+    numberOfColCountInfinite: T;
+    numberOfColCountTop: T;
     inferredRowCount: SummarizedMeasurement;
+    approxRangeRowCount: SummarizedMeasurement;
     numberOfRowCountExact: T;
     numberOfRowCountValues: T;
-    numberOfRowCountTop: T;
-    numberOfRowCountInfinite: T;
     numberOfRowCountBottom: T;
-    approxRangeRowCount: SummarizedMeasurement;
+    numberOfRowCountInfinite: T;
+    numberOfRowCountTop: T;
     perOperationNumber: Map<DataFrameOperationName, T>;
 }

package/benchmark/summarizer/first-phase/process.js

@@ -266,26 +266,29 @@ function summarizeDfShapeStats({ perNodeStats, ...stats }) {
         numberOfEntriesPerNode: (0, summarizer_1.summarizeMeasurement)(nodeStats.map(s => s.numberOfEntries)),
         numberOfOperations: (0, arrays_1.arraySum)(nodeStats.map(s => s.mappedOperations?.length).filter(assert_1.isNotUndefined)),
         numberOfTotalValues: nodeStats.filter(s => isValue(s.inferredColNames) && isValue(s.inferredColCount) && isValue(s.inferredRowCount)).length,
-        numberOfTotalTop: nodeStats.filter(s => isTop(s.inferredColNames) && isTop(s.inferredColCount) && isTop(s.inferredRowCount)).length,
         numberOfTotalBottom: nodeStats.filter(s => s.inferredColNames === 0 && isBottom(s.inferredColCount) && isBottom(s.inferredRowCount)).length,
+        numberOfTotalTop: nodeStats.filter(s => isTop(s.inferredColNames) && isTop(s.inferredColCount) && isTop(s.inferredRowCount)).length,
         inferredColNames: (0, summarizer_1.summarizeMeasurement)(nodeStats.map(s => s.inferredColNames).filter(isValue)),
+        approxRangeColNames: (0, summarizer_1.summarizeMeasurement)(nodeStats.map(s => s.approxRangeColNames).filter(assert_1.isNotUndefined).filter(isFinite)),
+        numberOfColNamesExact: nodeStats.map(s => s.approxRangeColNames).filter(range => range === 0).length,
         numberOfColNamesValues: nodeStats.map(s => s.inferredColNames).filter(isValue).length,
+        numberOfColNamesBottom: nodeStats.map(s => s.inferredColNames).filter(isBottom).length,
+        numberOfColNamesInfinite: nodeStats.map(s => s.inferredColNames).filter(isInfinite).length,
         numberOfColNamesTop: nodeStats.map(s => s.inferredColNames).filter(isTop).length,
-        numberOfColNamesBottom: nodeStats.map(s => s.inferredColNames).filter(number => number === 0).length,
         inferredColCount: (0, summarizer_1.summarizeMeasurement)(nodeStats.map(s => s.inferredColCount).filter(isValue)),
+        approxRangeColCount: (0, summarizer_1.summarizeMeasurement)(nodeStats.map(s => s.approxRangeColCount).filter(assert_1.isNotUndefined).filter(isFinite)),
         numberOfColCountExact: nodeStats.map(s => s.approxRangeColCount).filter(range => range === 0).length,
         numberOfColCountValues: nodeStats.map(s => s.inferredColCount).filter(isValue).length,
-        numberOfColCountTop: nodeStats.map(s => s.inferredColCount).filter(isTop).length,
-        numberOfColCountInfinite: nodeStats.map(s => s.inferredColCount).filter(isInfinite).length,
         numberOfColCountBottom: nodeStats.map(s => s.inferredColCount).filter(isBottom).length,
-        approxRangeColCount: (0, summarizer_1.summarizeMeasurement)(nodeStats.map(s => s.approxRangeColCount).filter(assert_1.isNotUndefined).filter(isFinite)),
+        numberOfColCountInfinite: nodeStats.map(s => s.inferredColCount).filter(isInfinite).length,
+        numberOfColCountTop: nodeStats.map(s => s.inferredColCount).filter(isTop).length,
         inferredRowCount: (0, summarizer_1.summarizeMeasurement)(nodeStats.map(s => s.inferredRowCount).filter(isValue)),
+        approxRangeRowCount: (0, summarizer_1.summarizeMeasurement)(nodeStats.map(s => s.approxRangeRowCount).filter(assert_1.isNotUndefined).filter(isFinite)),
         numberOfRowCountExact: nodeStats.map(s => s.approxRangeRowCount).filter(range => range === 0).length,
         numberOfRowCountValues: nodeStats.map(s => s.inferredRowCount).filter(isValue).length,
-        numberOfRowCountTop: nodeStats.map(s => s.inferredRowCount).filter(isTop).length,
-        numberOfRowCountInfinite: nodeStats.map(s => s.inferredRowCount).filter(isInfinite).length,
         numberOfRowCountBottom: nodeStats.map(s => s.inferredRowCount).filter(isBottom).length,
-        approxRangeRowCount: (0, summarizer_1.summarizeMeasurement)(nodeStats.map(s => s.approxRangeRowCount).filter(assert_1.isNotUndefined).filter(isFinite)),
+        numberOfRowCountInfinite: nodeStats.map(s => s.inferredRowCount).filter(isInfinite).length,
+        numberOfRowCountTop: nodeStats.map(s => s.inferredRowCount).filter(isTop).length,
         perOperationNumber: summarizePerOperationStats(nodeStats),
     };
 }

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

@@ -114,8 +114,8 @@ function summarizeAllSummarizedStats(stats) {
             numberOfNonDataFrameFiles: (0, arrays_1.arraySum)(stats.map(s => s.dataFrameShape?.numberOfNonDataFrameFiles).filter(assert_1.isNotUndefined)),
             numberOfResultConstraints: (0, summarizer_1.summarizeMeasurement)(stats.map(s => s.dataFrameShape?.numberOfResultConstraints).filter(assert_1.isNotUndefined)),
             numberOfResultingValues: (0, summarizer_1.summarizeMeasurement)(stats.map(s => s.dataFrameShape?.numberOfResultingValues).filter(assert_1.isNotUndefined)),
-            numberOfResultingTop: (0, summarizer_1.summarizeMeasurement)(stats.map(s => s.dataFrameShape?.numberOfResultingTop).filter(assert_1.isNotUndefined)),
             numberOfResultingBottom: (0, summarizer_1.summarizeMeasurement)(stats.map(s => s.dataFrameShape?.numberOfResultingBottom).filter(assert_1.isNotUndefined)),
+            numberOfResultingTop: (0, summarizer_1.summarizeMeasurement)(stats.map(s => s.dataFrameShape?.numberOfResultingTop).filter(assert_1.isNotUndefined)),
             numberOfEmptyNodes: (0, summarizer_1.summarizeMeasurement)(stats.map(s => s.dataFrameShape?.numberOfEmptyNodes).filter(assert_1.isNotUndefined)),
             numberOfOperationNodes: (0, summarizer_1.summarizeMeasurement)(stats.map(s => s.dataFrameShape?.numberOfOperationNodes).filter(assert_1.isNotUndefined)),
             numberOfValueNodes: (0, summarizer_1.summarizeMeasurement)(stats.map(s => s.dataFrameShape?.numberOfValueNodes).filter(assert_1.isNotUndefined)),
@@ -123,26 +123,29 @@ function summarizeAllSummarizedStats(stats) {
             numberOfEntriesPerNode: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.numberOfEntriesPerNode).filter(assert_1.isNotUndefined)),
             numberOfOperations: (0, summarizer_1.summarizeMeasurement)(stats.map(s => s.dataFrameShape?.numberOfOperations).filter(assert_1.isNotUndefined)),
             numberOfTotalValues: (0, summarizer_1.summarizeMeasurement)(stats.map(s => s.dataFrameShape?.numberOfTotalValues).filter(assert_1.isNotUndefined)),
-            numberOfTotalTop: (0, summarizer_1.summarizeMeasurement)(stats.map(s => s.dataFrameShape?.numberOfTotalTop).filter(assert_1.isNotUndefined)),
             numberOfTotalBottom: (0, summarizer_1.summarizeMeasurement)(stats.map(s => s.dataFrameShape?.numberOfTotalBottom).filter(assert_1.isNotUndefined)),
+            numberOfTotalTop: (0, summarizer_1.summarizeMeasurement)(stats.map(s => s.dataFrameShape?.numberOfTotalTop).filter(assert_1.isNotUndefined)),
             inferredColNames: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.inferredColNames).filter(assert_1.isNotUndefined)),
+            approxRangeColNames: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.approxRangeColNames).filter(assert_1.isNotUndefined)),
+            numberOfColNamesExact: (0, summarizer_1.summarizeMeasurement)(stats.map(s => s.dataFrameShape?.numberOfColNamesExact).filter(assert_1.isNotUndefined)),
             numberOfColNamesValues: (0, summarizer_1.summarizeMeasurement)(stats.map(s => s.dataFrameShape?.numberOfColNamesValues).filter(assert_1.isNotUndefined)),
-            numberOfColNamesTop: (0, summarizer_1.summarizeMeasurement)(stats.map(s => s.dataFrameShape?.numberOfColNamesTop).filter(assert_1.isNotUndefined)),
             numberOfColNamesBottom: (0, summarizer_1.summarizeMeasurement)(stats.map(s => s.dataFrameShape?.numberOfColNamesBottom).filter(assert_1.isNotUndefined)),
+            numberOfColNamesInfinite: (0, summarizer_1.summarizeMeasurement)(stats.map(s => s.dataFrameShape?.numberOfColNamesInfinite).filter(assert_1.isNotUndefined)),
+            numberOfColNamesTop: (0, summarizer_1.summarizeMeasurement)(stats.map(s => s.dataFrameShape?.numberOfColNamesTop).filter(assert_1.isNotUndefined)),
             inferredColCount: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.inferredColCount).filter(assert_1.isNotUndefined)),
+            approxRangeColCount: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.approxRangeColCount).filter(assert_1.isNotUndefined)),
             numberOfColCountExact: (0, summarizer_1.summarizeMeasurement)(stats.map(s => s.dataFrameShape?.numberOfColCountExact).filter(assert_1.isNotUndefined)),
             numberOfColCountValues: (0, summarizer_1.summarizeMeasurement)(stats.map(s => s.dataFrameShape?.numberOfColCountValues).filter(assert_1.isNotUndefined)),
-            numberOfColCountTop: (0, summarizer_1.summarizeMeasurement)(stats.map(s => s.dataFrameShape?.numberOfColCountTop).filter(assert_1.isNotUndefined)),
-            numberOfColCountInfinite: (0, summarizer_1.summarizeMeasurement)(stats.map(s => s.dataFrameShape?.numberOfColCountInfinite).filter(assert_1.isNotUndefined)),
             numberOfColCountBottom: (0, summarizer_1.summarizeMeasurement)(stats.map(s => s.dataFrameShape?.numberOfColCountBottom).filter(assert_1.isNotUndefined)),
-            approxRangeColCount: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.approxRangeColCount).filter(assert_1.isNotUndefined)),
+            numberOfColCountInfinite: (0, summarizer_1.summarizeMeasurement)(stats.map(s => s.dataFrameShape?.numberOfColCountInfinite).filter(assert_1.isNotUndefined)),
+            numberOfColCountTop: (0, summarizer_1.summarizeMeasurement)(stats.map(s => s.dataFrameShape?.numberOfColCountTop).filter(assert_1.isNotUndefined)),
             inferredRowCount: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.inferredRowCount).filter(assert_1.isNotUndefined)),
+            approxRangeRowCount: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.approxRangeRowCount).filter(assert_1.isNotUndefined)),
             numberOfRowCountExact: (0, summarizer_1.summarizeMeasurement)(stats.map(s => s.dataFrameShape?.numberOfRowCountExact).filter(assert_1.isNotUndefined)),
             numberOfRowCountValues: (0, summarizer_1.summarizeMeasurement)(stats.map(s => s.dataFrameShape?.numberOfRowCountValues).filter(assert_1.isNotUndefined)),
-            numberOfRowCountTop: (0, summarizer_1.summarizeMeasurement)(stats.map(s => s.dataFrameShape?.numberOfRowCountTop).filter(assert_1.isNotUndefined)),
-            numberOfRowCountInfinite: (0, summarizer_1.summarizeMeasurement)(stats.map(s => s.dataFrameShape?.numberOfRowCountInfinite).filter(assert_1.isNotUndefined)),
             numberOfRowCountBottom: (0, summarizer_1.summarizeMeasurement)(stats.map(s => s.dataFrameShape?.numberOfRowCountBottom).filter(assert_1.isNotUndefined)),
-            approxRangeRowCount: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.approxRangeRowCount).filter(assert_1.isNotUndefined)),
+            numberOfRowCountInfinite: (0, summarizer_1.summarizeMeasurement)(stats.map(s => s.dataFrameShape?.numberOfRowCountInfinite).filter(assert_1.isNotUndefined)),
+            numberOfRowCountTop: (0, summarizer_1.summarizeMeasurement)(stats.map(s => s.dataFrameShape?.numberOfRowCountTop).filter(assert_1.isNotUndefined)),
             perOperationNumber: new Map(semantics_1.DataFrameOperationNames.map(n => [n, (0, summarizer_1.summarizeMeasurement)(stats.map(s => s.dataFrameShape?.perOperationNumber.get(n) ?? 0))]))
         } : undefined
     };
@@ -198,8 +201,8 @@ function summarizeAllUltimateStats(stats) {
             numberOfNonDataFrameFiles: (0, arrays_1.arraySum)(stats.map(s => s.dataFrameShape?.numberOfNonDataFrameFiles).filter(assert_1.isNotUndefined)),
             numberOfResultConstraints: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.numberOfResultConstraints).filter(assert_1.isNotUndefined)),
             numberOfResultingValues: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.numberOfResultingValues).filter(assert_1.isNotUndefined)),
-            numberOfResultingTop: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.numberOfResultingTop).filter(assert_1.isNotUndefined)),
             numberOfResultingBottom: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.numberOfResultingBottom).filter(assert_1.isNotUndefined)),
+            numberOfResultingTop: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.numberOfResultingTop).filter(assert_1.isNotUndefined)),
             numberOfEmptyNodes: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.numberOfEmptyNodes).filter(assert_1.isNotUndefined)),
             numberOfOperationNodes: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.numberOfOperationNodes).filter(assert_1.isNotUndefined)),
             numberOfValueNodes: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.numberOfValueNodes).filter(assert_1.isNotUndefined)),
@@ -207,26 +210,29 @@ function summarizeAllUltimateStats(stats) {
             numberOfEntriesPerNode: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.numberOfEntriesPerNode).filter(assert_1.isNotUndefined)),
             numberOfOperations: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.numberOfOperations).filter(assert_1.isNotUndefined)),
             numberOfTotalValues: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.numberOfTotalValues).filter(assert_1.isNotUndefined)),
-            numberOfTotalTop: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.numberOfTotalTop).filter(assert_1.isNotUndefined)),
             numberOfTotalBottom: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.numberOfTotalBottom).filter(assert_1.isNotUndefined)),
+            numberOfTotalTop: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.numberOfTotalTop).filter(assert_1.isNotUndefined)),
             inferredColNames: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.inferredColNames).filter(assert_1.isNotUndefined)),
+            approxRangeColNames: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.approxRangeColNames).filter(assert_1.isNotUndefined)),
+            numberOfColNamesExact: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.numberOfColNamesExact).filter(assert_1.isNotUndefined)),
             numberOfColNamesValues: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.numberOfColNamesValues).filter(assert_1.isNotUndefined)),
-            numberOfColNamesTop: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.numberOfColNamesTop).filter(assert_1.isNotUndefined)),
             numberOfColNamesBottom: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.numberOfColNamesBottom).filter(assert_1.isNotUndefined)),
+            numberOfColNamesInfinite: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.numberOfColNamesInfinite).filter(assert_1.isNotUndefined)),
+            numberOfColNamesTop: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.numberOfColNamesTop).filter(assert_1.isNotUndefined)),
             inferredColCount: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.inferredColCount).filter(assert_1.isNotUndefined)),
+            approxRangeColCount: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.approxRangeColCount).filter(assert_1.isNotUndefined)),
             numberOfColCountExact: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.numberOfColCountExact).filter(assert_1.isNotUndefined)),
             numberOfColCountValues: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.numberOfColCountValues).filter(assert_1.isNotUndefined)),
-            numberOfColCountTop: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.numberOfColCountTop).filter(assert_1.isNotUndefined)),
-            numberOfColCountInfinite: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.numberOfColCountInfinite).filter(assert_1.isNotUndefined)),
             numberOfColCountBottom: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.numberOfColCountBottom).filter(assert_1.isNotUndefined)),
-            approxRangeColCount: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.approxRangeColCount).filter(assert_1.isNotUndefined)),
+            numberOfColCountInfinite: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.numberOfColCountInfinite).filter(assert_1.isNotUndefined)),
+            numberOfColCountTop: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.numberOfColCountTop).filter(assert_1.isNotUndefined)),
             inferredRowCount: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.inferredRowCount).filter(assert_1.isNotUndefined)),
+            approxRangeRowCount: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.approxRangeRowCount).filter(assert_1.isNotUndefined)),
             numberOfRowCountExact: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.numberOfRowCountExact).filter(assert_1.isNotUndefined)),
             numberOfRowCountValues: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.numberOfRowCountValues).filter(assert_1.isNotUndefined)),
-            numberOfRowCountTop: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.numberOfRowCountTop).filter(assert_1.isNotUndefined)),
-            numberOfRowCountInfinite: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.numberOfRowCountInfinite).filter(assert_1.isNotUndefined)),
             numberOfRowCountBottom: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.numberOfRowCountBottom).filter(assert_1.isNotUndefined)),
-            approxRangeRowCount: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.approxRangeRowCount).filter(assert_1.isNotUndefined)),
+            numberOfRowCountInfinite: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.numberOfRowCountInfinite).filter(assert_1.isNotUndefined)),
+            numberOfRowCountTop: (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.numberOfRowCountTop).filter(assert_1.isNotUndefined)),
             perOperationNumber: new Map(semantics_1.DataFrameOperationNames.map(n => [n, (0, process_1.summarizeSummarizedMeasurement)(stats.map(s => s.dataFrameShape?.perOperationNumber.get(n)).filter(assert_1.isNotUndefined))]))
         } : undefined
     };