You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by sr...@apache.org on 2011/05/02 20:14:25 UTC
svn commit: r1098706 [5/5] - in /mahout/trunk: core/src/main/java/
core/src/main/java/org/apache/mahout/
core/src/main/java/org/apache/mahout/cf/taste/eval/
core/src/main/java/org/apache/mahout/cf/taste/hadoop/
core/src/main/java/org/apache/mahout/cf/t...
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=1098706&r1=1098705&r2=1098706&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 Mon May 2 18:14:18 2011
@@ -84,7 +84,7 @@ public final class Property {
double x = a.getQuick(i);
double diff = Math.abs(value - x);
if (Double.isNaN(diff) && (Double.isNaN(value) && Double.isNaN(x) || value == x)) {
- diff = 0;
+ diff = 0.0;
}
if (diff > epsilon) {
return false;
@@ -121,10 +121,10 @@ public final class Property {
double x = a.getQuick(i);
double value = b.getQuick(i);
double diff = Math.abs(value - x);
- if (Double.isNaN(diff) && ((Double.isNaN(value) && Double.isNaN(x)) || value == x)) {
- diff = 0;
+ if (Double.isNaN(diff) && (Double.isNaN(value) && Double.isNaN(x) || value == x)) {
+ diff = 0.0;
}
- if (!(diff <= epsilon)) {
+ if (diff > epsilon) {
return false;
}
}
@@ -155,9 +155,9 @@ public final class Property {
double x = a.getQuick(row, column);
double diff = Math.abs(value - x);
if (Double.isNaN(diff) && (Double.isNaN(value) && Double.isNaN(x) || value == x)) {
- diff = 0;
+ diff = 0.0;
}
- if (!(diff <= epsilon)) {
+ if (diff > epsilon) {
return false;
}
}
@@ -196,8 +196,8 @@ public final class Property {
double x = a.getQuick(row, column);
double value = b.getQuick(row, column);
double diff = Math.abs(value - x);
- if (Double.isNaN(diff) && ((Double.isNaN(value) && Double.isNaN(x)) || value == x)) {
- diff = 0;
+ if (Double.isNaN(diff) && (Double.isNaN(value) && Double.isNaN(x) || value == x)) {
+ diff = 0.0;
}
if (diff > epsilon) {
return false;
Added: mahout/trunk/math/src/main/java/org/apache/mahout/math/package-info.java
URL: http://svn.apache.org/viewvc/mahout/trunk/math/src/main/java/org/apache/mahout/math/package-info.java?rev=1098706&view=auto
==============================================================================
--- mahout/trunk/math/src/main/java/org/apache/mahout/math/package-info.java (added)
+++ mahout/trunk/math/src/main/java/org/apache/mahout/math/package-info.java Mon May 2 18:14:18 2011
@@ -0,0 +1,4 @@
+/**
+ * Core base classes; Operations on primitive arrays such as sorting, partitioning and permuting.
+ */
+package org.apache.mahout.math;
\ No newline at end of file
Modified: mahout/trunk/math/src/main/java/org/apache/mahout/math/stats/LogLikelihood.java
URL: http://svn.apache.org/viewvc/mahout/trunk/math/src/main/java/org/apache/mahout/math/stats/LogLikelihood.java?rev=1098706&r1=1098705&r2=1098706&view=diff
==============================================================================
--- mahout/trunk/math/src/main/java/org/apache/mahout/math/stats/LogLikelihood.java (original)
+++ mahout/trunk/math/src/main/java/org/apache/mahout/math/stats/LogLikelihood.java Mon May 2 18:14:18 2011
@@ -110,7 +110,7 @@ public final class LogLikelihood {
public static double rootLogLikelihoodRatio(int k11, int k12, int k21, int k22) {
double llr = logLikelihoodRatio(k11, k12, k21, k22);
double sqrt = Math.sqrt(llr);
- if (((double) k11 / (k11 + k12)) < ((double) k21 / (k21 + k22))) {
+ if ((double) k11 / (k11 + k12) < (double) k21 / (k21 + k22)) {
sqrt = -sqrt;
}
return sqrt;
Modified: mahout/trunk/math/src/main/java/org/apache/mahout/math/stats/OnlineExponentialAverage.java
URL: http://svn.apache.org/viewvc/mahout/trunk/math/src/main/java/org/apache/mahout/math/stats/OnlineExponentialAverage.java?rev=1098706&r1=1098705&r2=1098706&view=diff
==============================================================================
--- mahout/trunk/math/src/main/java/org/apache/mahout/math/stats/OnlineExponentialAverage.java (original)
+++ mahout/trunk/math/src/main/java/org/apache/mahout/math/stats/OnlineExponentialAverage.java Mon May 2 18:14:18 2011
@@ -21,11 +21,12 @@ package org.apache.mahout.math.stats;
* Computes an online average that is exponentially weighted toward recent time-embedded samples.
*/
public class OnlineExponentialAverage {
+
private final double alpha;
- private double lastT = 0;
- private double s = 0;
- private double w = 0;
- private double T = 0;
+ private double lastT;
+ private double s;
+ private double w;
+ private double t;
/**
* Creates an averager that has a specified time constant for discounting old data. The time
@@ -46,8 +47,8 @@ public class OnlineExponentialAverage {
public void add(double t, double x) {
double pi = Math.exp(-(t - lastT) / alpha);
s = x + pi * s;
- w = 1 + pi * w;
- T = (t - lastT) + pi * T;
+ w = 1.0 + pi * w;
+ this.t = t - lastT + pi * this.t;
lastT = t;
}
@@ -56,6 +57,6 @@ public class OnlineExponentialAverage {
}
public double meanRate() {
- return s / T;
+ return s / t;
}
}
Modified: mahout/trunk/taste-web/src/main/java/org/apache/mahout/cf/taste/web/RecommenderServlet.java
URL: http://svn.apache.org/viewvc/mahout/trunk/taste-web/src/main/java/org/apache/mahout/cf/taste/web/RecommenderServlet.java?rev=1098706&r1=1098705&r2=1098706&view=diff
==============================================================================
--- mahout/trunk/taste-web/src/main/java/org/apache/mahout/cf/taste/web/RecommenderServlet.java (original)
+++ mahout/trunk/taste-web/src/main/java/org/apache/mahout/cf/taste/web/RecommenderServlet.java Mon May 2 18:14:18 2011
@@ -49,9 +49,9 @@ import java.util.List;
*
* <p>For example, you can get 10 recommendations for user 123 from the following URL (assuming
* you are running taste in a web application running locally on port 8080):<br/>
- * <code>http://localhost:8080/taste/RecommenderServlet?userID=123&howMany=10</code></p>
+ * {@code http://localhost:8080/taste/RecommenderServlet?userID=123&howMany=10}</p>
*
- * <p>This servlet requires one <code>init-param</code> in <code>web.xml</code>: it must find
+ * <p>This servlet requires one {@code init-param} in {@code web.xml}: it must find
* a parameter named "recommender-class" which is the name of a class that implements
* {@link Recommender} and has a no-arg constructor. The servlet will instantiate and use
* this {@link Recommender} to produce recommendations.</p>
Modified: mahout/trunk/taste-web/src/main/java/org/apache/mahout/cf/taste/web/RecommenderSingleton.java
URL: http://svn.apache.org/viewvc/mahout/trunk/taste-web/src/main/java/org/apache/mahout/cf/taste/web/RecommenderSingleton.java?rev=1098706&r1=1098705&r2=1098706&view=diff
==============================================================================
--- mahout/trunk/taste-web/src/main/java/org/apache/mahout/cf/taste/web/RecommenderSingleton.java (original)
+++ mahout/trunk/taste-web/src/main/java/org/apache/mahout/cf/taste/web/RecommenderSingleton.java Mon May 2 18:14:18 2011
@@ -22,7 +22,7 @@ import org.apache.mahout.cf.taste.recomm
/**
* <p>A singleton which holds an instance of a {@link Recommender}. This is used to share
- * a {@link Recommender} between {@link RecommenderServlet} and <code>RecommenderService.jws</code>.</p>
+ * a {@link Recommender} between {@link RecommenderServlet} and {@code RecommenderService.jws}.</p>
*/
public final class RecommenderSingleton {
Modified: mahout/trunk/utils/src/main/java/org/apache/mahout/text/SequenceFilesFromMailArchives.java
URL: http://svn.apache.org/viewvc/mahout/trunk/utils/src/main/java/org/apache/mahout/text/SequenceFilesFromMailArchives.java?rev=1098706&r1=1098705&r2=1098706&view=diff
==============================================================================
--- mahout/trunk/utils/src/main/java/org/apache/mahout/text/SequenceFilesFromMailArchives.java (original)
+++ mahout/trunk/utils/src/main/java/org/apache/mahout/text/SequenceFilesFromMailArchives.java Mon May 2 18:14:18 2011
@@ -202,7 +202,7 @@ public final class SequenceFilesFromMail
} else {
// first empty line we see after reading the message Id
// indicates that we are in the body ...
- inBody = (nextLine.length() == 0);
+ inBody = nextLine.length() == 0;
}
}
} else {
Modified: mahout/trunk/utils/src/main/java/org/apache/mahout/utils/clustering/ClusterDumper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/clustering/ClusterDumper.java?rev=1098706&r1=1098705&r2=1098706&view=diff
==============================================================================
--- mahout/trunk/utils/src/main/java/org/apache/mahout/utils/clustering/ClusterDumper.java (original)
+++ mahout/trunk/utils/src/main/java/org/apache/mahout/utils/clustering/ClusterDumper.java Mon May 2 18:14:18 2011
@@ -282,7 +282,7 @@ public final class ClusterDumper extends
Collection<Pair<String, Double>> topTerms = new LinkedList<Pair<String, Double>>();
- for (int i = 0; (i < vectorTerms.size()) && (i < numTerms); i++) {
+ for (int i = 0; i < vectorTerms.size() && i < numTerms; i++) {
int index = vectorTerms.get(i).index;
String dictTerm = dictionary[index];
if (dictTerm == null) {
Modified: mahout/trunk/utils/src/main/java/org/apache/mahout/utils/eval/DatasetSplitter.java
URL: http://svn.apache.org/viewvc/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/eval/DatasetSplitter.java?rev=1098706&r1=1098705&r2=1098706&view=diff
==============================================================================
--- mahout/trunk/utils/src/main/java/org/apache/mahout/utils/eval/DatasetSplitter.java (original)
+++ mahout/trunk/utils/src/main/java/org/apache/mahout/utils/eval/DatasetSplitter.java Mon May 2 18:14:18 2011
@@ -18,7 +18,6 @@
package org.apache.mahout.utils.eval;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.BooleanWritable;
import org.apache.hadoop.io.LongWritable;
import org.apache.hadoop.io.NullWritable;
import org.apache.hadoop.io.Text;
@@ -71,9 +70,9 @@ public class DatasetSplitter extends Abs
addInputOption();
addOutputOption();
addOption("trainingPercentage", "t", "percentage of the data to use as training set (default: " +
- DEFAULT_TRAINING_PERCENTAGE + ")", String.valueOf(DEFAULT_TRAINING_PERCENTAGE));
+ DEFAULT_TRAINING_PERCENTAGE + ')', String.valueOf(DEFAULT_TRAINING_PERCENTAGE));
addOption("probePercentage", "p", "percentage of the data to use as probe set (default: " +
- DEFAULT_PROBE_PERCENTAGE +")", String.valueOf(DEFAULT_PROBE_PERCENTAGE));
+ DEFAULT_PROBE_PERCENTAGE + ')', String.valueOf(DEFAULT_PROBE_PERCENTAGE));
Map<String, String> parsedArgs = parseArguments(args);
double trainingPercentage = Double.parseDouble(parsedArgs.get("--trainingPercentage"));
Modified: mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/io/VectorWriter.java
URL: http://svn.apache.org/viewvc/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/io/VectorWriter.java?rev=1098706&r1=1098705&r2=1098706&view=diff
==============================================================================
--- mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/io/VectorWriter.java (original)
+++ mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/io/VectorWriter.java Mon May 2 18:14:18 2011
@@ -41,7 +41,7 @@ public interface VectorWriter extends Cl
void write(Vector vector) throws IOException;
/**
- * Write the first <code>maxDocs</code> to the output.
+ * Write the first {@code maxDocs} to the output.
* @param iterable The {@link Iterable} to loop over
* @param maxDocs the maximum number of docs to write
* @return The number of docs written