Apache
/
commons-math
mirror of https://github.com/apache/commons-math.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Moved variable declarations closer to their point of use. 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/trunk@1361797 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gilles Sadowski 2012-07-15 21:06:33 +00:00
parent 3ba28fe49d
commit bf2ac35d56
1 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/main/java/org/apache/commons/math3/analysis/solvers/LaguerreSolver.java
View File

@ -262,15 +262,15 @@ public class LaguerreSolver extends AbstractPolynomialSolver {
throw new NoDataException(LocalizedFormats.POLYNOMIAL); throw new NoDataException(LocalizedFormats.POLYNOMIAL);
} }
// Coefficients for deflated polynomial. // Coefficients for deflated polynomial.
Complex c[] = new Complex[n + 1]; final Complex c[] = new Complex[n + 1];
for (int i = 0; i <= n; i++) { for (int i = 0; i <= n; i++) {
c[i] = coefficients[i]; c[i] = coefficients[i];
} }
// Solve individual roots successively. // Solve individual roots successively.
Complex root[] = new Complex[n]; final Complex root[] = new Complex[n];
for (int i = 0; i < n; i++) { for (int i = 0; i < n; i++) {
Complex subarray[] = new Complex[n - i + 1]; final Complex subarray[] = new Complex[n - i + 1];
System.arraycopy(c, 0, subarray, 0, subarray.length); System.arraycopy(c, 0, subarray, 0, subarray.length);
root[i] = solve(subarray, initial); root[i] = solve(subarray, initial);
// Polynomial deflation using synthetic division. // Polynomial deflation using synthetic division.
@ -313,26 +313,18 @@ public class LaguerreSolver extends AbstractPolynomialSolver {
final double relativeAccuracy = getRelativeAccuracy(); final double relativeAccuracy = getRelativeAccuracy();
final double functionValueAccuracy = getFunctionValueAccuracy(); final double functionValueAccuracy = getFunctionValueAccuracy();
Complex N = new Complex(n, 0.0); final Complex N = new Complex(n, 0);
Complex N1 = new Complex(n - 1, 0.0); final Complex N1 = new Complex(n - 1, 0);
Complex pv = null;
Complex dv = null;
Complex d2v = null;
Complex G = null;
Complex G2 = null;
Complex H = null;
Complex delta = null;
Complex denominator = null;
Complex z = initial; Complex z = initial;
Complex oldz = new Complex(Double.POSITIVE_INFINITY, Complex oldz = new Complex(Double.POSITIVE_INFINITY,
Double.POSITIVE_INFINITY); Double.POSITIVE_INFINITY);
while (true) { while (true) {
// Compute pv (polynomial value), dv (derivative value), and // Compute pv (polynomial value), dv (derivative value), and
// d2v (second derivative value) simultaneously. // d2v (second derivative value) simultaneously.
pv = coefficients[n]; Complex pv = coefficients[n];
dv = Complex.ZERO; Complex dv = Complex.ZERO;
d2v = Complex.ZERO; Complex d2v = Complex.ZERO;
for (int j = n-1; j >= 0; j--) { for (int j = n-1; j >= 0; j--) {
d2v = dv.add(z.multiply(d2v)); d2v = dv.add(z.multiply(d2v));
dv = pv.add(z.multiply(dv)); dv = pv.add(z.multiply(dv));
@ -341,8 +333,8 @@ public class LaguerreSolver extends AbstractPolynomialSolver {
d2v = d2v.multiply(new Complex(2.0, 0.0)); d2v = d2v.multiply(new Complex(2.0, 0.0));
// check for convergence // check for convergence
double tolerance = FastMath.max(relativeAccuracy * z.abs(), final double tolerance = FastMath.max(relativeAccuracy * z.abs(),
absoluteAccuracy); absoluteAccuracy);
if ((z.subtract(oldz)).abs() <= tolerance) { if ((z.subtract(oldz)).abs() <= tolerance) {
return z; return z;
} }
@ -351,15 +343,15 @@ public class LaguerreSolver extends AbstractPolynomialSolver {
} }
// now pv != 0, calculate the new approximation // now pv != 0, calculate the new approximation
G = dv.divide(pv); final Complex G = dv.divide(pv);
G2 = G.multiply(G); final Complex G2 = G.multiply(G);
H = G2.subtract(d2v.divide(pv)); final Complex H = G2.subtract(d2v.divide(pv));
delta = N1.multiply((N.multiply(H)).subtract(G2)); final Complex delta = N1.multiply((N.multiply(H)).subtract(G2));
// choose a denominator larger in magnitude // choose a denominator larger in magnitude
Complex deltaSqrt = delta.sqrt(); final Complex deltaSqrt = delta.sqrt();
Complex dplus = G.add(deltaSqrt); final Complex dplus = G.add(deltaSqrt);
Complex dminus = G.subtract(deltaSqrt); final Complex dminus = G.subtract(deltaSqrt);
denominator = dplus.abs() > dminus.abs() ? dplus : dminus; final Complex denominator = dplus.abs() > dminus.abs() ? dplus : dminus;
// Perturb z if denominator is zero, for instance, // Perturb z if denominator is zero, for instance,
// p(x) = x^3 + 1, z = 0. // p(x) = x^3 + 1, z = 0.
if (denominator.equals(new Complex(0.0, 0.0))) { if (denominator.equals(new Complex(0.0, 0.0))) {