extern/kalker
1
0
Fork 0
mirror of https://github.com/PaddiM8/kalker.git synced 2024-12-04 13:43:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #155 from BenderBlog/master

Browse Source 
Use Boole's rule to calculate integrate
This commit is contained in:
PaddiM8 2024-07-16 11:18:25 +02:00 committed by GitHub
commit 23f6da4322
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
kalk/src/numerical.rs
View File

@ -79,11 +79,11 @@ pub fn integrate(
expr: &Expr,
integration_variable: &str,
) -> Result<KalkValue, KalkError> {
Ok(simpsons_rule(context, a, b, expr, integration_variable)?.round_if_needed())
Ok(boole_rule(context, a, b, expr, integration_variable)?.round_if_needed())
}
/// Composite Simpson's 3/8 rule
fn simpsons_rule(
/// Composite Boole's rule
fn boole_rule(
context: &mut interpreter::Context,
a_expr: &Expr,
b_expr: &Expr,
@ -96,8 +96,8 @@ fn simpsons_rule(
.symbol_table
.get_and_remove_var(integration_variable);
const N: i32 = 900;
let a = interpreter::eval_expr(context, a_expr, None)?;
const N: i32 = 1200;
let a: KalkValue = interpreter::eval_expr(context, a_expr, None)?;
let b = interpreter::eval_expr(context, b_expr, None)?;
let h = (b.sub_without_unit(&a))?.div_without_unit(&KalkValue::from(N))?;
for i in 0..=N {
@ -110,9 +110,10 @@ fn simpsons_rule(
));
let factor = KalkValue::from(match i {
0 | N => 1,
_ if i % 3 == 0 => 2,
_ => 3,
0 | N => 7,
_ if i % 4 == 0 => 14,
_ if (i - 2) % 4 == 0 => 12,
_ => 32,
} as f64);
// factor * f(x_n)
@ -135,8 +136,8 @@ fn simpsons_rule(
let (h_real, h_imaginary, h_unit) = as_number_or_zero!(h);
result.mul_without_unit(&KalkValue::Number(
3f64 / 8f64 * h_real,
3f64 / 8f64 * h_imaginary,
4f64 / 90f64 * h_real,
4f64 / 90f64 * h_imaginary,
h_unit,
))
}