M-Labs/nalgebra
3
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #139 from mitchmindtree/master

Browse Source 
Allow for non-consuming std operations on DMat. Added DMat multiplication test.
This commit is contained in:
Sébastien Crozet 2015-06-23 21:03:38 +02:00
commit 8dfb8ee7b9
2 changed files with 96 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/structs/dmat.rs
View File

@ -265,7 +265,35 @@ impl<N> IndexMut<(usize, usize)> for DMat<N> {
impl<N: Copy + Mul<N, Output = N> + Add<N, Output = N> + Zero> Mul<DMat<N>> for DMat<N> {
type Output = DMat<N>;
#[inline]
fn mul(self, right: DMat<N>) -> DMat<N> {
(&self) * (&right)
}
}
impl<'a, N: Copy + Mul<N, Output = N> + Add<N, Output = N> + Zero> Mul<&'a DMat<N>> for DMat<N> {
type Output = DMat<N>;
#[inline]
fn mul(self, right: &'a DMat<N>) -> DMat<N> {
(&self) * right
}
}
impl<'a, N: Copy + Mul<N, Output = N> + Add<N, Output = N> + Zero> Mul<DMat<N>> for &'a DMat<N> {
type Output = DMat<N>;
#[inline]
fn mul(self, right: DMat<N>) -> DMat<N> {
right * self
}
}
impl<'a, N: Copy + Mul<N, Output = N> + Add<N, Output = N> + Zero> Mul<&'a DMat<N>> for &'a DMat<N> {
type Output = DMat<N>;
#[inline]
fn mul(self, right: &DMat<N>) -> DMat<N> {
assert!(self.ncols == right.nrows);
let mut res = unsafe { DMat::new_uninitialized(self.nrows, right.ncols) };
@ -668,6 +696,24 @@ impl<N: Copy + Add<N, Output = N>> Add<DMat<N>> for DMat<N> {
#[inline]
fn add(self, right: DMat<N>) -> DMat<N> {
self + (&right)
}
}
impl<'a, N: Copy + Add<N, Output = N>> Add<DMat<N>> for &'a DMat<N> {
type Output = DMat<N>;
#[inline]
fn add(self, right: DMat<N>) -> DMat<N> {
right + self
}
}
impl<'a, N: Copy + Add<N, Output = N>> Add<&'a DMat<N>> for DMat<N> {
type Output = DMat<N>;
#[inline]
fn add(self, right: &'a DMat<N>) -> DMat<N> {
assert!(self.nrows == right.nrows && self.ncols == right.ncols,
"Unable to add matrices with different dimensions.");
@ -701,6 +747,24 @@ impl<N: Copy + Sub<N, Output = N>> Sub<DMat<N>> for DMat<N> {
#[inline]
fn sub(self, right: DMat<N>) -> DMat<N> {
self - (&right)
}
}
impl<'a, N: Copy + Sub<N, Output = N>> Sub<DMat<N>> for &'a DMat<N> {
type Output = DMat<N>;
#[inline]
fn sub(self, right: DMat<N>) -> DMat<N> {
right - self
}
}
impl<'a, N: Copy + Sub<N, Output = N>> Sub<&'a DMat<N>> for DMat<N> {
type Output = DMat<N>;
#[inline]
fn sub(self, right: &'a DMat<N>) -> DMat<N> {
assert!(self.nrows == right.nrows && self.ncols == right.ncols,
"Unable to subtract matrices with different dimensions.");

32
tests/mat.rs
View File

@ -322,6 +322,38 @@ fn test_dmat_addition() {
assert!((mat1 + mat2) == res);
}
#[test]
fn test_dmat_multiplication() {
let mat1 = DMat::from_row_vec(
2,
2,
&[
1.0, 2.0,
3.0, 4.0
]
);
let mat2 = DMat::from_row_vec(
2,
2,
&[
10.0, 20.0,
30.0, 40.0
]
);
let res = DMat::from_row_vec(
2,
2,
&[
70.0, 100.0,
150.0, 220.0
]
);
assert!((mat1 * mat2) == res);
}
#[test]
fn test_dmat_subtraction() {
let mat1 = DMat::from_row_vec(