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 [6/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/matrix/impl/SparseDoubleMatrix2D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SparseDoubleMatrix2D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SparseDoubleMatrix2D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SparseDoubleMatrix2D.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.matrix.impl;
+package org.apache.mahout.matrix.matrix.impl;
-import org.apache.mahout.colt.map.AbstractIntDoubleMap;
-import org.apache.mahout.colt.map.OpenIntDoubleHashMap;
-import org.apache.mahout.colt.matrix.DoubleMatrix1D;
-import org.apache.mahout.colt.matrix.DoubleMatrix2D;
+import org.apache.mahout.matrix.map.AbstractIntDoubleMap;
+import org.apache.mahout.matrix.map.OpenIntDoubleHashMap;
+import org.apache.mahout.matrix.matrix.DoubleMatrix1D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix2D;
/**
Sparse hashed 2-d matrix 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.
@@ -19,7 +19,7 @@
<b>Implementation:</b>
<p>
Note that this implementation is not synchronized.
-Uses a {@link org.apache.mahout.colt.map.OpenIntDoubleHashMap}, which is a compact and performant hashing technique.
+Uses a {@link org.apache.mahout.matrix.map.OpenIntDoubleHashMap}, which is a compact and performant hashing technique.
<p>
<b>Memory requirements:</b>
<p>
@@ -65,8 +65,8 @@
}
</pre>
-@see org.apache.mahout.colt.map
-@see org.apache.mahout.colt.map.OpenIntDoubleHashMap
+@see org.apache.mahout.matrix.map
+@see org.apache.mahout.matrix.map.OpenIntDoubleHashMap
@author wolfgang.hoschek@cern.ch
@version 1.0, 09/24/99
*/
@@ -107,7 +107,7 @@
/**
* Constructs a matrix with a given number of rows and columns using memory as specified.
* All entries are initially <tt>0</tt>.
- * For details related to memory usage see {@link org.apache.mahout.colt.map.OpenIntDoubleHashMap}.
+ * For details related to memory usage see {@link org.apache.mahout.matrix.map.OpenIntDoubleHashMap}.
*
* @param rows the number of rows the matrix shall have.
* @param columns the number of columns the matrix shall have.
@@ -171,7 +171,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) {
if (this.isNoView && function instanceof org.apache.mahout.jet.math.Mult) { // x[i] = mult*x[i]
this.elements.assign(function);
}
@@ -204,7 +204,7 @@
}
return super.assign(source);
}
-public DoubleMatrix2D assign(final DoubleMatrix2D y, org.apache.mahout.colt.function.DoubleDoubleFunction function) {
+public DoubleMatrix2D assign(final DoubleMatrix2D y, org.apache.mahout.matrix.function.DoubleDoubleFunction function) {
if (!this.isNoView) return super.assign(y,function);
checkShape(y);
@@ -213,7 +213,7 @@
final double alpha = ((org.apache.mahout.jet.math.PlusMult) function).multiplicator;
if (alpha==0) return this; // nothing to do
y.forEachNonZero(
- new org.apache.mahout.colt.function.IntIntDoubleFunction() {
+ new org.apache.mahout.matrix.function.IntIntDoubleFunction() {
public double apply(int i, int j, double value) {
setQuick(i,j,getQuick(i,j) + alpha*value);
return value;
@@ -225,7 +225,7 @@
if (function== org.apache.mahout.jet.math.Functions.mult) { // x[i] = x[i] * y[i]
this.elements.forEachPair(
- new org.apache.mahout.colt.function.IntDoubleProcedure() {
+ new org.apache.mahout.matrix.function.IntDoubleProcedure() {
public boolean apply(int key, double value) {
int i = key/columns;
int j = key%columns;
@@ -239,7 +239,7 @@
if (function== org.apache.mahout.jet.math.Functions.div) { // x[i] = x[i] / y[i]
this.elements.forEachPair(
- new org.apache.mahout.colt.function.IntDoubleProcedure() {
+ new org.apache.mahout.matrix.function.IntDoubleProcedure() {
public boolean apply(int key, double value) {
int i = key/columns;
int j = key%columns;
@@ -273,10 +273,10 @@
public void ensureCapacity(int minCapacity) {
this.elements.ensureCapacity(minCapacity);
}
-public DoubleMatrix2D forEachNonZero(final org.apache.mahout.colt.function.IntIntDoubleFunction function) {
+public DoubleMatrix2D forEachNonZero(final org.apache.mahout.matrix.function.IntIntDoubleFunction function) {
if (this.isNoView) {
this.elements.forEachPair(
- new org.apache.mahout.colt.function.IntDoubleProcedure() {
+ new org.apache.mahout.matrix.function.IntDoubleProcedure() {
public boolean apply(int key, double value) {
int i = key/columns;
int j = key%columns;
@@ -463,7 +463,7 @@
if (yElements==null || zElements==null) throw new InternalError();
this.elements.forEachPair(
- new org.apache.mahout.colt.function.IntDoubleProcedure() {
+ new org.apache.mahout.matrix.function.IntDoubleProcedure() {
public boolean apply(int key, double value) {
int i = key/columns;
int j = key%columns;
@@ -477,7 +477,7 @@
/*
forEachNonZero(
- new org.apache.mahout.colt.function.IntIntDoubleFunction() {
+ new org.apache.mahout.matrix.function.IntIntDoubleFunction() {
public double apply(int i, int j, double value) {
if (transposeA) { int tmp=i; i=j; j=tmp; }
zElements[zi + zStride*i] += value * yElements[yi + yStride*j];
@@ -525,7 +525,7 @@
final org.apache.mahout.jet.math.PlusMult fun = org.apache.mahout.jet.math.PlusMult.plusMult(0);
this.elements.forEachPair(
- new org.apache.mahout.colt.function.IntDoubleProcedure() {
+ new org.apache.mahout.matrix.function.IntDoubleProcedure() {
public boolean apply(int key, double value) {
int i = key/columns;
int j = key%columns;
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SparseDoubleMatrix3D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SparseDoubleMatrix3D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SparseDoubleMatrix3D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SparseDoubleMatrix3D.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.matrix.impl;
+package org.apache.mahout.matrix.matrix.impl;
-import org.apache.mahout.colt.map.AbstractIntDoubleMap;
-import org.apache.mahout.colt.map.OpenIntDoubleHashMap;
-import org.apache.mahout.colt.matrix.DoubleMatrix2D;
-import org.apache.mahout.colt.matrix.DoubleMatrix3D;
+import org.apache.mahout.matrix.map.AbstractIntDoubleMap;
+import org.apache.mahout.matrix.map.OpenIntDoubleHashMap;
+import org.apache.mahout.matrix.matrix.DoubleMatrix2D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix3D;
/**
Sparse hashed 3-d matrix 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.
@@ -19,7 +19,7 @@
<b>Implementation:</b>
<p>
Note that this implementation is not synchronized.
-Uses a {@link org.apache.mahout.colt.map.OpenIntDoubleHashMap}, which is a compact and performant hashing technique.
+Uses a {@link org.apache.mahout.matrix.map.OpenIntDoubleHashMap}, which is a compact and performant hashing technique.
<p>
<b>Memory requirements:</b>
<p>
@@ -69,8 +69,8 @@
}
</pre>
-@see org.apache.mahout.colt.map
-@see org.apache.mahout.colt.map.OpenIntDoubleHashMap
+@see org.apache.mahout.matrix.map
+@see org.apache.mahout.matrix.map.OpenIntDoubleHashMap
@author wolfgang.hoschek@cern.ch
@version 1.0, 09/24/99
*/
@@ -113,7 +113,7 @@
/**
* Constructs a matrix with a given number of slices, rows and columns using memory as specified.
* All entries are initially <tt>0</tt>.
- * For details related to memory usage see {@link org.apache.mahout.colt.map.OpenIntDoubleHashMap}.
+ * For details related to memory usage see {@link org.apache.mahout.matrix.map.OpenIntDoubleHashMap}.
*
* @param slices the number of slices the matrix shall have.
* @param rows the number of rows the matrix shall have.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SparseObjectMatrix1D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SparseObjectMatrix1D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SparseObjectMatrix1D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SparseObjectMatrix1D.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.matrix.impl;
+package org.apache.mahout.matrix.matrix.impl;
-import org.apache.mahout.colt.map.AbstractIntObjectMap;
-import org.apache.mahout.colt.map.OpenIntObjectHashMap;
-import org.apache.mahout.colt.matrix.ObjectMatrix1D;
-import org.apache.mahout.colt.matrix.ObjectMatrix2D;
+import org.apache.mahout.matrix.map.AbstractIntObjectMap;
+import org.apache.mahout.matrix.map.OpenIntObjectHashMap;
+import org.apache.mahout.matrix.matrix.ObjectMatrix1D;
+import org.apache.mahout.matrix.matrix.ObjectMatrix2D;
/**
Sparse hashed 1-d matrix (aka <i>vector</i>) holding <tt>Object</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.
@@ -19,7 +19,7 @@
<b>Implementation:</b>
<p>
Note that this implementation is not synchronized.
-Uses a {@link org.apache.mahout.colt.map.OpenIntObjectHashMap}, which is a compact and performant hashing technique.
+Uses a {@link org.apache.mahout.matrix.map.OpenIntObjectHashMap}, which is a compact and performant hashing technique.
<p>
<b>Memory requirements:</b>
<p>
@@ -79,7 +79,7 @@
/**
* Constructs a matrix with a given number of parameters.
* All entries are initially <tt>null</tt>.
- * For details related to memory usage see {@link org.apache.mahout.colt.map.OpenIntObjectHashMap}.
+ * For details related to memory usage see {@link org.apache.mahout.matrix.map.OpenIntObjectHashMap}.
*
* @param size the number of cells the matrix shall have.
* @param initialCapacity the initial capacity of the hash map.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SparseObjectMatrix2D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SparseObjectMatrix2D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SparseObjectMatrix2D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SparseObjectMatrix2D.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.matrix.impl;
+package org.apache.mahout.matrix.matrix.impl;
-import org.apache.mahout.colt.map.AbstractIntObjectMap;
-import org.apache.mahout.colt.map.OpenIntObjectHashMap;
-import org.apache.mahout.colt.matrix.ObjectMatrix1D;
-import org.apache.mahout.colt.matrix.ObjectMatrix2D;
+import org.apache.mahout.matrix.map.AbstractIntObjectMap;
+import org.apache.mahout.matrix.map.OpenIntObjectHashMap;
+import org.apache.mahout.matrix.matrix.ObjectMatrix1D;
+import org.apache.mahout.matrix.matrix.ObjectMatrix2D;
/**
Sparse hashed 2-d matrix holding <tt>Object</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.
@@ -19,7 +19,7 @@
<b>Implementation:</b>
<p>
Note that this implementation is not synchronized.
-Uses a {@link org.apache.mahout.colt.map.OpenIntObjectHashMap}, which is a compact and performant hashing technique.
+Uses a {@link org.apache.mahout.matrix.map.OpenIntObjectHashMap}, which is a compact and performant hashing technique.
<p>
<b>Memory requirements:</b>
<p>
@@ -65,8 +65,8 @@
}
</pre>
-@see org.apache.mahout.colt.map
-@see org.apache.mahout.colt.map.OpenIntObjectHashMap
+@see org.apache.mahout.matrix.map
+@see org.apache.mahout.matrix.map.OpenIntObjectHashMap
@author wolfgang.hoschek@cern.ch
@version 1.0, 09/24/99
*/
@@ -106,7 +106,7 @@
/**
* Constructs a matrix with a given number of rows and columns using memory as specified.
* All entries are initially <tt>null</tt>.
- * For details related to memory usage see {@link org.apache.mahout.colt.map.OpenIntObjectHashMap}.
+ * For details related to memory usage see {@link org.apache.mahout.matrix.map.OpenIntObjectHashMap}.
*
* @param rows the number of rows the matrix shall have.
* @param columns the number of columns the matrix shall have.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SparseObjectMatrix3D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SparseObjectMatrix3D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SparseObjectMatrix3D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SparseObjectMatrix3D.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.matrix.impl;
+package org.apache.mahout.matrix.matrix.impl;
-import org.apache.mahout.colt.map.AbstractIntObjectMap;
-import org.apache.mahout.colt.map.OpenIntObjectHashMap;
-import org.apache.mahout.colt.matrix.ObjectMatrix2D;
-import org.apache.mahout.colt.matrix.ObjectMatrix3D;
+import org.apache.mahout.matrix.map.AbstractIntObjectMap;
+import org.apache.mahout.matrix.map.OpenIntObjectHashMap;
+import org.apache.mahout.matrix.matrix.ObjectMatrix2D;
+import org.apache.mahout.matrix.matrix.ObjectMatrix3D;
/**
Sparse hashed 3-d matrix holding <tt>Object</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.
@@ -19,7 +19,7 @@
<b>Implementation:</b>
<p>
Note that this implementation is not synchronized.
-Uses a {@link org.apache.mahout.colt.map.OpenIntObjectHashMap}, which is a compact and performant hashing technique.
+Uses a {@link org.apache.mahout.matrix.map.OpenIntObjectHashMap}, which is a compact and performant hashing technique.
<p>
<b>Memory requirements:</b>
<p>
@@ -69,8 +69,8 @@
}
</pre>
-@see org.apache.mahout.colt.map
-@see org.apache.mahout.colt.map.OpenIntObjectHashMap
+@see org.apache.mahout.matrix.map
+@see org.apache.mahout.matrix.map.OpenIntObjectHashMap
@author wolfgang.hoschek@cern.ch
@version 1.0, 09/24/99
*/
@@ -113,7 +113,7 @@
/**
* Constructs a matrix with a given number of slices, rows and columns using memory as specified.
* All entries are initially <tt>null</tt>.
- * For details related to memory usage see {@link org.apache.mahout.colt.map.OpenIntObjectHashMap}.
+ * For details related to memory usage see {@link org.apache.mahout.matrix.map.OpenIntObjectHashMap}.
*
* @param slices the number of slices the matrix shall have.
* @param rows the number of rows the matrix shall have.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/TestMatrix2D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/TestMatrix2D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/TestMatrix2D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/TestMatrix2D.java Mon Nov 23 16:34:55 2009
@@ -6,21 +6,21 @@
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.impl;
+package org.apache.mahout.matrix.matrix.impl;
-import org.apache.mahout.colt.function.DoubleDoubleFunction;
-import org.apache.mahout.colt.function.DoubleFunction;
-import org.apache.mahout.colt.list.IntArrayList;
-import org.apache.mahout.colt.map.AbstractIntDoubleMap;
-import org.apache.mahout.colt.map.OpenIntDoubleHashMap;
-import org.apache.mahout.colt.matrix.DoubleFactory2D;
-import org.apache.mahout.colt.matrix.DoubleMatrix1D;
-import org.apache.mahout.colt.matrix.DoubleMatrix2D;
-import org.apache.mahout.colt.matrix.DoubleMatrix3D;
-import org.apache.mahout.colt.matrix.doublealgo.DoubleMatrix2DComparator;
-import org.apache.mahout.colt.matrix.linalg.Algebra;
-import org.apache.mahout.colt.matrix.linalg.LUDecompositionQuick;
-import org.apache.mahout.colt.matrix.linalg.SeqBlas;
+import org.apache.mahout.matrix.function.DoubleDoubleFunction;
+import org.apache.mahout.matrix.function.DoubleFunction;
+import org.apache.mahout.matrix.list.IntArrayList;
+import org.apache.mahout.matrix.map.AbstractIntDoubleMap;
+import org.apache.mahout.matrix.map.OpenIntDoubleHashMap;
+import org.apache.mahout.matrix.matrix.DoubleFactory2D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix1D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix2D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix3D;
+import org.apache.mahout.matrix.matrix.doublealgo.DoubleMatrix2DComparator;
+import org.apache.mahout.matrix.matrix.linalg.Algebra;
+import org.apache.mahout.matrix.matrix.linalg.LUDecompositionQuick;
+import org.apache.mahout.matrix.matrix.linalg.SeqBlas;
/**
* Quick and dirty tests.
*
@@ -29,11 +29,11 @@
*/
class TestMatrix2D {
private static final org.apache.mahout.jet.math.Functions F = org.apache.mahout.jet.math.Functions.functions;
- private static final org.apache.mahout.colt.matrix.DoubleFactory2D Factory2D = org.apache.mahout.colt.matrix.DoubleFactory2D.dense;
- private static final org.apache.mahout.colt.matrix.DoubleFactory1D Factory1D = org.apache.mahout.colt.matrix.DoubleFactory1D.dense;
- private static final org.apache.mahout.colt.matrix.linalg.Algebra LinearAlgebra = org.apache.mahout.colt.matrix.linalg.Algebra.DEFAULT;
- private static final org.apache.mahout.colt.matrix.doublealgo.Transform Transform = org.apache.mahout.colt.matrix.doublealgo.Transform.transform;
- private static final org.apache.mahout.colt.matrix.linalg.Property Property = org.apache.mahout.colt.matrix.linalg.Property.DEFAULT;
+ private static final org.apache.mahout.matrix.matrix.DoubleFactory2D Factory2D = org.apache.mahout.matrix.matrix.DoubleFactory2D.dense;
+ private static final org.apache.mahout.matrix.matrix.DoubleFactory1D Factory1D = org.apache.mahout.matrix.matrix.DoubleFactory1D.dense;
+ private static final org.apache.mahout.matrix.matrix.linalg.Algebra LinearAlgebra = org.apache.mahout.matrix.matrix.linalg.Algebra.DEFAULT;
+ private static final org.apache.mahout.matrix.matrix.doublealgo.Transform Transform = org.apache.mahout.matrix.matrix.doublealgo.Transform.transform;
+ private static final org.apache.mahout.matrix.matrix.linalg.Property Property = org.apache.mahout.matrix.matrix.linalg.Property.DEFAULT;
/**
* Makes this class non instantiable, but still let's others inherit from it.
*/
@@ -184,7 +184,7 @@
// Sum( x[i]*x[i] )
System.out.println(matrix.viewSelection(
- new org.apache.mahout.colt.function.DoubleProcedure() {
+ new org.apache.mahout.matrix.function.DoubleProcedure() {
public final boolean apply(double a) { return a % 2 == 0; }
}
));
@@ -251,7 +251,7 @@
)
);
-DoubleMatrix3D x = org.apache.mahout.colt.matrix.DoubleFactory3D.dense.ascending(2,2,2);
+DoubleMatrix3D x = org.apache.mahout.matrix.matrix.DoubleFactory3D.dense.ascending(2,2,2);
System.out.println(x);
// Sum( x[slice,row,col]*x[slice,row,col] )
@@ -282,7 +282,7 @@
a.assign(0);
b.assign(0);
-org.apache.mahout.colt.Timer timer = new org.apache.mahout.colt.Timer().start();
+org.apache.mahout.matrix.Timer timer = new org.apache.mahout.matrix.Timer().start();
LinearAlgebra.mult(a,b);
timer.stop().display();
}
@@ -309,7 +309,7 @@
//DoubleMatrix2D A = Factory2D.makeAscending(size,size).assign(new org.apache.mahout.jet.random.engine.MersenneTwister());
-org.apache.mahout.colt.Timer timer = new org.apache.mahout.colt.Timer().start();
+org.apache.mahout.matrix.Timer timer = new org.apache.mahout.matrix.Timer().start();
DoubleMatrix2D inv = null;
for (int run=0; run<runs; run++) {
inv = LinearAlgebra.inverse(A);
@@ -353,10 +353,10 @@
System.out.println("\n"+Factory2D.diag(A,B,C));
*/
-//System.out.println("\n"+org.apache.mahout.colt.matrixpattern.Converting.toHTML(A.toString()));
-//System.out.println("\n"+org.apache.mahout.colt.matrixpattern.Converting.toHTML(B.toString()));
-//System.out.println("\n"+org.apache.mahout.colt.matrixpattern.Converting.toHTML(C.toString()));
-//System.out.println("\n"+org.apache.mahout.colt.matrixpattern.Converting.toHTML(Factory2D.diagonal(A,B,C).toString()));
+//System.out.println("\n"+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(A.toString()));
+//System.out.println("\n"+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(B.toString()));
+//System.out.println("\n"+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(C.toString()));
+//System.out.println("\n"+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(Factory2D.diagonal(A,B,C).toString()));
}
/**
*/
@@ -403,17 +403,17 @@
/*
-System.out.println("\n"+org.apache.mahout.colt.matrixpattern.Converting.toHTML(A00.toString()));
-System.out.println("\n"+org.apache.mahout.colt.matrixpattern.Converting.toHTML(A01.toString()));
-System.out.println("\n"+org.apache.mahout.colt.matrixpattern.Converting.toHTML(A02.toString()));
-System.out.println("\n"+org.apache.mahout.colt.matrixpattern.Converting.toHTML(A10.toString()));
-System.out.println("\n"+org.apache.mahout.colt.matrixpattern.Converting.toHTML(A11.toString()));
-System.out.println("\n"+org.apache.mahout.colt.matrixpattern.Converting.toHTML(A12.toString()));
-System.out.println("\n"+org.apache.mahout.colt.matrixpattern.Converting.toHTML(A20.toString()));
-System.out.println("\n"+org.apache.mahout.colt.matrixpattern.Converting.toHTML(A21.toString()));
-System.out.println("\n"+org.apache.mahout.colt.matrixpattern.Converting.toHTML(A22.toString()));
+System.out.println("\n"+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(A00.toString()));
+System.out.println("\n"+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(A01.toString()));
+System.out.println("\n"+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(A02.toString()));
+System.out.println("\n"+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(A10.toString()));
+System.out.println("\n"+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(A11.toString()));
+System.out.println("\n"+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(A12.toString()));
+System.out.println("\n"+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(A20.toString()));
+System.out.println("\n"+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(A21.toString()));
+System.out.println("\n"+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(A22.toString()));
-System.out.println("\n"+org.apache.mahout.colt.matrixpattern.Converting.toHTML(Factory2D.make33(A00,A01,A02,A10,A11,A12,A20,A21,A22).toString()));
+System.out.println("\n"+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(Factory2D.make33(A00,A01,A02,A10,A11,A12,A20,A21,A22).toString()));
*/
}
/**
@@ -433,14 +433,14 @@
{ 0, 0, 0, 0 }
};
A = Factory2D.make(values5);
-k = org.apache.mahout.colt.matrix.linalg.Property.DEFAULT.semiBandwidth(A);
-uk = org.apache.mahout.colt.matrix.linalg.Property.DEFAULT.upperBandwidth(A);
-lk = org.apache.mahout.colt.matrix.linalg.Property.DEFAULT.lowerBandwidth(A);
+k = org.apache.mahout.matrix.matrix.linalg.Property.DEFAULT.semiBandwidth(A);
+uk = org.apache.mahout.matrix.matrix.linalg.Property.DEFAULT.upperBandwidth(A);
+lk = org.apache.mahout.matrix.matrix.linalg.Property.DEFAULT.lowerBandwidth(A);
System.out.println("\n\nupperBandwidth="+uk);
System.out.println("lowerBandwidth="+lk);
System.out.println("bandwidth="+k+" "+A);
-//System.out.println("\n\nbandwidth="+k+" "+org.apache.mahout.colt.matrixpattern.Converting.toHTML(A.toString()));
+//System.out.println("\n\nbandwidth="+k+" "+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(A.toString()));
double[][] values4 =
{
@@ -450,13 +450,13 @@
{ 0, 0, 0, 1 }
};
A = Factory2D.make(values4);
-k = org.apache.mahout.colt.matrix.linalg.Property.DEFAULT.semiBandwidth(A);
-uk = org.apache.mahout.colt.matrix.linalg.Property.DEFAULT.upperBandwidth(A);
-lk = org.apache.mahout.colt.matrix.linalg.Property.DEFAULT.lowerBandwidth(A);
+k = org.apache.mahout.matrix.matrix.linalg.Property.DEFAULT.semiBandwidth(A);
+uk = org.apache.mahout.matrix.matrix.linalg.Property.DEFAULT.upperBandwidth(A);
+lk = org.apache.mahout.matrix.matrix.linalg.Property.DEFAULT.lowerBandwidth(A);
System.out.println("\n\nupperBandwidth="+uk);
System.out.println("lowerBandwidth="+lk);
System.out.println("bandwidth="+k+" "+A);
-//System.out.println("\n\nbandwidth="+k+" "+org.apache.mahout.colt.matrixpattern.Converting.toHTML(A.toString()));
+//System.out.println("\n\nbandwidth="+k+" "+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(A.toString()));
double[][] values1 =
{
@@ -466,13 +466,13 @@
{ 0, 0, 1, 1 }
};
A = Factory2D.make(values1);
-k = org.apache.mahout.colt.matrix.linalg.Property.DEFAULT.semiBandwidth(A);
-uk = org.apache.mahout.colt.matrix.linalg.Property.DEFAULT.upperBandwidth(A);
-lk = org.apache.mahout.colt.matrix.linalg.Property.DEFAULT.lowerBandwidth(A);
+k = org.apache.mahout.matrix.matrix.linalg.Property.DEFAULT.semiBandwidth(A);
+uk = org.apache.mahout.matrix.matrix.linalg.Property.DEFAULT.upperBandwidth(A);
+lk = org.apache.mahout.matrix.matrix.linalg.Property.DEFAULT.lowerBandwidth(A);
System.out.println("\n\nupperBandwidth="+uk);
System.out.println("lowerBandwidth="+lk);
System.out.println("bandwidth="+k+" "+A);
-//System.out.println("\n\nbandwidth="+k+" "+org.apache.mahout.colt.matrixpattern.Converting.toHTML(A.toString()));
+//System.out.println("\n\nbandwidth="+k+" "+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(A.toString()));
double[][] values6 =
@@ -483,13 +483,13 @@
{ 0, 0, 0, 1 }
};
A = Factory2D.make(values6);
-k = org.apache.mahout.colt.matrix.linalg.Property.DEFAULT.semiBandwidth(A);
-uk = org.apache.mahout.colt.matrix.linalg.Property.DEFAULT.upperBandwidth(A);
-lk = org.apache.mahout.colt.matrix.linalg.Property.DEFAULT.lowerBandwidth(A);
+k = org.apache.mahout.matrix.matrix.linalg.Property.DEFAULT.semiBandwidth(A);
+uk = org.apache.mahout.matrix.matrix.linalg.Property.DEFAULT.upperBandwidth(A);
+lk = org.apache.mahout.matrix.matrix.linalg.Property.DEFAULT.lowerBandwidth(A);
System.out.println("\n\nupperBandwidth="+uk);
System.out.println("lowerBandwidth="+lk);
System.out.println("bandwidth="+k+" "+A);
-//System.out.println("\n\nbandwidth="+k+" "+org.apache.mahout.colt.matrixpattern.Converting.toHTML(A.toString()));
+//System.out.println("\n\nbandwidth="+k+" "+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(A.toString()));
double[][] values7 =
{
@@ -499,13 +499,13 @@
{ 1, 1, 1, 1 }
};
A = Factory2D.make(values7);
-k = org.apache.mahout.colt.matrix.linalg.Property.DEFAULT.semiBandwidth(A);
-uk = org.apache.mahout.colt.matrix.linalg.Property.DEFAULT.upperBandwidth(A);
-lk = org.apache.mahout.colt.matrix.linalg.Property.DEFAULT.lowerBandwidth(A);
+k = org.apache.mahout.matrix.matrix.linalg.Property.DEFAULT.semiBandwidth(A);
+uk = org.apache.mahout.matrix.matrix.linalg.Property.DEFAULT.upperBandwidth(A);
+lk = org.apache.mahout.matrix.matrix.linalg.Property.DEFAULT.lowerBandwidth(A);
System.out.println("\n\nupperBandwidth="+uk);
System.out.println("lowerBandwidth="+lk);
System.out.println("bandwidth="+k+" "+A);
-//System.out.println("\n\nbandwidth="+k+" "+org.apache.mahout.colt.matrixpattern.Converting.toHTML(A.toString()));
+//System.out.println("\n\nbandwidth="+k+" "+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(A.toString()));
double[][] values2 =
@@ -516,13 +516,13 @@
{ 1, 0, 1, 1 }
};
A = Factory2D.make(values2);
-k = org.apache.mahout.colt.matrix.linalg.Property.DEFAULT.semiBandwidth(A);
-uk = org.apache.mahout.colt.matrix.linalg.Property.DEFAULT.upperBandwidth(A);
-lk = org.apache.mahout.colt.matrix.linalg.Property.DEFAULT.lowerBandwidth(A);
+k = org.apache.mahout.matrix.matrix.linalg.Property.DEFAULT.semiBandwidth(A);
+uk = org.apache.mahout.matrix.matrix.linalg.Property.DEFAULT.upperBandwidth(A);
+lk = org.apache.mahout.matrix.matrix.linalg.Property.DEFAULT.lowerBandwidth(A);
System.out.println("\n\nupperBandwidth="+uk);
System.out.println("lowerBandwidth="+lk);
System.out.println("bandwidth="+k+" "+A);
-//System.out.println("\n\nbandwidth="+k+" "+org.apache.mahout.colt.matrixpattern.Converting.toHTML(A.toString()));
+//System.out.println("\n\nbandwidth="+k+" "+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(A.toString()));
double[][] values3 =
{
@@ -532,13 +532,13 @@
{ 0, 0, 1, 1 }
};
A = Factory2D.make(values3);
-k = org.apache.mahout.colt.matrix.linalg.Property.DEFAULT.semiBandwidth(A);
-uk = org.apache.mahout.colt.matrix.linalg.Property.DEFAULT.upperBandwidth(A);
-lk = org.apache.mahout.colt.matrix.linalg.Property.DEFAULT.lowerBandwidth(A);
+k = org.apache.mahout.matrix.matrix.linalg.Property.DEFAULT.semiBandwidth(A);
+uk = org.apache.mahout.matrix.matrix.linalg.Property.DEFAULT.upperBandwidth(A);
+lk = org.apache.mahout.matrix.matrix.linalg.Property.DEFAULT.lowerBandwidth(A);
System.out.println("\n\nupperBandwidth="+uk);
System.out.println("lowerBandwidth="+lk);
System.out.println("bandwidth="+k+" "+A);
-//System.out.println("\n\nbandwidth="+k+" "+org.apache.mahout.colt.matrixpattern.Converting.toHTML(A.toString()));
+//System.out.println("\n\nbandwidth="+k+" "+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(A.toString()));
@@ -590,17 +590,17 @@
/*
-System.out.println("\n"+org.apache.mahout.colt.matrixpattern.Converting.toHTML(A00.toString()));
-System.out.println("\n"+org.apache.mahout.colt.matrixpattern.Converting.toHTML(A01.toString()));
-System.out.println("\n"+org.apache.mahout.colt.matrixpattern.Converting.toHTML(A02.toString()));
-System.out.println("\n"+org.apache.mahout.colt.matrixpattern.Converting.toHTML(A10.toString()));
-System.out.println("\n"+org.apache.mahout.colt.matrixpattern.Converting.toHTML(A11.toString()));
-System.out.println("\n"+org.apache.mahout.colt.matrixpattern.Converting.toHTML(A12.toString()));
-System.out.println("\n"+org.apache.mahout.colt.matrixpattern.Converting.toHTML(A20.toString()));
-System.out.println("\n"+org.apache.mahout.colt.matrixpattern.Converting.toHTML(A21.toString()));
-System.out.println("\n"+org.apache.mahout.colt.matrixpattern.Converting.toHTML(A22.toString()));
+System.out.println("\n"+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(A00.toString()));
+System.out.println("\n"+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(A01.toString()));
+System.out.println("\n"+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(A02.toString()));
+System.out.println("\n"+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(A10.toString()));
+System.out.println("\n"+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(A11.toString()));
+System.out.println("\n"+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(A12.toString()));
+System.out.println("\n"+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(A20.toString()));
+System.out.println("\n"+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(A21.toString()));
+System.out.println("\n"+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(A22.toString()));
-System.out.println("\n"+org.apache.mahout.colt.matrixpattern.Converting.toHTML(Factory2D.make33(A00,A01,A02,A10,A11,A12,A20,A21,A22).toString()));
+System.out.println("\n"+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(Factory2D.make33(A00,A01,A02,A10,A11,A12,A20,A21,A22).toString()));
*/
}
/**
@@ -647,7 +647,7 @@
A = Factory2D.make(values1);
System.out.println("\n\n"+LinearAlgebra.toVerboseString(A));
-//System.out.println("\n\nbandwidth="+k+" "+org.apache.mahout.colt.matrixpattern.Converting.toHTML(A.toString()));
+//System.out.println("\n\nbandwidth="+k+" "+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(A.toString()));
double[][] values2 =
@@ -662,7 +662,7 @@
A = Factory2D.make(values2);
System.out.println("\n\n"+LinearAlgebra.toVerboseString(A));
-//System.out.println("\n\nbandwidth="+k+" "+org.apache.mahout.colt.matrixpattern.Converting.toHTML(A.toString()));
+//System.out.println("\n\nbandwidth="+k+" "+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(A.toString()));
double[][] values3 =
{
@@ -680,7 +680,7 @@
A = Factory2D.make(values3);
System.out.println("\n\n"+LinearAlgebra.toVerboseString(A));
-//System.out.println("\n\nbandwidth="+k+" "+org.apache.mahout.colt.matrixpattern.Converting.toHTML(A.toString()));
+//System.out.println("\n\nbandwidth="+k+" "+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(A.toString()));
//Exact eigenvalues from Westlake (1968), p.150 (ei'vectors given too):
double a = Math.sqrt(10405); double b = Math.sqrt(26);
@@ -707,11 +707,11 @@
};
A = Factory2D.make(values1);
System.out.println(A);
-System.out.println(new org.apache.mahout.colt.matrix.doublealgo.Formatter(null).toString(A));
+System.out.println(new org.apache.mahout.matrix.matrix.doublealgo.Formatter(null).toString(A));
//System.out.println("\n\n"+LinearAlgebra.toVerboseString(A));
//System.out.println(new LUDecomposition(A));
-//System.out.println("\n\nbandwidth="+k+" "+org.apache.mahout.colt.matrixpattern.Converting.toHTML(A.toString()));
+//System.out.println("\n\nbandwidth="+k+" "+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(A.toString()));
}
/**
*/
@@ -740,7 +740,7 @@
//System.out.println("\n\n"+LinearAlgebra.toVerboseString(A));
//System.out.println(new LUDecomposition(A));
-//System.out.println("\n\nbandwidth="+k+" "+org.apache.mahout.colt.matrixpattern.Converting.toHTML(A.toString()));
+//System.out.println("\n\nbandwidth="+k+" "+org.apache.mahout.matrix.matrixpattern.Converting.toHTML(A.toString()));
}
/**
*/
@@ -776,7 +776,7 @@
LUDecompositionQuick lu = new LUDecompositionQuick();
System.out.println("benchmarking assignment...");
-org.apache.mahout.colt.Timer timer = new org.apache.mahout.colt.Timer().start();
+org.apache.mahout.matrix.Timer timer = new org.apache.mahout.matrix.Timer().start();
LU.assign(A);
solved.assign(b);
timer.stop().display();
@@ -820,12 +820,12 @@
final double beta = 1-omega;
A = factory.make(size,size,value);
-org.apache.mahout.colt.function.Double9Function function = new org.apache.mahout.colt.function.Double9Function() {
+org.apache.mahout.matrix.function.Double9Function function = new org.apache.mahout.matrix.function.Double9Function() {
public final double apply(double a00, double a01, double a02, double a10, double a11, double a12, double a20, double a21, double a22) {
return alpha*a11 + beta*(a01+a10+a12+a21);
}
};
-org.apache.mahout.colt.Timer timer = new org.apache.mahout.colt.Timer().start();
+org.apache.mahout.matrix.Timer timer = new org.apache.mahout.matrix.Timer().start();
System.out.println("benchmarking stencil...");
for (int i=0; i<runs; i++) {
@@ -867,7 +867,7 @@
double value = 0.5;
A = factory.make(size,size,value);
Property.generateNonSingular(A);
-org.apache.mahout.colt.Timer timer = new org.apache.mahout.colt.Timer().start();
+org.apache.mahout.matrix.Timer timer = new org.apache.mahout.matrix.Timer().start();
System.out.println(A);
System.out.println(Algebra.ZERO.inverse(A));
@@ -895,7 +895,7 @@
double value = 0.5;
A = factory.make(size,size,value);
Property.generateNonSingular(A);
-org.apache.mahout.colt.Timer timer = new org.apache.mahout.colt.Timer().start();
+org.apache.mahout.matrix.Timer timer = new org.apache.mahout.matrix.Timer().start();
DoubleMatrix2DComparator fun = new DoubleMatrix2DComparator() {
public int compare(DoubleMatrix2D a, DoubleMatrix2D b) {
@@ -1009,7 +1009,7 @@
A = factory.make(size,size);
System.out.print("A assign C... ");
-org.apache.mahout.colt.Timer timer = new org.apache.mahout.colt.Timer().start();
+org.apache.mahout.matrix.Timer timer = new org.apache.mahout.matrix.Timer().start();
A.assign(C);
timer.stop().display();
@@ -1067,7 +1067,7 @@
DoubleMatrix2D x = new DenseDoubleMatrix2D(size,size).assign(0.5);
DoubleMatrix2D matrix = f.sample(size,size,0.5,0.001);
- org.apache.mahout.colt.Timer timer = new org.apache.mahout.colt.Timer().start();
+ org.apache.mahout.matrix.Timer timer = new org.apache.mahout.matrix.Timer().start();
DoubleMatrix2D res = matrix.zMult(x,null);
timer.stop().display();
@@ -1160,7 +1160,7 @@
IntArrayList list = new IntArrayList(values);
int val = 3;
int sum=0;
-org.apache.mahout.colt.Timer timer = new org.apache.mahout.colt.Timer().start();
+org.apache.mahout.matrix.Timer timer = new org.apache.mahout.matrix.Timer().start();
for (int i=size; --i>=0; ) {
int k = list.binarySearchFromTo(val,0,values.length-1);
System.out.println(list+", "+val+" --> "+k);
@@ -1186,7 +1186,7 @@
DoubleMatrix2D C = Factory2D.dense.sample(size,size,value,0.01);
A = factory.make(size,size);
-org.apache.mahout.colt.Timer timer = new org.apache.mahout.colt.Timer().start();
+org.apache.mahout.matrix.Timer timer = new org.apache.mahout.matrix.Timer().start();
A.assign(C);
timer.stop().display();
@@ -1236,9 +1236,9 @@
IntArrayList list = new IntArrayList(values);
int l = values.length-1;
int sum=0;
-org.apache.mahout.colt.Timer timer = new org.apache.mahout.colt.Timer().start();
+org.apache.mahout.matrix.Timer timer = new org.apache.mahout.matrix.Timer().start();
for (int i=size; --i>=0; ) {
- int k = org.apache.mahout.colt.Sorting.binarySearchFromTo(values,val,0,l);
+ int k = org.apache.mahout.matrix.Sorting.binarySearchFromTo(values,val,0,l);
//int k = list.binarySearchFromTo(val,0,l);
//System.out.println(list+", "+val+" --> i="+k+", -i-1="+(-k-1));
sum+=k;
@@ -1263,7 +1263,7 @@
DoubleMatrix2D C = Factory2D.dense.sample(size,size,value,0.01);
A = factory.make(size,size);
-org.apache.mahout.colt.Timer timer = new org.apache.mahout.colt.Timer().start();
+org.apache.mahout.matrix.Timer timer = new org.apache.mahout.matrix.Timer().start();
A.assign(C);
timer.stop().display();
@@ -1775,7 +1775,7 @@
DenseDoubleMatrix1D d1Double = new DenseDoubleMatrix1D(temp);
- // hep.aida.bin.DynamicBin1D d1ynamicBin = org.apache.mahout.colt.matrix.doublealgo.Statistic.bin(d1Double);
+ // hep.aida.bin.DynamicBin1D d1ynamicBin = org.apache.mahout.matrix.matrix.doublealgo.Statistic.bin(d1Double);
double max = 0;//d1ynamicBin.max();
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/TridiagonalDoubleMatrix2D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/TridiagonalDoubleMatrix2D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/TridiagonalDoubleMatrix2D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/TridiagonalDoubleMatrix2D.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.impl;
+package org.apache.mahout.matrix.matrix.impl;
-import org.apache.mahout.colt.matrix.DoubleMatrix1D;
-import org.apache.mahout.colt.matrix.DoubleMatrix2D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix1D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix2D;
/**
Tridiagonal 2-d matrix 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.
@@ -109,7 +109,7 @@
else super.assign(value);
return this;
}
-public DoubleMatrix2D assign(final org.apache.mahout.colt.function.DoubleFunction function) {
+public DoubleMatrix2D assign(final org.apache.mahout.matrix.function.DoubleFunction function) {
if (function instanceof org.apache.mahout.jet.math.Mult) { // x[i] = mult*x[i]
final double alpha = ((org.apache.mahout.jet.math.Mult) function).multiplicator;
if (alpha==1) return this;
@@ -124,7 +124,7 @@
*/
forEachNonZero(
- new org.apache.mahout.colt.function.IntIntDoubleFunction() {
+ new org.apache.mahout.matrix.function.IntIntDoubleFunction() {
public double apply(int i, int j, double value) {
return function.apply(value);
}
@@ -162,7 +162,7 @@
if (source instanceof RCDoubleMatrix2D || source instanceof SparseDoubleMatrix2D) {
assign(0);
source.forEachNonZero(
- new org.apache.mahout.colt.function.IntIntDoubleFunction() {
+ new org.apache.mahout.matrix.function.IntIntDoubleFunction() {
public double apply(int i, int j, double value) {
setQuick(i,j,value);
return value;
@@ -174,14 +174,14 @@
return super.assign(source);
}
-public DoubleMatrix2D assign(final DoubleMatrix2D y, org.apache.mahout.colt.function.DoubleDoubleFunction function) {
+public DoubleMatrix2D assign(final DoubleMatrix2D y, org.apache.mahout.matrix.function.DoubleDoubleFunction function) {
checkShape(y);
if (function instanceof org.apache.mahout.jet.math.PlusMult) { // x[i] = x[i] + alpha*y[i]
final double alpha = ((org.apache.mahout.jet.math.PlusMult) function).multiplicator;
if (alpha==0) return this; // nothing to do
y.forEachNonZero(
- new org.apache.mahout.colt.function.IntIntDoubleFunction() {
+ new org.apache.mahout.matrix.function.IntIntDoubleFunction() {
public double apply(int i, int j, double value) {
setQuick(i,j,getQuick(i,j) + alpha*value);
return value;
@@ -193,7 +193,7 @@
if (function== org.apache.mahout.jet.math.Functions.mult) { // x[i] = x[i] * y[i]
forEachNonZero(
- new org.apache.mahout.colt.function.IntIntDoubleFunction() {
+ new org.apache.mahout.matrix.function.IntIntDoubleFunction() {
public double apply(int i, int j, double value) {
setQuick(i,j,getQuick(i,j) * y.getQuick(i,j));
return value;
@@ -205,7 +205,7 @@
if (function== org.apache.mahout.jet.math.Functions.div) { // x[i] = x[i] / y[i]
forEachNonZero(
- new org.apache.mahout.colt.function.IntIntDoubleFunction() {
+ new org.apache.mahout.matrix.function.IntIntDoubleFunction() {
public double apply(int i, int j, double value) {
setQuick(i,j,getQuick(i,j) / y.getQuick(i,j));
return value;
@@ -217,7 +217,7 @@
return super.assign(y,function);
}
-public DoubleMatrix2D forEachNonZero(final org.apache.mahout.colt.function.IntIntDoubleFunction function) {
+public DoubleMatrix2D forEachNonZero(final org.apache.mahout.matrix.function.IntIntDoubleFunction function) {
for (int kind=0; kind<=2; kind++) {
int i=0,j=0;
switch (kind) {
@@ -449,7 +449,7 @@
if (yElements==null || zElements==null) throw new InternalError();
forEachNonZero(
- new org.apache.mahout.colt.function.IntIntDoubleFunction() {
+ new org.apache.mahout.matrix.function.IntIntDoubleFunction() {
public double apply(int i, int j, double value) {
if (transposeA) { int tmp=i; i=j; j=tmp; }
zElements[zi + zStride*i] += value * yElements[yi + yStride*j];
@@ -493,7 +493,7 @@
final org.apache.mahout.jet.math.PlusMult fun = org.apache.mahout.jet.math.PlusMult.plusMult(0);
forEachNonZero(
- new org.apache.mahout.colt.function.IntIntDoubleFunction() {
+ new org.apache.mahout.matrix.function.IntIntDoubleFunction() {
public double apply(int i, int j, double value) {
fun.multiplicator = value*alpha;
if (!transposeA)
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/WrapperDoubleMatrix1D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/WrapperDoubleMatrix1D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/WrapperDoubleMatrix1D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/WrapperDoubleMatrix1D.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.impl;
+package org.apache.mahout.matrix.matrix.impl;
-import org.apache.mahout.colt.matrix.DoubleMatrix1D;
-import org.apache.mahout.colt.matrix.DoubleMatrix2D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix1D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix2D;
/**
1-d matrix holding <tt>double</tt> elements; either a view wrapping another matrix or a matrix whose views are wrappers.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/WrapperDoubleMatrix2D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/WrapperDoubleMatrix2D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/WrapperDoubleMatrix2D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/WrapperDoubleMatrix2D.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.impl;
+package org.apache.mahout.matrix.matrix.impl;
-import org.apache.mahout.colt.matrix.DoubleMatrix1D;
-import org.apache.mahout.colt.matrix.DoubleMatrix2D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix1D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix2D;
/**
2-d matrix holding <tt>double</tt> elements; either a view wrapping another matrix or a matrix whose views are wrappers.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/Algebra.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/Algebra.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/Algebra.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/Algebra.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.linalg;
+package org.apache.mahout.matrix.matrix.linalg;
-import org.apache.mahout.colt.matrix.DoubleFactory2D;
-import org.apache.mahout.colt.matrix.DoubleMatrix1D;
-import org.apache.mahout.colt.matrix.DoubleMatrix2D;
+import org.apache.mahout.matrix.matrix.DoubleFactory2D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix1D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix2D;
/**
* Linear algebraic matrix operations operating on {@link DoubleMatrix2D}; concentrates most functionality of this package.
*
@@ -21,7 +21,7 @@
* @deprecated until unit tests are in place. Until this time, this class/interface is unsupported.
*/
@Deprecated
-public class Algebra extends org.apache.mahout.colt.PersistentObject {
+public class Algebra extends org.apache.mahout.matrix.PersistentObject {
/**
* A default Algebra object; has {@link Property#DEFAULT} attached for tolerance.
* Allows ommiting to construct an Algebra object time and again.
@@ -119,8 +119,8 @@
/**
* Returns sqrt(a^2 + b^2) without under/overflow.
*/
-protected static org.apache.mahout.colt.function.DoubleDoubleFunction hypotFunction() {
- return new org.apache.mahout.colt.function.DoubleDoubleFunction() {
+protected static org.apache.mahout.matrix.function.DoubleDoubleFunction hypotFunction() {
+ return new org.apache.mahout.matrix.function.DoubleDoubleFunction() {
public final double apply(double a, double b) {
return hypot(a,b);
}
@@ -377,13 +377,13 @@
return A;
}
- 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) {
A.viewRow(a).swap(A.viewRow(b));
}
};
- org.apache.mahout.colt.GenericPermuting.permute(indexes, swapper, work, null);
+ org.apache.mahout.matrix.GenericPermuting.permute(indexes, swapper, work, null);
return A;
}
/**
@@ -418,7 +418,7 @@
return T;
}
- int k = org.apache.mahout.colt.bitvector.QuickBitVector.mostSignificantBit(p); // index of highest bit in state "true"
+ int k = org.apache.mahout.matrix.bitvector.QuickBitVector.mostSignificantBit(p); // index of highest bit in state "true"
/*
this is the naive version:
@@ -430,7 +430,7 @@
*/
// here comes the optimized version:
- //org.apache.mahout.colt.Timer timer = new org.apache.mahout.colt.Timer().start();
+ //org.apache.mahout.matrix.Timer timer = new org.apache.mahout.matrix.Timer().start();
int i=0;
while (i<=k && (p & (1<<i)) == 0) { // while (bit i of p == false)
@@ -593,8 +593,8 @@
</pre>
*/
public String toString(DoubleMatrix2D matrix) {
- final org.apache.mahout.colt.list.ObjectArrayList names = new org.apache.mahout.colt.list.ObjectArrayList();
- final org.apache.mahout.colt.list.ObjectArrayList values = new org.apache.mahout.colt.list.ObjectArrayList();
+ final org.apache.mahout.matrix.list.ObjectArrayList names = new org.apache.mahout.matrix.list.ObjectArrayList();
+ final org.apache.mahout.matrix.list.ObjectArrayList values = new org.apache.mahout.matrix.list.ObjectArrayList();
String unknown = "Illegal operation or error: ";
// determine properties
@@ -632,19 +632,19 @@
// sort ascending by property name
- 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 Property.get(names,a).compareTo(Property.get(names,b));
}
};
- 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) {
Object tmp;
tmp = names.get(a); names.set(a,names.get(b)); names.set(b,tmp);
tmp = values.get(a); values.set(a,values.get(b)); values.set(b,tmp);
}
};
- org.apache.mahout.colt.GenericSorting.quickSort(0,names.size(),comp,swapper);
+ org.apache.mahout.matrix.GenericSorting.quickSort(0,names.size(),comp,swapper);
// determine padding for nice formatting
int maxLength = 0;
@@ -945,7 +945,7 @@
* @throws IllegalArgumentException if <tt>!Testing.isSquare(A)</tt>.
*/
private DoubleMatrix2D xpowSlow(DoubleMatrix2D A, int k) {
- //org.apache.mahout.colt.Timer timer = new org.apache.mahout.colt.Timer().start();
+ //org.apache.mahout.matrix.Timer timer = new org.apache.mahout.matrix.Timer().start();
DoubleMatrix2D result = A.copy();
for (int i=0; i<k-1; i++) {
result = mult(result,A);
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/Blas.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/Blas.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/Blas.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/Blas.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.linalg;
+package org.apache.mahout.matrix.matrix.linalg;
-import org.apache.mahout.colt.matrix.DoubleMatrix1D;
-import org.apache.mahout.colt.matrix.DoubleMatrix2D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix1D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix2D;
/**
<p>
Subset of the <A HREF="http://netlib2.cs.utk.edu/blas/faq.html">BLAS</A> (Basic Linear Algebra System);
@@ -69,7 +69,7 @@
@param function a function object taking as argument the current cell's value.
@see org.apache.mahout.jet.math.Functions
*/
-public void assign(DoubleMatrix2D A, org.apache.mahout.colt.function.DoubleFunction function);
+public void assign(DoubleMatrix2D A, org.apache.mahout.matrix.function.DoubleFunction function);
/**
Assigns the result of a function to each cell; <tt>x[row,col] = function(x[row,col],y[row,col])</tt>.
@@ -81,7 +81,7 @@
@throws IllegalArgumentException if <tt>x.columns() != y.columns() || x.rows() != y.rows()</tt>
@see org.apache.mahout.jet.math.Functions
*/
-public void assign(DoubleMatrix2D x,DoubleMatrix2D y, org.apache.mahout.colt.function.DoubleDoubleFunction function) ;
+public void assign(DoubleMatrix2D x,DoubleMatrix2D y, org.apache.mahout.matrix.function.DoubleDoubleFunction function) ;
/**
Returns the sum of absolute values; <tt>|x[0]| + |x[1]| + ... </tt>.
In fact equivalent to <tt>x.aggregate(org.apache.mahout.jet.math.Functions.plus, org.apache.mahout.jet.math.Functions.abs)</tt>.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/CholeskyDecomposition.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/CholeskyDecomposition.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/CholeskyDecomposition.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/CholeskyDecomposition.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.linalg;
+package org.apache.mahout.matrix.matrix.linalg;
-import org.apache.mahout.colt.matrix.DoubleMatrix1D;
-import org.apache.mahout.colt.matrix.DoubleMatrix2D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix1D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix2D;
/**
For a symmetric, positive definite matrix <tt>A</tt>, the Cholesky decomposition
is a lower triangular matrix <tt>L</tt> so that <tt>A = L*L'</tt>;
@@ -209,7 +209,7 @@
catch (IllegalArgumentException exc) { buf.append(unknown+exc.getMessage()); }
buf.append("\n\ninverse(A) = ");
- try { buf.append(String.valueOf(this.solve(org.apache.mahout.colt.matrix.DoubleFactory2D.dense.identity(L.rows()))));}
+ try { buf.append(String.valueOf(this.solve(org.apache.mahout.matrix.matrix.DoubleFactory2D.dense.identity(L.rows()))));}
catch (IllegalArgumentException exc) { buf.append(unknown+exc.getMessage()); }
return buf.toString();
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/Diagonal.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/Diagonal.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/Diagonal.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/Diagonal.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.matrix.linalg;
+package org.apache.mahout.matrix.matrix.linalg;
-import org.apache.mahout.colt.matrix.DoubleMatrix2D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix2D;
/**
* For diagonal matrices we can often do better.
*
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/EigenvalueDecomposition.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/EigenvalueDecomposition.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/EigenvalueDecomposition.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/EigenvalueDecomposition.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.matrix.linalg;
+package org.apache.mahout.matrix.matrix.linalg;
-import org.apache.mahout.colt.matrix.DoubleFactory1D;
-import org.apache.mahout.colt.matrix.DoubleFactory2D;
-import org.apache.mahout.colt.matrix.DoubleMatrix1D;
-import org.apache.mahout.colt.matrix.DoubleMatrix2D;
+import org.apache.mahout.matrix.matrix.DoubleFactory1D;
+import org.apache.mahout.matrix.matrix.DoubleFactory2D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix1D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix2D;
/**
Eigenvalues and eigenvectors of a real matrix <tt>A</tt>.
<P>
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/LUDecomposition.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/LUDecomposition.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/LUDecomposition.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/LUDecomposition.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.linalg;
+package org.apache.mahout.matrix.matrix.linalg;
-import org.apache.mahout.colt.matrix.DoubleMatrix2D;
-//import org.apache.mahout.colt.matrix.DenseDoubleMatrix1D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix2D;
+//import org.apache.mahout.matrix.matrix.DenseDoubleMatrix1D;
/**
For an <tt>m x n</tt> matrix <tt>A</tt> with <tt>m >= n</tt>, the LU decomposition is an <tt>m x n</tt>
unit lower triangular matrix <tt>L</tt>, an <tt>n x n</tt> upper triangular matrix <tt>U</tt>,
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/LUDecompositionQuick.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/LUDecompositionQuick.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/LUDecompositionQuick.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/LUDecompositionQuick.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.linalg;
+package org.apache.mahout.matrix.matrix.linalg;
-import org.apache.mahout.colt.matrix.DoubleMatrix1D;
-import org.apache.mahout.colt.matrix.DoubleMatrix2D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix1D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix2D;
/**
A low level version of {@link LUDecomposition}, avoiding unnecessary memory allocation and copying.
The input to <tt>decompose</tt> methods is overriden with the result (LU).
@@ -108,7 +108,7 @@
DoubleMatrix1D[] LUrows = new DoubleMatrix1D[m];
for (int i = 0; i < m; i++) LUrows[i] = LU.viewRow(i);
- org.apache.mahout.colt.list.IntArrayList nonZeroIndexes = new org.apache.mahout.colt.list.IntArrayList(); // sparsity
+ org.apache.mahout.matrix.list.IntArrayList nonZeroIndexes = new org.apache.mahout.matrix.list.IntArrayList(); // sparsity
DoubleMatrix1D LUcolj = LU.viewColumn(0).like(); // blocked column j
org.apache.mahout.jet.math.Mult multFunction = org.apache.mahout.jet.math.Mult.mult(0);
@@ -478,8 +478,8 @@
org.apache.mahout.jet.math.Mult div = org.apache.mahout.jet.math.Mult.div(0);
org.apache.mahout.jet.math.PlusMult minusMult = org.apache.mahout.jet.math.PlusMult.minusMult(0);
- org.apache.mahout.colt.list.IntArrayList nonZeroIndexes = new org.apache.mahout.colt.list.IntArrayList(); // sparsity
- DoubleMatrix1D Browk = org.apache.mahout.colt.matrix.DoubleFactory1D.dense.make(nx); // blocked row k
+ org.apache.mahout.matrix.list.IntArrayList nonZeroIndexes = new org.apache.mahout.matrix.list.IntArrayList(); // sparsity
+ DoubleMatrix1D Browk = org.apache.mahout.matrix.matrix.DoubleFactory1D.dense.make(nx); // blocked row k
// Solve L*Y = B(piv,:)
for (int k = 0; k < n; k++) {
@@ -516,7 +516,7 @@
Brows[k].assign(div);
// blocking
- if (Browk==null) Browk = org.apache.mahout.colt.matrix.DoubleFactory1D.dense.make(B.columns());
+ if (Browk==null) Browk = org.apache.mahout.matrix.matrix.DoubleFactory1D.dense.make(B.columns());
Browk.assign(Brows[k]);
// sparsity detection
@@ -624,7 +624,7 @@
catch (IllegalArgumentException exc) { buf.append(unknown+exc.getMessage()); }
buf.append("\npivot = ");
- try { buf.append(String.valueOf(new org.apache.mahout.colt.list.IntArrayList(this.getPivot())));}
+ try { buf.append(String.valueOf(new org.apache.mahout.matrix.list.IntArrayList(this.getPivot())));}
catch (IllegalArgumentException exc) { buf.append(unknown+exc.getMessage()); }
buf.append("\n\nL = ");
@@ -636,7 +636,7 @@
catch (IllegalArgumentException exc) { buf.append(unknown+exc.getMessage()); }
buf.append("\n\ninverse(A) = ");
- DoubleMatrix2D identity = org.apache.mahout.colt.matrix.DoubleFactory2D.dense.identity(LU.rows());
+ DoubleMatrix2D identity = org.apache.mahout.matrix.matrix.DoubleFactory2D.dense.identity(LU.rows());
try { this.solve(identity); buf.append(String.valueOf(identity)); }
catch (IllegalArgumentException exc) { buf.append(unknown+exc.getMessage()); }
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/Matrix2DMatrix2DFunction.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/Matrix2DMatrix2DFunction.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/Matrix2DMatrix2DFunction.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/Matrix2DMatrix2DFunction.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.matrix.linalg;
+package org.apache.mahout.matrix.matrix.linalg;
-import org.apache.mahout.colt.matrix.DoubleMatrix2D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix2D;
/**
* Interface that represents a function object: a function that takes
* two arguments and returns a single value.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/Property.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/Property.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/Property.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/Property.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.linalg;
+package org.apache.mahout.matrix.matrix.linalg;
-import org.apache.mahout.colt.matrix.DoubleMatrix1D;
-import org.apache.mahout.colt.matrix.DoubleMatrix2D;
-import org.apache.mahout.colt.matrix.DoubleMatrix3D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix1D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix2D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix3D;
/**
Tests matrices for linear algebraic properties (equality, tridiagonality, symmetry, singularity, etc).
<p>
@@ -172,7 +172,7 @@
* @deprecated until unit tests are in place. Until this time, this class/interface is unsupported.
*/
@Deprecated
-public class Property extends org.apache.mahout.colt.PersistentObject {
+public class Property extends org.apache.mahout.matrix.PersistentObject {
/**
* The default Property object; currently has <tt>tolerance()==1.0E-9</tt>.
*/
@@ -218,7 +218,7 @@
*/
public void checkRectangular(DoubleMatrix2D A) {
if (A.rows() < A.columns()) {
- throw new IllegalArgumentException("Matrix must be rectangular: "+ org.apache.mahout.colt.matrix.doublealgo.Formatter.shape(A));
+ throw new IllegalArgumentException("Matrix must be rectangular: "+ org.apache.mahout.matrix.matrix.doublealgo.Formatter.shape(A));
}
}
/**
@@ -226,7 +226,7 @@
* @throws IllegalArgumentException if <tt>A.rows() != A.columns()</tt>.
*/
public void checkSquare(DoubleMatrix2D A) {
- if (A.rows() != A.columns()) throw new IllegalArgumentException("Matrix must be square: "+ org.apache.mahout.colt.matrix.doublealgo.Formatter.shape(A));
+ if (A.rows() != A.columns()) throw new IllegalArgumentException("Matrix must be square: "+ org.apache.mahout.matrix.matrix.doublealgo.Formatter.shape(A));
}
/**
* Returns the matrix's fraction of non-zero cells; <tt>A.cardinality() / A.size()</tt>.
@@ -429,7 +429,7 @@
}
/**
*/
-protected static String get(org.apache.mahout.colt.list.ObjectArrayList list, int index) {
+protected static String get(org.apache.mahout.matrix.list.ObjectArrayList list, int index) {
return ((String) list.get(index));
}
/**
@@ -558,7 +558,7 @@
*/
public boolean isOrthogonal(DoubleMatrix2D A) {
checkSquare(A);
- return equals(A.zMult(A,null,1,0,false,true), org.apache.mahout.colt.matrix.DoubleFactory2D.dense.identity(A.rows()));
+ return equals(A.zMult(A,null,1,0,false,true), org.apache.mahout.matrix.matrix.DoubleFactory2D.dense.identity(A.rows()));
}
/**
* A matrix <tt>A</tt> is <i>positive</i> if <tt>A[i,j] > 0</tt> holds for all cells.
@@ -973,8 +973,8 @@
</pre>
*/
public String toString(DoubleMatrix2D A) {
- final org.apache.mahout.colt.list.ObjectArrayList names = new org.apache.mahout.colt.list.ObjectArrayList();
- final org.apache.mahout.colt.list.ObjectArrayList values = new org.apache.mahout.colt.list.ObjectArrayList();
+ final org.apache.mahout.matrix.list.ObjectArrayList names = new org.apache.mahout.matrix.list.ObjectArrayList();
+ final org.apache.mahout.matrix.list.ObjectArrayList values = new org.apache.mahout.matrix.list.ObjectArrayList();
String unknown = "Illegal operation or error: ";
// determine properties
@@ -1087,19 +1087,19 @@
// sort ascending by property name
- 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 get(names,a).compareTo(get(names,b));
}
};
- 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) {
Object tmp;
tmp = names.get(a); names.set(a,names.get(b)); names.set(b,tmp);
tmp = values.get(a); values.set(a,values.get(b)); values.set(b,tmp);
}
};
- org.apache.mahout.colt.GenericSorting.quickSort(0,names.size(),comp,swapper);
+ org.apache.mahout.matrix.GenericSorting.quickSort(0,names.size(),comp,swapper);
// determine padding for nice formatting
int maxLength = 0;
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/QRDecomposition.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/QRDecomposition.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/QRDecomposition.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/QRDecomposition.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.linalg;
+package org.apache.mahout.matrix.matrix.linalg;
-import org.apache.mahout.colt.matrix.DoubleMatrix1D;
-import org.apache.mahout.colt.matrix.DoubleMatrix2D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix1D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix2D;
/**
For an <tt>m x n</tt> matrix <tt>A</tt> with <tt>m >= n</tt>, the QR decomposition is an <tt>m x n</tt>
@@ -62,7 +62,7 @@
n = A.columns();
Rdiag = A.like1D(n);
//Rdiag = new double[n];
- org.apache.mahout.colt.function.DoubleDoubleFunction hypot = Algebra.hypotFunction();
+ org.apache.mahout.matrix.function.DoubleDoubleFunction hypot = Algebra.hypotFunction();
// precompute and cache some views to avoid regenerating them time and again
DoubleMatrix1D[] QRcolumns = new DoubleMatrix1D[n];
@@ -258,7 +258,7 @@
catch (IllegalArgumentException exc) { buf.append(unknown+exc.getMessage()); }
buf.append("\n\npseudo inverse(A) = ");
- try { buf.append(String.valueOf(this.solve(org.apache.mahout.colt.matrix.DoubleFactory2D.dense.identity(QR.rows()))));}
+ try { buf.append(String.valueOf(this.solve(org.apache.mahout.matrix.matrix.DoubleFactory2D.dense.identity(QR.rows()))));}
catch (IllegalArgumentException exc) { buf.append(unknown+exc.getMessage()); }
return buf.toString();
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/SeqBlas.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/SeqBlas.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/SeqBlas.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/SeqBlas.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.linalg;
+package org.apache.mahout.matrix.matrix.linalg;
-import org.apache.mahout.colt.matrix.DoubleMatrix1D;
-import org.apache.mahout.colt.matrix.DoubleMatrix2D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix1D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix2D;
/**
Sequential implementation of the Basic Linear Algebra System.
@@ -39,10 +39,10 @@
Makes this class non instantiable, but still let's others inherit from it.
*/
protected SeqBlas() {}
-public void assign(DoubleMatrix2D A, org.apache.mahout.colt.function.DoubleFunction function) {
+public void assign(DoubleMatrix2D A, org.apache.mahout.matrix.function.DoubleFunction function) {
A.assign(function);
}
-public void assign(DoubleMatrix2D A, DoubleMatrix2D B, org.apache.mahout.colt.function.DoubleDoubleFunction function) {
+public void assign(DoubleMatrix2D A, DoubleMatrix2D B, org.apache.mahout.matrix.function.DoubleDoubleFunction function) {
A.assign(B,function);
}
public double dasum(DoubleMatrix1D x) {
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/SingularValueDecomposition.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/SingularValueDecomposition.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/SingularValueDecomposition.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/SingularValueDecomposition.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.linalg;
+package org.apache.mahout.matrix.matrix.linalg;
-import org.apache.mahout.colt.matrix.DoubleFactory2D;
-import org.apache.mahout.colt.matrix.DoubleMatrix2D;
+import org.apache.mahout.matrix.matrix.DoubleFactory2D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix2D;
/**
For an <tt>m x n</tt> matrix <tt>A</tt> with <tt>m >= n</tt>, the singular value decomposition is
an <tt>m x n</tt> orthogonal matrix <tt>U</tt>, an <tt>n x n</tt> diagonal matrix <tt>S</tt>, and
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/Smp.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/Smp.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/Smp.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/Smp.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.linalg;
+package org.apache.mahout.matrix.matrix.linalg;
import EDU.oswego.cs.dl.util.concurrent.FJTask;
import EDU.oswego.cs.dl.util.concurrent.FJTaskRunnerGroup;
-import org.apache.mahout.colt.matrix.DoubleMatrix2D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix2D;
/*
*/
class Smp {
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/SmpBlas.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/SmpBlas.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/SmpBlas.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/linalg/SmpBlas.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.linalg;
+package org.apache.mahout.matrix.matrix.linalg;
-import org.apache.mahout.colt.matrix.DoubleMatrix1D;
-import org.apache.mahout.colt.matrix.DoubleMatrix2D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix1D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix2D;
import EDU.oswego.cs.dl.util.concurrent.FJTask;
/**
Parallel implementation of the Basic Linear Algebra System for symmetric multi processing boxes.
@@ -18,8 +18,8 @@
<ul>
<li>{@link #dgemm dgemm} (matrix-matrix multiplication)</li>
<li>{@link #dgemv dgemv} (matrix-vector multiplication)</li>
-<li>{@link #assign(DoubleMatrix2D, org.apache.mahout.colt.function.DoubleFunction) assign(A,function)} (generalized matrix scaling/transform): Strong speedup only for expensive functions like logarithm, sin, etc.</li>
-<li>{@link #assign(DoubleMatrix2D,DoubleMatrix2D, org.apache.mahout.colt.function.DoubleDoubleFunction) assign(A,B,function)} (generalized matrix scaling/transform): Strong speedup only for expensive functions like pow etc.</li>
+<li>{@link #assign(DoubleMatrix2D, org.apache.mahout.matrix.function.DoubleFunction) assign(A,function)} (generalized matrix scaling/transform): Strong speedup only for expensive functions like logarithm, sin, etc.</li>
+<li>{@link #assign(DoubleMatrix2D,DoubleMatrix2D, org.apache.mahout.matrix.function.DoubleDoubleFunction) assign(A,B,function)} (generalized matrix scaling/transform): Strong speedup only for expensive functions like pow etc.</li>
</ul>
In all cases, no or only marginal speedup is seen for small problem sizes; they are detected and the sequential algorithm is used.
@@ -102,7 +102,7 @@
smpBlas = new SmpBlas(maxThreads, seqBlas);
}
}
-public void assign(DoubleMatrix2D A, final org.apache.mahout.colt.function.DoubleFunction function) {
+public void assign(DoubleMatrix2D A, final org.apache.mahout.matrix.function.DoubleFunction function) {
run(A,false,
new Matrix2DMatrix2DFunction() {
public double apply(DoubleMatrix2D AA, DoubleMatrix2D BB) {
@@ -112,7 +112,7 @@
}
);
}
-public void assign(DoubleMatrix2D A, DoubleMatrix2D B, final org.apache.mahout.colt.function.DoubleDoubleFunction function) {
+public void assign(DoubleMatrix2D A, DoubleMatrix2D B, final org.apache.mahout.matrix.function.DoubleDoubleFunction function) {
run(A,B,false,
new Matrix2DMatrix2DFunction() {
public double apply(DoubleMatrix2D AA, DoubleMatrix2D BB) {
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/objectalgo/Formatter.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/objectalgo/Formatter.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/objectalgo/Formatter.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/objectalgo/Formatter.java Mon Nov 23 16:34:55 2009
@@ -1,4 +1,4 @@
-package org.apache.mahout.colt.matrix.objectalgo;
+package org.apache.mahout.matrix.matrix.objectalgo;
/*
Copyright � 1999 CERN - European Organization for Nuclear Research.
@@ -8,17 +8,17 @@
CERN makes no representations about the suitability of this software for any purpose.
It is provided "as is" without expressed or implied warranty.
*/
-import org.apache.mahout.colt.matrix.ObjectMatrix1D;
-import org.apache.mahout.colt.matrix.ObjectMatrix2D;
-import org.apache.mahout.colt.matrix.ObjectMatrix3D;
-import org.apache.mahout.colt.matrix.impl.AbstractFormatter;
-import org.apache.mahout.colt.matrix.impl.AbstractMatrix1D;
-import org.apache.mahout.colt.matrix.impl.AbstractMatrix2D;
-import org.apache.mahout.colt.matrix.impl.Former;
+import org.apache.mahout.matrix.matrix.ObjectMatrix1D;
+import org.apache.mahout.matrix.matrix.ObjectMatrix2D;
+import org.apache.mahout.matrix.matrix.ObjectMatrix3D;
+import org.apache.mahout.matrix.matrix.impl.AbstractFormatter;
+import org.apache.mahout.matrix.matrix.impl.AbstractMatrix1D;
+import org.apache.mahout.matrix.matrix.impl.AbstractMatrix2D;
+import org.apache.mahout.matrix.matrix.impl.Former;
/**
Flexible, well human readable matrix print formatting.
Each cell is converted using {@link Object#toString()}.
-For examples see {@link org.apache.mahout.colt.matrix.doublealgo.Formatter doublealgo.Formatter} which is just the same except that it operates on doubles.
+For examples see {@link org.apache.mahout.matrix.matrix.doublealgo.Formatter doublealgo.Formatter} which is just the same except that it operates on doubles.
@author wolfgang.hoschek@cern.ch
@version 1.1, 11/22/99
@@ -182,7 +182,7 @@
int width = c + columns;
// make larger matrix holding original matrix and naming strings
- org.apache.mahout.colt.matrix.ObjectMatrix2D titleMatrix = matrix.like(height, width);
+ org.apache.mahout.matrix.matrix.ObjectMatrix2D titleMatrix = matrix.like(height, width);
// insert original matrix into larger matrix
titleMatrix.viewPart(r,c,rows,columns).assign(matrix);
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/objectalgo/ObjectMatrix1DComparator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/objectalgo/ObjectMatrix1DComparator.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/objectalgo/ObjectMatrix1DComparator.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/objectalgo/ObjectMatrix1DComparator.java Mon Nov 23 16:34:55 2009
@@ -1,4 +1,4 @@
-package org.apache.mahout.colt.matrix.objectalgo;
+package org.apache.mahout.matrix.matrix.objectalgo;
/*
Copyright � 1999 CERN - European Organization for Nuclear Research.
@@ -8,11 +8,11 @@
CERN makes no representations about the suitability of this software for any purpose.
It is provided "as is" without expressed or implied warranty.
*/
-import org.apache.mahout.colt.matrix.ObjectMatrix1D;
+import org.apache.mahout.matrix.matrix.ObjectMatrix1D;
/**
* 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.matrix.objectalgo.Sorting.quickSort</tt>) to allow precise control over the sort order.<p>
+ * <tt>org.apache.mahout.matrix.matrix.objectalgo.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
@@ -24,7 +24,7 @@
* @version 1.0, 09/24/99
* @see java.util.Comparator
* @see org.apache.mahout.colt
- * @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/matrix/objectalgo/ObjectMatrix2DComparator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/objectalgo/ObjectMatrix2DComparator.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/objectalgo/ObjectMatrix2DComparator.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/objectalgo/ObjectMatrix2DComparator.java Mon Nov 23 16:34:55 2009
@@ -1,4 +1,4 @@
-package org.apache.mahout.colt.matrix.objectalgo;
+package org.apache.mahout.matrix.matrix.objectalgo;
/*
Copyright � 1999 CERN - European Organization for Nuclear Research.
@@ -8,11 +8,11 @@
CERN makes no representations about the suitability of this software for any purpose.
It is provided "as is" without expressed or implied warranty.
*/
-import org.apache.mahout.colt.matrix.ObjectMatrix2D;
+import org.apache.mahout.matrix.matrix.ObjectMatrix2D;
/**
* 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.matrix.objectalgo.Sorting.quickSort</tt>) to allow precise control over the sort order.<p>
+ * <tt>org.apache.mahout.matrix.matrix.objectalgo.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
@@ -24,7 +24,7 @@
* @version 1.0, 09/24/99
* @see java.util.Comparator
* @see org.apache.mahout.colt
- * @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.