You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by ro...@apache.org on 2010/10/05 00:56:07 UTC
svn commit: r1004469 - in /mahout/trunk:
core/src/main/java/org/apache/mahout/clustering/minhash/
core/src/main/java/org/apache/mahout/vectorizer/encoders/
core/src/main/java/org/apache/mahout/vectors/
core/src/test/java/org/apache/mahout/classifier/sg...
Author: robinanil
Date: Mon Oct 4 22:56:06 2010
New Revision: 1004469
URL: http://svn.apache.org/viewvc?rev=1004469&view=rev
Log:
MAHOUT-521 Move FeatureVectorEncoders to vectorizer.encoders
Added:
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/AdaptiveWordValueEncoder.java
- copied, changed from r1004320, mahout/trunk/core/src/main/java/org/apache/mahout/vectors/AdaptiveWordValueEncoder.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/CachingContinuousValueEncoder.java
- copied, changed from r1004320, mahout/trunk/core/src/main/java/org/apache/mahout/vectors/CachingContinuousValueEncoder.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/CachingStaticWordValueEncoder.java
- copied, changed from r1004320, mahout/trunk/core/src/main/java/org/apache/mahout/vectors/CachingStaticWordValueEncoder.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/CachingTextValueEncoder.java
- copied, changed from r1004320, mahout/trunk/core/src/main/java/org/apache/mahout/vectors/CachingTextValueEncoder.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/ConstantValueEncoder.java
- copied, changed from r1004320, mahout/trunk/core/src/main/java/org/apache/mahout/vectors/ConstantValueEncoder.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/ContinuousValueEncoder.java
- copied, changed from r1004320, mahout/trunk/core/src/main/java/org/apache/mahout/vectors/ContinuousValueEncoder.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/Dictionary.java
- copied, changed from r1004320, mahout/trunk/core/src/main/java/org/apache/mahout/vectors/Dictionary.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/FeatureVectorEncoder.java
- copied, changed from r1004320, mahout/trunk/core/src/main/java/org/apache/mahout/vectors/FeatureVectorEncoder.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/InteractionValueEncoder.java
- copied, changed from r1004320, mahout/trunk/core/src/main/java/org/apache/mahout/vectors/InteractionValueEncoder.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/LuceneTextValueEncoder.java
- copied, changed from r1004320, mahout/trunk/core/src/main/java/org/apache/mahout/vectors/LuceneTextValueEncoder.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/MurmurHash.java
- copied, changed from r1004320, mahout/trunk/core/src/main/java/org/apache/mahout/vectors/MurmurHash.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/StaticWordValueEncoder.java
- copied, changed from r1004320, mahout/trunk/core/src/main/java/org/apache/mahout/vectors/StaticWordValueEncoder.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/TextValueEncoder.java
- copied, changed from r1004320, mahout/trunk/core/src/main/java/org/apache/mahout/vectors/TextValueEncoder.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/WordValueEncoder.java
- copied, changed from r1004320, mahout/trunk/core/src/main/java/org/apache/mahout/vectors/WordValueEncoder.java
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/encoders/
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/encoders/ContinuousValueEncoderTest.java
- copied, changed from r1004320, mahout/trunk/core/src/test/java/org/apache/mahout/vectors/ContinuousValueEncoderTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/encoders/InteractionValueEncoderTest.java
- copied, changed from r1004320, mahout/trunk/core/src/test/java/org/apache/mahout/vectors/InteractionValueEncoderTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/encoders/MurmurHashTest.java
- copied, changed from r1004320, mahout/trunk/core/src/test/java/org/apache/mahout/vectors/MurmurHashTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/encoders/TextValueEncoderTest.java
- copied, changed from r1004320, mahout/trunk/core/src/test/java/org/apache/mahout/vectors/TextValueEncoderTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/encoders/WordLikeValueEncoderTest.java
- copied, changed from r1004320, mahout/trunk/core/src/test/java/org/apache/mahout/vectors/WordLikeValueEncoderTest.java
Removed:
mahout/trunk/core/src/main/java/org/apache/mahout/vectors/
mahout/trunk/core/src/test/java/org/apache/mahout/vectors/
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/minhash/HashFactory.java
mahout/trunk/core/src/test/java/org/apache/mahout/classifier/sgd/CsvRecordFactoryTest.java
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/TrainNewsGroups.java
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/minhash/HashFactory.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/minhash/HashFactory.java?rev=1004469&r1=1004468&r2=1004469&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/minhash/HashFactory.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/minhash/HashFactory.java Mon Oct 4 22:56:06 2010
@@ -17,7 +17,7 @@
package org.apache.mahout.clustering.minhash;
import org.apache.mahout.common.RandomUtils;
-import org.apache.mahout.vectors.MurmurHash;
+import org.apache.mahout.vectorizer.encoders.MurmurHash;
import java.util.Random;
Copied: mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/AdaptiveWordValueEncoder.java (from r1004320, mahout/trunk/core/src/main/java/org/apache/mahout/vectors/AdaptiveWordValueEncoder.java)
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/AdaptiveWordValueEncoder.java?p2=mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/AdaptiveWordValueEncoder.java&p1=mahout/trunk/core/src/main/java/org/apache/mahout/vectors/AdaptiveWordValueEncoder.java&r1=1004320&r2=1004469&rev=1004469&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/vectors/AdaptiveWordValueEncoder.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/AdaptiveWordValueEncoder.java Mon Oct 4 22:56:06 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.vectors;
+package org.apache.mahout.vectorizer.encoders;
import com.google.common.collect.HashMultiset;
import com.google.common.collect.Multiset;
Copied: mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/CachingContinuousValueEncoder.java (from r1004320, mahout/trunk/core/src/main/java/org/apache/mahout/vectors/CachingContinuousValueEncoder.java)
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/CachingContinuousValueEncoder.java?p2=mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/CachingContinuousValueEncoder.java&p1=mahout/trunk/core/src/main/java/org/apache/mahout/vectors/CachingContinuousValueEncoder.java&r1=1004320&r2=1004469&rev=1004469&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/vectors/CachingContinuousValueEncoder.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/CachingContinuousValueEncoder.java Mon Oct 4 22:56:06 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.vectors;
+package org.apache.mahout.vectorizer.encoders;
import org.apache.mahout.math.map.OpenIntIntHashMap;
Copied: mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/CachingStaticWordValueEncoder.java (from r1004320, mahout/trunk/core/src/main/java/org/apache/mahout/vectors/CachingStaticWordValueEncoder.java)
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/CachingStaticWordValueEncoder.java?p2=mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/CachingStaticWordValueEncoder.java&p1=mahout/trunk/core/src/main/java/org/apache/mahout/vectors/CachingStaticWordValueEncoder.java&r1=1004320&r2=1004469&rev=1004469&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/vectors/CachingStaticWordValueEncoder.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/CachingStaticWordValueEncoder.java Mon Oct 4 22:56:06 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.vectors;
+package org.apache.mahout.vectorizer.encoders;
import org.apache.mahout.math.map.OpenIntIntHashMap;
Copied: mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/CachingTextValueEncoder.java (from r1004320, mahout/trunk/core/src/main/java/org/apache/mahout/vectors/CachingTextValueEncoder.java)
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/CachingTextValueEncoder.java?p2=mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/CachingTextValueEncoder.java&p1=mahout/trunk/core/src/main/java/org/apache/mahout/vectors/CachingTextValueEncoder.java&r1=1004320&r2=1004469&rev=1004469&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/vectors/CachingTextValueEncoder.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/CachingTextValueEncoder.java Mon Oct 4 22:56:06 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.vectors;
+package org.apache.mahout.vectorizer.encoders;
public class CachingTextValueEncoder extends TextValueEncoder {
public CachingTextValueEncoder(String name, int dataSize) {
Copied: mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/ConstantValueEncoder.java (from r1004320, mahout/trunk/core/src/main/java/org/apache/mahout/vectors/ConstantValueEncoder.java)
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/ConstantValueEncoder.java?p2=mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/ConstantValueEncoder.java&p1=mahout/trunk/core/src/main/java/org/apache/mahout/vectors/ConstantValueEncoder.java&r1=1004320&r2=1004469&rev=1004469&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/vectors/ConstantValueEncoder.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/ConstantValueEncoder.java Mon Oct 4 22:56:06 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.vectors;
+package org.apache.mahout.vectorizer.encoders;
import org.apache.mahout.math.Vector;
Copied: mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/ContinuousValueEncoder.java (from r1004320, mahout/trunk/core/src/main/java/org/apache/mahout/vectors/ContinuousValueEncoder.java)
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/ContinuousValueEncoder.java?p2=mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/ContinuousValueEncoder.java&p1=mahout/trunk/core/src/main/java/org/apache/mahout/vectors/ContinuousValueEncoder.java&r1=1004320&r2=1004469&rev=1004469&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/vectors/ContinuousValueEncoder.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/ContinuousValueEncoder.java Mon Oct 4 22:56:06 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.vectors;
+package org.apache.mahout.vectorizer.encoders;
import org.apache.mahout.math.Vector;
Copied: mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/Dictionary.java (from r1004320, mahout/trunk/core/src/main/java/org/apache/mahout/vectors/Dictionary.java)
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/Dictionary.java?p2=mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/Dictionary.java&p1=mahout/trunk/core/src/main/java/org/apache/mahout/vectors/Dictionary.java&r1=1004320&r2=1004469&rev=1004469&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/vectors/Dictionary.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/Dictionary.java Mon Oct 4 22:56:06 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.vectors;
+package org.apache.mahout.vectorizer.encoders;
import com.google.common.collect.Maps;
Copied: mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/FeatureVectorEncoder.java (from r1004320, mahout/trunk/core/src/main/java/org/apache/mahout/vectors/FeatureVectorEncoder.java)
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/FeatureVectorEncoder.java?p2=mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/FeatureVectorEncoder.java&p1=mahout/trunk/core/src/main/java/org/apache/mahout/vectors/FeatureVectorEncoder.java&r1=1004320&r2=1004469&rev=1004469&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/vectors/FeatureVectorEncoder.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/FeatureVectorEncoder.java Mon Oct 4 22:56:06 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.vectors;
+package org.apache.mahout.vectorizer.encoders;
import com.google.common.base.Charsets;
import com.google.common.collect.Sets;
Copied: mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/InteractionValueEncoder.java (from r1004320, mahout/trunk/core/src/main/java/org/apache/mahout/vectors/InteractionValueEncoder.java)
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/InteractionValueEncoder.java?p2=mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/InteractionValueEncoder.java&p1=mahout/trunk/core/src/main/java/org/apache/mahout/vectors/InteractionValueEncoder.java&r1=1004320&r2=1004469&rev=1004469&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/vectors/InteractionValueEncoder.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/InteractionValueEncoder.java Mon Oct 4 22:56:06 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.vectors;
+package org.apache.mahout.vectorizer.encoders;
import org.apache.mahout.math.Vector;
Copied: mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/LuceneTextValueEncoder.java (from r1004320, mahout/trunk/core/src/main/java/org/apache/mahout/vectors/LuceneTextValueEncoder.java)
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/LuceneTextValueEncoder.java?p2=mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/LuceneTextValueEncoder.java&p1=mahout/trunk/core/src/main/java/org/apache/mahout/vectors/LuceneTextValueEncoder.java&r1=1004320&r2=1004469&rev=1004469&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/vectors/LuceneTextValueEncoder.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/LuceneTextValueEncoder.java Mon Oct 4 22:56:06 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.vectors;
+package org.apache.mahout.vectorizer.encoders;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
Copied: mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/MurmurHash.java (from r1004320, mahout/trunk/core/src/main/java/org/apache/mahout/vectors/MurmurHash.java)
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/MurmurHash.java?p2=mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/MurmurHash.java&p1=mahout/trunk/core/src/main/java/org/apache/mahout/vectors/MurmurHash.java&r1=1004320&r2=1004469&rev=1004469&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/vectors/MurmurHash.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/MurmurHash.java Mon Oct 4 22:56:06 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.vectors;
+package org.apache.mahout.vectorizer.encoders;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
Copied: mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/StaticWordValueEncoder.java (from r1004320, mahout/trunk/core/src/main/java/org/apache/mahout/vectors/StaticWordValueEncoder.java)
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/StaticWordValueEncoder.java?p2=mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/StaticWordValueEncoder.java&p1=mahout/trunk/core/src/main/java/org/apache/mahout/vectors/StaticWordValueEncoder.java&r1=1004320&r2=1004469&rev=1004469&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/vectors/StaticWordValueEncoder.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/StaticWordValueEncoder.java Mon Oct 4 22:56:06 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.vectors;
+package org.apache.mahout.vectorizer.encoders;
import com.google.common.base.Charsets;
Copied: mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/TextValueEncoder.java (from r1004320, mahout/trunk/core/src/main/java/org/apache/mahout/vectors/TextValueEncoder.java)
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/TextValueEncoder.java?p2=mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/TextValueEncoder.java&p1=mahout/trunk/core/src/main/java/org/apache/mahout/vectors/TextValueEncoder.java&r1=1004320&r2=1004469&rev=1004469&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/vectors/TextValueEncoder.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/TextValueEncoder.java Mon Oct 4 22:56:06 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.vectors;
+package org.apache.mahout.vectorizer.encoders;
import com.google.common.base.Charsets;
import com.google.common.base.Splitter;
Copied: mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/WordValueEncoder.java (from r1004320, mahout/trunk/core/src/main/java/org/apache/mahout/vectors/WordValueEncoder.java)
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/WordValueEncoder.java?p2=mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/WordValueEncoder.java&p1=mahout/trunk/core/src/main/java/org/apache/mahout/vectors/WordValueEncoder.java&r1=1004320&r2=1004469&rev=1004469&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/vectors/WordValueEncoder.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/encoders/WordValueEncoder.java Mon Oct 4 22:56:06 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.vectors;
+package org.apache.mahout.vectorizer.encoders;
import org.apache.mahout.math.Vector;
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/classifier/sgd/CsvRecordFactoryTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/sgd/CsvRecordFactoryTest.java?rev=1004469&r1=1004468&r2=1004469&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/classifier/sgd/CsvRecordFactoryTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/classifier/sgd/CsvRecordFactoryTest.java Mon Oct 4 22:56:06 2010
@@ -21,7 +21,7 @@ import com.google.common.collect.Immutab
import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.math.DenseVector;
import org.apache.mahout.math.Vector;
-import org.apache.mahout.vectors.Dictionary;
+import org.apache.mahout.vectorizer.encoders.Dictionary;
import org.junit.Test;
public final class CsvRecordFactoryTest extends MahoutTestCase {
Copied: mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/encoders/ContinuousValueEncoderTest.java (from r1004320, mahout/trunk/core/src/test/java/org/apache/mahout/vectors/ContinuousValueEncoderTest.java)
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/encoders/ContinuousValueEncoderTest.java?p2=mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/encoders/ContinuousValueEncoderTest.java&p1=mahout/trunk/core/src/test/java/org/apache/mahout/vectors/ContinuousValueEncoderTest.java&r1=1004320&r2=1004469&rev=1004469&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/vectors/ContinuousValueEncoderTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/encoders/ContinuousValueEncoderTest.java Mon Oct 4 22:56:06 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.vectors;
+package org.apache.mahout.vectorizer.encoders;
import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.math.DenseVector;
Copied: mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/encoders/InteractionValueEncoderTest.java (from r1004320, mahout/trunk/core/src/test/java/org/apache/mahout/vectors/InteractionValueEncoderTest.java)
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/encoders/InteractionValueEncoderTest.java?p2=mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/encoders/InteractionValueEncoderTest.java&p1=mahout/trunk/core/src/test/java/org/apache/mahout/vectors/InteractionValueEncoderTest.java&r1=1004320&r2=1004469&rev=1004469&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/vectors/InteractionValueEncoderTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/encoders/InteractionValueEncoderTest.java Mon Oct 4 22:56:06 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.vectors;
+package org.apache.mahout.vectorizer.encoders;
import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.math.DenseVector;
Copied: mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/encoders/MurmurHashTest.java (from r1004320, mahout/trunk/core/src/test/java/org/apache/mahout/vectors/MurmurHashTest.java)
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/encoders/MurmurHashTest.java?p2=mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/encoders/MurmurHashTest.java&p1=mahout/trunk/core/src/test/java/org/apache/mahout/vectors/MurmurHashTest.java&r1=1004320&r2=1004469&rev=1004469&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/vectors/MurmurHashTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/encoders/MurmurHashTest.java Mon Oct 4 22:56:06 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.vectors;
+package org.apache.mahout.vectorizer.encoders;
import com.google.common.base.Charsets;
import org.apache.mahout.common.MahoutTestCase;
Copied: mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/encoders/TextValueEncoderTest.java (from r1004320, mahout/trunk/core/src/test/java/org/apache/mahout/vectors/TextValueEncoderTest.java)
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/encoders/TextValueEncoderTest.java?p2=mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/encoders/TextValueEncoderTest.java&p1=mahout/trunk/core/src/test/java/org/apache/mahout/vectors/TextValueEncoderTest.java&r1=1004320&r2=1004469&rev=1004469&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/vectors/TextValueEncoderTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/encoders/TextValueEncoderTest.java Mon Oct 4 22:56:06 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.vectors;
+package org.apache.mahout.vectorizer.encoders;
import com.google.common.collect.ImmutableMap;
import org.apache.mahout.common.MahoutTestCase;
Copied: mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/encoders/WordLikeValueEncoderTest.java (from r1004320, mahout/trunk/core/src/test/java/org/apache/mahout/vectors/WordLikeValueEncoderTest.java)
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/encoders/WordLikeValueEncoderTest.java?p2=mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/encoders/WordLikeValueEncoderTest.java&p1=mahout/trunk/core/src/test/java/org/apache/mahout/vectors/WordLikeValueEncoderTest.java&r1=1004320&r2=1004469&rev=1004469&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/vectors/WordLikeValueEncoderTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/encoders/WordLikeValueEncoderTest.java Mon Oct 4 22:56:06 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.vectors;
+package org.apache.mahout.vectorizer.encoders;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/TrainNewsGroups.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/TrainNewsGroups.java?rev=1004469&r1=1004468&r2=1004469&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/TrainNewsGroups.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/TrainNewsGroups.java Mon Oct 4 22:56:06 2010
@@ -35,10 +35,10 @@ import org.apache.mahout.math.RandomAcce
import org.apache.mahout.math.Vector;
import org.apache.mahout.math.function.Functions;
import org.apache.mahout.math.function.UnaryFunction;
-import org.apache.mahout.vectors.ConstantValueEncoder;
-import org.apache.mahout.vectors.Dictionary;
-import org.apache.mahout.vectors.FeatureVectorEncoder;
-import org.apache.mahout.vectors.StaticWordValueEncoder;
+import org.apache.mahout.vectorizer.encoders.ConstantValueEncoder;
+import org.apache.mahout.vectorizer.encoders.Dictionary;
+import org.apache.mahout.vectorizer.encoders.FeatureVectorEncoder;
+import org.apache.mahout.vectorizer.encoders.StaticWordValueEncoder;
import java.io.BufferedReader;
import java.io.File;