You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by gs...@apache.org on 2009/11/23 17:35:07 UTC
svn commit: r883399 [2/7] - in /lucene/mahout/trunk/matrix: ./
src/main/java/org/apache/mahout/jet/math/
src/main/java/org/apache/mahout/jet/random/
src/main/java/org/apache/mahout/jet/random/engine/
src/main/java/org/apache/mahout/jet/random/sampling/...
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/VectorView.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/VectorView.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/VectorView.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/VectorView.java Mon Nov 23 16:34:55 2009
@@ -117,6 +117,11 @@
}
@Override
+ public java.util.Iterator<Vector.Element> iterateNonZero(boolean sorted) {
+ return new NonZeroIterator();
+ }
+
+ @Override
public java.util.Iterator<Vector.Element> iterateAll() {
return new AllIterator();
}
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/bitvector/BitMatrix.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/bitvector/BitMatrix.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/bitvector/BitMatrix.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/bitvector/BitMatrix.java Mon Nov 23 16:34:55 2009
@@ -6,7 +6,9 @@
CERN makes no representations about the suitability of this software for any purpose.
It is provided "as is" without expressed or implied warranty.
*/
-package org.apache.mahout.colt.bitvector;
+package org.apache.mahout.matrix.bitvector;
+
+import org.apache.mahout.matrix.PersistentObject;
import java.awt.Rectangle;
/**
@@ -39,7 +41,7 @@
* @deprecated until unit tests are in place. Until this time, this class/interface is unsupported.
*/
@Deprecated
-public class BitMatrix extends org.apache.mahout.colt.PersistentObject {
+public class BitMatrix extends PersistentObject {
protected int columns;
protected int rows;
@@ -190,13 +192,13 @@
* @param procedure a procedure object taking as first argument the current column and as second argument the current row. Stops iteration if the procedure returns <tt>false</tt>, otherwise continues.
* @return <tt>false</tt> if the procedure stopped before all elements where iterated over, <tt>true</tt> otherwise.
*/
-public boolean forEachCoordinateInState(boolean state, final org.apache.mahout.colt.function.IntIntProcedure procedure) {
+public boolean forEachCoordinateInState(boolean state, final org.apache.mahout.matrix.function.IntIntProcedure procedure) {
/*
this is equivalent to the low level version below, apart from that it iterates in the reverse oder and is slower.
if (size()==0) return true;
BitVector vector = toBitVector();
return vector.forEachIndexFromToInState(0,size()-1,state,
- new org.apache.mahout.colt.function.IntFunction() {
+ new org.apache.mahout.matrix.function.IntFunction() {
public boolean apply(int index) {
return function.apply(index%columns, index/columns);
}
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/bitvector/BitVector.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/bitvector/BitVector.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/bitvector/BitVector.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/bitvector/BitVector.java Mon Nov 23 16:34:55 2009
@@ -6,7 +6,7 @@
CERN makes no representations about the suitability of this software for any purpose.
It is provided "as is" without expressed or implied warranty.
*/
-package org.apache.mahout.colt.bitvector;
+package org.apache.mahout.matrix.bitvector;
/**
* Fixed sized (non resizable) bitvector.
@@ -52,7 +52,7 @@
* @deprecated until unit tests are in place. Until this time, this class/interface is unsupported.
*/
@Deprecated
-public class BitVector extends org.apache.mahout.colt.PersistentObject {
+public class BitVector extends org.apache.mahout.matrix.PersistentObject {
/*
* Bits are packed into arrays of "units." Currently a unit is a long,
* which consists of 64 bits, requiring 6 address bits. The choice of unit
@@ -71,16 +71,16 @@
protected int nbits; //the size
// IntProcedure for method indexOfFromTo(...)
- private class IndexProcedure implements org.apache.mahout.colt.function.IntProcedure {
+ private class IndexProcedure implements org.apache.mahout.matrix.function.IntProcedure {
private int foundPos = -1;
public boolean apply(int index) {
- foundPos = index;
+ foundPos = index;
return false;
}
}
/**
- * You normally need not use this method. Use this method only if performance is critical.
+ * You normally need not use this method. Use this method only if performance is critical.
* Constructs a bit vector with the given backing bits and size.
* <b>WARNING:</b> For efficiency reasons and to keep memory usage low, <b>the array is not copied</b>.
* So if subsequently you modify the specified array directly via the [] operator, be sure you know what you're doing.
@@ -108,7 +108,7 @@
/**
* Performs a logical <b>AND</b> of the receiver with another bit vector (A = A & B).
* The receiver is modified so that a bit in it has the
- * value <code>true</code> if and only if it already had the
+ * value <code>true</code> if and only if it already had the
* value <code>true</code> and the corresponding bit in the other bit vector
* argument has the value <code>true</code>.
*
@@ -144,13 +144,13 @@
int cardinality=0;
int fullUnits = numberOfFullUnits();
final int bitsPerUnit = QuickBitVector.BITS_PER_UNIT;
-
+
// determine cardinality on full units
final long[] theBits=bits;
for(int i=fullUnits; --i >= 0;) {
long val = theBits[i];
if (val == -1L) { // all bits set?
- cardinality += bitsPerUnit;
+ cardinality += bitsPerUnit;
}
else if (val != 0L) { // more than one bit set?
for (int j=bitsPerUnit; --j >= 0; ) {
@@ -185,7 +185,7 @@
public void clear() {
final long[] theBits = this.bits;
for (int i = theBits.length; --i >= 0 ;) theBits[i] = 0L;
-
+
//new LongArrayList(bits).fillFromToWith(0,size()-1,0L);
}
/**
@@ -199,10 +199,10 @@
QuickBitVector.clear(bits, bitIndex);
}
/**
- * Cloning this <code>BitVector</code> produces a new <code>BitVector</code>
+ * Cloning this <code>BitVector</code> produces a new <code>BitVector</code>
* that is equal to it.
- * The clone of the bit vector is another bit vector that has exactly the
- * same bits set to <code>true</code> as this bit vector and the same
+ * The clone of the bit vector is another bit vector that has exactly the
+ * same bits set to <code>true</code> as this bit vector and the same
* current size, but independent state.
*
* @return a deep copy of this bit vector.
@@ -221,7 +221,7 @@
return (BitVector) clone();
}
/**
- * You normally need not use this method. Use this method only if performance is critical.
+ * You normally need not use this method. Use this method only if performance is critical.
* Returns the bit vector's backing bits.
* <b>WARNING:</b> For efficiency reasons and to keep memory usage low, <b>the array is not copied</b>.
* So if subsequently you modify the returned array directly via the [] operator, be sure you know what you're doing.
@@ -236,7 +236,7 @@
return bits;
}
/**
- * You normally need not use this method. Use this method only if performance is critical.
+ * You normally need not use this method. Use this method only if performance is critical.
* Sets the bit vector's backing bits and size.
* <b>WARNING:</b> For efficiency reasons and to keep memory usage low, <b>the array is not copied</b>.
* So if subsequently you modify the specified array directly via the [] operator, be sure you know what you're doing.
@@ -258,11 +258,11 @@
}
/**
* Compares this object against the specified object.
- * The result is <code>true</code> if and only if the argument is
+ * The result is <code>true</code> if and only if the argument is
* not <code>null</code> and is a <code>BitVector</code> object
- * that has the same size as the receiver and
+ * that has the same size as the receiver and
* the same bits set to <code>true</code> as the receiver.
- * That is, for every nonnegative <code>int</code> index <code>k</code>,
+ * That is, for every nonnegative <code>int</code> index <code>k</code>,
* <pre>((BitVector)obj).get(k) == this.get(k)</pre>
* must be true.
*
@@ -290,8 +290,8 @@
if (get(i) != other.get(i)) return false;
i++;
}
-
- return true;
+
+ return true;
}
/**
* Applies a procedure to each bit index within the specified range that holds a bit in the given state.
@@ -307,11 +307,11 @@
* @param from the leftmost search position, inclusive.
* @param to the rightmost search position, inclusive.
* @param state element to search for.
- * @param procedure a procedure object taking as argument the current bit index. Stops iteration if the procedure returns <tt>false</tt>, otherwise continues.
- * @return <tt>false</tt> if the procedure stopped before all elements where iterated over, <tt>true</tt> otherwise.
+ * @param procedure a procedure object taking as argument the current bit index. Stops iteration if the procedure returns <tt>false</tt>, otherwise continues.
+ * @return <tt>false</tt> if the procedure stopped before all elements where iterated over, <tt>true</tt> otherwise.
* @throws IndexOutOfBoundsException if (<tt>size()>0 && (from<0 || from>to || to>=size())</tt>).
*/
-public boolean forEachIndexFromToInState(int from, int to, boolean state, org.apache.mahout.colt.function.IntProcedure procedure) {
+public boolean forEachIndexFromToInState(int from, int to, boolean state, org.apache.mahout.matrix.function.IntProcedure procedure) {
/*
// this version is equivalent to the low level version below, but about 100 times slower for large ranges.
if (nbits==0) return true;
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/bitvector/QuickBitVector.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/bitvector/QuickBitVector.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/bitvector/QuickBitVector.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/bitvector/QuickBitVector.java Mon Nov 23 16:34:55 2009
@@ -6,7 +6,7 @@
CERN makes no representations about the suitability of this software for any purpose.
It is provided "as is" without expressed or implied warranty.
*/
-package org.apache.mahout.colt.bitvector;
+package org.apache.mahout.matrix.bitvector;
/**
* Implements quick non polymorphic non bounds checking low level bitvector operations.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/DoubleBuffer.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/DoubleBuffer.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/DoubleBuffer.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/DoubleBuffer.java Mon Nov 23 16:34:55 2009
@@ -6,9 +6,9 @@
CERN makes no representations about the suitability of this software for any purpose.
It is provided "as is" without expressed or implied warranty.
*/
-package org.apache.mahout.colt.buffer;
+package org.apache.mahout.matrix.buffer;
-import org.apache.mahout.colt.list.DoubleArrayList;
+import org.apache.mahout.matrix.list.DoubleArrayList;
/**
* Fixed sized (non resizable) streaming buffer connected to a target <tt>DoubleBufferConsumer</tt> to which data is automatically flushed upon buffer overflow.
*
@@ -19,7 +19,7 @@
* @deprecated until unit tests are in place. Until this time, this class/interface is unsupported.
*/
@Deprecated
-public class DoubleBuffer extends org.apache.mahout.colt.PersistentObject implements DoubleBufferConsumer {
+public class DoubleBuffer extends org.apache.mahout.matrix.PersistentObject implements DoubleBufferConsumer {
protected DoubleBufferConsumer target;
protected double[] elements;
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/DoubleBuffer2D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/DoubleBuffer2D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/DoubleBuffer2D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/DoubleBuffer2D.java Mon Nov 23 16:34:55 2009
@@ -6,9 +6,9 @@
CERN makes no representations about the suitability of this software for any purpose.
It is provided "as is" without expressed or implied warranty.
*/
-package org.apache.mahout.colt.buffer;
+package org.apache.mahout.matrix.buffer;
-import org.apache.mahout.colt.list.DoubleArrayList;
+import org.apache.mahout.matrix.list.DoubleArrayList;
/**
* Fixed sized (non resizable) streaming buffer connected to a target <tt>DoubleBuffer2DConsumer</tt> to which data is automatically flushed upon buffer overflow.
*
@@ -19,7 +19,7 @@
* @deprecated until unit tests are in place. Until this time, this class/interface is unsupported.
*/
@Deprecated
-public class DoubleBuffer2D extends org.apache.mahout.colt.PersistentObject implements DoubleBuffer2DConsumer {
+public class DoubleBuffer2D extends org.apache.mahout.matrix.PersistentObject implements DoubleBuffer2DConsumer {
protected DoubleBuffer2DConsumer target;
protected double[] xElements;
protected double[] yElements;
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/DoubleBuffer2DConsumer.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/DoubleBuffer2DConsumer.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/DoubleBuffer2DConsumer.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/DoubleBuffer2DConsumer.java Mon Nov 23 16:34:55 2009
@@ -6,9 +6,9 @@
CERN makes no representations about the suitability of this software for any purpose.
It is provided "as is" without expressed or implied warranty.
*/
-package org.apache.mahout.colt.buffer;
+package org.apache.mahout.matrix.buffer;
-import org.apache.mahout.colt.list.DoubleArrayList;
+import org.apache.mahout.matrix.list.DoubleArrayList;
/**
* Target of a streaming <tt>DoubleBuffer2D</tt> into which data is flushed upon buffer overflow.
*
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/DoubleBuffer3D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/DoubleBuffer3D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/DoubleBuffer3D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/DoubleBuffer3D.java Mon Nov 23 16:34:55 2009
@@ -6,9 +6,9 @@
CERN makes no representations about the suitability of this software for any purpose.
It is provided "as is" without expressed or implied warranty.
*/
-package org.apache.mahout.colt.buffer;
+package org.apache.mahout.matrix.buffer;
-import org.apache.mahout.colt.list.DoubleArrayList;
+import org.apache.mahout.matrix.list.DoubleArrayList;
/**
* Fixed sized (non resizable) streaming buffer connected to a target <tt>DoubleBuffer3DConsumer</tt> to which data is automatically flushed upon buffer overflow.
*
@@ -19,7 +19,7 @@
* @deprecated until unit tests are in place. Until this time, this class/interface is unsupported.
*/
@Deprecated
-public class DoubleBuffer3D extends org.apache.mahout.colt.PersistentObject implements DoubleBuffer3DConsumer {
+public class DoubleBuffer3D extends org.apache.mahout.matrix.PersistentObject implements DoubleBuffer3DConsumer {
protected DoubleBuffer3DConsumer target;
protected double[] xElements;
protected double[] yElements;
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/DoubleBuffer3DConsumer.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/DoubleBuffer3DConsumer.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/DoubleBuffer3DConsumer.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/DoubleBuffer3DConsumer.java Mon Nov 23 16:34:55 2009
@@ -6,9 +6,9 @@
CERN makes no representations about the suitability of this software for any purpose.
It is provided "as is" without expressed or implied warranty.
*/
-package org.apache.mahout.colt.buffer;
+package org.apache.mahout.matrix.buffer;
-import org.apache.mahout.colt.list.DoubleArrayList;
+import org.apache.mahout.matrix.list.DoubleArrayList;
/**
* Target of a streaming <tt>DoubleBuffer3D</tt> into which data is flushed upon buffer overflow.
*
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/DoubleBufferConsumer.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/DoubleBufferConsumer.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/DoubleBufferConsumer.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/DoubleBufferConsumer.java Mon Nov 23 16:34:55 2009
@@ -6,9 +6,9 @@
CERN makes no representations about the suitability of this software for any purpose.
It is provided "as is" without expressed or implied warranty.
*/
-package org.apache.mahout.colt.buffer;
+package org.apache.mahout.matrix.buffer;
-import org.apache.mahout.colt.list.DoubleArrayList;
+import org.apache.mahout.matrix.list.DoubleArrayList;
/**
* Target of a streaming <tt>DoubleBuffer</tt> into which data is flushed upon buffer overflow.
*
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/IntBuffer.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/IntBuffer.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/IntBuffer.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/IntBuffer.java Mon Nov 23 16:34:55 2009
@@ -6,9 +6,9 @@
CERN makes no representations about the suitability of this software for any purpose.
It is provided "as is" without expressed or implied warranty.
*/
-package org.apache.mahout.colt.buffer;
+package org.apache.mahout.matrix.buffer;
-import org.apache.mahout.colt.list.IntArrayList;
+import org.apache.mahout.matrix.list.IntArrayList;
/**
* Fixed sized (non resizable) streaming buffer connected to a target <tt>IntBufferConsumer</tt> to which data is automatically flushed upon buffer overflow.
*
@@ -19,7 +19,7 @@
* @deprecated until unit tests are in place. Until this time, this class/interface is unsupported.
*/
@Deprecated
-public class IntBuffer extends org.apache.mahout.colt.PersistentObject implements IntBufferConsumer {
+public class IntBuffer extends org.apache.mahout.matrix.PersistentObject implements IntBufferConsumer {
protected IntBufferConsumer target;
protected int[] elements;
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/IntBuffer2D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/IntBuffer2D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/IntBuffer2D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/IntBuffer2D.java Mon Nov 23 16:34:55 2009
@@ -6,9 +6,9 @@
CERN makes no representations about the suitability of this software for any purpose.
It is provided "as is" without expressed or implied warranty.
*/
-package org.apache.mahout.colt.buffer;
+package org.apache.mahout.matrix.buffer;
-import org.apache.mahout.colt.list.IntArrayList;
+import org.apache.mahout.matrix.list.IntArrayList;
/**
* Fixed sized (non resizable) streaming buffer connected to a target <tt>IntBuffer2DConsumer</tt> to which data is automatically flushed upon buffer overflow.
*
@@ -19,7 +19,7 @@
* @deprecated until unit tests are in place. Until this time, this class/interface is unsupported.
*/
@Deprecated
-public class IntBuffer2D extends org.apache.mahout.colt.PersistentObject implements IntBuffer2DConsumer {
+public class IntBuffer2D extends org.apache.mahout.matrix.PersistentObject implements IntBuffer2DConsumer {
protected IntBuffer2DConsumer target;
protected int[] xElements;
protected int[] yElements;
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/IntBuffer2DConsumer.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/IntBuffer2DConsumer.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/IntBuffer2DConsumer.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/IntBuffer2DConsumer.java Mon Nov 23 16:34:55 2009
@@ -6,9 +6,9 @@
CERN makes no representations about the suitability of this software for any purpose.
It is provided "as is" without expressed or implied warranty.
*/
-package org.apache.mahout.colt.buffer;
+package org.apache.mahout.matrix.buffer;
-import org.apache.mahout.colt.list.IntArrayList;
+import org.apache.mahout.matrix.list.IntArrayList;
/**
* Target of a streaming <tt>IntBuffer2D</tt> into which data is flushed upon buffer overflow.
*
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/IntBuffer3D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/IntBuffer3D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/IntBuffer3D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/IntBuffer3D.java Mon Nov 23 16:34:55 2009
@@ -6,9 +6,9 @@
CERN makes no representations about the suitability of this software for any purpose.
It is provided "as is" without expressed or implied warranty.
*/
-package org.apache.mahout.colt.buffer;
+package org.apache.mahout.matrix.buffer;
-import org.apache.mahout.colt.list.IntArrayList;
+import org.apache.mahout.matrix.list.IntArrayList;
/**
* Fixed sized (non resizable) streaming buffer connected to a target <tt>IntBuffer3DConsumer</tt> to which data is automatically flushed upon buffer overflow.
*
@@ -19,7 +19,7 @@
* @deprecated until unit tests are in place. Until this time, this class/interface is unsupported.
*/
@Deprecated
-public class IntBuffer3D extends org.apache.mahout.colt.PersistentObject implements IntBuffer3DConsumer {
+public class IntBuffer3D extends org.apache.mahout.matrix.PersistentObject implements IntBuffer3DConsumer {
protected IntBuffer3DConsumer target;
protected int[] xElements;
protected int[] yElements;
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/IntBuffer3DConsumer.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/IntBuffer3DConsumer.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/IntBuffer3DConsumer.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/IntBuffer3DConsumer.java Mon Nov 23 16:34:55 2009
@@ -6,9 +6,9 @@
CERN makes no representations about the suitability of this software for any purpose.
It is provided "as is" without expressed or implied warranty.
*/
-package org.apache.mahout.colt.buffer;
+package org.apache.mahout.matrix.buffer;
-import org.apache.mahout.colt.list.IntArrayList;
+import org.apache.mahout.matrix.list.IntArrayList;
/**
* Target of a streaming <tt>IntBuffer3D</tt> into which data is flushed upon buffer overflow.
*
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/IntBufferConsumer.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/IntBufferConsumer.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/IntBufferConsumer.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/IntBufferConsumer.java Mon Nov 23 16:34:55 2009
@@ -6,9 +6,9 @@
CERN makes no representations about the suitability of this software for any purpose.
It is provided "as is" without expressed or implied warranty.
*/
-package org.apache.mahout.colt.buffer;
+package org.apache.mahout.matrix.buffer;
-import org.apache.mahout.colt.list.IntArrayList;
+import org.apache.mahout.matrix.list.IntArrayList;
/**
* Target of a streaming <tt>IntBuffer</tt> into which data is flushed upon buffer overflow.
*
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/ObjectBuffer.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/ObjectBuffer.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/ObjectBuffer.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/ObjectBuffer.java Mon Nov 23 16:34:55 2009
@@ -6,9 +6,9 @@
CERN makes no representations about the suitability of this software for any purpose.
It is provided "as is" without expressed or implied warranty.
*/
-package org.apache.mahout.colt.buffer;
+package org.apache.mahout.matrix.buffer;
-import org.apache.mahout.colt.list.ObjectArrayList;
+import org.apache.mahout.matrix.list.ObjectArrayList;
/**
* Fixed sized (non resizable) streaming buffer connected to a target <tt>ObjectBufferConsumer</tt> to which data is automatically flushed upon buffer overflow.
*
@@ -19,7 +19,7 @@
* @deprecated until unit tests are in place. Until this time, this class/interface is unsupported.
*/
@Deprecated
-public class ObjectBuffer extends org.apache.mahout.colt.PersistentObject implements ObjectBufferConsumer {
+public class ObjectBuffer extends org.apache.mahout.matrix.PersistentObject implements ObjectBufferConsumer {
protected ObjectBufferConsumer target;
protected Object[] elements;
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/ObjectBufferConsumer.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/ObjectBufferConsumer.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/ObjectBufferConsumer.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/buffer/ObjectBufferConsumer.java Mon Nov 23 16:34:55 2009
@@ -6,9 +6,9 @@
CERN makes no representations about the suitability of this software for any purpose.
It is provided "as is" without expressed or implied warranty.
*/
-package org.apache.mahout.colt.buffer;
+package org.apache.mahout.matrix.buffer;
-import org.apache.mahout.colt.list.ObjectArrayList;
+import org.apache.mahout.matrix.list.ObjectArrayList;
/**
* Target of a streaming <tt>ObjectBuffer</tt> into which data is flushed upon buffer overflow.
*
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/BooleanProcedure.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/BooleanProcedure.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/BooleanProcedure.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/BooleanProcedure.java Mon Nov 23 16:34:55 2009
@@ -1,4 +1,4 @@
-package org.apache.mahout.colt.function;
+package org.apache.mahout.matrix.function;
/*
Copyright 1999 CERN - European Organization for Nuclear Research.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/ByteComparator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/ByteComparator.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/ByteComparator.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/ByteComparator.java Mon Nov 23 16:34:55 2009
@@ -1,4 +1,4 @@
-package org.apache.mahout.colt.function;
+package org.apache.mahout.matrix.function;
/*
Copyright 1999 CERN - European Organization for Nuclear Research.
@@ -11,7 +11,7 @@
/**
* A comparison function which imposes a <i>total ordering</i> on some
* collection of elements. Comparators can be passed to a sort method (such as
- * <tt>org.apache.mahout.colt.Sorting.quickSort</tt>) to allow precise control over the sort order.<p>
+ * <tt>org.apache.mahout.matrix.Sorting.quickSort</tt>) to allow precise control over the sort order.<p>
*
* Note: It is generally a good idea for comparators to implement
* <tt>java.io.Serializable</tt>, as they may be used as ordering methods in
@@ -22,7 +22,7 @@
* @author wolfgang.hoschek@cern.ch
* @version 0.1 01/09/99
* @see java.util.Comparator
- * @see org.apache.mahout.colt.Sorting
+ * @see org.apache.mahout.matrix.Sorting
*/
/**
* @deprecated until unit tests are in place. Until this time, this class/interface is unsupported.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/ByteProcedure.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/ByteProcedure.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/ByteProcedure.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/ByteProcedure.java Mon Nov 23 16:34:55 2009
@@ -1,4 +1,4 @@
-package org.apache.mahout.colt.function;
+package org.apache.mahout.matrix.function;
/*
Copyright 1999 CERN - European Organization for Nuclear Research.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/CharComparator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/CharComparator.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/CharComparator.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/CharComparator.java Mon Nov 23 16:34:55 2009
@@ -1,4 +1,4 @@
-package org.apache.mahout.colt.function;
+package org.apache.mahout.matrix.function;
/*
Copyright 1999 CERN - European Organization for Nuclear Research.
@@ -11,7 +11,7 @@
/**
* A comparison function which imposes a <i>total ordering</i> on some
* collection of elements. Comparators can be passed to a sort method (such as
- * <tt>org.apache.mahout.colt.Sorting.quickSort</tt>) to allow precise control over the sort order.<p>
+ * <tt>org.apache.mahout.matrix.Sorting.quickSort</tt>) to allow precise control over the sort order.<p>
*
* Note: It is generally a good idea for comparators to implement
* <tt>java.io.Serializable</tt>, as they may be used as ordering methods in
@@ -22,7 +22,7 @@
* @author wolfgang.hoschek@cern.ch
* @version 0.1 01/09/99
* @see java.util.Comparator
- * @see org.apache.mahout.colt.Sorting
+ * @see org.apache.mahout.matrix.Sorting
*/
/**
* @deprecated until unit tests are in place. Until this time, this class/interface is unsupported.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/CharProcedure.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/CharProcedure.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/CharProcedure.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/CharProcedure.java Mon Nov 23 16:34:55 2009
@@ -1,4 +1,4 @@
-package org.apache.mahout.colt.function;
+package org.apache.mahout.matrix.function;
/*
Copyright 1999 CERN - European Organization for Nuclear Research.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/Double27Function.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/Double27Function.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/Double27Function.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/Double27Function.java Mon Nov 23 16:34:55 2009
@@ -1,4 +1,4 @@
-package org.apache.mahout.colt.function;
+package org.apache.mahout.matrix.function;
/*
Copyright 1999 CERN - European Organization for Nuclear Research.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/Double5Function.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/Double5Function.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/Double5Function.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/Double5Function.java Mon Nov 23 16:34:55 2009
@@ -1,4 +1,4 @@
-package org.apache.mahout.colt.function;
+package org.apache.mahout.matrix.function;
/*
Copyright 1999 CERN - European Organization for Nuclear Research.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/Double9Function.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/Double9Function.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/Double9Function.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/Double9Function.java Mon Nov 23 16:34:55 2009
@@ -1,4 +1,4 @@
-package org.apache.mahout.colt.function;
+package org.apache.mahout.matrix.function;
/*
Copyright 1999 CERN - European Organization for Nuclear Research.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/DoubleComparator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/DoubleComparator.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/DoubleComparator.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/DoubleComparator.java Mon Nov 23 16:34:55 2009
@@ -1,4 +1,4 @@
-package org.apache.mahout.colt.function;
+package org.apache.mahout.matrix.function;
/*
Copyright 1999 CERN - European Organization for Nuclear Research.
@@ -11,7 +11,7 @@
/**
* A comparison function which imposes a <i>total ordering</i> on some
* collection of elements. Comparators can be passed to a sort method (such as
- * <tt>org.apache.mahout.colt.Sorting.quickSort</tt>) to allow precise control over the sort order.<p>
+ * <tt>org.apache.mahout.matrix.Sorting.quickSort</tt>) to allow precise control over the sort order.<p>
*
* Note: It is generally a good idea for comparators to implement
* <tt>java.io.Serializable</tt>, as they may be used as ordering methods in
@@ -22,7 +22,7 @@
* @author wolfgang.hoschek@cern.ch
* @version 0.1 01/09/99
* @see java.util.Comparator
- * @see org.apache.mahout.colt.Sorting
+ * @see org.apache.mahout.matrix.Sorting
*/
/**
* @deprecated until unit tests are in place. Until this time, this class/interface is unsupported.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/DoubleDoubleFunction.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/DoubleDoubleFunction.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/DoubleDoubleFunction.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/DoubleDoubleFunction.java Mon Nov 23 16:34:55 2009
@@ -1,4 +1,4 @@
-package org.apache.mahout.colt.function;
+package org.apache.mahout.matrix.function;
/*
Copyright 1999 CERN - European Organization for Nuclear Research.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/DoubleDoubleProcedure.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/DoubleDoubleProcedure.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/DoubleDoubleProcedure.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/DoubleDoubleProcedure.java Mon Nov 23 16:34:55 2009
@@ -1,4 +1,4 @@
-package org.apache.mahout.colt.function;
+package org.apache.mahout.matrix.function;
/*
Copyright 1999 CERN - European Organization for Nuclear Research.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/DoubleFunction.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/DoubleFunction.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/DoubleFunction.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/DoubleFunction.java Mon Nov 23 16:34:55 2009
@@ -1,4 +1,4 @@
-package org.apache.mahout.colt.function;
+package org.apache.mahout.matrix.function;
/*
Copyright 1999 CERN - European Organization for Nuclear Research.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/DoubleIntProcedure.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/DoubleIntProcedure.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/DoubleIntProcedure.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/DoubleIntProcedure.java Mon Nov 23 16:34:55 2009
@@ -1,4 +1,4 @@
-package org.apache.mahout.colt.function;
+package org.apache.mahout.matrix.function;
/*
Copyright 1999 CERN - European Organization for Nuclear Research.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/DoubleProcedure.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/DoubleProcedure.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/DoubleProcedure.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/DoubleProcedure.java Mon Nov 23 16:34:55 2009
@@ -1,4 +1,4 @@
-package org.apache.mahout.colt.function;
+package org.apache.mahout.matrix.function;
/*
Copyright 1999 CERN - European Organization for Nuclear Research.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/FloatComparator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/FloatComparator.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/FloatComparator.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/FloatComparator.java Mon Nov 23 16:34:55 2009
@@ -1,4 +1,4 @@
-package org.apache.mahout.colt.function;
+package org.apache.mahout.matrix.function;
/*
Copyright 1999 CERN - European Organization for Nuclear Research.
@@ -11,7 +11,7 @@
/**
* A comparison function which imposes a <i>total ordering</i> on some
* collection of elements. Comparators can be passed to a sort method (such as
- * <tt>org.apache.mahout.colt.Sorting.quickSort</tt>) to allow precise control over the sort order.<p>
+ * <tt>org.apache.mahout.matrix.Sorting.quickSort</tt>) to allow precise control over the sort order.<p>
*
* Note: It is generally a good idea for comparators to implement
* <tt>java.io.Serializable</tt>, as they may be used as ordering methods in
@@ -22,7 +22,7 @@
* @author wolfgang.hoschek@cern.ch
* @version 0.1 01/09/99
* @see java.util.Comparator
- * @see org.apache.mahout.colt.Sorting
+ * @see org.apache.mahout.matrix.Sorting
*/
/**
* @deprecated until unit tests are in place. Until this time, this class/interface is unsupported.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/FloatProcedure.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/FloatProcedure.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/FloatProcedure.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/FloatProcedure.java Mon Nov 23 16:34:55 2009
@@ -1,4 +1,4 @@
-package org.apache.mahout.colt.function;
+package org.apache.mahout.matrix.function;
/*
Copyright 1999 CERN - European Organization for Nuclear Research.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntComparator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntComparator.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntComparator.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntComparator.java Mon Nov 23 16:34:55 2009
@@ -1,4 +1,4 @@
-package org.apache.mahout.colt.function;
+package org.apache.mahout.matrix.function;
/*
Copyright 1999 CERN - European Organization for Nuclear Research.
@@ -11,7 +11,7 @@
/**
* A comparison function which imposes a <i>total ordering</i> on some
* collection of elements. Comparators can be passed to a sort method (such as
- * <tt>org.apache.mahout.colt.Sorting.quickSort</tt>) to allow precise control over the sort order.<p>
+ * <tt>org.apache.mahout.matrix.Sorting.quickSort</tt>) to allow precise control over the sort order.<p>
*
* Note: It is generally a good idea for comparators to implement
* <tt>java.io.Serializable</tt>, as they may be used as ordering methods in
@@ -22,7 +22,7 @@
* @author wolfgang.hoschek@cern.ch
* @version 0.1 01/09/99
* @see java.util.Comparator
- * @see org.apache.mahout.colt.Sorting
+ * @see org.apache.mahout.matrix.Sorting
*/
/**
* @deprecated until unit tests are in place. Until this time, this class/interface is unsupported.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntDoubleFunction.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntDoubleFunction.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntDoubleFunction.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntDoubleFunction.java Mon Nov 23 16:34:55 2009
@@ -6,7 +6,7 @@
CERN makes no representations about the suitability of this software for any purpose.
It is provided "as is" without expressed or implied warranty.
*/
-package org.apache.mahout.colt.function;
+package org.apache.mahout.matrix.function;
/**
* Interface that represents a function object: a function that takes two arguments.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntDoubleProcedure.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntDoubleProcedure.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntDoubleProcedure.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntDoubleProcedure.java Mon Nov 23 16:34:55 2009
@@ -1,4 +1,4 @@
-package org.apache.mahout.colt.function;
+package org.apache.mahout.matrix.function;
/*
Copyright 1999 CERN - European Organization for Nuclear Research.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntFunction.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntFunction.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntFunction.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntFunction.java Mon Nov 23 16:34:55 2009
@@ -1,4 +1,4 @@
-package org.apache.mahout.colt.function;
+package org.apache.mahout.matrix.function;
/*
Copyright 1999 CERN - European Organization for Nuclear Research.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntIntDoubleFunction.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntIntDoubleFunction.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntIntDoubleFunction.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntIntDoubleFunction.java Mon Nov 23 16:34:55 2009
@@ -6,7 +6,7 @@
CERN makes no representations about the suitability of this software for any purpose.
It is provided "as is" without expressed or implied warranty.
*/
-package org.apache.mahout.colt.function;
+package org.apache.mahout.matrix.function;
/**
* Interface that represents a function object: a function that takes three arguments.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntIntDoubleProcedure.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntIntDoubleProcedure.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntIntDoubleProcedure.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntIntDoubleProcedure.java Mon Nov 23 16:34:55 2009
@@ -6,7 +6,7 @@
CERN makes no representations about the suitability of this software for any purpose.
It is provided "as is" without expressed or implied warranty.
*/
-package org.apache.mahout.colt.function;
+package org.apache.mahout.matrix.function;
/**
* Interface that represents a procedure object: a procedure that takes
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntIntFunction.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntIntFunction.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntIntFunction.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntIntFunction.java Mon Nov 23 16:34:55 2009
@@ -1,4 +1,4 @@
-package org.apache.mahout.colt.function;
+package org.apache.mahout.matrix.function;
/*
Copyright 1999 CERN - European Organization for Nuclear Research.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntIntIntProcedure.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntIntIntProcedure.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntIntIntProcedure.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntIntIntProcedure.java Mon Nov 23 16:34:55 2009
@@ -1,4 +1,4 @@
-package org.apache.mahout.colt.function;
+package org.apache.mahout.matrix.function;
/*
Copyright 1999 CERN - European Organization for Nuclear Research.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntIntProcedure.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntIntProcedure.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntIntProcedure.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntIntProcedure.java Mon Nov 23 16:34:55 2009
@@ -1,4 +1,4 @@
-package org.apache.mahout.colt.function;
+package org.apache.mahout.matrix.function;
/*
Copyright 1999 CERN - European Organization for Nuclear Research.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntObjectProcedure.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntObjectProcedure.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntObjectProcedure.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntObjectProcedure.java Mon Nov 23 16:34:55 2009
@@ -1,4 +1,4 @@
-package org.apache.mahout.colt.function;
+package org.apache.mahout.matrix.function;
/*
Copyright 1999 CERN - European Organization for Nuclear Research.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntProcedure.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntProcedure.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntProcedure.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntProcedure.java Mon Nov 23 16:34:55 2009
@@ -1,4 +1,4 @@
-package org.apache.mahout.colt.function;
+package org.apache.mahout.matrix.function;
/*
Copyright 1999 CERN - European Organization for Nuclear Research.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/LongComparator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/LongComparator.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/LongComparator.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/LongComparator.java Mon Nov 23 16:34:55 2009
@@ -1,4 +1,4 @@
-package org.apache.mahout.colt.function;
+package org.apache.mahout.matrix.function;
/*
Copyright 1999 CERN - European Organization for Nuclear Research.
@@ -11,7 +11,7 @@
/**
* A comparison function which imposes a <i>total ordering</i> on some
* collection of elements. Comparators can be passed to a sort method (such as
- * <tt>org.apache.mahout.colt.Sorting.quickSort</tt>) to allow precise control over the sort order.<p>
+ * <tt>org.apache.mahout.matrix.Sorting.quickSort</tt>) to allow precise control over the sort order.<p>
*
* Note: It is generally a good idea for comparators to implement
* <tt>java.io.Serializable</tt>, as they may be used as ordering methods in
@@ -22,7 +22,7 @@
* @author wolfgang.hoschek@cern.ch
* @version 0.1 01/09/99
* @see java.util.Comparator
- * @see org.apache.mahout.colt.Sorting
+ * @see org.apache.mahout.matrix.Sorting
*/
/**
* @deprecated until unit tests are in place. Until this time, this class/interface is unsupported.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/LongObjectProcedure.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/LongObjectProcedure.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/LongObjectProcedure.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/LongObjectProcedure.java Mon Nov 23 16:34:55 2009
@@ -1,4 +1,4 @@
-package org.apache.mahout.colt.function;
+package org.apache.mahout.matrix.function;
/*
Copyright 1999 CERN - European Organization for Nuclear Research.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/LongProcedure.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/LongProcedure.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/LongProcedure.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/LongProcedure.java Mon Nov 23 16:34:55 2009
@@ -1,4 +1,4 @@
-package org.apache.mahout.colt.function;
+package org.apache.mahout.matrix.function;
/*
Copyright 1999 CERN - European Organization for Nuclear Research.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/ObjectFunction.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/ObjectFunction.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/ObjectFunction.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/ObjectFunction.java Mon Nov 23 16:34:55 2009
@@ -1,4 +1,4 @@
-package org.apache.mahout.colt.function;
+package org.apache.mahout.matrix.function;
/*
Copyright 1999 CERN - European Organization for Nuclear Research.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/ObjectObjectFunction.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/ObjectObjectFunction.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/ObjectObjectFunction.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/ObjectObjectFunction.java Mon Nov 23 16:34:55 2009
@@ -1,4 +1,4 @@
-package org.apache.mahout.colt.function;
+package org.apache.mahout.matrix.function;
/*
Copyright 1999 CERN - European Organization for Nuclear Research.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/ObjectProcedure.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/ObjectProcedure.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/ObjectProcedure.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/ObjectProcedure.java Mon Nov 23 16:34:55 2009
@@ -1,4 +1,4 @@
-package org.apache.mahout.colt.function;
+package org.apache.mahout.matrix.function;
/*
Copyright 1999 CERN - European Organization for Nuclear Research.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/ShortComparator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/ShortComparator.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/ShortComparator.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/ShortComparator.java Mon Nov 23 16:34:55 2009
@@ -1,4 +1,4 @@
-package org.apache.mahout.colt.function;
+package org.apache.mahout.matrix.function;
/*
Copyright 1999 CERN - European Organization for Nuclear Research.
@@ -11,7 +11,7 @@
/**
* A comparison function which imposes a <i>total ordering</i> on some
* collection of elements. Comparators can be passed to a sort method (such as
- * <tt>org.apache.mahout.colt.Sorting.quickSort</tt>) to allow precise control over the sort order.<p>
+ * <tt>org.apache.mahout.matrix.Sorting.quickSort</tt>) to allow precise control over the sort order.<p>
*
* Note: It is generally a good idea for comparators to implement
* <tt>java.io.Serializable</tt>, as they may be used as ordering methods in
@@ -22,7 +22,7 @@
* @author wolfgang.hoschek@cern.ch
* @version 0.1 01/09/99
* @see java.util.Comparator
- * @see org.apache.mahout.colt.Sorting
+ * @see org.apache.mahout.matrix.Sorting
*/
/**
* @deprecated until unit tests are in place. Until this time, this class/interface is unsupported.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/ShortProcedure.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/ShortProcedure.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/ShortProcedure.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/ShortProcedure.java Mon Nov 23 16:34:55 2009
@@ -1,4 +1,4 @@
-package org.apache.mahout.colt.function;
+package org.apache.mahout.matrix.function;
/*
Copyright 1999 CERN - European Organization for Nuclear Research.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractBooleanList.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractBooleanList.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractBooleanList.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractBooleanList.java Mon Nov 23 16:34:55 2009
@@ -6,9 +6,9 @@
CERN makes no representations about the suitability of this software for any purpose.
It is provided "as is" without expressed or implied warranty.
*/
-package org.apache.mahout.colt.list;
+package org.apache.mahout.matrix.list;
-import org.apache.mahout.colt.function.BooleanProcedure;
+import org.apache.mahout.matrix.function.BooleanProcedure;
/**
Abstract base class for resizable lists holding <code>boolean</code> elements; abstract.
First see the <a href="package-summary.html">package summary</a> and javadoc <a href="package-tree.html">tree view</a> to get the broad picture.
@@ -658,6 +658,6 @@
* the String representation of each element.
*/
public String toString() {
- return org.apache.mahout.colt.Arrays.toString(partFromTo(0, size()-1).elements());
+ return org.apache.mahout.matrix.Arrays.toString(partFromTo(0, size()-1).elements());
}
}
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractByteList.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractByteList.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractByteList.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractByteList.java Mon Nov 23 16:34:55 2009
@@ -6,10 +6,10 @@
CERN makes no representations about the suitability of this software for any purpose.
It is provided "as is" without expressed or implied warranty.
*/
-package org.apache.mahout.colt.list;
+package org.apache.mahout.matrix.list;
-import org.apache.mahout.colt.function.ByteComparator;
-import org.apache.mahout.colt.function.ByteProcedure;
+import org.apache.mahout.matrix.function.ByteComparator;
+import org.apache.mahout.matrix.function.ByteProcedure;
/**
Abstract base class for resizable lists holding <code>byte</code> elements; abstract.
First see the <a href="package-summary.html">package summary</a> and javadoc <a href="package-tree.html">tree view</a> to get the broad picture.
@@ -364,7 +364,7 @@
checkRangeFromTo(from, to, mySize);
byte[] myElements = elements();
- org.apache.mahout.colt.Sorting.mergeSort(myElements, from, to+1);
+ org.apache.mahout.matrix.Sorting.mergeSort(myElements, from, to+1);
elements(myElements);
setSizeRaw(mySize);
}
@@ -402,7 +402,7 @@
checkRangeFromTo(from, to, mySize);
byte[] myElements = elements();
- org.apache.mahout.colt.Sorting.mergeSort(myElements, from, to+1, c);
+ org.apache.mahout.matrix.Sorting.mergeSort(myElements, from, to+1, c);
elements(myElements);
setSizeRaw(mySize);
}
@@ -478,7 +478,7 @@
checkRangeFromTo(from, to, mySize);
byte[] myElements = elements();
- org.apache.mahout.colt.Sorting.quickSort(myElements, from, to+1,c);
+ org.apache.mahout.matrix.Sorting.quickSort(myElements, from, to+1,c);
elements(myElements);
setSizeRaw(mySize);
}
@@ -776,6 +776,6 @@
* the String representation of each element.
*/
public String toString() {
- return org.apache.mahout.colt.Arrays.toString(partFromTo(0, size()-1).elements());
+ return org.apache.mahout.matrix.Arrays.toString(partFromTo(0, size()-1).elements());
}
}
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractCharList.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractCharList.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractCharList.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractCharList.java Mon Nov 23 16:34:55 2009
@@ -6,10 +6,10 @@
CERN makes no representations about the suitability of this software for any purpose.
It is provided "as is" without expressed or implied warranty.
*/
-package org.apache.mahout.colt.list;
+package org.apache.mahout.matrix.list;
-import org.apache.mahout.colt.function.CharComparator;
-import org.apache.mahout.colt.function.CharProcedure;
+import org.apache.mahout.matrix.function.CharComparator;
+import org.apache.mahout.matrix.function.CharProcedure;
/**
Abstract base class for resizable lists holding <code>char</code> elements; abstract.
First see the <a href="package-summary.html">package summary</a> and javadoc <a href="package-tree.html">tree view</a> to get the broad picture.
@@ -364,7 +364,7 @@
checkRangeFromTo(from, to, mySize);
char[] myElements = elements();
- org.apache.mahout.colt.Sorting.mergeSort(myElements, from, to+1);
+ org.apache.mahout.matrix.Sorting.mergeSort(myElements, from, to+1);
elements(myElements);
setSizeRaw(mySize);
}
@@ -402,7 +402,7 @@
checkRangeFromTo(from, to, mySize);
char[] myElements = elements();
- org.apache.mahout.colt.Sorting.mergeSort(myElements, from, to+1, c);
+ org.apache.mahout.matrix.Sorting.mergeSort(myElements, from, to+1, c);
elements(myElements);
setSizeRaw(mySize);
}
@@ -478,7 +478,7 @@
checkRangeFromTo(from, to, mySize);
char[] myElements = elements();
- org.apache.mahout.colt.Sorting.quickSort(myElements, from, to+1,c);
+ org.apache.mahout.matrix.Sorting.quickSort(myElements, from, to+1,c);
elements(myElements);
setSizeRaw(mySize);
}
@@ -776,6 +776,6 @@
* the String representation of each element.
*/
public String toString() {
- return org.apache.mahout.colt.Arrays.toString(partFromTo(0, size()-1).elements());
+ return org.apache.mahout.matrix.Arrays.toString(partFromTo(0, size()-1).elements());
}
}
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractCollection.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractCollection.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractCollection.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractCollection.java Mon Nov 23 16:34:55 2009
@@ -6,7 +6,7 @@
CERN makes no representations about the suitability of this software for any purpose.
It is provided "as is" without expressed or implied warranty.
*/
-package org.apache.mahout.colt.list;
+package org.apache.mahout.matrix.list;
/**
Abstract base class for resizable collections holding objects or primitive data types such as <code>int</code>, <code>float</code>, etc.
@@ -25,7 +25,7 @@
* @deprecated until unit tests are in place. Until this time, this class/interface is unsupported.
*/
@Deprecated
-public abstract class AbstractCollection extends org.apache.mahout.colt.PersistentObject {
+public abstract class AbstractCollection extends org.apache.mahout.matrix.PersistentObject {
/**
* Makes this class non instantiable, but still let's others inherit from it.
*/
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractDoubleList.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractDoubleList.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractDoubleList.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractDoubleList.java Mon Nov 23 16:34:55 2009
@@ -6,10 +6,10 @@
CERN makes no representations about the suitability of this software for any purpose.
It is provided "as is" without expressed or implied warranty.
*/
-package org.apache.mahout.colt.list;
+package org.apache.mahout.matrix.list;
-import org.apache.mahout.colt.function.DoubleComparator;
-import org.apache.mahout.colt.function.DoubleProcedure;
+import org.apache.mahout.matrix.function.DoubleComparator;
+import org.apache.mahout.matrix.function.DoubleProcedure;
/**
Abstract base class for resizable lists holding <code>double</code> elements; abstract.
First see the <a href="package-summary.html">package summary</a> and javadoc <a href="package-tree.html">tree view</a> to get the broad picture.
@@ -18,7 +18,7 @@
* @deprecated until unit tests are in place. Until this time, this class/interface is unsupported.
*/
@Deprecated
-public abstract class AbstractDoubleList extends AbstractList implements org.apache.mahout.colt.buffer.DoubleBufferConsumer {
+public abstract class AbstractDoubleList extends AbstractList implements org.apache.mahout.matrix.buffer.DoubleBufferConsumer {
/**
* The size of the list.
* This is a READ_ONLY variable for all methods but setSizeRaw(int newSize) !!!
@@ -372,7 +372,7 @@
checkRangeFromTo(from, to, mySize);
double[] myElements = elements();
- org.apache.mahout.colt.Sorting.mergeSort(myElements, from, to+1);
+ org.apache.mahout.matrix.Sorting.mergeSort(myElements, from, to+1);
elements(myElements);
setSizeRaw(mySize);
}
@@ -410,7 +410,7 @@
checkRangeFromTo(from, to, mySize);
double[] myElements = elements();
- org.apache.mahout.colt.Sorting.mergeSort(myElements, from, to+1, c);
+ org.apache.mahout.matrix.Sorting.mergeSort(myElements, from, to+1, c);
elements(myElements);
setSizeRaw(mySize);
}
@@ -451,7 +451,7 @@
double[] myElements = elements();
java.util.Arrays.sort(myElements, from, to+1);
- //org.apache.mahout.colt.Sorting.mergeSort(myElements, from, to+1); // TODO just for debugging
+ //org.apache.mahout.matrix.Sorting.mergeSort(myElements, from, to+1); // TODO just for debugging
elements(myElements);
setSizeRaw(mySize);
@@ -488,7 +488,7 @@
checkRangeFromTo(from, to, mySize);
double[] myElements = elements();
- org.apache.mahout.colt.Sorting.quickSort(myElements, from, to+1,c);
+ org.apache.mahout.matrix.Sorting.quickSort(myElements, from, to+1,c);
elements(myElements);
setSizeRaw(mySize);
}
@@ -786,6 +786,6 @@
* the String representation of each element.
*/
public String toString() {
- return org.apache.mahout.colt.Arrays.toString(partFromTo(0, size()-1).elements());
+ return org.apache.mahout.matrix.Arrays.toString(partFromTo(0, size()-1).elements());
}
}
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractFloatList.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractFloatList.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractFloatList.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractFloatList.java Mon Nov 23 16:34:55 2009
@@ -6,10 +6,10 @@
CERN makes no representations about the suitability of this software for any purpose.
It is provided "as is" without expressed or implied warranty.
*/
-package org.apache.mahout.colt.list;
+package org.apache.mahout.matrix.list;
-import org.apache.mahout.colt.function.FloatComparator;
-import org.apache.mahout.colt.function.FloatProcedure;
+import org.apache.mahout.matrix.function.FloatComparator;
+import org.apache.mahout.matrix.function.FloatProcedure;
/**
Abstract base class for resizable lists holding <code>float</code> elements; abstract.
First see the <a href="package-summary.html">package summary</a> and javadoc <a href="package-tree.html">tree view</a> to get the broad picture.
@@ -364,7 +364,7 @@
checkRangeFromTo(from, to, mySize);
float[] myElements = elements();
- org.apache.mahout.colt.Sorting.mergeSort(myElements, from, to+1);
+ org.apache.mahout.matrix.Sorting.mergeSort(myElements, from, to+1);
elements(myElements);
setSizeRaw(mySize);
}
@@ -402,7 +402,7 @@
checkRangeFromTo(from, to, mySize);
float[] myElements = elements();
- org.apache.mahout.colt.Sorting.mergeSort(myElements, from, to+1, c);
+ org.apache.mahout.matrix.Sorting.mergeSort(myElements, from, to+1, c);
elements(myElements);
setSizeRaw(mySize);
}
@@ -478,7 +478,7 @@
checkRangeFromTo(from, to, mySize);
float[] myElements = elements();
- org.apache.mahout.colt.Sorting.quickSort(myElements, from, to+1,c);
+ org.apache.mahout.matrix.Sorting.quickSort(myElements, from, to+1,c);
elements(myElements);
setSizeRaw(mySize);
}
@@ -776,6 +776,6 @@
* the String representation of each element.
*/
public String toString() {
- return org.apache.mahout.colt.Arrays.toString(partFromTo(0, size()-1).elements());
+ return org.apache.mahout.matrix.Arrays.toString(partFromTo(0, size()-1).elements());
}
}
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractIntList.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractIntList.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractIntList.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractIntList.java Mon Nov 23 16:34:55 2009
@@ -6,10 +6,10 @@
CERN makes no representations about the suitability of this software for any purpose.
It is provided "as is" without expressed or implied warranty.
*/
-package org.apache.mahout.colt.list;
+package org.apache.mahout.matrix.list;
-import org.apache.mahout.colt.function.IntComparator;
-import org.apache.mahout.colt.function.IntProcedure;
+import org.apache.mahout.matrix.function.IntComparator;
+import org.apache.mahout.matrix.function.IntProcedure;
/**
Abstract base class for resizable lists holding <code>int</code> elements; abstract.
First see the <a href="package-summary.html">package summary</a> and javadoc <a href="package-tree.html">tree view</a> to get the broad picture.
@@ -18,7 +18,7 @@
* @deprecated until unit tests are in place. Until this time, this class/interface is unsupported.
*/
@Deprecated
-public abstract class AbstractIntList extends AbstractList implements org.apache.mahout.colt.buffer.IntBufferConsumer {
+public abstract class AbstractIntList extends AbstractList implements org.apache.mahout.matrix.buffer.IntBufferConsumer {
/**
* The size of the list.
* This is a READ_ONLY variable for all methods but setSizeRaw(int newSize) !!!
@@ -371,7 +371,7 @@
checkRangeFromTo(from, to, mySize);
int[] myElements = elements();
- org.apache.mahout.colt.Sorting.mergeSort(myElements, from, to+1);
+ org.apache.mahout.matrix.Sorting.mergeSort(myElements, from, to+1);
elements(myElements);
setSizeRaw(mySize);
}
@@ -409,7 +409,7 @@
checkRangeFromTo(from, to, mySize);
int[] myElements = elements();
- org.apache.mahout.colt.Sorting.mergeSort(myElements, from, to+1, c);
+ org.apache.mahout.matrix.Sorting.mergeSort(myElements, from, to+1, c);
elements(myElements);
setSizeRaw(mySize);
}
@@ -450,7 +450,7 @@
int[] myElements = elements();
java.util.Arrays.sort(myElements, from, to+1);
- //org.apache.mahout.colt.Sorting.mergeSort(myElements, from, to+1); // TODO just for debugging
+ //org.apache.mahout.matrix.Sorting.mergeSort(myElements, from, to+1); // TODO just for debugging
elements(myElements);
setSizeRaw(mySize);
}
@@ -486,7 +486,7 @@
checkRangeFromTo(from, to, mySize);
int[] myElements = elements();
- org.apache.mahout.colt.Sorting.quickSort(myElements, from, to+1,c);
+ org.apache.mahout.matrix.Sorting.quickSort(myElements, from, to+1,c);
elements(myElements);
setSizeRaw(mySize);
}
@@ -784,6 +784,6 @@
* the String representation of each element.
*/
public String toString() {
- return org.apache.mahout.colt.Arrays.toString(partFromTo(0, size()-1).elements());
+ return org.apache.mahout.matrix.Arrays.toString(partFromTo(0, size()-1).elements());
}
}
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractList.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractList.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractList.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractList.java Mon Nov 23 16:34:55 2009
@@ -6,7 +6,7 @@
CERN makes no representations about the suitability of this software for any purpose.
It is provided "as is" without expressed or implied warranty.
*/
-package org.apache.mahout.colt.list;
+package org.apache.mahout.matrix.list;
/**
Abstract base class for resizable lists holding objects or primitive data types such as <code>int</code>, <code>float</code>, etc.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractLongList.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractLongList.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractLongList.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractLongList.java Mon Nov 23 16:34:55 2009
@@ -6,10 +6,10 @@
CERN makes no representations about the suitability of this software for any purpose.
It is provided "as is" without expressed or implied warranty.
*/
-package org.apache.mahout.colt.list;
+package org.apache.mahout.matrix.list;
-import org.apache.mahout.colt.function.LongComparator;
-import org.apache.mahout.colt.function.LongProcedure;
+import org.apache.mahout.matrix.function.LongComparator;
+import org.apache.mahout.matrix.function.LongProcedure;
/**
Abstract base class for resizable lists holding <code>long</code> elements; abstract.
First see the <a href="package-summary.html">package summary</a> and javadoc <a href="package-tree.html">tree view</a> to get the broad picture.
@@ -364,7 +364,7 @@
checkRangeFromTo(from, to, mySize);
long[] myElements = elements();
- org.apache.mahout.colt.Sorting.mergeSort(myElements, from, to+1);
+ org.apache.mahout.matrix.Sorting.mergeSort(myElements, from, to+1);
elements(myElements);
setSizeRaw(mySize);
}
@@ -402,7 +402,7 @@
checkRangeFromTo(from, to, mySize);
long[] myElements = elements();
- org.apache.mahout.colt.Sorting.mergeSort(myElements, from, to+1, c);
+ org.apache.mahout.matrix.Sorting.mergeSort(myElements, from, to+1, c);
elements(myElements);
setSizeRaw(mySize);
}
@@ -478,7 +478,7 @@
checkRangeFromTo(from, to, mySize);
long[] myElements = elements();
- org.apache.mahout.colt.Sorting.quickSort(myElements, from, to+1,c);
+ org.apache.mahout.matrix.Sorting.quickSort(myElements, from, to+1,c);
elements(myElements);
setSizeRaw(mySize);
}
@@ -776,6 +776,6 @@
* the String representation of each element.
*/
public String toString() {
- return org.apache.mahout.colt.Arrays.toString(partFromTo(0, size()-1).elements());
+ return org.apache.mahout.matrix.Arrays.toString(partFromTo(0, size()-1).elements());
}
}
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractShortList.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractShortList.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractShortList.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractShortList.java Mon Nov 23 16:34:55 2009
@@ -6,10 +6,10 @@
CERN makes no representations about the suitability of this software for any purpose.
It is provided "as is" without expressed or implied warranty.
*/
-package org.apache.mahout.colt.list;
+package org.apache.mahout.matrix.list;
-import org.apache.mahout.colt.function.ShortComparator;
-import org.apache.mahout.colt.function.ShortProcedure;
+import org.apache.mahout.matrix.function.ShortComparator;
+import org.apache.mahout.matrix.function.ShortProcedure;
/**
Abstract base class for resizable lists holding <code>short</code> elements; abstract.
First see the <a href="package-summary.html">package summary</a> and javadoc <a href="package-tree.html">tree view</a> to get the broad picture.
@@ -364,7 +364,7 @@
checkRangeFromTo(from, to, mySize);
short[] myElements = elements();
- org.apache.mahout.colt.Sorting.mergeSort(myElements, from, to+1);
+ org.apache.mahout.matrix.Sorting.mergeSort(myElements, from, to+1);
elements(myElements);
setSizeRaw(mySize);
}
@@ -402,7 +402,7 @@
checkRangeFromTo(from, to, mySize);
short[] myElements = elements();
- org.apache.mahout.colt.Sorting.mergeSort(myElements, from, to+1, c);
+ org.apache.mahout.matrix.Sorting.mergeSort(myElements, from, to+1, c);
elements(myElements);
setSizeRaw(mySize);
}
@@ -478,7 +478,7 @@
checkRangeFromTo(from, to, mySize);
short[] myElements = elements();
- org.apache.mahout.colt.Sorting.quickSort(myElements, from, to+1,c);
+ org.apache.mahout.matrix.Sorting.quickSort(myElements, from, to+1,c);
elements(myElements);
setSizeRaw(mySize);
}
@@ -776,6 +776,6 @@
* the String representation of each element.
*/
public String toString() {
- return org.apache.mahout.colt.Arrays.toString(partFromTo(0, size()-1).elements());
+ return org.apache.mahout.matrix.Arrays.toString(partFromTo(0, size()-1).elements());
}
}
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/BooleanArrayList.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/BooleanArrayList.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/BooleanArrayList.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/BooleanArrayList.java Mon Nov 23 16:34:55 2009
@@ -6,9 +6,9 @@
CERN makes no representations about the suitability of this software for any purpose.
It is provided "as is" without expressed or implied warranty.
*/
-package org.apache.mahout.colt.list;
+package org.apache.mahout.matrix.list;
-import org.apache.mahout.colt.function.BooleanProcedure;
+import org.apache.mahout.matrix.function.BooleanProcedure;
/**
Resizable list holding <code>boolean</code> elements; implemented with arrays.
First see the <a href="package-summary.html">package summary</a> and javadoc <a href="package-tree.html">tree view</a> to get the broad picture.
@@ -154,7 +154,7 @@
* @param minCapacity the desired minimum capacity.
*/
public void ensureCapacity(int minCapacity) {
- elements = org.apache.mahout.colt.Arrays.ensureCapacity(elements,minCapacity);
+ elements = org.apache.mahout.matrix.Arrays.ensureCapacity(elements,minCapacity);
}
/**
* Compares the specified Object with the receiver.
@@ -513,6 +513,6 @@
* storage of the receiver.
*/
public void trimToSize() {
- elements = org.apache.mahout.colt.Arrays.trimToCapacity(elements,size());
+ elements = org.apache.mahout.matrix.Arrays.trimToCapacity(elements,size());
}
}
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/ByteArrayList.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/ByteArrayList.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/ByteArrayList.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/ByteArrayList.java Mon Nov 23 16:34:55 2009
@@ -6,9 +6,9 @@
CERN makes no representations about the suitability of this software for any purpose.
It is provided "as is" without expressed or implied warranty.
*/
-package org.apache.mahout.colt.list;
+package org.apache.mahout.matrix.list;
-import org.apache.mahout.colt.function.ByteProcedure;
+import org.apache.mahout.matrix.function.ByteProcedure;
/**
Resizable list holding <code>byte</code> elements; implemented with arrays.
First see the <a href="package-summary.html">package summary</a> and javadoc <a href="package-tree.html">tree view</a> to get the broad picture.
@@ -101,11 +101,11 @@
* elements in the receiver are less than the specified key. Note
* that this guarantees that the return value will be >= 0 if
* and only if the key is found.
- * @see org.apache.mahout.colt.Sorting
+ * @see org.apache.mahout.matrix.Sorting
* @see java.util.Arrays
*/
public int binarySearchFromTo(byte key, int from, int to) {
- return org.apache.mahout.colt.Sorting.binarySearchFromTo(this.elements,key,from,to);
+ return org.apache.mahout.matrix.Sorting.binarySearchFromTo(this.elements,key,from,to);
}
/**
* Returns a deep copy of the receiver.
@@ -231,7 +231,7 @@
* @param minCapacity the desired minimum capacity.
*/
public void ensureCapacity(int minCapacity) {
- elements = org.apache.mahout.colt.Arrays.ensureCapacity(elements,minCapacity);
+ elements = org.apache.mahout.matrix.Arrays.ensureCapacity(elements,minCapacity);
}
/**
* Compares the specified Object with the receiver.
@@ -576,6 +576,6 @@
* storage of the receiver.
*/
public void trimToSize() {
- elements = org.apache.mahout.colt.Arrays.trimToCapacity(elements,size());
+ elements = org.apache.mahout.matrix.Arrays.trimToCapacity(elements,size());
}
}