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

LA: Matrix arithmetics design pattern: Add, Subtract

v2
Christoph Ruegg 14 years ago
parent
2df2f0cb83
commit
4daf5ec83e
5 changed files with 35 additions and 180 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 48
      src/Numerics/LinearAlgebra/Complex/DiagonalMatrix.cs
  2. 48
      src/Numerics/LinearAlgebra/Complex32/DiagonalMatrix.cs
  3. 48
      src/Numerics/LinearAlgebra/Double/DiagonalMatrix.cs
  4. 21
      src/Numerics/LinearAlgebra/Generic/Matrix.Arithmetic.cs
  5. 48
      src/Numerics/LinearAlgebra/Single/DiagonalMatrix.cs

48
src/Numerics/LinearAlgebra/Complex/DiagonalMatrix.cs
View File

@ -228,34 +228,14 @@ namespace MathNet.Numerics.LinearAlgebra.Complex
/// <param name="result">The matrix to store the result of the addition.</param> /// <param name="result">The matrix to store the result of the addition.</param>
/// <exception cref="ArgumentNullException">If the other matrix is <see langword="null"/>.</exception> /// <exception cref="ArgumentNullException">If the other matrix is <see langword="null"/>.</exception>
/// <exception cref="ArgumentOutOfRangeException">If the two matrices don't have the same dimensions.</exception> /// <exception cref="ArgumentOutOfRangeException">If the two matrices don't have the same dimensions.</exception>
public override void Add(Matrix<Complex> other, Matrix<Complex> result) protected override void DoAdd(Matrix<Complex> other, Matrix<Complex> result)
{ {
if (other == null)
{
throw new ArgumentNullException("other");
}
if (result == null)
{
throw new ArgumentNullException("result");
}
if (other.RowCount != RowCount || other.ColumnCount != ColumnCount)
{
throw DimensionsDontMatch<ArgumentOutOfRangeException>(this, other, "other");
}
if (result.RowCount != RowCount || result.ColumnCount != ColumnCount)
{
throw DimensionsDontMatch<ArgumentOutOfRangeException>(this, result, "result");
}
var diagOther = other as DiagonalMatrix; var diagOther = other as DiagonalMatrix;
var diagResult = result as DiagonalMatrix; var diagResult = result as DiagonalMatrix;
if (diagOther == null || diagResult == null) if (diagOther == null || diagResult == null)
{ {
base.Add(other, result); base.DoAdd(other, result);
} }
else else
{ {
@ -303,34 +283,14 @@ namespace MathNet.Numerics.LinearAlgebra.Complex
/// <param name="result">The matrix to store the result of the subtraction.</param> /// <param name="result">The matrix to store the result of the subtraction.</param>
/// <exception cref="ArgumentNullException">If the other matrix is <see langword="null"/>.</exception> /// <exception cref="ArgumentNullException">If the other matrix is <see langword="null"/>.</exception>
/// <exception cref="ArgumentOutOfRangeException">If the two matrices don't have the same dimensions.</exception> /// <exception cref="ArgumentOutOfRangeException">If the two matrices don't have the same dimensions.</exception>
public override void Subtract(Matrix<Complex> other, Matrix<Complex> result) protected override void DoSubtract(Matrix<Complex> other, Matrix<Complex> result)
{ {
if (other == null)
{
throw new ArgumentNullException("other");
}
if (result == null)
{
throw new ArgumentNullException("result");
}
if (other.RowCount != RowCount || other.ColumnCount != ColumnCount)
{
throw DimensionsDontMatch<ArgumentOutOfRangeException>(this, other, "other");
}
if (result.RowCount != RowCount || result.ColumnCount != ColumnCount)
{
throw DimensionsDontMatch<ArgumentOutOfRangeException>(this, other, "other");
}
var diagOther = other as DiagonalMatrix; var diagOther = other as DiagonalMatrix;
var diagResult = result as DiagonalMatrix; var diagResult = result as DiagonalMatrix;
if (diagOther == null || diagResult == null) if (diagOther == null || diagResult == null)
{ {
base.Subtract(other, result); base.DoSubtract(other, result);
} }
else else
{ {

48
src/Numerics/LinearAlgebra/Complex32/DiagonalMatrix.cs
View File

@ -228,34 +228,14 @@ namespace MathNet.Numerics.LinearAlgebra.Complex32
/// <param name="result">The matrix to store the result of the addition.</param> /// <param name="result">The matrix to store the result of the addition.</param>
/// <exception cref="ArgumentNullException">If the other matrix is <see langword="null"/>.</exception> /// <exception cref="ArgumentNullException">If the other matrix is <see langword="null"/>.</exception>
/// <exception cref="ArgumentOutOfRangeException">If the two matrices don't have the same dimensions.</exception> /// <exception cref="ArgumentOutOfRangeException">If the two matrices don't have the same dimensions.</exception>
public override void Add(Matrix<Complex32> other, Matrix<Complex32> result) protected override void DoAdd(Matrix<Complex32> other, Matrix<Complex32> result)
{ {
if (other == null)
{
throw new ArgumentNullException("other");
}
if (result == null)
{
throw new ArgumentNullException("result");
}
if (other.RowCount != RowCount || other.ColumnCount != ColumnCount)
{
throw DimensionsDontMatch<ArgumentOutOfRangeException>(this, other, "other");
}
if (result.RowCount != RowCount || result.ColumnCount != ColumnCount)
{
throw DimensionsDontMatch<ArgumentOutOfRangeException>(this, other, "other");
}
var diagOther = other as DiagonalMatrix; var diagOther = other as DiagonalMatrix;
var diagResult = result as DiagonalMatrix; var diagResult = result as DiagonalMatrix;
if (diagOther == null || diagResult == null) if (diagOther == null || diagResult == null)
{ {
base.Add(other, result); base.DoAdd(other, result);
} }
else else
{ {
@ -303,34 +283,14 @@ namespace MathNet.Numerics.LinearAlgebra.Complex32
/// <param name="result">The matrix to store the result of the subtraction.</param> /// <param name="result">The matrix to store the result of the subtraction.</param>
/// <exception cref="ArgumentNullException">If the other matrix is <see langword="null"/>.</exception> /// <exception cref="ArgumentNullException">If the other matrix is <see langword="null"/>.</exception>
/// <exception cref="ArgumentOutOfRangeException">If the two matrices don't have the same dimensions.</exception> /// <exception cref="ArgumentOutOfRangeException">If the two matrices don't have the same dimensions.</exception>
public override void Subtract(Matrix<Complex32> other, Matrix<Complex32> result) protected override void DoSubtract(Matrix<Complex32> other, Matrix<Complex32> result)
{ {
if (other == null)
{
throw new ArgumentNullException("other");
}
if (result == null)
{
throw new ArgumentNullException("result");
}
if (other.RowCount != RowCount || other.ColumnCount != ColumnCount)
{
throw DimensionsDontMatch<ArgumentOutOfRangeException>(this, other, "other");
}
if (result.RowCount != RowCount || result.ColumnCount != ColumnCount)
{
throw DimensionsDontMatch<ArgumentOutOfRangeException>(this, other, "result");
}
var diagOther = other as DiagonalMatrix; var diagOther = other as DiagonalMatrix;
var diagResult = result as DiagonalMatrix; var diagResult = result as DiagonalMatrix;
if (diagOther == null || diagResult == null) if (diagOther == null || diagResult == null)
{ {
base.Subtract(other, result); base.DoSubtract(other, result);
} }
else else
{ {

48
src/Numerics/LinearAlgebra/Double/DiagonalMatrix.cs
View File

@ -227,34 +227,14 @@ namespace MathNet.Numerics.LinearAlgebra.Double
/// <param name="result">The matrix to store the result of the addition.</param> /// <param name="result">The matrix to store the result of the addition.</param>
/// <exception cref="ArgumentNullException">If the other matrix is <see langword="null"/>.</exception> /// <exception cref="ArgumentNullException">If the other matrix is <see langword="null"/>.</exception>
/// <exception cref="ArgumentOutOfRangeException">If the two matrices don't have the same dimensions.</exception> /// <exception cref="ArgumentOutOfRangeException">If the two matrices don't have the same dimensions.</exception>
public override void Add(Matrix<double> other, Matrix<double> result) protected override void DoAdd(Matrix<double> other, Matrix<double> result)
{ {
if (other == null)
{
throw new ArgumentNullException("other");
}
if (result == null)
{
throw new ArgumentNullException("result");
}
if (other.RowCount != RowCount || other.ColumnCount != ColumnCount)
{
throw DimensionsDontMatch<ArgumentOutOfRangeException>(this, other, "other");
}
if (result.RowCount != RowCount || result.ColumnCount != ColumnCount)
{
throw DimensionsDontMatch<ArgumentOutOfRangeException>(this, result, "result");
}
var diagOther = other as DiagonalMatrix; var diagOther = other as DiagonalMatrix;
var diagResult = result as DiagonalMatrix; var diagResult = result as DiagonalMatrix;
if (diagOther == null || diagResult == null) if (diagOther == null || diagResult == null)
{ {
base.Add(other, result); base.DoAdd(other, result);
} }
else else
{ {
@ -302,34 +282,14 @@ namespace MathNet.Numerics.LinearAlgebra.Double
/// <param name="result">The matrix to store the result of the subtraction.</param> /// <param name="result">The matrix to store the result of the subtraction.</param>
/// <exception cref="ArgumentNullException">If the other matrix is <see langword="null"/>.</exception> /// <exception cref="ArgumentNullException">If the other matrix is <see langword="null"/>.</exception>
/// <exception cref="ArgumentOutOfRangeException">If the two matrices don't have the same dimensions.</exception> /// <exception cref="ArgumentOutOfRangeException">If the two matrices don't have the same dimensions.</exception>
public override void Subtract(Matrix<double> other, Matrix<double> result) protected override void DoSubtract(Matrix<double> other, Matrix<double> result)
{ {
if (other == null)
{
throw new ArgumentNullException("other");
}
if (result == null)
{
throw new ArgumentNullException("result");
}
if (other.RowCount != RowCount || other.ColumnCount != ColumnCount)
{
throw DimensionsDontMatch<ArgumentOutOfRangeException>(this, other, "other");
}
if (result.RowCount != RowCount || result.ColumnCount != ColumnCount)
{
throw DimensionsDontMatch<ArgumentOutOfRangeException>(this, result, "result");
}
var diagOther = other as DiagonalMatrix; var diagOther = other as DiagonalMatrix;
var diagResult = result as DiagonalMatrix; var diagResult = result as DiagonalMatrix;
if (diagOther == null || diagResult == null) if (diagOther == null || diagResult == null)
{ {
base.Subtract(other, result); base.DoSubtract(other, result);
} }
else else
{ {

21
src/Numerics/LinearAlgebra/Generic/Matrix.Arithmetic.cs
View File

@ -81,13 +81,18 @@ namespace MathNet.Numerics.LinearAlgebra.Generic
/// <param name="result">The matrix to store the result of the addition.</param> /// <param name="result">The matrix to store the result of the addition.</param>
/// <exception cref="ArgumentNullException">If the other matrix is <see langword="null"/>.</exception> /// <exception cref="ArgumentNullException">If the other matrix is <see langword="null"/>.</exception>
/// <exception cref="ArgumentOutOfRangeException">If the two matrices don't have the same dimensions.</exception> /// <exception cref="ArgumentOutOfRangeException">If the two matrices don't have the same dimensions.</exception>
public virtual void Add(Matrix<T> other, Matrix<T> result) public void Add(Matrix<T> other, Matrix<T> result)
{ {
if (other == null) if (other == null)
{ {
throw new ArgumentNullException("other"); throw new ArgumentNullException("other");
} }
if (result == null)
{
throw new ArgumentNullException("result");
}
if (other.RowCount != RowCount || other.ColumnCount != ColumnCount) if (other.RowCount != RowCount || other.ColumnCount != ColumnCount)
{ {
throw DimensionsDontMatch<ArgumentOutOfRangeException>(this, other, "other"); throw DimensionsDontMatch<ArgumentOutOfRangeException>(this, other, "other");
@ -141,16 +146,26 @@ namespace MathNet.Numerics.LinearAlgebra.Generic
/// <param name="result">The matrix to store the result of the subtraction.</param> /// <param name="result">The matrix to store the result of the subtraction.</param>
/// <exception cref="ArgumentNullException">If the other matrix is <see langword="null"/>.</exception> /// <exception cref="ArgumentNullException">If the other matrix is <see langword="null"/>.</exception>
/// <exception cref="ArgumentOutOfRangeException">If the two matrices don't have the same dimensions.</exception> /// <exception cref="ArgumentOutOfRangeException">If the two matrices don't have the same dimensions.</exception>
public virtual void Subtract(Matrix<T> other, Matrix<T> result) public void Subtract(Matrix<T> other, Matrix<T> result)
{ {
if (other == null) if (other == null)
{ {
throw new ArgumentNullException("other"); throw new ArgumentNullException("other");
} }
if (result == null)
{
throw new ArgumentNullException("result");
}
if (other.RowCount != RowCount || other.ColumnCount != ColumnCount) if (other.RowCount != RowCount || other.ColumnCount != ColumnCount)
{ {
throw DimensionsDontMatch<ArgumentOutOfRangeException>(this, other); throw DimensionsDontMatch<ArgumentOutOfRangeException>(this, other, "other");
}
if (result.RowCount != RowCount || result.ColumnCount != ColumnCount)
{
throw DimensionsDontMatch<ArgumentOutOfRangeException>(this, result, "result");
} }
DoSubtract(other, result); DoSubtract(other, result);

48
src/Numerics/LinearAlgebra/Single/DiagonalMatrix.cs
View File

@ -227,34 +227,14 @@ namespace MathNet.Numerics.LinearAlgebra.Single
/// <param name="result">The matrix to store the result of the addition.</param> /// <param name="result">The matrix to store the result of the addition.</param>
/// <exception cref="ArgumentNullException">If the other matrix is <see langword="null"/>.</exception> /// <exception cref="ArgumentNullException">If the other matrix is <see langword="null"/>.</exception>
/// <exception cref="ArgumentOutOfRangeException">If the two matrices don't have the same dimensions.</exception> /// <exception cref="ArgumentOutOfRangeException">If the two matrices don't have the same dimensions.</exception>
public override void Add(Matrix<float> other, Matrix<float> result) protected override void DoAdd(Matrix<float> other, Matrix<float> result)
{ {
if (other == null)
{
throw new ArgumentNullException("other");
}
if (result == null)
{
throw new ArgumentNullException("result");
}
if (other.RowCount != RowCount || other.ColumnCount != ColumnCount)
{
throw DimensionsDontMatch<ArgumentOutOfRangeException>(this, other, "other");
}
if (result.RowCount != RowCount || result.ColumnCount != ColumnCount)
{
throw DimensionsDontMatch<ArgumentOutOfRangeException>(this, result, "result");
}
var diagOther = other as DiagonalMatrix; var diagOther = other as DiagonalMatrix;
var diagResult = result as DiagonalMatrix; var diagResult = result as DiagonalMatrix;
if (diagOther == null || diagResult == null) if (diagOther == null || diagResult == null)
{ {
base.Add(other, result); base.DoAdd(other, result);
} }
else else
{ {
@ -302,34 +282,14 @@ namespace MathNet.Numerics.LinearAlgebra.Single
/// <param name="result">The matrix to store the result of the subtraction.</param> /// <param name="result">The matrix to store the result of the subtraction.</param>
/// <exception cref="ArgumentNullException">If the other matrix is <see langword="null"/>.</exception> /// <exception cref="ArgumentNullException">If the other matrix is <see langword="null"/>.</exception>
/// <exception cref="ArgumentOutOfRangeException">If the two matrices don't have the same dimensions.</exception> /// <exception cref="ArgumentOutOfRangeException">If the two matrices don't have the same dimensions.</exception>
public override void Subtract(Matrix<float> other, Matrix<float> result) protected override void DoSubtract(Matrix<float> other, Matrix<float> result)
{ {
if (other == null)
{
throw new ArgumentNullException("other");
}
if (result == null)
{
throw new ArgumentNullException("result");
}
if (other.RowCount != RowCount || other.ColumnCount != ColumnCount)
{
throw DimensionsDontMatch<ArgumentOutOfRangeException>(this, other, "other");
}
if (result.RowCount != RowCount || result.ColumnCount != ColumnCount)
{
throw DimensionsDontMatch<ArgumentOutOfRangeException>(this, result, "result");
}
var diagOther = other as DiagonalMatrix; var diagOther = other as DiagonalMatrix;
var diagResult = result as DiagonalMatrix; var diagResult = result as DiagonalMatrix;
if (diagOther == null || diagResult == null) if (diagOther == null || diagResult == null)
{ {
base.Subtract(other, result); base.DoSubtract(other, result);
} }
else else
{ {

Write Preview
Loading…
Cancel
Save