mahout-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sro...@apache.org
Subject svn commit: r907870 [2/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
Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/math/IntFunctions.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/math/IntFunctions.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/math/IntFunctions.java
(original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/math/IntFunctions.java
Tue Feb  9 01:17:44 2010
@@ -33,7 +33,7 @@
    *****************************/
   /** Function that returns <tt>Math.abs(a) == (a < 0) ? -a : a</tt>. */
   public static final IntFunction abs = new IntFunction() {
-    @Override
+
     public int apply(int a) {
       return (a < 0) ? -a : a;
     }
@@ -41,7 +41,7 @@
 
   /** Function that returns its argument. */
   public static final IntFunction identity = new IntFunction() {
-    @Override
+
     public int apply(int a) {
       return a;
     }
@@ -49,7 +49,7 @@
 
   /** Function that returns <tt>~a</tt>. */
   public static final IntFunction not = new IntFunction() {
-    @Override
+
     public int apply(int a) {
       return ~a;
     }
@@ -57,7 +57,7 @@
 
   /** Function that returns <tt>a < 0 ? -1 : a > 0 ? 1 : 0</tt>. */
   public static final IntFunction sign = new IntFunction() {
-    @Override
+
     public int apply(int a) {
       return a < 0 ? -1 : a > 0 ? 1 : 0;
     }
@@ -65,7 +65,7 @@
 
   /** Function that returns <tt>a * a</tt>. */
   public static final IntFunction square = new IntFunction() {
-    @Override
+
     public int apply(int a) {
       return a * a;
     }
@@ -78,7 +78,7 @@
 
   /** Function that returns <tt>a & b</tt>. */
   public static final IntIntFunction and = new IntIntFunction() {
-    @Override
+
     public int apply(int a, int b) {
       return a & b;
     }
@@ -86,7 +86,7 @@
 
   /** Function that returns <tt>a < b ? -1 : a > b ? 1 : 0</tt>. */
   public static final IntIntFunction compare = new IntIntFunction() {
-    @Override
+
     public int apply(int a, int b) {
       return a < b ? -1 : a > b ? 1 : 0;
     }
@@ -94,7 +94,7 @@
 
   /** Function that returns <tt>a / b</tt>. */
   public static final IntIntFunction div = new IntIntFunction() {
-    @Override
+
     public int apply(int a, int b) {
       return a / b;
     }
@@ -102,7 +102,7 @@
 
   /** Function that returns <tt>a == b ? 1 : 0</tt>. */
   public static final IntIntFunction equals = new IntIntFunction() {
-    @Override
+
     public int apply(int a, int b) {
       return a == b ? 1 : 0;
     }
@@ -110,7 +110,7 @@
 
   /** Function that returns <tt>Math.max(a,b)</tt>. */
   public static final IntIntFunction max = new IntIntFunction() {
-    @Override
+
     public int apply(int a, int b) {
       return (a >= b) ? a : b;
     }
@@ -118,7 +118,7 @@
 
   /** Function that returns <tt>Math.min(a,b)</tt>. */
   public static final IntIntFunction min = new IntIntFunction() {
-    @Override
+
     public int apply(int a, int b) {
       return (a <= b) ? a : b;
     }
@@ -126,7 +126,7 @@
 
   /** Function that returns <tt>a - b</tt>. */
   public static final IntIntFunction minus = new IntIntFunction() {
-    @Override
+
     public int apply(int a, int b) {
       return a - b;
     }
@@ -134,7 +134,7 @@
 
   /** Function that returns <tt>a * b</tt>. */
   public static final IntIntFunction mult = new IntIntFunction() {
-    @Override
+
     public int apply(int a, int b) {
       return a * b;
     }
@@ -142,7 +142,7 @@
 
   /** Function that returns <tt>a | b</tt>. */
   public static final IntIntFunction or = new IntIntFunction() {
-    @Override
+
     public int apply(int a, int b) {
       return a | b;
     }
@@ -150,7 +150,7 @@
 
   /** Function that returns <tt>a + b</tt>. */
   public static final IntIntFunction plus = new IntIntFunction() {
-    @Override
+
     public int apply(int a, int b) {
       return a + b;
     }
@@ -158,7 +158,7 @@
 
   /** Function that returns <tt>(int) Math.pow(a,b)</tt>. */
   public static final IntIntFunction pow = new IntIntFunction() {
-    @Override
+
     public int apply(int a, int b) {
       return (int) Math.pow(a, b);
     }
@@ -170,7 +170,7 @@
   /** Constructs a function that returns <tt>a & b</tt>. <tt>a</tt>
is a variable, <tt>b</tt> is fixed. */
   public static IntFunction and(final int b) {
     return new IntFunction() {
-      @Override
+
       public int apply(int a) {
         return a & b;
       }
@@ -183,7 +183,7 @@
    */
   public static IntFunction between(final int from, final int to) {
     return new IntFunction() {
-      @Override
+
       public int apply(int a) {
         return (from <= a && a <= to) ? 1 : 0;
       }
@@ -199,7 +199,7 @@
    */
   public static IntFunction chain(final IntFunction g, final IntFunction h) {
     return new IntFunction() {
-      @Override
+
       public int apply(int a) {
         return g.apply(h.apply(a));
       }
@@ -215,7 +215,7 @@
    */
   public static IntIntFunction chain(final IntFunction g, final IntIntFunction h) {
     return new IntIntFunction() {
-      @Override
+
       public int apply(int a, int b) {
         return g.apply(h.apply(a, b));
       }
@@ -232,7 +232,7 @@
    */
   public static IntIntFunction chain(final IntIntFunction f, final IntFunction g, final IntFunction
h) {
     return new IntIntFunction() {
-      @Override
+
       public int apply(int a, int b) {
         return f.apply(g.apply(a), h.apply(b));
       }
@@ -245,7 +245,7 @@
    */
   public static IntFunction compare(final int b) {
     return new IntFunction() {
-      @Override
+
       public int apply(int a) {
         return a < b ? -1 : a > b ? 1 : 0;
       }
@@ -255,7 +255,7 @@
   /** Constructs a function that returns the constant <tt>c</tt>. */
   public static IntFunction constant(final int c) {
     return new IntFunction() {
-      @Override
+
       public int apply(int a) {
         return c;
       }
@@ -265,7 +265,7 @@
   /** Constructs a function that returns <tt>a / b</tt>. <tt>a</tt>
is a variable, <tt>b</tt> is fixed. */
   public static IntFunction div(final int b) {
     return new IntFunction() {
-      @Override
+
       public int apply(int a) {
         return a / b;
       }
@@ -275,7 +275,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 IntFunction equals(final int b) {
     return new IntFunction() {
-      @Override
+
       public int apply(int a) {
         return a == b ? 1 : 0;
       }
@@ -285,7 +285,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 IntFunction max(final int b) {
     return new IntFunction() {
-      @Override
+
       public int apply(int a) {
         return (a >= b) ? a : b;
       }
@@ -295,7 +295,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 IntFunction min(final int b) {
     return new IntFunction() {
-      @Override
+
       public int apply(int a) {
         return (a <= b) ? a : b;
       }
@@ -305,7 +305,7 @@
   /** Constructs a function that returns <tt>a - b</tt>. <tt>a</tt>
is a variable, <tt>b</tt> is fixed. */
   public static IntFunction minus(final int b) {
     return new IntFunction() {
-      @Override
+
       public int apply(int a) {
         return a - b;
       }
@@ -315,7 +315,7 @@
   /** Constructs a function that returns <tt>a * b</tt>. <tt>a</tt>
is a variable, <tt>b</tt> is fixed. */
   public static IntFunction mult(final int b) {
     return new IntFunction() {
-      @Override
+
       public int apply(int a) {
         return a * b;
       }
@@ -325,7 +325,7 @@
   /** Constructs a function that returns <tt>a | b</tt>. <tt>a</tt>
is a variable, <tt>b</tt> is fixed. */
   public static IntFunction or(final int b) {
     return new IntFunction() {
-      @Override
+
       public int apply(int a) {
         return a | b;
       }
@@ -335,7 +335,7 @@
   /** Constructs a function that returns <tt>a + b</tt>. <tt>a</tt>
is a variable, <tt>b</tt> is fixed. */
   public static IntFunction plus(final int b) {
     return new IntFunction() {
-      @Override
+
       public int apply(int a) {
         return a + b;
       }
@@ -345,7 +345,7 @@
   /** Constructs a function that returns <tt>(int) Math.pow(a,b)</tt>. <tt>a</tt>
is a variable, <tt>b</tt> is fixed. */
   public static IntFunction pow(final int b) {
     return new IntFunction() {
-      @Override
+
       public int apply(int a) {
         return (int) Math.pow(a, b);
       }

Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/random/AbstractDistribution.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/random/AbstractDistribution.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/random/AbstractDistribution.java
(original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/random/AbstractDistribution.java
Tue Feb  9 01:17:44 2010
@@ -44,7 +44,6 @@
    * Equivalent to <tt>nextDouble()</tt>. This has the effect that distributions
can now be used as function objects,
    * returning a random number upon function evaluation.
    */
-  @Override
   public double apply(double dummy) {
     return nextDouble();
   }
@@ -53,7 +52,6 @@
    * Equivalent to <tt>nextInt()</tt>. This has the effect that distributions
can now be used as function objects,
    * returning a random number upon function evaluation.
    */
-  @Override
   public int apply(int dummy) {
     return nextInt();
   }

Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/random/engine/RandomEngine.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/random/engine/RandomEngine.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/random/engine/RandomEngine.java
(original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/random/engine/RandomEngine.java
Tue Feb  9 01:17:44 2010
@@ -59,7 +59,6 @@
    * Equivalent to <tt>raw()</tt>. This has the effect that random engines can
now be used as function objects,
    * returning a random number upon function evaluation.
    */
-  @Override
   public double apply(double dummy) {
     return raw();
   }
@@ -68,7 +67,6 @@
    * Equivalent to <tt>nextInt()</tt>. This has the effect that random engines
can now be used as function objects,
    * returning a random number upon function evaluation.
    */
-  @Override
   public int apply(int dummy) {
     return nextInt();
   }

Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/stat/quantile/DoubleQuantileEstimator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/stat/quantile/DoubleQuantileEstimator.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/stat/quantile/DoubleQuantileEstimator.java
(original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/stat/quantile/DoubleQuantileEstimator.java
Tue Feb  9 01:17:44 2010
@@ -33,7 +33,6 @@
    *
    * @param value the value to add.
    */
-  @Override
   public void add(double value) {
     totalElementsFilled++;
     if (!sampleNextElement()) {
@@ -58,7 +57,6 @@
    *
    * @param values the list of which all values shall be added.
    */
-  @Override
   public void addAllOf(DoubleArrayList values) {
     addAllOfFromTo(values, 0, values.size() - 1);
   }
@@ -71,7 +69,6 @@
    * @param from   the index of the first element to be added (inclusive).
    * @param to     the index of the last element to be added (inclusive).
    */
-  @Override
   public void addAllOfFromTo(DoubleArrayList values, int from, int to) {
 
     double[] valuesToAdd = values.elements();
@@ -122,7 +119,6 @@
    * Removes all elements from the receiver.  The receiver will be empty after this call
returns, and its memory
    * requirements will be close to zero.
    */
-  @Override
   public void clear() {
     this.totalElementsFilled = 0;
     this.currentBufferToFill = null;
@@ -175,7 +171,6 @@
    *                  continues.
    * @return <tt>false</tt> if the procedure stopped before all elements where
iterated over, <tt>true</tt> otherwise.
    */
-  @Override
   public boolean forEach(DoubleProcedure procedure) {
     return this.bufferSet.forEach(procedure);
   }
@@ -184,7 +179,6 @@
    * Returns the number of elements currently needed to store all contained elements. This
number usually differs from
    * the results of method <tt>size()</tt>, according to the underlying datastructure.
    */
-  @Override
   public long memory() {
     return bufferSet.memory();
   }
@@ -199,7 +193,6 @@
    * @param element the element to search for.
    * @return the percentage <tt>p</tt> of elements <tt>&lt;= element</tt>
(<tt>0.0 &lt;= p &lt;=1.0)</tt>.
    */
-  @Override
   public double phi(double element) {
     return bufferSet.phi(element);
   }
@@ -219,7 +212,6 @@
    *             <tt>phis</tt> must be sorted ascending.
    * @return the approximate quantile elements.
    */
-  @Override
   public DoubleArrayList quantileElements(DoubleArrayList phis) {
 
     phis = preProcessPhis(phis);
@@ -254,7 +246,6 @@
    * Returns the number of elements currently contained in the receiver (identical to the
number of values added so
    * far).
    */
-  @Override
   public long size() {
     return totalElementsFilled;
   }

Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/stat/quantile/ExactDoubleQuantileFinder.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/stat/quantile/ExactDoubleQuantileFinder.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/stat/quantile/ExactDoubleQuantileFinder.java
(original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/stat/quantile/ExactDoubleQuantileFinder.java
Tue Feb  9 01:17:44 2010
@@ -34,7 +34,6 @@
    *
    * @param value the value to add.
    */
-  @Override
   public void add(double value) {
     this.buffer.add(value);
     this.isSorted = false;
@@ -45,7 +44,6 @@
    *
    * @param values the list of which all values shall be added.
    */
-  @Override
   public void addAllOf(DoubleArrayList values) {
     addAllOfFromTo(values, 0, values.size() - 1);
   }
@@ -58,7 +56,6 @@
    * @param from   the index of the first element to be added (inclusive).
    * @param to     the index of the last element to be added (inclusive).
    */
-  @Override
   public void addAllOfFromTo(DoubleArrayList values, int from, int to) {
     buffer.addAllOfFromTo(values, from, to);
     this.isSorted = false;
@@ -68,7 +65,6 @@
    * Removes all elements from the receiver.  The receiver will be empty after this call
returns, and its memory
    * requirements will be close to zero.
    */
-  @Override
   public void clear() {
     this.buffer.clear();
     this.buffer.trimToSize();
@@ -102,7 +98,6 @@
    *                  continues.
    * @return <tt>false</tt> if the procedure stopped before all elements where
iterated over, <tt>true</tt> otherwise.
    */
-  @Override
   public boolean forEach(DoubleProcedure procedure) {
     double[] theElements = buffer.elements();
     int theSize = (int) size();
@@ -119,7 +114,6 @@
    * Returns the number of elements currently needed to store all contained elements. This
number usually differs from
    * the results of method <tt>size()</tt>, according to the underlying datastructure.
    */
-  @Override
   public long memory() {
     return buffer.elements().length;
   }
@@ -131,7 +125,6 @@
    * @param element the element to search for.
    * @return the percentage <tt>p</tt> of elements <tt>&lt;= element</tt>
(<tt>0.0 &lt;= p &lt;=1.0)</tt>.
    */
-  @Override
   public double phi(double element) {
     this.sort();
     return org.apache.mahout.math.jet.stat.Descriptive.rankInterpolated(buffer, element)
/ this.size();
@@ -144,7 +137,6 @@
    *             <tt>phis</tt> must be sorted ascending.
    * @return the exact quantile elements.
    */
-  @Override
   public DoubleArrayList quantileElements(DoubleArrayList phis) {
     this.sort();
     return org.apache.mahout.math.jet.stat.Descriptive.quantiles(this.buffer, phis);
@@ -154,7 +146,6 @@
    * Returns the number of elements currently contained in the receiver (identical to the
number of values added so
    * far).
    */
-  @Override
   public long size() {
     return buffer.size();
   }

Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/stat/quantile/UnknownDoubleQuantileEstimator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/stat/quantile/UnknownDoubleQuantileEstimator.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/stat/quantile/UnknownDoubleQuantileEstimator.java
(original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/stat/quantile/UnknownDoubleQuantileEstimator.java
Tue Feb  9 01:17:44 2010
@@ -186,7 +186,6 @@
   private static void sortAscendingByLevel(DoubleBuffer[] fullBuffers) {
     Sorting.quickSort(fullBuffers, 0, fullBuffers.length - 1,
         new Comparator<DoubleBuffer>() {
-          @Override
           public int compare(DoubleBuffer o1, DoubleBuffer o2) {
             int l1 = o1.level();
             int l2 = o2.level();

Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/doublealgo/Partitioning.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/doublealgo/Partitioning.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/doublealgo/Partitioning.java
(original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/doublealgo/Partitioning.java
Tue Feb  9 01:17:44 2010
@@ -73,7 +73,6 @@
     // this one knows how to swap two row indexes (a,b)
     final int[] g = rowIndexes;
     Swapper swapper = new Swapper() {
-      @Override
       public void swap(int b, int c) {
         int tmp = g[b];
         g[b] = g[c];
@@ -84,7 +83,6 @@
     // compare splitter[a] with columnView[rowIndexes[b]]
     final DoubleMatrix1D columnView = matrix.viewColumn(column);
     IntComparator comp = new IntComparator() {
-      @Override
       public int compare(int a, int b) {
         double av = splitters[a];
         double bv = columnView.getQuick(g[b]);
@@ -94,7 +92,6 @@
 
     // compare columnView[rowIndexes[a]] with columnView[rowIndexes[b]]
     IntComparator comp2 = new IntComparator() {
-      @Override
       public int compare(int a, int b) {
         double av = columnView.getQuick(g[a]);
         double bv = columnView.getQuick(g[b]);
@@ -104,7 +101,6 @@
 
     // compare splitter[a] with splitter[b]
     IntComparator comp3 = new IntComparator() {
-      @Override
       public int compare(int a, int b) {
         double av = splitters[a];
         double bv = splitters[b];

Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/doublealgo/Sorting.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/doublealgo/Sorting.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/doublealgo/Sorting.java
(original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/doublealgo/Sorting.java
Tue Feb  9 01:17:44 2010
@@ -96,7 +96,6 @@
     }
 
     IntComparator comp = new IntComparator() {
-      @Override
       public int compare(int a, int b) {
         double av = vector.getQuick(a);
         double bv = vector.getQuick(b);
@@ -139,7 +138,6 @@
     }
 
     IntComparator comp = new IntComparator() {
-      @Override
       public int compare(int a, int b) {
         return c.compare(vector.getQuick(a), vector.getQuick(b));
       }
@@ -208,7 +206,6 @@
 
     // compares two aggregates at a time
     IntComparator comp = new IntComparator() {
-      @Override
       public int compare(int x, int y) {
         double a = aggregates[x];
         double b = aggregates[y];
@@ -220,7 +217,6 @@
     };
     // swaps aggregates and reorders indexes
     Swapper swapper = new Swapper() {
-      @Override
       public void swap(int x, int y) {
         int t1 = indexes[x];
         indexes[x] = indexes[y];
@@ -267,7 +263,6 @@
 
     final DoubleMatrix1D col = matrix.viewColumn(column);
     IntComparator comp = new IntComparator() {
-      @Override
       public int compare(int a, int b) {
         double av = col.getQuick(a);
         double bv = col.getQuick(b);
@@ -319,7 +314,6 @@
     }
 
     IntComparator comp = new IntComparator() {
-      @Override
       public int compare(int a, int b) {
         //return c.compare(matrix.viewRow(a), matrix.viewRow(b));
         return c.compare(views[a], views[b]);
@@ -445,7 +439,6 @@
 
     final DoubleMatrix1D sliceView = matrix.viewRow(row).viewColumn(column);
     IntComparator comp = new IntComparator() {
-      @Override
       public int compare(int a, int b) {
         double av = sliceView.getQuick(a);
         double bv = sliceView.getQuick(b);
@@ -497,7 +490,6 @@
     }
 
     IntComparator comp = new IntComparator() {
-      @Override
       public int compare(int a, int b) {
         //return c.compare(matrix.viewSlice(a), matrix.viewSlice(b));
         return c.compare(views[a], views[b]);

Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/doublealgo/Statistic.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/doublealgo/Statistic.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/doublealgo/Statistic.java
(original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/doublealgo/Statistic.java
Tue Feb  9 01:17:44 2010
@@ -24,7 +24,6 @@
 
   /** Euclidean distance function; <tt>Sqrt(Sum( (x[i]-y[i])^2 ))</tt>. */
   public static final VectorVectorFunction EUCLID = new VectorVectorFunction() {
-    @Override
     public double apply(DoubleMatrix1D a, DoubleMatrix1D b) {
       return Math.sqrt(a.aggregate(b, Functions.plus, Functions.chain(Functions.square, Functions.minus)));
     }
@@ -32,7 +31,6 @@
 
   /** Bray-Curtis distance function; <tt>Sum( abs(x[i]-y[i]) )  /  Sum( x[i]+y[i] )</tt>.
*/
   public static final VectorVectorFunction BRAY_CURTIS = new VectorVectorFunction() {
-    @Override
     public double apply(DoubleMatrix1D a, DoubleMatrix1D b) {
       return a.aggregate(b, Functions.plus, Functions.chain(Functions.abs, Functions.minus))
/
           a.aggregate(b, Functions.plus, Functions.plus);
@@ -42,13 +40,11 @@
   /** Canberra distance function; <tt>Sum( abs(x[i]-y[i]) / abs(x[i]+y[i]) )</tt>.
*/
   public static final VectorVectorFunction CANBERRA = new VectorVectorFunction() {
     private final BinaryFunction fun = new BinaryFunction() {
-      @Override
       public double apply(double a, double b) {
         return Math.abs(a - b) / Math.abs(a + b);
       }
     };
 
-    @Override
     public double apply(DoubleMatrix1D a, DoubleMatrix1D b) {
       return a.aggregate(b, Functions.plus, fun);
     }
@@ -56,7 +52,6 @@
 
   /** Maximum distance function; <tt>Max( abs(x[i]-y[i]) )</tt>. */
   public static final VectorVectorFunction MAXIMUM = new VectorVectorFunction() {
-    @Override
     public double apply(DoubleMatrix1D a, DoubleMatrix1D b) {
       return a.aggregate(b, Functions.max, Functions.chain(Functions.abs, Functions.minus));
     }
@@ -64,7 +59,6 @@
 
   /** Manhattan distance function; <tt>Sum( abs(x[i]-y[i]) )</tt>. */
   public static final VectorVectorFunction MANHATTAN = new VectorVectorFunction() {
-    @Override
     public double apply(DoubleMatrix1D a, DoubleMatrix1D b) {
       return a.aggregate(b, Functions.plus, Functions.chain(Functions.abs, Functions.minus));
     }

Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/FormerFactory.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/FormerFactory.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/FormerFactory.java
(original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/FormerFactory.java
Tue Feb  9 01:17:44 2010
@@ -35,7 +35,6 @@
    */
   public Former create(String format) {
     return new Former() {
-      @Override
       public String form(double value) {
         return String.valueOf(value);
       }

Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/RCDoubleMatrix2D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/RCDoubleMatrix2D.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/RCDoubleMatrix2D.java
(original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/RCDoubleMatrix2D.java
Tue Feb  9 01:17:44 2010
@@ -145,7 +145,6 @@
       assign(0);
       source.forEachNonZero(
           new IntIntDoubleFunction() {
-            @Override
             public double apply(int i, int j, double value) {
               setQuick(i, j, value);
               return value;
@@ -196,7 +195,6 @@
       } // nothing to do
       y.forEachNonZero(
           new IntIntDoubleFunction() {
-            @Override
             public double apply(int i, int j, double value) {
               setQuick(i, j, getQuick(i, j) + alpha * value);
               return value;

Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/SparseDoubleMatrix2D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/SparseDoubleMatrix2D.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/SparseDoubleMatrix2D.java
(original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/SparseDoubleMatrix2D.java
Tue Feb  9 01:17:44 2010
@@ -187,7 +187,6 @@
       } // nothing to do
       y.forEachNonZero(
           new IntIntDoubleFunction() {
-            @Override
             public double apply(int i, int j, double value) {
               setQuick(i, j, getQuick(i, j) + alpha * value);
               return value;
@@ -200,7 +199,6 @@
     if (function == Functions.mult) { // x[i] = x[i] * y[i]
       this.elements.forEachPair(
           new IntDoubleProcedure() {
-            @Override
             public boolean apply(int key, double value) {
               int i = key / columns;
               int j = key % columns;
@@ -217,7 +215,6 @@
     if (function == Functions.div) { // x[i] = x[i] / y[i]
       this.elements.forEachPair(
           new IntDoubleProcedure() {
-            @Override
             public boolean apply(int key, double value) {
               int i = key / columns;
               int j = key % columns;
@@ -263,7 +260,6 @@
     if (this.isNoView) {
       this.elements.forEachPair(
           new IntDoubleProcedure() {
-            @Override
             public boolean apply(int key, double value) {
               int i = key / columns;
               int j = key % columns;
@@ -474,7 +470,6 @@
 
     this.elements.forEachPair(
         new IntDoubleProcedure() {
-          @Override
           public boolean apply(int key, double value) {
             int i = key / columns;
             int j = key % columns;
@@ -547,7 +542,6 @@
 
     this.elements.forEachPair(
         new IntDoubleProcedure() {
-          @Override
           public boolean apply(int key, double value) {
             int i = key / columns;
             int j = key % columns;

Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/TridiagonalDoubleMatrix2D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/TridiagonalDoubleMatrix2D.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/TridiagonalDoubleMatrix2D.java
(original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/impl/TridiagonalDoubleMatrix2D.java
Tue Feb  9 01:17:44 2010
@@ -128,7 +128,6 @@
 
       forEachNonZero(
           new IntIntDoubleFunction() {
-            @Override
             public double apply(int i, int j, double value) {
               return function.apply(value);
             }
@@ -171,7 +170,6 @@
       assign(0);
       source.forEachNonZero(
           new IntIntDoubleFunction() {
-            @Override
             public double apply(int i, int j, double value) {
               setQuick(i, j, value);
               return value;
@@ -196,7 +194,6 @@
       } // nothing to do
       y.forEachNonZero(
           new IntIntDoubleFunction() {
-            @Override
             public double apply(int i, int j, double value) {
               setQuick(i, j, getQuick(i, j) + alpha * value);
               return value;
@@ -209,7 +206,6 @@
     if (function == Functions.mult) { // x[i] = x[i] * y[i]
       forEachNonZero(
           new IntIntDoubleFunction() {
-            @Override
             public double apply(int i, int j, double value) {
               setQuick(i, j, getQuick(i, j) * y.getQuick(i, j));
               return value;
@@ -222,7 +218,6 @@
     if (function == Functions.div) { // x[i] = x[i] / y[i]
       forEachNonZero(
           new IntIntDoubleFunction() {
-            @Override
             public double apply(int i, int j, double value) {
               setQuick(i, j, getQuick(i, j) / y.getQuick(i, j));
               return value;
@@ -443,7 +438,6 @@
 
     forEachNonZero(
         new IntIntDoubleFunction() {
-          @Override
           public double apply(int i, int j, double value) {
             if (transposeA) {
               int tmp = i;
@@ -511,7 +505,6 @@
 
     forEachNonZero(
         new IntIntDoubleFunction() {
-          @Override
           public double apply(int i, int j, double value) {
             fun.setMultiplicator(value * alpha);
             if (!transposeA) {

Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/Algebra.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/Algebra.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/Algebra.java
(original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/Algebra.java
Tue Feb  9 01:17:44 2010
@@ -124,7 +124,6 @@
   /** Returns sqrt(a^2 + b^2) without under/overflow. */
   private static BinaryFunction hypotFunction() {
     return new BinaryFunction() {
-      @Override
       public double apply(double a, double b) {
         return hypot(a, b);
       }
@@ -407,7 +406,6 @@
     }
 
     Swapper swapper = new Swapper() {
-      @Override
       public void swap(int a, int b) {
         A.viewRow(a).swap(A.viewRow(b));
       }
@@ -723,13 +721,11 @@
 
     // sort ascending by property name
     IntComparator comp = new IntComparator() {
-      @Override
       public int compare(int a, int b) {
         return Property.get(names, a).compareTo(Property.get(names, b));
       }
     };
     Swapper swapper = new Swapper() {
-      @Override
       public void swap(int a, int b) {
         String tmp = names.get(a);
         names.set(a, names.get(b));

Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/Property.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/Property.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/Property.java
(original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/Property.java
Tue Feb  9 01:17:44 2010
@@ -1050,13 +1050,11 @@
 
     // sort ascending by property name
     IntComparator comp = new IntComparator() {
-      @Override
       public int compare(int a, int b) {
         return get(names, a).compareTo(get(names, b));
       }
     };
     Swapper swapper = new Swapper() {
-      @Override
       public void swap(int a, int b) {
         String tmp = names.get(a);
         names.set(a, names.get(b));

Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/SeqBlas.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/SeqBlas.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/SeqBlas.java
(original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/SeqBlas.java
Tue Feb  9 01:17:44 2010
@@ -25,60 +25,49 @@
   private SeqBlas() {
   }
 
-  @Override
   public void assign(DoubleMatrix2D A, UnaryFunction function) {
     A.assign(function);
   }
 
-  @Override
   public void assign(DoubleMatrix2D A, DoubleMatrix2D B,
                      BinaryFunction function) {
     A.assign(B, function);
   }
 
-  @Override
   public double dasum(DoubleMatrix1D x) {
     return x.aggregate(Functions.plus, Functions.abs);
   }
 
-  @Override
   public void daxpy(double alpha, DoubleMatrix1D x, DoubleMatrix1D y) {
     y.assign(x, Functions.plusMult(alpha));
   }
 
-  @Override
   public void daxpy(double alpha, DoubleMatrix2D A, DoubleMatrix2D B) {
     B.assign(A, Functions.plusMult(alpha));
   }
 
-  @Override
   public void dcopy(DoubleMatrix1D x, DoubleMatrix1D y) {
     y.assign(x);
   }
 
-  @Override
   public void dcopy(DoubleMatrix2D A, DoubleMatrix2D B) {
     B.assign(A);
   }
 
-  @Override
   public double ddot(DoubleMatrix1D x, DoubleMatrix1D y) {
     return x.zDotProduct(y);
   }
 
-  @Override
   public void dgemm(boolean transposeA, boolean transposeB, double alpha, DoubleMatrix2D
A, DoubleMatrix2D B,
                     double beta, DoubleMatrix2D C) {
     A.zMult(B, C, alpha, beta, transposeA, transposeB);
   }
 
-  @Override
   public void dgemv(boolean transposeA, double alpha, DoubleMatrix2D A, DoubleMatrix1D x,
double beta,
                     DoubleMatrix1D y) {
     A.zMult(x, y, alpha, beta, transposeA);
   }
 
-  @Override
   public void dger(double alpha, DoubleMatrix1D x, DoubleMatrix1D y, DoubleMatrix2D A) {
     PlusMult fun = PlusMult.plusMult(0);
     for (int i = A.rows(); --i >= 0;) {
@@ -88,12 +77,10 @@
     }
   }
 
-  @Override
   public double dnrm2(DoubleMatrix1D x) {
     return Math.sqrt(Algebra.DEFAULT.norm2(x));
   }
 
-  @Override
   public void drot(DoubleMatrix1D x, DoubleMatrix1D y, double c, double s) {
     x.checkSize(y);
     DoubleMatrix1D tmp = x.copy();
@@ -105,7 +92,6 @@
     y.assign(tmp, Functions.minusMult(s));
   }
 
-  @Override
   public void drotg(double a, double b, double[] rotvec) {
 
     double roe = b;
@@ -155,22 +141,18 @@
 
   }
 
-  @Override
   public void dscal(double alpha, DoubleMatrix1D x) {
     x.assign(Functions.mult(alpha));
   }
 
-  @Override
   public void dscal(double alpha, DoubleMatrix2D A) {
     A.assign(Functions.mult(alpha));
   }
 
-  @Override
   public void dswap(DoubleMatrix1D x, DoubleMatrix1D y) {
     y.swap(x);
   }
 
-  @Override
   public void dswap(DoubleMatrix2D A, DoubleMatrix2D B) {
     //B.swap(A); not yet implemented
     A.checkShape(B);
@@ -179,7 +161,6 @@
     }
   }
 
-  @Override
   public void dsymv(boolean isUpperTriangular, double alpha, DoubleMatrix2D A, DoubleMatrix1D
x, double beta,
                     DoubleMatrix1D y) {
     if (isUpperTriangular) {
@@ -204,7 +185,6 @@
     y.assign(tmp);
   }
 
-  @Override
   public void dtrmv(boolean isUpperTriangular, boolean transposeA, boolean isUnitTriangular,
DoubleMatrix2D A,
                     DoubleMatrix1D x) {
     if (transposeA) {
@@ -246,7 +226,6 @@
     x.assign(b);
   }
 
-  @Override
   public int idamax(DoubleMatrix1D x) {
     int maxIndex = -1;
     double maxValue = Double.MIN_VALUE;

Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/SmpBlas.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/SmpBlas.java?rev=907870&r1=907869&r2=907870&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/SmpBlas.java
(original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/SmpBlas.java
Tue Feb  9 01:17:44 2010
@@ -68,11 +68,9 @@
     }
   }
 
-  @Override
   public void assign(DoubleMatrix2D A, final UnaryFunction function) {
     run(A, false,
         new Matrix2DMatrix2DFunction() {
-          @Override
           public double apply(DoubleMatrix2D AA, DoubleMatrix2D BB) {
             seqBlas.assign(AA, function);
             return 0;
@@ -81,12 +79,10 @@
     );
   }
 
-  @Override
   public void assign(DoubleMatrix2D A, DoubleMatrix2D B,
                      final BinaryFunction function) {
     run(A, B, false,
         new Matrix2DMatrix2DFunction() {
-          @Override
           public double apply(DoubleMatrix2D AA, DoubleMatrix2D BB) {
             seqBlas.assign(AA, BB, function);
             return 0;
@@ -95,37 +91,30 @@
     );
   }
 
-  @Override
   public double dasum(DoubleMatrix1D x) {
     return seqBlas.dasum(x);
   }
 
-  @Override
   public void daxpy(double alpha, DoubleMatrix1D x, DoubleMatrix1D y) {
     seqBlas.daxpy(alpha, x, y);
   }
 
-  @Override
   public void daxpy(double alpha, DoubleMatrix2D A, DoubleMatrix2D B) {
     seqBlas.daxpy(alpha, A, B);
   }
 
-  @Override
   public void dcopy(DoubleMatrix1D x, DoubleMatrix1D y) {
     seqBlas.dcopy(x, y);
   }
 
-  @Override
   public void dcopy(DoubleMatrix2D A, DoubleMatrix2D B) {
     seqBlas.dcopy(A, B);
   }
 
-  @Override
   public double ddot(DoubleMatrix1D x, DoubleMatrix1D y) {
     return seqBlas.ddot(x, y);
   }
 
-  @Override
   public void dgemm(final boolean transposeA, final boolean transposeB, final double alpha,
DoubleMatrix2D A,
                     DoubleMatrix2D B, final double beta, DoubleMatrix2D C) {
     /*
@@ -236,7 +225,6 @@
     }
   }
 
-  @Override
   public void dgemv(final boolean transposeA, final double alpha, DoubleMatrix2D A, final
DoubleMatrix1D x,
                     final double beta, DoubleMatrix1D y) {
     /*
@@ -306,59 +294,48 @@
     }
   }
 
-  @Override
   public void dger(double alpha, DoubleMatrix1D x, DoubleMatrix1D y, DoubleMatrix2D A) {
     seqBlas.dger(alpha, x, y, A);
   }
 
-  @Override
   public double dnrm2(DoubleMatrix1D x) {
     return seqBlas.dnrm2(x);
   }
 
-  @Override
   public void drot(DoubleMatrix1D x, DoubleMatrix1D y, double c, double s) {
     seqBlas.drot(x, y, c, s);
   }
 
-  @Override
   public void drotg(double a, double b, double[] rotvec) {
     seqBlas.drotg(a, b, rotvec);
   }
 
-  @Override
   public void dscal(double alpha, DoubleMatrix1D x) {
     seqBlas.dscal(alpha, x);
   }
 
-  @Override
   public void dscal(double alpha, DoubleMatrix2D A) {
     seqBlas.dscal(alpha, A);
   }
 
-  @Override
   public void dswap(DoubleMatrix1D x, DoubleMatrix1D y) {
     seqBlas.dswap(x, y);
   }
 
-  @Override
   public void dswap(DoubleMatrix2D A, DoubleMatrix2D B) {
     seqBlas.dswap(A, B);
   }
 
-  @Override
   public void dsymv(boolean isUpperTriangular, double alpha, DoubleMatrix2D A, DoubleMatrix1D
x, double beta,
                     DoubleMatrix1D y) {
     seqBlas.dsymv(isUpperTriangular, alpha, A, x, beta, y);
   }
 
-  @Override
   public void dtrmv(boolean isUpperTriangular, boolean transposeA, boolean isUnitTriangular,
DoubleMatrix2D A,
                     DoubleMatrix1D x) {
     seqBlas.dtrmv(isUpperTriangular, transposeA, isUnitTriangular, A, x);
   }
 
-  @Override
   public int idamax(DoubleMatrix1D x) {
     return seqBlas.idamax(x);
   }



Mime
View raw message