svn commit: r1455748 [2/2] - in /mahout/trunk: core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/ core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/ core/src/main/java/org/apache/mahout/classifier/ core/src/main/java/org/apache/...

[sr...@apache.org]

Modified: mahout/trunk/math/src/main/java/org/apache/mahout/math/random/SyntheticVariable.java
URL: http://svn.apache.org/viewvc/mahout/trunk/math/src/main/java/org/apache/mahout/math/random/SyntheticVariable.java?rev=1455748&r1=1455747&r2=1455748&view=diff
==============================================================================
--- mahout/trunk/math/src/main/java/org/apache/mahout/math/random/SyntheticVariable.java (original)
+++ mahout/trunk/math/src/main/java/org/apache/mahout/math/random/SyntheticVariable.java Tue Mar 12 23:10:14 2013
@@ -56,7 +56,7 @@ import java.util.Map;
  */
 public class SyntheticVariable extends AbstractSamplerFunction {
 
-    private Map<String, String> assign(Iterable<String> split) {
+  private static Map<String, String> assign(Iterable<String> split) {
     Iterable<String> labels = ImmutableList.of(
       "name", "type", "n", "missing", "missing%", "mean", "std", "min", "max",
       "q01", "q05", "q10", "q25", "q50", "q75", "q90", "q95", "q99");

Modified: mahout/trunk/math/src/main/java/org/apache/mahout/math/set/HashUtils.java
URL: http://svn.apache.org/viewvc/mahout/trunk/math/src/main/java/org/apache/mahout/math/set/HashUtils.java?rev=1455748&r1=1455747&r2=1455748&view=diff
==============================================================================
--- mahout/trunk/math/src/main/java/org/apache/mahout/math/set/HashUtils.java (original)
+++ mahout/trunk/math/src/main/java/org/apache/mahout/math/set/HashUtils.java Tue Mar 12 23:10:14 2013
@@ -21,7 +21,7 @@ package org.apache.mahout.math.set;
  * Computes hashes of primitive values.  Providing these as statics allows the templated code
  * to compute hashes of sets.
  */
-public class HashUtils {
+public final class HashUtils {
 
   private HashUtils() {
   }

Modified: mahout/trunk/math/src/main/java/org/apache/mahout/math/solver/ConjugateGradientSolver.java
URL: http://svn.apache.org/viewvc/mahout/trunk/math/src/main/java/org/apache/mahout/math/solver/ConjugateGradientSolver.java?rev=1455748&r1=1455747&r2=1455748&view=diff
==============================================================================
--- mahout/trunk/math/src/main/java/org/apache/mahout/math/solver/ConjugateGradientSolver.java (original)
+++ mahout/trunk/math/src/main/java/org/apache/mahout/math/solver/ConjugateGradientSolver.java Tue Mar 12 23:10:14 2013
@@ -144,7 +144,7 @@ public class ConjugateGradientSolver
     Vector residual = b.minus(a.times(x));
     residualNormSquared = residual.dot(residual);
 
-    log.info("Conjugate gradient initial residual norm = " + Math.sqrt(residualNormSquared));
+    log.info("Conjugate gradient initial residual norm = {}", Math.sqrt(residualNormSquared));
     double previousConditionedNormSqr = 0.0;
     Vector updateDirection = null;
     while (Math.sqrt(residualNormSquared) > maxError && iterations < maxIterations) {
@@ -185,7 +185,7 @@ public class ConjugateGradientSolver
       previousConditionedNormSqr = conditionedNormSqr;
       residualNormSquared = residual.dot(residual);
       
-      log.info("Conjugate gradient iteration " + iterations + " residual norm = " + Math.sqrt(residualNormSquared));
+      log.info("Conjugate gradient iteration {} residual norm = {}", iterations, Math.sqrt(residualNormSquared));
     }
     return x;
   }

Modified: mahout/trunk/math/src/test/java/org/apache/mahout/math/FileBasedSparseBinaryMatrixTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/math/src/test/java/org/apache/mahout/math/FileBasedSparseBinaryMatrixTest.java?rev=1455748&r1=1455747&r2=1455748&view=diff
==============================================================================
--- mahout/trunk/math/src/test/java/org/apache/mahout/math/FileBasedSparseBinaryMatrixTest.java (original)
+++ mahout/trunk/math/src/test/java/org/apache/mahout/math/FileBasedSparseBinaryMatrixTest.java Tue Mar 12 23:10:14 2013
@@ -25,15 +25,17 @@ import java.io.IOException;
 import java.util.Random;
 
 public class FileBasedSparseBinaryMatrixTest extends MahoutTestCase {
+  
+  /*  
   // 10 million rows x 40 columns x 8 bytes = 3.2GB of data
   // we need >2GB to stress the file based matrix implementation
   private static final int ROWS = 10 * 1000 * 1000;
   private static final int COLUMNS = 1000;
 
-  // @Test
+  @Test
   public void testBigMatrix() throws IOException {
     // only run this test if -DrunSlowTests is used.  Also requires 4GB or more of heap.
-//    assumeNotNull(System.getProperty("runSlowTests"));
+    // assumeNotNull(System.getProperty("runSlowTests"));
 
     Matrix m0 = new SparseRowMatrix(ROWS, COLUMNS);
     Random gen = RandomUtils.getRandom();
@@ -60,6 +62,7 @@ public class FileBasedSparseBinaryMatrix
   private static int matrixValue(int i) {
     return (i * 88513) % 10000;
   }
+   */
 
   @Test
   public void testSetData() throws IOException {

Modified: mahout/trunk/math/src/test/java/org/apache/mahout/math/QRDecompositionTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/math/src/test/java/org/apache/mahout/math/QRDecompositionTest.java?rev=1455748&r1=1455747&r2=1455748&view=diff
==============================================================================
--- mahout/trunk/math/src/test/java/org/apache/mahout/math/QRDecompositionTest.java (original)
+++ mahout/trunk/math/src/test/java/org/apache/mahout/math/QRDecompositionTest.java Tue Mar 12 23:10:14 2013
@@ -33,12 +33,12 @@ public final class QRDecompositionTest e
 
     // how close is Q to actually being orthornormal?
     double maxIdent = qr.getQ().transpose().times(qr.getQ()).viewDiagonal().assign(Functions.plus(-1)).norm(1);
-    assertEquals(0, maxIdent, 1e-13);
+    assertEquals(0, maxIdent, 1.0e-13);
 
     // how close is Q R to the original value of A?
     Matrix z = qr.getQ().times(qr.getR()).minus(a);
     double maxError = z.aggregate(Functions.MIN, Functions.ABS);
-    assertEquals(0, maxError, 1e-13);
+    assertEquals(0, maxError, 1.0e-13);
   }
 
   @Test
@@ -73,7 +73,7 @@ public final class QRDecompositionTest e
     Matrix r = qr.getR();
 
     // check identity down to sign
-    assertEquals(0, r.clone().assign(Functions.ABS).minus(rRef.clone().assign(Functions.ABS)).aggregate(Functions.PLUS, Functions.IDENTITY), 1e-12);
+    assertEquals(0, r.clone().assign(Functions.ABS).minus(rRef.clone().assign(Functions.ABS)).aggregate(Functions.PLUS, Functions.IDENTITY), 1.0e-12);
 
     Matrix qRef = reshape(new double[]{
       -0.165178287646573, 0.0510035857637869, 0.13985915987379, -0.120173729496501,
@@ -93,7 +93,7 @@ public final class QRDecompositionTest e
     Matrix q = qr.getQ();
     printMatrix("q", q);
 
-    assertEquals(0, q.clone().assign(Functions.ABS).minus(qRef.clone().assign(Functions.ABS)).aggregate(Functions.PLUS, Functions.IDENTITY), 1e-12);
+    assertEquals(0, q.clone().assign(Functions.ABS).minus(qRef.clone().assign(Functions.ABS)).aggregate(Functions.PLUS, Functions.IDENTITY), 1.0e-12);
 
     Matrix x1 = qr.solve(reshape(new double[]{
       -0.0178247686747641, 0.68631714634098, -0.335464858468858, 1.50249941751569,
@@ -129,7 +129,7 @@ public final class QRDecompositionTest e
     }, 5, 8);
     printMatrix("rRef", rRef);
     printMatrix("rActual", rActual);
-    assertEquals(0, rActual.clone().assign(Functions.ABS).minus(rRef.clone().assign(Functions.ABS)).aggregate(Functions.PLUS, Functions.IDENTITY), 1e-12);
+    assertEquals(0, rActual.clone().assign(Functions.ABS).minus(rRef.clone().assign(Functions.ABS)).aggregate(Functions.PLUS, Functions.IDENTITY), 1.0e-12);
 //    assertEquals(rRef, rActual, 1.0e-8);
 
     Matrix qRef = reshape(new double[]{
@@ -145,7 +145,7 @@ public final class QRDecompositionTest e
     printMatrix("qRef", qRef);
     printMatrix("q", q);
 
-    assertEquals(0, q.clone().assign(Functions.ABS).minus(qRef.clone().assign(Functions.ABS)).aggregate(Functions.PLUS, Functions.IDENTITY), 1e-12);
+    assertEquals(0, q.clone().assign(Functions.ABS).minus(qRef.clone().assign(Functions.ABS)).aggregate(Functions.PLUS, Functions.IDENTITY), 1.0e-12);
 //    assertEquals(qRef, q, 1.0e-8);
 
     Matrix x1 = qr.solve(b());
@@ -157,7 +157,7 @@ public final class QRDecompositionTest e
     printMatrix("x", x1);
     assertEquals(xRef, x1, 1.0e-8);
 
-    assertEquals(x, qr.getQ().times(qr.getR()), 1e-15);
+    assertEquals(x, qr.getQ().times(qr.getR()), 1.0e-15);
   }
 
   @Test
@@ -188,10 +188,10 @@ public final class QRDecompositionTest e
   }
 
   private interface Decomposer {
-    public QR decompose(Matrix a);
+    QR decompose(Matrix a);
   }
 
-  private void decompositionSpeedCheck(Decomposer qrf, OnlineSummarizer s1, Matrix a, String label) {
+  private static void decompositionSpeedCheck(Decomposer qrf, OnlineSummarizer s1, Matrix a, String label) {
     int n = 0;
     List<Integer> counts = Lists.newArrayList(10, 20, 50, 100, 200, 500);
     for (int k : counts) {
@@ -221,7 +221,7 @@ public final class QRDecompositionTest e
       if (k > 100) {
         s1.add(t1 - t0);
       }
-      System.out.printf("%s %d\t%.1f\t%g\t%g\t%g\n", label, n, (t1 - t0) / 1e3 / n, maxIdent, maxError, warmup);
+      System.out.printf("%s %d\t%.1f\t%g\t%g\t%g\n", label, n, (t1 - t0) / 1.0e3 / n, maxIdent, maxError, warmup);
     }
   }
 

Modified: mahout/trunk/math/src/test/java/org/apache/mahout/math/set/HashUtilsTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/math/src/test/java/org/apache/mahout/math/set/HashUtilsTest.java?rev=1455748&r1=1455747&r2=1455748&view=diff
==============================================================================
--- mahout/trunk/math/src/test/java/org/apache/mahout/math/set/HashUtilsTest.java (original)
+++ mahout/trunk/math/src/test/java/org/apache/mahout/math/set/HashUtilsTest.java Tue Mar 12 23:10:14 2013
@@ -57,7 +57,7 @@ public class HashUtilsTest extends TestC
     }
   }
 
-  private <T> int checkCounts(Collection<T> original) {
+  private static <T> int checkCounts(Collection<T> original) {
     Multiset<T> hashCounts = HashMultiset.create();
     for (T v : original) {
       hashCounts.add(v);