diff --git a/src/Numerics/LinearAlgebra/Complex/DenseMatrix.cs b/src/Numerics/LinearAlgebra/Complex/DenseMatrix.cs index e1afd250..df43af87 100644 --- a/src/Numerics/LinearAlgebra/Complex/DenseMatrix.cs +++ b/src/Numerics/LinearAlgebra/Complex/DenseMatrix.cs @@ -61,11 +61,6 @@ namespace MathNet.Numerics.LinearAlgebra.Complex /// The matrix's data. readonly Complex[] _data; - internal DenseColumnMajorMatrixStorage Raw - { - get { return _storage; } - } - internal DenseMatrix(DenseColumnMajorMatrixStorage storage) : base(storage) { diff --git a/src/Numerics/LinearAlgebra/Complex/DiagonalMatrix.cs b/src/Numerics/LinearAlgebra/Complex/DiagonalMatrix.cs index 805720e7..6991fd30 100644 --- a/src/Numerics/LinearAlgebra/Complex/DiagonalMatrix.cs +++ b/src/Numerics/LinearAlgebra/Complex/DiagonalMatrix.cs @@ -32,7 +32,6 @@ namespace MathNet.Numerics.LinearAlgebra.Complex using Generic; using Properties; using Storage; - using Threading; /// /// A matrix type for diagonal matrices. @@ -54,11 +53,6 @@ namespace MathNet.Numerics.LinearAlgebra.Complex /// The matrix's data. readonly Complex[] _data; - internal DiagonalMatrixStorage Raw - { - get { return _storage; } - } - internal DiagonalMatrix(DiagonalMatrixStorage storage) : base(storage) { diff --git a/src/Numerics/LinearAlgebra/Complex/SparseMatrix.cs b/src/Numerics/LinearAlgebra/Complex/SparseMatrix.cs index 50d30bc6..26731193 100644 --- a/src/Numerics/LinearAlgebra/Complex/SparseMatrix.cs +++ b/src/Numerics/LinearAlgebra/Complex/SparseMatrix.cs @@ -56,11 +56,6 @@ namespace MathNet.Numerics.LinearAlgebra.Complex get { return _storage.ValueCount; } } - internal SparseCompressedRowMatrixStorage Raw - { - get { return _storage; } - } - internal SparseMatrix(SparseCompressedRowMatrixStorage storage) : base(storage) { @@ -761,7 +756,7 @@ namespace MathNet.Numerics.LinearAlgebra.Complex left = sparseOther; } - var leftStorage = left.Raw; + var leftStorage = left._storage; for (var i = 0; i < leftStorage.RowCount; i++) { // Get the begin / end index for the current row @@ -801,7 +796,7 @@ namespace MathNet.Numerics.LinearAlgebra.Complex return; } - var otherStorage = sparseOther.Raw; + var otherStorage = sparseOther._storage; if (ReferenceEquals(this, sparseResult)) { @@ -901,7 +896,7 @@ namespace MathNet.Numerics.LinearAlgebra.Complex CopyTo(sparseResult); } - CommonParallel.For(0, NonZerosCount, index => sparseResult.Raw.Values[index] *= scalar); + CommonParallel.For(0, NonZerosCount, index => sparseResult._storage.Values[index] *= scalar); } } @@ -1000,7 +995,7 @@ namespace MathNet.Numerics.LinearAlgebra.Complex var values = _storage.Values; var valueCount = _storage.ValueCount; - var otherStorage = otherSparse.Raw; + var otherStorage = otherSparse._storage; for (var j = 0; j < RowCount; j++) { @@ -1033,7 +1028,7 @@ namespace MathNet.Numerics.LinearAlgebra.Complex } } - resultSparse.Raw.At(i, j, sum + result.At(i, j)); + resultSparse._storage.At(i, j, sum + result.At(i, j)); } } } diff --git a/src/Numerics/LinearAlgebra/Complex32/DenseMatrix.cs b/src/Numerics/LinearAlgebra/Complex32/DenseMatrix.cs index 614f4cd8..ba6fcaf8 100644 --- a/src/Numerics/LinearAlgebra/Complex32/DenseMatrix.cs +++ b/src/Numerics/LinearAlgebra/Complex32/DenseMatrix.cs @@ -61,11 +61,6 @@ namespace MathNet.Numerics.LinearAlgebra.Complex32 /// The matrix's data. readonly Complex32[] _data; - internal DenseColumnMajorMatrixStorage Raw - { - get { return _storage; } - } - internal DenseMatrix(DenseColumnMajorMatrixStorage storage) : base(storage) { diff --git a/src/Numerics/LinearAlgebra/Complex32/DiagonalMatrix.cs b/src/Numerics/LinearAlgebra/Complex32/DiagonalMatrix.cs index 4c511431..fbeff2e1 100644 --- a/src/Numerics/LinearAlgebra/Complex32/DiagonalMatrix.cs +++ b/src/Numerics/LinearAlgebra/Complex32/DiagonalMatrix.cs @@ -32,7 +32,6 @@ namespace MathNet.Numerics.LinearAlgebra.Complex32 using Numerics; using Properties; using Storage; - using Threading; /// /// A matrix type for diagonal matrices. @@ -54,11 +53,6 @@ namespace MathNet.Numerics.LinearAlgebra.Complex32 /// The matrix's data. readonly Complex32[] _data; - internal DiagonalMatrixStorage Raw - { - get { return _storage; } - } - internal DiagonalMatrix(DiagonalMatrixStorage storage) : base(storage) { diff --git a/src/Numerics/LinearAlgebra/Complex32/SparseMatrix.cs b/src/Numerics/LinearAlgebra/Complex32/SparseMatrix.cs index f780d53a..ed3b25b6 100644 --- a/src/Numerics/LinearAlgebra/Complex32/SparseMatrix.cs +++ b/src/Numerics/LinearAlgebra/Complex32/SparseMatrix.cs @@ -56,11 +56,6 @@ namespace MathNet.Numerics.LinearAlgebra.Complex32 get { return _storage.ValueCount; } } - internal SparseCompressedRowMatrixStorage Raw - { - get { return _storage; } - } - internal SparseMatrix(SparseCompressedRowMatrixStorage storage) : base(storage) { @@ -761,7 +756,7 @@ namespace MathNet.Numerics.LinearAlgebra.Complex32 left = sparseOther; } - var leftStorage = left.Raw; + var leftStorage = left._storage; for (var i = 0; i < leftStorage.RowCount; i++) { // Get the begin / end index for the current row @@ -800,7 +795,7 @@ namespace MathNet.Numerics.LinearAlgebra.Complex32 return; } - var otherStorage = sparseOther.Raw; + var otherStorage = sparseOther._storage; if (ReferenceEquals(this, sparseResult)) { @@ -900,7 +895,7 @@ namespace MathNet.Numerics.LinearAlgebra.Complex32 CopyTo(sparseResult); } - CommonParallel.For(0, NonZerosCount, index => sparseResult.Raw.Values[index] *= scalar); + CommonParallel.For(0, NonZerosCount, index => sparseResult._storage.Values[index] *= scalar); } } @@ -999,7 +994,7 @@ namespace MathNet.Numerics.LinearAlgebra.Complex32 var values = _storage.Values; var valueCount = _storage.ValueCount; - var otherStorage = otherSparse.Raw; + var otherStorage = otherSparse._storage; for (var j = 0; j < RowCount; j++) { @@ -1032,7 +1027,7 @@ namespace MathNet.Numerics.LinearAlgebra.Complex32 } } - resultSparse.Raw.At(i, j, sum + result.At(i, j)); + resultSparse._storage.At(i, j, sum + result.At(i, j)); } } } diff --git a/src/Numerics/LinearAlgebra/Double/DenseMatrix.cs b/src/Numerics/LinearAlgebra/Double/DenseMatrix.cs index 50007cd9..f59fdc41 100644 --- a/src/Numerics/LinearAlgebra/Double/DenseMatrix.cs +++ b/src/Numerics/LinearAlgebra/Double/DenseMatrix.cs @@ -61,11 +61,6 @@ namespace MathNet.Numerics.LinearAlgebra.Double /// The matrix's data. readonly double[] _data; - internal DenseColumnMajorMatrixStorage Raw - { - get { return _storage; } - } - internal DenseMatrix(DenseColumnMajorMatrixStorage storage) : base(storage) { diff --git a/src/Numerics/LinearAlgebra/Double/DiagonalMatrix.cs b/src/Numerics/LinearAlgebra/Double/DiagonalMatrix.cs index c0da0aa4..de0461b3 100644 --- a/src/Numerics/LinearAlgebra/Double/DiagonalMatrix.cs +++ b/src/Numerics/LinearAlgebra/Double/DiagonalMatrix.cs @@ -31,7 +31,6 @@ namespace MathNet.Numerics.LinearAlgebra.Double using Generic; using Properties; using Storage; - using Threading; /// /// A matrix type for diagonal matrices. @@ -53,11 +52,6 @@ namespace MathNet.Numerics.LinearAlgebra.Double /// The matrix's data. readonly double[] _data; - internal DiagonalMatrixStorage Raw - { - get { return _storage; } - } - internal DiagonalMatrix(DiagonalMatrixStorage storage) : base(storage) { diff --git a/src/Numerics/LinearAlgebra/Double/SparseMatrix.cs b/src/Numerics/LinearAlgebra/Double/SparseMatrix.cs index e8cbbc09..47d6cd96 100644 --- a/src/Numerics/LinearAlgebra/Double/SparseMatrix.cs +++ b/src/Numerics/LinearAlgebra/Double/SparseMatrix.cs @@ -55,11 +55,6 @@ namespace MathNet.Numerics.LinearAlgebra.Double get { return _storage.ValueCount; } } - internal SparseCompressedRowMatrixStorage Raw - { - get { return _storage; } - } - internal SparseMatrix(SparseCompressedRowMatrixStorage storage) : base(storage) { @@ -759,7 +754,7 @@ namespace MathNet.Numerics.LinearAlgebra.Double left = sparseOther; } - var leftStorage = left.Raw; + var leftStorage = left._storage; for (var i = 0; i < leftStorage.RowCount; i++) { // Get the begin / end index for the current row @@ -799,7 +794,7 @@ namespace MathNet.Numerics.LinearAlgebra.Double return; } - var otherStorage = sparseOther.Raw; + var otherStorage = sparseOther._storage; if (ReferenceEquals(this, sparseResult)) { @@ -899,7 +894,7 @@ namespace MathNet.Numerics.LinearAlgebra.Double CopyTo(sparseResult); } - CommonParallel.For(0, _storage.ValueCount, index => sparseResult.Raw.Values[index] *= scalar); + CommonParallel.For(0, _storage.ValueCount, index => sparseResult._storage.Values[index] *= scalar); } } @@ -998,7 +993,7 @@ namespace MathNet.Numerics.LinearAlgebra.Double var values = _storage.Values; var valueCount = _storage.ValueCount; - var otherStorage = otherSparse.Raw; + var otherStorage = otherSparse._storage; for (var j = 0; j < RowCount; j++) { @@ -1031,7 +1026,7 @@ namespace MathNet.Numerics.LinearAlgebra.Double } } - resultSparse.Raw.At(i, j, sum + result.At(i, j)); + resultSparse._storage.At(i, j, sum + result.At(i, j)); } } } @@ -1127,7 +1122,7 @@ namespace MathNet.Numerics.LinearAlgebra.Double CopyTo(result); } - var resultStorage = sparseResult.Raw; + var resultStorage = sparseResult._storage; for (var index = 0; index < resultStorage.Values.Length; index++) { resultStorage.Values[index] %= divisor; diff --git a/src/Numerics/LinearAlgebra/Single/DenseMatrix.cs b/src/Numerics/LinearAlgebra/Single/DenseMatrix.cs index b2b46989..a76560d8 100644 --- a/src/Numerics/LinearAlgebra/Single/DenseMatrix.cs +++ b/src/Numerics/LinearAlgebra/Single/DenseMatrix.cs @@ -61,11 +61,6 @@ namespace MathNet.Numerics.LinearAlgebra.Single /// The matrix's data. readonly float[] _data; - internal DenseColumnMajorMatrixStorage Raw - { - get { return _storage; } - } - internal DenseMatrix(DenseColumnMajorMatrixStorage storage) : base(storage) { diff --git a/src/Numerics/LinearAlgebra/Single/DiagonalMatrix.cs b/src/Numerics/LinearAlgebra/Single/DiagonalMatrix.cs index 0ea96a27..376df7d6 100644 --- a/src/Numerics/LinearAlgebra/Single/DiagonalMatrix.cs +++ b/src/Numerics/LinearAlgebra/Single/DiagonalMatrix.cs @@ -31,7 +31,6 @@ namespace MathNet.Numerics.LinearAlgebra.Single using Generic; using Properties; using Storage; - using Threading; /// /// A matrix type for diagonal matrices. @@ -53,11 +52,6 @@ namespace MathNet.Numerics.LinearAlgebra.Single /// The matrix's data. readonly float[] _data; - internal DiagonalMatrixStorage Raw - { - get { return _storage; } - } - internal DiagonalMatrix(DiagonalMatrixStorage storage) : base(storage) { diff --git a/src/Numerics/LinearAlgebra/Single/SparseMatrix.cs b/src/Numerics/LinearAlgebra/Single/SparseMatrix.cs index f72424e2..514a796b 100644 --- a/src/Numerics/LinearAlgebra/Single/SparseMatrix.cs +++ b/src/Numerics/LinearAlgebra/Single/SparseMatrix.cs @@ -55,11 +55,6 @@ namespace MathNet.Numerics.LinearAlgebra.Single get { return _storage.ValueCount; } } - internal SparseCompressedRowMatrixStorage Raw - { - get { return _storage; } - } - internal SparseMatrix(SparseCompressedRowMatrixStorage storage) : base(storage) { @@ -759,7 +754,7 @@ namespace MathNet.Numerics.LinearAlgebra.Single left = sparseOther; } - var leftStorage = left.Raw; + var leftStorage = left._storage; for (var i = 0; i < leftStorage.RowCount; i++) { // Get the begin / end index for the current row @@ -798,7 +793,7 @@ namespace MathNet.Numerics.LinearAlgebra.Single return; } - var otherStorage = sparseOther.Raw; + var otherStorage = sparseOther._storage; if (ReferenceEquals(this, sparseResult)) { @@ -898,7 +893,7 @@ namespace MathNet.Numerics.LinearAlgebra.Single CopyTo(sparseResult); } - CommonParallel.For(0, NonZerosCount, index => sparseResult.Raw.Values[index] *= scalar); + CommonParallel.For(0, NonZerosCount, index => sparseResult._storage.Values[index] *= scalar); } } @@ -997,7 +992,7 @@ namespace MathNet.Numerics.LinearAlgebra.Single var values = _storage.Values; var valueCount = _storage.ValueCount; - var otherStorage = otherSparse.Raw; + var otherStorage = otherSparse._storage; for (var j = 0; j < RowCount; j++) { @@ -1030,7 +1025,7 @@ namespace MathNet.Numerics.LinearAlgebra.Single } } - resultSparse.Raw.At(i, j, sum + result.At(i, j)); + resultSparse._storage.At(i, j, sum + result.At(i, j)); } } } @@ -1126,7 +1121,7 @@ namespace MathNet.Numerics.LinearAlgebra.Single CopyTo(result); } - var resultStorage = sparseResult.Raw; + var resultStorage = sparseResult._storage; for (var index = 0; index < resultStorage.Values.Length; index++) { resultStorage.Values[index] %= divisor;