Browse Source

cleaned up matrix names

la-knuth
Marcus Cuda 17 years ago
parent
commit
3a624c586d
  1. 4
      src/Numerics/LinearAlgebra/Double/Factorization/LU.cs
  2. 4
      src/Numerics/LinearAlgebra/Double/Matrix.Arithmetic.cs
  3. 521
      src/Numerics/LinearAlgebra/Double/Matrix.cs
  4. 6
      src/UnitTests/LinearAlgebraTests/Double/LinearAlgebraProviderTests.cs
  5. 14
      src/UnitTests/LinearAlgebraTests/Double/MatrixTests.Arithmetic.cs
  6. 48
      src/UnitTests/LinearAlgebraTests/Double/MatrixTests.cs

4
src/Numerics/LinearAlgebra/Double/Factorization/LU.cs

@ -78,7 +78,7 @@ namespace MathNet.Numerics.LinearAlgebra.Double.Factorization
{ {
get get
{ {
Matrix result = mFactors.GetLowerTriangle(); Matrix result = mFactors.LowerTriangle();
for (int i = 0; i < result.RowCount; i++) for (int i = 0; i < result.RowCount; i++)
{ {
result.At(i, i, 1); result.At(i, i, 1);
@ -92,7 +92,7 @@ namespace MathNet.Numerics.LinearAlgebra.Double.Factorization
/// </summary> /// </summary>
public virtual Matrix U public virtual Matrix U
{ {
get { return mFactors.GetUpperTriangle(); } get { return mFactors.UpperTriangle(); }
} }
/// <summary> /// <summary>

4
src/Numerics/LinearAlgebra/Double/Matrix.Arithmetic.cs

@ -925,7 +925,7 @@ namespace MathNet.Numerics.LinearAlgebra.Double
this.ColumnCount, this.ColumnCount,
i => i =>
{ {
var coli = this.GetColumn(i); var coli = this.Column(i);
var norm = coli.NormP(p); var norm = coli.NormP(p);
for (var j = 0; j < this.RowCount; j++) for (var j = 0; j < this.RowCount; j++)
{ {
@ -954,7 +954,7 @@ namespace MathNet.Numerics.LinearAlgebra.Double
this.ColumnCount, this.ColumnCount,
j => j =>
{ {
var rowj = this.GetRow(j); var rowj = this.Row(j);
var norm = rowj.NormP(p); var norm = rowj.NormP(p);
for (var i = 0; i < this.RowCount; i++) for (var i = 0; i < this.RowCount; i++)
{ {

521
src/Numerics/LinearAlgebra/Double/Matrix.cs

File diff suppressed because it is too large

6
src/UnitTests/LinearAlgebraTests/Double/LinearAlgebraProviderTests.cs

@ -157,7 +157,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
{ {
for (int j = 0; j < c.ColumnCount; j++) for (int j = 0; j < c.ColumnCount; j++)
{ {
AssertHelpers.AlmostEqual(x.GetRow(i) * y.GetColumn(j), c[i, j], 15); AssertHelpers.AlmostEqual(x.Row(i) * y.Column(j), c[i, j], 15);
} }
} }
} }
@ -180,7 +180,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
{ {
for (int j = 0; j < c.ColumnCount; j++) for (int j = 0; j < c.ColumnCount; j++)
{ {
AssertHelpers.AlmostEqual(2 * (x.GetRow(i) * y.GetColumn(j)), c[i, j], 15); AssertHelpers.AlmostEqual(2 * (x.Row(i) * y.Column(j)), c[i, j], 15);
} }
} }
@ -190,7 +190,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
{ {
for (int j = 0; j < c.ColumnCount; j++) for (int j = 0; j < c.ColumnCount; j++)
{ {
AssertHelpers.AlmostEqual(4 * (x.GetRow(i) * y.GetColumn(j)), c[i, j], 15); AssertHelpers.AlmostEqual(4 * (x.Row(i) * y.Column(j)), c[i, j], 15);
} }
} }
} }

14
src/UnitTests/LinearAlgebraTests/Double/MatrixTests.Arithmetic.cs

@ -64,7 +64,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
for (var i = 0; i < A.RowCount; i++) for (var i = 0; i < A.RowCount; i++)
{ {
var ar = A.GetRow(i); var ar = A.Row(i);
var dot = ar * x; var dot = ar * x;
Assert.AreEqual(dot, y[i]); Assert.AreEqual(dot, y[i]);
} }
@ -80,7 +80,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
for (var i = 0; i < A.RowCount; i++) for (var i = 0; i < A.RowCount; i++)
{ {
var ar = A.GetRow(i); var ar = A.Row(i);
var dot = ar * x; var dot = ar * x;
Assert.AreEqual(dot, y[i]); Assert.AreEqual(dot, y[i]);
} }
@ -99,7 +99,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
y = new DenseVector(new[] { 1.0, 2.0, 3.0 }); y = new DenseVector(new[] { 1.0, 2.0, 3.0 });
for (var i = 0; i < A.RowCount; i++) for (var i = 0; i < A.RowCount; i++)
{ {
var ar = A.GetRow(i); var ar = A.Row(i);
var dot = ar * y; var dot = ar * y;
Assert.AreEqual(dot, x[i]); Assert.AreEqual(dot, x[i]);
} }
@ -446,7 +446,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
{ {
for (var j = 0; j < C.ColumnCount; j++) for (var j = 0; j < C.ColumnCount; j++)
{ {
AssertHelpers.AlmostEqual(A.GetRow(i) * B.GetColumn(j), C[i, j], 15); AssertHelpers.AlmostEqual(A.Row(i) * B.Column(j), C[i, j], 15);
} }
} }
} }
@ -499,7 +499,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
{ {
for (var j = 0; j < C.ColumnCount; j++) for (var j = 0; j < C.ColumnCount; j++)
{ {
AssertHelpers.AlmostEqual(A.GetRow(i) * B.GetColumn(j), C[i, j], 15); AssertHelpers.AlmostEqual(A.Row(i) * B.Column(j), C[i, j], 15);
} }
} }
} }
@ -631,7 +631,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
var result = matrix.NormalizeColumns(pValue); var result = matrix.NormalizeColumns(pValue);
for (var j = 0; j < result.ColumnCount; j++) for (var j = 0; j < result.ColumnCount; j++)
{ {
var col = result.GetColumn(j); var col = result.Column(j);
Assert.AreApproximatelyEqual(1.0, col.NormP(pValue), 10e-12); Assert.AreApproximatelyEqual(1.0, col.NormP(pValue), 10e-12);
} }
} }
@ -645,7 +645,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
var matrix = this.testMatrices["Singular3x3"].NormalizeRows(pValue); var matrix = this.testMatrices["Singular3x3"].NormalizeRows(pValue);
for (var i = 0; i < matrix.RowCount; i++) for (var i = 0; i < matrix.RowCount; i++)
{ {
var row = matrix.GetRow(i); var row = matrix.Row(i);
Assert.AreApproximatelyEqual(1.0, row.NormP(pValue), 10e-12); Assert.AreApproximatelyEqual(1.0, row.NormP(pValue), 10e-12);
} }
} }

48
src/UnitTests/LinearAlgebraTests/Double/MatrixTests.cs

@ -238,7 +238,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
public void CanGetRow(int rowIndex, string name) public void CanGetRow(int rowIndex, string name)
{ {
var matrix = this.testMatrices[name]; var matrix = this.testMatrices[name];
var row = matrix.GetRow(rowIndex); var row = matrix.Row(rowIndex);
Assert.AreEqual(matrix.ColumnCount, row.Count); Assert.AreEqual(matrix.ColumnCount, row.Count);
for (var j = 0; j < matrix.ColumnCount; j++) for (var j = 0; j < matrix.ColumnCount; j++)
@ -252,7 +252,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
public void GetRowThrowsArgumentOutOfRangeWithNegativeIndex() public void GetRowThrowsArgumentOutOfRangeWithNegativeIndex()
{ {
var matrix = this.testMatrices["Singular3x3"]; var matrix = this.testMatrices["Singular3x3"];
matrix.GetRow(-1); matrix.Row(-1);
} }
[Test] [Test]
@ -260,7 +260,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
public void GetRowThrowsArgumentOutOfRangeWithOverflowingRowIndex() public void GetRowThrowsArgumentOutOfRangeWithOverflowingRowIndex()
{ {
var matrix = this.testMatrices["Singular3x3"]; var matrix = this.testMatrices["Singular3x3"];
matrix.GetRow(matrix.RowCount); matrix.Row(matrix.RowCount);
} }
[Test] [Test]
@ -272,7 +272,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
{ {
var matrix = this.testMatrices[name]; var matrix = this.testMatrices[name];
var row = CreateVector(matrix.ColumnCount); var row = CreateVector(matrix.ColumnCount);
matrix.GetRow(rowIndex, row); matrix.Row(rowIndex, row);
Assert.AreEqual(matrix.ColumnCount, row.Count); Assert.AreEqual(matrix.ColumnCount, row.Count);
for (var j = 0; j < matrix.ColumnCount; j++) for (var j = 0; j < matrix.ColumnCount; j++)
@ -286,7 +286,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
public void GetRowWithResultFailsWhenResultIsNull() public void GetRowWithResultFailsWhenResultIsNull()
{ {
var matrix = this.testMatrices["Singular3x3"]; var matrix = this.testMatrices["Singular3x3"];
matrix.GetRow(0, null); matrix.Row(0, null);
} }
[Test] [Test]
@ -295,7 +295,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
{ {
var matrix = this.testMatrices["Singular3x3"]; var matrix = this.testMatrices["Singular3x3"];
var row = CreateVector(matrix.ColumnCount); var row = CreateVector(matrix.ColumnCount);
matrix.GetRow(-1, row); matrix.Row(-1, row);
} }
[Test] [Test]
@ -304,7 +304,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
{ {
var matrix = this.testMatrices["Singular3x3"]; var matrix = this.testMatrices["Singular3x3"];
var row = CreateVector(matrix.ColumnCount); var row = CreateVector(matrix.ColumnCount);
matrix.GetRow(matrix.RowCount, row); matrix.Row(matrix.RowCount, row);
} }
[Test] [Test]
@ -315,7 +315,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
public void CanGetRowWithRange(int rowIndex, int start, int length, string name) public void CanGetRowWithRange(int rowIndex, int start, int length, string name)
{ {
var matrix = this.testMatrices[name]; var matrix = this.testMatrices[name];
var row = matrix.GetRow(rowIndex, start, length); var row = matrix.Row(rowIndex, start, length);
Assert.AreEqual(length, row.Count); Assert.AreEqual(length, row.Count);
for (var j = start; j < start + length; j++) for (var j = start; j < start + length; j++)
@ -330,7 +330,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
{ {
var matrix = this.testMatrices["Singular3x3"]; var matrix = this.testMatrices["Singular3x3"];
var result = CreateVector(matrix.ColumnCount); var result = CreateVector(matrix.ColumnCount);
matrix.GetRow(0, 0, 0, result); matrix.Row(0, 0, 0, result);
} }
[Test] [Test]
@ -339,7 +339,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
{ {
var matrix = this.testMatrices["Singular3x3"]; var matrix = this.testMatrices["Singular3x3"];
var result = this.CreateVector(matrix.ColumnCount - 1); var result = this.CreateVector(matrix.ColumnCount - 1);
matrix.GetRow(0, 0, 0, result); matrix.Row(0, 0, 0, result);
} }
[Test] [Test]
@ -350,7 +350,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
public void CanGetColumn(int colIndex, string name) public void CanGetColumn(int colIndex, string name)
{ {
var matrix = this.testMatrices[name]; var matrix = this.testMatrices[name];
var col = matrix.GetColumn(colIndex); var col = matrix.Column(colIndex);
Assert.AreEqual(matrix.RowCount, col.Count); Assert.AreEqual(matrix.RowCount, col.Count);
for (var j = 0; j < matrix.RowCount; j++) for (var j = 0; j < matrix.RowCount; j++)
@ -364,7 +364,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
public void GetColumnThrowsArgumentOutOfRangeWithNegativeIndex() public void GetColumnThrowsArgumentOutOfRangeWithNegativeIndex()
{ {
var matrix = this.testMatrices["Singular3x3"]; var matrix = this.testMatrices["Singular3x3"];
matrix.GetColumn(-1); matrix.Column(-1);
} }
[Test] [Test]
@ -372,7 +372,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
public void GetColumnThrowsArgumentOutOfRangeWithOverflowingRowIndex() public void GetColumnThrowsArgumentOutOfRangeWithOverflowingRowIndex()
{ {
var matrix = this.testMatrices["Singular3x3"]; var matrix = this.testMatrices["Singular3x3"];
matrix.GetColumn(matrix.ColumnCount); matrix.Column(matrix.ColumnCount);
} }
[Test] [Test]
@ -384,7 +384,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
{ {
var matrix = this.testMatrices[name]; var matrix = this.testMatrices[name];
var col = CreateVector(matrix.RowCount); var col = CreateVector(matrix.RowCount);
matrix.GetColumn(colIndex, col); matrix.Column(colIndex, col);
Assert.AreEqual(matrix.RowCount, col.Count); Assert.AreEqual(matrix.RowCount, col.Count);
for (var j = 0; j < matrix.RowCount; j++) for (var j = 0; j < matrix.RowCount; j++)
@ -398,7 +398,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
public void GetColumnFailsWhenResultIsNull() public void GetColumnFailsWhenResultIsNull()
{ {
var matrix = this.testMatrices["Singular3x3"]; var matrix = this.testMatrices["Singular3x3"];
matrix.GetColumn(0, null); matrix.Column(0, null);
} }
[Test] [Test]
@ -407,7 +407,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
{ {
var matrix = this.testMatrices["Singular3x3"]; var matrix = this.testMatrices["Singular3x3"];
var column = CreateVector(matrix.ColumnCount); var column = CreateVector(matrix.ColumnCount);
matrix.GetColumn(-1, column); matrix.Column(-1, column);
} }
[Test] [Test]
@ -416,7 +416,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
{ {
var matrix = this.testMatrices["Singular3x3"]; var matrix = this.testMatrices["Singular3x3"];
var column = CreateVector(matrix.RowCount); var column = CreateVector(matrix.RowCount);
matrix.GetRow(matrix.ColumnCount, column); matrix.Row(matrix.ColumnCount, column);
} }
[Test] [Test]
@ -427,7 +427,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
public void CanGetColumnWithRange(int colIndex, int start, int length, string name) public void CanGetColumnWithRange(int colIndex, int start, int length, string name)
{ {
var matrix = this.testMatrices[name]; var matrix = this.testMatrices[name];
var col = matrix.GetColumn(colIndex, start, length); var col = matrix.Column(colIndex, start, length);
Assert.AreEqual(length, col.Count); Assert.AreEqual(length, col.Count);
for (var j = start; j < start + length; j++) for (var j = start; j < start + length; j++)
@ -442,7 +442,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
{ {
var matrix = this.testMatrices["Singular3x3"]; var matrix = this.testMatrices["Singular3x3"];
var col = CreateVector(matrix.RowCount); var col = CreateVector(matrix.RowCount);
matrix.GetColumn(0, 0, 0, col); matrix.Column(0, 0, 0, col);
} }
[Test] [Test]
@ -451,7 +451,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
{ {
var matrix = this.testMatrices["Singular3x3"]; var matrix = this.testMatrices["Singular3x3"];
var result = this.CreateVector(matrix.RowCount - 1); var result = this.CreateVector(matrix.RowCount - 1);
matrix.GetColumn(0, 0, matrix.RowCount, result); matrix.Column(0, 0, matrix.RowCount, result);
} }
[Test] [Test]
@ -517,7 +517,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
{ {
var data = this.testMatrices[name]; var data = this.testMatrices[name];
var result = this.CreateMatrix(data.RowCount, data.ColumnCount); var result = this.CreateMatrix(data.RowCount, data.ColumnCount);
var lower = data.GetUpperTriangle(); var lower = data.UpperTriangle();
for (var i = 0; i < data.RowCount; i++) for (var i = 0; i < data.RowCount; i++)
{ {
for (var j = 0; j < data.ColumnCount; j++) for (var j = 0; j < data.ColumnCount; j++)
@ -541,7 +541,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
{ {
var data = this.testMatrices["Square3x3"]; var data = this.testMatrices["Square3x3"];
Matrix result = null; Matrix result = null;
data.GetUpperTriangle(result); data.UpperTriangle(result);
} }
[Test] [Test]
@ -550,7 +550,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
{ {
var data = this.testMatrices["Square3x3"]; var data = this.testMatrices["Square3x3"];
var result = this.CreateMatrix(data.RowCount + 1, data.ColumnCount); var result = this.CreateMatrix(data.RowCount + 1, data.ColumnCount);
data.GetUpperTriangle(result); data.UpperTriangle(result);
} }
[Test] [Test]
@ -559,7 +559,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
{ {
var data = this.testMatrices["Square3x3"]; var data = this.testMatrices["Square3x3"];
var result = this.CreateMatrix(data.RowCount, data.ColumnCount + 1); var result = this.CreateMatrix(data.RowCount, data.ColumnCount + 1);
data.GetUpperTriangle(result); data.UpperTriangle(result);
} }
[Test] [Test]

Loading…
Cancel
Save