From 4e9a0f6cb56f388e4fb89ff4edc2a028fb044845 Mon Sep 17 00:00:00 2001 From: thepaperpilot Date: Sat, 4 Feb 2023 18:51:11 -0600 Subject: [PATCH] Add some more tests for nested formulas --- src/game/formulas.ts | 2 ++ tests/game/formulas.test.ts | 15 +++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/src/game/formulas.ts b/src/game/formulas.ts index 7e893be..2ccfbde 100644 --- a/src/game/formulas.ts +++ b/src/game/formulas.ts @@ -875,6 +875,8 @@ export default class Formula { } invertIntegral(value: DecimalSource): DecimalSource { + // This is nearly completely non-functional + // Proper nesting will require somehow using integration by substitution or integration by parts return this.internalInvertIntegral?.call(this, value, ...this.inputs) ?? value; } diff --git a/tests/game/formulas.test.ts b/tests/game/formulas.test.ts index f8b4490..d9be004 100644 --- a/tests/game/formulas.test.ts +++ b/tests/game/formulas.test.ts @@ -563,6 +563,11 @@ describe("Inverting", () => { }) ); }); + + test("Inverting nested formulas", () => { + const formula = Formula.add(variable, constant).times(constant); + expect(formula.invert(100)).compare_tolerance(0); + }); }); describe("Integrating", () => { @@ -643,6 +648,11 @@ describe("Integrating", () => { // TODO I think these tests will require writing at least one known example for every function describe.todo("Integrable formulas integrate correctly"); + + test("Integrating nested formulas", () => { + const formula = Formula.add(variable, constant).times(constant); + expect(formula.evaluateIntegral()).compare_tolerance(1500); + }); }); describe("Inverting integrals", () => { @@ -721,6 +731,11 @@ describe("Inverting integrals", () => { // TODO I think these tests will require writing at least one known example for every function describe.todo("Invertible Integral formulas invert correctly"); + + test("Inverting integral of nested formulas", () => { + const formula = Formula.add(variable, constant).times(constant); + expect(formula.invertIntegral(1500)).compare_tolerance(10); + }); }); describe("Step-wise", () => {