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

Allow a comma before 'dx' in integrals

Browse Source
This commit is contained in:
bakk 2021-05-23 01:56:25 +02:00
parent 0e425fbf90
commit ab6e758726
3 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kalk/src/calculus.rs
View File

@ -28,7 +28,7 @@ pub fn derive_func(
.round_if_needed())
}
pub fn integrate(
pub fn integrate_with_unknown_variable(
context: &mut interpreter::Context,
a: &Expr,
b: &Expr,
@ -56,7 +56,17 @@ pub fn integrate(
Box::new(Expr::Literal(1f64)),
));
Ok(simpsons_rule(context, a, b, expr, integration_variable.unwrap())?.round_if_needed())
Ok(integrate(context, a, b, expr, integration_variable.unwrap())?.round_if_needed())
}
pub fn integrate(
context: &mut interpreter::Context,
a: &Expr,
b: &Expr,
expr: &Expr,
integration_variable: &str,
) -> Result<KalkNum, CalcError> {
Ok(simpsons_rule(context, a, b, expr, integration_variable)?.round_if_needed())
}
/// Composite Simpson's 3/8 rule

31
kalk/src/interpreter.rs
View File

@ -365,16 +365,33 @@ pub(crate) fn eval_fn_call_expr(
return Ok(sum);
}
"integrate" | "integral" | "∫" => {
// Make sure exactly 3 arguments were supplied.
if expressions.len() != 3 {
return Err(CalcError::IncorrectAmountOfArguments(
// Make sure either 3 or 4 arguments were supplied.
if expressions.len() < 3 || expressions.len() > 4 {}
return match expressions.len() {
3 => calculus::integrate_with_unknown_variable(
context,
&expressions[0],
&expressions[1],
&expressions[2],
),
4 => calculus::integrate(
context,
&expressions[0],
&expressions[1],
&expressions[2],
if let Expr::Var(integration_variable) = &expressions[3] {
&integration_variable.full_name[1..]
} else {
return Err(CalcError::ExpectedDx);
},
),
_ => Err(CalcError::IncorrectAmountOfArguments(
3,
"integrate".into(),
expressions.len(),
));
}
return calculus::integrate(context, &expressions[0], &expressions[1], &expressions[2]);
)),
};
}
_ => (),
}

4
kalk/src/parser.rs
View File

@ -111,8 +111,8 @@ pub enum CalcError {
impl ToString for CalcError {
fn to_string(&self) -> String {
match self {
CalcError::ExpectedDx => format!("Expected eg. dx, to specify for which variable the operation is being done to. Example with integration: ∫(0, 1, x dx). You may need to put parenthesis around the expression before dx/dy/du/etc."),
match self
CalcError::ExpectedDx => format!("Expected eg. dx, to specify for which variable the operation is being done to. Example with integration: ∫(0, 1, x dx) or ∫(0, 1, x, dx). You may need to put parenthesis around the expression before dx/dy/du/etc."),
CalcError::IncorrectAmountOfArguments(expected, func, got) => format!(
"Expected {} arguments for function {}, but got {}.",
expected, func, got