Browse Source

updated AppendMatrix to not be parallel - caused sparse tests to sometimes fail

la-knuth
Marcus Cuda 16 years ago
parent
commit
2616163c36
  1. 32
      src/Numerics/LinearAlgebra/Generic/Matrix.cs

32
src/Numerics/LinearAlgebra/Generic/Matrix.cs

@ -1583,27 +1583,21 @@ namespace MathNet.Numerics.LinearAlgebra.Generic
throw new ArgumentException(Resources.ArgumentMatrixSameColumnDimension); 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++) result.At(i, j, At(i, j));
{ }
for (var j = 0; j < ColumnCount; 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++) result.At(i, j + ColumnCount, right.At(i, j));
{ }
for (var j = 0; j < right.ColumnCount; j++) }
{
result.At(i, j + ColumnCount, right.At(i, j));
}
}
});
} }
/// <summary> /// <summary>

Loading…
Cancel
Save