mark/mers
1
0
Fork 0
mirror of https://github.com/Dummi26/mers.git synced 2025-03-10 14:13:52 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix max function

Browse Source
This commit is contained in:
Mark 2024-10-23 12:06:58 +02:00
parent 01541d5dad
commit bdf7fb9380
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mers_lib/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "mers_lib" name = "mers_lib"
version = "0.9.13" version = "0.9.14"
edition = "2021" edition = "2021"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
description = "library to use the mers language in other projects" description = "library to use the mers language in other projects"

12
mers_lib/src/program/configs/with_math.rs
View File

@ -582,19 +582,19 @@ impl Config {
Ok(o) Ok(o)
}, },
|a, i| { |a, i| {
let mut min_int = None; let mut max_int = None;
let mut min_float = None; let mut max_float = None;
for a in a.get().iterable(&i.global).expect("called `min` on non-itereable") { for a in a.get().iterable(&i.global).expect("called `min` on non-itereable") {
let a = a?; let a = a?;
let a = a.get(); let a = a.get();
let a = a.as_any().downcast_ref::<data::int::Int>().map(|v| Ok(v.0)).or_else(|| a.as_any().downcast_ref::<data::float::Float>().map(|v| Err(v.0))).expect("found non-Int/Float element in argument to `min`"); let a = a.as_any().downcast_ref::<data::int::Int>().map(|v| Ok(v.0)).or_else(|| a.as_any().downcast_ref::<data::float::Float>().map(|v| Err(v.0))).expect("found non-Int/Float element in argument to `min`");
match a { match a {
Ok(a) => if min_int.is_none() || a < min_int.unwrap() { min_int = Some(a); }, Ok(a) => if max_int.is_none() || a > max_int.unwrap() { max_int = Some(a); },
Err(a) => if min_float.is_none() || a < min_float.unwrap() { min_float = Some(a); }, Err(a) => if max_float.is_none() || a > max_float.unwrap() { max_float = Some(a); },
} }
} }
Ok(match (min_float, min_int) { Ok(match (max_float, max_int) {
(Some(a), Some(b)) => if a < b as f64 { Data::new(data::float::Float(a)) } else { Data::new(data::int::Int(b))}, (Some(a), Some(b)) => if a > b as f64 { Data::new(data::float::Float(a)) } else { Data::new(data::int::Int(b))},
(Some(a), None) => Data::new(data::float::Float(a)), (Some(a), None) => Data::new(data::float::Float(a)),
(None, Some(b)) => Data::new(data::int::Int(b)), (None, Some(b)) => Data::new(data::int::Int(b)),
(None, None) => Data::empty_tuple(), (None, None) => Data::empty_tuple(),