From 736cf4cc928b19ae0e71d39a58cf034364432b9b Mon Sep 17 00:00:00 2001 From: jnyrup Date: Sat, 20 Jan 2018 09:17:43 +0100 Subject: [PATCH] move variables into scopes --- .../Distributions/ConwayMaxwellPoisson.cs | 16 ++++++++-------- .../ManagedLinearAlgebraProvider.Complex32.cs | 3 ++- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/Numerics/Distributions/ConwayMaxwellPoisson.cs b/src/Numerics/Distributions/ConwayMaxwellPoisson.cs index 22b0acc1..c7c24cf4 100644 --- a/src/Numerics/Distributions/ConwayMaxwellPoisson.cs +++ b/src/Numerics/Distributions/ConwayMaxwellPoisson.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) { diff --git a/src/Numerics/Providers/LinearAlgebra/ManagedLinearAlgebraProvider.Complex32.cs b/src/Numerics/Providers/LinearAlgebra/ManagedLinearAlgebraProvider.Complex32.cs index 7cb64870..f266641c 100644 --- a/src/Numerics/Providers/LinearAlgebra/ManagedLinearAlgebraProvider.Complex32.cs +++ b/src/Numerics/Providers/LinearAlgebra/ManagedLinearAlgebraProvider.Complex32.cs @@ -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++)