Skip to content

Fix indefinite integral substitution bug (#272) #273

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mgreminger merged 2 commits into from
Sep 11, 2024
Merged

Fix indefinite integral substitution bug (#272) #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82eb422
tests: add test for #272
mgreminger Sep 11, 2024
f4f4d93
fix: implement fix for #272
mgreminger Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions public/dimensional_analysis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1141,9 +1141,9 @@ def custom_integral(local_expr: Expr, global_expr: Expr, dummy_integral_var: Sym
lower_limit: Expr | None = None, upper_limit: Expr | None = None,
lower_limit_dims: Expr | None = None, upper_limit_dims: Expr | None = None):
if lower_limit is not None and upper_limit is not None:
return Integral(local_expr, (dummy_integral_var, lower_limit, upper_limit)).subs({dummy_integral_var: integral_var})
return Integral(local_expr, (dummy_integral_var, lower_limit, upper_limit)).doit().subs({dummy_integral_var: integral_var})
else:
return Integral(local_expr, dummy_integral_var).subs({dummy_integral_var: integral_var})
return Integral(local_expr, dummy_integral_var).doit().subs({dummy_integral_var: integral_var})

def custom_integral_dims(local_expr: Expr, global_expr: Expr, dummy_integral_var: Symbol, integral_var: Expr,
lower_limit: Expr | None = None, upper_limit: Expr | None = None,
Expand Down
75 changes: 75 additions & 0 deletions tests/test_calc.spec.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,3 +338,78 @@ test('Test calculus units when operand contains placeholder function', async ()
expect(content).toBe('m^2');

});

test('Test indefinite integral substitution bug #272', async () => {
await page.setLatex(0, String.raw`\int\left(-L+S\right)\mathrm{d}\left(S\right)=`);

await page.locator('#add-math-cell').click();
await page.setLatex(1, String.raw`\int_0^{S}\left(-L+S\right)\mathrm{d}\left(S\right)=`);

await page.locator('#add-math-cell').click();
await page.setLatex(2, String.raw`S=L`);

await page.waitForSelector('.status-footer', {state: 'detached'});

let content = await page.textContent('#result-value-0');
expect(content).toBe(String.raw`- \frac{L^{2}}{2}`);

content = await page.textContent('#result-value-0');
expect(content).toBe(String.raw`- \frac{L^{2}}{2}`);
});

test('Test derivative substitution order', async () => {
await page.setLatex(0, String.raw`\frac{\mathrm{d}}{\mathrm{d}\left(S\right)}\left(-L^2+S^2\right)=`);

await page.locator('#add-math-cell').click();
await page.setLatex(1, String.raw`S=L`);

await page.waitForSelector('.status-footer', {state: 'detached'});

let content = await page.textContent('#result-value-0');
expect(content).toBe(String.raw`2 L`);
});

test('Test numerical integral and derivative using interpolation function', async () => {
await page.setLatex(0, String.raw`\int_{0\left\lbrack in\right\rbrack}^{2\left\lbrack in\right\rbrack}\left(\mathrm{Interp1}\left(S\right)\right)\mathrm{d}\left(S\right)=\left\lbrack in^2\right\rbrack`);

await page.locator('#add-math-cell').click();
await page.setLatex(1, String.raw`\frac{\mathrm{d}}{\mathrm{d}\left(S\right)}\left(\mathrm{Interp1}\left(S\right)\right)=`);

await page.locator('#add-math-cell').click();
await page.setLatex(2, String.raw`S=1.5\left\lbrack in\right\rbrack`);

await page.locator('#add-data-table-cell').click();

await page.locator('#parameter-units-3-0 >> math-field').type('[in]');
await page.locator('#parameter-units-3-1 >> math-field').type('[in]');

await page.locator('#data-table-input-3-0-0').click();

await page.keyboard.type('0');
await page.keyboard.press('Tab');
await page.keyboard.type('0');
await page.keyboard.press('Enter');

await page.keyboard.type('1');
await page.keyboard.press('Tab');
await page.keyboard.type('1');
await page.keyboard.press('Enter');

await page.keyboard.type('2');
await page.keyboard.press('Tab');
await page.keyboard.type('0');

await page.getByRole('button', { name: 'Add Interpolation' }).click();

await page.waitForSelector('.status-footer', {state: 'detached'});

let content = await page.textContent('#result-value-0');
expect(parseLatexFloat(content)).toBeCloseTo(1, 5);
content = await page.textContent('#result-units-0');
expect(content).toBe('in^2');

content = await page.textContent('#result-value-1');
expect(parseLatexFloat(content)).toBeCloseTo(-1, 9);
content = await page.textContent('#result-units-1');
expect(content).toBe('');
});