mahout-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sro...@apache.org
Subject svn commit: r907870 [1/2] - in /lucene/mahout/trunk/math/src/main: java-templates/org/apache/mahout/math/list/ java-templates/org/apache/mahout/math/map/ java-templates/org/apache/mahout/math/set/ java/org/apache/mahout/math/ java/org/apache/mahout/mat...
Date Tue, 09 Feb 2010 01:17:46 GMT
Author: srowen
Date: Tue Feb  9 01:17:44 2010
New Revision: 907870

URL: http://svn.apache.org/viewvc?rev=907870&view=rev
Log:
Remove @Override to resolve 1.5 compatibility; a few other cleanups along the way

Modified:
    lucene/mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/list/AbstractValueTypeList.java.t
    lucene/mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/map/AbstractKeyTypeValueTypeMap.java.t
    lucene/mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/map/AbstractObjectValueTypeMap.java.t
    lucene/mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/set/AbstractKeyTypeSet.java.t
    lucene/mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/set/OpenKeyTypeHashSet.java.t
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/AbstractMatrix.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/AbstractVector.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/DenseMatrix.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/DenseVector.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/JsonMatrixAdapter.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/JsonVectorAdapter.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/MatrixSlice.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/MatrixView.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/Partitioning.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/RandomAccessSparseVector.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/SequentialAccessSparseVector.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/SparseColumnMatrix.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/SparseMatrix.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/SparseRowMatrix.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/VectorView.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/decomposer/hebbian/HebbianUpdater.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/decomposer/hebbian/MultiThreadedEigenVerifier.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/decomposer/hebbian/SimpleEigenVerifier.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/decomposer/lanczos/LanczosSolver.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/function/Functions.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/function/Mult.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/function/PlusMult.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/function/SquareRootFunction.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/function/TimesFunction.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/math/IntFunctions.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/random/AbstractDistribution.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/random/engine/RandomEngine.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/stat/quantile/DoubleQuantileEstimator.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/stat/quantile/ExactDoubleQuantileFinder.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/stat/quantile/UnknownDoubleQuantileEstimator.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/doublealgo/Partitioning.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/doublealgo/Sorting.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/doublealgo/Statistic.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/FormerFactory.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/RCDoubleMatrix2D.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/SparseDoubleMatrix2D.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/TridiagonalDoubleMatrix2D.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/Algebra.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/Property.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/SeqBlas.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/SmpBlas.java

Modified: lucene/mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/list/AbstractValueTypeList.java.t
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/list/AbstractValueTypeList.java.t?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/list/AbstractValueTypeList.java.t (original)
+++ lucene/mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/list/AbstractValueTypeList.java.t Tue Feb  9 01:17:44 2010
@@ -85,7 +85,6 @@
    * Appends the specified list to the end of this list.
    * @param other the list to be appended. 
    **/
-  @Override
   public void addAllOf(${valueTypeCap}ArrayList other) {
 	addAllOfFromTo(other, 0, other.size() - 1);
   }

Modified: lucene/mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/map/AbstractKeyTypeValueTypeMap.java.t
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/map/AbstractKeyTypeValueTypeMap.java.t?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/map/AbstractKeyTypeValueTypeMap.java.t (original)
+++ lucene/mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/map/AbstractKeyTypeValueTypeMap.java.t Tue Feb  9 01:17:44 2010
@@ -52,7 +52,7 @@
   public boolean containsKey(final ${keyType} key) {
     return !forEachKey(
         new ${keyTypeCap}Procedure() {
-          @Override
+
           public boolean apply(${keyType} iterKey) {
             return (key != iterKey);
           }

Modified: lucene/mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/map/AbstractObjectValueTypeMap.java.t
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/map/AbstractObjectValueTypeMap.java.t?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/map/AbstractObjectValueTypeMap.java.t (original)
+++ lucene/mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/map/AbstractObjectValueTypeMap.java.t Tue Feb  9 01:17:44 2010
@@ -52,7 +52,7 @@
   public boolean containsKey(final T key) {
     return !forEachKey(
         new ObjectProcedure<T>() {
-          @Override
+
           public boolean apply(T iterKey) {
             return (key != iterKey);
           }
@@ -68,7 +68,7 @@
   public boolean containsValue(final ${valueType} value) {
     return !forEachPair(
         new Object${valueTypeCap}Procedure<T>() {
-          @Override
+
           public boolean apply(T iterKey, ${valueType} iterValue) {
             return (value != iterValue);
           }
@@ -132,7 +132,7 @@
     return
         forEachPair(
             new Object${valueTypeCap}Procedure<T>() {
-              @Override
+
               public boolean apply(T key, ${valueType} value) {
                 return other.containsKey(key) && other.get(key) == value;
               }
@@ -141,7 +141,7 @@
             &&
             other.forEachPair(
                 new Object${valueTypeCap}Procedure<T>() {
-                  @Override
+
                   public boolean apply(T key, ${valueType} value) {
                     return containsKey(key) && get(key) == value;
                   }
@@ -173,7 +173,7 @@
   public boolean forEachPair(final Object${valueTypeCap}Procedure<T> procedure) {
     return forEachKey(
         new ObjectProcedure<T>() {
-          @Override
+
           public boolean apply(T key) {
             return procedure.apply(key, get(key));
           }
@@ -216,7 +216,7 @@
     list.clear();
     forEachKey(
         new ObjectProcedure<T>() {
-          @Override
+
           public boolean apply(T key) {
             list.add(key);
             return true;
@@ -263,7 +263,7 @@
 
     forEachPair(
         new Object${valueTypeCap}Procedure<T>() {
-          @Override
+
           public boolean apply(T key, ${valueType} value) {
             if (condition.apply(key, value)) {
               keyList.add(key);
@@ -317,7 +317,7 @@
 
     final ${valueType}[] v = valueList.elements();
     Swapper swapper = new Swapper() {
-      @Override
+
       public void swap(int a, int b) {
         ${valueType} t1 = v[a];
         v[a] = v[b];
@@ -329,7 +329,7 @@
     };
 
     IntComparator comp = new IntComparator() {
-      @Override
+
       public int compare(int a, int b) {
         return v[a] < v[b] ? -1 : v[a] > v[b] ? 1 : 0;
       }
@@ -429,7 +429,7 @@
     list.clear();
     forEachKey(
         new ObjectProcedure<T>() {
-          @Override
+
           public boolean apply(T key) {
             list.add(get(key));
             return true;
@@ -447,7 +447,7 @@
   public void assign(final ${valueTypeCap}Function function) {
     copy().forEachPair(
         new  Object${valueTypeCap}Procedure<T>() {
-          @Override
+
           public boolean apply(T key, ${valueType} value) {
             put(key, function.apply(value));
             return true;
@@ -465,7 +465,7 @@
     clear();
     other.forEachPair(
         new Object${valueTypeCap}Procedure<T>() {
-          @Override
+          
           public boolean apply(T key, ${valueType} value) {
             put(key, value);
             return true;

Modified: lucene/mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/set/AbstractKeyTypeSet.java.t
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/set/AbstractKeyTypeSet.java.t?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/set/AbstractKeyTypeSet.java.t (original)
+++ lucene/mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/set/AbstractKeyTypeSet.java.t Tue Feb  9 01:17:44 2010
@@ -32,7 +32,7 @@
   public boolean contains(final ${keyType} key) {
     return !forEachKey(
         new ${keyTypeCap}Procedure() {
-          @Override
+
           public boolean apply(${keyType} iterKey) {
             return (key != iterKey);
           }
@@ -65,7 +65,7 @@
     return
         forEachKey(
             new ${keyTypeCap}Procedure() {
-              @Override
+
               public boolean apply(${keyType} key) {
                 return other.contains(key);
               }
@@ -111,7 +111,7 @@
     list.clear();
     forEachKey(
         new ${keyTypeCap}Procedure() {
-          @Override
+
           public boolean apply(${keyType} key) {
             list.add(key);
             return true;
@@ -124,7 +124,6 @@
    * existing.
    *
    * @param key   the key the value shall be associated with.
-   * @param value the value to be associated.
    * @return <tt>true</tt> if the receiver did not already contain such a key; <tt>false</tt> if the receiver did
    *         already contain such a key - the new value has now replaced the formerly associated value.
    */

Modified: lucene/mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/set/OpenKeyTypeHashSet.java.t
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/set/OpenKeyTypeHashSet.java.t?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/set/OpenKeyTypeHashSet.java.t (original)
+++ lucene/mahout/trunk/math/src/main/java-templates/org/apache/mahout/math/set/OpenKeyTypeHashSet.java.t Tue Feb  9 01:17:44 2010
@@ -266,7 +266,6 @@
    * existing.
    *
    * @param key   the key the value shall be associated with.
-   * @param value the value to be associated.
    * @return <tt>true</tt> if the receiver did not already contain such a key; <tt>false</tt> if the receiver did
    *         already contain such a key - the new value has now replaced the formerly associated value.
    */

Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/AbstractMatrix.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/AbstractMatrix.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/AbstractMatrix.java (original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/AbstractMatrix.java Tue Feb  9 01:17:44 2010
@@ -36,28 +36,23 @@
 
   protected Map<String, Integer> rowLabelBindings;
 
-  @Override
   public Iterator<MatrixSlice> iterator() {
     return iterateAll();
   }
 
-  @Override
   public Iterator<MatrixSlice> iterateAll() {
     return new Iterator<MatrixSlice>() {
       int slice = 0;
 
-      @Override
       public boolean hasNext() {
         return slice < numSlices();
       }
 
-      @Override
       public MatrixSlice next() {
         int i = slice++;
         return new MatrixSlice(slice(i), i);
       }
 
-      @Override
       public void remove() {
         throw new UnsupportedOperationException("remove() not supported for Matrix iterator");
       }
@@ -81,7 +76,6 @@
     return numRows();
   }
 
-  @Override
   public double get(String rowLabel, String columnLabel) throws IndexException,
       UnboundLabelException {
     if (columnLabelBindings == null || rowLabelBindings == null) {
@@ -96,17 +90,14 @@
     return get(row, col);
   }
 
-  @Override
   public Map<String, Integer> getColumnLabelBindings() {
     return columnLabelBindings;
   }
 
-  @Override
   public Map<String, Integer> getRowLabelBindings() {
     return rowLabelBindings;
   }
 
-  @Override
   public void set(String rowLabel, double[] rowData) {
     if (columnLabelBindings == null) {
       throw new UnboundLabelException();
@@ -118,7 +109,6 @@
     set(row, rowData);
   }
 
-  @Override
   public void set(String rowLabel, int row, double[] rowData) {
     if (rowLabelBindings == null) {
       rowLabelBindings = new HashMap<String, Integer>();
@@ -127,7 +117,6 @@
     set(row, rowData);
   }
 
-  @Override
   public void set(String rowLabel, String columnLabel, double value)
       throws IndexException, UnboundLabelException {
     if (columnLabelBindings == null || rowLabelBindings == null) {
@@ -141,7 +130,6 @@
     set(row, col, value);
   }
 
-  @Override
   public void set(String rowLabel, String columnLabel, int row, int column,
                   double value) throws IndexException, UnboundLabelException {
     if (rowLabelBindings == null) {
@@ -156,12 +144,10 @@
     set(row, column, value);
   }
 
-  @Override
   public void setColumnLabelBindings(Map<String, Integer> bindings) {
     columnLabelBindings = bindings;
   }
 
-  @Override
   public void setRowLabelBindings(Map<String, Integer> bindings) {
     rowLabelBindings = bindings;
   }
@@ -172,12 +158,10 @@
   // index into int[2] for row value
   public static final int ROW = 0;
 
-  @Override
   public int numRows() {
     return size()[ROW];
   }
 
-  @Override
   public int numCols() {
     return size()[COL];
   }
@@ -194,7 +178,6 @@
     return gson.fromJson(formatString, matrixType);
   }
 
-  @Override
   public String asFormatString() {
     Type vectorType = new TypeToken<Vector>() {
     }.getType();
@@ -207,7 +190,6 @@
     return gson.toJson(this, matrixType);
   }
 
-  @Override
   public Matrix assign(double value) {
     int[] c = size();
     for (int row = 0; row < c[ROW]; row++) {
@@ -218,7 +200,6 @@
     return this;
   }
 
-  @Override
   public Matrix assign(double[][] values) {
     int[] c = size();
     if (c[ROW] != values.length) {
@@ -236,7 +217,6 @@
     return this;
   }
 
-  @Override
   public Matrix assign(Matrix other, BinaryFunction function) {
     int[] c = size();
     int[] o = other.size();
@@ -252,7 +232,6 @@
     return this;
   }
 
-  @Override
   public Matrix assign(Matrix other) {
     int[] c = size();
     int[] o = other.size();
@@ -267,7 +246,6 @@
     return this;
   }
 
-  @Override
   public Matrix assign(UnaryFunction function) {
     int[] c = size();
     for (int row = 0; row < c[ROW]; row++) {
@@ -278,7 +256,6 @@
     return this;
   }
 
-  @Override
   public double determinant() {
     int[] card = size();
     int rowSize = card[ROW];
@@ -332,7 +309,6 @@
     return clone;
   }
 
-  @Override
   public Matrix divide(double x) {
     Matrix result = clone();
     int[] c = size();
@@ -344,7 +320,6 @@
     return result;
   }
 
-  @Override
   public double get(int row, int column) {
     int[] c = size();
     if (row < 0 || column < 0 || row >= c[ROW] || column >= c[COL]) {
@@ -353,7 +328,6 @@
     return getQuick(row, column);
   }
 
-  @Override
   public Matrix minus(Matrix other) {
     int[] c = size();
     int[] o = other.size();
@@ -370,7 +344,6 @@
     return result;
   }
 
-  @Override
   public Matrix plus(double x) {
     Matrix result = clone();
     int[] c = size();
@@ -382,7 +355,6 @@
     return result;
   }
 
-  @Override
   public Matrix plus(Matrix other) {
     int[] c = size();
     int[] o = other.size();
@@ -399,7 +371,6 @@
     return result;
   }
 
-  @Override
   public void set(int row, int column, double value) {
     int[] c = size();
     if (row < 0 || column < 0 || row >= c[ROW] || column >= c[COL]) {
@@ -408,7 +379,6 @@
     setQuick(row, column, value);
   }
 
-  @Override
   public void set(int row, double[] data) {
     int[] c = size();
     if (c[COL] < data.length) {
@@ -423,7 +393,6 @@
     }
   }
 
-  @Override
   public Matrix times(double x) {
     Matrix result = clone();
     int[] c = size();
@@ -435,7 +404,6 @@
     return result;
   }
 
-  @Override
   public Matrix times(Matrix other) {
     int[] c = size();
     int[] o = other.size();
@@ -455,7 +423,6 @@
     return result;
   }
 
-  @Override
   public Vector times(Vector v) {
     int[] c = size();
     if (c[COL] != v.size()) {
@@ -468,7 +435,6 @@
     return w;
   }
 
-  @Override
   public Vector timesSquared(Vector v) {
     int[] c = size();
     if (c[COL] != v.size()) {
@@ -485,7 +451,6 @@
     return w;
   }
 
-  @Override
   public Matrix transpose() {
     int[] card = size();
     Matrix result = like(card[COL], card[ROW]);
@@ -497,7 +462,6 @@
     return result;
   }
 
-  @Override
   public double zSum() {
     double result = 0;
     int[] c = size();
@@ -540,21 +504,17 @@
       return matrix.like(rows, columns);
     }
 
-    @Override
     public Iterator<Element> iterateAll() {
       return new Iterator<Element>() {
         int i = 0;
-        @Override
         public boolean hasNext() {
           return i < size;
         }
 
-        @Override
         public Element next() {
           return getElement(i++);
         }
 
-        @Override
         public void remove() {
           throw new UnsupportedOperationException("Element removal not supported");
         }
@@ -566,38 +526,31 @@
      * many of them.
      * @return an iterator (currently dense).
      */
-    @Override
     public Iterator<Element> iterateNonZero() {
       return iterateAll();
     }
 
-    @Override
     public Element getElement(final int i) {
       return new Element() {
-        @Override
         public double get() {
           return getQuick(i);
         }
 
-        @Override
         public int index() {
           return i;
         }
 
-        @Override
         public void set(double value) {
           setQuick(i, value);
         }
       };
     }
 
-    @Override
     public double getQuick(int index) {
       Vector v = rowToColumn ? matrix.getRow(index) : matrix.getColumn(index);
       return v == null ? 0 : v.getQuick(transposeOffset);
     }
 
-    @Override
     public void setQuick(int index, double value) {
       Vector v = rowToColumn ? matrix.getRow(index) : matrix.getColumn(index);
       if(v == null) {
@@ -612,12 +565,10 @@
       return new DenseVector(cardinality);
     }
 
-    @Override
     public Vector like() {
       return new DenseVector(size);
     }
 
-    @Override
     public Vector like(int cardinality) {
       return new DenseVector(cardinality);
     }
@@ -627,7 +578,6 @@
      *
      * @return the number of nonzero entries
      */
-    @Override
     public int getNumNondefaultElements() {
       return size;
     }

Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/AbstractVector.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/AbstractVector.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/AbstractVector.java (original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/AbstractVector.java Tue Feb  9 01:17:44 2010
@@ -81,7 +81,6 @@
    */
   protected abstract Matrix matrixLike(int rows, int columns);
 
-  @Override
   public Vector viewPart(int offset, int length) {
     if (length > size) {
       throw new CardinalityException();
@@ -107,7 +106,6 @@
     return clone;
   }
 
-  @Override
   public Vector divide(double x) {
     Vector result = clone();
     Iterator<Element> iter = result.iterateNonZero();
@@ -120,7 +118,6 @@
     return result;
   }
 
-  @Override
   public double dot(Vector x) {
     if (size() != x.size()) {
       throw new CardinalityException();
@@ -135,7 +132,6 @@
     return result;
   }
 
-  @Override
   public double get(int index) {
     if (index >= 0 && index < size()) {
       return getQuick(index);
@@ -144,7 +140,6 @@
     }
   }
 
-  @Override
   public Vector minus(Vector x) {
     if (size() != x.size()) {
       throw new CardinalityException();
@@ -158,17 +153,14 @@
     return result;
   }
 
-  @Override
   public Vector normalize() {
     return divide(Math.sqrt(dot(this)));
   }
 
-  @Override
   public Vector normalize(double power) {
     return divide(norm(power));
   }
 
-  @Override
   public double norm(double power) {
     if (power < 0.0) {
       throw new IllegalArgumentException("Power must be >= 0");
@@ -209,7 +201,6 @@
     }
   }
 
-  @Override
   public double getLengthSquared() {
     if (lengthSquared >= 0.0) {
       return lengthSquared;
@@ -217,7 +208,6 @@
     return lengthSquared = dot(this);
   }
 
-  @Override
   public double getDistanceSquared(Vector v) {
     if(v.size() != size()) {
       throw new CardinalityException();
@@ -242,11 +232,10 @@
     while(it.hasNext() && (e = it.next()) != null) {
       d += e.get() * (e.get() - 2 * randomlyAccessed.getQuick(e.index()));
     }
-    assert(d > -1e-9); // round-off errors should never be too far off!
+    assert(d > -1.0e-9); // round-off errors should never be too far off!
     return Math.abs(d);
   }
 
-  @Override
   public double maxValue() {
     double result = Double.NEGATIVE_INFINITY;
     for (int i = 0; i < size(); i++) {
@@ -255,7 +244,6 @@
     return result;
   }
 
-  @Override
   public int maxValueIndex() {
     int result = -1;
     double max = Double.NEGATIVE_INFINITY;
@@ -269,7 +257,6 @@
     return result;
   }
 
-  @Override
   public Vector plus(double x) {
     Vector result = clone();
     for (int i = 0; i < result.size(); i++) {
@@ -278,7 +265,6 @@
     return result;
   }
 
-  @Override
   public Vector plus(Vector x) {
     if (size() != x.size()) {
       throw new CardinalityException();
@@ -296,7 +282,6 @@
     return result;
   }
 
-  @Override
   public void addTo(Vector v) {
     Iterator<Element> it = iterateNonZero();
     Element e;
@@ -306,7 +291,6 @@
     }
   }
 
-  @Override
   public void set(int index, double value) {
     if (index >= 0 && index < size()) {
       setQuick(index, value);
@@ -315,7 +299,6 @@
     }
   }
 
-  @Override
   public Vector times(double x) {
     Vector result = clone();
     Iterator<Element> iter = iterateNonZero();
@@ -328,7 +311,6 @@
     return result;
   }
 
-  @Override
   public Vector times(Vector x) {
     if (size() != x.size()) {
       throw new CardinalityException();
@@ -344,7 +326,6 @@
     return result;
   }
 
-  @Override
   public double zSum() {
     double result = 0;
     Iterator<Element> iter = iterateNonZero();
@@ -356,7 +337,6 @@
     return result;
   }
 
-  @Override
   public Vector assign(double value) {
     for (int i = 0; i < size(); i++) {
       setQuick(i, value);
@@ -364,7 +344,6 @@
     return this;
   }
 
-  @Override
   public Vector assign(double[] values) {
     if (values.length != size()) {
       throw new CardinalityException();
@@ -375,7 +354,6 @@
     return this;
   }
 
-  @Override
   public Vector assign(Vector other) {
     if (other.size() != size()) {
       throw new CardinalityException();
@@ -386,37 +364,34 @@
     return this;
   }
 
-  @Override
   public Vector assign(BinaryFunction f, double y) {
     Iterator<Element> it;
-    Element e;
     if(f.apply(0, y) == 0) {
       it = iterateNonZero();
     } else {
       it = iterateAll();
     }
+    Element e;
     while(it.hasNext() && (e = it.next()) != null) {
       e.set(f.apply(e.get(), y));
     }
     return this;
   }
 
-  @Override
   public Vector assign(UnaryFunction function) {
     Iterator<Element> it;
-    Element e;
     if(function.apply(0) == 0) {
       it = iterateNonZero();
     } else {
       it = iterateAll();
     }
+    Element e;
     while(it.hasNext() && (e = it.next()) != null) {
       e.set(function.apply(e.get()));
     }
     return this;
   }
 
-  @Override
   public Vector assign(Vector other, BinaryFunction function) {
     if (other.size() != size()) {
       throw new CardinalityException();
@@ -427,7 +402,6 @@
     return this;
   }
 
-  @Override
   public Matrix cross(Vector other) {
     Matrix result = matrixLike(size(), other.size());
     for (int row = 0; row < size(); row++) {
@@ -452,22 +426,18 @@
     return gson.fromJson(formattedString, vectorType);
   }
 
-  @Override
   public String getName() {
     return name;
   }
 
-  @Override
   public void setName(String name) {
     this.name = name;
   }
 
-  @Override
   public int size() {
     return size;  
   }
 
-  @Override
   public String asFormatString() {
     Type vectorType = new TypeToken<Vector>() {
     }.getType();
@@ -559,7 +529,6 @@
    }
 
 
-  @Override
   public double get(String label) throws IndexException, UnboundLabelException {
     if (bindings == null) {
       throw new UnboundLabelException();
@@ -571,12 +540,10 @@
     return get(index);
   }
 
-  @Override
   public Map<String, Integer> getLabelBindings() {
     return bindings;
   }
 
-  @Override
   public void set(String label, double value) throws IndexException,
       UnboundLabelException {
     if (bindings == null) {
@@ -589,12 +556,10 @@
     set(index, value);
   }
 
-  @Override
   public void setLabelBindings(Map<String, Integer> bindings) {
     this.bindings = bindings;
   }
 
-  @Override
   public void set(String label, int index, double value) throws IndexException {
     if (bindings == null) {
       bindings = new HashMap<String, Integer>();

Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/DenseMatrix.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/DenseMatrix.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/DenseMatrix.java (original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/DenseMatrix.java Tue Feb  9 01:17:44 2010
@@ -54,7 +54,6 @@
     this.values = new double[rows][columns];
   }
 
-  @Override
   public int[] size() {
     int[] result = new int[2];
     result[ROW] = rowSize();
@@ -72,32 +71,26 @@
     return clone;
   }
 
-  @Override
   public double getQuick(int row, int column) {
     return values[row][column];
   }
 
-  @Override
   public Matrix like() {
     return like(rowSize(), columnSize());
   }
 
-  @Override
   public Matrix like(int rows, int columns) {
     return new DenseMatrix(rows, columns);
   }
 
-  @Override
   public void setQuick(int row, int column, double value) {
     values[row][column] = value;
   }
 
-  @Override
   public int[] getNumNondefaultElements() {
     return size();
   }
 
-  @Override
   public Matrix viewPart(int[] offset, int[] size) {
     if (size[ROW] > rowSize() || size[COL] > columnSize()) {
       throw new CardinalityException();
@@ -109,7 +102,6 @@
     return new MatrixView(this, offset, size);
   }
 
-  @Override
   public Matrix assignColumn(int column, Vector other) {
     if (other.size() != rowSize() || column >= columnSize()) {
       throw new CardinalityException();
@@ -120,7 +112,6 @@
     return this;
   }
 
-  @Override
   public Matrix assignRow(int row, Vector other) {
     if (row >= rowSize() || other.size() != columnSize()) {
       throw new CardinalityException();
@@ -131,7 +122,6 @@
     return this;
   }
 
-  @Override
   public Vector getColumn(int column) {
     if (column < 0 || column >= columnSize()) {
       throw new IndexException();
@@ -139,7 +129,6 @@
     return new TransposeViewVector(this, column);
   }
 
-  @Override
   public Vector getRow(int row) {
     if (row < 0 || row >= rowSize()) {
       throw new IndexException();

Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/DenseVector.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/DenseVector.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/DenseVector.java (original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/DenseVector.java Tue Feb  9 01:17:44 2010
@@ -96,26 +96,22 @@
     return clone;
   }
 
-  @Override
   public double getQuick(int index) {
     return values[index];
   }
 
-  @Override
   public DenseVector like() {
     DenseVector denseVector = new DenseVector(size());
     denseVector.setLabelBindings(getLabelBindings());
     return denseVector;
   }
 
-  @Override
   public Vector like(int cardinality) {
     Vector denseVector = new DenseVector(cardinality);
     denseVector.setLabelBindings(getLabelBindings());
     return denseVector;
   }
 
-  @Override
   public void setQuick(int index, double value) {
     lengthSquared = -1.0;
     values[index] = value;
@@ -142,7 +138,6 @@
     return this;
   }
 
-  @Override
   public int getNumNondefaultElements() {
     return values.length;
   }
@@ -161,14 +156,12 @@
   /**
    * Returns an iterator that traverses this Vector from 0 to cardinality-1, in that order.
    *
-   * @see java.lang.Iterable#iterator
+   * @see Iterable#iterator
    */
-  @Override
   public Iterator<Vector.Element> iterateNonZero() {
     return new NonZeroIterator();
   }
 
-  @Override
   public Iterator<Vector.Element> iterateAll() {
     return new AllIterator();
   }
@@ -188,12 +181,10 @@
       }
     }
 
-    @Override
     public boolean hasNext() {
       return offset < values.length;
     }
 
-    @Override
     public Vector.Element next() {
       if (offset >= values.length) {
         throw new NoSuchElementException();
@@ -204,7 +195,6 @@
       return element;
     }
 
-    @Override
     public void remove() {
       throw new UnsupportedOperationException();
     }
@@ -214,12 +204,10 @@
 
     private final Element element = new Element(-1);
 
-    @Override
     public boolean hasNext() {
       return element.ind + 1 < values.length;
     }
 
-    @Override
     public Vector.Element next() {
       if (!hasNext()) {
         throw new NoSuchElementException();
@@ -228,7 +216,6 @@
       return element;
     }
 
-    @Override
     public void remove() {
       throw new UnsupportedOperationException();
     }
@@ -242,24 +229,20 @@
       this.ind = ind;
     }
 
-    @Override
     public double get() {
       return values[ind];
     }
 
-    @Override
     public int index() {
       return ind;
     }
 
-    @Override
     public void set(double value) {
       lengthSquared = -1.0;
       values[ind] = value;
     }
   }
 
-  @Override
   public Vector.Element getElement(int index) {
     return new Element(index);
   }

Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/JsonMatrixAdapter.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/JsonMatrixAdapter.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/JsonMatrixAdapter.java (original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/JsonMatrixAdapter.java Tue Feb  9 01:17:44 2010
@@ -39,7 +39,6 @@
   public static final String CLASS = "class";
   public static final String MATRIX = "matrix";
 
-  @Override
   public JsonElement serialize(Matrix src, Type typeOfSrc,
                                JsonSerializationContext context) {
     Type vectorType = new TypeToken<Vector>() {
@@ -56,7 +55,6 @@
     return obj;
   }
 
-  @Override
   public Matrix deserialize(JsonElement json, Type typeOfT,
                             JsonDeserializationContext context) throws JsonParseException {
     Type vectorType = new TypeToken<Vector>() {

Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/JsonVectorAdapter.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/JsonVectorAdapter.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/JsonVectorAdapter.java (original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/JsonVectorAdapter.java Tue Feb  9 01:17:44 2010
@@ -37,7 +37,6 @@
   private static final Logger log = LoggerFactory.getLogger(JsonVectorAdapter.class);
   public static final String VECTOR = "vector";
 
-  @Override
   public JsonElement serialize(Vector src, Type typeOfSrc,
                                JsonSerializationContext context) {
     GsonBuilder builder = new GsonBuilder();
@@ -49,7 +48,6 @@
     return obj;
   }
 
-  @Override
   public Vector deserialize(JsonElement json, Type typeOfT,
                             JsonDeserializationContext context) throws JsonParseException {
     GsonBuilder builder = new GsonBuilder();

Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/MatrixSlice.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/MatrixSlice.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/MatrixSlice.java (original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/MatrixSlice.java Tue Feb  9 01:17:44 2010
@@ -1,9 +1,27 @@
-package org.apache.mahout.math;
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
+package org.apache.mahout.math;
 
 public class MatrixSlice {
-  private Vector v;
-  private int index;
+
+  private final Vector v;
+  private final int index;
+
   public MatrixSlice(Vector v, int index) {
     this.v = v;
     this.index = index;

Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/MatrixView.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/MatrixView.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/MatrixView.java (original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/MatrixView.java Tue Feb  9 01:17:44 2010
@@ -45,7 +45,6 @@
     this.cardinality = cardinality;
   }
 
-  @Override
   public int[] size() {
     return cardinality;
   }
@@ -59,33 +58,27 @@
     return clone;
   }
 
-  @Override
   public double getQuick(int row, int column) {
     return matrix.getQuick(offset[ROW] + row, offset[COL] + column);
   }
 
-  @Override
   public Matrix like() {
     return matrix.like(cardinality[ROW], cardinality[COL]);
   }
 
-  @Override
   public Matrix like(int rows, int columns) {
 
     return matrix.like(rows, columns);
   }
 
-  @Override
   public void setQuick(int row, int column, double value) {
     matrix.setQuick(offset[ROW] + row, offset[COL] + column, value);
   }
 
-  @Override
   public int[] getNumNondefaultElements() {
     return cardinality;
   }
 
-  @Override
   public Matrix viewPart(int[] offset, int[] size) {
     if (size[ROW] > cardinality[ROW] || size[COL] > cardinality[COL]) {
       throw new CardinalityException();
@@ -100,7 +93,6 @@
     return new MatrixView(matrix, origin, size);
   }
 
-  @Override
   public Matrix assignColumn(int column, Vector other) {
     if (cardinality[ROW] != other.size()) {
       throw new CardinalityException();
@@ -112,7 +104,6 @@
     return this;
   }
 
-  @Override
   public Matrix assignRow(int row, Vector other) {
     if (cardinality[COL] != other.size()) {
       throw new CardinalityException();
@@ -124,7 +115,6 @@
     return this;
   }
 
-  @Override
   public Vector getColumn(int column) {
     if (column < 0 || column >= cardinality[COL]) {
       throw new IndexException();
@@ -133,7 +123,6 @@
         cardinality[ROW]);
   }
 
-  @Override
   public Vector getRow(int row) {
     if (row < 0 || row >= cardinality[ROW]) {
       throw new IndexException();

Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/Partitioning.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/Partitioning.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/Partitioning.java (original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/Partitioning.java Tue Feb  9 01:17:44 2010
@@ -340,7 +340,7 @@
    *
    *                     <p> Tip: Normally you will have <tt>splitIndexes.length == s.length</tt> as well as
    *                     <tt>from==0, to==g.length-1</tt> and <tt>splitFrom==0, splitTo==s.length-1</tt>.
-   * @see Sorting#binarySearchFromTo(int,int,IntComparator)
+   * @see Sorting#binarySearchFromTo(Object[], Object, int, int, Comparator)
    */
   public static void genericPartition(int from, int to, int splitFrom, int splitTo, int[] splitIndexes,
                                       IntComparator comp, IntComparator comp2, IntComparator comp3, Swapper swapper) {
@@ -615,7 +615,6 @@
    *                     == splitters.length</tt> as well as <tt>from==0, to==list.length-1</tt> and <tt>splitFrom==0,
    *                     splitTo==splitters.length-1</tt>.
    * @see org.apache.mahout.math.Arrays
-   * @see org.apache.mahout.math.GenericSorting
    * @see java.util.Arrays
    */
   public static void partition(int[] list, int from, int to, int[] splitters, int splitFrom, int splitTo,

Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/RandomAccessSparseVector.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/RandomAccessSparseVector.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/RandomAccessSparseVector.java (original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/RandomAccessSparseVector.java Tue Feb  9 01:17:44 2010
@@ -95,23 +95,19 @@
     return this;
   }
 
-  @Override
   public double getQuick(int index) {
     return values.get(index);
   }
 
-  @Override
   public void setQuick(int index, double value) {
     lengthSquared = -1.0;
     values.put(index, value);
   }
 
-  @Override
   public int getNumNondefaultElements() {
     return values.size();
   }
 
-  @Override
   public RandomAccessSparseVector like() {
     int numValues = 256;
     if (values != null) {
@@ -120,7 +116,6 @@
     return new RandomAccessSparseVector(size(), numValues);
   }
 
-  @Override
   public Vector like(int newCardinality) {
     int numValues = 256;
     if (values != null) {
@@ -136,12 +131,10 @@
    * @return an {@link NonZeroIterator} over the Elements.
    * @see #getElement(int)
    */
-  @Override
   public java.util.Iterator<Vector.Element> iterateNonZero() {
     return new NonZeroIterator(false);
   }
   
-  @Override
   public Iterator<Vector.Element> iterateAll() {
     return new AllIterator();
   }
@@ -184,12 +177,10 @@
     private int offset = 0;
     private final Element element = new Element(0);
 
-    @Override
     public boolean hasNext() {
       return offset < size();
     }
 
-    @Override
     public Vector.Element next() {
       if (offset >= size()) {
         throw new NoSuchElementException();
@@ -198,7 +189,6 @@
       return element;
     }
 
-    @Override
     public void remove() {
       throw new UnsupportedOperationException();
     }
@@ -217,12 +207,10 @@
       }      
     }
 
-    @Override
     public boolean hasNext() {
       return offset < intArrList.size();
     }
 
-    @Override
     public Element next() {
       if (offset < intArrList.size()) {
         element.ind = intArrList.get(offset++);
@@ -231,13 +219,11 @@
       throw new NoSuchElementException();
     }
 
-    @Override
     public void remove() {
       throw new UnsupportedOperationException();
     }
   }
 
-  @Override
   public Vector.Element getElement(int index) {
     return new Element(index);
   }
@@ -249,17 +235,14 @@
       this.ind = ind;
     }
 
-    @Override
     public double get() {
       return values.get(ind);
     }
 
-    @Override
     public int index() {
       return ind;
     }
 
-    @Override
     public void set(double value) {
       lengthSquared = -1.0;
       values.put(ind, value);
@@ -276,7 +259,6 @@
       this.skipSet = skipSet;
     }
 
-    @Override
     public boolean apply(int key, double value) {
       if(skipSet.contains(key)) {
         // returning true is ok, yes?  It is ignored.
@@ -320,7 +302,6 @@
       this.v = v;
     }
 
-    @Override
     public boolean apply(int key, double value) {
       v.set(key, value + v.get(key));
       return true;

Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/SequentialAccessSparseVector.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/SequentialAccessSparseVector.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/SequentialAccessSparseVector.java (original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/SequentialAccessSparseVector.java Tue Feb  9 01:17:44 2010
@@ -82,22 +82,18 @@
     return clone;
   }
 
-  @Override
   public double getQuick(int index) {
     return values.get(index);
   }
 
-  @Override
   public void setQuick(int index, double value) {
     values.set(index, value);
   }
 
-  @Override
   public int getNumNondefaultElements() {
     return values.getNumMappings();
   }
 
-  @Override
   public SequentialAccessSparseVector like() {
     int numValues = 256;
     if (values != null) {
@@ -106,7 +102,6 @@
     return new SequentialAccessSparseVector(size(), numValues);
   }
 
-  @Override
   public Vector like(int newCardinality) {
     int numValues = 256;
     if (values != null) {
@@ -115,12 +110,10 @@
     return new SequentialAccessSparseVector(newCardinality, numValues);
   }
 
-  @Override
-  public java.util.Iterator<Element> iterateNonZero() {
+  public Iterator<Element> iterateNonZero() {
     return new IntDoublePairIterator(this);
   }
 
-  @Override
   public Iterator<Element> iterateAll() {
     return new IntDoublePairIterator(this, size());
   }
@@ -178,12 +171,11 @@
       element = new DenseElement(offset, v);
       maxOffset = cardinality;
     }
-    @Override
+
     public boolean hasNext() {
       return offset < maxOffset;
     }
 
-    @Override
     public Element next() {
       if (offset >= maxOffset) {
         throw new NoSuchElementException();
@@ -192,13 +184,11 @@
       return element;
     }
 
-    @Override
     public void remove() {
       throw new UnsupportedOperationException();
     }
   }
 
-  @Override
   public Element getElement(int index) {
     return new DenseElement(index, this);
   }
@@ -227,7 +217,6 @@
       index = ind;
     }
 
-    @Override
     public double get() {
       if(index >= indices.length) return 0.0;
       int cur = indices[index];
@@ -236,12 +225,10 @@
       return 0.0;
     }
 
-    @Override
     public int index() {
       return offset;
     }
 
-    @Override
     public void set(double value) {
       v.lengthSquared = -1;
       if(value != 0.0) mapping.set(indices[offset], value);
@@ -254,17 +241,14 @@
       super(ind, v);
     }
 
-    @Override
     public double get() {
       return values[offset];
     }
 
-    @Override
     public int index() {
       return indices[offset];
     }
 
-    @Override
     public void set(double value) {
       values[offset] = value;
     }

Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/SparseColumnMatrix.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/SparseColumnMatrix.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/SparseColumnMatrix.java (original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/SparseColumnMatrix.java Tue Feb  9 01:17:44 2010
@@ -58,7 +58,6 @@
     }
   }
 
-  @Override
   public int[] size() {
     return cardinality;
   }
@@ -91,7 +90,6 @@
     return numCols();
   }
 
-  @Override
   public double getQuick(int row, int column) {
     if (columns[column] == null) {
       return 0.0;
@@ -100,12 +98,10 @@
     }
   }
 
-  @Override
   public Matrix like() {
     return new SparseColumnMatrix(cardinality);
   }
 
-  @Override
   public Matrix like(int rows, int columns) {
     int[] c = new int[2];
     c[ROW] = rows;
@@ -113,7 +109,6 @@
     return new SparseColumnMatrix(c);
   }
 
-  @Override
   public void setQuick(int row, int column, double value) {
     if (columns[column] == null) {
       columns[column] = new RandomAccessSparseVector(cardinality[ROW]);
@@ -121,7 +116,6 @@
     columns[column].setQuick(row, value);
   }
 
-  @Override
   public int[] getNumNondefaultElements() {
     int[] result = new int[2];
     result[COL] = columns.length;
@@ -132,7 +126,6 @@
     return result;
   }
 
-  @Override
   public Matrix viewPart(int[] offset, int[] size) {
     if (size[COL] > columns.length || size[ROW] > columns[COL].size()) {
       throw new CardinalityException();
@@ -144,7 +137,6 @@
     return new MatrixView(this, offset, size);
   }
 
-  @Override
   public Matrix assignColumn(int column, Vector other) {
     if (other.size() != cardinality[ROW] || column >= cardinality[COL]) {
       throw new CardinalityException();
@@ -153,7 +145,6 @@
     return this;
   }
 
-  @Override
   public Matrix assignRow(int row, Vector other) {
     if (row >= cardinality[ROW] || other.size() != cardinality[COL]) {
       throw new CardinalityException();
@@ -164,7 +155,6 @@
     return this;
   }
 
-  @Override
   public Vector getColumn(int column) {
     if (column < 0 || column >= cardinality[COL]) {
       throw new IndexException();
@@ -172,7 +162,6 @@
     return columns[column];
   }
 
-  @Override
   public Vector getRow(int row) {
     if (row < 0 || row >= cardinality[ROW]) {
       throw new IndexException();

Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/SparseMatrix.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/SparseMatrix.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/SparseMatrix.java (original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/SparseMatrix.java Tue Feb  9 01:17:44 2010
@@ -55,7 +55,6 @@
     this.rows = new HashMap<Integer, Vector>();
   }
 
-  @Override
   public int[] size() {
     return cardinality;
   }
@@ -68,7 +67,6 @@
     return clone;
   }
 
-  @Override
   public double getQuick(int row, int column) {
     Vector r = rows.get(row);
     if (r == null) {
@@ -78,17 +76,14 @@
     }
   }
 
-  @Override
   public Matrix like() {
     return new SparseMatrix(cardinality);
   }
 
-  @Override
   public Matrix like(int rows, int columns) {
     return new SparseMatrix(new int[]{rows, columns});
   }
 
-  @Override
   public void setQuick(int row, int column, double value) {
     Vector r = rows.get(row);
     if (r == null) {
@@ -98,7 +93,6 @@
     r.setQuick(column, value);
   }
 
-  @Override
   public int[] getNumNondefaultElements() {
     int[] result = new int[2];
     result[ROW] = rows.size();
@@ -109,7 +103,6 @@
     return result;
   }
 
-  @Override
   public Matrix viewPart(int[] offset, int[] size) {
     if (size[ROW] > cardinality[ROW] || size[COL] > cardinality[COL]) {
       throw new CardinalityException();
@@ -121,7 +114,6 @@
     return new MatrixView(this, offset, size);
   }
 
-  @Override
   public Matrix assignColumn(int column, Vector other) {
     if (other.size() != cardinality[ROW] || column >= cardinality[COL]) {
       throw new CardinalityException();
@@ -140,7 +132,6 @@
     return this;
   }
 
-  @Override
   public Matrix assignRow(int row, Vector other) {
     if (row >= cardinality[ROW] || other.size() != cardinality[COL]) {
       throw new CardinalityException();
@@ -149,7 +140,6 @@
     return this;
   }
 
-  @Override
   public Vector getColumn(int column) {
     if (column < 0 || column >= cardinality[COL]) {
       throw new IndexException();
@@ -161,7 +151,6 @@
     return new DenseVector(d);
   }
 
-  @Override
   public Vector getRow(int row) {
     if (row < 0 || row >= cardinality[ROW]) {
       throw new IndexException();

Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/SparseRowMatrix.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/SparseRowMatrix.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/SparseRowMatrix.java (original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/SparseRowMatrix.java Tue Feb  9 01:17:44 2010
@@ -74,7 +74,6 @@
     this(cardinality, true);
   }
 
-  @Override
   public int[] size() {
     return cardinality;
   }
@@ -90,7 +89,6 @@
     return clone;
   }
 
-  @Override
   public double getQuick(int row, int column) {
     if (rows[row] == null) {
       return 0.0;
@@ -99,12 +97,10 @@
     }
   }
 
-  @Override
   public Matrix like() {
     return new SparseRowMatrix(cardinality, randomAccessRows);
   }
 
-  @Override
   public Matrix like(int rows, int columns) {
     int[] c = new int[2];
     c[ROW] = rows;
@@ -112,12 +108,10 @@
     return new SparseRowMatrix(c, randomAccessRows);
   }
 
-  @Override
   public void setQuick(int row, int column, double value) {
     rows[row].setQuick(column, value);
   }
 
-  @Override
   public int[] getNumNondefaultElements() {
     int[] result = new int[2];
     result[ROW] = rows.length;
@@ -127,7 +121,6 @@
     return result;
   }
 
-  @Override
   public Matrix viewPart(int[] offset, int[] size) {
     if (size[ROW] > rows.length || size[COL] > rows[ROW].size()) {
       throw new CardinalityException();
@@ -139,7 +132,6 @@
     return new MatrixView(this, offset, size);
   }
 
-  @Override
   public Matrix assignColumn(int column, Vector other) {
     if (other.size() != cardinality[ROW] || column >= cardinality[COL]) {
       throw new CardinalityException();
@@ -150,7 +142,6 @@
     return this;
   }
 
-  @Override
   public Matrix assignRow(int row, Vector other) {
     if (row >= cardinality[ROW] || other.size() != cardinality[COL]) {
       throw new CardinalityException();
@@ -164,7 +155,6 @@
    * @param column an int column index
    * @return a shallow view of the column
    */
-  @Override
   public Vector getColumn(int column) {
     if (column < 0 || column >= cardinality[COL]) {
       throw new IndexException();
@@ -184,7 +174,6 @@
    * @param row an int row index
    * @return a shallow view of the Vector at specified row (ie you may mutate the original matrix using this row)
    */
-  @Override
   public Vector getRow(int row) {
     if (row < 0 || row >= cardinality[ROW]) {
       throw new IndexException();

Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/VectorView.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/VectorView.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/VectorView.java (original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/VectorView.java Tue Feb  9 01:17:44 2010
@@ -58,27 +58,22 @@
     return clone;
   }
 
-  @Override
   public double getQuick(int index) {
     return vector.getQuick(offset + index);
   }
 
-  @Override
   public Vector like() {
     return vector.like();
   }
 
-  @Override
   public Vector like(int cardinality) {
     return vector.like(cardinality);
   }
 
-  @Override
   public void setQuick(int index, double value) {
     vector.setQuick(offset + index, value);
   }
 
-  @Override
   public int getNumNondefaultElements() {
     return cardinality;
   }
@@ -99,12 +94,10 @@
     return index >= offset && index < offset + cardinality;
   }
 
-  @Override
   public Iterator<Vector.Element> iterateNonZero() {
     return new NonZeroIterator();
   }
 
-  @Override
   public Iterator<Vector.Element> iterateAll() {
     return new AllIterator();
   }
@@ -126,17 +119,14 @@
         if (isInView(el.index()) && el.get() != 0) {
           final Vector.Element decorated = vector.getElement(el.index());
           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) {
               decorated.set(value);
             }
@@ -147,7 +137,6 @@
       el = null; // No element was found
     }
 
-    @Override
     public Vector.Element next() {
       if (!hasNext()) {
         throw new NoSuchElementException();
@@ -157,13 +146,11 @@
       return buffer;
     }
 
-    @Override
     public boolean hasNext() {
       return el != null;
     }
 
     /** @throws UnsupportedOperationException all the time. method not implemented. */
-    @Override
     public void remove() {
       throw new UnsupportedOperationException();
     }
@@ -186,17 +173,14 @@
         if (isInView(el.index())) {
           final Vector.Element decorated = vector.getElement(el.index());
           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) {
               decorated.set(value);
             }
@@ -207,7 +191,6 @@
       el = null; // No element was found
     }
 
-    @Override
     public Vector.Element next() {
       if (!hasNext()) {
         throw new NoSuchElementException();
@@ -217,13 +200,11 @@
       return buffer;
     }
 
-    @Override
     public boolean hasNext() {
       return el != null;
     }
 
     /** @throws UnsupportedOperationException all the time. method not implemented. */
-    @Override
     public void remove() {
       throw new UnsupportedOperationException();
     }
@@ -242,7 +223,6 @@
     return result;
   }
 
-  @Override
   public Vector.Element getElement(int index) {
     return new Element(index);
   }
@@ -255,17 +235,14 @@
       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);
     }

Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/decomposer/hebbian/HebbianUpdater.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/decomposer/hebbian/HebbianUpdater.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/decomposer/hebbian/HebbianUpdater.java (original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/decomposer/hebbian/HebbianUpdater.java Tue Feb  9 01:17:44 2010
@@ -23,7 +23,6 @@
 
 public class HebbianUpdater implements EigenUpdater {
 
-  @Override
   public void update(Vector pseudoEigen,
                      Vector trainingVector,
                      TrainingState currentState) {

Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/decomposer/hebbian/MultiThreadedEigenVerifier.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/decomposer/hebbian/MultiThreadedEigenVerifier.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/decomposer/hebbian/MultiThreadedEigenVerifier.java (original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/decomposer/hebbian/MultiThreadedEigenVerifier.java Tue Feb  9 01:17:44 2010
@@ -64,7 +64,6 @@
       this.vector = vector;
     }
 
-    @Override
     public void run() {
       EigenStatus status = innerVerify(eigenMatrix, vector);
       synchronized (MultiThreadedEigenVerifier.this.status) {

Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/decomposer/hebbian/SimpleEigenVerifier.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/decomposer/hebbian/SimpleEigenVerifier.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/decomposer/hebbian/SimpleEigenVerifier.java (original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/decomposer/hebbian/SimpleEigenVerifier.java Tue Feb  9 01:17:44 2010
@@ -21,7 +21,6 @@
 
 public class SimpleEigenVerifier implements SingularVectorVerifier {
 
-  @Override
   public EigenStatus verify(Matrix eigenMatrix, Vector vector) {
     Vector resultantVector = eigenMatrix.timesSquared(vector);
     double newNorm = resultantVector.norm(2);

Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/decomposer/lanczos/LanczosSolver.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/decomposer/lanczos/LanczosSolver.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/decomposer/lanczos/LanczosSolver.java (original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/decomposer/lanczos/LanczosSolver.java Tue Feb  9 01:17:44 2010
@@ -86,7 +86,6 @@
       this.d = d;
     }
 
-    @Override
     public double apply(double arg1) {
       return arg1 * d;
     }

Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/function/Functions.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/function/Functions.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/function/Functions.java (original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/function/Functions.java Tue Feb  9 01:17:44 2010
@@ -8,12 +8,6 @@
 */
 package org.apache.mahout.math.function;
 
-import org.apache.mahout.math.function.BinaryFunction;
-import org.apache.mahout.math.function.UnaryFunction;
-import org.apache.mahout.math.function.DoubleDoubleProcedure;
-import org.apache.mahout.math.function.DoubleProcedure;
-import org.apache.mahout.math.function.Mult;
-import org.apache.mahout.math.function.PlusMult;
 import org.apache.mahout.math.jet.random.engine.MersenneTwister;
 
 import java.util.Date;
@@ -98,7 +92,6 @@
    *****************************/
   /** Function that returns <tt>Math.abs(a)</tt>. */
   public static final UnaryFunction abs = new UnaryFunction() {
-    @Override
     public double apply(double a) {
       return Math.abs(a);
     }
@@ -106,7 +99,6 @@
 
   /** Function that returns <tt>Math.acos(a)</tt>. */
   public static final UnaryFunction acos = new UnaryFunction() {
-    @Override
     public double apply(double a) {
       return Math.acos(a);
     }
@@ -114,7 +106,6 @@
 
   /** Function that returns <tt>Math.asin(a)</tt>. */
   public static final UnaryFunction asin = new UnaryFunction() {
-    @Override
     public double apply(double a) {
       return Math.asin(a);
     }
@@ -122,7 +113,6 @@
 
   /** Function that returns <tt>Math.atan(a)</tt>. */
   public static final UnaryFunction atan = new UnaryFunction() {
-    @Override
     public double apply(double a) {
       return Math.atan(a);
     }
@@ -130,7 +120,7 @@
 
   /** Function that returns <tt>Math.ceil(a)</tt>. */
   public static final UnaryFunction ceil = new UnaryFunction() {
-    @Override
+
     public double apply(double a) {
       return Math.ceil(a);
     }
@@ -138,7 +128,7 @@
 
   /** Function that returns <tt>Math.cos(a)</tt>. */
   public static final UnaryFunction cos = new UnaryFunction() {
-    @Override
+
     public double apply(double a) {
       return Math.cos(a);
     }
@@ -146,7 +136,7 @@
 
   /** Function that returns <tt>Math.exp(a)</tt>. */
   public static final UnaryFunction exp = new UnaryFunction() {
-    @Override
+
     public double apply(double a) {
       return Math.exp(a);
     }
@@ -154,7 +144,7 @@
 
   /** Function that returns <tt>Math.floor(a)</tt>. */
   public static final UnaryFunction floor = new UnaryFunction() {
-    @Override
+
     public double apply(double a) {
       return Math.floor(a);
     }
@@ -162,7 +152,7 @@
 
   /** Function that returns its argument. */
   public static final UnaryFunction identity = new UnaryFunction() {
-    @Override
+
     public double apply(double a) {
       return a;
     }
@@ -170,7 +160,7 @@
 
   /** Function that returns <tt>1.0 / a</tt>. */
   public static final UnaryFunction inv = new UnaryFunction() {
-    @Override
+
     public double apply(double a) {
       return 1.0 / a;
     }
@@ -178,7 +168,7 @@
 
   /** Function that returns <tt>Math.log(a)</tt>. */
   public static final UnaryFunction logarithm = new UnaryFunction() {
-    @Override
+
     public double apply(double a) {
       return Math.log(a);
     }
@@ -186,7 +176,7 @@
 
   /** Function that returns <tt>Math.log(a) / Math.log(2)</tt>. */
   public static final UnaryFunction log2 = new UnaryFunction() {
-    @Override
+
     public double apply(double a) {
       return Math.log(a) * 1.4426950408889634;
     }
@@ -194,7 +184,7 @@
 
   /** Function that returns <tt>-a</tt>. */
   public static final UnaryFunction negate = new UnaryFunction() {
-    @Override
+
     public double apply(double a) {
       return -a;
     }
@@ -202,7 +192,7 @@
 
   /** Function that returns <tt>Math.rint(a)</tt>. */
   public static final UnaryFunction rint = new UnaryFunction() {
-    @Override
+
     public double apply(double a) {
       return Math.rint(a);
     }
@@ -210,7 +200,7 @@
 
   /** Function that returns <tt>a < 0 ? -1 : a > 0 ? 1 : 0</tt>. */
   public static final UnaryFunction sign = new UnaryFunction() {
-    @Override
+
     public double apply(double a) {
       return a < 0 ? -1 : a > 0 ? 1 : 0;
     }
@@ -218,7 +208,7 @@
 
   /** Function that returns <tt>Math.sin(a)</tt>. */
   public static final UnaryFunction sin = new UnaryFunction() {
-    @Override
+
     public double apply(double a) {
       return Math.sin(a);
     }
@@ -226,7 +216,7 @@
 
   /** Function that returns <tt>Math.sqrt(a)</tt>. */
   public static final UnaryFunction sqrt = new UnaryFunction() {
-    @Override
+
     public double apply(double a) {
       return Math.sqrt(a);
     }
@@ -234,7 +224,7 @@
 
   /** Function that returns <tt>a * a</tt>. */
   public static final UnaryFunction square = new UnaryFunction() {
-    @Override
+
     public double apply(double a) {
       return a * a;
     }
@@ -242,7 +232,7 @@
 
   /** Function that returns <tt>Math.tan(a)</tt>. */
   public static final UnaryFunction tan = new UnaryFunction() {
-    @Override
+
     public double apply(double a) {
       return Math.tan(a);
     }
@@ -255,7 +245,7 @@
 
   /** Function that returns <tt>Math.atan2(a,b)</tt>. */
   public static final BinaryFunction atan2 = new BinaryFunction() {
-    @Override
+
     public double apply(double a, double b) {
       return Math.atan2(a, b);
     }
@@ -273,7 +263,7 @@
 
   /** Function that returns <tt>a < b ? -1 : a > b ? 1 : 0</tt>. */
   public static final BinaryFunction compare = new BinaryFunction() {
-    @Override
+
     public double apply(double a, double b) {
       return a < b ? -1 : a > b ? 1 : 0;
     }
@@ -281,7 +271,7 @@
 
   /** Function that returns <tt>a / b</tt>. */
   public static final BinaryFunction div = new BinaryFunction() {
-    @Override
+
     public double apply(double a, double b) {
       return a / b;
     }
@@ -289,7 +279,7 @@
 
   /** Function that returns <tt>a == b ? 1 : 0</tt>. */
   public static final BinaryFunction equals = new BinaryFunction() {
-    @Override
+
     public double apply(double a, double b) {
       return a == b ? 1 : 0;
     }
@@ -297,7 +287,7 @@
 
   /** Function that returns <tt>a > b ? 1 : 0</tt>. */
   public static final BinaryFunction greater = new BinaryFunction() {
-    @Override
+
     public double apply(double a, double b) {
       return a > b ? 1 : 0;
     }
@@ -305,7 +295,7 @@
 
   /** Function that returns <tt>Math.IEEEremainder(a,b)</tt>. */
   public static final BinaryFunction IEEEremainder = new BinaryFunction() {
-    @Override
+
     public double apply(double a, double b) {
       return Math.IEEEremainder(a, b);
     }
@@ -313,7 +303,7 @@
 
   /** Function that returns <tt>a == b</tt>. */
   public static final DoubleDoubleProcedure isEqual = new DoubleDoubleProcedure() {
-    @Override
+
     public boolean apply(double a, double b) {
       return a == b;
     }
@@ -321,7 +311,7 @@
 
   /** Function that returns <tt>a < b</tt>. */
   public static final DoubleDoubleProcedure isLess = new DoubleDoubleProcedure() {
-    @Override
+
     public boolean apply(double a, double b) {
       return a < b;
     }
@@ -329,7 +319,7 @@
 
   /** Function that returns <tt>a > b</tt>. */
   public static final DoubleDoubleProcedure isGreater = new DoubleDoubleProcedure() {
-    @Override
+
     public boolean apply(double a, double b) {
       return a > b;
     }
@@ -337,7 +327,7 @@
 
   /** Function that returns <tt>a < b ? 1 : 0</tt>. */
   public static final BinaryFunction less = new BinaryFunction() {
-    @Override
+
     public double apply(double a, double b) {
       return a < b ? 1 : 0;
     }
@@ -345,7 +335,7 @@
 
   /** Function that returns <tt>Math.log(a) / Math.log(b)</tt>. */
   public static final BinaryFunction lg = new BinaryFunction() {
-    @Override
+
     public double apply(double a, double b) {
       return Math.log(a) / Math.log(b);
     }
@@ -353,7 +343,7 @@
 
   /** Function that returns <tt>Math.max(a,b)</tt>. */
   public static final BinaryFunction max = new BinaryFunction() {
-    @Override
+
     public double apply(double a, double b) {
       return Math.max(a, b);
     }
@@ -361,7 +351,7 @@
 
   /** Function that returns <tt>Math.min(a,b)</tt>. */
   public static final BinaryFunction min = new BinaryFunction() {
-    @Override
+
     public double apply(double a, double b) {
       return Math.min(a, b);
     }
@@ -377,7 +367,7 @@
 
   /** Function that returns <tt>a % b</tt>. */
   public static final BinaryFunction mod = new BinaryFunction() {
-    @Override
+
     public double apply(double a, double b) {
       return a % b;
     }
@@ -385,7 +375,7 @@
 
   /** Function that returns <tt>a * b</tt>. */
   public static final BinaryFunction mult = new BinaryFunction() {
-    @Override
+
     public double apply(double a, double b) {
       return a * b;
     }
@@ -401,7 +391,7 @@
 
   /** Function that returns <tt>Math.abs(a) + Math.abs(b)</tt>. */
   public static final BinaryFunction plusAbs = new BinaryFunction() {
-    @Override
+
     public double apply(double a, double b) {
       return Math.abs(a) + Math.abs(b);
     }
@@ -409,7 +399,7 @@
 
   /** Function that returns <tt>Math.pow(a,b)</tt>. */
   public static final BinaryFunction pow = new BinaryFunction() {
-    @Override
+
     public double apply(double a, double b) {
       return Math.pow(a, b);
     }
@@ -424,7 +414,7 @@
    */
   public static UnaryFunction between(final double from, final double to) {
     return new UnaryFunction() {
-      @Override
+
       public double apply(double a) {
         return (from <= a && a <= to) ? 1 : 0;
       }
@@ -440,7 +430,7 @@
    */
   public static UnaryFunction bindArg1(final BinaryFunction function, final double c) {
     return new UnaryFunction() {
-      @Override
+
       public double apply(double var) {
         return function.apply(c, var);
       }
@@ -456,7 +446,7 @@
    */
   public static UnaryFunction bindArg2(final BinaryFunction function, final double c) {
     return new UnaryFunction() {
-      @Override
+
       public double apply(double var) {
         return function.apply(var, c);
       }
@@ -474,7 +464,7 @@
   public static BinaryFunction chain(final BinaryFunction f, final UnaryFunction g,
                                            final UnaryFunction h) {
     return new BinaryFunction() {
-      @Override
+
       public double apply(double a, double b) {
         return f.apply(g.apply(a), h.apply(b));
       }
@@ -490,7 +480,7 @@
    */
   public static BinaryFunction chain(final UnaryFunction g, final BinaryFunction h) {
     return new BinaryFunction() {
-      @Override
+
       public double apply(double a, double b) {
         return g.apply(h.apply(a, b));
       }
@@ -506,7 +496,7 @@
    */
   public static UnaryFunction chain(final UnaryFunction g, final UnaryFunction h) {
     return new UnaryFunction() {
-      @Override
+
       public double apply(double a) {
         return g.apply(h.apply(a));
       }
@@ -519,7 +509,7 @@
    */
   public static UnaryFunction compare(final double b) {
     return new UnaryFunction() {
-      @Override
+
       public double apply(double a) {
         return a < b ? -1 : a > b ? 1 : 0;
       }
@@ -529,7 +519,7 @@
   /** Constructs a function that returns the constant <tt>c</tt>. */
   public static UnaryFunction constant(final double c) {
     return new UnaryFunction() {
-      @Override
+
       public double apply(double a) {
         return c;
       }
@@ -545,7 +535,7 @@
   /** Constructs a function that returns <tt>a == b ? 1 : 0</tt>. <tt>a</tt> is a variable, <tt>b</tt> is fixed. */
   public static UnaryFunction equals(final double b) {
     return new UnaryFunction() {
-      @Override
+
       public double apply(double a) {
         return a == b ? 1 : 0;
       }
@@ -555,7 +545,7 @@
   /** Constructs a function that returns <tt>a > b ? 1 : 0</tt>. <tt>a</tt> is a variable, <tt>b</tt> is fixed. */
   public static UnaryFunction greater(final double b) {
     return new UnaryFunction() {
-      @Override
+
       public double apply(double a) {
         return a > b ? 1 : 0;
       }
@@ -568,7 +558,7 @@
    */
   public static UnaryFunction IEEEremainder(final double b) {
     return new UnaryFunction() {
-      @Override
+
       public double apply(double a) {
         return Math.IEEEremainder(a, b);
       }
@@ -581,7 +571,7 @@
    */
   public static DoubleProcedure isBetween(final double from, final double to) {
     return new DoubleProcedure() {
-      @Override
+
       public boolean apply(double a) {
         return from <= a && a <= to;
       }
@@ -591,7 +581,7 @@
   /** Constructs a function that returns <tt>a == b</tt>. <tt>a</tt> is a variable, <tt>b</tt> is fixed. */
   public static DoubleProcedure isEqual(final double b) {
     return new DoubleProcedure() {
-      @Override
+
       public boolean apply(double a) {
         return a == b;
       }
@@ -601,7 +591,7 @@
   /** Constructs a function that returns <tt>a > b</tt>. <tt>a</tt> is a variable, <tt>b</tt> is fixed. */
   public static DoubleProcedure isGreater(final double b) {
     return new DoubleProcedure() {
-      @Override
+
       public boolean apply(double a) {
         return a > b;
       }
@@ -611,7 +601,7 @@
   /** Constructs a function that returns <tt>a < b</tt>. <tt>a</tt> is a variable, <tt>b</tt> is fixed. */
   public static DoubleProcedure isLess(final double b) {
     return new DoubleProcedure() {
-      @Override
+
       public boolean apply(double a) {
         return a < b;
       }
@@ -621,7 +611,7 @@
   /** Constructs a function that returns <tt>a < b ? 1 : 0</tt>. <tt>a</tt> is a variable, <tt>b</tt> is fixed. */
   public static UnaryFunction less(final double b) {
     return new UnaryFunction() {
-      @Override
+
       public double apply(double a) {
         return a < b ? 1 : 0;
       }
@@ -636,7 +626,7 @@
     return new UnaryFunction() {
       private final double logInv = 1 / Math.log(b); // cached for speed
 
-      @Override
+
       public double apply(double a) {
         return Math.log(a) * logInv;
       }
@@ -646,7 +636,7 @@
   /** Constructs a function that returns <tt>Math.max(a,b)</tt>. <tt>a</tt> is a variable, <tt>b</tt> is fixed. */
   public static UnaryFunction max(final double b) {
     return new UnaryFunction() {
-      @Override
+
       public double apply(double a) {
         return Math.max(a, b);
       }
@@ -656,7 +646,7 @@
   /** Constructs a function that returns <tt>Math.min(a,b)</tt>. <tt>a</tt> is a variable, <tt>b</tt> is fixed. */
   public static UnaryFunction min(final double b) {
     return new UnaryFunction() {
-      @Override
+
       public double apply(double a) {
         return Math.min(a, b);
       }
@@ -679,7 +669,7 @@
   /** Constructs a function that returns <tt>a % b</tt>. <tt>a</tt> is a variable, <tt>b</tt> is fixed. */
   public static UnaryFunction mod(final double b) {
     return new UnaryFunction() {
-      @Override
+
       public double apply(double a) {
         return a % b;
       }
@@ -699,7 +689,7 @@
   /** Constructs a function that returns <tt>a + b</tt>. <tt>a</tt> is a variable, <tt>b</tt> is fixed. */
   public static UnaryFunction plus(final double b) {
     return new UnaryFunction() {
-      @Override
+
       public double apply(double a) {
         return a + b;
       }
@@ -722,7 +712,7 @@
   /** Constructs a function that returns <tt>Math.pow(a,b)</tt>. <tt>a</tt> is a variable, <tt>b</tt> is fixed. */
   public static UnaryFunction pow(final double b) {
     return new UnaryFunction() {
-      @Override
+
       public double apply(double a) {
         return Math.pow(a, b);
       }
@@ -752,7 +742,6 @@
    */
   public static UnaryFunction round(final double precision) {
     return new UnaryFunction() {
-      @Override
       public double apply(double a) {
         return Math.rint(a / precision) * precision;
       }
@@ -768,7 +757,6 @@
    */
   public static BinaryFunction swapArgs(final BinaryFunction function) {
     return new BinaryFunction() {
-      @Override
       public double apply(double a, double b) {
         return function.apply(b, a);
       }

Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/function/Mult.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/function/Mult.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/function/Mult.java (original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/function/Mult.java Tue Feb  9 01:17:44 2010
@@ -8,8 +8,6 @@
 */
 package org.apache.mahout.math.function;
 
-import org.apache.mahout.math.function.UnaryFunction;
-
 /**
  * Only for performance tuning of compute intensive linear algebraic computations.
  * Constructs functions that return one of
@@ -30,7 +28,6 @@
   }
 
   /** Returns the result of the function evaluation. */
-  @Override
   public double apply(double a) {
     return a * multiplicator;
   }

Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/function/PlusMult.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/function/PlusMult.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/function/PlusMult.java (original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/function/PlusMult.java Tue Feb  9 01:17:44 2010
@@ -32,7 +32,6 @@
   }
 
   /** Returns the result of the function evaluation. */
-  @Override
   public double apply(double a, double b) {
     return a + b * multiplicator;
   }

Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/function/SquareRootFunction.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/function/SquareRootFunction.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/function/SquareRootFunction.java (original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/function/SquareRootFunction.java Tue Feb  9 01:17:44 2010
@@ -19,7 +19,6 @@
 
 public class SquareRootFunction implements UnaryFunction {
 
-  @Override
   public double apply(double arg1) {
     return Math.sqrt(arg1);
   }

Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/function/TimesFunction.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/function/TimesFunction.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/function/TimesFunction.java (original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/function/TimesFunction.java Tue Feb  9 01:17:44 2010
@@ -25,7 +25,6 @@
    * @param y second argument
    * @return the product
    */
-  @Override
   public double apply(double x, double y) {
     return x * y;
   }



Mime
View raw message