Horizontal42/summarum
1
0
Fork 0
mirror of https://github.com/Horizontal42/summarum.git synced 2026-11-10 19:11:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

extract filterSameDimension/reduceCompatible in AGG_FUNCS

Browse source 
chart/min/max repeated the same same-dimension filter, and sum/avg
repeated the same left-to-right accumulation loop.
This commit is contained in:
Horizontal42 2026-08-12 20:06:25 +03:00
parent 93acfab28c
commit 0353ae7bf6
1 changed files with 26 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
src/engine/evaluator.ts
View file

@ -414,11 +414,31 @@ function evalGoalSeek(lhsNode: Node, rhsNode: Node, ctx: EvalCtx): Value {
return qty(lo.plus(hi).div(2)); return qty(lo.plus(hi).div(2));
} }
/** Lines whose unit shares the first line's dimension (mixed-dimension blocks skip the rest). */
function filterSameDimension(block: Quantity[]): Quantity[] {
const refDim = block[0].unit?.dimension ?? null;
return block.filter((q) => (q.unit?.dimension ?? null) === refDim);
}
/** Adds compatible lines left to right, silently skipping ones with an incompatible dimension. */
function reduceCompatible(block: Quantity[]): { acc: Quantity; counted: number } {
let acc = block[0];
let counted = 1;
for (let i = 1; i < block.length; i++) {
try {
acc = numericAdd(acc, block[i], 1);
counted++;
} catch {
// skip lines with incompatible dimensions
}
}
return { acc, counted };
}
const AGG_FUNCS: Record<string, (block: Quantity[]) => Value> = { const AGG_FUNCS: Record<string, (block: Quantity[]) => Value> = {
count: (block) => qty(new Decimal(block.length)), count: (block) => qty(new Decimal(block.length)),
chart: (block) => { chart: (block) => {
const refDim = block[0].unit?.dimension ?? null; const compatible = filterSameDimension(block);
const compatible = block.filter((q) => (q.unit?.dimension ?? null) === refDim);
if (compatible.length < 2) throw new EvalError("need at least 2 values for chart"); if (compatible.length < 2) throw new EvalError("need at least 2 values for chart");
return { return {
kind: "chart", kind: "chart",
@ -426,39 +446,12 @@ const AGG_FUNCS: Record<string, (block: Quantity[]) => Value> = {
unitLabel: block[0].unit?.format ?? null, unitLabel: block[0].unit?.format ?? null,
}; };
}, },
min: (block) => { min: (block) => filterSameDimension(block).reduce((best, q) => toBase(q).lt(toBase(best)) ? q : best),
const refDim = block[0].unit?.dimension ?? null; max: (block) => filterSameDimension(block).reduce((best, q) => toBase(q).gt(toBase(best)) ? q : best),
const compatible = block.filter((q) => (q.unit?.dimension ?? null) === refDim);
return compatible.reduce((best, q) => toBase(q).lt(toBase(best)) ? q : best);
},
max: (block) => {
const refDim = block[0].unit?.dimension ?? null;
const compatible = block.filter((q) => (q.unit?.dimension ?? null) === refDim);
return compatible.reduce((best, q) => toBase(q).gt(toBase(best)) ? q : best);
},
product: (block) => qty(block.reduce((acc, q) => acc.mul(q.value), new Decimal(1))), product: (block) => qty(block.reduce((acc, q) => acc.mul(q.value), new Decimal(1))),
sum: (block) => { sum: (block) => reduceCompatible(block).acc,
let acc = block[0];
for (let i = 1; i < block.length; i++) {
try {
acc = numericAdd(acc, block[i], 1);
} catch {
// skip lines with incompatible dimensions
}
}
return acc;
},
avg: (block) => { avg: (block) => {
let acc = block[0]; const { acc, counted } = reduceCompatible(block);
let counted = 1;
for (let i = 1; i < block.length; i++) {
try {
acc = numericAdd(acc, block[i], 1);
counted++;
} catch {
// skip lines with incompatible dimensions
}
}
return qty(acc.value.div(counted), acc.unit); return qty(acc.value.div(counted), acc.unit);
} }
}; };