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

Cosmetics

v2
Christoph Ruegg 14 years ago
parent
73599b146b
commit
6908674873
5 changed files with 156 additions and 173 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. 1
      src/Numerics/LinearAlgebra/Storage/DenseColumnMajorMatrixStorage.cs
  2. 36
      src/UnitTests/LinearAlgebraTests/Complex/MatrixLoader.cs
  3. 48
      src/UnitTests/LinearAlgebraTests/Complex32/MatrixLoader.cs
  4. 36
      src/UnitTests/LinearAlgebraTests/Double/MatrixLoader.cs
  5. 48
      src/UnitTests/LinearAlgebraTests/Single/MatrixLoader.cs

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

@ -130,7 +130,6 @@ namespace MathNet.Numerics.LinearAlgebra.Storage
{ {
for (var i = 0; i < storage.RowCount; i++) for (var i = 0; i < storage.RowCount; i++)
{ {
storage.Data[index++] = init(i, j); storage.Data[index++] = init(i, j);
} }
} }

36
src/UnitTests/LinearAlgebraTests/Complex/MatrixLoader.cs
View File

@ -3,7 +3,9 @@
// http://numerics.mathdotnet.com // http://numerics.mathdotnet.com
// http://github.com/mathnet/mathnet-numerics // http://github.com/mathnet/mathnet-numerics
// http://mathnetnumerics.codeplex.com // http://mathnetnumerics.codeplex.com
// Copyright (c) 2009-2010 Math.NET //
// Copyright (c) 2009-2013 Math.NET
//
// Permission is hereby granted, free of charge, to any person // Permission is hereby granted, free of charge, to any person
// obtaining a copy of this software and associated documentation // obtaining a copy of this software and associated documentation
// files (the "Software"), to deal in the Software without // files (the "Software"), to deal in the Software without
@ -12,8 +14,10 @@
// copies of the Software, and to permit persons to whom the // copies of the Software, and to permit persons to whom the
// Software is furnished to do so, subject to the following // Software is furnished to do so, subject to the following
// conditions: // conditions:
//
// The above copyright notice and this permission notice shall be // The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software. // included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES // EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND // OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@ -42,20 +46,12 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex
/// <summary> /// <summary>
/// Gets or sets test matrices values to use. /// Gets or sets test matrices values to use.
/// </summary> /// </summary>
protected Dictionary<string, Complex[,]> TestData2D protected Dictionary<string, Complex[,]> TestData2D { get; set; }
{
get;
set;
}
/// <summary> /// <summary>
/// Gets or sets test matrices instances to use. /// Gets or sets test matrices instances to use.
/// </summary> /// </summary>
protected Dictionary<string, Matrix> TestMatrices protected Dictionary<string, Matrix> TestMatrices { get; set; }
{
get;
set;
}
/// <summary> /// <summary>
/// Creates a matrix for the given number of rows and columns. /// Creates a matrix for the given number of rows and columns.
@ -95,13 +91,13 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex
{ {
TestData2D = new Dictionary<string, Complex[,]> TestData2D = new Dictionary<string, Complex[,]>
{ {
{ "Singular3x3", new[,] { { new Complex(1.0, 1), new Complex(1.0, 1), new Complex(2.0, 1) }, { new Complex(1.0, 1), new Complex(1.0, 1), new Complex(2.0, 1) }, { new Complex(1.0, 1), new Complex(1.0, 1), new Complex(2.0, 1) } } }, {"Singular3x3", new[,] {{new Complex(1.0, 1), new Complex(1.0, 1), new Complex(2.0, 1)}, {new Complex(1.0, 1), new Complex(1.0, 1), new Complex(2.0, 1)}, {new Complex(1.0, 1), new Complex(1.0, 1), new Complex(2.0, 1)}}},
{ "Square3x3", new[,] { { new Complex(-1.1, 1), new Complex(-2.2, 1), new Complex(-3.3, 1) }, { Complex.Zero, new Complex(1.1, 1), new Complex(2.2, 1) }, { new Complex(-4.4, 1), new Complex(5.5, 1), new Complex(6.6, 1) } } }, {"Square3x3", new[,] {{new Complex(-1.1, 1), new Complex(-2.2, 1), new Complex(-3.3, 1)}, {Complex.Zero, new Complex(1.1, 1), new Complex(2.2, 1)}, {new Complex(-4.4, 1), new Complex(5.5, 1), new Complex(6.6, 1)}}},
{ "Square4x4", new[,] { { new Complex(-1.1, 1), new Complex(-2.2, 1), new Complex(-3.3, 1), new Complex(-4.4, 1) }, { Complex.Zero, new Complex(1.1, 1), new Complex(2.2, 1), new Complex(3.3, 1) }, { new Complex(1.0, 1), new Complex(2.1, 1), new Complex(6.2, 1), new Complex(4.3, 1) }, { new Complex(-4.4, 1), new Complex(5.5, 1), new Complex(6.6, 1), new Complex(-7.7, 1) } } }, {"Square4x4", new[,] {{new Complex(-1.1, 1), new Complex(-2.2, 1), new Complex(-3.3, 1), new Complex(-4.4, 1)}, {Complex.Zero, new Complex(1.1, 1), new Complex(2.2, 1), new Complex(3.3, 1)}, {new Complex(1.0, 1), new Complex(2.1, 1), new Complex(6.2, 1), new Complex(4.3, 1)}, {new Complex(-4.4, 1), new Complex(5.5, 1), new Complex(6.6, 1), new Complex(-7.7, 1)}}},
{ "Singular4x4", new[,] { { new Complex(-1.1, 1), new Complex(-2.2, 1), new Complex(-3.3, 1), new Complex(-4.4, 1) }, { new Complex(-1.1, 1), new Complex(-2.2, 1), new Complex(-3.3, 1), new Complex(-4.4, 1) }, { new Complex(-1.1, 1), new Complex(-2.2, 1), new Complex(-3.3, 1), new Complex(-4.4, 1) }, { new Complex(-1.1, 1), new Complex(-2.2, 1), new Complex(-3.3, 1), new Complex(-4.4, 1) } } }, {"Singular4x4", new[,] {{new Complex(-1.1, 1), new Complex(-2.2, 1), new Complex(-3.3, 1), new Complex(-4.4, 1)}, {new Complex(-1.1, 1), new Complex(-2.2, 1), new Complex(-3.3, 1), new Complex(-4.4, 1)}, {new Complex(-1.1, 1), new Complex(-2.2, 1), new Complex(-3.3, 1), new Complex(-4.4, 1)}, {new Complex(-1.1, 1), new Complex(-2.2, 1), new Complex(-3.3, 1), new Complex(-4.4, 1)}}},
{ "Tall3x2", new[,] { { new Complex(-1.1, 1), new Complex(-2.2, 1) }, { Complex.Zero, new Complex(1.1, 1) }, { new Complex(-4.4, 1), new Complex(5.5, 1) } } }, {"Tall3x2", new[,] {{new Complex(-1.1, 1), new Complex(-2.2, 1)}, {Complex.Zero, new Complex(1.1, 1)}, {new Complex(-4.4, 1), new Complex(5.5, 1)}}},
{ "Wide2x3", new[,] { { new Complex(-1.1, 1), new Complex(-2.2, 1), new Complex(-3.3, 1) }, { Complex.Zero, new Complex(1.1, 1), new Complex(2.2, 1) } } }, {"Wide2x3", new[,] {{new Complex(-1.1, 1), new Complex(-2.2, 1), new Complex(-3.3, 1)}, {Complex.Zero, new Complex(1.1, 1), new Complex(2.2, 1)}}},
{ "Symmetric3x3", new[,] { { Complex.One, 2.0, 3.0 }, { 2.0, 2.0, 0.0 }, { 3.0, 0.0, 3.0 } } } {"Symmetric3x3", new[,] {{Complex.One, 2.0, 3.0}, {2.0, 2.0, 0.0}, {3.0, 0.0, 3.0}}}
}; };
TestMatrices = new Dictionary<string, Matrix>(); TestMatrices = new Dictionary<string, Matrix>();
@ -158,7 +154,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex
} }
// Generate a Hermitian matrix which is positive definite. // Generate a Hermitian matrix which is positive definite.
return matrixA.ConjugateTranspose() * matrixA; return matrixA.ConjugateTranspose()*matrixA;
} }
/// <summary> /// <summary>
@ -229,7 +225,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex
} }
// Generate a Hermitian matrix which is positive definite. // Generate a Hermitian matrix which is positive definite.
return matrixA.ConjugateTranspose() * matrixA; return matrixA.ConjugateTranspose()*matrixA;
} }
/// <summary> /// <summary>

48
src/UnitTests/LinearAlgebraTests/Complex32/MatrixLoader.cs
View File

@ -3,7 +3,9 @@
// http://numerics.mathdotnet.com // http://numerics.mathdotnet.com
// http://github.com/mathnet/mathnet-numerics // http://github.com/mathnet/mathnet-numerics
// http://mathnetnumerics.codeplex.com // http://mathnetnumerics.codeplex.com
// Copyright (c) 2009-2010 Math.NET //
// Copyright (c) 2009-2013 Math.NET
//
// Permission is hereby granted, free of charge, to any person // Permission is hereby granted, free of charge, to any person
// obtaining a copy of this software and associated documentation // obtaining a copy of this software and associated documentation
// files (the "Software"), to deal in the Software without // files (the "Software"), to deal in the Software without
@ -12,8 +14,10 @@
// copies of the Software, and to permit persons to whom the // copies of the Software, and to permit persons to whom the
// Software is furnished to do so, subject to the following // Software is furnished to do so, subject to the following
// conditions: // conditions:
//
// The above copyright notice and this permission notice shall be // The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software. // included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES // EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND // OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@ -42,20 +46,12 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32
/// <summary> /// <summary>
/// Gets or sets test matrices values to use. /// Gets or sets test matrices values to use.
/// </summary> /// </summary>
protected Dictionary<string, Complex32[,]> TestData2D protected Dictionary<string, Complex32[,]> TestData2D { get; set; }
{
get;
set;
}
/// <summary> /// <summary>
/// Gets or sets test matrices instances to use. /// Gets or sets test matrices instances to use.
/// </summary> /// </summary>
protected Dictionary<string, Matrix> TestMatrices protected Dictionary<string, Matrix> TestMatrices { get; set; }
{
get;
set;
}
/// <summary> /// <summary>
/// Creates a matrix for the given number of rows and columns. /// Creates a matrix for the given number of rows and columns.
@ -95,13 +91,13 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32
{ {
TestData2D = new Dictionary<string, Complex32[,]> TestData2D = new Dictionary<string, Complex32[,]>
{ {
{ "Singular3x3", new[,] { { new Complex32(1.0f, 1), new Complex32(1.0f, 1), new Complex32(2.0f, 1) }, { new Complex32(1.0f, 1), new Complex32(1.0f, 1), new Complex32(2.0f, 1) }, { new Complex32(1.0f, 1), new Complex32(1.0f, 1), new Complex32(2.0f, 1) } } }, {"Singular3x3", new[,] {{new Complex32(1.0f, 1), new Complex32(1.0f, 1), new Complex32(2.0f, 1)}, {new Complex32(1.0f, 1), new Complex32(1.0f, 1), new Complex32(2.0f, 1)}, {new Complex32(1.0f, 1), new Complex32(1.0f, 1), new Complex32(2.0f, 1)}}},
{ "Square3x3", new[,] { { new Complex32(-1.1f, 1), new Complex32(-2.2f, 1), new Complex32(-3.3f, 1) }, { Complex32.Zero, new Complex32(1.1f, 1), new Complex32(2.2f, 1) }, { new Complex32(-4.4f, 1), new Complex32(5.5f, 1), new Complex32(6.6f, 1) } } }, {"Square3x3", new[,] {{new Complex32(-1.1f, 1), new Complex32(-2.2f, 1), new Complex32(-3.3f, 1)}, {Complex32.Zero, new Complex32(1.1f, 1), new Complex32(2.2f, 1)}, {new Complex32(-4.4f, 1), new Complex32(5.5f, 1), new Complex32(6.6f, 1)}}},
{ "Square4x4", new[,] { { new Complex32(-1.1f, 1), new Complex32(-2.2f, 1), new Complex32(-3.3f, 1), new Complex32(-4.4f, 1) }, { Complex32.Zero, new Complex32(1.1f, 1), new Complex32(2.2f, 1), new Complex32(3.3f, 1) }, { new Complex32(1.0f, 1), new Complex32(2.1f, 1), new Complex32(6.2f, 1), new Complex32(4.3f, 1) }, { new Complex32(-4.4f, 1), new Complex32(5.5f, 1), new Complex32(6.6f, 1), new Complex32(-7.7f, 1) } } }, {"Square4x4", new[,] {{new Complex32(-1.1f, 1), new Complex32(-2.2f, 1), new Complex32(-3.3f, 1), new Complex32(-4.4f, 1)}, {Complex32.Zero, new Complex32(1.1f, 1), new Complex32(2.2f, 1), new Complex32(3.3f, 1)}, {new Complex32(1.0f, 1), new Complex32(2.1f, 1), new Complex32(6.2f, 1), new Complex32(4.3f, 1)}, {new Complex32(-4.4f, 1), new Complex32(5.5f, 1), new Complex32(6.6f, 1), new Complex32(-7.7f, 1)}}},
{ "Singular4x4", new[,] { { new Complex32(-1.1f, 1), new Complex32(-2.2f, 1), new Complex32(-3.3f, 1), new Complex32(-4.4f, 1) }, { new Complex32(-1.1f, 1), new Complex32(-2.2f, 1), new Complex32(-3.3f, 1), new Complex32(-4.4f, 1) }, { new Complex32(-1.1f, 1), new Complex32(-2.2f, 1), new Complex32(-3.3f, 1), new Complex32(-4.4f, 1) }, { new Complex32(-1.1f, 1), new Complex32(-2.2f, 1), new Complex32(-3.3f, 1), new Complex32(-4.4f, 1) } } }, {"Singular4x4", new[,] {{new Complex32(-1.1f, 1), new Complex32(-2.2f, 1), new Complex32(-3.3f, 1), new Complex32(-4.4f, 1)}, {new Complex32(-1.1f, 1), new Complex32(-2.2f, 1), new Complex32(-3.3f, 1), new Complex32(-4.4f, 1)}, {new Complex32(-1.1f, 1), new Complex32(-2.2f, 1), new Complex32(-3.3f, 1), new Complex32(-4.4f, 1)}, {new Complex32(-1.1f, 1), new Complex32(-2.2f, 1), new Complex32(-3.3f, 1), new Complex32(-4.4f, 1)}}},
{ "Tall3x2", new[,] { { new Complex32(-1.1f, 1), new Complex32(-2.2f, 1) }, { Complex32.Zero, new Complex32(1.1f, 1) }, { new Complex32(-4.4f, 1), new Complex32(5.5f, 1) } } }, {"Tall3x2", new[,] {{new Complex32(-1.1f, 1), new Complex32(-2.2f, 1)}, {Complex32.Zero, new Complex32(1.1f, 1)}, {new Complex32(-4.4f, 1), new Complex32(5.5f, 1)}}},
{ "Wide2x3", new[,] { { new Complex32(-1.1f, 1), new Complex32(-2.2f, 1), new Complex32(-3.3f, 1) }, { Complex32.Zero, new Complex32(1.1f, 1), new Complex32(2.2f, 1) } } }, {"Wide2x3", new[,] {{new Complex32(-1.1f, 1), new Complex32(-2.2f, 1), new Complex32(-3.3f, 1)}, {Complex32.Zero, new Complex32(1.1f, 1), new Complex32(2.2f, 1)}}},
{ "Symmetric3x3", new[,] { { Complex32.One, 2.0f, 3.0f }, { 2.0f, 2.0f, 0.0f }, { 3.0f, 0.0f, 3.0f } } } {"Symmetric3x3", new[,] {{Complex32.One, 2.0f, 3.0f}, {2.0f, 2.0f, 0.0f}, {3.0f, 0.0f, 3.0f}}}
}; };
TestMatrices = new Dictionary<string, Matrix>(); TestMatrices = new Dictionary<string, Matrix>();
@ -129,7 +125,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32
{ {
for (var j = 0; j < col; j++) for (var j = 0; j < col; j++)
{ {
matrixA[i, j] = new Complex32((float)normal.Sample(), (float)normal.Sample()); matrixA[i, j] = new Complex32((float) normal.Sample(), (float) normal.Sample());
} }
} }
@ -153,12 +149,12 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32
{ {
for (var j = 0; j < order; j++) for (var j = 0; j < order; j++)
{ {
matrixA[i, j] = new Complex32((float)normal.Sample(), (float)normal.Sample()); matrixA[i, j] = new Complex32((float) normal.Sample(), (float) normal.Sample());
} }
} }
// Generate a Hermitian matrix which is positive definite. // Generate a Hermitian matrix which is positive definite.
return matrixA.ConjugateTranspose() * matrixA; return matrixA.ConjugateTranspose()*matrixA;
} }
/// <summary> /// <summary>
@ -176,7 +172,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32
var v = new DenseVector(order); var v = new DenseVector(order);
for (var i = 0; i < order; i++) for (var i = 0; i < order; i++)
{ {
v[i] = new Complex32((float)normal.Sample(), (float)normal.Sample()); v[i] = new Complex32((float) normal.Sample(), (float) normal.Sample());
} }
return v; return v;
@ -200,7 +196,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32
{ {
for (var j = 0; j < col; j++) for (var j = 0; j < col; j++)
{ {
matrixA[i, j] = new Complex32((float)normal.Sample(), (float)normal.Sample()); matrixA[i, j] = new Complex32((float) normal.Sample(), (float) normal.Sample());
} }
} }
@ -224,12 +220,12 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32
{ {
for (var j = 0; j < order; j++) for (var j = 0; j < order; j++)
{ {
matrixA[i, j] = new Complex32((float)normal.Sample(), (float)normal.Sample()); matrixA[i, j] = new Complex32((float) normal.Sample(), (float) normal.Sample());
} }
} }
// Generate a Hermitian matrix which is positive definite. // Generate a Hermitian matrix which is positive definite.
return matrixA.ConjugateTranspose() * matrixA; return matrixA.ConjugateTranspose()*matrixA;
} }
/// <summary> /// <summary>
@ -247,7 +243,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32
var v = new UserDefinedVector(order); var v = new UserDefinedVector(order);
for (var i = 0; i < order; i++) for (var i = 0; i < order; i++)
{ {
v[i] = new Complex32((float)normal.Sample(), (float)normal.Sample()); v[i] = new Complex32((float) normal.Sample(), (float) normal.Sample());
} }
// Generate a matrix which is positive definite. // Generate a matrix which is positive definite.

36
src/UnitTests/LinearAlgebraTests/Double/MatrixLoader.cs
View File

@ -3,7 +3,9 @@
// http://numerics.mathdotnet.com // http://numerics.mathdotnet.com
// http://github.com/mathnet/mathnet-numerics // http://github.com/mathnet/mathnet-numerics
// http://mathnetnumerics.codeplex.com // http://mathnetnumerics.codeplex.com
// Copyright (c) 2009-2010 Math.NET //
// Copyright (c) 2009-2013 Math.NET
//
// Permission is hereby granted, free of charge, to any person // Permission is hereby granted, free of charge, to any person
// obtaining a copy of this software and associated documentation // obtaining a copy of this software and associated documentation
// files (the "Software"), to deal in the Software without // files (the "Software"), to deal in the Software without
@ -12,8 +14,10 @@
// copies of the Software, and to permit persons to whom the // copies of the Software, and to permit persons to whom the
// Software is furnished to do so, subject to the following // Software is furnished to do so, subject to the following
// conditions: // conditions:
//
// The above copyright notice and this permission notice shall be // The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software. // included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES // EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND // OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@ -41,20 +45,12 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
/// <summary> /// <summary>
/// Gets or sets test matrices values to use. /// Gets or sets test matrices values to use.
/// </summary> /// </summary>
protected Dictionary<string, double[,]> TestData2D protected Dictionary<string, double[,]> TestData2D { get; set; }
{
get;
set;
}
/// <summary> /// <summary>
/// Gets or sets test matrices instances to use. /// Gets or sets test matrices instances to use.
/// </summary> /// </summary>
protected Dictionary<string, Matrix> TestMatrices protected Dictionary<string, Matrix> TestMatrices { get; set; }
{
get;
set;
}
/// <summary> /// <summary>
/// Creates a matrix for the given number of rows and columns. /// Creates a matrix for the given number of rows and columns.
@ -94,13 +90,13 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
{ {
TestData2D = new Dictionary<string, double[,]> TestData2D = new Dictionary<string, double[,]>
{ {
{ "Singular3x3", new[,] { { 1.0, 1.0, 2.0 }, { 1.0, 1.0, 2.0 }, { 1.0, 1.0, 2.0 } } }, {"Singular3x3", new[,] {{1.0, 1.0, 2.0}, {1.0, 1.0, 2.0}, {1.0, 1.0, 2.0}}},
{ "Square3x3", new[,] { { -1.1, -2.2, -3.3 }, { 0.0, 1.1, 2.2 }, { -4.4, 5.5, 6.6 } } }, {"Square3x3", new[,] {{-1.1, -2.2, -3.3}, {0.0, 1.1, 2.2}, {-4.4, 5.5, 6.6}}},
{ "Square4x4", new[,] { { -1.1, -2.2, -3.3, -4.4 }, { 0.0, 1.1, 2.2, 3.3 }, { 1.0, 2.1, 6.2, 4.3 }, { -4.4, 5.5, 6.6, -7.7 } } }, {"Square4x4", new[,] {{-1.1, -2.2, -3.3, -4.4}, {0.0, 1.1, 2.2, 3.3}, {1.0, 2.1, 6.2, 4.3}, {-4.4, 5.5, 6.6, -7.7}}},
{ "Singular4x4", new[,] { { -1.1, -2.2, -3.3, -4.4 }, { -1.1, -2.2, -3.3, -4.4 }, { -1.1, -2.2, -3.3, -4.4 }, { -1.1, -2.2, -3.3, -4.4 } } }, {"Singular4x4", new[,] {{-1.1, -2.2, -3.3, -4.4}, {-1.1, -2.2, -3.3, -4.4}, {-1.1, -2.2, -3.3, -4.4}, {-1.1, -2.2, -3.3, -4.4}}},
{ "Tall3x2", new[,] { { -1.1, -2.2 }, { 0.0, 1.1 }, { -4.4, 5.5 } } }, {"Tall3x2", new[,] {{-1.1, -2.2}, {0.0, 1.1}, {-4.4, 5.5}}},
{ "Wide2x3", new[,] { { -1.1, -2.2, -3.3 }, { 0.0, 1.1, 2.2 } } }, {"Wide2x3", new[,] {{-1.1, -2.2, -3.3}, {0.0, 1.1, 2.2}}},
{ "Symmetric3x3", new[,] { { 1.0, 2.0, 3.0 }, { 2.0, 2.0, 0.0 }, { 3.0, 0.0, 3.0 } } } {"Symmetric3x3", new[,] {{1.0, 2.0, 3.0}, {2.0, 2.0, 0.0}, {3.0, 0.0, 3.0}}}
}; };
TestMatrices = new Dictionary<string, Matrix>(); TestMatrices = new Dictionary<string, Matrix>();
@ -157,7 +153,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
} }
// Generate a matrix which is positive definite. // Generate a matrix which is positive definite.
return matrixA.Transpose() * matrixA; return matrixA.Transpose()*matrixA;
} }
/// <summary> /// <summary>
@ -228,7 +224,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
} }
// Generate a matrix which is positive definite. // Generate a matrix which is positive definite.
return matrixA.Transpose() * matrixA; return matrixA.Transpose()*matrixA;
} }
/// <summary> /// <summary>

48
src/UnitTests/LinearAlgebraTests/Single/MatrixLoader.cs
View File

@ -3,7 +3,9 @@
// http://numerics.mathdotnet.com // http://numerics.mathdotnet.com
// http://github.com/mathnet/mathnet-numerics // http://github.com/mathnet/mathnet-numerics
// http://mathnetnumerics.codeplex.com // http://mathnetnumerics.codeplex.com
// Copyright (c) 2009-2010 Math.NET //
// Copyright (c) 2009-2013 Math.NET
//
// Permission is hereby granted, free of charge, to any person // Permission is hereby granted, free of charge, to any person
// obtaining a copy of this software and associated documentation // obtaining a copy of this software and associated documentation
// files (the "Software"), to deal in the Software without // files (the "Software"), to deal in the Software without
@ -12,8 +14,10 @@
// copies of the Software, and to permit persons to whom the // copies of the Software, and to permit persons to whom the
// Software is furnished to do so, subject to the following // Software is furnished to do so, subject to the following
// conditions: // conditions:
//
// The above copyright notice and this permission notice shall be // The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software. // included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES // EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND // OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@ -41,20 +45,12 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single
/// <summary> /// <summary>
/// Gets or sets test matrices values to use. /// Gets or sets test matrices values to use.
/// </summary> /// </summary>
protected Dictionary<string, float[,]> TestData2D protected Dictionary<string, float[,]> TestData2D { get; set; }
{
get;
set;
}
/// <summary> /// <summary>
/// Gets or sets test matrices instances to use. /// Gets or sets test matrices instances to use.
/// </summary> /// </summary>
protected Dictionary<string, Matrix> TestMatrices protected Dictionary<string, Matrix> TestMatrices { get; set; }
{
get;
set;
}
/// <summary> /// <summary>
/// Creates a matrix for the given number of rows and columns. /// Creates a matrix for the given number of rows and columns.
@ -94,13 +90,13 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single
{ {
TestData2D = new Dictionary<string, float[,]> TestData2D = new Dictionary<string, float[,]>
{ {
{ "Singular3x3", new[,] { { 1.0f, 1.0f, 2.0f }, { 1.0f, 1.0f, 2.0f }, { 1.0f, 1.0f, 2.0f } } }, {"Singular3x3", new[,] {{1.0f, 1.0f, 2.0f}, {1.0f, 1.0f, 2.0f}, {1.0f, 1.0f, 2.0f}}},
{ "Square3x3", new[,] { { -1.1f, -2.2f, -3.3f }, { 0.0f, 1.1f, 2.2f }, { -4.4f, 5.5f, 6.6f } } }, {"Square3x3", new[,] {{-1.1f, -2.2f, -3.3f}, {0.0f, 1.1f, 2.2f}, {-4.4f, 5.5f, 6.6f}}},
{ "Square4x4", new[,] { { -1.1f, -2.2f, -3.3f, -4.4f }, { 0.0f, 1.1f, 2.2f, 3.3f }, { 1.0f, 2.1f, 6.2f, 4.3f }, { -4.4f, 5.5f, 6.6f, -7.7f } } }, {"Square4x4", new[,] {{-1.1f, -2.2f, -3.3f, -4.4f}, {0.0f, 1.1f, 2.2f, 3.3f}, {1.0f, 2.1f, 6.2f, 4.3f}, {-4.4f, 5.5f, 6.6f, -7.7f}}},
{ "Singular4x4", new[,] { { -1.1f, -2.2f, -3.3f, -4.4f }, { -1.1f, -2.2f, -3.3f, -4.4f }, { -1.1f, -2.2f, -3.3f, -4.4f }, { -1.1f, -2.2f, -3.3f, -4.4f } } }, {"Singular4x4", new[,] {{-1.1f, -2.2f, -3.3f, -4.4f}, {-1.1f, -2.2f, -3.3f, -4.4f}, {-1.1f, -2.2f, -3.3f, -4.4f}, {-1.1f, -2.2f, -3.3f, -4.4f}}},
{ "Tall3x2", new[,] { { -1.1f, -2.2f }, { 0.0f, 1.1f }, { -4.4f, 5.5f } } }, {"Tall3x2", new[,] {{-1.1f, -2.2f}, {0.0f, 1.1f}, {-4.4f, 5.5f}}},
{ "Wide2x3", new[,] { { -1.1f, -2.2f, -3.3f }, { 0.0f, 1.1f, 2.2f } } }, {"Wide2x3", new[,] {{-1.1f, -2.2f, -3.3f}, {0.0f, 1.1f, 2.2f}}},
{ "Symmetric3x3", new[,] { { 1.0f, 2.0f, 3.0f }, { 2.0f, 2.0f, 0.0f }, { 3.0f, 0.0f, 3.0f } } } {"Symmetric3x3", new[,] {{1.0f, 2.0f, 3.0f}, {2.0f, 2.0f, 0.0f}, {3.0f, 0.0f, 3.0f}}}
}; };
TestMatrices = new Dictionary<string, Matrix>(); TestMatrices = new Dictionary<string, Matrix>();
@ -128,7 +124,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single
{ {
for (var j = 0; j < col; j++) for (var j = 0; j < col; j++)
{ {
matrixA[i, j] = (float)normal.Sample(); matrixA[i, j] = (float) normal.Sample();
} }
} }
@ -152,12 +148,12 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single
{ {
for (var j = 0; j < order; j++) for (var j = 0; j < order; j++)
{ {
matrixA[i, j] = (float)normal.Sample(); matrixA[i, j] = (float) normal.Sample();
} }
} }
// Generate a matrix which is positive definite. // Generate a matrix which is positive definite.
return matrixA.Transpose() * matrixA; return matrixA.Transpose()*matrixA;
} }
/// <summary> /// <summary>
@ -175,7 +171,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single
var v = new DenseVector(order); var v = new DenseVector(order);
for (var i = 0; i < order; i++) for (var i = 0; i < order; i++)
{ {
v[i] = (float)normal.Sample(); v[i] = (float) normal.Sample();
} }
return v; return v;
@ -199,7 +195,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single
{ {
for (var j = 0; j < col; j++) for (var j = 0; j < col; j++)
{ {
matrixA[i, j] = (float)normal.Sample(); matrixA[i, j] = (float) normal.Sample();
} }
} }
@ -223,12 +219,12 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single
{ {
for (var j = 0; j < order; j++) for (var j = 0; j < order; j++)
{ {
matrixA[i, j] = (float)normal.Sample(); matrixA[i, j] = (float) normal.Sample();
} }
} }
// Generate a matrix which is positive definite. // Generate a matrix which is positive definite.
return matrixA.Transpose() * matrixA; return matrixA.Transpose()*matrixA;
} }
/// <summary> /// <summary>
@ -246,7 +242,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single
var v = new UserDefinedVector(order); var v = new UserDefinedVector(order);
for (var i = 0; i < order; i++) for (var i = 0; i < order; i++)
{ {
v[i] = (float)normal.Sample(); v[i] = (float) normal.Sample();
} }
// Generate a matrix which is positive definite. // Generate a matrix which is positive definite.

Write Preview
Loading…
Cancel
Save