From 8b14cef4e730790976b339d0b2a4042987daf429 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arttu=20Yl=C3=A4-Outinen?= <yleisnimi@gmail.com>
Date: Sun, 12 Jul 2015 09:42:31 +0300
Subject: [PATCH 1/2] Add a test for multiplication of non-square DMats.

Demonstrates a bug in Mul implementation.
---
 tests/mat.rs | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/tests/mat.rs b/tests/mat.rs
index b4fc2161..88f98e0d 100644
--- a/tests/mat.rs
+++ b/tests/mat.rs
@@ -354,6 +354,40 @@ fn test_dmat_multiplication() {
     assert!((mat1 * mat2) == res);
 }
 
+// Tests multiplication of rectangular (non-square) matrices.
+#[test]
+fn test_dmat_multiplication_rect() {
+    let mat1 = DMat::from_row_vec(
+        1,
+        2,
+        &[
+            1.0, 2.0,
+        ]
+    );
+
+    let mat2 = DMat::from_row_vec(
+        2,
+        3,
+        &[
+            3.0, 4.0, 5.0,
+            6.0, 7.0, 8.0,
+        ]
+    );
+
+    let res = DMat::from_row_vec(
+        1,
+        3,
+        &[
+            15.0, 18.0, 21.0,
+        ]
+    );
+
+   assert!((mat1.clone() * mat2.clone()) == res);
+   assert!((&mat1 * mat2.clone()) == res);
+   assert!((mat1.clone() * &mat2) == res);
+   assert!((&mat1 * &mat2) == res);
+}
+
 #[test]
 fn test_dmat_subtraction() {
     let mat1 = DMat::from_row_vec(

From 75208896a31fac3b22383983fc372c50ac241aa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arttu=20Yl=C3=A4-Outinen?= <yleisnimi@gmail.com>
Date: Sun, 12 Jul 2015 09:44:03 +0300
Subject: [PATCH 2/2] Fix multiplication of non-square DMats.

Matrices were in wrong order.
---
 src/structs/dmat.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/structs/dmat.rs b/src/structs/dmat.rs
index b55227fb..9a2bc2ca 100644
--- a/src/structs/dmat.rs
+++ b/src/structs/dmat.rs
@@ -285,11 +285,11 @@ impl<'a, N: Copy + Mul<N, Output = N> + Add<N, Output = N> + Zero> Mul<DMat<N>>
 
     #[inline]
     fn mul(self, right: DMat<N>) -> DMat<N> {
-        right * self
+        self * (&right)
     }
 }
 
-impl<'a, N: Copy + Mul<N, Output = N> + Add<N, Output = N> + Zero> Mul<&'a DMat<N>> for &'a DMat<N> {
+impl<'a, 'b, N: Copy + Mul<N, Output = N> + Add<N, Output = N> + Zero> Mul<&'b DMat<N>> for &'a DMat<N> {
     type Output = DMat<N>;
 
     #[inline]