profectus/Profectus
Template
1
0
Fork 4
Code Issues 38 Pull requests 6 Projects 2 Releases Packages Wiki Activity Actions

More test fixes

Browse source
This commit is contained in:
thepaperpilot 2023-02-14 13:00:31 -06:00
parent 553c6a4554
commit 8987c0c69f
2 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/game/formulas.ts
View file

@ -1006,7 +1006,7 @@ export default class Formula<T extends [FormulaSource] | FormulaSource[]> {
return new Formula({ return new Formula({
inputs: [value], inputs: [value],
evaluate: evalStep, evaluate: evalStep,
invert: formula.isInvertible() && !formula.hasVariable() ? invertStep : undefined invert: formula.isInvertible() && formula.hasVariable() ? invertStep : undefined
}); });
} }
@ -1047,7 +1047,7 @@ export default class Formula<T extends [FormulaSource] | FormulaSource[]> {
return new Formula({ return new Formula({
inputs: [value], inputs: [value],
evaluate: evalStep, evaluate: evalStep,
invert: formula.isInvertible() && !formula.hasVariable() ? invertStep : undefined invert: formula.isInvertible() && formula.hasVariable() ? invertStep : undefined
}); });
} }
/** @see {@link if} */ /** @see {@link if} */

41
tests/game/formulas.test.ts
View file

@ -647,8 +647,11 @@ describe("Inverting integrals", () => {
checkFormula(Formula[name](variable, constant))); checkFormula(Formula[name](variable, constant)));
test(`${name}(const, var) is marked as having an invertible integral`, () => test(`${name}(const, var) is marked as having an invertible integral`, () =>
checkFormula(Formula[name](constant, variable))); checkFormula(Formula[name](constant, variable)));
test(`${name}(var, var) is marked as having an invertible integral`, () => test(`${name}(var, var) is marked as not having an invertible integral`, () => {
checkFormula(Formula[name](variable, variable))); const formula = Formula[name](variable, variable);
expect(formula.isIntegralInvertible()).toBe(false);
expect(() => formula.invertIntegral(10)).to.throw();
});
}); });
}); });
}); });
@ -659,35 +662,35 @@ describe("Inverting integrals", () => {
} }
nonInvertibleIntegralZeroPramFunctionNames.forEach(name => { nonInvertibleIntegralZeroPramFunctionNames.forEach(name => {
describe(name, () => { describe(name, () => {
test(`${name}(var) is marked as not integrable`, () => test(`${name}(var) is marked as not having an invertible integral`, () =>
checkFormula(Formula[name](variable))); checkFormula(Formula[name](variable)));
}); });
}); });
nonInvertibleIntegralOneParamFunctionNames.forEach(name => { nonInvertibleIntegralOneParamFunctionNames.forEach(name => {
describe(name, () => { describe(name, () => {
test(`${name}(var, const) is marked as not integrable`, () => test(`${name}(var, const) is marked as not having an invertible integral`, () =>
checkFormula(Formula[name](variable, constant))); checkFormula(Formula[name](variable, constant)));
test(`${name}(const, var) is marked as not integrable`, () => test(`${name}(const, var) is marked as not having an invertible integral`, () =>
checkFormula(Formula[name](constant, variable))); checkFormula(Formula[name](constant, variable)));
test(`${name}(var, var) is marked as not integrable`, () => test(`${name}(var, var) is marked as not having an invertible integral`, () =>
checkFormula(Formula[name](variable, variable))); checkFormula(Formula[name](variable, variable)));
}); });
}); });
nonInvertibleIntegralTwoParamFunctionNames.forEach(name => { nonInvertibleIntegralTwoParamFunctionNames.forEach(name => {
describe(name, () => { describe(name, () => {
test(`${name}(var, const, const) is marked as not integrable`, () => test(`${name}(var, const, const) is marked as not having an invertible integral`, () =>
checkFormula(Formula[name](variable, constant, constant))); checkFormula(Formula[name](variable, constant, constant)));
test(`${name}(const, var, const) is marked as not integrable`, () => test(`${name}(const, var, const) is marked as not having an invertible integral`, () =>
checkFormula(Formula[name](constant, variable, constant))); checkFormula(Formula[name](constant, variable, constant)));
test(`${name}(const, const, var) is marked as not integrable`, () => test(`${name}(const, const, var) is marked as not having an invertible integral`, () =>
checkFormula(Formula[name](constant, constant, variable))); checkFormula(Formula[name](constant, constant, variable)));
test(`${name}(var, var, const) is marked as not integrable`, () => test(`${name}(var, var, const) is marked as not having an invertible integral`, () =>
checkFormula(Formula[name](variable, variable, constant))); checkFormula(Formula[name](variable, variable, constant)));
test(`${name}(var, const, var) is marked as not integrable`, () => test(`${name}(var, const, var) is marked as not having an invertible integral`, () =>
checkFormula(Formula[name](variable, constant, variable))); checkFormula(Formula[name](variable, constant, variable)));
test(`${name}(const, var, var) is marked as not integrable`, () => test(`${name}(const, var, var) is marked as not having an invertible integral`, () =>
checkFormula(Formula[name](constant, variable, variable))); checkFormula(Formula[name](constant, variable, variable)));
test(`${name}(var, var, var) is marked as not integrable`, () => test(`${name}(var, var, var) is marked as not having an invertible integral`, () =>
checkFormula(Formula[name](variable, variable, variable))); checkFormula(Formula[name](variable, variable, variable)));
}); });
}); });
@ -890,7 +893,7 @@ describe("Custom Formulas", () => {
inputs: [], inputs: [],
evaluate: () => 6, evaluate: () => 6,
invert: value => value, invert: value => value,
variable: ref(10) hasVariable: true
}).invert(10) }).invert(10)
).compare_tolerance(10)); ).compare_tolerance(10));
test("One input inverts correctly", () => test("One input inverts correctly", () =>
@ -899,7 +902,7 @@ describe("Custom Formulas", () => {
inputs: [1], inputs: [1],
evaluate: () => 10, evaluate: () => 10,
invert: (value, v1) => v1, invert: (value, v1) => v1,
variable: ref(10) hasVariable: true
}).invert(10) }).invert(10)
).compare_tolerance(1)); ).compare_tolerance(1));
test("Two inputs inverts correctly", () => test("Two inputs inverts correctly", () =>
@ -908,7 +911,7 @@ describe("Custom Formulas", () => {
inputs: [1, 2], inputs: [1, 2],
evaluate: () => 10, evaluate: () => 10,
invert: (value, v1, v2) => v2, invert: (value, v1, v2) => v2,
variable: ref(10) hasVariable: true
}).invert(10) }).invert(10)
).compare_tolerance(2)); ).compare_tolerance(2));
}); });
@ -947,7 +950,7 @@ describe("Custom Formulas", () => {
inputs: [], inputs: [],
evaluate: () => 10, evaluate: () => 10,
invertIntegral: () => 1, invertIntegral: () => 1,
variable: ref(10) hasVariable: true
}).invertIntegral(8) }).invertIntegral(8)
).compare_tolerance(1)); ).compare_tolerance(1));
test("One input inverts integral correctly", () => test("One input inverts integral correctly", () =>
@ -956,7 +959,7 @@ describe("Custom Formulas", () => {
inputs: [1], inputs: [1],
evaluate: () => 10, evaluate: () => 10,
invertIntegral: val => 1, invertIntegral: val => 1,
variable: ref(10) hasVariable: true
}).invertIntegral(8) }).invertIntegral(8)
).compare_tolerance(1)); ).compare_tolerance(1));
test("Two inputs inverts integral correctly", () => test("Two inputs inverts integral correctly", () =>
@ -965,7 +968,7 @@ describe("Custom Formulas", () => {
inputs: [1, 2], inputs: [1, 2],
evaluate: (v1, v2) => 10, evaluate: (v1, v2) => 10,
invertIntegral: (v1, v2) => 1, invertIntegral: (v1, v2) => 1,
variable: ref(10) hasVariable: true
}).invertIntegral(8) }).invertIntegral(8)
).compare_tolerance(1)); ).compare_tolerance(1));
}); });