2018-10-21 04:26:44 +08:00
|
|
|
// Non-conventional component-wise operators.
|
2016-12-05 05:44:42 +08:00
|
|
|
|
2018-02-02 19:26:35 +08:00
|
|
|
use num::{Signed, Zero};
|
2018-05-19 23:15:15 +08:00
|
|
|
use std::ops::{Add, Mul};
|
2016-12-05 05:44:42 +08:00
|
|
|
|
2018-02-02 19:26:35 +08:00
|
|
|
use alga::general::{ClosedDiv, ClosedMul};
|
2016-12-05 05:44:42 +08:00
|
|
|
|
2019-03-23 21:29:07 +08:00
|
|
|
use crate::base::allocator::{Allocator, SameShapeAllocator};
|
|
|
|
use crate::base::constraint::{SameNumberOfColumns, SameNumberOfRows, ShapeConstraint};
|
|
|
|
use crate::base::dimension::Dim;
|
|
|
|
use crate::base::storage::{Storage, StorageMut};
|
|
|
|
use crate::base::{DefaultAllocator, Matrix, MatrixMN, MatrixSum, Scalar};
|
2016-12-05 05:44:42 +08:00
|
|
|
|
2018-10-20 17:36:35 +08:00
|
|
|
/// The type of the result of a matrix component-wise operation.
|
2017-08-03 01:37:44 +08:00
|
|
|
pub type MatrixComponentOp<N, R1, C1, R2, C2> = MatrixSum<N, R1, C1, R2, C2>;
|
2016-12-05 05:44:42 +08:00
|
|
|
|
2019-12-17 07:09:14 +08:00
|
|
|
impl<N: Scalar, R: Dim, C: Dim, S: Storage<N, R, C>> Matrix<N, R, C, S> {
|
2018-10-20 17:36:35 +08:00
|
|
|
/// Computes the component-wise absolute value.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```
|
|
|
|
/// # use nalgebra::Matrix2;
|
|
|
|
/// let a = Matrix2::new(0.0, 1.0,
|
|
|
|
/// -2.0, -3.0);
|
|
|
|
/// assert_eq!(a.abs(), Matrix2::new(0.0, 1.0, 2.0, 3.0))
|
|
|
|
/// ```
|
2016-12-05 05:44:42 +08:00
|
|
|
#[inline]
|
2017-08-03 01:37:44 +08:00
|
|
|
pub fn abs(&self) -> MatrixMN<N, R, C>
|
2018-02-02 19:26:35 +08:00
|
|
|
where
|
|
|
|
N: Signed,
|
|
|
|
DefaultAllocator: Allocator<N, R, C>,
|
|
|
|
{
|
2016-12-05 05:44:42 +08:00
|
|
|
let mut res = self.clone_owned();
|
|
|
|
|
|
|
|
for e in res.iter_mut() {
|
|
|
|
*e = e.abs();
|
|
|
|
}
|
|
|
|
|
|
|
|
res
|
|
|
|
}
|
|
|
|
|
|
|
|
// FIXME: add other operators like component_ln, component_pow, etc. ?
|
|
|
|
}
|
|
|
|
|
|
|
|
macro_rules! component_binop_impl(
|
2018-02-02 19:26:40 +08:00
|
|
|
($($binop: ident, $binop_mut: ident, $binop_assign: ident, $cmpy: ident, $Trait: ident . $op: ident . $op_assign: ident, $desc:expr, $desc_cmpy:expr, $desc_mut:expr);* $(;)*) => {$(
|
2019-12-17 07:09:14 +08:00
|
|
|
impl<N: Scalar, R1: Dim, C1: Dim, SA: Storage<N, R1, C1>> Matrix<N, R1, C1, SA> {
|
2017-04-07 05:58:44 +08:00
|
|
|
#[doc = $desc]
|
2016-12-05 05:44:42 +08:00
|
|
|
#[inline]
|
2017-08-03 01:37:44 +08:00
|
|
|
pub fn $binop<R2, C2, SB>(&self, rhs: &Matrix<N, R2, C2, SB>) -> MatrixComponentOp<N, R1, C1, R2, C2>
|
2016-12-05 05:44:42 +08:00
|
|
|
where N: $Trait,
|
|
|
|
R2: Dim, C2: Dim,
|
|
|
|
SB: Storage<N, R2, C2>,
|
2017-08-03 01:37:44 +08:00
|
|
|
DefaultAllocator: SameShapeAllocator<N, R1, C1, R2, C2>,
|
|
|
|
ShapeConstraint: SameNumberOfRows<R1, R2> + SameNumberOfColumns<C1, C2> {
|
2018-02-02 19:26:35 +08:00
|
|
|
|
2017-08-03 01:37:44 +08:00
|
|
|
assert_eq!(self.shape(), rhs.shape(), "Componentwise mul/div: mismatched matrix dimensions.");
|
2016-12-05 05:44:42 +08:00
|
|
|
let mut res = self.clone_owned_sum();
|
2017-08-03 01:37:44 +08:00
|
|
|
|
|
|
|
for j in 0 .. res.ncols() {
|
|
|
|
for i in 0 .. res.nrows() {
|
|
|
|
unsafe {
|
2019-12-06 06:54:17 +08:00
|
|
|
res.get_unchecked_mut((i, j)).$op_assign(rhs.get_unchecked((i, j)).inlined_clone());
|
2017-08-03 01:37:44 +08:00
|
|
|
}
|
|
|
|
}
|
2016-12-05 05:44:42 +08:00
|
|
|
}
|
2017-08-03 01:37:44 +08:00
|
|
|
|
2016-12-05 05:44:42 +08:00
|
|
|
res
|
|
|
|
}
|
|
|
|
}
|
2017-08-03 01:37:44 +08:00
|
|
|
|
2019-12-17 07:09:14 +08:00
|
|
|
impl<N: Scalar, R1: Dim, C1: Dim, SA: StorageMut<N, R1, C1>> Matrix<N, R1, C1, SA> {
|
2018-02-02 19:26:27 +08:00
|
|
|
// componentwise binop plus Y.
|
2018-02-02 19:26:40 +08:00
|
|
|
#[doc = $desc_cmpy]
|
2018-02-02 19:26:27 +08:00
|
|
|
#[inline]
|
2018-02-02 19:26:40 +08:00
|
|
|
pub fn $cmpy<R2, C2, SB, R3, C3, SC>(&mut self, alpha: N, a: &Matrix<N, R2, C2, SB>, b: &Matrix<N, R3, C3, SC>, beta: N)
|
2018-02-02 19:26:27 +08:00
|
|
|
where N: $Trait + Zero + Mul<N, Output = N> + Add<N, Output = N>,
|
|
|
|
R2: Dim, C2: Dim,
|
|
|
|
R3: Dim, C3: Dim,
|
|
|
|
SB: Storage<N, R2, C2>,
|
|
|
|
SC: Storage<N, R3, C3>,
|
|
|
|
ShapeConstraint: SameNumberOfRows<R1, R2> + SameNumberOfColumns<C1, C2> +
|
|
|
|
SameNumberOfRows<R1, R3> + SameNumberOfColumns<C1, C3> {
|
|
|
|
assert_eq!(self.shape(), a.shape(), "Componentwise mul/div: mismatched matrix dimensions.");
|
|
|
|
assert_eq!(self.shape(), b.shape(), "Componentwise mul/div: mismatched matrix dimensions.");
|
|
|
|
|
|
|
|
if beta.is_zero() {
|
|
|
|
for j in 0 .. self.ncols() {
|
|
|
|
for i in 0 .. self.nrows() {
|
|
|
|
unsafe {
|
2019-12-06 06:54:17 +08:00
|
|
|
let res = alpha.inlined_clone() * a.get_unchecked((i, j)).inlined_clone().$op(b.get_unchecked((i, j)).inlined_clone());
|
2018-12-03 04:00:08 +08:00
|
|
|
*self.get_unchecked_mut((i, j)) = res;
|
2018-02-02 19:26:27 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
for j in 0 .. self.ncols() {
|
|
|
|
for i in 0 .. self.nrows() {
|
|
|
|
unsafe {
|
2019-12-06 06:54:17 +08:00
|
|
|
let res = alpha.inlined_clone() * a.get_unchecked((i, j)).inlined_clone().$op(b.get_unchecked((i, j)).inlined_clone());
|
|
|
|
*self.get_unchecked_mut((i, j)) = beta.inlined_clone() * self.get_unchecked((i, j)).inlined_clone() + res;
|
2018-02-02 19:26:27 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-04-07 05:58:44 +08:00
|
|
|
#[doc = $desc_mut]
|
2016-12-05 05:44:42 +08:00
|
|
|
#[inline]
|
2017-08-14 01:53:04 +08:00
|
|
|
pub fn $binop_assign<R2, C2, SB>(&mut self, rhs: &Matrix<N, R2, C2, SB>)
|
2016-12-05 05:44:42 +08:00
|
|
|
where N: $Trait,
|
|
|
|
R2: Dim,
|
|
|
|
C2: Dim,
|
|
|
|
SB: Storage<N, R2, C2>,
|
2017-08-03 01:37:44 +08:00
|
|
|
ShapeConstraint: SameNumberOfRows<R1, R2> + SameNumberOfColumns<C1, C2> {
|
|
|
|
|
|
|
|
assert_eq!(self.shape(), rhs.shape(), "Componentwise mul/div: mismatched matrix dimensions.");
|
|
|
|
|
|
|
|
for j in 0 .. self.ncols() {
|
|
|
|
for i in 0 .. self.nrows() {
|
|
|
|
unsafe {
|
2019-12-06 06:54:17 +08:00
|
|
|
self.get_unchecked_mut((i, j)).$op_assign(rhs.get_unchecked((i, j)).inlined_clone());
|
2017-08-03 01:37:44 +08:00
|
|
|
}
|
|
|
|
}
|
2016-12-05 05:44:42 +08:00
|
|
|
}
|
|
|
|
}
|
2017-08-14 01:53:04 +08:00
|
|
|
|
|
|
|
#[doc = $desc_mut]
|
|
|
|
#[inline]
|
2018-10-16 15:47:04 +08:00
|
|
|
#[deprecated(note = "This is renamed using the `_assign` suffix instead of the `_mut` suffix.")]
|
2017-08-14 01:53:04 +08:00
|
|
|
pub fn $binop_mut<R2, C2, SB>(&mut self, rhs: &Matrix<N, R2, C2, SB>)
|
|
|
|
where N: $Trait,
|
|
|
|
R2: Dim,
|
|
|
|
C2: Dim,
|
|
|
|
SB: Storage<N, R2, C2>,
|
|
|
|
ShapeConstraint: SameNumberOfRows<R1, R2> + SameNumberOfColumns<C1, C2> {
|
|
|
|
self.$binop_assign(rhs)
|
|
|
|
}
|
2016-12-05 05:44:42 +08:00
|
|
|
}
|
|
|
|
)*}
|
|
|
|
);
|
|
|
|
|
|
|
|
component_binop_impl!(
|
2018-02-02 19:26:27 +08:00
|
|
|
component_mul, component_mul_mut, component_mul_assign, cmpy, ClosedMul.mul.mul_assign,
|
2018-10-20 17:36:35 +08:00
|
|
|
r"
|
|
|
|
Componentwise matrix or vector multiplication.
|
|
|
|
|
|
|
|
# Example
|
|
|
|
|
|
|
|
```
|
|
|
|
# use nalgebra::Matrix2;
|
|
|
|
let a = Matrix2::new(0.0, 1.0, 2.0, 3.0);
|
|
|
|
let b = Matrix2::new(4.0, 5.0, 6.0, 7.0);
|
|
|
|
let expected = Matrix2::new(0.0, 5.0, 12.0, 21.0);
|
|
|
|
|
|
|
|
assert_eq!(a.component_mul(&b), expected);
|
|
|
|
```
|
|
|
|
",
|
|
|
|
r"
|
|
|
|
Computes componentwise `self[i] = alpha * a[i] * b[i] + beta * self[i]`.
|
|
|
|
|
|
|
|
# Example
|
|
|
|
```
|
|
|
|
# use nalgebra::Matrix2;
|
|
|
|
let mut m = Matrix2::new(0.0, 1.0, 2.0, 3.0);
|
|
|
|
let a = Matrix2::new(0.0, 1.0, 2.0, 3.0);
|
|
|
|
let b = Matrix2::new(4.0, 5.0, 6.0, 7.0);
|
|
|
|
let expected = (a.component_mul(&b) * 5.0) + m * 10.0;
|
|
|
|
|
|
|
|
m.cmpy(5.0, &a, &b, 10.0);
|
|
|
|
assert_eq!(m, expected);
|
|
|
|
```
|
|
|
|
",
|
|
|
|
r"
|
|
|
|
Inplace componentwise matrix or vector multiplication.
|
|
|
|
|
|
|
|
# Example
|
|
|
|
```
|
|
|
|
# use nalgebra::Matrix2;
|
|
|
|
let mut a = Matrix2::new(0.0, 1.0, 2.0, 3.0);
|
|
|
|
let b = Matrix2::new(4.0, 5.0, 6.0, 7.0);
|
|
|
|
let expected = Matrix2::new(0.0, 5.0, 12.0, 21.0);
|
|
|
|
|
|
|
|
a.component_mul_assign(&b);
|
|
|
|
|
|
|
|
assert_eq!(a, expected);
|
|
|
|
```
|
|
|
|
";
|
2018-02-02 19:26:27 +08:00
|
|
|
component_div, component_div_mut, component_div_assign, cdpy, ClosedDiv.div.div_assign,
|
2018-10-20 17:36:35 +08:00
|
|
|
r"
|
|
|
|
Componentwise matrix or vector division.
|
|
|
|
|
|
|
|
# Example
|
|
|
|
|
|
|
|
```
|
|
|
|
# use nalgebra::Matrix2;
|
|
|
|
let a = Matrix2::new(0.0, 1.0, 2.0, 3.0);
|
|
|
|
let b = Matrix2::new(4.0, 5.0, 6.0, 7.0);
|
|
|
|
let expected = Matrix2::new(0.0, 1.0 / 5.0, 2.0 / 6.0, 3.0 / 7.0);
|
|
|
|
|
|
|
|
assert_eq!(a.component_div(&b), expected);
|
|
|
|
```
|
|
|
|
",
|
|
|
|
r"
|
|
|
|
Computes componentwise `self[i] = alpha * a[i] / b[i] + beta * self[i]`.
|
|
|
|
|
|
|
|
# Example
|
|
|
|
```
|
|
|
|
# use nalgebra::Matrix2;
|
|
|
|
let mut m = Matrix2::new(0.0, 1.0, 2.0, 3.0);
|
|
|
|
let a = Matrix2::new(4.0, 5.0, 6.0, 7.0);
|
|
|
|
let b = Matrix2::new(4.0, 5.0, 6.0, 7.0);
|
|
|
|
let expected = (a.component_div(&b) * 5.0) + m * 10.0;
|
|
|
|
|
|
|
|
m.cdpy(5.0, &a, &b, 10.0);
|
|
|
|
assert_eq!(m, expected);
|
|
|
|
```
|
|
|
|
",
|
|
|
|
r"
|
|
|
|
Inplace componentwise matrix or vector division.
|
|
|
|
|
|
|
|
# Example
|
|
|
|
```
|
|
|
|
# use nalgebra::Matrix2;
|
|
|
|
let mut a = Matrix2::new(0.0, 1.0, 2.0, 3.0);
|
|
|
|
let b = Matrix2::new(4.0, 5.0, 6.0, 7.0);
|
|
|
|
let expected = Matrix2::new(0.0, 1.0 / 5.0, 2.0 / 6.0, 3.0 / 7.0);
|
|
|
|
|
|
|
|
a.component_div_assign(&b);
|
|
|
|
|
|
|
|
assert_eq!(a, expected);
|
|
|
|
```
|
|
|
|
";
|
2016-12-05 05:44:42 +08:00
|
|
|
// FIXME: add other operators like bitshift, etc. ?
|
|
|
|
);
|