[IMP] evaluation_plugin: use rangeSet

Author: fdamhaut

packages/o-spreadsheet-engine/src/plugins/ui_core_views/cell_evaluation/evaluation_plugin.ts

@@ -33,6 +33,7 @@ import { ExcelWorkbookData } from "../../../types/workbook_data";
 import { FormulaCellWithDependencies } from "../../core/cell";
 import { CoreViewPlugin, CoreViewPluginConfig } from "../../core_view_plugin";
 import { Evaluator } from "./evaluator";
+import { RangeSet } from "./range_set";
 
 //#region
 
@@ -172,7 +173,7 @@ export class EvaluationPlugin extends CoreViewPlugin {
   private shouldRebuildDependenciesGraph = true;
 
   private evaluator: Evaluator;
-  private positionsToUpdate: CellPosition[] = [];
+  private positionsToUpdate: RangeSet = new RangeSet();
 
   constructor(config: CoreViewPluginConfig) {
     super(config);
@@ -199,7 +200,7 @@ export class EvaluationPlugin extends CoreViewPlugin {
           return;
         }
         const position = { sheetId: cmd.sheetId, row: cmd.row, col: cmd.col };
-        this.positionsToUpdate.push(position);
+        this.positionsToUpdate.addPosition(position);
 
         if ("content" in cmd) {
           this.evaluator.updateDependencies(position);
@@ -210,14 +211,12 @@ export class EvaluationPlugin extends CoreViewPlugin {
           return;
         }
         for (const zone of cmd.target) {
-          this.positionsToUpdate.push(...cellPositions(cmd.sheetId, zone));
+          this.positionsToUpdate.add({ sheetId: cmd.sheetId, zone });
         }
         break;
       case "EVALUATE_CELLS":
         if (cmd.cellIds) {
-          for (let i = 0; i < cmd.cellIds.length; i++) {
-            this.positionsToUpdate.push(this.getters.getCellPosition(cmd.cellIds[i]));
-          }
+          this.positionsToUpdate.addManyPositions(cmd.cellIds.map(this.getters.getCellPosition));
         } else {
           this.evaluator.evaluateAllCells();
         }
@@ -230,10 +229,10 @@ export class EvaluationPlugin extends CoreViewPlugin {
       this.evaluator.buildDependencyGraph();
       this.evaluator.evaluateAllCells();
       this.shouldRebuildDependenciesGraph = false;
-    } else if (this.positionsToUpdate.length) {
+    } else if (this.positionsToUpdate.size()) {
       this.evaluator.evaluateCells(this.positionsToUpdate);
     }
-    this.positionsToUpdate = [];
+    this.positionsToUpdate = new RangeSet();
   }
 
   // ---------------------------------------------------------------------------

packages/o-spreadsheet-engine/src/plugins/ui_core_views/cell_evaluation/evaluator.ts

@@ -109,6 +109,14 @@ export class Evaluator {
     return this.evaluatedCells.keysForSheet(sheetId);
   }
 
+  getArrayFormulaSpreadingOnRange(range: BoundedRange): CellPosition[] {
+    const arrayFormulas = this.spreadingRelations.searchFormulaPositionsSpreadingOn(
+      range.sheetId,
+      range.zone
+    );
+    return arrayFormulas.filter((position) => !this.blockedArrayFormulas.has(position));
+  }
+
   getArrayFormulaSpreadingOn(position: CellPosition): CellPosition | undefined {
     const isEmpty = this.getEvaluatedCell(position).type === CellValueType.empty;
     if (isEmpty) {
@@ -162,35 +170,22 @@ export class Evaluator {
     return new PositionSet(this.getters.getSheetIds());
   }
 
-  evaluateCells(positions: CellPosition[]) {
+  evaluateCells(rangesToCompute: RangeSet) {
     const start = performance.now();
-    const rangesToCompute = new RangeSet();
-    rangesToCompute.addManyPositions(positions);
-    const arrayFormulasPositions = this.getArrayFormulasImpactedByChangesOf(positions);
+    rangesToCompute.addMany(this.getArrayFormulasImpactedByChangesOf(rangesToCompute));
     rangesToCompute.addMany(this.getCellsDependingOn(rangesToCompute));
-    rangesToCompute.addMany(arrayFormulasPositions);
-    rangesToCompute.addMany(this.getCellsDependingOn(arrayFormulasPositions));
     this.formatCache = this.getters.getCellFormatInRanges(rangesToCompute);
     this.evaluate(rangesToCompute);
     console.debug("evaluate Cells", performance.now() - start, "ms");
   }
 
-  private getArrayFormulasImpactedByChangesOf(positions: Iterable<CellPosition>): RangeSet {
+  private getArrayFormulasImpactedByChangesOf(ranges: RangeSet): RangeSet {
     const impactedRanges = new RangeSet();
-
-    for (const position of positions) {
-      const content = this.getters.getCell(position)?.content;
-      const arrayFormulaPosition = this.getArrayFormulaSpreadingOn(position);
-      if (arrayFormulaPosition !== undefined) {
-        // take into account new collisions.
-        impactedRanges.addPosition(arrayFormulaPosition);
-      }
-      if (!content) {
-        // The previous content could have blocked some array formulas
-        impactedRanges.addPosition(position);
-      }
+    for (const range of ranges) {
+      impactedRanges.add(range);
+      impactedRanges.addManyPositions(this.getArrayFormulaSpreadingOnRange(range));
     }
-    for (const range of [...impactedRanges]) {
+    for (const range of impactedRanges) {
       impactedRanges.addMany(this.getArrayFormulasBlockedBy(range.sheetId, range.zone));
     }
     return impactedRanges;

packages/o-spreadsheet-engine/src/plugins/ui_feature/format.ts

@@ -33,16 +33,13 @@ export class FormatPlugin extends UIPlugin {
     const measurePositions: CellPosition[] = [];
     const measuresByPivotId: Record<string, Set<string>> = {};
     for (const zone of recomputeZones(zones)) {
-      for (let col = zone.left; col <= zone.right; col++) {
-        for (let row = zone.top; row <= zone.bottom; row++) {
-          const position = { sheetId, col, row };
-          const pivotCell = this.getters.getPivotCellFromPosition(position);
-          if (this.isSpilledPivotValueFormula(position, pivotCell)) {
-            measurePositions.push(position);
-            const pivotId = this.getters.getPivotIdFromPosition(position) || "";
-            measuresByPivotId[pivotId] ??= new Set();
-            measuresByPivotId[pivotId].add(pivotCell.measure);
-          }
+      for (const position of this.getters.getEvaluatedCellsPositionInZone(sheetId, zone)) {
+        const pivotCell = this.getters.getPivotCellFromPosition(position);
+        if (this.isSpilledPivotValueFormula(position, pivotCell)) {
+          measurePositions.push(position);
+          const pivotId = this.getters.getPivotIdFromPosition(position) || "";
+          measuresByPivotId[pivotId] ??= new Set();
+          measuresByPivotId[pivotId].add(pivotCell.measure);
         }
       }
     }