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 [3/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/list/CharArrayList.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/CharArrayList.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/CharArrayList.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/CharArrayList.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.CharProcedure;
+import org.apache.mahout.matrix.function.CharProcedure;
/**
Resizable list holding <code>char</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(char 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.
@@ -197,7 +197,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.
@@ -569,6 +569,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/DistinctNumberList.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/DistinctNumberList.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/DistinctNumberList.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/DistinctNumberList.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;
/**
* Resizable compressed list holding numbers; based on the fact that a number from a large list with few distinct values need not take more than <tt>log(distinctValues)</tt> bits; implemented with a <tt>MinMaxNumberList</tt>.
@@ -58,7 +58,7 @@
* @deprecated until unit tests are in place. Until this time, this class/interface is unsupported.
*/
@Deprecated
-public class DistinctNumberList extends org.apache.mahout.colt.list.AbstractLongList {
+public class DistinctNumberList extends org.apache.mahout.matrix.list.AbstractLongList {
protected long[] distinctValues;
protected MinMaxNumberList elements;
/**
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/DoubleArrayList.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/DoubleArrayList.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/DoubleArrayList.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/DoubleArrayList.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.DoubleProcedure;
+import org.apache.mahout.matrix.function.DoubleProcedure;
/**
Resizable list holding <code>double</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.
@@ -103,11 +103,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(double 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.
@@ -161,7 +161,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.
@@ -482,6 +482,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/FloatArrayList.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/FloatArrayList.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/FloatArrayList.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/FloatArrayList.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.FloatProcedure;
+import org.apache.mahout.matrix.function.FloatProcedure;
/**
Resizable list holding <code>float</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.
@@ -99,11 +99,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(float 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.
@@ -157,7 +157,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.
@@ -478,6 +478,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/IntArrayList.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/IntArrayList.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/IntArrayList.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/IntArrayList.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.IntProcedure;
+import org.apache.mahout.matrix.function.IntProcedure;
/**
Resizable list holding <code>int</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.
@@ -105,11 +105,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(int 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.
@@ -201,7 +201,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.
@@ -573,6 +573,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/LongArrayList.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/LongArrayList.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/LongArrayList.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/LongArrayList.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.LongProcedure;
+import org.apache.mahout.matrix.function.LongProcedure;
/**
Resizable list holding <code>long</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.
@@ -99,11 +99,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(long 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.
@@ -195,7 +195,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.
@@ -567,6 +567,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/MinMaxNumberList.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/MinMaxNumberList.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/MinMaxNumberList.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/MinMaxNumberList.java Mon Nov 23 16:34:55 2009
@@ -6,12 +6,12 @@
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.bitvector.BitVector;
-import org.apache.mahout.colt.bitvector.QuickBitVector;
+import org.apache.mahout.matrix.bitvector.BitVector;
+import org.apache.mahout.matrix.bitvector.QuickBitVector;
/**
- * Resizable compressed list holding numbers; based on the fact that a value in a given interval need not take more than <tt>log(max-min+1)</tt> bits; implemented with a <tt>org.apache.mahout.colt.bitvector.BitVector</tt>.
+ * Resizable compressed list holding numbers; based on the fact that a value in a given interval need not take more than <tt>log(max-min+1)</tt> bits; implemented with a <tt>org.apache.mahout.matrix.bitvector.BitVector</tt>.
* 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.
* <p>
* Numbers can be compressed when minimum and maximum of all values ever to be stored in the list are known.
@@ -69,7 +69,7 @@
* @deprecated until unit tests are in place. Until this time, this class/interface is unsupported.
*/
@Deprecated
-public class MinMaxNumberList extends org.apache.mahout.colt.list.AbstractLongList {
+public class MinMaxNumberList extends org.apache.mahout.matrix.list.AbstractLongList {
protected long minValue;
protected int bitsPerElement;
protected long[] bits;
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/ObjectArrayList.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/ObjectArrayList.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/ObjectArrayList.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/ObjectArrayList.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.ObjectProcedure;
+import org.apache.mahout.matrix.function.ObjectProcedure;
/**
Resizable list holding <code>Object</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.
@@ -223,12 +223,12 @@
* 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
* @see java.util.Comparator
*/
public int binarySearchFromTo(Object key, int from, int to, java.util.Comparator comparator) {
- return org.apache.mahout.colt.Sorting.binarySearchFromTo(this.elements,key,from,to,comparator);
+ return org.apache.mahout.matrix.Sorting.binarySearchFromTo(this.elements,key,from,to,comparator);
}
/**
* Returns a copy of the receiver such that the copy and the receiver <i>share</i> the same elements, but do not share the same array to index them;
@@ -312,7 +312,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 for equality.
@@ -631,7 +631,7 @@
public void quickSortFromTo(int from, int to) {
if (size==0) return;
checkRangeFromTo(from, to, size);
- org.apache.mahout.colt.Sorting.quickSort(elements, from, to+1);
+ org.apache.mahout.matrix.Sorting.quickSort(elements, from, to+1);
}
/**
* Sorts the receiver according
@@ -662,7 +662,7 @@
public void quickSortFromTo(int from, int to, java.util.Comparator c) {
if (size==0) return;
checkRangeFromTo(from, to, size);
- org.apache.mahout.colt.Sorting.quickSort(elements, from, to+1, c);
+ org.apache.mahout.matrix.Sorting.quickSort(elements, from, to+1, c);
}
/**
* Removes from the receiver all elements that are contained in the specified list.
@@ -976,7 +976,7 @@
* 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());
}
/**
* Trims the capacity of the receiver to be the receiver's current
@@ -984,6 +984,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/ShortArrayList.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/ShortArrayList.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/ShortArrayList.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/ShortArrayList.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.ShortProcedure;
+import org.apache.mahout.matrix.function.ShortProcedure;
/**
Resizable list holding <code>short</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(short 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.
@@ -197,7 +197,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.
@@ -569,6 +569,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/SimpleLongArrayList.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/SimpleLongArrayList.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/SimpleLongArrayList.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/SimpleLongArrayList.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;
/**
Resizable list holding <code>long</code> elements; implemented with arrays; not efficient; just to demonstrate which methods you must override to implement a fully functional list.
@@ -67,7 +67,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);
}
/**
* Returns the element at the specified position in the receiver; <b>WARNING:</b> Does not check preconditions.
@@ -98,6 +98,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/adapter/DoubleListAdapter.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/adapter/DoubleListAdapter.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/adapter/DoubleListAdapter.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/adapter/DoubleListAdapter.java Mon Nov 23 16:34:55 2009
@@ -6,11 +6,11 @@
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.adapter;
+package org.apache.mahout.matrix.list.adapter;
-import org.apache.mahout.colt.list.AbstractDoubleList;
+import org.apache.mahout.matrix.list.AbstractDoubleList;
/**
- * Adapter that permits an {@link org.apache.mahout.colt.list.AbstractDoubleList} to be viewed and treated as a JDK 1.2 {@link java.util.AbstractList}.
+ * Adapter that permits an {@link org.apache.mahout.matrix.list.AbstractDoubleList} to be viewed and treated as a JDK 1.2 {@link java.util.AbstractList}.
* Makes the contained list compatible with the JDK 1.2 Collections Framework.
* <p>
* Any attempt to pass elements other than <tt>java.lang.Number</tt> to setter methods will throw a <tt>java.lang.ClassCastException</tt>.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/adapter/FloatListAdapter.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/adapter/FloatListAdapter.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/adapter/FloatListAdapter.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/adapter/FloatListAdapter.java Mon Nov 23 16:34:55 2009
@@ -6,11 +6,11 @@
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.adapter;
+package org.apache.mahout.matrix.list.adapter;
-import org.apache.mahout.colt.list.AbstractFloatList;
+import org.apache.mahout.matrix.list.AbstractFloatList;
/**
- * Adapter that permits an {@link org.apache.mahout.colt.list.AbstractFloatList} to be viewed and treated as a JDK 1.2 {@link java.util.AbstractList}.
+ * Adapter that permits an {@link org.apache.mahout.matrix.list.AbstractFloatList} to be viewed and treated as a JDK 1.2 {@link java.util.AbstractList}.
* Makes the contained list compatible with the JDK 1.2 Collections Framework.
* <p>
* Any attempt to pass elements other than <tt>java.lang.Number</tt> to setter methods will throw a <tt>java.lang.ClassCastException</tt>.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/adapter/IntListAdapter.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/adapter/IntListAdapter.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/adapter/IntListAdapter.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/adapter/IntListAdapter.java Mon Nov 23 16:34:55 2009
@@ -6,11 +6,11 @@
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.adapter;
+package org.apache.mahout.matrix.list.adapter;
-import org.apache.mahout.colt.list.AbstractIntList;
+import org.apache.mahout.matrix.list.AbstractIntList;
/**
- * Adapter that permits an {@link org.apache.mahout.colt.list.AbstractIntList} to be viewed and treated as a JDK 1.2 {@link java.util.AbstractList}.
+ * Adapter that permits an {@link org.apache.mahout.matrix.list.AbstractIntList} to be viewed and treated as a JDK 1.2 {@link java.util.AbstractList}.
* Makes the contained list compatible with the JDK 1.2 Collections Framework.
* <p>
* Any attempt to pass elements other than <tt>java.lang.Number</tt> to setter methods will throw a <tt>java.lang.ClassCastException</tt>.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/adapter/LongListAdapter.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/adapter/LongListAdapter.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/adapter/LongListAdapter.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/adapter/LongListAdapter.java Mon Nov 23 16:34:55 2009
@@ -6,11 +6,11 @@
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.adapter;
+package org.apache.mahout.matrix.list.adapter;
-import org.apache.mahout.colt.list.AbstractLongList;
+import org.apache.mahout.matrix.list.AbstractLongList;
/**
- * Adapter that permits an {@link org.apache.mahout.colt.list.AbstractLongList} to be viewed and treated as a JDK 1.2 {@link java.util.AbstractList}.
+ * Adapter that permits an {@link org.apache.mahout.matrix.list.AbstractLongList} to be viewed and treated as a JDK 1.2 {@link java.util.AbstractList}.
* Makes the contained list compatible with the JDK 1.2 Collections Framework.
* <p>
* Any attempt to pass elements other than <tt>java.lang.Number</tt> to setter methods will throw a <tt>java.lang.ClassCastException</tt>.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/adapter/ObjectListAdapter.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/adapter/ObjectListAdapter.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/adapter/ObjectListAdapter.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/adapter/ObjectListAdapter.java Mon Nov 23 16:34:55 2009
@@ -6,11 +6,11 @@
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.adapter;
+package org.apache.mahout.matrix.list.adapter;
-import org.apache.mahout.colt.list.ObjectArrayList;
+import org.apache.mahout.matrix.list.ObjectArrayList;
/**
- * Adapter that permits an {@link org.apache.mahout.colt.list.ObjectArrayList} to be viewed and treated as a JDK 1.2 {@link java.util.AbstractList}.
+ * Adapter that permits an {@link org.apache.mahout.matrix.list.ObjectArrayList} to be viewed and treated as a JDK 1.2 {@link java.util.AbstractList}.
* Makes the contained list compatible with the JDK 1.2 Collections Framework.
*/
/**
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/AbstractDoubleIntMap.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/AbstractDoubleIntMap.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/AbstractDoubleIntMap.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/AbstractDoubleIntMap.java Mon Nov 23 16:34:55 2009
@@ -6,12 +6,12 @@
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.map;
+package org.apache.mahout.matrix.map;
-import org.apache.mahout.colt.function.DoubleIntProcedure;
-import org.apache.mahout.colt.function.DoubleProcedure;
-import org.apache.mahout.colt.list.DoubleArrayList;
-import org.apache.mahout.colt.list.IntArrayList;
+import org.apache.mahout.matrix.function.DoubleIntProcedure;
+import org.apache.mahout.matrix.function.DoubleProcedure;
+import org.apache.mahout.matrix.list.DoubleArrayList;
+import org.apache.mahout.matrix.list.IntArrayList;
/**
Abstract base class for hash maps holding (key,value) associations of type <tt>(double-->int)</tt>.
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.
@@ -290,7 +290,7 @@
final double[] k = keyList.elements();
final int[] v = valueList.elements();
- org.apache.mahout.colt.Swapper swapper = new org.apache.mahout.colt.Swapper() {
+ org.apache.mahout.matrix.Swapper swapper = new org.apache.mahout.matrix.Swapper() {
public void swap(int a, int b) {
int t1; double t2;
t1 = v[a]; v[a] = v[b]; v[b] = t1;
@@ -298,26 +298,26 @@
}
};
- org.apache.mahout.colt.function.IntComparator comp = new org.apache.mahout.colt.function.IntComparator() {
+ org.apache.mahout.matrix.function.IntComparator comp = new org.apache.mahout.matrix.function.IntComparator() {
public int compare(int a, int b) {
return k[a]<k[b] ? -1 : k[a]==k[b] ? 0 : 1;
}
};
- org.apache.mahout.colt.MultiSorting.sort(0,keyList.size(),comp,swapper);
+ org.apache.mahout.matrix.MultiSorting.sort(0,keyList.size(),comp,swapper);
*/
// this variant may be quicker
- //org.apache.mahout.colt.map.OpenDoubleIntHashMap.hashCollisions = 0;
- //System.out.println("collisions="+org.apache.mahout.colt.map.OpenDoubleIntHashMap.hashCollisions);
+ //org.apache.mahout.matrix.map.OpenDoubleIntHashMap.hashCollisions = 0;
+ //System.out.println("collisions="+org.apache.mahout.matrix.map.OpenDoubleIntHashMap.hashCollisions);
keys(keyList);
keyList.sort();
valueList.setSize(keyList.size());
for (int i=keyList.size(); --i >= 0; ) {
valueList.setQuick(i,get(keyList.getQuick(i)));
}
- //System.out.println("collisions="+org.apache.mahout.colt.map.OpenDoubleIntHashMap.hashCollisions);
+ //System.out.println("collisions="+org.apache.mahout.matrix.map.OpenDoubleIntHashMap.hashCollisions);
}
/**
@@ -340,7 +340,7 @@
final double[] k = keyList.elements();
final int[] v = valueList.elements();
- org.apache.mahout.colt.Swapper swapper = new org.apache.mahout.colt.Swapper() {
+ org.apache.mahout.matrix.Swapper swapper = new org.apache.mahout.matrix.Swapper() {
public void swap(int a, int b) {
int t1; double t2;
t1 = v[a]; v[a] = v[b]; v[b] = t1;
@@ -348,15 +348,15 @@
}
};
- org.apache.mahout.colt.function.IntComparator comp = new org.apache.mahout.colt.function.IntComparator() {
+ org.apache.mahout.matrix.function.IntComparator comp = new org.apache.mahout.matrix.function.IntComparator() {
public int compare(int a, int b) {
return v[a]<v[b] ? -1 : v[a]>v[b] ? 1 : (k[a]<k[b] ? -1 : (k[a]==k[b] ? 0 : 1));
}
};
- //org.apache.mahout.colt.map.OpenDoubleIntHashMap.hashCollisions = 0;
- org.apache.mahout.colt.GenericSorting.quickSort(0,keyList.size(),comp,swapper);
- //System.out.println("collisions="+org.apache.mahout.colt.map.OpenDoubleIntHashMap.hashCollisions);
+ //org.apache.mahout.matrix.map.OpenDoubleIntHashMap.hashCollisions = 0;
+ org.apache.mahout.matrix.GenericSorting.quickSort(0,keyList.size(),comp,swapper);
+ //System.out.println("collisions="+org.apache.mahout.matrix.map.OpenDoubleIntHashMap.hashCollisions);
}
/**
* Associates the given key with the given value.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/AbstractIntDoubleMap.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/AbstractIntDoubleMap.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/AbstractIntDoubleMap.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/AbstractIntDoubleMap.java Mon Nov 23 16:34:55 2009
@@ -6,12 +6,12 @@
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.map;
+package org.apache.mahout.matrix.map;
-import org.apache.mahout.colt.function.IntDoubleProcedure;
-import org.apache.mahout.colt.function.IntProcedure;
-import org.apache.mahout.colt.list.DoubleArrayList;
-import org.apache.mahout.colt.list.IntArrayList;
+import org.apache.mahout.matrix.function.IntDoubleProcedure;
+import org.apache.mahout.matrix.function.IntProcedure;
+import org.apache.mahout.matrix.list.DoubleArrayList;
+import org.apache.mahout.matrix.list.IntArrayList;
/**
Abstract base class for hash maps holding (key,value) associations of type <tt>(int-->double)</tt>.
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.
@@ -40,9 +40,9 @@
@param function a function object taking as argument the current association's value.
*/
-public void assign(final org.apache.mahout.colt.function.DoubleFunction function) {
+public void assign(final org.apache.mahout.matrix.function.DoubleFunction function) {
copy().forEachPair(
- new org.apache.mahout.colt.function.IntDoubleProcedure() {
+ new org.apache.mahout.matrix.function.IntDoubleProcedure() {
public boolean apply(int key, double value) {
put(key,function.apply(value));
return true;
@@ -341,7 +341,7 @@
final int[] k = keyList.elements();
final double[] v = valueList.elements();
- org.apache.mahout.colt.Swapper swapper = new org.apache.mahout.colt.Swapper() {
+ org.apache.mahout.matrix.Swapper swapper = new org.apache.mahout.matrix.Swapper() {
public void swap(int a, int b) {
int t2; double t1;
t1 = v[a]; v[a] = v[b]; v[b] = t1;
@@ -349,13 +349,13 @@
}
};
- org.apache.mahout.colt.function.IntComparator comp = new org.apache.mahout.colt.function.IntComparator() {
+ org.apache.mahout.matrix.function.IntComparator comp = new org.apache.mahout.matrix.function.IntComparator() {
public int compare(int a, int b) {
return v[a]<v[b] ? -1 : v[a]>v[b] ? 1 : (k[a]<k[b] ? -1 : (k[a]==k[b] ? 0 : 1));
}
};
- org.apache.mahout.colt.GenericSorting.quickSort(0,keyList.size(),comp,swapper);
+ org.apache.mahout.matrix.GenericSorting.quickSort(0,keyList.size(),comp,swapper);
}
/**
* Associates the given key with the given value.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/AbstractIntIntMap.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/AbstractIntIntMap.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/AbstractIntIntMap.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/AbstractIntIntMap.java Mon Nov 23 16:34:55 2009
@@ -6,11 +6,11 @@
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.map;
+package org.apache.mahout.matrix.map;
-import org.apache.mahout.colt.function.IntIntProcedure;
-import org.apache.mahout.colt.function.IntProcedure;
-import org.apache.mahout.colt.list.IntArrayList;
+import org.apache.mahout.matrix.function.IntIntProcedure;
+import org.apache.mahout.matrix.function.IntProcedure;
+import org.apache.mahout.matrix.list.IntArrayList;
/**
Abstract base class for hash maps holding (key,value) associations of type <tt>(int-->int)</tt>.
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.
@@ -309,7 +309,7 @@
final int[] k = keyList.elements();
final int[] v = valueList.elements();
- org.apache.mahout.colt.Swapper swapper = new org.apache.mahout.colt.Swapper() {
+ org.apache.mahout.matrix.Swapper swapper = new org.apache.mahout.matrix.Swapper() {
public void swap(int a, int b) {
int t2; int t1;
t1 = v[a]; v[a] = v[b]; v[b] = t1;
@@ -317,13 +317,13 @@
}
};
- org.apache.mahout.colt.function.IntComparator comp = new org.apache.mahout.colt.function.IntComparator() {
+ org.apache.mahout.matrix.function.IntComparator comp = new org.apache.mahout.matrix.function.IntComparator() {
public int compare(int a, int b) {
return v[a]<v[b] ? -1 : v[a]>v[b] ? 1 : (k[a]<k[b] ? -1 : (k[a]==k[b] ? 0 : 1));
}
};
- org.apache.mahout.colt.GenericSorting.quickSort(0,keyList.size(),comp,swapper);
+ org.apache.mahout.matrix.GenericSorting.quickSort(0,keyList.size(),comp,swapper);
}
/**
* Associates the given key with the given value.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/AbstractIntObjectMap.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/AbstractIntObjectMap.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/AbstractIntObjectMap.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/AbstractIntObjectMap.java Mon Nov 23 16:34:55 2009
@@ -6,12 +6,12 @@
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.map;
+package org.apache.mahout.matrix.map;
-import org.apache.mahout.colt.function.IntObjectProcedure;
-import org.apache.mahout.colt.function.IntProcedure;
-import org.apache.mahout.colt.list.IntArrayList;
-import org.apache.mahout.colt.list.ObjectArrayList;
+import org.apache.mahout.matrix.function.IntObjectProcedure;
+import org.apache.mahout.matrix.function.IntProcedure;
+import org.apache.mahout.matrix.list.IntArrayList;
+import org.apache.mahout.matrix.list.ObjectArrayList;
/**
Abstract base class for hash maps holding (key,value) associations of type <tt>(int-->Object)</tt>.
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.
@@ -311,7 +311,7 @@
final int[] k = keyList.elements();
final Object[] v = valueList.elements();
- org.apache.mahout.colt.Swapper swapper = new org.apache.mahout.colt.Swapper() {
+ org.apache.mahout.matrix.Swapper swapper = new org.apache.mahout.matrix.Swapper() {
public void swap(int a, int b) {
int t2; Object t1;
t1 = v[a]; v[a] = v[b]; v[b] = t1;
@@ -319,7 +319,7 @@
}
};
- org.apache.mahout.colt.function.IntComparator comp = new org.apache.mahout.colt.function.IntComparator() {
+ org.apache.mahout.matrix.function.IntComparator comp = new org.apache.mahout.matrix.function.IntComparator() {
public int compare(int a, int b) {
int ab = ((Comparable)v[a]).compareTo((Comparable)v[b]);
return ab<0 ? -1 : ab>0 ? 1 : (k[a]<k[b] ? -1 : (k[a]==k[b] ? 0 : 1));
@@ -327,7 +327,7 @@
}
};
- org.apache.mahout.colt.GenericSorting.quickSort(0,keyList.size(),comp,swapper);
+ org.apache.mahout.matrix.GenericSorting.quickSort(0,keyList.size(),comp,swapper);
}
/**
* Associates the given key with the given value.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/AbstractLongObjectMap.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/AbstractLongObjectMap.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/AbstractLongObjectMap.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/AbstractLongObjectMap.java Mon Nov 23 16:34:55 2009
@@ -6,12 +6,12 @@
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.map;
+package org.apache.mahout.matrix.map;
-import org.apache.mahout.colt.function.LongObjectProcedure;
-import org.apache.mahout.colt.function.LongProcedure;
-import org.apache.mahout.colt.list.LongArrayList;
-import org.apache.mahout.colt.list.ObjectArrayList;
+import org.apache.mahout.matrix.function.LongObjectProcedure;
+import org.apache.mahout.matrix.function.LongProcedure;
+import org.apache.mahout.matrix.list.LongArrayList;
+import org.apache.mahout.matrix.list.ObjectArrayList;
/**
Abstract base class for hash maps holding (key,value) associations of type <tt>(long-->Object)</tt>.
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.
@@ -311,7 +311,7 @@
final long[] k = keyList.elements();
final Object[] v = valueList.elements();
- org.apache.mahout.colt.Swapper swapper = new org.apache.mahout.colt.Swapper() {
+ org.apache.mahout.matrix.Swapper swapper = new org.apache.mahout.matrix.Swapper() {
public void swap(int a, int b) {
long t2; Object t1;
t1 = v[a]; v[a] = v[b]; v[b] = t1;
@@ -319,7 +319,7 @@
}
};
- org.apache.mahout.colt.function.IntComparator comp = new org.apache.mahout.colt.function.IntComparator() {
+ org.apache.mahout.matrix.function.IntComparator comp = new org.apache.mahout.matrix.function.IntComparator() {
public int compare(int a, int b) {
int ab = ((Comparable)v[a]).compareTo((Comparable)v[b]);
return ab<0 ? -1 : ab>0 ? 1 : (k[a]<k[b] ? -1 : (k[a]==k[b] ? 0 : 1));
@@ -327,7 +327,7 @@
}
};
- org.apache.mahout.colt.GenericSorting.quickSort(0,keyList.size(),comp,swapper);
+ org.apache.mahout.matrix.GenericSorting.quickSort(0,keyList.size(),comp,swapper);
}
/**
* Associates the given key with the given value.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/AbstractMap.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/AbstractMap.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/AbstractMap.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/AbstractMap.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.map;
+package org.apache.mahout.matrix.map;
/**
Abstract base class for hash maps holding objects or primitive data types such as <code>int</code>, <code>float</code>, etc. as keys and/or values.
@@ -22,7 +22,7 @@
* @deprecated until unit tests are in place. Until this time, this class/interface is unsupported.
*/
@Deprecated
-public abstract class AbstractMap extends org.apache.mahout.colt.PersistentObject {
+public abstract class AbstractMap extends org.apache.mahout.matrix.PersistentObject {
//public static boolean debug = false; // debug only
/**
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/Benchmark.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/Benchmark.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/Benchmark.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/Benchmark.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.map;
+package org.apache.mahout.matrix.map;
-import org.apache.mahout.colt.Timer;
+import org.apache.mahout.matrix.Timer;
/**
* Benchmarks the classes of this package.
*
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/HashFunctions.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/HashFunctions.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/HashFunctions.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/HashFunctions.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.map;
+package org.apache.mahout.matrix.map;
/**
* Provides various hash functions.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/OpenDoubleIntHashMap.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/OpenDoubleIntHashMap.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/OpenDoubleIntHashMap.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/OpenDoubleIntHashMap.java Mon Nov 23 16:34:55 2009
@@ -6,13 +6,13 @@
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.map;
+package org.apache.mahout.matrix.map;
-import org.apache.mahout.colt.function.DoubleIntProcedure;
-import org.apache.mahout.colt.function.DoubleProcedure;
-import org.apache.mahout.colt.list.ByteArrayList;
-import org.apache.mahout.colt.list.DoubleArrayList;
-import org.apache.mahout.colt.list.IntArrayList;
+import org.apache.mahout.matrix.function.DoubleIntProcedure;
+import org.apache.mahout.matrix.function.DoubleProcedure;
+import org.apache.mahout.matrix.list.ByteArrayList;
+import org.apache.mahout.matrix.list.DoubleArrayList;
+import org.apache.mahout.matrix.list.IntArrayList;
/**
Hash map holding (key,value) associations of type <tt>(double-->int)</tt>; Automatically grows and shrinks as needed; Implemented using open addressing with double hashing.
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.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/OpenIntDoubleHashMap.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/OpenIntDoubleHashMap.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/OpenIntDoubleHashMap.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/OpenIntDoubleHashMap.java Mon Nov 23 16:34:55 2009
@@ -6,13 +6,13 @@
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.map;
+package org.apache.mahout.matrix.map;
-import org.apache.mahout.colt.function.IntDoubleProcedure;
-import org.apache.mahout.colt.function.IntProcedure;
-import org.apache.mahout.colt.list.ByteArrayList;
-import org.apache.mahout.colt.list.DoubleArrayList;
-import org.apache.mahout.colt.list.IntArrayList;
+import org.apache.mahout.matrix.function.IntDoubleProcedure;
+import org.apache.mahout.matrix.function.IntProcedure;
+import org.apache.mahout.matrix.list.ByteArrayList;
+import org.apache.mahout.matrix.list.DoubleArrayList;
+import org.apache.mahout.matrix.list.IntArrayList;
/**
Hash map holding (key,value) associations of type <tt>(int-->double)</tt>; Automatically grows and shrinks as needed; Implemented using open addressing with double hashing.
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.
@@ -91,7 +91,7 @@
@param function a function object taking as argument the current association's value.
*/
-public void assign(org.apache.mahout.colt.function.DoubleFunction function) {
+public void assign(org.apache.mahout.matrix.function.DoubleFunction function) {
// specialization for speed
if (function instanceof org.apache.mahout.jet.math.Mult) { // x[i] = mult*x[i]
double multiplicator = ((org.apache.mahout.jet.math.Mult)function).multiplicator;
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/OpenIntIntHashMap.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/OpenIntIntHashMap.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/OpenIntIntHashMap.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/OpenIntIntHashMap.java Mon Nov 23 16:34:55 2009
@@ -6,12 +6,12 @@
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.map;
+package org.apache.mahout.matrix.map;
-import org.apache.mahout.colt.function.IntIntProcedure;
-import org.apache.mahout.colt.function.IntProcedure;
-import org.apache.mahout.colt.list.ByteArrayList;
-import org.apache.mahout.colt.list.IntArrayList;
+import org.apache.mahout.matrix.function.IntIntProcedure;
+import org.apache.mahout.matrix.function.IntProcedure;
+import org.apache.mahout.matrix.list.ByteArrayList;
+import org.apache.mahout.matrix.list.IntArrayList;
/**
Hash map holding (key,value) associations of type <tt>(int-->int)</tt>; Automatically grows and shrinks as needed; Implemented using open addressing with double hashing.
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.
@@ -26,7 +26,7 @@
* @deprecated until unit tests are in place. Until this time, this class/interface is unsupported.
*/
@Deprecated
-public class OpenIntIntHashMap extends AbstractIntIntMap {
+public class OpenIntIntHashMap extends org.apache.mahout.matrix.map.AbstractIntIntMap {
/**
* The hash table keys.
* @serial
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/OpenIntObjectHashMap.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/OpenIntObjectHashMap.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/OpenIntObjectHashMap.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/OpenIntObjectHashMap.java Mon Nov 23 16:34:55 2009
@@ -6,13 +6,13 @@
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.map;
+package org.apache.mahout.matrix.map;
-import org.apache.mahout.colt.function.IntObjectProcedure;
-import org.apache.mahout.colt.function.IntProcedure;
-import org.apache.mahout.colt.list.ByteArrayList;
-import org.apache.mahout.colt.list.IntArrayList;
-import org.apache.mahout.colt.list.ObjectArrayList;
+import org.apache.mahout.matrix.function.IntObjectProcedure;
+import org.apache.mahout.matrix.function.IntProcedure;
+import org.apache.mahout.matrix.list.ByteArrayList;
+import org.apache.mahout.matrix.list.IntArrayList;
+import org.apache.mahout.matrix.list.ObjectArrayList;
/**
Hash map holding (key,value) associations of type <tt>(int-->Object)</tt>; Automatically grows and shrinks as needed; Implemented using open addressing with double hashing.
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.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/OpenLongObjectHashMap.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/OpenLongObjectHashMap.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/OpenLongObjectHashMap.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/OpenLongObjectHashMap.java Mon Nov 23 16:34:55 2009
@@ -6,13 +6,13 @@
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.map;
+package org.apache.mahout.matrix.map;
-import org.apache.mahout.colt.function.LongObjectProcedure;
-import org.apache.mahout.colt.function.LongProcedure;
-import org.apache.mahout.colt.list.ByteArrayList;
-import org.apache.mahout.colt.list.LongArrayList;
-import org.apache.mahout.colt.list.ObjectArrayList;
+import org.apache.mahout.matrix.function.LongObjectProcedure;
+import org.apache.mahout.matrix.function.LongProcedure;
+import org.apache.mahout.matrix.list.ByteArrayList;
+import org.apache.mahout.matrix.list.LongArrayList;
+import org.apache.mahout.matrix.list.ObjectArrayList;
/**
Hash map holding (key,value) associations of type <tt>(long-->Object)</tt>; Automatically grows and shrinks as needed; Implemented using open addressing with double hashing.
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.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/PrimeFinder.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/PrimeFinder.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/PrimeFinder.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/PrimeFinder.java Mon Nov 23 16:34:55 2009
@@ -1,4 +1,4 @@
-package org.apache.mahout.colt.map;
+package org.apache.mahout.matrix.map;
/**
* Not of interest for users; only for implementors of hashtables.
@@ -130,7 +130,7 @@
// To find numbers fast, we sort them once and for all.
java.util.Arrays.sort(primeCapacities);
- //new org.apache.mahout.colt.list.IntArrayList(primeCapacities).mergeSort(); // for debug only, TODO
+ //new org.apache.mahout.matrix.list.IntArrayList(primeCapacities).mergeSort(); // for debug only, TODO
}
/**
@@ -157,7 +157,7 @@
*/
public static int nextPrime(int desiredCapacity) {
int i = java.util.Arrays.binarySearch(primeCapacities, desiredCapacity);
- //int i = new org.apache.mahout.colt.list.IntArrayList(primeCapacities).binarySearch(desiredCapacity); // for debug only TODO
+ //int i = new org.apache.mahout.matrix.list.IntArrayList(primeCapacities).binarySearch(desiredCapacity); // for debug only TODO
if (i<0) {
// desired capacity not found, choose next prime greater than desired capacity
i = -i -1; // remember the semantics of binarySearch...
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/QuickOpenIntIntHashMap.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/QuickOpenIntIntHashMap.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/QuickOpenIntIntHashMap.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/QuickOpenIntIntHashMap.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.map;
+package org.apache.mahout.matrix.map;
/**
Status: Experimental; Do not use for production yet. Hash map holding (key,value) associations of type <tt>(int-->int)</tt>; Automatically grows and shrinks as needed; Implemented using open addressing with double hashing.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/DoubleFactory1D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/DoubleFactory1D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/DoubleFactory1D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/DoubleFactory1D.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.matrix;
+package org.apache.mahout.matrix.matrix;
-import org.apache.mahout.colt.matrix.impl.DenseDoubleMatrix1D;
-import org.apache.mahout.colt.matrix.impl.SparseDoubleMatrix1D;
+import org.apache.mahout.matrix.matrix.impl.DenseDoubleMatrix1D;
+import org.apache.mahout.matrix.matrix.impl.SparseDoubleMatrix1D;
/**
Factory for convenient construction of 1-d matrices holding <tt>double</tt> cells.
Use idioms like <tt>DoubleFactory1D.dense.make(1000)</tt> to construct dense matrices,
@@ -36,7 +36,7 @@
* @deprecated until unit tests are in place. Until this time, this class/interface is unsupported.
*/
@Deprecated
-public class DoubleFactory1D extends org.apache.mahout.colt.PersistentObject {
+public class DoubleFactory1D extends org.apache.mahout.matrix.PersistentObject {
/**
* A factory producing dense matrices.
*/
@@ -132,7 +132,7 @@
* @param values The values to be filled into the new matrix.
* @return a new matrix.
*/
-public DoubleMatrix1D make(org.apache.mahout.colt.list.AbstractDoubleList values) {
+public DoubleMatrix1D make(org.apache.mahout.matrix.list.AbstractDoubleList values) {
int size = values.size();
DoubleMatrix1D vector = make(size);
for (int i=size; --i >= 0; ) vector.set(i, values.get(i));
@@ -195,9 +195,9 @@
* @param values The values to be filled into the new list.
* @return a new list.
*/
-public org.apache.mahout.colt.list.DoubleArrayList toList(DoubleMatrix1D values) {
+public org.apache.mahout.matrix.list.DoubleArrayList toList(DoubleMatrix1D values) {
int size = values.size();
- org.apache.mahout.colt.list.DoubleArrayList list = new org.apache.mahout.colt.list.DoubleArrayList(size);
+ org.apache.mahout.matrix.list.DoubleArrayList list = new org.apache.mahout.matrix.list.DoubleArrayList(size);
list.setSize(size);
for (int i=size; --i >= 0; ) list.set(i, values.get(i));
return list;
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/DoubleFactory2D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/DoubleFactory2D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/DoubleFactory2D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/DoubleFactory2D.java Mon Nov 23 16:34:55 2009
@@ -6,11 +6,11 @@
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.matrix;
+package org.apache.mahout.matrix.matrix;
-import org.apache.mahout.colt.matrix.impl.DenseDoubleMatrix2D;
-import org.apache.mahout.colt.matrix.impl.RCDoubleMatrix2D;
-import org.apache.mahout.colt.matrix.impl.SparseDoubleMatrix2D;
+import org.apache.mahout.matrix.matrix.impl.DenseDoubleMatrix2D;
+import org.apache.mahout.matrix.matrix.impl.RCDoubleMatrix2D;
+import org.apache.mahout.matrix.matrix.impl.SparseDoubleMatrix2D;
/**
Factory for convenient construction of 2-d matrices holding <tt>double</tt>
cells. Also provides convenient methods to compose (concatenate) and decompose
@@ -78,7 +78,7 @@
* @deprecated until unit tests are in place. Until this time, this class/interface is unsupported.
*/
@Deprecated
-public class DoubleFactory2D extends org.apache.mahout.colt.PersistentObject {
+public class DoubleFactory2D extends org.apache.mahout.matrix.PersistentObject {
/**
* A factory producing dense matrices.
*/
@@ -541,7 +541,7 @@
{ null, make(2,2,4), null }
};
System.out.println("\n"+compose(parts1));
-//System.out.println("\n"+org.apache.mahout.colt.matrixpattern.Converting.toHTML(make(parts1).toString()));
+//System.out.println("\n"+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(make(parts1).toString()));
/*
//
@@ -562,7 +562,7 @@
{ identity(3).viewRowFlip(), null }
};
System.out.println("\n"+compose(parts3));
-//System.out.println("\n"+org.apache.mahout.colt.matrixpattern.Converting.toHTML(make(parts3).toString()));
+//System.out.println("\n"+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(make(parts3).toString()));
DoubleMatrix2D A = ascending(2,2);
DoubleMatrix2D B = descending(2,2);
@@ -574,7 +574,7 @@
{ _, A, _, B }
};
System.out.println("\n"+compose(parts4));
-//System.out.println("\n"+org.apache.mahout.colt.matrixpattern.Converting.toHTML(make(parts4).toString()));
+//System.out.println("\n"+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(make(parts4).toString()));
}
/**
@@ -601,7 +601,7 @@
System.out.println(B);
System.out.println(C);
System.out.println(D);
-//System.out.println("\n"+org.apache.mahout.colt.matrixpattern.Converting.toHTML(make(parts1).toString()));
+//System.out.println("\n"+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(make(parts1).toString()));
/*
//
@@ -623,7 +623,7 @@
{ identity(3).viewRowFlip(), null }
};
System.out.println("\n"+make(parts3));
-//System.out.println("\n"+org.apache.mahout.colt.matrixpattern.Converting.toHTML(make(parts3).toString()));
+//System.out.println("\n"+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(make(parts3).toString()));
DoubleMatrix2D A = ascending(2,2);
DoubleMatrix2D B = descending(2,2);
@@ -635,7 +635,7 @@
{ _, A, _, B }
};
System.out.println("\n"+make(parts4));
-//System.out.println("\n"+org.apache.mahout.colt.matrixpattern.Converting.toHTML(make(parts4).toString()));
+//System.out.println("\n"+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(make(parts4).toString()));
*/
}
/**
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/DoubleFactory3D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/DoubleFactory3D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/DoubleFactory3D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/DoubleFactory3D.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.matrix;
+package org.apache.mahout.matrix.matrix;
-import org.apache.mahout.colt.matrix.impl.DenseDoubleMatrix3D;
-import org.apache.mahout.colt.matrix.impl.SparseDoubleMatrix3D;
+import org.apache.mahout.matrix.matrix.impl.DenseDoubleMatrix3D;
+import org.apache.mahout.matrix.matrix.impl.SparseDoubleMatrix3D;
/**
Factory for convenient construction of 3-d matrices holding <tt>double</tt> cells.
Use idioms like <tt>DoubleFactory3D.dense.make(4,4,4)</tt> to construct dense matrices,
@@ -36,7 +36,7 @@
* @deprecated until unit tests are in place. Until this time, this class/interface is unsupported.
*/
@Deprecated
-public class DoubleFactory3D extends org.apache.mahout.colt.PersistentObject {
+public class DoubleFactory3D extends org.apache.mahout.matrix.PersistentObject {
/**
* A factory producing dense matrices.
*/
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/DoubleMatrix1D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/DoubleMatrix1D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/DoubleMatrix1D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/DoubleMatrix1D.java Mon Nov 23 16:34:55 2009
@@ -6,11 +6,11 @@
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.matrix;
+package org.apache.mahout.matrix.matrix;
-import org.apache.mahout.colt.list.DoubleArrayList;
-import org.apache.mahout.colt.list.IntArrayList;
-import org.apache.mahout.colt.matrix.impl.AbstractMatrix1D;
+import org.apache.mahout.matrix.list.DoubleArrayList;
+import org.apache.mahout.matrix.list.IntArrayList;
+import org.apache.mahout.matrix.matrix.impl.AbstractMatrix1D;
/**
Abstract base class for 1-d matrices (aka <i>vectors</i>) holding <tt>double</tt> elements.
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.
@@ -52,7 +52,7 @@
@return the aggregated measure.
@see org.apache.mahout.jet.math.Functions
*/
-public double aggregate(org.apache.mahout.colt.function.DoubleDoubleFunction aggr, org.apache.mahout.colt.function.DoubleFunction f) {
+public double aggregate(org.apache.mahout.matrix.function.DoubleDoubleFunction aggr, org.apache.mahout.matrix.function.DoubleFunction f) {
if (size==0) return Double.NaN;
double a = f.apply(getQuick(size-1));
for (int i=size-1; --i >= 0; ) {
@@ -86,7 +86,7 @@
@throws IllegalArgumentException if <tt>size() != other.size()</tt>.
@see org.apache.mahout.jet.math.Functions
*/
-public double aggregate(DoubleMatrix1D other, org.apache.mahout.colt.function.DoubleDoubleFunction aggr, org.apache.mahout.colt.function.DoubleDoubleFunction f) {
+public double aggregate(DoubleMatrix1D other, org.apache.mahout.matrix.function.DoubleDoubleFunction aggr, org.apache.mahout.matrix.function.DoubleDoubleFunction f) {
checkSize(other);
if (size==0) return Double.NaN;
double a = f.apply(getQuick(size-1),other.getQuick(size-1));
@@ -141,7 +141,7 @@
@return <tt>this</tt> (for convenience only).
@see org.apache.mahout.jet.math.Functions
*/
-public DoubleMatrix1D assign(org.apache.mahout.colt.function.DoubleFunction function) {
+public DoubleMatrix1D assign(org.apache.mahout.matrix.function.DoubleFunction function) {
for (int i=size; --i >= 0; ) {
setQuick(i, function.apply(getQuick(i)));
}
@@ -187,7 +187,7 @@
@throws IllegalArgumentException if <tt>size() != y.size()</tt>.
@see org.apache.mahout.jet.math.Functions
*/
-public DoubleMatrix1D assign(DoubleMatrix1D y, org.apache.mahout.colt.function.DoubleDoubleFunction function) {
+public DoubleMatrix1D assign(DoubleMatrix1D y, org.apache.mahout.matrix.function.DoubleDoubleFunction function) {
checkSize(y);
for (int i=size; --i >= 0; ) {
setQuick(i, function.apply(getQuick(i), y.getQuick(i)));
@@ -223,7 +223,7 @@
@throws IllegalArgumentException if <tt>size() != y.size()</tt>.
@see org.apache.mahout.jet.math.Functions
*/
-public DoubleMatrix1D assign(DoubleMatrix1D y, org.apache.mahout.colt.function.DoubleDoubleFunction function, org.apache.mahout.colt.list.IntArrayList nonZeroIndexes) {
+public DoubleMatrix1D assign(DoubleMatrix1D y, org.apache.mahout.matrix.function.DoubleDoubleFunction function, org.apache.mahout.matrix.list.IntArrayList nonZeroIndexes) {
checkSize(y);
int[] nonZeroElements = nonZeroIndexes.elements();
@@ -307,7 +307,7 @@
* @return <tt>true</tt> if all cells are equal to the given value, <tt>false</tt> otherwise.
*/
public boolean equals(double value) {
- return org.apache.mahout.colt.matrix.linalg.Property.DEFAULT.equals(this,value);
+ return org.apache.mahout.matrix.matrix.linalg.Property.DEFAULT.equals(this,value);
}
/**
* Compares this object against the specified object.
@@ -324,7 +324,7 @@
if (obj == null) return false;
if (!(obj instanceof DoubleMatrix1D)) return false;
- return org.apache.mahout.colt.matrix.linalg.Property.DEFAULT.equals(this,(DoubleMatrix1D) obj);
+ return org.apache.mahout.matrix.matrix.linalg.Property.DEFAULT.equals(this,(DoubleMatrix1D) obj);
}
/**
* Returns the matrix cell value at coordinate <tt>index</tt>.
@@ -545,10 +545,10 @@
}
/**
* Returns a string representation using default formatting.
- * @see org.apache.mahout.colt.matrix.doublealgo.Formatter
+ * @see org.apache.mahout.matrix.matrix.doublealgo.Formatter
*/
public String toString() {
- return new org.apache.mahout.colt.matrix.doublealgo.Formatter().toString(this);
+ return new org.apache.mahout.matrix.matrix.doublealgo.Formatter().toString(this);
}
/**
* Constructs and returns a new view equal to the receiver.
@@ -655,7 +655,7 @@
@param condition The condition to be matched.
@return the new view.
*/
-public DoubleMatrix1D viewSelection(org.apache.mahout.colt.function.DoubleProcedure condition) {
+public DoubleMatrix1D viewSelection(org.apache.mahout.matrix.function.DoubleProcedure condition) {
IntArrayList matches = new IntArrayList();
for (int i=0; i < size; i++) {
if (condition.apply(getQuick(i))) matches.add(i);
@@ -673,12 +673,12 @@
/**
Sorts the vector into ascending order, according to the <i>natural ordering</i>.
This sort is guaranteed to be <i>stable</i>.
-For further information, see {@link org.apache.mahout.colt.matrix.doublealgo.Sorting#sort(DoubleMatrix1D)}.
-For more advanced sorting functionality, see {@link org.apache.mahout.colt.matrix.doublealgo.Sorting}.
+For further information, see {@link org.apache.mahout.matrix.matrix.doublealgo.Sorting#sort(DoubleMatrix1D)}.
+For more advanced sorting functionality, see {@link org.apache.mahout.matrix.matrix.doublealgo.Sorting}.
@return a new sorted vector (matrix) view.
*/
public DoubleMatrix1D viewSorted() {
- return org.apache.mahout.colt.matrix.doublealgo.Sorting.mergeSort.sort(this);
+ return org.apache.mahout.matrix.matrix.doublealgo.Sorting.mergeSort.sort(this);
}
/**
Constructs and returns a new <i>stride view</i> which is a sub matrix consisting of every i-th cell.
@@ -707,7 +707,7 @@
* @param procedure a procedure object taking as argument the current cell's value. 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.
*/
-private boolean xforEach(final org.apache.mahout.colt.function.DoubleProcedure procedure) {
+private boolean xforEach(final org.apache.mahout.matrix.function.DoubleProcedure procedure) {
for (int i=size; --i >= 0;) {
if (!procedure.apply(getQuick(i))) return false;
}
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/DoubleMatrix1DProcedure.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/DoubleMatrix1DProcedure.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/DoubleMatrix1DProcedure.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/DoubleMatrix1DProcedure.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.matrix;
+package org.apache.mahout.matrix.matrix;
/**
* Interface that represents a condition or procedure object: takes
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/DoubleMatrix2D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/DoubleMatrix2D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/DoubleMatrix2D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/DoubleMatrix2D.java Mon Nov 23 16:34:55 2009
@@ -6,13 +6,13 @@
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.matrix;
+package org.apache.mahout.matrix.matrix;
-import org.apache.mahout.colt.list.DoubleArrayList;
-import org.apache.mahout.colt.list.IntArrayList;
-import org.apache.mahout.colt.matrix.impl.AbstractMatrix2D;
-import org.apache.mahout.colt.matrix.impl.DenseDoubleMatrix1D;
-import org.apache.mahout.colt.matrix.impl.DenseDoubleMatrix2D;
+import org.apache.mahout.matrix.list.DoubleArrayList;
+import org.apache.mahout.matrix.list.IntArrayList;
+import org.apache.mahout.matrix.matrix.impl.AbstractMatrix2D;
+import org.apache.mahout.matrix.matrix.impl.DenseDoubleMatrix1D;
+import org.apache.mahout.matrix.matrix.impl.DenseDoubleMatrix2D;
/**
Abstract base class for 2-d matrices holding <tt>double</tt> elements.
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.
@@ -58,7 +58,7 @@
@return the aggregated measure.
@see org.apache.mahout.jet.math.Functions
*/
-public double aggregate(org.apache.mahout.colt.function.DoubleDoubleFunction aggr, org.apache.mahout.colt.function.DoubleFunction f) {
+public double aggregate(org.apache.mahout.matrix.function.DoubleDoubleFunction aggr, org.apache.mahout.matrix.function.DoubleFunction f) {
if (size()==0) return Double.NaN;
double a = f.apply(getQuick(rows-1,columns-1));
int d = 1; // last cell already done
@@ -101,7 +101,7 @@
@throws IllegalArgumentException if <tt>columns() != other.columns() || rows() != other.rows()</tt>
@see org.apache.mahout.jet.math.Functions
*/
-public double aggregate(DoubleMatrix2D other, org.apache.mahout.colt.function.DoubleDoubleFunction aggr, org.apache.mahout.colt.function.DoubleDoubleFunction f) {
+public double aggregate(DoubleMatrix2D other, org.apache.mahout.matrix.function.DoubleDoubleFunction aggr, org.apache.mahout.matrix.function.DoubleDoubleFunction f) {
checkShape(other);
if (size()==0) return Double.NaN;
double a = f.apply(getQuick(rows-1,columns-1),other.getQuick(rows-1,columns-1));
@@ -175,7 +175,7 @@
@return <tt>this</tt> (for convenience only).
@see org.apache.mahout.jet.math.Functions
*/
-public DoubleMatrix2D assign(org.apache.mahout.colt.function.DoubleFunction function) {
+public DoubleMatrix2D assign(org.apache.mahout.matrix.function.DoubleFunction function) {
for (int row=rows; --row >= 0; ) {
for (int column=columns; --column >= 0; ) {
setQuick(row,column, function.apply(getQuick(row,column)));
@@ -235,7 +235,7 @@
@throws IllegalArgumentException if <tt>columns() != other.columns() || rows() != other.rows()</tt>
@see org.apache.mahout.jet.math.Functions
*/
-public DoubleMatrix2D assign(DoubleMatrix2D y, org.apache.mahout.colt.function.DoubleDoubleFunction function) {
+public DoubleMatrix2D assign(DoubleMatrix2D y, org.apache.mahout.matrix.function.DoubleDoubleFunction function) {
checkShape(y);
for (int row=rows; --row >= 0; ) {
for (int column=columns; --column >= 0; ) {
@@ -274,7 +274,7 @@
* @return <tt>true</tt> if all cells are equal to the given value, <tt>false</tt> otherwise.
*/
public boolean equals(double value) {
- return org.apache.mahout.colt.matrix.linalg.Property.DEFAULT.equals(this,value);
+ return org.apache.mahout.matrix.matrix.linalg.Property.DEFAULT.equals(this,value);
}
/**
* Compares this object against the specified object.
@@ -291,7 +291,7 @@
if (obj == null) return false;
if (!(obj instanceof DoubleMatrix2D)) return false;
- return org.apache.mahout.colt.matrix.linalg.Property.DEFAULT.equals(this,(DoubleMatrix2D) obj);
+ return org.apache.mahout.matrix.matrix.linalg.Property.DEFAULT.equals(this,(DoubleMatrix2D) obj);
}
/**
* Assigns the result of a function to each <i>non-zero</i> cell; <tt>x[row,col] = function(x[row,col])</tt>.
@@ -303,7 +303,7 @@
* @param function a function object taking as argument the current non-zero cell's row, column and value.
* @return <tt>this</tt> (for convenience only).
*/
-public DoubleMatrix2D forEachNonZero(final org.apache.mahout.colt.function.IntIntDoubleFunction function) {
+public DoubleMatrix2D forEachNonZero(final org.apache.mahout.matrix.function.IntIntDoubleFunction function) {
for (int row=rows; --row >= 0;) {
for (int column=columns; --column >= 0;) {
double value = getQuick(row,column);
@@ -491,10 +491,10 @@
}
/**
* Returns a string representation using default formatting.
- * @see org.apache.mahout.colt.matrix.doublealgo.Formatter
+ * @see org.apache.mahout.matrix.matrix.doublealgo.Formatter
*/
public String toString() {
- return new org.apache.mahout.colt.matrix.doublealgo.Formatter().toString(this);
+ return new org.apache.mahout.matrix.matrix.doublealgo.Formatter().toString(this);
}
/**
* Constructs and returns a new view equal to the receiver.
@@ -783,13 +783,13 @@
/**
Sorts the matrix rows into ascending order, according to the <i>natural ordering</i> of the matrix values in the given column.
This sort is guaranteed to be <i>stable</i>.
-For further information, see {@link org.apache.mahout.colt.matrix.doublealgo.Sorting#sort(DoubleMatrix2D,int)}.
-For more advanced sorting functionality, see {@link org.apache.mahout.colt.matrix.doublealgo.Sorting}.
+For further information, see {@link org.apache.mahout.matrix.matrix.doublealgo.Sorting#sort(DoubleMatrix2D,int)}.
+For more advanced sorting functionality, see {@link org.apache.mahout.matrix.matrix.doublealgo.Sorting}.
@return a new sorted vector (matrix) view.
@throws IndexOutOfBoundsException if <tt>column < 0 || column >= columns()</tt>.
*/
public DoubleMatrix2D viewSorted(int column) {
- return org.apache.mahout.colt.matrix.doublealgo.Sorting.mergeSort.sort(this,column);
+ return org.apache.mahout.matrix.matrix.doublealgo.Sorting.mergeSort.sort(this,column);
}
/**
Constructs and returns a new <i>stride view</i> which is a sub matrix consisting of every i-th cell.
@@ -821,7 +821,7 @@
* @param procedure a procedure object taking as argument the current cell's value. 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.
*/
-private boolean xforEach(final org.apache.mahout.colt.function.DoubleProcedure procedure) {
+private boolean xforEach(final org.apache.mahout.matrix.function.DoubleProcedure procedure) {
for (int row=rows; --row >= 0;) {
for (int column=columns; --column >= 0;) {
if (!procedure.apply(getQuick(row,column))) return false;
@@ -856,7 +856,7 @@
final double beta = 0.75;
// 8 neighbors
-org.apache.mahout.colt.function.Double9Function f = new org.apache.mahout.colt.function.Double9Function() {
+org.apache.mahout.matrix.function.Double9Function f = new org.apache.mahout.matrix.function.Double9Function() {
public final double apply(
double a00, double a01, double a02,
double a10, double a11, double a12,
@@ -867,7 +867,7 @@
A.zAssign8Neighbors(B,f);
// 4 neighbors
-org.apache.mahout.colt.function.Double9Function g = new org.apache.mahout.colt.function.Double9Function() {
+org.apache.mahout.matrix.function.Double9Function g = new org.apache.mahout.matrix.function.Double9Function() {
public final double apply(
double a00, double a01, double a02,
double a10, double a11, double a12,
@@ -883,7 +883,7 @@
@throws NullPointerException if <tt>function==null</tt>.
@throws IllegalArgumentException if <tt>rows() != B.rows() || columns() != B.columns()</tt>.
*/
-public void zAssign8Neighbors(DoubleMatrix2D B, org.apache.mahout.colt.function.Double9Function function) {
+public void zAssign8Neighbors(DoubleMatrix2D B, org.apache.mahout.matrix.function.Double9Function function) {
if (function==null) throw new NullPointerException("function must not be null.");
checkShape(B);
if (rows<3 || columns<3) return; // nothing to do
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/DoubleMatrix2DProcedure.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/DoubleMatrix2DProcedure.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/DoubleMatrix2DProcedure.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/DoubleMatrix2DProcedure.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.matrix;
+package org.apache.mahout.matrix.matrix;
/**
* Interface that represents a condition or procedure object: takes