valerie/qm
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity

added greatest common divisor and least common multiple helpers

Browse source
This commit is contained in:
Valerie Wolfe 2024-10-09 14:35:23 -04:00
parent e6c3df373f
commit ed9be1c739
3 changed files with 38 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/context/helper.rs
View file

@ -38,6 +38,32 @@ pub fn fix(arg: &Value) -> EvalResult {
} else { Err(EvalexprError::wrong_function_argument_amount(1, 2)) } } else { Err(EvalexprError::wrong_function_argument_amount(1, 2)) }
} }
pub fn greatest_common_divisor(arg: &Value) -> EvalResult {
if let Value::Tuple(args) = arg {
let len = args.len();
if len != 2 { return Err(EvalexprError::wrong_function_argument_amount(len, 2)); }
let a = args[0].clone();
let b = args[1].clone();
if let (Value::Int(a), Value::Int(b)) = (a, b) { Ok( Value::Int( util::gcd(i64::max(a, b), i64::min(a, b)) ) ) }
else { Err(EvalexprError::expected_int( if !args[0].is_int() { args[0].clone() } else { args[1].clone() } )) }
} else { Err(EvalexprError::expected_tuple(arg.clone())) }
}
pub fn least_common_multiple(arg: &Value) -> EvalResult {
if let Value::Tuple(args) = arg {
let len = args.len();
if len != 2 { return Err(EvalexprError::wrong_function_argument_amount(len, 2)); }
let a = args[0].clone();
let b = args[1].clone();
if let (Value::Int(a), Value::Int(b)) = (a, b) { Ok( Value::Int( util::lcm(i64::max(a, b), i64::min(a, b)) ) ) }
else { Err(EvalexprError::expected_int( if !args[0].is_int() { args[0].clone() } else { args[1].clone() } )) }
} else { Err(EvalexprError::expected_tuple(arg.clone())) }
}
pub fn logarithm(arg: &Value) -> EvalResult { pub fn logarithm(arg: &Value) -> EvalResult {
let value: f64; let value: f64;
let base: Option<f64>; let base: Option<f64>;

2
src/context/mod.rs
View file

@ -28,6 +28,8 @@ pub fn build(args: &mut Arguments) -> HashMapContext {
// math functions // math functions
"cos" => Function::new(|arg| helper::cosine(arg)), "cos" => Function::new(|arg| helper::cosine(arg)),
"fix" => Function::new(|arg| helper::fix(arg)), "fix" => Function::new(|arg| helper::fix(arg)),
"gcd" => Function::new(|arg| helper::greatest_common_divisor(arg)),
"lcm" => Function::new(|arg| helper::least_common_multiple(arg)),
"log" => Function::new(|arg| helper::logarithm(arg)), "log" => Function::new(|arg| helper::logarithm(arg)),
"sin" => Function::new(|arg| helper::sine(arg)), "sin" => Function::new(|arg| helper::sine(arg)),
"sqrt" => Function::new(|arg| helper::square_root(arg)), "sqrt" => Function::new(|arg| helper::square_root(arg)),

10
src/util.rs
View file

@ -1,6 +1,16 @@
use evalexpr::{ EvalexprError, Value }; use evalexpr::{ EvalexprError, Value };
pub fn gcd(big: i64, small: i64) -> i64 {
if small == 0 { big }
else { gcd(small, big % small) }
}
pub fn lcm(big: i64, small: i64) -> i64 {
let product = (big * small).abs();
product / gcd(big, small)
}
pub fn parse_radix(prefix: &str, base: u32, arg: &str) -> Result<Value, EvalexprError> { pub fn parse_radix(prefix: &str, base: u32, arg: &str) -> Result<Value, EvalexprError> {
let parse = arg.strip_prefix(prefix).unwrap_or(arg); let parse = arg.strip_prefix(prefix).unwrap_or(arg);