magnus167/rustframe
1
0
Fork 0
mirror of https://github.com/Magnus167/rustframe.git synced 2025-08-20 04:19:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor element-wise comparison implementation for matrices

Browse Source
This commit is contained in:
Palash Tyagi 2025-04-24 23:39:34 +01:00
parent 601c1c58d0
commit 21fc4a7241
1 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/matrix/mat.rs
View File

@ -184,27 +184,37 @@ impl<'a, T> MatrixRow<'a, T> {
}
}
macro_rules! impl_cmp {
($name:ident, $op:tt) => {
pub fn $name(&self, rhs: &Matrix<T>) -> BoolMatrix {
assert_eq!(self.rows, rhs.rows, "…");
assert_eq!(self.cols, rhs.cols, "…");
let data = self.data.iter()
.zip(rhs.data.iter())
.map(|(a, b)| a $op b)
.collect();
BoolMatrix::from_vec(data, self.rows, self.cols)
/// Implements element‐wise eq, lt, le, gt and ge for `Matrix<T>`.
macro_rules! impl_elementwise_cmp {
(
$( $method:ident => $op:tt ),* $(,)?
) => {
impl<T: PartialOrd> Matrix<T> {
$(
#[doc = concat!("Element‐wise comparison `x ", stringify!($op), " y`.")]
pub fn $method(&self, rhs: &Matrix<T>) -> BoolMatrix {
assert_eq!(self.rows, rhs.rows, "row count mismatch");
assert_eq!(self.cols, rhs.cols, "col count mismatch");
let data = self
.data
.iter()
.zip(&rhs.data)
.map(|(a, b)| a $op b)
.collect();
BoolMatrix::from_vec(data, self.rows, self.cols)
}
)*
}
};
}
impl<T: PartialOrd> Matrix<T> {
impl_cmp!(lt_elementwise, <);
impl_cmp!(le_elementwise, <=);
impl_cmp!(gt_elementwise, >);
impl_cmp!(ge_elementwise, >=);
// Invoke it for all five operations:
impl_elementwise_cmp! {
eq_elementwise => ==,
lt_elementwise => <,
le_elementwise => <=,
gt_elementwise => >,
ge_elementwise => >=,
}
/// Generates element-wise arithmetic implementations for matrices.