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

Enhance element-wise arithmetic operations for Matrix + Scalar to support in-place modifications and improve performance

Browse Source
This commit is contained in:
Palash Tyagi 2025-05-03 00:38:07 +01:00
parent 7f587a7b7e
commit 36a0846efa
1 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/matrix/mat.rs
View File

@ -474,29 +474,50 @@ macro_rules! impl_elementwise_op_matrix_all {
}; };
} }
/// Generates element-wise arithmetic implementations for matrices with scalars. /// Generates element-wise arithmetic implementations for Matrix + Scalar
macro_rules! impl_elementwise_op_scalar { macro_rules! impl_elementwise_op_scalar_all {
($OpTrait:ident, $method:ident, $op:tt) => { ($OpTrait:ident, $method:ident, $op:tt) => {
impl<'a, T> std::ops::$OpTrait<T> for &'a Matrix<T> // &Matrix + Scalar
where impl<'a, T> $OpTrait<T> for &'a Matrix<T>
T: Clone + std::ops::$OpTrait<Output = T>, where T: Clone + $OpTrait<Output = T> {
{
type Output = Matrix<T>; type Output = Matrix<T>;
fn $method(self, rhs: T) -> Matrix<T> { fn $method(self, rhs: T) -> Matrix<T> {
// Apply the operation element-wise and collect into a new matrix
let data = self.data.iter().cloned().map(|a| a $op rhs.clone()).collect(); let data = self.data.iter().cloned().map(|a| a $op rhs.clone()).collect();
Matrix { rows: self.rows, cols: self.cols, data } Matrix { rows: self.rows, cols: self.cols, data }
} }
} }
// Matrix + Scalar (Consumes self)
impl<T> $OpTrait<T> for Matrix<T>
where T: Clone + $OpTrait<Output = T> {
type Output = Matrix<T>;
fn $method(mut self, rhs: T) -> Matrix<T> { // Make self mutable
// Modify self data in place
for a in self.data.iter_mut() {
*a = a.clone() $op rhs.clone(); // Requires T: Clone
}
// Return modified self
self
// Alternative: Collect into new Vec
// let data = self.data.into_iter().map(|a| a $op rhs.clone()).collect();
// Matrix { rows: self.rows, cols: self.cols, data }
}
}
// NOTE: Scalar + Matrix (e.g., 1.0 + matrix) is NOT implemented here.
// It would require `impl Add<Matrix<T>> for T`, which is discouraged
// for primitive types unless inside the crate defining T.
}; };
} }
// Instantiate element-wise addition, subtraction, multiplication, and division // Instantiate ALL combinations for arithmetic ops using the new macros
impl_elementwise_op_scalar!(Add, add, +); impl_elementwise_op_matrix_all!(Add, add, +);
impl_elementwise_op_scalar!(Sub, sub, -); impl_elementwise_op_matrix_all!(Sub, sub, -);
impl_elementwise_op_scalar!(Mul, mul, *); impl_elementwise_op_matrix_all!(Mul, mul, *); // Element-wise multiplication
impl_elementwise_op_scalar!(Div, div, /); impl_elementwise_op_matrix_all!(Div, div, /); // Element-wise division
impl_elementwise_op_scalar_all!(Add, add, +);
impl_elementwise_op_scalar_all!(Sub, sub, -);
impl_elementwise_op_scalar_all!(Mul, mul, *);
impl_elementwise_op_scalar_all!(Div, div, /);
/// Generates element-wise bitwise operations for boolean matrices. /// Generates element-wise bitwise operations for boolean matrices.
macro_rules! impl_bitwise_op { macro_rules! impl_bitwise_op {