-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add basic evaluation for BmaUpdateFn, refactor parts of code.
- Loading branch information
Showing
10 changed files
with
238 additions
and
96 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -33,3 +33,4 @@ serde_json = "1.0" | |
| serde_with = "3.9.0" | ||
| serde-xml-rs = "0.6.0" | ||
| num-rational = "0.4.2" | ||
| num-traits = "0.2.19" | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,152 @@ | ||
| use crate::update_fn::bma_fn_tree::BmaFnUpdate; | ||
| use crate::update_fn::bma_fn_tree::{BmaFnUpdate, Expression}; | ||
| use crate::update_fn::enums::{AggregateFn, ArithOp, Literal, UnaryFn}; | ||
| use biodivine_lib_param_bn::FnUpdate; | ||
| use num_rational::Rational32; | ||
| use num_traits::sign::Signed; | ||
| use std::collections::HashMap; | ||
|
|
||
| impl BmaFnUpdate { | ||
| pub fn to_update_fn(&self) -> FnUpdate { | ||
| // TODO: implementation via explicit construction of the function table | ||
| todo!() | ||
| } | ||
|
|
||
| pub fn evaluate_in_valuation( | ||
| &self, | ||
| valuation: &HashMap<String, Rational32>, | ||
| ) -> Result<Rational32, String> { | ||
| match &self.expression_tree { | ||
| Expression::Terminal(Literal::Str(name)) => { | ||
| if let Some(value) = valuation.get(name) { | ||
| Ok(*value) | ||
| } else { | ||
| Err(format!("Variable `{name}` not found in the valuation.")) | ||
| } | ||
| } | ||
| Expression::Terminal(Literal::Int(value)) => Ok(Rational32::new(*value, 1)), | ||
| Expression::Arithmetic(operator, left, right) => { | ||
| let left_value = left.evaluate_in_valuation(valuation)?; | ||
| let right_value = right.evaluate_in_valuation(valuation)?; | ||
| let res = match operator { | ||
| ArithOp::Plus => left_value + right_value, | ||
| ArithOp::Minus => left_value - right_value, | ||
| ArithOp::Mult => left_value * right_value, | ||
| ArithOp::Div => left_value / right_value, | ||
| }; | ||
| Ok(res) | ||
| } | ||
| Expression::Unary(function, child_node) => { | ||
| let child_value = child_node.evaluate_in_valuation(valuation)?; | ||
| let res = match function { | ||
| UnaryFn::Abs => Rational32::abs(&child_value), | ||
| UnaryFn::Ceil => Rational32::ceil(&child_value), | ||
| UnaryFn::Floor => Rational32::floor(&child_value), | ||
| }; | ||
| Ok(res) | ||
| } | ||
| Expression::Aggregation(function, arguments) => { | ||
| let args_values: Vec<Rational32> = arguments | ||
| .iter() | ||
| .map(|arg| arg.evaluate_in_valuation(valuation)) | ||
| .collect::<Result<Vec<Rational32>, String>>()?; | ||
| let res = match function { | ||
| AggregateFn::Avg => { | ||
| let count = args_values.len() as i32; | ||
| let sum: Rational32 = args_values.iter().cloned().sum(); | ||
| sum / Rational32::from_integer(count) | ||
| } | ||
| AggregateFn::Max => args_values | ||
| .iter() | ||
| .cloned() | ||
| .max() | ||
| .expect("List of numbers is empty"), | ||
| AggregateFn::Min => args_values | ||
| .iter() | ||
| .cloned() | ||
| .min() | ||
| .expect("List of numbers is empty"), | ||
| }; | ||
| Ok(res) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod tests { | ||
| use crate::update_fn::parser::parse_bma_formula; | ||
| use num_rational::Rational32; | ||
| use std::collections::HashMap; | ||
|
|
||
| #[test] | ||
| fn test_evaluate_terminal_str() { | ||
| let expression = parse_bma_formula("x").unwrap(); | ||
| let valuation = HashMap::from([("x".to_string(), Rational32::new(5, 1))]); | ||
| let result = expression.evaluate_in_valuation(&valuation); | ||
| assert!(result.is_ok()); | ||
| assert_eq!(result.unwrap(), Rational32::new(5, 1)); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_evaluate_terminal_int() { | ||
| let expression = parse_bma_formula("7").unwrap(); | ||
| let valuation = HashMap::new(); | ||
| let result = expression.evaluate_in_valuation(&valuation); | ||
| assert!(result.is_ok()); | ||
| assert_eq!(result.unwrap(), Rational32::new(7, 1)); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_evaluate_arithmetic_plus() { | ||
| let expression = parse_bma_formula("2 + 3").unwrap(); | ||
| let valuation = HashMap::new(); | ||
| let result = expression.evaluate_in_valuation(&valuation); | ||
| assert!(result.is_ok()); | ||
| assert_eq!(result.unwrap(), Rational32::new(5, 1)); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_evaluate_arithmetic_mult() { | ||
| let expression = parse_bma_formula("4 * x").unwrap(); | ||
| let valuation = HashMap::from([("x".to_string(), Rational32::new(2, 1))]); | ||
| let result = expression.evaluate_in_valuation(&valuation); | ||
| assert!(result.is_ok()); | ||
| assert_eq!(result.unwrap(), Rational32::new(8, 1)); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_evaluate_unary_abs() { | ||
| let expression = parse_bma_formula("abs(5 - 10)").unwrap(); | ||
| let valuation = HashMap::new(); | ||
| let result = expression.evaluate_in_valuation(&valuation); | ||
| assert!(result.is_ok()); | ||
| assert_eq!(result.unwrap(), Rational32::new(5, 1)); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_evaluate_aggregation_avg() { | ||
| let expression = parse_bma_formula("avg(1, 2, 3)").unwrap(); | ||
| let valuation = HashMap::new(); | ||
| let result = expression.evaluate_in_valuation(&valuation); | ||
| assert!(result.is_ok()); | ||
| assert_eq!(result.unwrap(), Rational32::new(2, 1)); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_evaluate_aggregation_max() { | ||
| let expression = parse_bma_formula("max(1, 4, 3)").unwrap(); | ||
| let valuation = HashMap::new(); | ||
| let result = expression.evaluate_in_valuation(&valuation); | ||
| assert!(result.is_ok()); | ||
| assert_eq!(result.unwrap(), Rational32::new(4, 1)); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_evaluate_aggregation_min() { | ||
| let expression = parse_bma_formula("min(1, 2 - 4, 3)").unwrap(); | ||
| let valuation = HashMap::new(); | ||
| let result = expression.evaluate_in_valuation(&valuation); | ||
| assert!(result.is_ok()); | ||
| assert_eq!(result.unwrap(), Rational32::new(-2, 1)); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.