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 16:39:37 UTC
svn commit: r883371 - in /lucene/mahout/trunk: core/
core/src/main/java/org/apache/mahout/matrix/
core/src/test/java/org/apache/mahout/matrix/ matrix/
matrix/src/main/java/org/apache/mahout/matrix/ matrix/src/test/
matrix/src/test/java/ matrix/src/test...
Author: gsingers
Date: Mon Nov 23 15:39:36 2009
New Revision: 883371
URL: http://svn.apache.org/viewvc?rev=883371&view=rev
Log:
MAHOUT-165: move matrix classes over to matrix module from core
Added:
lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/AbstractMatrix.java (props changed)
- copied unchanged from r883360, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/AbstractMatrix.java
lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/AbstractVector.java (props changed)
- copied unchanged from r883360, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/AbstractVector.java
lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/BinaryFunction.java (props changed)
- copied unchanged from r883360, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/BinaryFunction.java
lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/CardinalityException.java (props changed)
- copied unchanged from r883360, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/CardinalityException.java
lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/DenseMatrix.java (props changed)
- copied unchanged from r883360, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/DenseMatrix.java
lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/DenseVector.java (props changed)
- copied unchanged from r883360, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/DenseVector.java
lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/IndexException.java (props changed)
- copied unchanged from r883360, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/IndexException.java
lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/JsonMatrixAdapter.java
- copied unchanged from r883360, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/JsonMatrixAdapter.java
lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/JsonVectorAdapter.java
- copied unchanged from r883360, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/JsonVectorAdapter.java
lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/Matrix.java (props changed)
- copied unchanged from r883360, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/Matrix.java
lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/MatrixView.java (props changed)
- copied unchanged from r883360, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/MatrixView.java
lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/NegateFunction.java (props changed)
- copied unchanged from r883360, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/NegateFunction.java
lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/OrderedIntDoubleMapping.java
- copied unchanged from r883360, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/OrderedIntDoubleMapping.java
lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/PlusFunction.java (props changed)
- copied unchanged from r883360, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/PlusFunction.java
lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/PlusWithScaleFunction.java (props changed)
- copied unchanged from r883360, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/PlusWithScaleFunction.java
lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/SparseColumnMatrix.java (props changed)
- copied unchanged from r883360, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseColumnMatrix.java
lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/SparseMatrix.java (props changed)
- copied unchanged from r883360, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseMatrix.java
lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/SparseRowMatrix.java (props changed)
- copied unchanged from r883360, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseRowMatrix.java
lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/SparseVector.java (props changed)
- copied unchanged from r883360, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseVector.java
lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/SquareRootFunction.java
- copied unchanged from r883360, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SquareRootFunction.java
lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/TimesFunction.java
- copied unchanged from r883360, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/TimesFunction.java
lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/UnaryFunction.java (props changed)
- copied unchanged from r883360, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/UnaryFunction.java
lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/UnboundLabelException.java
- copied unchanged from r883360, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/UnboundLabelException.java
lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/Vector.java (props changed)
- copied unchanged from r883360, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/Vector.java
lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/VectorView.java (props changed)
- copied unchanged from r883360, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/VectorView.java
lucene/mahout/trunk/matrix/src/test/
lucene/mahout/trunk/matrix/src/test/java/
lucene/mahout/trunk/matrix/src/test/java/org/
lucene/mahout/trunk/matrix/src/test/java/org/apache/
lucene/mahout/trunk/matrix/src/test/java/org/apache/mahout/
lucene/mahout/trunk/matrix/src/test/java/org/apache/mahout/matrix/
- copied from r883360, lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/
lucene/mahout/trunk/matrix/src/test/resources/
Removed:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/
Modified:
lucene/mahout/trunk/core/pom.xml
lucene/mahout/trunk/matrix/pom.xml
Modified: lucene/mahout/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/pom.xml?rev=883371&r1=883370&r2=883371&view=diff
==============================================================================
--- lucene/mahout/trunk/core/pom.xml (original)
+++ lucene/mahout/trunk/core/pom.xml Mon Nov 23 15:39:36 2009
@@ -171,7 +171,11 @@
</build>
<dependencies>
-
+ <dependency>
+ <groupId>org.apache.mahout</groupId>
+ <artifactId>mahout-matrix</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.mahout.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
@@ -321,14 +325,6 @@
<scope>test</scope>
</dependency>
- <!-- Gson: Java to Json conversion -->
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <version>1.3</version>
- <scope>compile</scope>
- </dependency>
-
</dependencies>
<repositories>
<repository>
Modified: lucene/mahout/trunk/matrix/pom.xml
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/pom.xml?rev=883371&r1=883370&r2=883371&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/pom.xml (original)
+++ lucene/mahout/trunk/matrix/pom.xml Mon Nov 23 15:39:36 2009
@@ -94,10 +94,39 @@
<dependencies>
<dependency>
+ <groupId>org.apache.mahout.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <version>0.20.1</version>
+ </dependency>
+ <dependency>
<groupId>concurrent</groupId>
<artifactId>concurrent</artifactId>
<version>1.3.4</version>
</dependency>
+ <!-- Gson: Java to Json conversion -->
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>1.3</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.8</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jcl</artifactId>
+ <version>1.5.8</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<scm>
Propchange: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/AbstractMatrix.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/AbstractVector.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/BinaryFunction.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/CardinalityException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/DenseMatrix.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/DenseVector.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/IndexException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/Matrix.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/MatrixView.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/NegateFunction.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/PlusFunction.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/PlusWithScaleFunction.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/SparseColumnMatrix.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/SparseMatrix.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/SparseRowMatrix.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/SparseVector.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/UnaryFunction.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/Vector.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/VectorView.java
------------------------------------------------------------------------------
svn:eol-style = native