Browse Source
Merge pull request #543 from jnyrup/DelayVariables
Move variables into scopes
pull/549/head
Christoph Ruegg
9 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
10 additions and
9 deletions
-
src/Numerics/Distributions/ConwayMaxwellPoisson.cs
-
src/Numerics/Providers/LinearAlgebra/ManagedLinearAlgebraProvider.Complex32.cs
|
|
|
@ -191,12 +191,12 @@ namespace MathNet.Numerics.Distributions |
|
|
|
var a2 = a1*e; |
|
|
|
var ax2 = ax1*ex; |
|
|
|
|
|
|
|
var m = zx/z; |
|
|
|
var upper = (zx + (ax1/(1 - (ax2/ax1))))/z; |
|
|
|
var lower = zx/(z + (a1/(1 - (a2/a1)))); |
|
|
|
|
|
|
|
if ((ax2 < ax1) && (a2 < a1)) |
|
|
|
{ |
|
|
|
var m = zx/z; |
|
|
|
var upper = (zx + (ax1/(1 - (ax2/ax1))))/z; |
|
|
|
var lower = zx/(z + (a1/(1 - (a2/a1)))); |
|
|
|
|
|
|
|
var r = (upper - lower)/m; |
|
|
|
if (r < Tolerance) |
|
|
|
{ |
|
|
|
@ -252,12 +252,12 @@ namespace MathNet.Numerics.Distributions |
|
|
|
var a2 = a1*e; |
|
|
|
var axx2 = axx1*exx; |
|
|
|
|
|
|
|
var m = zxx/z; |
|
|
|
var upper = (zxx + (axx1/(1 - (axx2/axx1))))/z; |
|
|
|
var lower = zxx/(z + (a1/(1 - (a2/a1)))); |
|
|
|
|
|
|
|
if ((axx2 < axx1) && (a2 < a1)) |
|
|
|
{ |
|
|
|
var m = zxx/z; |
|
|
|
var upper = (zxx + (axx1/(1 - (axx2/axx1))))/z; |
|
|
|
var lower = zxx/(z + (a1/(1 - (a2/a1)))); |
|
|
|
|
|
|
|
var r = (upper - lower)/m; |
|
|
|
if (r < Tolerance) |
|
|
|
{ |
|
|
|
|
|
|
|
@ -2875,7 +2875,6 @@ namespace MathNet.Numerics.Providers.LinearAlgebra |
|
|
|
|
|
|
|
var matrixCopy = new Complex32[matrix.Length]; |
|
|
|
Array.Copy(matrix, 0, matrixCopy, 0, matrix.Length); |
|
|
|
var v = new DenseVector(order); |
|
|
|
if (isSymmetric) |
|
|
|
{ |
|
|
|
var tau = new Complex32[order]; |
|
|
|
@ -2894,6 +2893,8 @@ namespace MathNet.Numerics.Providers.LinearAlgebra |
|
|
|
} |
|
|
|
else |
|
|
|
{ |
|
|
|
var v = new DenseVector(order); |
|
|
|
|
|
|
|
DenseEvd.NonsymmetricReduceToHessenberg(matrixEv, matrixCopy, order); |
|
|
|
DenseEvd.NonsymmetricReduceHessenberToRealSchur(v.Values, matrixEv, matrixCopy, order); |
|
|
|
for (var i = 0; i < order; i++) |
|
|
|
|
