tsai
/
mathnet-numerics
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

LA: Storage providers must always force all parameters (no defaults)

build
Christoph Ruegg 10 years ago
parent
ae31d3a7b5
commit
c8efac9cc0
9 changed files with 38 additions and 43 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/Numerics/LinearAlgebra/Storage/DenseColumnMajorMatrixStorage.cs
  2. 4
      src/Numerics/LinearAlgebra/Storage/DenseVectorStorage.cs
  3. 4
      src/Numerics/LinearAlgebra/Storage/DiagonalMatrixStorage.cs
  4. 16
      src/Numerics/LinearAlgebra/Storage/MatrixStorage.cs
  5. 4
      src/Numerics/LinearAlgebra/Storage/SparseCompressedRowMatrixStorage.cs
  6. 4
      src/Numerics/LinearAlgebra/Storage/SparseVectorStorage.cs
  7. 15
      src/Numerics/LinearAlgebra/Storage/VectorStorage.cs
  8. 12
      src/UnitTests/LinearAlgebraTests/MatrixStorageCombinatorsTests.cs
  9. 18
      src/UnitTests/LinearAlgebraTests/VectorStorageCombinatorsTests.cs

4
src/Numerics/LinearAlgebra/Storage/DenseColumnMajorMatrixStorage.cs
View File

@ -819,7 +819,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage
// FUNCTIONAL COMBINATORS: MAP
public override void MapInplace(Func<T, T> f, Zeros zeros = Zeros.AllowSkip)
public override void MapInplace(Func<T, T> 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<int, int, T, T> f, Zeros zeros = Zeros.AllowSkip)
public override void MapIndexedInplace(Func<int, int, T, T> f, Zeros zeros)
{
CommonParallel.For(0, ColumnCount, Math.Max(4096/RowCount, 32), (a, b) =>
{

4
src/Numerics/LinearAlgebra/Storage/DenseVectorStorage.cs
View File

@ -438,7 +438,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage
// FUNCTIONAL COMBINATORS: MAP
public override void MapInplace(Func<T, T> f, Zeros zeros = Zeros.AllowSkip)
public override void MapInplace(Func<T, T> 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<int, T, T> f, Zeros zeros = Zeros.AllowSkip)
public override void MapIndexedInplace(Func<int, T, T> f, Zeros zeros)
{
CommonParallel.For(0, Data.Length, 4096, (a, b) =>
{

4
src/Numerics/LinearAlgebra/Storage/DiagonalMatrixStorage.cs
View File

@ -735,7 +735,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage
// FUNCTIONAL COMBINATORS: MAP
public override void MapInplace(Func<T, T> f, Zeros zeros = Zeros.AllowSkip)
public override void MapInplace(Func<T, T> f, Zeros zeros)
{
if (zeros == Zeros.Include)
{
@ -751,7 +751,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage
});
}
public override void MapIndexedInplace(Func<int, int, T, T> f, Zeros zeros = Zeros.AllowSkip)
public override void MapIndexedInplace(Func<int, int, T, T> f, Zeros zeros)
{
if (zeros == Zeros.Include)
{

16
src/Numerics/LinearAlgebra/Storage/MatrixStorage.cs
View File

@ -718,7 +718,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage
// FUNCTIONAL COMBINATORS: MAP
public virtual void MapInplace(Func<T, T> f, Zeros zeros = Zeros.AllowSkip)
public virtual void MapInplace(Func<T, T> f, Zeros zeros)
{
for (int i = 0; i < RowCount; i++)
{
@ -729,7 +729,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage
}
}
public virtual void MapIndexedInplace(Func<int, int, T, T> f, Zeros zeros = Zeros.AllowSkip)
public virtual void MapIndexedInplace(Func<int, int, T, T> f, Zeros zeros)
{
for (int i = 0; i < RowCount; i++)
{
@ -740,8 +740,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage
}
}
public void MapTo<TU>(MatrixStorage<TU> target, Func<T, TU> f,
Zeros zeros = Zeros.AllowSkip, ExistingData existingData = ExistingData.Clear)
public void MapTo<TU>(MatrixStorage<TU> target, Func<T, TU> f, Zeros zeros, ExistingData existingData)
where TU : struct, IEquatable<TU>, IFormattable
{
if (target == null)
@ -770,8 +769,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage
}
}
public void MapIndexedTo<TU>(MatrixStorage<TU> target, Func<int, int, T, TU> f,
Zeros zeros = Zeros.AllowSkip, ExistingData existingData = ExistingData.Clear)
public void MapIndexedTo<TU>(MatrixStorage<TU> target, Func<int, int, T, TU> f, Zeros zeros, ExistingData existingData)
where TU : struct, IEquatable<TU>, IFormattable
{
if (target == null)
@ -803,7 +801,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage
public void MapSubMatrixIndexedTo<TU>(MatrixStorage<TU> target, Func<int, int, T, TU> 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<TU>, IFormattable
{
if (target == null)
@ -884,7 +882,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage
// FUNCTIONAL COMBINATORS: FOLD
/// <remarks>The state array will not be modified, unless it is the same instance as the target array (which is allowed).</remarks>
public void FoldByRow<TU>(TU[] target, Func<TU, T, TU> f, Func<TU, int, TU> finalize, TU[] state, Zeros zeros = Zeros.AllowSkip)
public void FoldByRow<TU>(TU[] target, Func<TU, T, TU> f, Func<TU, int, TU> finalize, TU[] state, Zeros zeros)
{
if (target == null)
{
@ -922,7 +920,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage
}
/// <remarks>The state array will not be modified, unless it is the same instance as the target array (which is allowed).</remarks>
public void FoldByColumn<TU>(TU[] target, Func<TU, T, TU> f, Func<TU, int, TU> finalize, TU[] state, Zeros zeros = Zeros.AllowSkip)
public void FoldByColumn<TU>(TU[] target, Func<TU, T, TU> f, Func<TU, int, TU> finalize, TU[] state, Zeros zeros)
{
if (target == null)
{

4
src/Numerics/LinearAlgebra/Storage/SparseCompressedRowMatrixStorage.cs
View File

@ -1604,7 +1604,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage
// FUNCTIONAL COMBINATORS: MAP
public override void MapInplace(Func<T, T> f, Zeros zeros = Zeros.AllowSkip)
public override void MapInplace(Func<T, T> 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<int, int, T, T> f, Zeros zeros = Zeros.AllowSkip)
public override void MapIndexedInplace(Func<int, int, T, T> f, Zeros zeros)
{
if (zeros == Zeros.Include || !Zero.Equals(f(0, 1, Zero)))
{

4
src/Numerics/LinearAlgebra/Storage/SparseVectorStorage.cs
View File

@ -776,7 +776,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage
// FUNCTIONAL COMBINATORS: MAP
public override void MapInplace(Func<T, T> f, Zeros zeros = Zeros.AllowSkip)
public override void MapInplace(Func<T, T> f, Zeros zeros)
{
var indices = new List<int>();
var values = new List<T>(ValueCount);
@ -810,7 +810,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage
ValueCount = values.Count;
}
public override void MapIndexedInplace(Func<int, T, T> f, Zeros zeros = Zeros.AllowSkip)
public override void MapIndexedInplace(Func<int, T, T> f, Zeros zeros)
{
var indices = new List<int>();
var values = new List<T>(ValueCount);

15
src/Numerics/LinearAlgebra/Storage/VectorStorage.cs
View File

@ -481,7 +481,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage
// FUNCTIONAL COMBINATORS: MAP
public virtual void MapInplace(Func<T, T> f, Zeros zeros = Zeros.AllowSkip)
public virtual void MapInplace(Func<T, T> f, Zeros zeros)
{
for (int i = 0; i < Length; i++)
{
@ -489,7 +489,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage
}
}
public virtual void MapIndexedInplace(Func<int, T, T> f, Zeros zeros = Zeros.AllowSkip)
public virtual void MapIndexedInplace(Func<int, T, T> f, Zeros zeros)
{
for (int i = 0; i < Length; i++)
{
@ -497,8 +497,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage
}
}
public void MapTo<TU>(VectorStorage<TU> target, Func<T, TU> f,
Zeros zeros = Zeros.AllowSkip, ExistingData existingData = ExistingData.Clear)
public void MapTo<TU>(VectorStorage<TU> target, Func<T, TU> f, Zeros zeros, ExistingData existingData)
where TU : struct, IEquatable<TU>, IFormattable
{
if (target == null)
@ -523,8 +522,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage
}
}
public void MapIndexedTo<TU>(VectorStorage<TU> target, Func<int, T, TU> f,
Zeros zeros = Zeros.AllowSkip, ExistingData existingData = ExistingData.Clear)
public void MapIndexedTo<TU>(VectorStorage<TU> target, Func<int, T, TU> f, Zeros zeros, ExistingData existingData)
where TU : struct, IEquatable<TU>, IFormattable
{
if (target == null)
@ -549,8 +547,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage
}
}
public void Map2To(VectorStorage<T> target, VectorStorage<T> other, Func<T, T, T> f,
Zeros zeros = Zeros.AllowSkip, ExistingData existingData = ExistingData.Clear)
public void Map2To(VectorStorage<T> target, VectorStorage<T> other, Func<T, T, T> f, Zeros zeros, ExistingData existingData)
{
if (target == null)
{
@ -585,7 +582,7 @@ namespace MathNet.Numerics.LinearAlgebra.Storage
// FUNCTIONAL COMBINATORS: FOLD
public TState Fold2<TOther, TState>(VectorStorage<TOther> other, Func<TState, T, TOther, TState> f, TState state, Zeros zeros = Zeros.AllowSkip)
public TState Fold2<TOther, TState>(VectorStorage<TOther> other, Func<TState, T, TOther, TState> f, TState state, Zeros zeros)
where TOther : struct, IEquatable<TOther>, IFormattable
{
if (other == null)

12
src/UnitTests/LinearAlgebraTests/MatrixStorageCombinatorsTests.cs
View File

@ -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<double>(resultType, 2, 2);
var expected = DenseColumnMajorMatrixStorage<double>.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<double>(resultType, 2, 2);
var expected = DenseColumnMajorMatrixStorage<double>.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<double>(resultType, 2, 2);
var expected = DenseColumnMajorMatrixStorage<double>.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<double>(resultType, 2, 2);
var expected = DenseColumnMajorMatrixStorage<double>.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<double>(resultType, 2, 2);
var expected = DenseColumnMajorMatrixStorage<double>.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<double>(resultType, 2, 2);
var expected = DenseColumnMajorMatrixStorage<double>.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));
}

18
src/UnitTests/LinearAlgebraTests/VectorStorageCombinatorsTests.cs
View File

@ -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<double>(resultType, 4);
var expected = new DenseVectorStorage<double>(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<double>(resultType, 4);
var expected = new DenseVectorStorage<double>(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<double>(resultType, 4);
var expected = new DenseVectorStorage<double>(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<double>(resultType, 4);
var expected = new DenseVectorStorage<double>(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<double>(resultType, 4);
var expected = new DenseVectorStorage<double>(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<double>(resultType, 4);
var expected = new DenseVectorStorage<double>(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<double>(resultType, 6);
var expected = new DenseVectorStorage<double>(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<double>(resultType, 6);
var expected = new DenseVectorStorage<double>(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<double>(resultType, 6);
var expected = new DenseVectorStorage<double>(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));
}

Write Preview
Loading…
Cancel
Save