svn commit: r907546 - in /lucene/mahout/trunk: ./ collections/src/main/java/org/apache/mahout/math/function/ math/ math/src/main/java/org/apache/mahout/math/ math/src/main/java/org/apache/mahout/math/bitvector/ math/src/main/java/org/apache/mahout/math...

Sun, 07 Feb 2010 18:58:22 -0800 

Author: bimargulies
Date: Mon Feb  8 02:57:57 2010
New Revision: 907546

URL: http://svn.apache.org/viewvc?rev=907546&view=rev
Log:
MAHOUT-275 continued: make math use collections and eliminate the code from math

Removed:
    
lucene/mahout/trunk/collections/src/main/java/org/apache/mahout/math/function/BinaryFunction.java
    
lucene/mahout/trunk/collections/src/main/java/org/apache/mahout/math/function/BooleanProcedure.java
    
lucene/mahout/trunk/collections/src/main/java/org/apache/mahout/math/function/Double27Function.java
    
lucene/mahout/trunk/collections/src/main/java/org/apache/mahout/math/function/Double5Function.java
    
lucene/mahout/trunk/collections/src/main/java/org/apache/mahout/math/function/Double9Function.java
    
lucene/mahout/trunk/collections/src/main/java/org/apache/mahout/math/function/DoubleDoubleFunction.java
    
lucene/mahout/trunk/collections/src/main/java/org/apache/mahout/math/function/IntDoubleFunction.java
    
lucene/mahout/trunk/collections/src/main/java/org/apache/mahout/math/function/IntFunction.java
    
lucene/mahout/trunk/collections/src/main/java/org/apache/mahout/math/function/IntIntDoubleFunction.java
    
lucene/mahout/trunk/collections/src/main/java/org/apache/mahout/math/function/IntIntDoubleProcedure.java
    
lucene/mahout/trunk/collections/src/main/java/org/apache/mahout/math/function/IntIntFunction.java
    
lucene/mahout/trunk/collections/src/main/java/org/apache/mahout/math/function/IntIntIntProcedure.java
    
lucene/mahout/trunk/collections/src/main/java/org/apache/mahout/math/function/Mult.java
    
lucene/mahout/trunk/collections/src/main/java/org/apache/mahout/math/function/ObjectFunction.java
    
lucene/mahout/trunk/collections/src/main/java/org/apache/mahout/math/function/ObjectObjectFunction.java
    
lucene/mahout/trunk/collections/src/main/java/org/apache/mahout/math/function/PlusMult.java
    
lucene/mahout/trunk/collections/src/main/java/org/apache/mahout/math/function/SquareRootFunction.java
    
lucene/mahout/trunk/collections/src/main/java/org/apache/mahout/math/function/TimesFunction.java
    
lucene/mahout/trunk/collections/src/main/java/org/apache/mahout/math/function/UnaryFunction.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/Arrays.java
    
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/PersistentObject.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/Sorting.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/Swapper.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/bitvector/
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/buffer/
    
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/function/DoubleFunction.java
    
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/function/FloatFunction.java
    
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/function/ObjectObjectProcedure.java
    
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/function/ObjectProcedure.java
    
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/list/AbstractList.java
    
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/list/AbstractObjectList.java
    
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/list/DistinctNumberList.java
    
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/list/MinMaxNumberList.java
    
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/list/ObjectArrayList.java
    
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/list/SimpleLongArrayList.java
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/list/adapter/
    
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/list/package.html
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/map/
    lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/set/
    
lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/SortingTest.java
    lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/map/
    lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/set/
Modified:
    lucene/mahout/trunk/math/pom.xml
    lucene/mahout/trunk/pom.xml

Modified: lucene/mahout/trunk/math/pom.xml
URL: 
http://svn.apache.org/viewvc/lucene/mahout/trunk/math/pom.xml?rev=907546&r1=907545&r2=907546&view=diff
==============================================================================
--- lucene/mahout/trunk/math/pom.xml (original)
+++ lucene/mahout/trunk/math/pom.xml Mon Feb  8 02:57:57 2010
@@ -51,29 +51,6 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.apache.mahout</groupId>
-        <artifactId>mahout-collection-codegen-plugin</artifactId>
-        <version>${project.version}</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>generate</goal>
-            </goals>
-            <configuration><!-- examples for future reference. 
-              <mainExcludes>
-                <mainExclude>**/AbstractBooleanList.java</mainExclude>
-                <mainExclude>**/BooleanArrayList.java</mainExclude>
-                <mainExclude>**/BooleanBufferConsumer.java</mainExclude>
-              </mainExcludes>
-              <testExcludes>
-                <testExclude>**/BooleanArrayListTest.java</testExclude>
-              </testExcludes>-->
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>
         <version>2.4</version>
       </plugin>
@@ -95,6 +72,16 @@
 
   <dependencies>
     <dependency>
+      <groupId>org.apache.mahout</groupId>
+      <artifactId>mahout-collections</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>concurrent</groupId>
+      <artifactId>concurrent</artifactId>
+      <version>1.3.4</version>
+    </dependency>
+    <dependency>
       <groupId>concurrent</groupId>
       <artifactId>concurrent</artifactId>
       <version>1.3.4</version>
@@ -128,9 +115,9 @@
   </dependencies>
 
   <scm>
-    
<connection>scm:svn:https://svn.apache.org/repos/asf/lucene/mahout/tags/mahout-0.2-colt</connection>
-    
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/lucene/mahout/tags/mahout-0.2</developerConnection>
-    <url>https://svn.apache.org/repos/asf/lucene/mahout/mahout-colt</url>
+    
<connection>scm:svn:https://svn.apache.org/repos/asf/lucene/mahout/trunk/math</connection>
+    
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/lucene/mahout/trunk/math</developerConnection>
+    <url>https://svn.apache.org/repos/asf/lucene/mahout/math</url>
   </scm>
   <repositories>
     <repository>

Modified: lucene/mahout/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/lucene/mahout/trunk/pom.xml?rev=907546&r1=907545&r2=907546&view=diff
==============================================================================
--- lucene/mahout/trunk/pom.xml (original)
+++ lucene/mahout/trunk/pom.xml Mon Feb  8 02:57:57 2010
@@ -26,12 +26,13 @@
 
   <modules>
     <module>maven</module>
+    <module>collections-codegen-plugin</module>
+    <module>collections</module>
     <module>math</module>
     <module>core</module>
     <module>taste-web</module>
     <module>examples</module>
     <module>utils</module>
-    <module>collections-codegen-plugin</module>
   </modules>
 
   <build>

Reply via email to