From 6a7475683507d5804c41b6103c4045a3b0096bee Mon Sep 17 00:00:00 2001 From: Valerie Date: Thu, 29 Aug 2024 13:38:27 -0400 Subject: [PATCH] implemented trig functions and refactored math helpers --- Cargo.toml | 2 +- src/context/helper.rs | 132 +++++++++++++++++++++++++----------------- src/context/mod.rs | 64 ++++++++++++++++++++ src/main.rs | 2 +- src/util.rs | 59 +------------------ 5 files changed, 145 insertions(+), 114 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 1113088..5c36965 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "quickmath" -version = "0.3.0" +version = "0.3.1" edition = "2021" authors = [ "Valerie Wolfe " ] description = "A quick command-line math evaluator." diff --git a/src/context/helper.rs b/src/context/helper.rs index 221147a..6f4ad2b 100644 --- a/src/context/helper.rs +++ b/src/context/helper.rs @@ -10,71 +10,95 @@ pub type EvalResult = Result; // Mathematics +pub fn cosine(arg: &Value) -> EvalResult { + Ok( + if let Value::Float(float) = arg { float.clone() } + else if let Value::Int(int) = arg { int.clone() as f64 } + else { return Err(EvalexprError::expected_number(arg.clone())) } + .cos().into() + ) +} + pub fn fix(arg: &Value) -> EvalResult { - let args = arg.as_tuple()?; + if let Value::Tuple(args) = arg { + let len = args.len(); + if len == 2 { + let value = + if let Value::Float(float) = args[0] { float.clone() } + else { return Err(EvalexprError::expected_float(args[0].clone())); }; - let count = args.len(); - if count != 2 { - return Err(EvalexprError::WrongFunctionArgumentAmount { expected: 2..=2, actual: count }); - } + let operand = 10u64.pow( + if let Value::Int(int) = args[1] { int.clone() } + else { return Err(EvalexprError::expected_int(args[1].clone())); } + as u32 + ) as f64; - let float = args[0].as_float()?; - let figures = args[1].as_int()?; - - let operand: f64 = i64::pow(10, figures as u32) as f64; - let output = f64::round(float * operand) / operand; - return Ok(output.into()); + Ok( ((value * operand).round() / operand).into() ) + } else { Err(EvalexprError::wrong_function_argument_amount(len, 2)) } + } else { Err(EvalexprError::wrong_function_argument_amount(1, 2)) } } pub fn logarithm(arg: &Value) -> EvalResult { - let arguments: Vec; - let count: usize; - if arg.is_tuple() { - arguments = arg.as_tuple()?; - count = arguments.len(); - } else if arg.is_float() { - arguments = vec!(arg.as_float()?.into()); - count = 1; - } else if arg.is_int() { - arguments = vec!((arg.as_int()? as f64).into()); - count = 1; - } else { - return Err(EvalexprError::CustomMessage("Expected numbers".to_string())); + let value: f64; + let base: Option; + match arg { + Value::Tuple(tuple) + => { + let len = tuple.len(); + if len != 2 { return Err(EvalexprError::WrongOperatorArgumentAmount { expected: 2, actual: len }) } + + let i_value = tuple.get(0).unwrap(); + if let Value::Float(float) = i_value { value = float.clone(); } + else if let Value::Int(int) = i_value { value = int.clone() as f64; } + else { return Err(EvalexprError::expected_number(i_value.clone())); } + + let i_base = tuple.get(1).unwrap(); + if let Value::Float(float) = i_value { base = Some(float.clone()); } + else if let Value::Int(int) = i_value { base = Some(int.clone() as f64); } + else { return Err(EvalexprError::expected_number(i_base.clone())); } + }, + Value::Float(float) + => { + value = float.clone(); + base = None; + }, + Value::Int(int) + => { + value = int.clone() as f64; + base = None; + } + _ => return Err(EvalexprError::CustomMessage("Expected numbers.".to_owned())) } - let output: Value; - match count { - 1 => { - let argument = &arguments[0]; - if !argument.is_number() { - return Err(EvalexprError::CustomMessage("Expected number".to_string())); - } - let number = if argument.is_float() { argument.as_float()? } else { argument.as_int()? as f64 }; - output = number.ln().into(); - }, - 2 => { - let arg_value = &arguments[0]; - let arg_base = &arguments[1]; - if !(arg_value.is_number() && arg_base.is_number()) { - return Err(EvalexprError::CustomMessage("Expected two numbers".to_string())); - } - let value: f64 = if arg_value.is_float() { arg_value.as_float()? } else { arg_value.as_int()? as f64 }; - let base: f64 = if arg_base.is_float() { arg_base.as_float()? } else { arg_base.as_int()? as f64 }; - output = value.log(base).into(); - }, - _ => { - return Err(EvalexprError::WrongFunctionArgumentAmount { expected: 2..=2, actual: count }); - } - } - return Ok(output); + if let Some(base) = base { Ok(value.log(base).into()) } + else { Ok(value.ln().into()) } +} + +pub fn sine(arg: &Value) -> EvalResult { + Ok( + if let Value::Float(float) = arg { float.clone() } + else if let Value::Int(int) = arg { int.clone() as f64 } + else { return Err(EvalexprError::expected_number(arg.clone())) } + .sin().into() + ) } pub fn square_root(arg: &Value) -> EvalResult { - if !arg.is_number() { - return Err(EvalexprError::CustomMessage("Expected a number.".to_string())); - } - let value: f64 = if arg.is_float() { arg.as_float()? } else { arg.as_int()? as f64 }; - return Ok(value.sqrt().into()); + Ok( + if let Value::Float(float) = arg { float.clone() } + else if let Value::Int(int) = arg { int.clone() as f64 } + else { return Err(EvalexprError::expected_number(arg.clone())) } + .sqrt().into() + ) +} + +pub fn tangent(arg: &Value) -> EvalResult { + Ok( + if let Value::Float(float) = arg { float.clone() } + else if let Value::Int(int) = arg { int.clone() as f64 } + else { return Err(EvalexprError::expected_number(arg.clone())) } + .tan().into() + ) } diff --git a/src/context/mod.rs b/src/context/mod.rs index ee794e1..3023be6 100644 --- a/src/context/mod.rs +++ b/src/context/mod.rs @@ -2,3 +2,67 @@ pub mod global; pub mod helper; + +use pico_args::Arguments; +use evalexpr::{ + context_map, + + ContextWithMutableVariables, + HashMapContext, + Value +}; + +use crate::flag; + +pub fn build(args: &mut Arguments) -> HashMapContext { + let mut output = + if !args.contains(flag::EMPTY_CONTEXT) { + context_map! { + // globals + "c" => global::LIGHT_SPEED, + "e" => global::EULER, + "phi" => global::GOLDEN_RATIO, + "pi" => global::PI, + "√2" => global::ROOT_TWO, + + // math functions + "cos" => Function::new(|arg| helper::cosine(arg)), + "fix" => Function::new(|arg| helper::fix(arg)), + "log" => Function::new(|arg| helper::logarithm(arg)), + "sin" => Function::new(|arg| helper::sine(arg)), + "sqrt" => Function::new(|arg| helper::square_root(arg)), + "tan" => Function::new(|arg| helper::tangent(arg)), + + // data science functions + "avg" => Function::new(|arg| helper::average(arg)), + + // radix functions + "bin" => Function::new(|arg| helper::binary(arg)), + "hex" => Function::new(|arg| helper::hexadecimal(arg)), + "oct" => Function::new(|arg| helper::octal(arg)), + + // character aliases + "ϕ" => global::GOLDEN_RATIO, + "π" => global::PI, + "√" => Function::new(|arg| helper::square_root(arg)) + }.unwrap() + } else { HashMapContext::new() }; + + while let Ok(value) = args.value_from_str::<&str, String>(flag::SET) { + let split: Vec<&str> = value.split('=').collect(); + if split.len() == 2 { + let key = split[0].to_owned(); + + let value_str = split[1]; + let value = + if let Ok(integer) = value_str.parse::() { Value::Int(integer) } + else if let Ok(float) = value_str.parse::() { Value::Float(float) } + else { Value::from(value_str) }; + + output.set_value(key, value).ok(); } + else { std::process::exit(1); } + } + + output +} + diff --git a/src/main.rs b/src/main.rs index 4e94690..241157f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -42,7 +42,7 @@ fn main() { return; } - let mut context = util::build_context(&mut args); + let mut context = context::build(&mut args); let quiet = args.contains(flag::QUIET) || !stdout().is_terminal(); // collect args and evaluate if present diff --git a/src/util.rs b/src/util.rs index 0eda23c..be4b2ec 100644 --- a/src/util.rs +++ b/src/util.rs @@ -1,13 +1,5 @@ -use evalexpr::{ - context_map, ContextWithMutableVariables, EvalexprError, HashMapContext, Value -}; -use pico_args::Arguments; - -use crate::{ - context::{ global, helper }, - flag -}; +use evalexpr::{ EvalexprError, Value }; pub(crate) fn parse_radix(prefix: &str, base: u32, arg: &Value) -> Result { let i_parse = arg.as_string()?; @@ -22,52 +14,3 @@ pub(crate) fn parse_radix(prefix: &str, base: u32, arg: &Value) -> Result HashMapContext { - let mut output = - if !args.contains(flag::EMPTY_CONTEXT) { - context_map! { - // globals - "c" => global::LIGHT_SPEED, - "e" => global::EULER, - "phi" => global::GOLDEN_RATIO, - "pi" => global::PI, - "√2" => global::ROOT_TWO, - - // math functions - "fix" => Function::new(|arg| helper::fix(arg)), - "log" => Function::new(|arg| helper::logarithm(arg)), - "sqrt" => Function::new(|arg| helper::square_root(arg)), - - // data science functions - "avg" => Function::new(|arg| helper::average(arg)), - - // radix functions - "bin" => Function::new(|arg| helper::binary(arg)), - "hex" => Function::new(|arg| helper::hexadecimal(arg)), - "oct" => Function::new(|arg| helper::octal(arg)), - - // character aliases - "ϕ" => global::GOLDEN_RATIO, - "π" => global::PI, - "√" => Function::new(|arg| helper::square_root(arg)) - }.unwrap() - } else { HashMapContext::new() }; - - while let Ok(value) = args.value_from_str::<&str, String>(flag::SET) { - let split: Vec<&str> = value.split('=').collect(); - if split.len() == 2 { - let key = split[0].to_owned(); - - let value_str = split[1]; - let value = - if let Ok(integer) = value_str.parse::() { Value::Int(integer) } - else if let Ok(float) = value_str.parse::() { Value::Float(float) } - else { Value::from(value_str) }; - - output.set_value(key, value).ok(); } - else { std::process::exit(1); } - } - - output -} -