From c8efac9cc0dab0aafb1b57eff3a5c9f283d8ea2a Mon Sep 17 00:00:00 2001 From: Christoph Ruegg Date: Fri, 25 Nov 2016 15:55:08 +0100 Subject: [PATCH] LA: Storage providers must always force all parameters (no defaults) --- .../Storage/DenseColumnMajorMatrixStorage.cs | 4 ++-- .../Storage/DenseVectorStorage.cs | 4 ++-- .../Storage/DiagonalMatrixStorage.cs | 4 ++-- .../LinearAlgebra/Storage/MatrixStorage.cs | 16 +++++++--------- .../SparseCompressedRowMatrixStorage.cs | 4 ++-- .../Storage/SparseVectorStorage.cs | 4 ++-- .../LinearAlgebra/Storage/VectorStorage.cs | 15 ++++++--------- .../MatrixStorageCombinatorsTests.cs | 12 ++++++------ .../VectorStorageCombinatorsTests.cs | 18 +++++++++--------- 9 files changed, 38 insertions(+), 43 deletions(-) diff --git a/src/Numerics/LinearAlgebra/Storage/DenseColumnMajorMatrixStorage.cs b/src/Numerics/LinearAlgebra/Storage/DenseColumnMajorMatrixStorage.cs index 09fe3d66..02cab1ae 100644 --- a/src/Numerics/LinearAlgebra/Storage/DenseColumnMajorMatrixStorage.cs +++ b/src/Numerics/LinearAlgebra/Storage/DenseColumnMajorMatrixStorage.cs @@ -819,7 +819,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage // FUNCTIONAL COMBINATORS: MAP - public override void MapInplace(Func f, Zeros zeros = Zeros.AllowSkip) + public override void MapInplace(Func f, Zeros zeros) { CommonParallel.For(0, Data.Length, 4096, (a, b) => { @@ -830,7 +830,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage }); } - public override void MapIndexedInplace(Func f, Zeros zeros = Zeros.AllowSkip) + public override void MapIndexedInplace(Func f, Zeros zeros) { CommonParallel.For(0, ColumnCount, Math.Max(4096/RowCount, 32), (a, b) => { diff --git a/src/Numerics/LinearAlgebra/Storage/DenseVectorStorage.cs b/src/Numerics/LinearAlgebra/Storage/DenseVectorStorage.cs index 7d4d7b18..9a867800 100644 --- a/src/Numerics/LinearAlgebra/Storage/DenseVectorStorage.cs +++ b/src/Numerics/LinearAlgebra/Storage/DenseVectorStorage.cs @@ -438,7 +438,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage // FUNCTIONAL COMBINATORS: MAP - public override void MapInplace(Func f, Zeros zeros = Zeros.AllowSkip) + public override void MapInplace(Func f, Zeros zeros) { CommonParallel.For(0, Data.Length, 4096, (a, b) => { @@ -449,7 +449,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage }); } - public override void MapIndexedInplace(Func f, Zeros zeros = Zeros.AllowSkip) + public override void MapIndexedInplace(Func f, Zeros zeros) { CommonParallel.For(0, Data.Length, 4096, (a, b) => { diff --git a/src/Numerics/LinearAlgebra/Storage/DiagonalMatrixStorage.cs b/src/Numerics/LinearAlgebra/Storage/DiagonalMatrixStorage.cs index 58a315bd..ea97fa6d 100644 --- a/src/Numerics/LinearAlgebra/Storage/DiagonalMatrixStorage.cs +++ b/src/Numerics/LinearAlgebra/Storage/DiagonalMatrixStorage.cs @@ -735,7 +735,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage // FUNCTIONAL COMBINATORS: MAP - public override void MapInplace(Func f, Zeros zeros = Zeros.AllowSkip) + public override void MapInplace(Func f, Zeros zeros) { if (zeros == Zeros.Include) { @@ -751,7 +751,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage }); } - public override void MapIndexedInplace(Func f, Zeros zeros = Zeros.AllowSkip) + public override void MapIndexedInplace(Func f, Zeros zeros) { if (zeros == Zeros.Include) { diff --git a/src/Numerics/LinearAlgebra/Storage/MatrixStorage.cs b/src/Numerics/LinearAlgebra/Storage/MatrixStorage.cs index 3195759e..c725c7bb 100644 --- a/src/Numerics/LinearAlgebra/Storage/MatrixStorage.cs +++ b/src/Numerics/LinearAlgebra/Storage/MatrixStorage.cs @@ -718,7 +718,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage // FUNCTIONAL COMBINATORS: MAP - public virtual void MapInplace(Func f, Zeros zeros = Zeros.AllowSkip) + public virtual void MapInplace(Func f, Zeros zeros) { for (int i = 0; i < RowCount; i++) { @@ -729,7 +729,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage } } - public virtual void MapIndexedInplace(Func f, Zeros zeros = Zeros.AllowSkip) + public virtual void MapIndexedInplace(Func f, Zeros zeros) { for (int i = 0; i < RowCount; i++) { @@ -740,8 +740,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage } } - public void MapTo(MatrixStorage target, Func f, - Zeros zeros = Zeros.AllowSkip, ExistingData existingData = ExistingData.Clear) + public void MapTo(MatrixStorage target, Func f, Zeros zeros, ExistingData existingData) where TU : struct, IEquatable, IFormattable { if (target == null) @@ -770,8 +769,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage } } - public void MapIndexedTo(MatrixStorage target, Func f, - Zeros zeros = Zeros.AllowSkip, ExistingData existingData = ExistingData.Clear) + public void MapIndexedTo(MatrixStorage target, Func f, Zeros zeros, ExistingData existingData) where TU : struct, IEquatable, IFormattable { if (target == null) @@ -803,7 +801,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage public void MapSubMatrixIndexedTo(MatrixStorage target, Func f, int sourceRowIndex, int targetRowIndex, int rowCount, int sourceColumnIndex, int targetColumnIndex, int columnCount, - Zeros zeros = Zeros.AllowSkip, ExistingData existingData = ExistingData.Clear) + Zeros zeros, ExistingData existingData) where TU : struct, IEquatable, IFormattable { if (target == null) @@ -884,7 +882,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage // FUNCTIONAL COMBINATORS: FOLD /// The state array will not be modified, unless it is the same instance as the target array (which is allowed). - public void FoldByRow(TU[] target, Func f, Func finalize, TU[] state, Zeros zeros = Zeros.AllowSkip) + public void FoldByRow(TU[] target, Func f, Func finalize, TU[] state, Zeros zeros) { if (target == null) { @@ -922,7 +920,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage } /// The state array will not be modified, unless it is the same instance as the target array (which is allowed). - public void FoldByColumn(TU[] target, Func f, Func finalize, TU[] state, Zeros zeros = Zeros.AllowSkip) + public void FoldByColumn(TU[] target, Func f, Func finalize, TU[] state, Zeros zeros) { if (target == null) { diff --git a/src/Numerics/LinearAlgebra/Storage/SparseCompressedRowMatrixStorage.cs b/src/Numerics/LinearAlgebra/Storage/SparseCompressedRowMatrixStorage.cs index 6dfc0eac..ecbae3e3 100644 --- a/src/Numerics/LinearAlgebra/Storage/SparseCompressedRowMatrixStorage.cs +++ b/src/Numerics/LinearAlgebra/Storage/SparseCompressedRowMatrixStorage.cs @@ -1604,7 +1604,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage // FUNCTIONAL COMBINATORS: MAP - public override void MapInplace(Func f, Zeros zeros = Zeros.AllowSkip) + public override void MapInplace(Func f, Zeros zeros) { if (zeros == Zeros.Include || !Zero.Equals(f(Zero))) { @@ -1657,7 +1657,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage } } - public override void MapIndexedInplace(Func f, Zeros zeros = Zeros.AllowSkip) + public override void MapIndexedInplace(Func f, Zeros zeros) { if (zeros == Zeros.Include || !Zero.Equals(f(0, 1, Zero))) { diff --git a/src/Numerics/LinearAlgebra/Storage/SparseVectorStorage.cs b/src/Numerics/LinearAlgebra/Storage/SparseVectorStorage.cs index 226a8923..9ec937ad 100644 --- a/src/Numerics/LinearAlgebra/Storage/SparseVectorStorage.cs +++ b/src/Numerics/LinearAlgebra/Storage/SparseVectorStorage.cs @@ -776,7 +776,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage // FUNCTIONAL COMBINATORS: MAP - public override void MapInplace(Func f, Zeros zeros = Zeros.AllowSkip) + public override void MapInplace(Func f, Zeros zeros) { var indices = new List(); var values = new List(ValueCount); @@ -810,7 +810,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage ValueCount = values.Count; } - public override void MapIndexedInplace(Func f, Zeros zeros = Zeros.AllowSkip) + public override void MapIndexedInplace(Func f, Zeros zeros) { var indices = new List(); var values = new List(ValueCount); diff --git a/src/Numerics/LinearAlgebra/Storage/VectorStorage.cs b/src/Numerics/LinearAlgebra/Storage/VectorStorage.cs index b979b455..90d36625 100644 --- a/src/Numerics/LinearAlgebra/Storage/VectorStorage.cs +++ b/src/Numerics/LinearAlgebra/Storage/VectorStorage.cs @@ -481,7 +481,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage // FUNCTIONAL COMBINATORS: MAP - public virtual void MapInplace(Func f, Zeros zeros = Zeros.AllowSkip) + public virtual void MapInplace(Func f, Zeros zeros) { for (int i = 0; i < Length; i++) { @@ -489,7 +489,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage } } - public virtual void MapIndexedInplace(Func f, Zeros zeros = Zeros.AllowSkip) + public virtual void MapIndexedInplace(Func f, Zeros zeros) { for (int i = 0; i < Length; i++) { @@ -497,8 +497,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage } } - public void MapTo(VectorStorage target, Func f, - Zeros zeros = Zeros.AllowSkip, ExistingData existingData = ExistingData.Clear) + public void MapTo(VectorStorage target, Func f, Zeros zeros, ExistingData existingData) where TU : struct, IEquatable, IFormattable { if (target == null) @@ -523,8 +522,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage } } - public void MapIndexedTo(VectorStorage target, Func f, - Zeros zeros = Zeros.AllowSkip, ExistingData existingData = ExistingData.Clear) + public void MapIndexedTo(VectorStorage target, Func f, Zeros zeros, ExistingData existingData) where TU : struct, IEquatable, IFormattable { if (target == null) @@ -549,8 +547,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage } } - public void Map2To(VectorStorage target, VectorStorage other, Func f, - Zeros zeros = Zeros.AllowSkip, ExistingData existingData = ExistingData.Clear) + public void Map2To(VectorStorage target, VectorStorage other, Func f, Zeros zeros, ExistingData existingData) { if (target == null) { @@ -585,7 +582,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage // FUNCTIONAL COMBINATORS: FOLD - public TState Fold2(VectorStorage other, Func f, TState state, Zeros zeros = Zeros.AllowSkip) + public TState Fold2(VectorStorage other, Func f, TState state, Zeros zeros) where TOther : struct, IEquatable, IFormattable { if (other == null) diff --git a/src/UnitTests/LinearAlgebraTests/MatrixStorageCombinatorsTests.cs b/src/UnitTests/LinearAlgebraTests/MatrixStorageCombinatorsTests.cs index bc6ace62..5d662176 100644 --- a/src/UnitTests/LinearAlgebraTests/MatrixStorageCombinatorsTests.cs +++ b/src/UnitTests/LinearAlgebraTests/MatrixStorageCombinatorsTests.cs @@ -50,7 +50,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests var a = TestData.MatrixStorage(aType, new[,] { {1.0, 2.0}, {0.0, 4.0} }); var result = TestData.MatrixStorage(resultType, 2, 2); var expected = DenseColumnMajorMatrixStorage.OfArray(new[,] { {-1.0, -2.0}, {0.0, -4.0} }); - a.MapTo(result, u => -u, Zeros.AllowSkip); + a.MapTo(result, u => -u, Zeros.AllowSkip, ExistingData.Clear); Assert.That(result.Equals(expected)); } @@ -60,7 +60,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests var a = TestData.MatrixStorage(aType, new[,] { {1.0, 2.0}, {0.0, 4.0} }); var result = TestData.MatrixStorage(resultType, 2, 2); var expected = DenseColumnMajorMatrixStorage.OfArray(new[,] { {0.0, -1.0}, {1.0, -3.0} }); - a.MapTo(result, u => -u + 1.0, Zeros.Include); + a.MapTo(result, u => -u + 1.0, Zeros.Include, ExistingData.Clear); Assert.That(result.Equals(expected)); } @@ -70,7 +70,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests var a = TestData.MatrixStorage(aType, new[,] { { 1.0, 2.0 }, { 0.0, 4.0 } }); var result = TestData.MatrixStorage(resultType, 2, 2); var expected = DenseColumnMajorMatrixStorage.OfArray(new[,] { {0.0, -1.0}, {1.0, -3.0} }); - a.MapTo(result, u => -u + 1.0, Zeros.AllowSkip); + a.MapTo(result, u => -u + 1.0, Zeros.AllowSkip, ExistingData.Clear); Assert.That(result.Equals(expected)); } @@ -81,7 +81,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests var result = TestData.MatrixStorage(resultType, 2, 2); var expected = DenseColumnMajorMatrixStorage.OfArray(new[,] { {-1.0, -2.0}, {0.0, -4.0} }); int badValueCount = 0; // one time is OK for zero-check - a.MapIndexedTo(result, (i, j, u) => { if (a.At(i, j) != u) Interlocked.Increment(ref badValueCount); return -u; }, Zeros.AllowSkip); + a.MapIndexedTo(result, (i, j, u) => { if (a.At(i, j) != u) Interlocked.Increment(ref badValueCount); return -u; }, Zeros.AllowSkip, ExistingData.Clear); Assert.That(badValueCount, Is.LessThanOrEqualTo(1)); Assert.That(result.Equals(expected)); } @@ -93,7 +93,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests var result = TestData.MatrixStorage(resultType, 2, 2); var expected = DenseColumnMajorMatrixStorage.OfArray(new[,] { {0.0, -1.0}, {1.0, -3.0} }); int badValueCount = 0; // one time is OK for zero-check - a.MapIndexedTo(result, (i, j, u) => { if (a.At(i, j) != u) Interlocked.Increment(ref badValueCount); return -u + 1.0; }, Zeros.Include); + a.MapIndexedTo(result, (i, j, u) => { if (a.At(i, j) != u) Interlocked.Increment(ref badValueCount); return -u + 1.0; }, Zeros.Include, ExistingData.Clear); Assert.That(badValueCount, Is.LessThanOrEqualTo(1)); Assert.That(result.Equals(expected)); } @@ -105,7 +105,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests var result = TestData.MatrixStorage(resultType, 2, 2); var expected = DenseColumnMajorMatrixStorage.OfArray(new[,] { {0.0, -1.0}, {1.0, -3.0} }); int badValueCount = 0; // one time is OK for zero-check - a.MapIndexedTo(result, (i, j, u) => { if (a.At(i, j) != u) Interlocked.Increment(ref badValueCount); return -u + 1.0; }, Zeros.AllowSkip); + a.MapIndexedTo(result, (i, j, u) => { if (a.At(i, j) != u) Interlocked.Increment(ref badValueCount); return -u + 1.0; }, Zeros.AllowSkip, ExistingData.Clear); Assert.That(badValueCount, Is.LessThanOrEqualTo(1)); Assert.That(result.Equals(expected)); } diff --git a/src/UnitTests/LinearAlgebraTests/VectorStorageCombinatorsTests.cs b/src/UnitTests/LinearAlgebraTests/VectorStorageCombinatorsTests.cs index 8b58af82..12be7621 100644 --- a/src/UnitTests/LinearAlgebraTests/VectorStorageCombinatorsTests.cs +++ b/src/UnitTests/LinearAlgebraTests/VectorStorageCombinatorsTests.cs @@ -50,7 +50,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests var a = TestData.VectorStorage(aType, new[] { 1.0, 2.0, 0.0, 4.0 }); var result = TestData.VectorStorage(resultType, 4); var expected = new DenseVectorStorage(4, new[] { -1.0, -2.0, 0.0, -4.0 }); - a.MapTo(result, u => -u, Zeros.AllowSkip); + a.MapTo(result, u => -u, Zeros.AllowSkip, ExistingData.Clear); Assert.That(result.Equals(expected)); } @@ -60,7 +60,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests var a = TestData.VectorStorage(aType, new[] { 1.0, 2.0, 0.0, 4.0 }); var result = TestData.VectorStorage(resultType, 4); var expected = new DenseVectorStorage(4, new[] { 0.0, -1.0, 1.0, -3.0 }); - a.MapTo(result, u => -u + 1.0, Zeros.Include); + a.MapTo(result, u => -u + 1.0, Zeros.Include, ExistingData.Clear); Assert.That(result.Equals(expected)); } @@ -70,7 +70,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests var a = TestData.VectorStorage(aType, new[] { 1.0, 2.0, 0.0, 4.0 }); var result = TestData.VectorStorage(resultType, 4); var expected = new DenseVectorStorage(4, new[] { 0.0, -1.0, 1.0, -3.0 }); - a.MapTo(result, u => -u + 1.0, Zeros.AllowSkip); + a.MapTo(result, u => -u + 1.0, Zeros.AllowSkip, ExistingData.Clear); Assert.That(result.Equals(expected)); } @@ -81,7 +81,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests var result = TestData.VectorStorage(resultType, 4); var expected = new DenseVectorStorage(4, new[] { -1.0, -2.0, 0.0, -4.0 }); int badValueCount = 0; // one time is OK for zero-check - a.MapIndexedTo(result, (i, u) => { if (a.At(i) != u) Interlocked.Increment(ref badValueCount); return -u; }, Zeros.AllowSkip); + a.MapIndexedTo(result, (i, u) => { if (a.At(i) != u) Interlocked.Increment(ref badValueCount); return -u; }, Zeros.AllowSkip, ExistingData.Clear); Assert.That(badValueCount, Is.LessThanOrEqualTo(1)); Assert.That(result.Equals(expected)); } @@ -93,7 +93,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests var result = TestData.VectorStorage(resultType, 4); var expected = new DenseVectorStorage(4, new[] { 0.0, -1.0, 1.0, -3.0 }); int badValueCount = 0; // one time is OK for zero-check - a.MapIndexedTo(result, (i, u) => { if (a.At(i) != u) Interlocked.Increment(ref badValueCount); return -u + 1.0; }, Zeros.Include); + a.MapIndexedTo(result, (i, u) => { if (a.At(i) != u) Interlocked.Increment(ref badValueCount); return -u + 1.0; }, Zeros.Include, ExistingData.Clear); Assert.That(badValueCount, Is.LessThanOrEqualTo(1)); Assert.That(result.Equals(expected)); } @@ -105,7 +105,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests var result = TestData.VectorStorage(resultType, 4); var expected = new DenseVectorStorage(4, new[] { 0.0, -1.0, 1.0, -3.0 }); int badValueCount = 0; // one time is OK for zero-check - a.MapIndexedTo(result, (i, u) => { if (a.At(i) != u) Interlocked.Increment(ref badValueCount); return -u + 1.0; }, Zeros.AllowSkip); + a.MapIndexedTo(result, (i, u) => { if (a.At(i) != u) Interlocked.Increment(ref badValueCount); return -u + 1.0; }, Zeros.AllowSkip, ExistingData.Clear); Assert.That(badValueCount, Is.LessThanOrEqualTo(1)); Assert.That(result.Equals(expected)); } @@ -117,7 +117,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests var b = TestData.VectorStorage(bType, new[] { 11.0, 12.0, 13.0, 0.0, 0.0, 16.0 }); var result = TestData.VectorStorage(resultType, 6); var expected = new DenseVectorStorage(6, new[] { 12.0, 14.0, 13.0, 4.0, 0.0, 22.0 }); - a.Map2To(result, b, (u, v) => u + v, Zeros.AllowSkip); + a.Map2To(result, b, (u, v) => u + v, Zeros.AllowSkip, ExistingData.Clear); Assert.That(result.Equals(expected)); } @@ -128,7 +128,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests var b = TestData.VectorStorage(bType, new[] { 11.0, 12.0, 13.0, 0.0, 0.0, 16.0 }); var result = TestData.VectorStorage(resultType, 6); var expected = new DenseVectorStorage(6, new[] { 13.0, 15.0, 14.0, 5.0, 1.0, 23.0 }); - a.Map2To(result, b, (u, v) => u + v + 1.0, Zeros.Include); + a.Map2To(result, b, (u, v) => u + v + 1.0, Zeros.Include, ExistingData.Clear); Assert.That(result.Equals(expected)); } @@ -139,7 +139,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests var b = TestData.VectorStorage(bType, new[] { 11.0, 12.0, 13.0, 0.0, 0.0, 16.0 }); var result = TestData.VectorStorage(resultType, 6); var expected = new DenseVectorStorage(6, new[] { 13.0, 15.0, 14.0, 5.0, 1.0, 23.0 }); - a.Map2To(result, b, (u, v) => u + v + 1.0, Zeros.AllowSkip); + a.Map2To(result, b, (u, v) => u + v + 1.0, Zeros.AllowSkip, ExistingData.Clear); Assert.That(result.Equals(expected)); }