From aae4bbf06413f34f0f3ed1b4defbe2a256d3779c Mon Sep 17 00:00:00 2001 From: Jurgen Van Gael Date: Mon, 25 Jan 2010 07:06:30 +0800 Subject: [PATCH] Added matrix matrix multiplication unit tests. Fixed bug in matrix multiplication. --- src/Numerics/LinearAlgebra/Double/Matrix.cs | 2 +- src/UnitTests/LinearAlgebraTests/Double/MatrixTests.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Numerics/LinearAlgebra/Double/Matrix.cs b/src/Numerics/LinearAlgebra/Double/Matrix.cs index 2ac79729..19994da6 100644 --- a/src/Numerics/LinearAlgebra/Double/Matrix.cs +++ b/src/Numerics/LinearAlgebra/Double/Matrix.cs @@ -812,7 +812,7 @@ namespace MathNet.Numerics.LinearAlgebra.Double { s += this.At(j, l) * other.At(l, i); } - result.At(i, j, s); + result.At(j, i, s); } }); } diff --git a/src/UnitTests/LinearAlgebraTests/Double/MatrixTests.cs b/src/UnitTests/LinearAlgebraTests/Double/MatrixTests.cs index 588eb257..80909d09 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/MatrixTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/MatrixTests.cs @@ -666,7 +666,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double [Row("Wide2x3", "Tall3x2")] [Row("Tall3x2", "Wide2x3")] [MultipleAsserts] - public void CanMultiplyMatrixWithMatrix(string nameA, string nameB) + public void CanMultiplyMatrixWithMatrixIntoResult(string nameA, string nameB) { Matrix A = testMatrices[nameA]; Matrix B = testMatrices[nameB];