You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by sr...@apache.org on 2009/12/15 11:36:20 UTC
svn commit: r890748 - in /lucene/mahout/trunk/matrix/src:
main/java/org/apache/mahout/matrix/function/
main/java/org/apache/mahout/matrix/list/
main/java/org/apache/mahout/matrix/map/
test/java/org/apache/mahout/matrix/map/
Author: srowen
Date: Tue Dec 15 10:36:20 2009
New Revision: 890748
URL: http://svn.apache.org/viewvc?rev=890748&view=rev
Log:
MAHOUT-222 for Benson
Added:
lucene/mahout/trunk/matrix/src/test/java/org/apache/mahout/matrix/map/
lucene/mahout/trunk/matrix/src/test/java/org/apache/mahout/matrix/map/OpenIntIntHashMapTest.java
Modified:
lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntProcedure.java
lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractCollection.java
lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/AbstractMap.java
lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/PrimeFinder.java
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntProcedure.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntProcedure.java?rev=890748&r1=890747&r2=890748&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntProcedure.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/function/IntProcedure.java Tue Dec 15 10:36:20 2009
@@ -1,3 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.mahout.matrix.function;
/*
@@ -12,11 +28,7 @@
/**
* Interface that represents a procedure object: a procedure that takes a single argument and does not return a value.
*
- * @deprecated until unit tests are in place. Until this time, this class/interface is unsupported.
*/
-
-/** @deprecated until unit tests are in place. Until this time, this class/interface is unsupported. */
-@Deprecated
public interface IntProcedure {
/**
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractCollection.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractCollection.java?rev=890748&r1=890747&r2=890748&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractCollection.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/list/AbstractCollection.java Tue Dec 15 10:36:20 2009
@@ -1,3 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
/*
Copyright 1999 CERN - European Organization for Nuclear Research.
Permission to use, copy, modify, distribute and sell this software and its documentation for any purpose
@@ -21,20 +37,9 @@
@author wolfgang.hoschek@cern.ch
@version 1.0, 09/24/99
@see ArrayList
- @see java.util.Vector
- @see java.util.Arrays
*/
-
-//public abstract class AbstractCollection extends Object implements Cloneable, java.io.Serializable {
-
-/** @deprecated until unit tests are in place. Until this time, this class/interface is unsupported. */
-@Deprecated
public abstract class AbstractCollection<T> extends PersistentObject {
- /** Makes this class non instantiable, but still let's others inherit from it. */
- protected AbstractCollection() {
- }
-
/** Removes all elements from the receiver. The receiver will be empty after this call returns. */
public abstract void clear();
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/AbstractMap.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/AbstractMap.java?rev=890748&r1=890747&r2=890748&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/AbstractMap.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/AbstractMap.java Tue Dec 15 10:36:20 2009
@@ -1,3 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
/*
Copyright 1999 CERN - European Organization for Nuclear Research.
Permission to use, copy, modify, distribute and sell this software and its documentation for any purpose
@@ -12,7 +28,8 @@
/**
Abstract base class for hash maps holding objects or primitive data types such as <code>int</code>, <code>float</code>, etc. as keys and/or values.
- 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.
+ First see the <a href="package-summary.html">package summary</a>
+ and javadoc <a href="package-tree.html">tree view</a> to get the broad picture.
<p>
Note that implementations are not synchronized.
@@ -20,9 +37,6 @@
@version 1.0, 09/24/99
@see java.util.HashMap
*/
-
-/** @deprecated until unit tests are in place. Until this time, this class/interface is unsupported. */
-@Deprecated
public abstract class AbstractMap extends PersistentObject {
//public static boolean debug = false; // debug only
@@ -49,10 +63,6 @@
protected static final double defaultMinLoadFactor = 0.2;
protected static final double defaultMaxLoadFactor = 0.5;
- /** Makes this class non instantiable, but still let's others inherit from it. */
- protected AbstractMap() {
- }
-
/**
* Chooses a new prime table capacity optimized for growing that (approximately) satisfies the invariant <tt>c *
* minLoadFactor <= size <= c * maxLoadFactor</tt> and has at least one FREE slot for the given size.
@@ -127,7 +137,7 @@
* @param desiredCapacity the capacity desired by the user.
* @return the capacity which should be used for a hashtable.
*/
- protected int nextPrime(int desiredCapacity) {
+protected int nextPrime(int desiredCapacity) {
return PrimeFinder.nextPrime(desiredCapacity);
}
Modified: lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/PrimeFinder.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/PrimeFinder.java?rev=890748&r1=890747&r2=890748&view=diff
==============================================================================
--- lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/PrimeFinder.java (original)
+++ lucene/mahout/trunk/matrix/src/main/java/org/apache/mahout/matrix/map/PrimeFinder.java Tue Dec 15 10:36:20 2009
@@ -19,9 +19,6 @@
* Memory requirements: 1 KB static memory.
*
*/
-
-/** @deprecated until unit tests are in place. Until this time, this class/interface is unsupported. */
-@Deprecated
public class PrimeFinder {
private static final Logger log = LoggerFactory.getLogger(PrimeFinder.class);
Added: lucene/mahout/trunk/matrix/src/test/java/org/apache/mahout/matrix/map/OpenIntIntHashMapTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/matrix/src/test/java/org/apache/mahout/matrix/map/OpenIntIntHashMapTest.java?rev=890748&view=auto
==============================================================================
(empty)