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

refactor: extract helper functions from evalGoalSeek

Browse source 
Extracts `solveLinear`, `findBisectionBounds`, and `solveBisection`
helper functions to improve the readability and maintainability
of `evalGoalSeek` within `src/engine/evaluator.ts`.

Co-authored-by: Horizontal42 <75383519+Horizontal42@users.noreply.github.com>
This commit is contained in:
google-labs-jules[bot] 2026-08-26 14:01:07 +00:00
parent 37cfd2144b
commit ccd9cd8b34
1 changed files with 76 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
src/engine/evaluator.ts
View file

@ -475,45 +475,39 @@ function evalDateArith(op: string, l: Value, r: Value): Value {
return { ...date, ms, hasTime }; return { ...date, ms, hasTime };
} }
function evalGoalSeek(lhsNode: Node, rhsNode: Node, ctx: EvalCtx): Value { type SafeEvalFn = (x: Decimal) => Decimal | null;
const evalF = (x: Decimal): Decimal => {
const vars = new Map(ctx.vars);
vars.set("__x__", qty(x));
const innerCtx: EvalCtx = { ...ctx, vars };
const lv = evaluate(lhsNode, innerCtx);
const rv = evaluate(rhsNode, innerCtx);
const toD = (v: Value) => v.kind === "quantity" ? toBase(v) : DEC_ZERO;
return toD(lv).minus(toD(rv));
};
const safeEval = (x: Decimal): Decimal | null => {
try {
return evalF(x);
} catch {
return null;
}
};
function solveLinear(safeEval: SafeEvalFn): Decimal | null {
const f0 = safeEval(DEC_ZERO); const f0 = safeEval(DEC_ZERO);
const f1 = safeEval(DEC_ONE); const f1 = safeEval(DEC_ONE);
if (f0 !== null && f1 !== null) { if (f0 !== null && f1 !== null) {
const slope = f1.minus(f0); const slope = f1.minus(f0);
if (!slope.isZero()) { if (!slope.isZero()) {
const root = f0.neg().div(slope); const root = f0.neg().div(slope);
const fRoot = safeEval(root); const fRoot = safeEval(root);
if (fRoot !== null && fRoot.abs().lt(new Decimal("1e-9"))) if (fRoot !== null && fRoot.abs().lt(new Decimal("1e-9"))) return root;
return qty(root);
} }
} }
return null;
}
// Bisection fallback for nonlinear cases interface Bounds {
lo: Decimal;
hi: Decimal;
flo: Decimal | null;
fhi: Decimal | null;
}
function findBisectionBounds(safeEval: SafeEvalFn): Bounds {
let lo = new Decimal(-1e9); let lo = new Decimal(-1e9);
let hi = new Decimal(1e9); let hi = new Decimal(1e9);
let flo = safeEval(lo); let flo = safeEval(lo);
let fhi = safeEval(hi); let fhi = safeEval(hi);
if (flo === null || fhi === null || flo.mul(fhi).gt(0)) { if (flo !== null && fhi !== null && flo.mul(fhi).lte(0)) {
return { lo, hi, flo, fhi };
}
const probes = [ const probes = [
1, 2, 5, 10, 100, 1000, 10000, -1, -2, -5, -10, -100, -1000, -10000, 1, 2, 5, 10, 100, 1000, 10000, -1, -2, -5, -10, -100, -1000, -10000,
]; ];
@ -541,11 +535,14 @@ function evalGoalSeek(lhsNode: Node, rhsNode: Node, ctx: EvalCtx): Value {
} }
} }
if (!found) throw new EvalError("no solution"); if (!found) throw new EvalError("no solution");
} return { lo, hi, flo, fhi };
}
function solveBisection(safeEval: SafeEvalFn, initialBounds: Bounds): Decimal {
let { lo, hi, flo, fhi } = initialBounds;
for (let i = 0; i < 100; i++) { for (let i = 0; i < 100; i++) {
const mid = lo.plus(hi).div(2); const mid = lo.plus(hi).div(2);
if (hi.minus(lo).abs().lt(new Decimal("1e-10"))) return qty(mid); if (hi.minus(lo).abs().lt(new Decimal("1e-10"))) return mid;
const fm = safeEval(mid); const fm = safeEval(mid);
if (fm === null) { if (fm === null) {
lo = mid.plus("1e-9"); lo = mid.plus("1e-9");
@ -559,7 +556,34 @@ function evalGoalSeek(lhsNode: Node, rhsNode: Node, ctx: EvalCtx): Value {
flo = fm; flo = fm;
} }
} }
return qty(lo.plus(hi).div(2)); return lo.plus(hi).div(2);
}
function evalGoalSeek(lhsNode: Node, rhsNode: Node, ctx: EvalCtx): Value {
const evalF = (x: Decimal): Decimal => {
const vars = new Map(ctx.vars);
vars.set("__x__", qty(x));
const innerCtx: EvalCtx = { ...ctx, vars };
const lv = evaluate(lhsNode, innerCtx);
const rv = evaluate(rhsNode, innerCtx);
const toD = (v: Value) => (v.kind === "quantity" ? toBase(v) : DEC_ZERO);
return toD(lv).minus(toD(rv));
};
const safeEval: SafeEvalFn = (x: Decimal) => {
try {
return evalF(x);
} catch {
return null;
}
};
const linearRoot = solveLinear(safeEval);
if (linearRoot !== null) return qty(linearRoot);
const bounds = findBisectionBounds(safeEval);
const bisectionRoot = solveBisection(safeEval, bounds);
return qty(bisectionRoot);
} }
/** Lines whose unit shares the first line's dimension (mixed-dimension blocks skip the rest). */ /** Lines whose unit shares the first line's dimension (mixed-dimension blocks skip the rest). */