From 2616163c363f06980fd2cce6c201e5251ae0475a Mon Sep 17 00:00:00 2001 From: Marcus Cuda Date: Sun, 23 Jan 2011 21:11:57 +0800 Subject: [PATCH] updated AppendMatrix to not be parallel - caused sparse tests to sometimes fail --- src/Numerics/LinearAlgebra/Generic/Matrix.cs | 32 ++++++++------------ 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/src/Numerics/LinearAlgebra/Generic/Matrix.cs b/src/Numerics/LinearAlgebra/Generic/Matrix.cs index 1fe4e14c..3f2e3ce2 100644 --- a/src/Numerics/LinearAlgebra/Generic/Matrix.cs +++ b/src/Numerics/LinearAlgebra/Generic/Matrix.cs @@ -1583,27 +1583,21 @@ namespace MathNet.Numerics.LinearAlgebra.Generic throw new ArgumentException(Resources.ArgumentMatrixSameColumnDimension); } - CommonParallel.Invoke( - () => + for (var i = 0; i < RowCount; i++) + { + for (var j = 0; j < ColumnCount; j++) { - for (var i = 0; i < RowCount; i++) - { - for (var j = 0; j < ColumnCount; j++) - { - result.At(i, j, At(i, j)); - } - } - }, - () => + result.At(i, j, At(i, j)); + } + } + + for (var i = 0; i < RowCount; i++) + { + for (var j = 0; j < right.ColumnCount; j++) { - for (var i = 0; i < RowCount; i++) - { - for (var j = 0; j < right.ColumnCount; j++) - { - result.At(i, j + ColumnCount, right.At(i, j)); - } - } - }); + result.At(i, j + ColumnCount, right.At(i, j)); + } + } } ///