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 2008/12/24 00:32:36 UTC
svn commit: r729175 [4/5] - in /lucene/mahout/trunk:
core/src/main/java/org/apache/mahout/cf/taste/common/
core/src/main/java/org/apache/mahout/cf/taste/hadoop/
core/src/main/java/org/apache/mahout/cf/taste/impl/common/
core/src/main/java/org/apache/ma...
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/AbstractMatrix.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/AbstractMatrix.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/AbstractMatrix.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/AbstractMatrix.java Tue Dec 23 15:32:31 2008
@@ -17,8 +17,6 @@
package org.apache.mahout.matrix;
-import org.apache.hadoop.io.WritableComparable;
-
/**
* A few universal implementations of convenience functions
*
@@ -31,38 +29,7 @@
// index into int[2] for row value
public static final int ROW = 0;
- public abstract WritableComparable asWritableComparable();
-
- public abstract String asFormatString();
-
- public abstract Matrix assignColumn(int column, Vector other);
-
- public abstract Matrix assignRow(int row, Vector other);
-
- public abstract int[] cardinality();
-
- public abstract Matrix copy();
-
- public abstract Vector getColumn(int column);
-
- public abstract double getQuick(int row, int column);
-
- public abstract Vector getRow(int row);
-
- public abstract boolean haveSharedCells(Matrix other);
-
- public abstract Matrix like();
-
- public abstract Matrix like(int rows, int columns);
-
- public abstract void setQuick(int row, int column, double value);
-
- public abstract int[] size();
-
- public abstract double[][] toArray();
-
- public abstract Matrix viewPart(int[] offset, int[] length);
-
+ @Override
public Matrix assign(double value) {
int[] c = cardinality();
for (int row = 0; row < c[ROW]; row++)
@@ -71,6 +38,7 @@
return this;
}
+ @Override
public Matrix assign(double[][] values) {
int[] c = cardinality();
if (c[ROW] != values.length)
@@ -84,6 +52,7 @@
return this;
}
+ @Override
public Matrix assign(Matrix other, BinaryFunction function) {
int[] c = cardinality();
int[] o = other.cardinality();
@@ -96,6 +65,7 @@
return this;
}
+ @Override
public Matrix assign(Matrix other) {
int[] c = cardinality();
int[] o = other.cardinality();
@@ -107,6 +77,7 @@
return this;
}
+ @Override
public Matrix assign(UnaryFunction function) {
int[] c = cardinality();
for (int row = 0; row < c[ROW]; row++)
@@ -115,6 +86,7 @@
return this;
}
+ @Override
public double determinant() {
int[] card = cardinality();
int rowSize = card[ROW];
@@ -150,6 +122,7 @@
}
+ @Override
public Matrix divide(double x) {
Matrix result = copy();
int[] c = cardinality();
@@ -159,6 +132,7 @@
return result;
}
+ @Override
public double get(int row, int column) {
int[] c = cardinality();
if (row < 0 || column < 0 || row >= c[ROW] || column >= c[COL])
@@ -166,6 +140,7 @@
return getQuick(row, column);
}
+ @Override
public Matrix minus(Matrix other) {
int[] c = cardinality();
int[] o = other.cardinality();
@@ -179,6 +154,7 @@
return result;
}
+ @Override
public Matrix plus(double x) {
Matrix result = copy();
int[] c = cardinality();
@@ -188,6 +164,7 @@
return result;
}
+ @Override
public Matrix plus(Matrix other) {
int[] c = cardinality();
int[] o = other.cardinality();
@@ -201,6 +178,7 @@
return result;
}
+ @Override
public void set(int row, int column, double value) {
int[] c = cardinality();
if (row < 0 || column < 0 || row >= c[ROW] || column >= c[COL])
@@ -208,6 +186,7 @@
setQuick(row, column, value);
}
+ @Override
public void set(int row, double[] data) {
int[] c = cardinality();
if (c[COL] < data.length)
@@ -219,6 +198,7 @@
setQuick(row, i, data[i]);
}
+ @Override
public Matrix times(double x) {
Matrix result = copy();
int[] c = cardinality();
@@ -228,6 +208,7 @@
return result;
}
+ @Override
public Matrix times(Matrix other) {
int[] c = cardinality();
int[] o = other.cardinality();
@@ -244,6 +225,7 @@
return result;
}
+ @Override
public Matrix transpose() {
int[] card = cardinality();
Matrix result = like(card[COL], card[ROW]);
@@ -253,6 +235,7 @@
return result;
}
+ @Override
public double zSum() {
double result = 0;
int[] c = cardinality();
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/AbstractVector.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/AbstractVector.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/AbstractVector.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/AbstractVector.java Tue Dec 23 15:32:31 2008
@@ -17,27 +17,12 @@
package org.apache.mahout.matrix;
-import org.apache.hadoop.io.Writable;
import org.apache.hadoop.io.WritableComparable;
/**
* Implementations of generic capabilities like sum of elements and dot products
*/
-public abstract class AbstractVector implements Vector, Writable {
-
- public abstract WritableComparable asWritableComparable();
-
- public abstract int cardinality();
-
- public abstract Vector copy();
-
- public abstract boolean haveSharedCells(Vector other);
-
- public abstract double getQuick(int index);
-
- public abstract Vector like();
-
- public abstract Vector like(int cardinality);
+public abstract class AbstractVector implements Vector {
/**
* Subclasses must override to return an appropriately sparse or dense result
@@ -50,14 +35,6 @@
*/
protected abstract Matrix matrixLike(int rows, int columns);
- public abstract void setQuick(int index, double value);
-
- public abstract int size();
-
- public abstract double[] toArray();
-
- public abstract Vector viewPart(int offset, int length);
-
/**
* Returns an iterator for traversing the Vector, but not in any particular
* order. The actual implementations may make some guarantees about the order
@@ -66,9 +43,10 @@
*
* @see java.lang.Iterable#iterator()
*/
+ @Override
public abstract java.util.Iterator<Vector.Element> iterator();
- // @Override JDK 1.6
+ @Override
public Vector.Element getElement(int index) {
return new Element(index);
}
@@ -80,19 +58,23 @@
this.ind = ind;
}
+ @Override
public double get() {
return getQuick(ind);
}
+ @Override
public int index() {
return ind;
}
+ @Override
public void set(double value) {
setQuick(ind, value);
}
}
+ @Override
public Vector divide(double x) {
Vector result = copy();
for (int i = 0; i < result.cardinality(); i++)
@@ -100,6 +82,7 @@
return result;
}
+ @Override
public double dot(Vector x) {
if (cardinality() != x.cardinality())
throw new CardinalityException();
@@ -109,6 +92,7 @@
return result;
}
+ @Override
public double get(int index) {
if (index >= 0 && index < cardinality())
return getQuick(index);
@@ -116,6 +100,7 @@
throw new IndexException();
}
+ @Override
public Vector minus(Vector x) {
if (cardinality() != x.cardinality())
throw new CardinalityException();
@@ -125,11 +110,13 @@
return result;
}
+ @Override
public Vector normalize() {
double divSq = Math.sqrt(dot(this));
return divide(divSq);
}
+ @Override
public Vector plus(double x) {
Vector result = copy();
for (int i = 0; i < result.cardinality(); i++)
@@ -137,6 +124,7 @@
return result;
}
+ @Override
public Vector plus(Vector x) {
if (cardinality() != x.cardinality())
throw new CardinalityException();
@@ -146,6 +134,7 @@
return result;
}
+ @Override
public void set(int index, double value) {
if (index >= 0 && index < cardinality())
setQuick(index, value);
@@ -153,6 +142,7 @@
throw new IndexException();
}
+ @Override
public Vector times(double x) {
Vector result = copy();
for (int i = 0; i < result.cardinality(); i++)
@@ -160,6 +150,7 @@
return result;
}
+ @Override
public Vector times(Vector x) {
if (cardinality() != x.cardinality())
throw new CardinalityException();
@@ -169,6 +160,7 @@
return result;
}
+ @Override
public double zSum() {
double result = 0;
for (int i = 0; i < cardinality(); i++)
@@ -176,12 +168,14 @@
return result;
}
+ @Override
public Vector assign(double value) {
for (int i = 0; i < cardinality(); i++)
setQuick(i, value);
return this;
}
+ @Override
public Vector assign(double[] values) {
if (values.length != cardinality())
throw new CardinalityException();
@@ -190,6 +184,7 @@
return this;
}
+ @Override
public Vector assign(Vector other) {
if (other.cardinality() != cardinality())
throw new CardinalityException();
@@ -198,6 +193,7 @@
return this;
}
+ @Override
public Vector assign(BinaryFunction f, double y) {
for (int i = 0; i < cardinality(); i++) {
setQuick(i, f.apply(getQuick(i), y));
@@ -205,12 +201,14 @@
return this;
}
+ @Override
public Vector assign(UnaryFunction function) {
for (int i = 0; i < cardinality(); i++)
setQuick(i, function.apply(getQuick(i)));
return this;
}
+ @Override
public Vector assign(Vector other, BinaryFunction function) {
if (other.cardinality() != cardinality())
throw new CardinalityException();
@@ -219,6 +217,7 @@
return this;
}
+ @Override
public Matrix cross(Vector other) {
Matrix result = matrixLike(cardinality(), other.cardinality());
for (int row = 0; row < cardinality(); row++)
@@ -226,17 +225,15 @@
return result;
}
- public abstract String asFormatString();
-
/**
- * Decodes a point from its WritableComparable representation.
+ * Decodes a point from its WritableComparable<?> representation.
*
* @param writableComparable
- * a WritableComparable produced by asWritableComparable. Note the
+ * a WritableComparable<?> produced by asWritableComparable. Note the
* payload remainder: it is optional, but can be present.
* @return the n-dimensional point
*/
- public static Vector decodeVector(WritableComparable writableComparable) {
+ public static Vector decodeVector(WritableComparable<?> writableComparable) {
return decodeVector(writableComparable.toString());
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/BinaryFunction.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/BinaryFunction.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/BinaryFunction.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/BinaryFunction.java Tue Dec 23 15:32:31 2008
@@ -23,8 +23,8 @@
*
*/
public interface BinaryFunction {
- public final static BinaryFunction plus = new PlusFunction();
- public final static BinaryFunction times = new TimesFunction();
+ BinaryFunction plus = new PlusFunction();
+ BinaryFunction times = new TimesFunction();
/**
* Apply the function to the arguments and return the result
@@ -33,6 +33,6 @@
* @param arg2 a double for the second argument
* @return the result of applying the function
*/
- public double apply(double arg1, double arg2);
+ double apply(double arg1, double arg2);
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/DenseMatrix.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/DenseMatrix.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/DenseMatrix.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/DenseMatrix.java Tue Dec 23 15:32:31 2008
@@ -43,7 +43,6 @@
* a double[][]
*/
public DenseMatrix(double[][] values) {
- super();
// clone the rows
this.values = values.clone();
// be careful, need to clone the columns too
@@ -58,12 +57,11 @@
* @param columns
*/
public DenseMatrix(int rows, int columns) {
- super();
this.values = new double[rows][columns];
}
@Override
- public WritableComparable asWritableComparable() {
+ public WritableComparable<?> asWritableComparable() {
return new Text(asFormatString());
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/DenseVector.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/DenseVector.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/DenseVector.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/DenseVector.java Tue Dec 23 15:32:31 2008
@@ -23,6 +23,7 @@
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
+import java.util.NoSuchElementException;
/**
* Implements vector as an array of doubles
@@ -39,10 +40,10 @@
* Decode a new instance from the argument
*
* @param writableComparable
- * a WritableComparable produced by the asWritableComparable method
+ * a WritableComparable<?> produced by the asWritableComparable<?> method
* @return a DenseVector
*/
- public static Vector decodeFormat(WritableComparable writableComparable) {
+ public static Vector decodeFormat(WritableComparable<?> writableComparable) {
return decodeFormat(writableComparable.toString());
}
@@ -67,7 +68,6 @@
* @param values
*/
public DenseVector(double[] values) {
- super();
this.values = values.clone();
}
@@ -77,7 +77,6 @@
* @param cardinality
*/
public DenseVector(int cardinality) {
- super();
this.values = new double[cardinality];
}
@@ -87,7 +86,7 @@
}
@Override
- public WritableComparable asWritableComparable() {
+ public WritableComparable<?> asWritableComparable() {
return new Text(asFormatString());
}
@@ -172,24 +171,31 @@
private class Iterator implements java.util.Iterator<Vector.Element> {
private int ind;
- public Iterator() {
+ private Iterator() {
ind = 0;
}
+ @Override
public boolean hasNext() {
return ind < values.length;
}
+ @Override
public Vector.Element next() {
+ if (!hasNext()) {
+ throw new NoSuchElementException();
+ }
return new Element(ind++);
}
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
}
+ @Override
public void write(DataOutput dataOutput) throws IOException {
dataOutput.writeInt(cardinality());
for (Vector.Element element : this) {
@@ -197,6 +203,7 @@
}
}
+ @Override
public void readFields(DataInput dataInput) throws IOException {
double[] values = new double[dataInput.readInt()];
for (int i = 0; i < values.length; i++) {
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/Matrix.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/Matrix.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/Matrix.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/Matrix.java Tue Dec 23 15:32:31 2008
@@ -25,16 +25,14 @@
public interface Matrix {
/**
- * Return a formatted WritableComparable suitable for output
+ * Return a formatted WritableComparable<?> suitable for output
*
* @return formatted WritableComparable
*/
- WritableComparable asWritableComparable();
+ WritableComparable<?> asWritableComparable();
/**
- * Return a formatted String suitable for output
- *
- * @return
+ * @return a formatted String suitable for output
*/
String asFormatString();
/**
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/MatrixView.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/MatrixView.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/MatrixView.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/MatrixView.java Tue Dec 23 15:32:31 2008
@@ -44,14 +44,13 @@
* the int[2] cardinality of the view
*/
public MatrixView(Matrix matrix, int[] offset, int[] cardinality) {
- super();
this.matrix = matrix;
this.offset = offset;
this.cardinality = cardinality;
}
@Override
- public WritableComparable asWritableComparable() {
+ public WritableComparable<?> asWritableComparable() {
String out = asFormatString();
return new Text(out);
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/NegateFunction.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/NegateFunction.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/NegateFunction.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/NegateFunction.java Tue Dec 23 15:32:31 2008
@@ -19,6 +19,7 @@
public class NegateFunction implements UnaryFunction {
+ @Override
public double apply(double arg1) {
return -arg1;
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/PlusFunction.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/PlusFunction.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/PlusFunction.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/PlusFunction.java Tue Dec 23 15:32:31 2008
@@ -19,6 +19,7 @@
public class PlusFunction implements BinaryFunction {
+ @Override
public double apply(double arg1, double arg2) {
return arg1 + arg2;
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseColumnMatrix.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseColumnMatrix.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseColumnMatrix.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseColumnMatrix.java Tue Dec 23 15:32:31 2008
@@ -39,7 +39,6 @@
* a SparseVector[] array of columns
*/
public SparseColumnMatrix(int[] cardinality, SparseVector[] columns) {
- super();
this.cardinality = cardinality.clone();
this.columns = columns.clone();
for (int col = 0; col < cardinality[COL]; col++)
@@ -53,7 +52,6 @@
* the int[2] cardinality
*/
public SparseColumnMatrix(int[] cardinality) {
- super();
this.cardinality = cardinality.clone();
this.columns = new SparseVector[cardinality[COL]];
for (int col = 0; col < cardinality[COL]; col++)
@@ -61,7 +59,7 @@
}
@Override
- public WritableComparable asWritableComparable() {
+ public WritableComparable<?> asWritableComparable() {
String out = asFormatString();
return new Text(out);
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseMatrix.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseMatrix.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseMatrix.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseMatrix.java Tue Dec 23 15:32:31 2008
@@ -55,13 +55,12 @@
* the int[2] cardinality desired
*/
public SparseMatrix(int[] cardinality) {
- super();
this.cardinality = cardinality.clone();
this.rows = new HashMap<Integer, Vector>();
}
@Override
- public WritableComparable asWritableComparable() {
+ public WritableComparable<?> asWritableComparable() {
String out = asFormatString();
return new Text(out);
}
@@ -86,8 +85,8 @@
@Override
public Matrix copy() {
SparseMatrix copy = new SparseMatrix(cardinality);
- for (Integer row : rows.keySet())
- copy.rows.put(row, rows.get(row).copy());
+ for (Map.Entry<Integer, Vector> entry : rows.entrySet())
+ copy.rows.put(entry.getKey(), entry.getValue().copy());
return copy;
}
@@ -133,8 +132,8 @@
public int[] size() {
int[] result = new int[2];
result[ROW] = rows.size();
- for (Integer row : rows.keySet())
- result[COL] = Math.max(result[COL], rows.get(row).size());
+ for (Map.Entry<Integer, Vector> integerVectorEntry : rows.entrySet())
+ result[COL] = Math.max(result[COL], integerVectorEntry.getValue().size());
return result;
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseRowMatrix.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseRowMatrix.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseRowMatrix.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseRowMatrix.java Tue Dec 23 15:32:31 2008
@@ -52,7 +52,6 @@
* the int[2] cardinality desired
*/
public SparseRowMatrix(int[] cardinality) {
- super();
this.cardinality = cardinality.clone();
this.rows = new SparseVector[cardinality[ROW]];
for (int row = 0; row < cardinality[ROW]; row++)
@@ -60,7 +59,7 @@
}
@Override
- public WritableComparable asWritableComparable() {
+ public WritableComparable<?> asWritableComparable() {
String out = asFormatString();
return new Text(out);
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseVector.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseVector.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseVector.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseVector.java Tue Dec 23 15:32:31 2008
@@ -46,10 +46,10 @@
* Decode a new instance from the argument
*
* @param writableComparable
- * a writableComparable produced by the asWritableComparable method
+ * a writableComparable produced by the asWritableComparable<?> method
* @return a DenseVector
*/
- public static Vector decodeFormat(WritableComparable writableComparable) {
+ public static Vector decodeFormat(WritableComparable<?> writableComparable) {
return decodeFormat(writableComparable.toString());
}
@@ -68,7 +68,7 @@
if (pt.startsWith("[s")) {
int c = Integer.parseInt(pts[i].substring(2));
result = new SparseVector(c);
- } else if (!pt.startsWith("]")) {
+ } else if (pt.charAt(0) != ']') {
int ix = pt.indexOf(':');
int index = Integer.parseInt(pt.substring(0, ix).trim());
double value = Double.parseDouble(pt.substring(ix + 1));
@@ -79,7 +79,6 @@
}
public SparseVector(int cardinality) {
- super();
values = new HashMap<Integer, Double>();
this.cardinality = cardinality;
}
@@ -91,7 +90,7 @@
}
@Override
- public WritableComparable asWritableComparable() {
+ public WritableComparable<?> asWritableComparable() {
String out = asFormatString();
return new Text(out);
}
@@ -103,6 +102,7 @@
out.append("[s").append(cardinality).append(", ");
Map.Entry<Integer, Double>[] entries = (Map.Entry<Integer, Double>[]) values.entrySet().toArray(new Map.Entry[values.size()]);
Arrays.sort(entries, new Comparator<Map.Entry<Integer, Double>>(){
+ @Override
public int compare(Map.Entry<Integer, Double> e1, Map.Entry<Integer, Double> e2) {
return e1.getKey().compareTo(e2.getKey());
}
@@ -189,6 +189,7 @@
}
+ @Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
@@ -198,9 +199,9 @@
return cardinality == that.cardinality && (values == null ? that.values == null : values.equals(that.values));
}
+ @Override
public int hashCode() {
- int result;
- result = (values != null ? values.hashCode() : 0);
+ int result = (values != null ? values.hashCode() : 0);
result = 31 * result + cardinality;
return result;
}
@@ -208,18 +209,21 @@
private class Iterator implements java.util.Iterator<Vector.Element> {
private final java.util.Iterator<Map.Entry<Integer, Double>> it;
- public Iterator() {
+ Iterator() {
it = values.entrySet().iterator();
}
+ @Override
public boolean hasNext() {
return it.hasNext();
}
+ @Override
public Element next() {
return new Element(it.next().getKey());
}
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
@@ -245,17 +249,19 @@
return result;
}
+ @Override
public void write(DataOutput dataOutput) throws IOException {
dataOutput.writeInt(cardinality());
dataOutput.writeInt(size());
for (Vector.Element element : this) {
- if (element.get() != 0d) {
+ if (element.get() != 0.0d) {
dataOutput.writeInt(element.index());
dataOutput.writeDouble(element.get());
}
}
}
+ @Override
public void readFields(DataInput dataInput) throws IOException {
int cardinality = dataInput.readInt();
int size = dataInput.readInt();
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/TimesFunction.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/TimesFunction.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/TimesFunction.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/TimesFunction.java Tue Dec 23 15:32:31 2008
@@ -24,6 +24,7 @@
* @param y second argument
* @return the product
*/
+ @Override
public double apply(double x, double y) {
return x * y;
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/UnaryFunction.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/UnaryFunction.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/UnaryFunction.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/UnaryFunction.java Tue Dec 23 15:32:31 2008
@@ -30,6 +30,6 @@
* @param arg1 double for the argument
* @return the result of applying the function
*/
- public double apply(double arg1);
+ double apply(double arg1);
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/Vector.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/Vector.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/Vector.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/Vector.java Tue Dec 23 15:32:31 2008
@@ -26,11 +26,11 @@
public interface Vector extends Iterable<Vector.Element>, Writable {
/**
- * Return a formatted WritableComparable suitable for output
+ * Return a formatted WritableComparable<?> suitable for output
*
* @return formatted WritableComparable
*/
- WritableComparable asWritableComparable();
+ WritableComparable<?> asWritableComparable();
/**
* Return a formatted String suitable for output
@@ -127,7 +127,7 @@
*/
Element getElement(int index);
- public interface Element {
+ interface Element {
/**
* @return the value of this vector element.
*/
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/VectorView.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/VectorView.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/VectorView.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/VectorView.java Tue Dec 23 15:32:31 2008
@@ -24,6 +24,7 @@
import java.io.DataOutput;
import java.io.IOException;
import java.util.Iterator;
+import java.util.NoSuchElementException;
import java.nio.charset.Charset;
/**
@@ -44,7 +45,6 @@
private int cardinality;
public VectorView(Vector vector, int offset, int cardinality) {
- super();
this.vector = vector;
this.offset = offset;
this.cardinality = cardinality;
@@ -56,7 +56,7 @@
}
@Override
- public WritableComparable asWritableComparable() {
+ public WritableComparable<?> asWritableComparable() {
String out = asFormatString();
return new Text(out);
}
@@ -158,14 +158,17 @@
if (isInView(el.index())) {
final Vector.Element decorated = el;
el = new Vector.Element() {
+ @Override
public double get() {
return decorated.get();
}
+ @Override
public int index() {
return decorated.index() - offset;
}
+ @Override
public void set(double value) {
el.set(value);
}
@@ -176,12 +179,17 @@
el = null; // No element was found
}
+ @Override
public Vector.Element next() {
+ if (!hasNext()) {
+ throw new NoSuchElementException();
+ }
Vector.Element buffer = el;
buffer();
return buffer;
}
+ @Override
public boolean hasNext() {
return el != null;
}
@@ -190,12 +198,14 @@
* @throws UnsupportedOperationException
* all the time. method not implemented.
*/
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
}
+ @Override
public void write(DataOutput dataOutput) throws IOException {
dataOutput.writeInt(offset);
dataOutput.writeInt(cardinality);
@@ -205,6 +215,7 @@
vector.write(dataOutput);
}
+ @Override
public void readFields(DataInput dataInput) throws IOException {
int offset = dataInput.readInt();
int cardinality = dataInput.readInt();
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/DistanceMeasure.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/DistanceMeasure.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/DistanceMeasure.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/DistanceMeasure.java Tue Dec 23 15:32:31 2008
@@ -17,7 +17,6 @@
package org.apache.mahout.utils;
-import org.apache.hadoop.mapred.JobConfigurable;
import org.apache.mahout.matrix.CardinalityException;
import org.apache.mahout.matrix.Vector;
import org.apache.mahout.utils.parameters.Parametered;
@@ -26,7 +25,7 @@
* This interface is used for objects which can determine a distance metric
* between two points
*/
-public interface DistanceMeasure extends JobConfigurable, Parametered {
+public interface DistanceMeasure extends Parametered {
/**
* Returns the distance metric applied to the arguments
@@ -36,6 +35,6 @@
* @return a scalar doubles of the distance
* @throws CardinalityException
*/
- public double distance(Vector v1, Vector v2);
+ double distance(Vector v1, Vector v2);
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/EuclideanDistanceMeasure.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/EuclideanDistanceMeasure.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/EuclideanDistanceMeasure.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/EuclideanDistanceMeasure.java Tue Dec 23 15:32:31 2008
@@ -31,19 +31,22 @@
*/
public class EuclideanDistanceMeasure implements DistanceMeasure {
+ @Override
public void configure(JobConf job) {
// nothing to do
}
- public Collection<Parameter> getParameters() {
+ @Override
+ public Collection<Parameter<?>> getParameters() {
return Collections.emptyList();
}
+ @Override
public void createParameters(String prefix, JobConf jobConf) {
// nothing to do
}
- public double distance(double[] p1, double[] p2) {
+ public static double distance(double[] p1, double[] p2) {
double result = 0.0;
for (int i = 0; i < p1.length; i++) {
double delta = p2[i] - p1[i];
@@ -52,6 +55,7 @@
return Math.sqrt(result);
}
+ @Override
public double distance(Vector v1, Vector v2) {
if (v1.cardinality() != v2.cardinality())
throw new CardinalityException();
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/ManhattanDistanceMeasure.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/ManhattanDistanceMeasure.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/ManhattanDistanceMeasure.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/ManhattanDistanceMeasure.java Tue Dec 23 15:32:31 2008
@@ -31,25 +31,29 @@
*/
public class ManhattanDistanceMeasure implements DistanceMeasure {
- public double distance(double[] p1, double[] p2) {
+ public static double distance(double[] p1, double[] p2) {
double result = 0.0;
for (int i = 0; i < p1.length; i++)
result += Math.abs(p2[i] - p1[i]);
return result;
}
+ @Override
public void configure(JobConf job) {
// nothing to do
}
- public Collection<Parameter> getParameters() {
+ @Override
+ public Collection<Parameter<?>> getParameters() {
return Collections.emptyList();
}
+ @Override
public void createParameters(String prefix, JobConf jobConf) {
// nothing to do
}
+ @Override
public double distance(Vector v1, Vector v2) {
if (v1.cardinality() != v2.cardinality())
throw new CardinalityException();
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/StringUtils.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/StringUtils.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/StringUtils.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/StringUtils.java Tue Dec 23 15:32:31 2008
@@ -24,7 +24,7 @@
* restore the object given its string representation. Should use Hadoop
* Stringifier whenever available.
*/
-public class StringUtils {
+public final class StringUtils {
private static final XStream xstream = new XStream();
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/TanimotoDistanceMeasure.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/TanimotoDistanceMeasure.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/TanimotoDistanceMeasure.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/TanimotoDistanceMeasure.java Tue Dec 23 15:32:31 2008
@@ -30,8 +30,6 @@
*/
public class TanimotoDistanceMeasure extends WeightedDistanceMeasure {
- public TanimotoDistanceMeasure() {
- }
/**
* Calculates the distance between two vectors.
@@ -42,6 +40,7 @@
* @param vector1
* @return 0 for perfect match, > 0 for greater distance
*/
+ @Override
public double distance(Vector vector0, Vector vector1) {
// this whole distance measurent thing
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedDistanceMeasure.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedDistanceMeasure.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedDistanceMeasure.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedDistanceMeasure.java Tue Dec 23 15:32:31 2008
@@ -38,23 +38,26 @@
*/
public abstract class WeightedDistanceMeasure implements DistanceMeasure {
- private List<Parameter> parameters;
+ private List<Parameter<?>> parameters;
private Parameter<Path> weightsFile;
private Parameter<Class> vectorClass;
protected Vector weights;
+ @Override
public void createParameters(String prefix, JobConf jobConf) {
- parameters = new ArrayList<Parameter>();
+ parameters = new ArrayList<Parameter<?>>();
weightsFile = new PathParameter(prefix, "weightsFile", jobConf, null, "Path on DFS to a file containing the weights.");
parameters.add(weightsFile);
vectorClass = new ClassParameter(prefix, "vectorClass", jobConf, DenseVector.class, "Class<Vector> file specified in parameter weightsFile has been serialized with.");
parameters.add(vectorClass);
}
- public Collection<Parameter> getParameters() {
+ @Override
+ public Collection<Parameter<?>> getParameters() {
return parameters;
}
+ @Override
public void configure(JobConf jobConf) {
if (parameters == null) {
ParameteredGeneralizations.configureParameters(this, jobConf);
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedEuclideanDistanceMeasure.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedEuclideanDistanceMeasure.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedEuclideanDistanceMeasure.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedEuclideanDistanceMeasure.java Tue Dec 23 15:32:31 2008
@@ -25,6 +25,7 @@
*/
public class WeightedEuclideanDistanceMeasure extends WeightedDistanceMeasure {
+ @Override
public double distance(Vector p1, Vector p2) {
double result = 0;
Vector res = p2.minus(p1);
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedManhattanDistanceMeasure.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedManhattanDistanceMeasure.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedManhattanDistanceMeasure.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedManhattanDistanceMeasure.java Tue Dec 23 15:32:31 2008
@@ -25,6 +25,7 @@
*/
public class WeightedManhattanDistanceMeasure extends WeightedDistanceMeasure {
+ @Override
public double distance(Vector p1, Vector p2) {
double result = 0;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/AbstractParameter.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/AbstractParameter.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/AbstractParameter.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/AbstractParameter.java Tue Dec 23 15:32:31 2008
@@ -31,14 +31,16 @@
private final Class<T> type;
private final String defaultValue;
-
+ @Override
public void configure(JobConf jobConf) {
// nothing to do
}
+ @Override
public void createParameters(String prefix, JobConf jobConf) {
}
+ @Override
public String getStringValue() {
if (value == null) {
return null;
@@ -46,7 +48,8 @@
return value.toString();
}
- public Collection<Parameter> getParameters() {
+ @Override
+ public Collection<Parameter<?>> getParameters() {
return Collections.emptyList();
}
@@ -66,36 +69,42 @@
}
+ @Override
public String prefix() {
return prefix;
}
+ @Override
public String name() {
return name;
}
+ @Override
public String description() {
return description;
}
+ @Override
public Class<T> type() {
return type;
}
-
+ @Override
public String defaultValue() {
return defaultValue;
}
+ @Override
public T get() {
return value;
}
+ @Override
public void set(T value) {
this.value = value;
}
-
+ @Override
public String toString() {
if (value != null) {
return value.toString();
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/ClassParameter.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/ClassParameter.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/ClassParameter.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/ClassParameter.java Tue Dec 23 15:32:31 2008
@@ -21,10 +21,11 @@
public class ClassParameter extends AbstractParameter<Class> {
- public ClassParameter(String prefix, String name, JobConf jobConf, Class defaultValue, String description) {
+ public ClassParameter(String prefix, String name, JobConf jobConf, Class<?> defaultValue, String description) {
super(Class.class, prefix, name, jobConf, defaultValue, description);
}
+ @Override
public void setStringValue(String stringValue) {
try {
set(Class.forName(stringValue));
@@ -33,6 +34,7 @@
}
}
+ @Override
public String getStringValue() {
if (value == null) {
return null;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/CompositeParameter.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/CompositeParameter.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/CompositeParameter.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/CompositeParameter.java Tue Dec 23 15:32:31 2008
@@ -30,19 +30,23 @@
super(type, prefix, name, jobConf, defaultValue, description);
}
+ @Override
public void createParameters(String prefix, JobConf jobConf) {
get().createParameters(prefix, jobConf);
}
- public Collection<Parameter> getParameters() {
+ @Override
+ public Collection<Parameter<?>> getParameters() {
return get().getParameters();
}
+ @Override
public void configure(JobConf jobConf) {
get().configure(jobConf);
}
+ @Override
@SuppressWarnings("unchecked")
public void setStringValue(String className) {
try {
@@ -56,6 +60,7 @@
}
}
+ @Override
public String getStringValue() {
if (value == null) {
return null;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/DoubleParameter.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/DoubleParameter.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/DoubleParameter.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/DoubleParameter.java Tue Dec 23 15:32:31 2008
@@ -25,6 +25,7 @@
super(Double.class, prefix, name, jobConf, defaultValue, description);
}
+ @Override
public void setStringValue(String stringValue) {
set(Double.valueOf(stringValue));
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/FileParameter.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/FileParameter.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/FileParameter.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/FileParameter.java Tue Dec 23 15:32:31 2008
@@ -27,10 +27,12 @@
super(File.class, prefix, name, jobConf, defaultValue, description);
}
+ @Override
public void setStringValue(String stringValue) {
set(new File(stringValue));
}
+ @Override
public String getStringValue() {
if (value == null) {
return null;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/IntegerParameter.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/IntegerParameter.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/IntegerParameter.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/IntegerParameter.java Tue Dec 23 15:32:31 2008
@@ -25,6 +25,7 @@
super(Integer.class, prefix, name, jobConf, defaultValue, description);
}
+ @Override
public void setStringValue(String stringValue) {
set(Integer.valueOf(stringValue));
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/Parameter.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/Parameter.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/Parameter.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/Parameter.java Tue Dec 23 15:32:31 2008
@@ -27,21 +27,21 @@
*/
public interface Parameter<T> extends Parametered {
/** @return job configuration setting key prefix, e.g. 'org.apache.mahout.util.WeightedDistanceMeasure.' */
- public abstract String prefix();
+ String prefix();
/** @return configuration parameters name, e.g. 'weightsFile' */
- public abstract String name();
+ String name();
/** @return human readable description of parameters */
- public abstract String description();
+ String description();
/** @return value class type */
- public abstract Class<T> type();
+ Class<T> type();
/** @param stringValue value string representation */
- public abstract void setStringValue(String stringValue);
+ void setStringValue(String stringValue);
/** @return value string reprentation of current value */
- public abstract String getStringValue();
+ String getStringValue();
/** @param value new parameters value */
- public abstract void set(T value);
+ void set(T value);
/** @return current parameters value */
- public abstract T get();
+ T get();
/** @return value used if not set by consumer */
- public abstract String defaultValue();
+ String defaultValue();
}
\ No newline at end of file
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/Parametered.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/Parametered.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/Parametered.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/Parametered.java Tue Dec 23 15:32:31 2008
@@ -29,10 +29,9 @@
*/
public interface Parametered extends JobConfigurable {
- public static final Logger log = LoggerFactory.getLogger(Parametered.class);
+ Logger log = LoggerFactory.getLogger(Parametered.class);
-
- public abstract Collection<Parameter> getParameters();
+ Collection<Parameter<?>> getParameters();
/**
* EXPERT: consumers should never have to call this method. It would be friendly visible to
@@ -43,13 +42,15 @@
* @param prefix ends with a dot if not empty.
* @param jobConf configuration used for retreiving values
*/
- public abstract void createParameters(String prefix, JobConf jobConf);
+ void createParameters(String prefix, JobConf jobConf);
/**
* "multiple inheritance"
*/
- public static class ParameteredGeneralizations {
+ class ParameteredGeneralizations {
+ private ParameteredGeneralizations() {
+ }
/**
@@ -60,7 +61,7 @@
* @param jobConf configuration used for retreiving values
*/
public static void configureParameters(Parametered parametered, JobConf jobConf) {
- configureParameters(parametered.getClass().getSimpleName() + ".", parametered, jobConf);
+ configureParameters(parametered.getClass().getSimpleName() + '.', parametered, jobConf);
}
@@ -82,14 +83,14 @@
}
private static void configureParametersRecusivly(Parametered parametered, String prefix, JobConf jobConf) {
- for (Parameter parameter : parametered.getParameters()) {
+ for (Parameter<?> parameter : parametered.getParameters()) {
if (log.isDebugEnabled()) {
log.debug("Configuring " + prefix + parameter.name());
}
- String name = prefix + parameter.name() + ".";
+ String name = prefix + parameter.name() + '.';
parameter.createParameters(name, jobConf);
parameter.configure(jobConf);
- if (parameter.getParameters().size() > 0) {
+ if (!parameter.getParameters().isEmpty()) {
configureParametersRecusivly(parameter, name, jobConf);
}
}
@@ -106,6 +107,7 @@
private static class Help {
private final StringBuilder sb;
+ @Override
public String toString() {
return sb.toString();
}
@@ -113,11 +115,11 @@
private int longestName = 0;
private int numChars = 100; // a few extra just to be sure
- final int distanceBetweenNameAndDescription = 8;
+ static final int distanceBetweenNameAndDescription = 8;
// todo: hmmm in the end this is 5 letters less that it says.. not sure why
private void recurseCount(Parametered parametered) {
- for (Parameter parameter : parametered.getParameters()) {
+ for (Parameter<?> parameter : parametered.getParameters()) {
int parameterNameLength = parameter.name().length();
if (parameterNameLength > longestName) {
longestName = parameterNameLength;
@@ -139,7 +141,7 @@
}
private void recurseWrite(Parametered parametered) {
- for (Parameter parameter : parametered.getParameters()) {
+ for (Parameter<?> parameter : parametered.getParameters()) {
sb.append(parameter.prefix());
sb.append(parameter.name());
int max = longestName - parameter.name().length() - parameter.prefix().length() + distanceBetweenNameAndDescription;
@@ -162,6 +164,7 @@
private static class Conf {
private final StringBuilder sb;
+ @Override
public String toString() {
return sb.toString();
}
@@ -172,7 +175,7 @@
//int distanceBetweenNameAndDescription = 4;
private void recurseCount(Parametered parametered) {
- for (Parameter parameter : parametered.getParameters()) {
+ for (Parameter<?> parameter : parametered.getParameters()) {
int parameterNameLength = parameter.prefix().length() + parameter.name().length();
if (parameterNameLength > longestName) {
longestName = parameterNameLength;
@@ -200,7 +203,7 @@
}
private void recurseWrite(Parametered parametered) {
- for (Parameter parameter : parametered.getParameters()) {
+ for (Parameter<?> parameter : parametered.getParameters()) {
sb.append("# ");
sb.append(parameter.description());
sb.append('\n');
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/PathParameter.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/PathParameter.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/PathParameter.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/PathParameter.java Tue Dec 23 15:32:31 2008
@@ -20,14 +20,13 @@
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.mapred.JobConf;
-
public class PathParameter extends AbstractParameter<Path> {
public PathParameter(String prefix, String name, JobConf jobConf, Path defaultValue, String description) {
super(Path.class, prefix, name, jobConf, defaultValue, description);
}
-
+ @Override
public void setStringValue(String stringValue) {
set(new Path(stringValue));
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/StringParameter.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/StringParameter.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/StringParameter.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/StringParameter.java Tue Dec 23 15:32:31 2008
@@ -21,15 +21,16 @@
public class StringParameter extends AbstractParameter<String> {
-
public StringParameter(String prefix, String name, JobConf jobConf, String defaultValue, String description) {
super(String.class, prefix, name, jobConf, defaultValue, description);
}
+ @Override
public void setStringValue(String stringValue) {
set(stringValue);
}
+ @Override
public String getStringValue() {
return get();
}
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java Tue Dec 23 15:32:31 2008
@@ -188,7 +188,7 @@
public void testCanopyMapperEuclidean() throws Exception {
MeanShiftCanopyMapper mapper = new MeanShiftCanopyMapper();
MeanShiftCanopyCombiner combiner = new MeanShiftCanopyCombiner();
- DummyOutputCollector<Text,WritableComparable> collector = new DummyOutputCollector<Text,WritableComparable>();
+ DummyOutputCollector<Text,WritableComparable<?>> collector = new DummyOutputCollector<Text,WritableComparable<?>>();
MeanShiftCanopy.config(euclideanDistanceMeasure, 4, 1, 0.5);
// get the initial canopies
List<MeanShiftCanopy> canopies = getInitialCanopies();
@@ -203,14 +203,14 @@
assertEquals("Number of map results", 100, collector.getData().size());
// now combine the mapper output
MeanShiftCanopy.config(euclideanDistanceMeasure, 4, 1, 0.5);
- Map<String, List<WritableComparable>> mapData = collector.getData();
- collector = new DummyOutputCollector<Text,WritableComparable>();
+ Map<String, List<WritableComparable<?>>> mapData = collector.getData();
+ collector = new DummyOutputCollector<Text,WritableComparable<?>>();
for (String key : mapData.keySet())
combiner.reduce(new Text(key), mapData.get(key).iterator(), collector,
null);
// now verify the output
- List<WritableComparable> data = collector.getValue("canopy");
+ List<WritableComparable<?>> data = collector.getValue("canopy");
assertEquals("Number of canopies", refCanopies.size(), data.size());
// add all points to the reference canopies
Map<String, MeanShiftCanopy> refCanopyMap = new HashMap<String, MeanShiftCanopy>();
@@ -250,7 +250,7 @@
MeanShiftCanopyMapper mapper = new MeanShiftCanopyMapper();
MeanShiftCanopyCombiner combiner = new MeanShiftCanopyCombiner();
MeanShiftCanopyReducer reducer = new MeanShiftCanopyReducer();
- DummyOutputCollector<Text,WritableComparable> collector = new DummyOutputCollector<Text,WritableComparable>();
+ DummyOutputCollector<Text,WritableComparable<?>> collector = new DummyOutputCollector<Text,WritableComparable<?>>();
MeanShiftCanopy.config(euclideanDistanceMeasure, 4, 1, 0.5);
// get the initial canopies
List<MeanShiftCanopy> canopies = getInitialCanopies();
@@ -272,13 +272,13 @@
assertEquals("Number of map results", 100, collector.getData().size());
// now combine the mapper output
MeanShiftCanopy.config(euclideanDistanceMeasure, 4, 1, 0.5);
- Map<String, List<WritableComparable>> mapData = collector.getData();
- collector = new DummyOutputCollector<Text,WritableComparable>();
+ Map<String, List<WritableComparable<?>>> mapData = collector.getData();
+ collector = new DummyOutputCollector<Text,WritableComparable<?>>();
for (String key : mapData.keySet())
combiner.reduce(new Text(key), mapData.get(key).iterator(), collector,
null);
// now reduce the combiner output
- DummyOutputCollector<Text,WritableComparable> collector2 = new DummyOutputCollector<Text,WritableComparable>();
+ DummyOutputCollector<Text,WritableComparable<?>> collector2 = new DummyOutputCollector<Text,WritableComparable<?>>();
reducer.reduce(new Text("canopy"), collector.getValue("canopy").iterator(),
collector2, null);
@@ -294,7 +294,7 @@
for (String id : refCanopyMap.keySet()) {
MeanShiftCanopy ref = refCanopyMap.get(id);
- List<WritableComparable> values = collector2
+ List<WritableComparable<?>> values = collector2
.getValue((ref.isConverged() ? "V" : "C")
+ (ref.getCanopyId() - raw.length));
assertEquals("values", 1, values.size());
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/ejb/RecommenderEJBBean.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/ejb/RecommenderEJBBean.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/ejb/RecommenderEJBBean.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/ejb/RecommenderEJBBean.java Tue Dec 23 15:32:31 2008
@@ -70,6 +70,7 @@
recommender.refresh(alreadyRefreshed);
}
+ @Override
public void setSessionContext(SessionContext sessionContext) {
// Do nothing
}
@@ -109,14 +110,17 @@
}
}
+ @Override
public void ejbRemove() {
// Do nothing
}
+ @Override
public void ejbActivate() {
// Do nothing: stateless session beans are not passivated/activated
}
+ @Override
public void ejbPassivate() {
// Do nothing: stateless session beans are not passivated/activated
}
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensDataModel.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensDataModel.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensDataModel.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensDataModel.java Tue Dec 23 15:32:31 2008
@@ -39,7 +39,7 @@
private final Map<String, Movie> movieMap;
- GroupLensDataModel() throws IOException {
+ public GroupLensDataModel() throws IOException {
this(readResourceToTempFile("/org/apache/mahout/cf/taste/example/grouplens/ratings.dat"),
readResourceToTempFile("/org/apache/mahout/cf/taste/example/grouplens/movies.dat"));
}
@@ -101,7 +101,7 @@
private static File readResourceToTempFile(String resourceName) throws IOException {
InputStream is = GroupLensRecommender.class.getResourceAsStream(resourceName);
if (is == null) {
- is = new FileInputStream("src/example" + resourceName);
+ is = new FileInputStream("src/main/java" + resourceName);
}
try {
File tempFile = File.createTempFile("taste", null);
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensRecommender.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensRecommender.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensRecommender.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensRecommender.java Tue Dec 23 15:32:31 2008
@@ -57,31 +57,38 @@
recommender = new CachingRecommender(new SlopeOneRecommender(dataModel));
}
+ @Override
public List<RecommendedItem> recommend(Object userID, int howMany) throws TasteException {
return recommender.recommend(userID, howMany);
}
+ @Override
public List<RecommendedItem> recommend(Object userID, int howMany, Rescorer<Item> rescorer)
throws TasteException {
return recommender.recommend(userID, howMany, rescorer);
}
+ @Override
public double estimatePreference(Object userID, Object itemID) throws TasteException {
return recommender.estimatePreference(userID, itemID);
}
+ @Override
public void setPreference(Object userID, Object itemID, double value) throws TasteException {
recommender.setPreference(userID, itemID, value);
}
+ @Override
public void removePreference(Object userID, Object itemID) throws TasteException {
recommender.removePreference(userID, itemID);
}
+ @Override
public DataModel getDataModel() {
return recommender.getDataModel();
}
+ @Override
public void refresh(Collection<Refreshable> alreadyRefreshed) {
recommender.refresh(alreadyRefreshed);
}
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensRecommenderBuilder.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensRecommenderBuilder.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensRecommenderBuilder.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensRecommenderBuilder.java Tue Dec 23 15:32:31 2008
@@ -24,6 +24,7 @@
final class GroupLensRecommenderBuilder implements RecommenderBuilder {
+ @Override
public Recommender buildRecommender(DataModel dataModel) throws TasteException {
return new GroupLensRecommender(dataModel);
}
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/PrepareTwentyNewsgroups.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/PrepareTwentyNewsgroups.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/PrepareTwentyNewsgroups.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/PrepareTwentyNewsgroups.java Tue Dec 23 15:32:31 2008
@@ -42,12 +42,15 @@
*/
public class PrepareTwentyNewsgroups {
+ private PrepareTwentyNewsgroups() {
+ }
+
@SuppressWarnings("static-access")
public static void main(String[] args) throws IOException,
ClassNotFoundException, InstantiationException, IllegalAccessException, OptionException {
- final DefaultOptionBuilder obuilder = new DefaultOptionBuilder();
- final ArgumentBuilder abuilder = new ArgumentBuilder();
- final GroupBuilder gbuilder = new GroupBuilder();
+ DefaultOptionBuilder obuilder = new DefaultOptionBuilder();
+ ArgumentBuilder abuilder = new ArgumentBuilder();
+ GroupBuilder gbuilder = new GroupBuilder();
Option parentOpt = obuilder.withLongName("parent").withRequired(true).withArgument(
abuilder.withName("parent").withMinimum(1).withMaximum(1).create()).
@@ -67,10 +70,9 @@
Group group = gbuilder.withName("Options").withOption(analyzerNameOpt).withOption(charsetOpt).withOption(outputDirOpt).withOption(parentOpt).create();
- CommandLine cmdLine;
Parser parser = new Parser();
parser.setGroup(group);
- cmdLine = parser.parse(args);
+ CommandLine cmdLine = parser.parse(args);
File parentDir = new File((String) cmdLine.getValue(parentOpt));
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/TestClassifier.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/TestClassifier.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/TestClassifier.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/TestClassifier.java Tue Dec 23 15:32:31 2008
@@ -20,8 +20,6 @@
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.mapred.JobConf;
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.mahout.classifier.ClassifierResult;
import org.apache.mahout.classifier.ResultAnalyzer;
import org.apache.mahout.classifier.bayes.io.SequenceFileModelReader;
@@ -59,10 +57,10 @@
@SuppressWarnings({ "static-access", "unchecked" })
public static void main(String[] args) throws IOException,
- ClassNotFoundException, IllegalAccessException, InstantiationException, OptionException {
- final DefaultOptionBuilder obuilder = new DefaultOptionBuilder();
- final ArgumentBuilder abuilder = new ArgumentBuilder();
- final GroupBuilder gbuilder = new GroupBuilder();
+ OptionException {
+ DefaultOptionBuilder obuilder = new DefaultOptionBuilder();
+ ArgumentBuilder abuilder = new ArgumentBuilder();
+ GroupBuilder gbuilder = new GroupBuilder();
Option pathOpt = obuilder.withLongName("path").withRequired(true).withArgument(
abuilder.withName("path").withMinimum(1).withMaximum(1).create()).
@@ -95,10 +93,9 @@
Group group = gbuilder.withName("Options").withOption(analyzerOpt).withOption(defaultCatOpt).withOption(dirOpt).withOption(encodingOpt).withOption(gramSizeOpt).withOption(pathOpt)
.withOption(typeOpt).create();
- CommandLine cmdLine;
Parser parser = new Parser();
parser.setGroup(group);
- cmdLine = parser.parse(args);
+ CommandLine cmdLine = parser.parse(args);
SequenceFileModelReader reader = new SequenceFileModelReader();
@@ -133,7 +130,7 @@
throw new IllegalArgumentException("Unrecognized classifier type: " + classifierType);
}
- model = reader.loadModel(model, fs, modelPaths, conf);
+ reader.loadModel(model, fs, modelPaths, conf);
log.info("Done loading model: # labels: {}", model.getLabels().size());
@@ -180,8 +177,8 @@
while ((line = fileReader.readLine()) != null) {
Map<String, List<String>> document = Model.generateNGrams(line, gramSize);
- for (String labelName : document.keySet()) {
- List<String> strings = document.get(labelName);
+ for (Map.Entry<String, List<String>> stringListEntry : document.entrySet()) {
+ List<String> strings = stringListEntry.getValue();
ClassifierResult classifiedLabel = classifier.classify(model,
strings.toArray(new String[strings.size()]),
defaultCat);
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/TrainClassifier.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/TrainClassifier.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/TrainClassifier.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/TrainClassifier.java Tue Dec 23 15:32:31 2008
@@ -55,19 +55,22 @@
private static final Logger log = LoggerFactory.getLogger(TrainClassifier.class);
- public void trainNaiveBayes(String dir, String outputDir, int gramSize) throws IOException {
+ private TrainClassifier() {
+ }
+
+ public static void trainNaiveBayes(String dir, String outputDir, int gramSize) throws IOException {
BayesDriver.runJob(dir, outputDir, gramSize);
}
- public void trainCNaiveBayes(String dir, String outputDir, int gramSize) throws IOException {
+ public static void trainCNaiveBayes(String dir, String outputDir, int gramSize) throws IOException {
CBayesDriver.runJob(dir, outputDir, gramSize);
}
@SuppressWarnings("static-access")
public static void main(String[] args) throws IOException, OptionException {
- final DefaultOptionBuilder obuilder = new DefaultOptionBuilder();
- final ArgumentBuilder abuilder = new ArgumentBuilder();
- final GroupBuilder gbuilder = new GroupBuilder();
+ DefaultOptionBuilder obuilder = new DefaultOptionBuilder();
+ ArgumentBuilder abuilder = new ArgumentBuilder();
+ GroupBuilder gbuilder = new GroupBuilder();
Option inputDirOpt = obuilder.withLongName("inputDir").withRequired(true).withArgument(
abuilder.withName("inputDir").withMinimum(1).withMaximum(1).create()).
@@ -85,20 +88,18 @@
abuilder.withName("classifierType").withMinimum(1).withMaximum(1).create()).
withDescription("Type of classifier: bayes or cbayes").withShortName("type").create();
Group group = gbuilder.withName("Options").withOption(gramSizeOpt).withOption(inputDirOpt).withOption(outputOpt).withOption(typeOpt).create();
- CommandLine cmdLine;
Parser parser = new Parser();
parser.setGroup(group);
- cmdLine = parser.parse(args);
- TrainClassifier tn = new TrainClassifier();
+ CommandLine cmdLine = parser.parse(args);
String classifierType = (String) cmdLine.getValue(typeOpt);
if (classifierType.equalsIgnoreCase("bayes")) {
log.info("Training Bayes Classifier");
- tn.trainNaiveBayes((String)cmdLine.getValue(inputDirOpt), (String)cmdLine.getValue(outputOpt), Integer.parseInt((String) cmdLine.getValue(gramSizeOpt)));
+ trainNaiveBayes((String)cmdLine.getValue(inputDirOpt), (String)cmdLine.getValue(outputOpt), Integer.parseInt((String) cmdLine.getValue(gramSizeOpt)));
} else if (classifierType.equalsIgnoreCase("cbayes")) {
log.info("Training Complementary Bayes Classifier");
//setup the HDFS and copy the files there, then run the trainer
- tn.trainCNaiveBayes((String) cmdLine.getValue(inputDirOpt), (String) cmdLine.getValue(outputOpt), Integer.parseInt((String) cmdLine.getValue(gramSizeOpt)));
+ trainCNaiveBayes((String) cmdLine.getValue(inputDirOpt), (String) cmdLine.getValue(outputOpt), Integer.parseInt((String) cmdLine.getValue(gramSizeOpt)));
}
}
}
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreator.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreator.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreator.java Tue Dec 23 15:32:31 2008
@@ -29,13 +29,15 @@
import java.io.IOException;
public class WikipediaDatasetCreator {
+ private WikipediaDatasetCreator() {
+ }
@SuppressWarnings("static-access")
public static void main(String[] args) throws IOException,
- ClassNotFoundException, IllegalAccessException, InstantiationException, OptionException {
- final DefaultOptionBuilder obuilder = new DefaultOptionBuilder();
- final ArgumentBuilder abuilder = new ArgumentBuilder();
- final GroupBuilder gbuilder = new GroupBuilder();
+ OptionException {
+ DefaultOptionBuilder obuilder = new DefaultOptionBuilder();
+ ArgumentBuilder abuilder = new ArgumentBuilder();
+ GroupBuilder gbuilder = new GroupBuilder();
Option dirInputPathOpt = obuilder.withLongName("dirInputPath").withRequired(true).withArgument(
abuilder.withName("dirInputPath").withMinimum(1).withMaximum(1).create()).
@@ -51,11 +53,9 @@
Group group = gbuilder.withName("Options").withOption(countriesFileOpt).withOption(dirInputPathOpt).withOption(dirOutputPathOpt).create();
- CommandLine cmdLine;
Parser parser = new Parser();
parser.setGroup(group);
- cmdLine = parser.parse(args);
-
+ CommandLine cmdLine = parser.parse(args);
String dirInputPath = (String) cmdLine.getValue(dirInputPathOpt);
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreatorDriver.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreatorDriver.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreatorDriver.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreatorDriver.java Tue Dec 23 15:32:31 2008
@@ -38,6 +38,8 @@
* Create and run the Wikipedia Dataset Creator.
*/
public class WikipediaDatasetCreatorDriver {
+ private WikipediaDatasetCreatorDriver() {
+ }
/**
* Takes in two arguments:
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreatorMapper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreatorMapper.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreatorMapper.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreatorMapper.java Tue Dec 23 15:32:31 2008
@@ -44,6 +44,7 @@
private static Set<String> countries = null;
+ @Override
public void map(LongWritable key, Text value,
OutputCollector<Text, Text> output, Reporter reporter)
throws IOException {
@@ -67,12 +68,12 @@
}
}
- public String getCountry(Set<String> categories)
+ public static String getCountry(Set<String> categories)
{
for(String category : categories)
{
for(String country: countries){
- if(category.indexOf(country)!=-1){
+ if(category.contains(country)){
return country;
}
@@ -81,7 +82,7 @@
return "Unknown";
}
- public List<String> findAllCategories(String document){
+ public static List<String> findAllCategories(String document){
List<String> categories = new ArrayList<String>();
int startIndex = 0;
int categoryIndex;
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreatorOutputFormat.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreatorOutputFormat.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreatorOutputFormat.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreatorOutputFormat.java Tue Dec 23 15:32:31 2008
@@ -25,6 +25,7 @@
* different output files in sequence file output format.
*/
public class WikipediaDatasetCreatorOutputFormat extends MultipleTextOutputFormat<Text, Text> {
+ @Override
protected String generateFileNameForKeyValue(Text key, Text v, String name) {
return key.toString() + ".txt";
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreatorReducer.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreatorReducer.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreatorReducer.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreatorReducer.java Tue Dec 23 15:32:31 2008
@@ -30,6 +30,7 @@
* Can also be used as a local Combiner
*/
public class WikipediaDatasetCreatorReducer extends MapReduceBase implements Reducer<Text, Text, Text, Text> {
+ @Override
public void reduce(Text key, Iterator<Text> values, OutputCollector<Text, Text> output, Reporter reporter) throws IOException {
//Key is label,word, value is the number of times we've seen this label word per local node. Output is the same
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaXmlSplitter.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaXmlSplitter.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaXmlSplitter.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaXmlSplitter.java Tue Dec 23 15:32:31 2008
@@ -38,12 +38,14 @@
import java.text.NumberFormat;
public class WikipediaXmlSplitter {
+ private WikipediaXmlSplitter() {
+ }
@SuppressWarnings("static-access")
public static void main(String[] args) throws IOException, OptionException {
- final DefaultOptionBuilder obuilder = new DefaultOptionBuilder();
- final ArgumentBuilder abuilder = new ArgumentBuilder();
- final GroupBuilder gbuilder = new GroupBuilder();
+ DefaultOptionBuilder obuilder = new DefaultOptionBuilder();
+ ArgumentBuilder abuilder = new ArgumentBuilder();
+ GroupBuilder gbuilder = new GroupBuilder();
Option dumpFileOpt = obuilder.withLongName("dumpFile").withRequired(true).withArgument(
abuilder.withName("dumpFile").withMinimum(1).withMaximum(1).create()).
@@ -57,10 +59,9 @@
abuilder.withName("chunkSize").withMinimum(1).withMaximum(1).create()).
withDescription("The Size of the chunk, in megabytes").withShortName("c").create();
Group group = gbuilder.withName("Options").withOption(dumpFileOpt).withOption(outputDirOpt).withOption(chunkSizeOpt).create();
- CommandLine cmdLine;
Parser parser = new Parser();
parser.setGroup(group);
- cmdLine = parser.parse(args);
+ CommandLine cmdLine = parser.parse(args);
String dumpFilePath = (String) cmdLine.getValue(dumpFileOpt);
String outputDirPath = (String) cmdLine.getValue(outputDirOpt);
@@ -101,15 +102,15 @@
+ " </namespaces>\n"
+ " </siteinfo>\n";
- String thisLine;
StringBuilder content = new StringBuilder();
content.append(header);
int filenumber = 0;
NumberFormat decimalFormatter = new DecimalFormat("0000");
+ String thisLine;
while ((thisLine = dumpReader.readLine()) != null)
{
- boolean end = false;
if(thisLine.trim().startsWith("<page>")){
+ boolean end = false;
while(thisLine.trim().startsWith("</page>") == false){
content.append(thisLine).append('\n');
if ((thisLine = dumpReader.readLine()) == null){
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/XmlInputFormat.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/XmlInputFormat.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/XmlInputFormat.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/XmlInputFormat.java Tue Dec 23 15:32:31 2008
@@ -40,6 +40,7 @@
public static final String START_TAG_KEY = "xmlinput.start";
public static final String END_TAG_KEY = "xmlinput.end";
+ @Override
public RecordReader<LongWritable, Text> getRecordReader(InputSplit inputSplit, JobConf jobConf, Reporter reporter)
throws IOException {
return new XmlRecordReader((FileSplit) inputSplit, jobConf);
@@ -66,6 +67,7 @@
fsin.seek(start);
}
+ @Override
public boolean next(LongWritable key, Text value) throws IOException {
if (fsin.getPos() < end) {
if (readUntilMatch(startTag, false)) {
@@ -84,22 +86,27 @@
return false;
}
+ @Override
public LongWritable createKey() {
return new LongWritable();
}
+ @Override
public Text createValue() {
return new Text();
}
+ @Override
public long getPos() throws IOException {
return fsin.getPos();
}
+ @Override
public void close() throws IOException {
fsin.close();
}
+ @Override
public float getProgress() throws IOException {
return (float) ((fsin.getPos() - start) / (end - start));
}
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/InputDriver.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/InputDriver.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/InputDriver.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/InputDriver.java Tue Dec 23 15:32:31 2008
@@ -29,6 +29,8 @@
import java.io.IOException;
public class InputDriver {
+ private InputDriver() {
+ }
public static void main(String[] args) throws IOException {
runJob(args[0], args[1]);
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/InputMapper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/InputMapper.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/InputMapper.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/InputMapper.java Tue Dec 23 15:32:31 2008
@@ -33,6 +33,7 @@
public class InputMapper extends MapReduceBase implements
Mapper<LongWritable, Text, Text, Text> {
+ @Override
public void map(LongWritable key, Text values,
OutputCollector<Text, Text> output, Reporter reporter) throws IOException {
String[] numbers = values.toString().split(" ");
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/Job.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/Job.java?rev=729175&r1=729174&r2=729175&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/Job.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/Job.java Tue Dec 23 15:32:31 2008
@@ -26,6 +26,8 @@
import java.io.IOException;
public class Job {
+ private Job() {
+ }
public static void main(String[] args) throws IOException {
if (args.length == 5) {