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 [5/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/doublealgo/Sorting.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/doublealgo/Sorting.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/doublealgo/Sorting.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/doublealgo/Sorting.java Mon Nov 23 16:34:55 2009
@@ -6,15 +6,15 @@
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.doublealgo;
+package org.apache.mahout.matrix.matrix.doublealgo;
-import org.apache.mahout.colt.function.IntComparator;
-import org.apache.mahout.colt.matrix.DoubleFactory2D;
-import org.apache.mahout.colt.matrix.DoubleFactory3D;
-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.impl.DenseDoubleMatrix1D;
+import org.apache.mahout.matrix.function.IntComparator;
+import org.apache.mahout.matrix.matrix.DoubleFactory2D;
+import org.apache.mahout.matrix.matrix.DoubleFactory3D;
+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.impl.DenseDoubleMatrix1D;
/**
Matrix quicksorts and mergesorts.
Use idioms like <tt>Sorting.quickSort.sort(...)</tt> and <tt>Sorting.mergeSort.sort(...)</tt>.
@@ -32,8 +32,8 @@
A stable sort is, for example, helpful, if matrices are sorted successively
by multiple columns. It preserves the relative position of equal elements.
-@see org.apache.mahout.colt.GenericSorting
-@see org.apache.mahout.colt.Sorting
+@see org.apache.mahout.matrix.GenericSorting
+@see org.apache.mahout.matrix.Sorting
@see java.util.Arrays
@author wolfgang.hoschek@cern.ch
@@ -43,7 +43,7 @@
* @deprecated until unit tests are in place. Until this time, this class/interface is unsupported.
*/
@Deprecated
-public class Sorting extends org.apache.mahout.colt.PersistentObject {
+public class Sorting extends org.apache.mahout.matrix.PersistentObject {
/**
* A prefabricated quicksort.
*/
@@ -54,10 +54,10 @@
*/
public static final Sorting mergeSort = new Sorting() { // override quicksort with mergesort
protected void runSort(int[] a, int fromIndex, int toIndex, IntComparator c) {
- org.apache.mahout.colt.Sorting.mergeSort(a,fromIndex,toIndex,c);
+ org.apache.mahout.matrix.Sorting.mergeSort(a,fromIndex,toIndex,c);
}
- protected void runSort(int fromIndex, int toIndex, IntComparator c, org.apache.mahout.colt.Swapper swapper) {
- org.apache.mahout.colt.GenericSorting.mergeSort(fromIndex, toIndex, c, swapper);
+ protected void runSort(int fromIndex, int toIndex, IntComparator c, org.apache.mahout.matrix.Swapper swapper) {
+ org.apache.mahout.matrix.GenericSorting.mergeSort(fromIndex, toIndex, c, swapper);
}
};
/**
@@ -75,10 +75,10 @@
return -1; // e.g. 5 < NaN
}
protected void runSort(int[] a, int fromIndex, int toIndex, IntComparator c) {
- org.apache.mahout.colt.Sorting.quickSort(a,fromIndex,toIndex,c);
+ org.apache.mahout.matrix.Sorting.quickSort(a,fromIndex,toIndex,c);
}
-protected void runSort(int fromIndex, int toIndex, IntComparator c, org.apache.mahout.colt.Swapper swapper) {
- org.apache.mahout.colt.GenericSorting.quickSort(fromIndex, toIndex, c, swapper);
+protected void runSort(int fromIndex, int toIndex, IntComparator c, org.apache.mahout.matrix.Swapper swapper) {
+ org.apache.mahout.matrix.GenericSorting.quickSort(fromIndex, toIndex, c, swapper);
}
/**
Sorts the vector into ascending order, according to the <i>natural ordering</i>.
@@ -142,7 +142,7 @@
@return a new matrix view sorted as specified.
<b>Note that the original vector (matrix) is left unaffected.</b>
*/
-public DoubleMatrix1D sort(final DoubleMatrix1D vector, final org.apache.mahout.colt.function.DoubleComparator c) {
+public DoubleMatrix1D sort(final DoubleMatrix1D vector, final org.apache.mahout.matrix.function.DoubleComparator c) {
int[] indexes = new int[vector.size()]; // row indexes to reorder instead of matrix itself
for (int i=indexes.length; --i >= 0; ) indexes[i] = i;
@@ -238,7 +238,7 @@
for (int i=rows; --i >= 0; ) indexes[i] = i;
// compares two aggregates at a time
- 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 x, int y) {
double a = aggregates[x];
double b = aggregates[y];
@@ -247,7 +247,7 @@
}
};
// swaps aggregates and reorders indexes
- 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 x, int y) {
int t1; double t2;
t1 = indexes[x]; indexes[x] = indexes[y]; indexes[y] = t1;
@@ -416,8 +416,8 @@
// THE SLOW VERSION (takes some 300 secs)
DoubleMatrix1DComparator comparator = new DoubleMatrix1DComparator() {
public int compare(DoubleMatrix1D x, DoubleMatrix1D y) {
- double a = org.apache.mahout.colt.matrix.doublealgo.Statistic.bin(x).median();
- double b = org.apache.mahout.colt.matrix.doublealgo.Statistic.bin(y).median();
+ double a = org.apache.mahout.matrix.matrix.doublealgo.Statistic.bin(x).median();
+ double b = org.apache.mahout.matrix.matrix.doublealgo.Statistic.bin(y).median();
// double a = x.aggregate(F.plus,F.log);
// double b = y.aggregate(F.plus,F.log);
return a < b ? -1 : a==b ? 0 : 1;
@@ -572,7 +572,7 @@
Sorting sort = quickSort;
double[] values = {0.5, 1.5, 2.5, 3.5};
DoubleMatrix1D matrix = new DenseDoubleMatrix1D(values);
- org.apache.mahout.colt.function.DoubleComparator comp = new org.apache.mahout.colt.function.DoubleComparator() {
+ org.apache.mahout.matrix.function.DoubleComparator comp = new org.apache.mahout.matrix.function.DoubleComparator() {
public int compare(double a, double b) {
double as = Math.sin(a); double bs = Math.sin(b);
return as < bs ? -1 : as == bs ? 0 : 1;
@@ -587,7 +587,7 @@
sorted.assign(org.apache.mahout.jet.math.Functions.sin);
/*
sorted.assign(
- new org.apache.mahout.colt.function.DoubleFunction() {
+ new org.apache.mahout.matrix.function.DoubleFunction() {
public double apply(double arg) { return Math.sin(arg); }
}
);
@@ -609,7 +609,7 @@
/*
matrix1.assign(matrix2,
- new org.apache.mahout.colt.function.DoubleDoubleFunction() {
+ new org.apache.mahout.matrix.function.DoubleDoubleFunction() {
public double apply(double x, double y) { return Math.pow(x,y); }
}
);
@@ -626,10 +626,10 @@
System.out.println("\n\n");
System.out.print("now initializing... ");
- 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();
final org.apache.mahout.jet.math.Functions F = org.apache.mahout.jet.math.Functions.functions;
- DoubleMatrix2D A = org.apache.mahout.colt.matrix.DoubleFactory2D.dense.make(rows,columns);
+ DoubleMatrix2D A = org.apache.mahout.matrix.matrix.DoubleFactory2D.dense.make(rows,columns);
A.assign(new org.apache.mahout.jet.random.engine.DRand()); // initialize randomly
timer.stop().display();
@@ -668,7 +668,7 @@
String[] columnNames = new String[columns];
for (int i=columns; --i >= 0; ) columnNames[i] = Integer.toString(i);
for (int i=r; --i >= 0; ) rowNames[i] = Integer.toString(i);
- System.out.println("first part of sorted result = \n"+new org.apache.mahout.colt.matrix.doublealgo.Formatter("%G").toTitleString(
+ System.out.println("first part of sorted result = \n"+new org.apache.mahout.matrix.matrix.doublealgo.Formatter("%G").toTitleString(
A.viewPart(0,0,r,columns), rowNames, columnNames, null, null, null, funs
));
}
@@ -676,10 +676,10 @@
System.out.print("now sorting - slow version... ");
A = B;
- org.apache.mahout.colt.matrix.doublealgo.DoubleMatrix1DComparator fun = new org.apache.mahout.colt.matrix.doublealgo.DoubleMatrix1DComparator() {
+ org.apache.mahout.matrix.matrix.doublealgo.DoubleMatrix1DComparator fun = new org.apache.mahout.matrix.matrix.doublealgo.DoubleMatrix1DComparator() {
public int compare(DoubleMatrix1D x, DoubleMatrix1D y) {
- double a = org.apache.mahout.colt.matrix.doublealgo.Statistic.bin(x).median();
- double b = org.apache.mahout.colt.matrix.doublealgo.Statistic.bin(y).median();
+ double a = org.apache.mahout.matrix.matrix.doublealgo.Statistic.bin(x).median();
+ double b = org.apache.mahout.matrix.matrix.doublealgo.Statistic.bin(y).median();
//double a = x.aggregate(F.plus,F.log);
//double b = y.aggregate(F.plus,F.log);
return a < b ? -1 : (a==b) ? 0 : 1;
@@ -738,14 +738,14 @@
System.out.println("now initializing... ");
final org.apache.mahout.jet.math.Functions F = org.apache.mahout.jet.math.Functions.functions;
- DoubleMatrix2D A = org.apache.mahout.colt.matrix.DoubleFactory2D.dense.make(rows,columns);
+ DoubleMatrix2D A = org.apache.mahout.matrix.matrix.DoubleFactory2D.dense.make(rows,columns);
A.assign(new org.apache.mahout.jet.random.engine.DRand()); // initialize randomly
DoubleMatrix2D B = A.copy();
double[] v1 = A.viewColumn(0).toArray();
double[] v2 = A.viewColumn(0).toArray();
System.out.print("now quick sorting... ");
- 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();
quickSort.sort(A,0);
timer.stop().display();
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/doublealgo/Statistic.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/doublealgo/Statistic.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/doublealgo/Statistic.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/doublealgo/Statistic.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.doublealgo;
+package org.apache.mahout.matrix.matrix.doublealgo;
-import org.apache.mahout.colt.function.DoubleDoubleFunction;
-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.matrix.function.DoubleDoubleFunction;
+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.jet.random.engine.RandomEngine;
/**
Basic statistics operations on matrices.
@@ -131,7 +131,7 @@
* @param y the second argument vector passed to the function.
* @return the result of the function.
*/
-abstract public double apply(org.apache.mahout.colt.matrix.DoubleMatrix1D x, org.apache.mahout.colt.matrix.DoubleMatrix1D y);
+abstract public double apply(org.apache.mahout.matrix.matrix.DoubleMatrix1D x, org.apache.mahout.matrix.matrix.DoubleMatrix1D y);
}
/**
@@ -154,7 +154,7 @@
public static DoubleMatrix2D aggregate(DoubleMatrix2D matrix, hep.aida.bin.BinFunction1D[] aggr, DoubleMatrix2D result) {
DynamicBin1D bin = new DynamicBin1D();
double[] elements = new double[matrix.rows()];
- org.apache.mahout.colt.list.DoubleArrayList values = new org.apache.mahout.colt.list.DoubleArrayList(elements);
+ org.apache.mahout.matrix.list.DoubleArrayList values = new org.apache.mahout.matrix.list.DoubleArrayList(elements);
for (int column=matrix.columns(); --column >= 0; ) {
matrix.viewColumn(column).toArray(elements); // copy column into values
bin.clear();
@@ -270,7 +270,7 @@
public static DoubleMatrix2D covariance(DoubleMatrix2D matrix) {
int rows = matrix.rows();
int columns = matrix.columns();
- DoubleMatrix2D covariance = new org.apache.mahout.colt.matrix.impl.DenseDoubleMatrix2D(columns,columns);
+ DoubleMatrix2D covariance = new org.apache.mahout.matrix.matrix.impl.DenseDoubleMatrix2D(columns,columns);
double[] sums = new double[columns];
DoubleMatrix1D[] cols = new DoubleMatrix1D[columns];
@@ -329,9 +329,9 @@
if (x.size() != y.size() || y.size() != weights.size()) throw new IllegalArgumentException("vectors must have same size");
double epsilon = 1.0E-9;
- org.apache.mahout.colt.list.DoubleArrayList distinct = new org.apache.mahout.colt.list.DoubleArrayList();
+ org.apache.mahout.matrix.list.DoubleArrayList distinct = new org.apache.mahout.matrix.list.DoubleArrayList();
double[] vals = new double[x.size()];
- org.apache.mahout.colt.list.DoubleArrayList sorted = new org.apache.mahout.colt.list.DoubleArrayList(vals);
+ org.apache.mahout.matrix.list.DoubleArrayList sorted = new org.apache.mahout.matrix.list.DoubleArrayList(vals);
// compute distinct values of x
x.toArray(vals); // copy x into vals
@@ -369,9 +369,9 @@
if (x.size() != y.size() || x.size() != z.size() || x.size() != weights.size()) throw new IllegalArgumentException("vectors must have same size");
double epsilon = 1.0E-9;
- org.apache.mahout.colt.list.DoubleArrayList distinct = new org.apache.mahout.colt.list.DoubleArrayList();
+ org.apache.mahout.matrix.list.DoubleArrayList distinct = new org.apache.mahout.matrix.list.DoubleArrayList();
double[] vals = new double[x.size()];
- org.apache.mahout.colt.list.DoubleArrayList sorted = new org.apache.mahout.colt.list.DoubleArrayList(vals);
+ org.apache.mahout.matrix.list.DoubleArrayList sorted = new org.apache.mahout.matrix.list.DoubleArrayList(vals);
// compute distinct values of x
x.toArray(vals); // copy x into vals
@@ -422,10 +422,10 @@
//System.out.println(distance(A,EUCLID));
-//System.out.println(org.apache.mahout.colt.matrixpattern.Converting.toHTML(A.toString()));
-//System.out.println(org.apache.mahout.colt.matrixpattern.Converting.toHTML(covariance(A).toString()));
-//System.out.println(org.apache.mahout.colt.matrixpattern.Converting.toHTML(correlation(covariance(A)).toString()));
-//System.out.println(org.apache.mahout.colt.matrixpattern.Converting.toHTML(distance(A,EUCLID).toString()));
+//System.out.println(org.apache.mahout.matrix.matrixpattern.Converting.toHTML(A.toString()));
+//System.out.println(org.apache.mahout.matrix.matrixpattern.Converting.toHTML(covariance(A).toString()));
+//System.out.println(org.apache.mahout.matrix.matrixpattern.Converting.toHTML(correlation(covariance(A)).toString()));
+//System.out.println(org.apache.mahout.matrix.matrixpattern.Converting.toHTML(distance(A,EUCLID).toString()));
}
/**
* Demonstrates usage of this class.
@@ -440,7 +440,7 @@
System.out.println("benchmarking correlation...");
-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 corr = correlation(covariance(A));
timer.stop().display();
@@ -482,7 +482,7 @@
*/
public static DoubleMatrix2D distance(DoubleMatrix2D matrix, VectorVectorFunction distanceFunction) {
int columns = matrix.columns();
- DoubleMatrix2D distance = new org.apache.mahout.colt.matrix.impl.DenseDoubleMatrix2D(columns,columns);
+ DoubleMatrix2D distance = new org.apache.mahout.matrix.matrix.impl.DenseDoubleMatrix2D(columns,columns);
// cache views
DoubleMatrix1D[] cols = new DoubleMatrix1D[columns];
@@ -763,7 +763,7 @@
/*
int rows = matrix.rows();
int columns = matrix.columns();
- DoubleMatrix2D distance = new org.apache.mahout.colt.matrix.impl.DenseDoubleMatrix2D(columns,columns);
+ DoubleMatrix2D distance = new org.apache.mahout.matrix.matrix.impl.DenseDoubleMatrix2D(columns,columns);
// cache views
DoubleMatrix1D[] cols = new DoubleMatrix1D[columns];
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/doublealgo/Stencil.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/doublealgo/Stencil.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/doublealgo/Stencil.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/doublealgo/Stencil.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.doublealgo;
+package org.apache.mahout.matrix.matrix.doublealgo;
-import org.apache.mahout.colt.matrix.DoubleMatrix2D;
-import org.apache.mahout.colt.matrix.DoubleMatrix2DProcedure;
-import org.apache.mahout.colt.matrix.DoubleMatrix3D;
-import org.apache.mahout.colt.matrix.DoubleMatrix3DProcedure;
+import org.apache.mahout.matrix.matrix.DoubleMatrix2D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix2DProcedure;
+import org.apache.mahout.matrix.matrix.DoubleMatrix3D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix3DProcedure;
/**
Stencil operations. For efficient finite difference operations.
Applies a function to a moving <tt>3 x 3</tt> or <tt>3 x 3 x 3</tt> window.
@@ -45,7 +45,7 @@
(Since a convergence may be expensive, you may want to do it only every 2,4 or 8 iterations.)
@return the number of iterations actually executed.
*/
-public static int stencil27(DoubleMatrix3D A, org.apache.mahout.colt.function.Double27Function function, int maxIterations, DoubleMatrix3DProcedure hasConverged, int convergenceIterations) {
+public static int stencil27(DoubleMatrix3D A, org.apache.mahout.matrix.function.Double27Function function, int maxIterations, DoubleMatrix3DProcedure hasConverged, int convergenceIterations) {
DoubleMatrix3D B = A.copy();
if (convergenceIterations <= 1) convergenceIterations=2;
if (convergenceIterations%2 != 0) convergenceIterations++; // odd -> make it even
@@ -74,7 +74,7 @@
(Since a convergence may be expensive, you may want to do it only every 2,4 or 8 iterations.)
@return the number of iterations actually executed.
*/
-public static int stencil9(DoubleMatrix2D A, org.apache.mahout.colt.function.Double9Function function, int maxIterations, DoubleMatrix2DProcedure hasConverged, int convergenceIterations) {
+public static int stencil9(DoubleMatrix2D A, org.apache.mahout.matrix.function.Double9Function function, int maxIterations, DoubleMatrix2DProcedure hasConverged, int convergenceIterations) {
DoubleMatrix2D B = A.copy();
if (convergenceIterations <= 1) convergenceIterations=2;
if (convergenceIterations%2 != 0) convergenceIterations++; // odd -> make it even
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/doublealgo/Transform.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/doublealgo/Transform.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/doublealgo/Transform.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/doublealgo/Transform.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.doublealgo;
+package org.apache.mahout.matrix.matrix.doublealgo;
-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;
/**
-Deprecated; Basic element-by-element transformations on {@link org.apache.mahout.colt.matrix.DoubleMatrix1D} and {@link org.apache.mahout.colt.matrix.DoubleMatrix2D}.
+Deprecated; Basic element-by-element transformations on {@link org.apache.mahout.matrix.matrix.DoubleMatrix1D} and {@link org.apache.mahout.matrix.matrix.DoubleMatrix2D}.
All transformations modify the first argument matrix to hold the result of the transformation.
Use idioms like <tt>result = mult(matrix.copy(),5)</tt> to leave source matrices unaffected.
<p>
@@ -45,7 +45,7 @@
* @deprecated until unit tests are in place. Until this time, this class/interface is unsupported.
*/
@Deprecated
-public class Transform extends org.apache.mahout.colt.PersistentObject {
+public class Transform extends org.apache.mahout.matrix.PersistentObject {
/**
* Little trick to allow for "aliasing", that is, renaming this class.
* Normally you would write
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/AbstractFormatter.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/AbstractFormatter.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/AbstractFormatter.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/AbstractFormatter.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.impl;
+package org.apache.mahout.matrix.matrix.impl;
/**
Abstract base class for flexible, well human readable matrix print formatting.
@@ -26,7 +26,7 @@
* @deprecated until unit tests are in place. Until this time, this class/interface is unsupported.
*/
@Deprecated
-public abstract class AbstractFormatter extends org.apache.mahout.colt.PersistentObject {
+public abstract class AbstractFormatter extends org.apache.mahout.matrix.PersistentObject {
/**
* The alignment string aligning the cells of a column to the left.
*/
@@ -233,7 +233,7 @@
// now the processing
int size = formats.length;
-ObjectMatrix2D matrix = org.apache.mahout.colt.matrix.ObjectFactory2D.dense.make(values);
+ObjectMatrix2D matrix = org.apache.mahout.matrix.matrix.ObjectFactory2D.dense.make(values);
String[] strings = new String[size];
String[] sourceCodes = new String[size];
String[] htmlStrings = new String[size];
@@ -245,8 +245,8 @@
sourceCodes[i] = toSourceCode(matrix,format);
// may not compile because of packages not included in the distribution
- //htmlStrings[i] = org.apache.mahout.colt.matrixpattern.Converting.toHTML(strings[i]);
- //htmlSourceCodes[i] = org.apache.mahout.colt.matrixpattern.Converting.toHTML(sourceCodes[i]);
+ //htmlStrings[i] = org.apache.mahout.matrix.matrixpattern.Converting.toHTML(strings[i]);
+ //htmlSourceCodes[i] = org.apache.mahout.matrix.matrixpattern.Converting.toHTML(sourceCodes[i]);
}
System.out.println("original:\n"+toString(matrix));
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/AbstractMatrix.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/AbstractMatrix.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/AbstractMatrix.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/AbstractMatrix.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.impl;
+package org.apache.mahout.matrix.matrix.impl;
/**
Abstract base class for arbitrary-dimensional matrices holding objects or primitive data types such as <code>int</code>, <code>float</code>, etc.
@@ -21,7 +21,7 @@
* @deprecated until unit tests are in place. Until this time, this class/interface is unsupported.
*/
@Deprecated
-public abstract class AbstractMatrix extends org.apache.mahout.colt.PersistentObject {
+public abstract class AbstractMatrix extends org.apache.mahout.matrix.PersistentObject {
protected boolean isNoView = true;
//public static boolean debug = true;
/**
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/AbstractMatrix1D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/AbstractMatrix1D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/AbstractMatrix1D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/AbstractMatrix1D.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.impl;
+package org.apache.mahout.matrix.matrix.impl;
/**
Abstract base class for 1-d matrices (aka <i>vectors</i>) holding objects or primitive data types such as <code>int</code>, <code>double</code>, etc.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/AbstractMatrix2D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/AbstractMatrix2D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/AbstractMatrix2D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/AbstractMatrix2D.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.impl;
+package org.apache.mahout.matrix.matrix.impl;
/**
Abstract base class for 2-d matrices holding objects or primitive data types such as <code>int</code>, <code>double</code>, etc.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/AbstractMatrix3D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/AbstractMatrix3D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/AbstractMatrix3D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/AbstractMatrix3D.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.impl;
+package org.apache.mahout.matrix.matrix.impl;
/**
Abstract base class for 3-d matrices holding objects or primitive data types such as <code>int</code>, <code>double</code>, etc.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/Benchmark.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/Benchmark.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/Benchmark.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/Benchmark.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.DoubleFactory2D;
-import org.apache.mahout.colt.matrix.DoubleMatrix2D;
+import org.apache.mahout.matrix.matrix.DoubleFactory2D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix2D;
/**
Benchmarks the performance of matrix algorithms.
@@ -30,16 +30,16 @@
// certain loops need to be constructed so that the jitter can't optimize them away and we get fantastic numbers.
// this involves primarly read-loops
- org.apache.mahout.colt.Timer timer1 = new org.apache.mahout.colt.Timer();
- org.apache.mahout.colt.Timer timer2 = new org.apache.mahout.colt.Timer();
- org.apache.mahout.colt.Timer timer3 = new org.apache.mahout.colt.Timer();
- org.apache.mahout.colt.Timer timer4 = new org.apache.mahout.colt.Timer();
- org.apache.mahout.colt.Timer timer5 = new org.apache.mahout.colt.Timer();
- org.apache.mahout.colt.Timer timer6 = new org.apache.mahout.colt.Timer();
+ org.apache.mahout.matrix.Timer timer1 = new org.apache.mahout.matrix.Timer();
+ org.apache.mahout.matrix.Timer timer2 = new org.apache.mahout.matrix.Timer();
+ org.apache.mahout.matrix.Timer timer3 = new org.apache.mahout.matrix.Timer();
+ org.apache.mahout.matrix.Timer timer4 = new org.apache.mahout.matrix.Timer();
+ org.apache.mahout.matrix.Timer timer5 = new org.apache.mahout.matrix.Timer();
+ org.apache.mahout.matrix.Timer timer6 = new org.apache.mahout.matrix.Timer();
DoubleMatrix2D matrix = null;
if (kind.equals("sparse")) matrix = new SparseDoubleMatrix2D(size,size,initialCapacity,minLoadFactor,maxLoadFactor);
- else if (kind.equals("dense")) matrix = org.apache.mahout.colt.matrix.DoubleFactory2D.dense.make(size,size);
+ else if (kind.equals("dense")) matrix = org.apache.mahout.matrix.matrix.DoubleFactory2D.dense.make(size,size);
//else if (kind.equals("denseArray")) matrix = new DoubleArrayMatrix2D(size,size);
else throw new RuntimeException("unknown kind");
@@ -133,7 +133,7 @@
DoubleMatrix2D C = Basic.product(A,B);
timer5.start();
for (int i=0; i<runs; i++) {
- org.apache.mahout.colt.matrix.Blas.matrixMultiply(A,B,C);
+ org.apache.mahout.matrix.matrix.Blas.matrixMultiply(A,B,C);
}
timer5.stop();
timer5.display();
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/BenchmarkMatrix2D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/BenchmarkMatrix2D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/BenchmarkMatrix2D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/BenchmarkMatrix2D.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.impl;
+package org.apache.mahout.matrix.matrix.impl;
-import org.apache.mahout.colt.matrix.DoubleMatrix2D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix2D;
/**
Benchmarks the performance of matrices. Here are the results of some encouraging
measurements. Note that all benchmarks only measure the time spent in accessing
@@ -173,12 +173,12 @@
// certain loops need to be constructed so that the jitter can't optimize them away and we get fantastic numbers.
// this involves primarly read-loops
- org.apache.mahout.colt.Timer timer1 = new org.apache.mahout.colt.Timer();
- org.apache.mahout.colt.Timer timer2 = new org.apache.mahout.colt.Timer();
- org.apache.mahout.colt.Timer timer3 = new org.apache.mahout.colt.Timer();
- org.apache.mahout.colt.Timer timer4 = new org.apache.mahout.colt.Timer();
- org.apache.mahout.colt.Timer emptyLoop = new org.apache.mahout.colt.Timer();
- org.apache.mahout.colt.Timer emptyLoop2 = new org.apache.mahout.colt.Timer();
+ org.apache.mahout.matrix.Timer timer1 = new org.apache.mahout.matrix.Timer();
+ org.apache.mahout.matrix.Timer timer2 = new org.apache.mahout.matrix.Timer();
+ org.apache.mahout.matrix.Timer timer3 = new org.apache.mahout.matrix.Timer();
+ org.apache.mahout.matrix.Timer timer4 = new org.apache.mahout.matrix.Timer();
+ org.apache.mahout.matrix.Timer emptyLoop = new org.apache.mahout.matrix.Timer();
+ org.apache.mahout.matrix.Timer emptyLoop2 = new org.apache.mahout.matrix.Timer();
emptyLoop.start();
int dummy = 0;
@@ -328,8 +328,8 @@
// certain loops need to be constructed so that the jitter can't optimize them away and we get fantastic numbers.
// this involves primarly read-loops
- org.apache.mahout.colt.Timer timer1 = new org.apache.mahout.colt.Timer();
- org.apache.mahout.colt.Timer timer2 = new org.apache.mahout.colt.Timer();
+ org.apache.mahout.matrix.Timer timer1 = new org.apache.mahout.matrix.Timer();
+ org.apache.mahout.matrix.Timer timer2 = new org.apache.mahout.matrix.Timer();
long size = (((long)rows)*columns)*runs;
@@ -344,7 +344,7 @@
//if (kind.equals("sparse")) ((SparseDoubleMatrix2D)matrix).elements.hashCollisions = 0;
for (int i=0; i<runs; i++) {
timer1.start();
- org.apache.mahout.colt.matrix.doublealgo.Transform.mult(matrix, 3);
+ org.apache.mahout.matrix.matrix.doublealgo.Transform.mult(matrix, 3);
timer1.stop();
}
timer1.display();
@@ -366,7 +366,7 @@
//if (kind.equals("sparse")) ((SparseDoubleMatrix2D)matrix).elements.hashCollisions = 0;
for (int i=0; i<runs; i++) {
timer2.start();
- org.apache.mahout.colt.matrix.doublealgo.Transform.mult(matrix,3);
+ org.apache.mahout.matrix.matrix.doublealgo.Transform.mult(matrix,3);
timer2.stop();
}
timer2.display();
@@ -390,11 +390,11 @@
public static void doubleBenchmarkPrimitive(int runs, int rows, int columns, boolean print) {
// certain loops need to be constructed so that the jitter can't optimize them away and we get fantastic numbers.
// this involves primarly read-loops
- org.apache.mahout.colt.Timer timer1 = new org.apache.mahout.colt.Timer();
- org.apache.mahout.colt.Timer timer2 = new org.apache.mahout.colt.Timer();
- org.apache.mahout.colt.Timer timer3 = new org.apache.mahout.colt.Timer();
- org.apache.mahout.colt.Timer emptyLoop = new org.apache.mahout.colt.Timer();
- org.apache.mahout.colt.Timer emptyLoop2 = new org.apache.mahout.colt.Timer();
+ org.apache.mahout.matrix.Timer timer1 = new org.apache.mahout.matrix.Timer();
+ org.apache.mahout.matrix.Timer timer2 = new org.apache.mahout.matrix.Timer();
+ org.apache.mahout.matrix.Timer timer3 = new org.apache.mahout.matrix.Timer();
+ org.apache.mahout.matrix.Timer emptyLoop = new org.apache.mahout.matrix.Timer();
+ org.apache.mahout.matrix.Timer emptyLoop2 = new org.apache.mahout.matrix.Timer();
emptyLoop.start();
int dummy = 0;
@@ -513,11 +513,11 @@
public static void doubleBenchmarkPrimitiveOptimized(int runs, int rows, int columns, boolean print) {
// certain loops need to be constructed so that the jitter can't optimize them away and we get fantastic numbers.
// this involves primarly read-loops
- org.apache.mahout.colt.Timer timer1 = new org.apache.mahout.colt.Timer();
- org.apache.mahout.colt.Timer timer2 = new org.apache.mahout.colt.Timer();
- org.apache.mahout.colt.Timer timer3 = new org.apache.mahout.colt.Timer();
- org.apache.mahout.colt.Timer emptyLoop = new org.apache.mahout.colt.Timer();
- org.apache.mahout.colt.Timer emptyLoop2 = new org.apache.mahout.colt.Timer();
+ org.apache.mahout.matrix.Timer timer1 = new org.apache.mahout.matrix.Timer();
+ org.apache.mahout.matrix.Timer timer2 = new org.apache.mahout.matrix.Timer();
+ org.apache.mahout.matrix.Timer timer3 = new org.apache.mahout.matrix.Timer();
+ org.apache.mahout.matrix.Timer emptyLoop = new org.apache.mahout.matrix.Timer();
+ org.apache.mahout.matrix.Timer emptyLoop2 = new org.apache.mahout.matrix.Timer();
emptyLoop.start();
int dummy = 0;
@@ -637,11 +637,11 @@
// certain loops need to be constructed so that the jitter can't optimize them away and we get fantastic numbers.
// this involves primarly read-loops
- org.apache.mahout.colt.Timer timer1 = new org.apache.mahout.colt.Timer();
- org.apache.mahout.colt.Timer timer2 = new org.apache.mahout.colt.Timer();
- org.apache.mahout.colt.Timer timer3 = new org.apache.mahout.colt.Timer();
- org.apache.mahout.colt.Timer emptyLoop = new org.apache.mahout.colt.Timer();
- org.apache.mahout.colt.Timer emptyLoop2 = new org.apache.mahout.colt.Timer();
+ org.apache.mahout.matrix.Timer timer1 = new org.apache.mahout.matrix.Timer();
+ org.apache.mahout.matrix.Timer timer2 = new org.apache.mahout.matrix.Timer();
+ org.apache.mahout.matrix.Timer timer3 = new org.apache.mahout.matrix.Timer();
+ org.apache.mahout.matrix.Timer emptyLoop = new org.apache.mahout.matrix.Timer();
+ org.apache.mahout.matrix.Timer emptyLoop2 = new org.apache.mahout.matrix.Timer();
emptyLoop.start();
int dummy = 0;
@@ -771,11 +771,11 @@
/*
// certain loops need to be constructed so that the jitter can't optimize them away and we get fantastic numbers.
// this involves primarly read-loops
- org.apache.mahout.colt.Timer timer1 = new org.apache.mahout.colt.Timer();
- org.apache.mahout.colt.Timer timer2 = new org.apache.mahout.colt.Timer();
- org.apache.mahout.colt.Timer timer3 = new org.apache.mahout.colt.Timer();
- org.apache.mahout.colt.Timer emptyLoop = new org.apache.mahout.colt.Timer();
- org.apache.mahout.colt.Timer emptyLoop2 = new org.apache.mahout.colt.Timer();
+ org.apache.mahout.matrix.Timer timer1 = new org.apache.mahout.matrix.Timer();
+ org.apache.mahout.matrix.Timer timer2 = new org.apache.mahout.matrix.Timer();
+ org.apache.mahout.matrix.Timer timer3 = new org.apache.mahout.matrix.Timer();
+ org.apache.mahout.matrix.Timer emptyLoop = new org.apache.mahout.matrix.Timer();
+ org.apache.mahout.matrix.Timer emptyLoop2 = new org.apache.mahout.matrix.Timer();
emptyLoop.start();
int dummy = 0;
@@ -889,11 +889,11 @@
/*
// certain loops need to be constructed so that the jitter can't optimize them away and we get fantastic numbers.
// this involves primarly read-loops
- org.apache.mahout.colt.Timer timer1 = new org.apache.mahout.colt.Timer();
- org.apache.mahout.colt.Timer timer2 = new org.apache.mahout.colt.Timer();
- org.apache.mahout.colt.Timer timer3 = new org.apache.mahout.colt.Timer();
- org.apache.mahout.colt.Timer emptyLoop = new org.apache.mahout.colt.Timer();
- org.apache.mahout.colt.Timer emptyLoop2 = new org.apache.mahout.colt.Timer();
+ org.apache.mahout.matrix.Timer timer1 = new org.apache.mahout.matrix.Timer();
+ org.apache.mahout.matrix.Timer timer2 = new org.apache.mahout.matrix.Timer();
+ org.apache.mahout.matrix.Timer timer3 = new org.apache.mahout.matrix.Timer();
+ org.apache.mahout.matrix.Timer emptyLoop = new org.apache.mahout.matrix.Timer();
+ org.apache.mahout.matrix.Timer emptyLoop2 = new org.apache.mahout.matrix.Timer();
emptyLoop.start();
int dummy = 0;
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/DelegateDoubleMatrix1D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/DelegateDoubleMatrix1D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/DelegateDoubleMatrix1D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/DelegateDoubleMatrix1D.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 2-d matrix and therefore delegating calls to it.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/DenseDoubleMatrix1D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/DenseDoubleMatrix1D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/DenseDoubleMatrix1D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/DenseDoubleMatrix1D.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;
/**
Dense 1-d matrix (aka <i>vector</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.
@@ -127,7 +127,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) {
int s=stride;
int i=index(0);
double[] elems = this.elements;
@@ -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) {
+public DoubleMatrix1D assign(DoubleMatrix1D y, org.apache.mahout.matrix.function.DoubleDoubleFunction function) {
// overriden for performance only
if (! (y instanceof DenseDoubleMatrix1D)) {
return super.assign(y,function);
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/DenseDoubleMatrix2D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/DenseDoubleMatrix2D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/DenseDoubleMatrix2D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/DenseDoubleMatrix2D.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;
/**
Dense 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.
@@ -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) {
final double[] elems = this.elements;
if (elems==null) throw new InternalError();
int index = index(0,0);
@@ -287,7 +287,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) {
// overriden for performance only
if (! (y instanceof DenseDoubleMatrix2D)) {
return super.assign(y, function);
@@ -520,7 +520,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,
@@ -531,7 +531,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,
@@ -547,7 +547,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) {
// 1. using only 4-5 out of the 9 cells in "function" is *not* the limiting factor for performance.
// 2. if the "function" would be hardwired into the innermost loop, a speedup of 1.5-2.0 would be seen
@@ -683,7 +683,7 @@
/*
final RCDoubleMatrix2D transB = new RCDoubleMatrix2D(B.columns,B.rows);
B.forEachNonZero(
- new org.apache.mahout.colt.function.IntIntDoubleFunction() {
+ new org.apache.mahout.matrix.function.IntIntDoubleFunction() {
public double apply(int i, int j, double value) {
transB.setQuick(j,i,value);
return value;
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/DenseDoubleMatrix3D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/DenseDoubleMatrix3D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/DenseDoubleMatrix3D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/DenseDoubleMatrix3D.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.DoubleMatrix2D;
-import org.apache.mahout.colt.matrix.DoubleMatrix3D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix2D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix3D;
/**
Dense 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.
@@ -322,7 +322,7 @@
final double alpha = 0.25;
final double beta = 0.75;
-org.apache.mahout.colt.function.Double27Function f = new org.apache.mahout.colt.function.Double27Function() {
+org.apache.mahout.matrix.function.Double27Function f = new org.apache.mahout.matrix.function.Double27Function() {
public final double apply(
double a000, double a001, double a002,
double a010, double a011, double a012,
@@ -346,7 +346,7 @@
@throws NullPointerException if <tt>function==null</tt>.
@throws IllegalArgumentException if <tt>rows() != B.rows() || columns() != B.columns() || slices() != B.slices() </tt>.
*/
-public void zAssign27Neighbors(DoubleMatrix3D B, org.apache.mahout.colt.function.Double27Function function) {
+public void zAssign27Neighbors(DoubleMatrix3D B, org.apache.mahout.matrix.function.Double27Function function) {
// overridden for performance only
if (!(B instanceof DenseDoubleMatrix3D)) {
super.zAssign27Neighbors(B, function);
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/DenseObjectMatrix1D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/DenseObjectMatrix1D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/DenseObjectMatrix1D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/DenseObjectMatrix1D.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.ObjectMatrix1D;
-import org.apache.mahout.colt.matrix.ObjectMatrix2D;
+import org.apache.mahout.matrix.matrix.ObjectMatrix1D;
+import org.apache.mahout.matrix.matrix.ObjectMatrix2D;
/**
Dense 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.
@@ -112,7 +112,7 @@
@return <tt>this</tt> (for convenience only).
@see org.apache.mahout.jet.math.Functions
*/
-public ObjectMatrix1D assign(org.apache.mahout.colt.function.ObjectFunction function) {
+public ObjectMatrix1D assign(org.apache.mahout.matrix.function.ObjectFunction function) {
int s=stride;
int i=index(0);
Object[] elems = this.elements;
@@ -198,7 +198,7 @@
@throws IllegalArgumentException if <tt>size() != y.size()</tt>.
@see org.apache.mahout.jet.math.Functions
*/
-public ObjectMatrix1D assign(ObjectMatrix1D y, org.apache.mahout.colt.function.ObjectObjectFunction function) {
+public ObjectMatrix1D assign(ObjectMatrix1D y, org.apache.mahout.matrix.function.ObjectObjectFunction function) {
// overriden for performance only
if (! (y instanceof DenseObjectMatrix1D)) {
return super.assign(y,function);
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/DenseObjectMatrix2D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/DenseObjectMatrix2D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/DenseObjectMatrix2D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/DenseObjectMatrix2D.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.ObjectMatrix1D;
-import org.apache.mahout.colt.matrix.ObjectMatrix2D;
+import org.apache.mahout.matrix.matrix.ObjectMatrix1D;
+import org.apache.mahout.matrix.matrix.ObjectMatrix2D;
/**
Dense 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.
@@ -155,7 +155,7 @@
@return <tt>this</tt> (for convenience only).
@see org.apache.mahout.jet.math.Functions
*/
-public ObjectMatrix2D assign(org.apache.mahout.colt.function.ObjectFunction function) {
+public ObjectMatrix2D assign(org.apache.mahout.matrix.function.ObjectFunction function) {
final Object[] elems = this.elements;
if (elems==null) throw new InternalError();
int index = index(0,0);
@@ -253,7 +253,7 @@
@throws IllegalArgumentException if <tt>columns() != other.columns() || rows() != other.rows()</tt>
@see org.apache.mahout.jet.math.Functions
*/
-public ObjectMatrix2D assign(ObjectMatrix2D y, org.apache.mahout.colt.function.ObjectObjectFunction function) {
+public ObjectMatrix2D assign(ObjectMatrix2D y, org.apache.mahout.matrix.function.ObjectObjectFunction function) {
// overriden for performance only
if (! (y instanceof DenseObjectMatrix2D)) {
return super.assign(y, function);
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/DenseObjectMatrix3D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/DenseObjectMatrix3D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/DenseObjectMatrix3D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/DenseObjectMatrix3D.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.ObjectMatrix2D;
-import org.apache.mahout.colt.matrix.ObjectMatrix3D;
+import org.apache.mahout.matrix.matrix.ObjectMatrix2D;
+import org.apache.mahout.matrix.matrix.ObjectMatrix3D;
/**
Dense 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.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/Former.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/Former.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/Former.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/Former.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.impl;
+package org.apache.mahout.matrix.matrix.impl;
/**
* Formats a double into a string (like sprintf in C).
@@ -15,7 +15,7 @@
* @version 1.0, 21/07/00
* @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/impl/FormerFactory.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/FormerFactory.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/FormerFactory.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/FormerFactory.java Mon Nov 23 16:34:55 2009
@@ -1,8 +1,8 @@
-package org.apache.mahout.colt.matrix.impl;
+package org.apache.mahout.matrix.matrix.impl;
/**
- * Factory producing implementations of {@link org.apache.mahout.colt.matrix.impl.Former} via method create();
+ * Factory producing implementations of {@link org.apache.mahout.matrix.matrix.impl.Former} via method create();
* Implementations of can use existing libraries such as PrintfFormat or Format or other.
* Serves to isolate the interface of String formatting from the actual implementation.
* If you want to plug in a different String formatting implementation, simply replace this class with your alternative.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/NormInfinityTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/NormInfinityTest.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/NormInfinityTest.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/NormInfinityTest.java Mon Nov 23 16:34:55 2009
@@ -1,7 +1,7 @@
-package org.apache.mahout.colt.matrix.impl;
+package org.apache.mahout.matrix.matrix.impl;
-import org.apache.mahout.colt.matrix.*;
-import org.apache.mahout.colt.matrix.linalg.Algebra;
+import org.apache.mahout.matrix.matrix.*;
+import org.apache.mahout.matrix.matrix.linalg.Algebra;
class NormInfinityTest {
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/QRTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/QRTest.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/QRTest.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/QRTest.java Mon Nov 23 16:34:55 2009
@@ -1,8 +1,8 @@
-package org.apache.mahout.colt.matrix.impl;
+package org.apache.mahout.matrix.matrix.impl;
-import org.apache.mahout.colt.matrix.DoubleFactory2D;
-import org.apache.mahout.colt.matrix.DoubleMatrix2D;
-import org.apache.mahout.colt.matrix.linalg.Algebra;
+import org.apache.mahout.matrix.matrix.DoubleFactory2D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix2D;
+import org.apache.mahout.matrix.matrix.linalg.Algebra;
//import Jama.Matrix.*;
//import Jama.*;
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/RCDoubleMatrix2D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/RCDoubleMatrix2D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/RCDoubleMatrix2D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/RCDoubleMatrix2D.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.list.DoubleArrayList;
-import org.apache.mahout.colt.list.IntArrayList;
-import org.apache.mahout.colt.matrix.DoubleMatrix1D;
-import org.apache.mahout.colt.matrix.DoubleMatrix2D;
+import org.apache.mahout.matrix.list.DoubleArrayList;
+import org.apache.mahout.matrix.list.IntArrayList;
+import org.apache.mahout.matrix.matrix.DoubleMatrix1D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix2D;
/**
Sparse row-compressed 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.
@@ -20,7 +20,7 @@
<p>
Internally uses the standard sparse row-compressed format, with two important differences that broaden the applicability of this storage format:
<ul>
-<li>We use a {@link org.apache.mahout.colt.list.IntArrayList} and {@link org.apache.mahout.colt.list.DoubleArrayList} to hold the column indexes and nonzero values, respectively.
+<li>We use a {@link org.apache.mahout.matrix.list.IntArrayList} and {@link org.apache.mahout.matrix.list.DoubleArrayList} to hold the column indexes and nonzero values, respectively.
This improves set(...) performance, because the standard way of using non-resizable primitive arrays causes excessive memory allocation, garbage collection and array copying.
The small downside of this is that set(...,0) does not free memory (The capacity of an arraylist does not shrink upon element removal).
<li>Column indexes are kept sorted within a row. This both improves get and set performance on rows with many non-zeros, because we can use a binary search.
@@ -82,7 +82,7 @@
<pre>
// Linear algebraic y = A * x
A.forEachNonZero(
- new org.apache.mahout.colt.function.IntIntDoubleFunction() {
+ new org.apache.mahout.matrix.function.IntIntDoubleFunction() {
public double apply(int row, int column, double value) {
y.setQuick(row,y.getQuick(row) + value * x.getQuick(column));
return value;
@@ -99,7 +99,7 @@
<pre>
// Elementwise A = A + alpha*B
B.forEachNonZero(
- new org.apache.mahout.colt.function.IntIntDoubleFunction() {
+ new org.apache.mahout.matrix.function.IntIntDoubleFunction() {
public double apply(int row, int column, double value) {
A.setQuick(row,column,A.getQuick(row,column) + alpha*value);
return value;
@@ -109,7 +109,7 @@
</pre>
</td>
</table>
-Method {@link #assign(DoubleMatrix2D, org.apache.mahout.colt.function.DoubleDoubleFunction)} does just that if you supply {@link org.apache.mahout.jet.math.Functions#plusMult} as argument.
+Method {@link #assign(DoubleMatrix2D, org.apache.mahout.matrix.function.DoubleDoubleFunction)} does just that if you supply {@link org.apache.mahout.jet.math.Functions#plusMult} as argument.
@author wolfgang.hoschek@cern.ch
@@ -175,7 +175,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;
@@ -189,7 +189,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);
}
@@ -220,7 +220,7 @@
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;
@@ -259,14 +259,14 @@
return this;
}
-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);
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;
@@ -308,7 +308,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) {
int[] idx = indexes.elements();
double[] vals = values.elements();
@@ -443,7 +443,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) {
zElements[zi + zStride*i] += value * yElements[yi + yStride*j];
//z.setQuick(row,z.getQuick(row) + value * y.getQuick(column));
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/RCMDoubleMatrix2D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/RCMDoubleMatrix2D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/RCMDoubleMatrix2D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/RCMDoubleMatrix2D.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.list.DoubleArrayList;
-import org.apache.mahout.colt.list.IntArrayList;
-import org.apache.mahout.colt.matrix.DoubleMatrix1D;
-import org.apache.mahout.colt.matrix.DoubleMatrix2D;
+import org.apache.mahout.matrix.list.DoubleArrayList;
+import org.apache.mahout.matrix.list.IntArrayList;
+import org.apache.mahout.matrix.matrix.DoubleMatrix1D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix2D;
/**
Sparse row-compressed-modified 2-d matrix holding <tt>double</tt> elements.
@author wolfgang.hoschek@cern.ch
@@ -175,7 +175,7 @@
*
* @throws IllegalArgumentException if <tt>A.columns() != y.size() || A.rows() > z.size())</tt>.
*/
-protected void zMult(final DoubleMatrix1D y, final DoubleMatrix1D z, org.apache.mahout.colt.list.IntArrayList nonZeroIndexes, DoubleMatrix1D[] allRows, final double alpha, final double beta) {
+protected void zMult(final DoubleMatrix1D y, final DoubleMatrix1D z, org.apache.mahout.matrix.list.IntArrayList nonZeroIndexes, DoubleMatrix1D[] allRows, final double alpha, final double beta) {
if (columns != y.size() || rows > z.size())
throw new IllegalArgumentException("Incompatible args: "+toStringShort()+", "+y.toStringShort()+", "+z.toStringShort());
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedDenseDoubleMatrix1D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedDenseDoubleMatrix1D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedDenseDoubleMatrix1D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedDenseDoubleMatrix1D.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;
/**
Selection view on dense 1-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.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedDenseDoubleMatrix2D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedDenseDoubleMatrix2D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedDenseDoubleMatrix2D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedDenseDoubleMatrix2D.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;
/**
Selection view on dense 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.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedDenseDoubleMatrix3D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedDenseDoubleMatrix3D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedDenseDoubleMatrix3D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedDenseDoubleMatrix3D.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.DoubleMatrix2D;
-import org.apache.mahout.colt.matrix.DoubleMatrix3D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix2D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix3D;
/**
Selection view on dense 3-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.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedDenseObjectMatrix1D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedDenseObjectMatrix1D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedDenseObjectMatrix1D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedDenseObjectMatrix1D.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.ObjectMatrix1D;
-import org.apache.mahout.colt.matrix.ObjectMatrix2D;
+import org.apache.mahout.matrix.matrix.ObjectMatrix1D;
+import org.apache.mahout.matrix.matrix.ObjectMatrix2D;
/**
Selection view on dense 1-d matrices 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.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedDenseObjectMatrix2D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedDenseObjectMatrix2D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedDenseObjectMatrix2D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedDenseObjectMatrix2D.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.ObjectMatrix1D;
-import org.apache.mahout.colt.matrix.ObjectMatrix2D;
+import org.apache.mahout.matrix.matrix.ObjectMatrix1D;
+import org.apache.mahout.matrix.matrix.ObjectMatrix2D;
/**
Selection view on dense 2-d matrices 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.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedDenseObjectMatrix3D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedDenseObjectMatrix3D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedDenseObjectMatrix3D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedDenseObjectMatrix3D.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.ObjectMatrix2D;
-import org.apache.mahout.colt.matrix.ObjectMatrix3D;
+import org.apache.mahout.matrix.matrix.ObjectMatrix2D;
+import org.apache.mahout.matrix.matrix.ObjectMatrix3D;
/**
Selection view on dense 3-d matrices 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.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedSparseDoubleMatrix1D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedSparseDoubleMatrix1D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedSparseDoubleMatrix1D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedSparseDoubleMatrix1D.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.impl;
+package org.apache.mahout.matrix.matrix.impl;
-import org.apache.mahout.colt.map.AbstractIntDoubleMap;
-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.matrix.DoubleMatrix1D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix2D;
/**
Selection view on sparse 1-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.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedSparseDoubleMatrix2D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedSparseDoubleMatrix2D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedSparseDoubleMatrix2D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedSparseDoubleMatrix2D.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.impl;
+package org.apache.mahout.matrix.matrix.impl;
-import org.apache.mahout.colt.map.AbstractIntDoubleMap;
-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.matrix.DoubleMatrix1D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix2D;
/**
Selection view on sparse 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.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedSparseDoubleMatrix3D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedSparseDoubleMatrix3D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedSparseDoubleMatrix3D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedSparseDoubleMatrix3D.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.impl;
+package org.apache.mahout.matrix.matrix.impl;
-import org.apache.mahout.colt.map.AbstractIntDoubleMap;
-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.matrix.DoubleMatrix2D;
+import org.apache.mahout.matrix.matrix.DoubleMatrix3D;
/**
Selection view on sparse 3-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.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedSparseObjectMatrix1D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedSparseObjectMatrix1D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedSparseObjectMatrix1D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedSparseObjectMatrix1D.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.impl;
+package org.apache.mahout.matrix.matrix.impl;
-import org.apache.mahout.colt.map.AbstractIntObjectMap;
-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.matrix.ObjectMatrix1D;
+import org.apache.mahout.matrix.matrix.ObjectMatrix2D;
/**
Selection view on sparse 1-d matrices 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.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedSparseObjectMatrix2D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedSparseObjectMatrix2D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedSparseObjectMatrix2D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedSparseObjectMatrix2D.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.impl;
+package org.apache.mahout.matrix.matrix.impl;
-import org.apache.mahout.colt.map.AbstractIntObjectMap;
-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.matrix.ObjectMatrix1D;
+import org.apache.mahout.matrix.matrix.ObjectMatrix2D;
/**
Selection view on sparse 2-d matrices 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.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedSparseObjectMatrix3D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedSparseObjectMatrix3D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedSparseObjectMatrix3D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SelectedSparseObjectMatrix3D.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.impl;
+package org.apache.mahout.matrix.matrix.impl;
-import org.apache.mahout.colt.map.AbstractIntObjectMap;
-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.matrix.ObjectMatrix2D;
+import org.apache.mahout.matrix.matrix.ObjectMatrix3D;
/**
Selection view on sparse 3-d matrices 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.
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SparseDoubleMatrix1D.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SparseDoubleMatrix1D.java?rev=883399&r1=883398&r2=883399&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SparseDoubleMatrix1D.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/matrix/impl/SparseDoubleMatrix1D.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 1-d matrix (aka <i>vector</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.
@@ -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>
@@ -79,7 +79,7 @@
/**
* Constructs a matrix with a given number of parameters.
* 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 size the number of cells the matrix shall have.
* @param initialCapacity the initial capacity of the hash map.