Modified: mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/SparseDoubleMatrix3D.java URL: http://svn.apache.org/viewvc/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/SparseDoubleMatrix3D.java?rev=985565&r1=985564&r2=985565&view=diff ============================================================================== --- mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/SparseDoubleMatrix3D.java (original) +++ mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/SparseDoubleMatrix3D.java Sat Aug 14 19:09:09 2010 @@ -119,11 +119,7 @@ public class SparseDoubleMatrix3D extend /** Returns the number of cells having non-zero values. */ @Override public int cardinality() { - if (this.isNoView) { - return this.elements.size(); - } else { - return super.cardinality(); - } + return this.isNoView ? this.elements.size() : super.cardinality(); } /**
Modified: mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/TridiagonalDoubleMatrix2D.java URL: http://svn.apache.org/viewvc/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/TridiagonalDoubleMatrix2D.java?rev=985565&r1=985564&r2=985565&view=diff ============================================================================== --- mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/TridiagonalDoubleMatrix2D.java (original) +++ mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/TridiagonalDoubleMatrix2D.java Sat Aug 14 19:09:09 2010 @@ -233,7 +233,8 @@ class TridiagonalDoubleMatrix2D extends @Override public DoubleMatrix2D forEachNonZero(IntIntDoubleFunction function) { for (int kind = 0; kind <= 2; kind++) { - int i = 0, j = 0; + int i = 0; + int j = 0; switch (kind) { case 0: { i = 1; @@ -278,14 +279,11 @@ class TridiagonalDoubleMatrix2D extends * should only use this method when you are absolutely sure that the coordinate is within bounds.</b> Precondition * (unchecked): <tt>0 <= column < columns() && 0 <= row < rows()</tt>. * - * @param row the index of the row-coordinate. - * @param column the index of the column-coordinate. + * j...@param column the index of the column-coordinate. * @return the value at the specified coordinate. */ @Override - public double getQuick(int row, int column) { - int i = row; - int j = column; + public double getQuick(int i, int j) { int k = j - i + 1; int q = i; @@ -354,14 +352,12 @@ class TridiagonalDoubleMatrix2D extends * should only use this method when you are absolutely sure that the coordinate is within bounds.</b> Precondition * (unchecked): <tt>0 <= column < columns() && 0 <= row < rows()</tt>. * - * @param row the index of the row-coordinate. - * @param column the index of the column-coordinate. + * @param i the index of the row-coordinate. + * @param j the index of the column-coordinate. * @param value the value to be filled into the specified cell. */ @Override - public void setQuick(int row, int column, double value) { - int i = row; - int j = column; + public void setQuick(int i, int j, double value) { boolean isZero = (value == 0); @@ -388,7 +384,7 @@ class TridiagonalDoubleMatrix2D extends if (!isZero) { throw new IllegalArgumentException( - "Can't store non-zero value to non-tridiagonal coordinate: row=" + row + ", column=" + column + ", value=" + + "Can't store non-zero value to non-tridiagonal coordinate: row=" + i + ", column=" + j + ", value=" + value); } Modified: mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/WrapperDoubleMatrix2D.java URL: http://svn.apache.org/viewvc/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/WrapperDoubleMatrix2D.java?rev=985565&r1=985564&r2=985565&view=diff ============================================================================== --- mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/WrapperDoubleMatrix2D.java (original) +++ mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/WrapperDoubleMatrix2D.java Sat Aug 14 19:09:09 2010 @@ -279,7 +279,7 @@ class WrapperDoubleMatrix2D extends Doub if (rows == 0) { return this; } - DoubleMatrix2D view = new WrapperDoubleMatrix2D(this) { + return new WrapperDoubleMatrix2D(WrapperDoubleMatrix2D.this) { @Override public double getQuick(int row, int column) { return content.get(rows - 1 - row, column); @@ -290,7 +290,6 @@ class WrapperDoubleMatrix2D extends Doub content.set(rows - 1 - row, column, value); } }; - return view; } /** Modified: mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/Algebra.java URL: http://svn.apache.org/viewvc/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/Algebra.java?rev=985565&r1=985564&r2=985565&view=diff ============================================================================== --- mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/Algebra.java (original) +++ mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/Algebra.java Sat Aug 14 19:09:09 2010 @@ -750,7 +750,7 @@ public class Algebra extends PersistentO // finally, format properties StringBuilder buf = new StringBuilder(); for (int i = 0; i < names.size(); i++) { - String name = ((String) names.get(i)); + String name = names.get(i); buf.append(name); buf.append(Property.blanks(maxLength - name.length())); buf.append(" : "); Modified: mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/EigenvalueDecomposition.java URL: http://svn.apache.org/viewvc/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/EigenvalueDecomposition.java?rev=985565&r1=985564&r2=985565&view=diff ============================================================================== --- mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/EigenvalueDecomposition.java (original) +++ mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/EigenvalueDecomposition.java Sat Aug 14 19:09:09 2010 @@ -23,7 +23,8 @@ public class EigenvalueDecomposition imp private final int n; /** Arrays for internal storage of eigenvalues. */ - private final double[] d, e; + private final double[] d; + private final double[] e; /** Array for internal storage of eigenvectors. */ private final double[][] V; @@ -36,7 +37,8 @@ public class EigenvalueDecomposition imp // Complex scalar division. - private transient double cdivr, cdivi; + private transient double cdivr; + private transient double cdivi; /** * Constructs and returns a new eigenvalue decomposition object; The decomposed matrices can be retrieved via instance @@ -88,7 +90,8 @@ public class EigenvalueDecomposition imp } private void cdiv(double xr, double xi, double yr, double yi) { - double r, d; + double r; + double d; if (Math.abs(yr) > Math.abs(yi)) { r = yi / yr; d = yr + r * yi; Modified: mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/LUDecompositionQuick.java URL: http://svn.apache.org/viewvc/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/LUDecompositionQuick.java?rev=985565&r1=985564&r2=985565&view=diff ============================================================================== --- mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/LUDecompositionQuick.java (original) +++ mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/LUDecompositionQuick.java Sat Aug 14 19:09:09 2010 @@ -162,7 +162,7 @@ public class LUDecompositionQuick implem * @param A any matrix. */ public void decompose(DoubleMatrix2D A, int semiBandwidth) { - if (!algebra.property().isSquare(A) || semiBandwidth < 0 || semiBandwidth > 2) { + if (!Property.isSquare(A) || semiBandwidth < 0 || semiBandwidth > 2) { decompose(A); return; } @@ -365,7 +365,7 @@ public class LUDecompositionQuick implem * @throws IllegalArgumentException if <tt>A.rows() < A.columns()</tt>. */ public void solve(DoubleMatrix1D B) { - algebra.property().checkRectangular(LU); + Property.checkRectangular(LU); int m = m(); int n = n(); if (B.size() != m) { @@ -428,7 +428,7 @@ public class LUDecompositionQuick implem * @throws IllegalArgumentException if <tt>A.rows() < A.columns()</tt>. */ public void solve(DoubleMatrix2D B) { - algebra.property().checkRectangular(LU); + Property.checkRectangular(LU); int m = m(); int n = n(); if (B.rows() != m) { @@ -541,7 +541,7 @@ public class LUDecompositionQuick implem * @throws IllegalArgumentException if <tt>A.rows() < A.columns()</tt>. */ private void solveOld(DoubleMatrix2D B) { - algebra.property().checkRectangular(LU); + Property.checkRectangular(LU); int m = m(); int n = n(); if (B.rows() != m) { Modified: mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/Property.java URL: http://svn.apache.org/viewvc/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/Property.java?rev=985565&r1=985564&r2=985565&view=diff ============================================================================== --- mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/Property.java (original) +++ mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/Property.java Sat Aug 14 19:09:09 2010 @@ -1069,14 +1069,14 @@ public class Property extends Persistent // determine padding for nice formatting int maxLength = 0; for (int i = 0; i < names.size(); i++) { - int length = ((CharSequence) names.get(i)).length(); + int length = names.get(i).length(); maxLength = Math.max(length, maxLength); } // finally, format properties StringBuilder buf = new StringBuilder(); for (int i = 0; i < names.size(); i++) { - String name = ((String) names.get(i)); + String name = names.get(i); buf.append(name); buf.append(blanks(maxLength - name.length())); buf.append(" : "); Modified: mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/QRDecomposition.java URL: http://svn.apache.org/viewvc/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/QRDecomposition.java?rev=985565&r1=985564&r2=985565&view=diff ============================================================================== --- mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/QRDecomposition.java (original) +++ mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/QRDecomposition.java Sat Aug 14 19:09:09 2010 @@ -34,7 +34,8 @@ public class QRDecomposition implements //private double[][] QR; /** Row and column dimensions. */ - private final int m, n; + private final int m; + private final int n; /** Array for internal storage of diagonal of R. */ private final DoubleMatrix1D Rdiag; Modified: mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/SeqBlas.java URL: http://svn.apache.org/viewvc/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/SeqBlas.java?rev=985565&r1=985564&r2=985565&view=diff ============================================================================== --- mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/SeqBlas.java (original) +++ mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/SeqBlas.java Sat Aug 14 19:09:09 2010 @@ -246,10 +246,6 @@ public class SeqBlas implements Blas { * @param b b */ private static double sign(double a, double b) { - if (b < 0.0) { - return -Math.abs(a); - } else { - return Math.abs(a); - } + return b < 0.0 ? -Math.abs(a) : Math.abs(a); } } Modified: mahout/trunk/math/src/main/java/org/apache/mahout/math/stats/OnlineSummarizer.java URL: http://svn.apache.org/viewvc/mahout/trunk/math/src/main/java/org/apache/mahout/math/stats/OnlineSummarizer.java?rev=985565&r1=985564&r2=985565&view=diff ============================================================================== --- mahout/trunk/math/src/main/java/org/apache/mahout/math/stats/OnlineSummarizer.java (original) +++ mahout/trunk/math/src/main/java/org/apache/mahout/math/stats/OnlineSummarizer.java Sat Aug 14 19:09:09 2010 @@ -45,7 +45,7 @@ public class OnlineSummarizer { private DoubleArrayList starter = new DoubleArrayList(100); // quartile estimates - private double q[] = new double[5]; + private final double[] q = new double[5]; // mean and variance estimates private double mean = 0; @@ -109,11 +109,7 @@ public class OnlineSummarizer { if (n == 0) { throw new IllegalArgumentException("Must have at least one sample to estimate minimum value"); } - if (n <= 100) { - return starter.get(0); - } else { - return q[0]; - } + return n <= 100 ? starter.get(0) : q[0]; } private void sort() { @@ -128,11 +124,7 @@ public class OnlineSummarizer { if (n == 0) { throw new IllegalArgumentException("Must have at least one sample to estimate maximum value"); } - if (n <= 100) { - return starter.get(99); - } else { - return q[4]; - } + return n <= 100 ? starter.get(99) : q[4]; } public double quartile(int i) {
