Author: robinanil
Date: Sun Oct 3 18:43:20 2010
New Revision: 1004024
URL: http://svn.apache.org/viewvc?rev=1004024&view=rev
Log:
MAHOUT-521 Moving vectorizer to core
Added:
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/DefaultAnalyzer.java
- copied, changed from r1003844,
mahout/trunk/utils/src/main/java/org/apache/mahout/text/DefaultAnalyzer.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/DictionaryVectorizer.java
- copied, changed from r1003874,
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/text/DictionaryVectorizer.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/DocumentProcessor.java
- copied, changed from r1003844,
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/text/DocumentProcessor.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/SparseVectorsFromSequenceFiles.java
- copied, changed from r1003874,
mahout/trunk/utils/src/main/java/org/apache/mahout/text/SparseVectorsFromSequenceFiles.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/TF.java
- copied, changed from r1003844,
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/TF.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/TFIDF.java
- copied, changed from r1003844,
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/TFIDF.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/Weight.java
- copied, changed from r1003844,
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/Weight.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/
- copied from r1003844,
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/nlp/collocations/
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/common/
- copied from r1003844,
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/common/
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/common/PartialVectorMergeReducer.java
- copied, changed from r1003874,
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/common/PartialVectorMergeReducer.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/common/PartialVectorMerger.java
- copied, changed from r1003874,
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/common/PartialVectorMerger.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/document/
- copied from r1003844,
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/text/document/
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/term/
- copied from r1003844,
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/text/term/
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/tfidf/
- copied from r1003844,
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/tfidf/
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/tfidf/TFIDFConverter.java
- copied, changed from r1003874,
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/tfidf/TFIDFConverter.java
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/DictionaryVectorizerTest.java
- copied, changed from r1003874,
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/text/DictionaryVectorizerTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/RandomDocumentGenerator.java
- copied, changed from r1003844,
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/text/RandomDocumentGenerator.java
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/SparseVectorsFromSequenceFilesTest.java
- copied, changed from r1003844,
mahout/trunk/utils/src/test/java/org/apache/mahout/text/SparseVectorsFromSequenceFilesTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/
- copied from r1003844,
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/nlp/collocations/
Removed:
mahout/trunk/utils/src/main/java/org/apache/mahout/text/DefaultAnalyzer.java
mahout/trunk/utils/src/main/java/org/apache/mahout/text/SparseVectorsFromSequenceFiles.java
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/nlp/collocations/
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/TF.java
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/TFIDF.java
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/Weight.java
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/common/
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/text/DictionaryVectorizer.java
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/text/DocumentProcessor.java
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/text/document/
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/text/term/
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/tfidf/
mahout/trunk/utils/src/test/java/org/apache/mahout/text/SparseVectorsFromSequenceFilesTest.java
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/nlp/collocations/
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/text/DictionaryVectorizerTest.java
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/text/RandomDocumentGenerator.java
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/CollocCombiner.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/CollocDriver.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/CollocMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/CollocReducer.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/Gram.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/GramKey.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/GramKeyGroupComparator.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/GramKeyPartitioner.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/LLRReducer.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/document/SequenceFileTokenizerMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/term/TFPartialVectorReducer.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/term/TermCountMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/term/TermCountReducer.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/term/TermDocumentCountMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/term/TermDocumentCountReducer.java
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/tfidf/TFIDFPartialVectorReducer.java
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/CollocMapperTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/CollocReducerTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/GramKeyGroupComparatorTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/GramKeyPartitionerTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/GramKeyTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/GramTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/LLRReducerTest.java
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/Driver.java
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/TFDFMapper.java
mahout/trunk/utils/src/test/java/org/apache/mahout/clustering/TestClusterDumper.java
mahout/trunk/utils/src/test/java/org/apache/mahout/clustering/dirichlet/TestL1ModelClustering.java
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/lucene/LuceneIterableTest.java
Copied:
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/DefaultAnalyzer.java
(from r1003844,
mahout/trunk/utils/src/main/java/org/apache/mahout/text/DefaultAnalyzer.java)
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/DefaultAnalyzer.java?p2=mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/DefaultAnalyzer.java&p1=mahout/trunk/utils/src/main/java/org/apache/mahout/text/DefaultAnalyzer.java&r1=1003844&r2=1004024&rev=1004024&view=diff
==============================================================================
---
mahout/trunk/utils/src/main/java/org/apache/mahout/text/DefaultAnalyzer.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/DefaultAnalyzer.java
Sun Oct 3 18:43:20 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.mahout.text;
+package org.apache.mahout.vectorizer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.util.Version;
Copied:
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/DictionaryVectorizer.java
(from r1003874,
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/text/DictionaryVectorizer.java)
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/DictionaryVectorizer.java?p2=mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/DictionaryVectorizer.java&p1=mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/text/DictionaryVectorizer.java&r1=1003874&r2=1004024&rev=1004024&view=diff
==============================================================================
---
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/text/DictionaryVectorizer.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/DictionaryVectorizer.java
Sun Oct 3 18:43:20 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.vectors.text;
+package org.apache.mahout.vectorizer;
import java.io.IOException;
import java.net.URI;
@@ -42,11 +42,11 @@ import org.apache.hadoop.mapreduce.lib.o
import org.apache.mahout.common.HadoopUtil;
import org.apache.mahout.common.StringTuple;
import org.apache.mahout.math.VectorWritable;
-import org.apache.mahout.utils.nlp.collocations.llr.CollocDriver;
-import org.apache.mahout.utils.vectors.common.PartialVectorMerger;
-import org.apache.mahout.utils.vectors.text.term.TFPartialVectorReducer;
-import org.apache.mahout.utils.vectors.text.term.TermCountMapper;
-import org.apache.mahout.utils.vectors.text.term.TermCountReducer;
+import org.apache.mahout.vectorizer.collocations.llr.CollocDriver;
+import org.apache.mahout.vectorizer.common.PartialVectorMerger;
+import org.apache.mahout.vectorizer.term.TFPartialVectorReducer;
+import org.apache.mahout.vectorizer.term.TermCountMapper;
+import org.apache.mahout.vectorizer.term.TermCountReducer;
/**
* This class converts a set of input documents in the sequence file format to
vectors. The Sequence file
Copied:
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/DocumentProcessor.java
(from r1003844,
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/text/DocumentProcessor.java)
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/DocumentProcessor.java?p2=mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/DocumentProcessor.java&p1=mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/text/DocumentProcessor.java&r1=1003844&r2=1004024&rev=1004024&view=diff
==============================================================================
---
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/text/DocumentProcessor.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/DocumentProcessor.java
Sun Oct 3 18:43:20 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.vectors.text;
+package org.apache.mahout.vectorizer;
import java.io.IOException;
@@ -30,7 +30,7 @@ import org.apache.hadoop.mapreduce.lib.o
import org.apache.lucene.analysis.Analyzer;
import org.apache.mahout.common.HadoopUtil;
import org.apache.mahout.common.StringTuple;
-import
org.apache.mahout.utils.vectors.text.document.SequenceFileTokenizerMapper;
+import org.apache.mahout.vectorizer.document.SequenceFileTokenizerMapper;
/**
* This class converts a set of input documents in the sequence file format of
{...@link StringTuple}s.The
Copied:
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/SparseVectorsFromSequenceFiles.java
(from r1003874,
mahout/trunk/utils/src/main/java/org/apache/mahout/text/SparseVectorsFromSequenceFiles.java)
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/SparseVectorsFromSequenceFiles.java?p2=mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/SparseVectorsFromSequenceFiles.java&p1=mahout/trunk/utils/src/main/java/org/apache/mahout/text/SparseVectorsFromSequenceFiles.java&r1=1003874&r2=1004024&rev=1004024&view=diff
==============================================================================
---
mahout/trunk/utils/src/main/java/org/apache/mahout/text/SparseVectorsFromSequenceFiles.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/SparseVectorsFromSequenceFiles.java
Sun Oct 3 18:43:20 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.text;
+package org.apache.mahout.vectorizer;
import org.apache.commons.cli2.CommandLine;
import org.apache.commons.cli2.Group;
@@ -30,11 +30,11 @@ import org.apache.hadoop.fs.Path;
import org.apache.lucene.analysis.Analyzer;
import org.apache.mahout.common.CommandLineUtil;
import org.apache.mahout.common.HadoopUtil;
-import org.apache.mahout.utils.nlp.collocations.llr.LLRReducer;
-import org.apache.mahout.utils.vectors.common.PartialVectorMerger;
-import org.apache.mahout.utils.vectors.text.DictionaryVectorizer;
-import org.apache.mahout.utils.vectors.text.DocumentProcessor;
-import org.apache.mahout.utils.vectors.tfidf.TFIDFConverter;
+import org.apache.mahout.vectorizer.collocations.llr.LLRReducer;
+import org.apache.mahout.vectorizer.common.PartialVectorMerger;
+import org.apache.mahout.vectorizer.DictionaryVectorizer;
+import org.apache.mahout.vectorizer.DocumentProcessor;
+import org.apache.mahout.vectorizer.tfidf.TFIDFConverter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/TF.java
(from r1003844,
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/TF.java)
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/TF.java?p2=mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/TF.java&p1=mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/TF.java&r1=1003844&r2=1004024&rev=1004024&view=diff
==============================================================================
--- mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/TF.java
(original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/TF.java Sun
Oct 3 18:43:20 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.vectors;
+package org.apache.mahout.vectorizer;
/**
* {...@link org.apache.mahout.utils.vectors.Weight} based on term frequency
only
Copied: mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/TFIDF.java
(from r1003844,
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/TFIDF.java)
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/TFIDF.java?p2=mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/TFIDF.java&p1=mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/TFIDF.java&r1=1003844&r2=1004024&rev=1004024&view=diff
==============================================================================
--- mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/TFIDF.java
(original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/TFIDF.java Sun
Oct 3 18:43:20 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.vectors;
+package org.apache.mahout.vectorizer;
import org.apache.lucene.search.DefaultSimilarity;
import org.apache.lucene.search.Similarity;
Copied:
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/Weight.java (from
r1003844,
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/Weight.java)
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/Weight.java?p2=mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/Weight.java&p1=mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/Weight.java&r1=1003844&r2=1004024&rev=1004024&view=diff
==============================================================================
---
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/Weight.java
(original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/Weight.java
Sun Oct 3 18:43:20 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.vectors;
+package org.apache.mahout.vectorizer;
public interface Weight {
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/CollocCombiner.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/CollocCombiner.java?rev=1004024&r1=1003844&r2=1004024&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/CollocCombiner.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/CollocCombiner.java
Sun Oct 3 18:43:20 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.nlp.collocations.llr;
+package org.apache.mahout.vectorizer.collocations.llr;
import java.io.IOException;
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/CollocDriver.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/CollocDriver.java?rev=1004024&r1=1003844&r2=1004024&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/CollocDriver.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/CollocDriver.java
Sun Oct 3 18:43:20 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.nlp.collocations.llr;
+package org.apache.mahout.vectorizer.collocations.llr;
import java.io.IOException;
import java.util.Map;
@@ -35,8 +35,8 @@ import org.apache.lucene.analysis.Analyz
import org.apache.mahout.common.AbstractJob;
import org.apache.mahout.common.HadoopUtil;
import org.apache.mahout.common.commandline.DefaultOptionCreator;
-import org.apache.mahout.text.DefaultAnalyzer;
-import org.apache.mahout.utils.vectors.text.DocumentProcessor;
+import org.apache.mahout.vectorizer.DefaultAnalyzer;
+import org.apache.mahout.vectorizer.DocumentProcessor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/CollocMapper.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/CollocMapper.java?rev=1004024&r1=1003844&r2=1004024&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/CollocMapper.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/CollocMapper.java
Sun Oct 3 18:43:20 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.nlp.collocations.llr;
+package org.apache.mahout.vectorizer.collocations.llr;
import java.io.IOException;
import java.util.Iterator;
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/CollocReducer.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/CollocReducer.java?rev=1004024&r1=1003844&r2=1004024&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/CollocReducer.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/CollocReducer.java
Sun Oct 3 18:43:20 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.nlp.collocations.llr;
+package org.apache.mahout.vectorizer.collocations.llr;
import java.io.IOException;
import java.util.Iterator;
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/Gram.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/Gram.java?rev=1004024&r1=1003844&r2=1004024&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/Gram.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/Gram.java
Sun Oct 3 18:43:20 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.nlp.collocations.llr;
+package org.apache.mahout.vectorizer.collocations.llr;
import java.io.DataInput;
import java.io.DataOutput;
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/GramKey.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/GramKey.java?rev=1004024&r1=1003844&r2=1004024&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/GramKey.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/GramKey.java
Sun Oct 3 18:43:20 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.nlp.collocations.llr;
+package org.apache.mahout.vectorizer.collocations.llr;
import java.io.DataInput;
import java.io.DataOutput;
@@ -26,7 +26,7 @@ import org.apache.hadoop.io.BinaryCompar
import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.WritableComparable;
import org.apache.mahout.math.Varint;
-import org.apache.mahout.utils.nlp.collocations.llr.Gram.Type;
+import org.apache.mahout.vectorizer.collocations.llr.Gram.Type;
/** A GramKey, based on the identity fields of Gram (type, string) plus a
byte[] used for secondary ordering */
public final class GramKey extends BinaryComparable implements
WritableComparable<BinaryComparable> {
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/GramKeyGroupComparator.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/GramKeyGroupComparator.java?rev=1004024&r1=1003844&r2=1004024&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/GramKeyGroupComparator.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/GramKeyGroupComparator.java
Sun Oct 3 18:43:20 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.nlp.collocations.llr;
+package org.apache.mahout.vectorizer.collocations.llr;
import org.apache.hadoop.io.WritableComparable;
import org.apache.hadoop.io.WritableComparator;
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/GramKeyPartitioner.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/GramKeyPartitioner.java?rev=1004024&r1=1003844&r2=1004024&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/GramKeyPartitioner.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/GramKeyPartitioner.java
Sun Oct 3 18:43:20 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.nlp.collocations.llr;
+package org.apache.mahout.vectorizer.collocations.llr;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.WritableComparator;
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/LLRReducer.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/LLRReducer.java?rev=1004024&r1=1003844&r2=1004024&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/LLRReducer.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/collocations/llr/LLRReducer.java
Sun Oct 3 18:43:20 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.nlp.collocations.llr;
+package org.apache.mahout.vectorizer.collocations.llr;
import java.io.IOException;
Copied:
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/common/PartialVectorMergeReducer.java
(from r1003874,
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/common/PartialVectorMergeReducer.java)
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/common/PartialVectorMergeReducer.java?p2=mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/common/PartialVectorMergeReducer.java&p1=mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/common/PartialVectorMergeReducer.java&r1=1003874&r2=1004024&rev=1004024&view=diff
==============================================================================
---
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/common/PartialVectorMergeReducer.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/common/PartialVectorMergeReducer.java
Sun Oct 3 18:43:20 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.vectors.common;
+package org.apache.mahout.vectorizer.common;
import java.io.IOException;
Copied:
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/common/PartialVectorMerger.java
(from r1003874,
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/common/PartialVectorMerger.java)
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/common/PartialVectorMerger.java?p2=mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/common/PartialVectorMerger.java&p1=mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/common/PartialVectorMerger.java&r1=1003874&r2=1004024&rev=1004024&view=diff
==============================================================================
---
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/common/PartialVectorMerger.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/common/PartialVectorMerger.java
Sun Oct 3 18:43:20 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.vectors.common;
+package org.apache.mahout.vectorizer.common;
import java.io.IOException;
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/document/SequenceFileTokenizerMapper.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/document/SequenceFileTokenizerMapper.java?rev=1004024&r1=1003844&r2=1004024&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/document/SequenceFileTokenizerMapper.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/document/SequenceFileTokenizerMapper.java
Sun Oct 3 18:43:20 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.vectors.text.document;
+package org.apache.mahout.vectorizer.document;
import java.io.IOException;
import java.io.StringReader;
@@ -26,8 +26,8 @@ import org.apache.lucene.analysis.Analyz
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.TermAttribute;
import org.apache.mahout.common.StringTuple;
-import org.apache.mahout.text.DefaultAnalyzer;
-import org.apache.mahout.utils.vectors.text.DocumentProcessor;
+import org.apache.mahout.vectorizer.DefaultAnalyzer;
+import org.apache.mahout.vectorizer.DocumentProcessor;
/**
* Tokenizes a text document and outputs tokens in a StringTuple
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/term/TFPartialVectorReducer.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/term/TFPartialVectorReducer.java?rev=1004024&r1=1003844&r2=1004024&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/term/TFPartialVectorReducer.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/term/TFPartialVectorReducer.java
Sun Oct 3 18:43:20 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.vectors.text.term;
+package org.apache.mahout.vectorizer.term;
import java.io.IOException;
import java.net.URI;
@@ -39,9 +39,9 @@ import org.apache.mahout.math.Sequential
import org.apache.mahout.math.Vector;
import org.apache.mahout.math.VectorWritable;
import org.apache.mahout.math.map.OpenObjectIntHashMap;
-import
org.apache.mahout.utils.nlp.collocations.llr.CollocMapper.IteratorTokenStream;
-import org.apache.mahout.utils.vectors.common.PartialVectorMerger;
-import org.apache.mahout.utils.vectors.text.DictionaryVectorizer;
+import
org.apache.mahout.vectorizer.collocations.llr.CollocMapper.IteratorTokenStream;
+import org.apache.mahout.vectorizer.common.PartialVectorMerger;
+import org.apache.mahout.vectorizer.DictionaryVectorizer;
/**
* Converts a document in to a sparse vector
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/term/TermCountMapper.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/term/TermCountMapper.java?rev=1004024&r1=1003844&r2=1004024&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/term/TermCountMapper.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/term/TermCountMapper.java
Sun Oct 3 18:43:20 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.vectors.text.term;
+package org.apache.mahout.vectorizer.term;
import java.io.IOException;
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/term/TermCountReducer.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/term/TermCountReducer.java?rev=1004024&r1=1003844&r2=1004024&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/term/TermCountReducer.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/term/TermCountReducer.java
Sun Oct 3 18:43:20 2010
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.vectors.text.term;
+package org.apache.mahout.vectorizer.term;
import java.io.IOException;
import org.apache.hadoop.io.LongWritable;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapreduce.Reducer;
-import org.apache.mahout.utils.vectors.text.DictionaryVectorizer;
+import org.apache.mahout.vectorizer.DictionaryVectorizer;
/**
* Can also be used as a local Combiner. This accumulates all the words and
the weights and sums them up.
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/term/TermDocumentCountMapper.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/term/TermDocumentCountMapper.java?rev=1004024&r1=1003844&r2=1004024&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/term/TermDocumentCountMapper.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/term/TermDocumentCountMapper.java
Sun Oct 3 18:43:20 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.vectors.text.term;
+package org.apache.mahout.vectorizer.term;
import java.io.IOException;
import java.util.Iterator;
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/term/TermDocumentCountReducer.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/term/TermDocumentCountReducer.java?rev=1004024&r1=1003844&r2=1004024&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/term/TermDocumentCountReducer.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/term/TermDocumentCountReducer.java
Sun Oct 3 18:43:20 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.vectors.text.term;
+package org.apache.mahout.vectorizer.term;
import java.io.IOException;
Copied:
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/tfidf/TFIDFConverter.java
(from r1003874,
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/tfidf/TFIDFConverter.java)
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/tfidf/TFIDFConverter.java?p2=mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/tfidf/TFIDFConverter.java&p1=mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/tfidf/TFIDFConverter.java&r1=1003874&r2=1004024&rev=1004024&view=diff
==============================================================================
---
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/tfidf/TFIDFConverter.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/tfidf/TFIDFConverter.java
Sun Oct 3 18:43:20 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.vectors.tfidf;
+package org.apache.mahout.vectorizer.tfidf;
import java.io.IOException;
import java.net.URI;
@@ -40,9 +40,9 @@ import org.apache.hadoop.mapreduce.lib.o
import org.apache.mahout.common.HadoopUtil;
import org.apache.mahout.common.Pair;
import org.apache.mahout.math.VectorWritable;
-import org.apache.mahout.utils.vectors.common.PartialVectorMerger;
-import org.apache.mahout.utils.vectors.text.term.TermDocumentCountMapper;
-import org.apache.mahout.utils.vectors.text.term.TermDocumentCountReducer;
+import org.apache.mahout.vectorizer.common.PartialVectorMerger;
+import org.apache.mahout.vectorizer.term.TermDocumentCountMapper;
+import org.apache.mahout.vectorizer.term.TermDocumentCountReducer;
/**
* This class converts a set of input vectors with term frequencies to TfIdf
vectors. The Sequence file input
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/tfidf/TFIDFPartialVectorReducer.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/tfidf/TFIDFPartialVectorReducer.java?rev=1004024&r1=1003844&r2=1004024&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/tfidf/TFIDFPartialVectorReducer.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/vectorizer/tfidf/TFIDFPartialVectorReducer.java
Sun Oct 3 18:43:20 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.vectors.tfidf;
+package org.apache.mahout.vectorizer.tfidf;
import java.io.IOException;
import java.net.URI;
@@ -36,8 +36,8 @@ import org.apache.mahout.math.Sequential
import org.apache.mahout.math.Vector;
import org.apache.mahout.math.VectorWritable;
import org.apache.mahout.math.map.OpenIntLongHashMap;
-import org.apache.mahout.utils.vectors.TFIDF;
-import org.apache.mahout.utils.vectors.common.PartialVectorMerger;
+import org.apache.mahout.vectorizer.TFIDF;
+import org.apache.mahout.vectorizer.common.PartialVectorMerger;
/**
* Converts a document in to a sparse vector
Copied:
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/DictionaryVectorizerTest.java
(from r1003874,
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/text/DictionaryVectorizerTest.java)
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/DictionaryVectorizerTest.java?p2=mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/DictionaryVectorizerTest.java&p1=mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/text/DictionaryVectorizerTest.java&r1=1003874&r2=1004024&rev=1004024&view=diff
==============================================================================
---
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/text/DictionaryVectorizerTest.java
(original)
+++
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/DictionaryVectorizerTest.java
Sun Oct 3 18:43:20 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.vectors.text;
+package org.apache.mahout.vectorizer;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileStatus;
@@ -25,14 +25,13 @@ import org.apache.hadoop.fs.PathFilter;
import org.apache.hadoop.io.SequenceFile;
import org.apache.hadoop.io.Text;
import org.apache.lucene.analysis.Analyzer;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.math.NamedVector;
import org.apache.mahout.math.RandomAccessSparseVector;
import org.apache.mahout.math.SequentialAccessSparseVector;
import org.apache.mahout.math.Vector;
import org.apache.mahout.math.VectorWritable;
-import org.apache.mahout.text.DefaultAnalyzer;
-import org.apache.mahout.utils.MahoutTestCase;
-import org.apache.mahout.utils.vectors.tfidf.TFIDFConverter;
+import org.apache.mahout.vectorizer.tfidf.TFIDFConverter;
import org.junit.Before;
import org.junit.Test;
Copied:
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/RandomDocumentGenerator.java
(from r1003844,
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/text/RandomDocumentGenerator.java)
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/RandomDocumentGenerator.java?p2=mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/RandomDocumentGenerator.java&p1=mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/text/RandomDocumentGenerator.java&r1=1003844&r2=1004024&rev=1004024&view=diff
==============================================================================
---
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/text/RandomDocumentGenerator.java
(original)
+++
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/RandomDocumentGenerator.java
Sun Oct 3 18:43:20 2010
@@ -1,4 +1,4 @@
-package org.apache.mahout.utils.vectors.text;
+package org.apache.mahout.vectorizer;
import java.util.Random;
Copied:
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/SparseVectorsFromSequenceFilesTest.java
(from r1003844,
mahout/trunk/utils/src/test/java/org/apache/mahout/text/SparseVectorsFromSequenceFilesTest.java)
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/SparseVectorsFromSequenceFilesTest.java?p2=mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/SparseVectorsFromSequenceFilesTest.java&p1=mahout/trunk/utils/src/test/java/org/apache/mahout/text/SparseVectorsFromSequenceFilesTest.java&r1=1003844&r2=1004024&rev=1004024&view=diff
==============================================================================
---
mahout/trunk/utils/src/test/java/org/apache/mahout/text/SparseVectorsFromSequenceFilesTest.java
(original)
+++
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/SparseVectorsFromSequenceFilesTest.java
Sun Oct 3 18:43:20 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.text;
+package org.apache.mahout.vectorizer;
import java.util.LinkedList;
import java.util.List;
@@ -25,9 +25,7 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.SequenceFile;
import org.apache.hadoop.io.Text;
-import org.apache.mahout.utils.MahoutTestCase;
-import org.apache.mahout.utils.vectors.text.DictionaryVectorizerTest;
-import org.apache.mahout.utils.vectors.text.RandomDocumentGenerator;
+import org.apache.mahout.common.MahoutTestCase;
import org.junit.Before;
import org.junit.Test;
Modified:
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/CollocMapperTest.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/CollocMapperTest.java?rev=1004024&r1=1003844&r2=1004024&view=diff
==============================================================================
---
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/CollocMapperTest.java
(original)
+++
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/CollocMapperTest.java
Sun Oct 3 18:43:20 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.nlp.collocations.llr;
+package org.apache.mahout.vectorizer.collocations.llr;
import java.io.Reader;
import java.util.Collections;
@@ -29,9 +29,9 @@ import org.apache.lucene.analysis.Analyz
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.util.Version;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.StringTuple;
-import org.apache.mahout.utils.MahoutTestCase;
-import org.apache.mahout.utils.nlp.collocations.llr.Gram.Type;
+import org.apache.mahout.vectorizer.collocations.llr.Gram.Type;
import org.easymock.classextension.EasyMock;
import org.junit.Before;
import org.junit.Test;
Modified:
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/CollocReducerTest.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/CollocReducerTest.java?rev=1004024&r1=1003844&r2=1004024&view=diff
==============================================================================
---
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/CollocReducerTest.java
(original)
+++
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/CollocReducerTest.java
Sun Oct 3 18:43:20 2010
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.nlp.collocations.llr;
+package org.apache.mahout.vectorizer.collocations.llr;
-import static org.apache.mahout.utils.nlp.collocations.llr.Gram.Type.HEAD;
-import static org.apache.mahout.utils.nlp.collocations.llr.Gram.Type.NGRAM;
-import static org.apache.mahout.utils.nlp.collocations.llr.Gram.Type.TAIL;
-import static org.apache.mahout.utils.nlp.collocations.llr.Gram.Type.UNIGRAM;
+import static org.apache.mahout.vectorizer.collocations.llr.Gram.Type.HEAD;
+import static org.apache.mahout.vectorizer.collocations.llr.Gram.Type.NGRAM;
+import static org.apache.mahout.vectorizer.collocations.llr.Gram.Type.TAIL;
+import static org.apache.mahout.vectorizer.collocations.llr.Gram.Type.UNIGRAM;
import java.util.Arrays;
import java.util.Collection;
@@ -28,7 +28,7 @@ import java.util.LinkedList;
import org.apache.hadoop.mapreduce.Reducer;
import org.apache.hadoop.mapreduce.Reducer.Context;
-import org.apache.mahout.utils.MahoutTestCase;
+import org.apache.mahout.common.MahoutTestCase;
import org.easymock.classextension.EasyMock;
import org.junit.Before;
import org.junit.Test;
Modified:
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/GramKeyGroupComparatorTest.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/GramKeyGroupComparatorTest.java?rev=1004024&r1=1003844&r2=1004024&view=diff
==============================================================================
---
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/GramKeyGroupComparatorTest.java
(original)
+++
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/GramKeyGroupComparatorTest.java
Sun Oct 3 18:43:20 2010
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.nlp.collocations.llr;
+package org.apache.mahout.vectorizer.collocations.llr;
-import org.apache.mahout.utils.MahoutTestCase;
+import org.apache.mahout.common.MahoutTestCase;
import org.junit.Test;
public final class GramKeyGroupComparatorTest extends MahoutTestCase {
Modified:
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/GramKeyPartitionerTest.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/GramKeyPartitionerTest.java?rev=1004024&r1=1003844&r2=1004024&view=diff
==============================================================================
---
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/GramKeyPartitionerTest.java
(original)
+++
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/GramKeyPartitionerTest.java
Sun Oct 3 18:43:20 2010
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.nlp.collocations.llr;
+package org.apache.mahout.vectorizer.collocations.llr;
import org.apache.hadoop.mapreduce.Partitioner;
-import org.apache.mahout.utils.MahoutTestCase;
+import org.apache.mahout.common.MahoutTestCase;
import org.junit.Test;
public final class GramKeyPartitionerTest extends MahoutTestCase {
Modified:
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/GramKeyTest.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/GramKeyTest.java?rev=1004024&r1=1003844&r2=1004024&view=diff
==============================================================================
---
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/GramKeyTest.java
(original)
+++
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/GramKeyTest.java
Sun Oct 3 18:43:20 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.nlp.collocations.llr;
+package org.apache.mahout.vectorizer.collocations.llr;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -23,7 +23,7 @@ import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.util.Arrays;
-import org.apache.mahout.utils.MahoutTestCase;
+import org.apache.mahout.common.MahoutTestCase;
import org.junit.Test;
public final class GramKeyTest extends MahoutTestCase {
Modified:
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/GramTest.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/GramTest.java?rev=1004024&r1=1003844&r2=1004024&view=diff
==============================================================================
---
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/GramTest.java
(original)
+++
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/GramTest.java
Sun Oct 3 18:43:20 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.nlp.collocations.llr;
+package org.apache.mahout.vectorizer.collocations.llr;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -26,7 +26,7 @@ import java.io.DataOutputStream;
import java.util.Arrays;
import java.util.HashMap;
-import org.apache.mahout.utils.MahoutTestCase;
+import org.apache.mahout.common.MahoutTestCase;
import org.junit.Test;
public final class GramTest extends MahoutTestCase {
Modified:
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/LLRReducerTest.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/LLRReducerTest.java?rev=1004024&r1=1003844&r2=1004024&view=diff
==============================================================================
---
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/LLRReducerTest.java
(original)
+++
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/LLRReducerTest.java
Sun Oct 3 18:43:20 2010
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.nlp.collocations.llr;
+package org.apache.mahout.vectorizer.collocations.llr;
-import static org.apache.mahout.utils.nlp.collocations.llr.Gram.Type.HEAD;
-import static org.apache.mahout.utils.nlp.collocations.llr.Gram.Type.NGRAM;
-import static org.apache.mahout.utils.nlp.collocations.llr.Gram.Type.TAIL;
+import static org.apache.mahout.vectorizer.collocations.llr.Gram.Type.HEAD;
+import static org.apache.mahout.vectorizer.collocations.llr.Gram.Type.NGRAM;
+import static org.apache.mahout.vectorizer.collocations.llr.Gram.Type.TAIL;
import java.util.Arrays;
import java.util.Collection;
@@ -29,9 +29,9 @@ import org.apache.hadoop.conf.Configurat
import org.apache.hadoop.io.DoubleWritable;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapreduce.Reducer;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.math.stats.LogLikelihood;
-import org.apache.mahout.utils.MahoutTestCase;
-import org.apache.mahout.utils.nlp.collocations.llr.LLRReducer.LLCallback;
+import org.apache.mahout.vectorizer.collocations.llr.LLRReducer.LLCallback;
import org.easymock.classextension.EasyMock;
import org.junit.Before;
import org.junit.Test;
Modified:
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/Driver.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/Driver.java?rev=1004024&r1=1004023&r2=1004024&view=diff
==============================================================================
---
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/Driver.java
(original)
+++
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/Driver.java
Sun Oct 3 18:43:20 2010
@@ -43,14 +43,14 @@ import org.apache.lucene.store.Directory
import org.apache.lucene.store.FSDirectory;
import org.apache.mahout.common.CommandLineUtil;
import org.apache.mahout.math.VectorWritable;
-import org.apache.mahout.utils.vectors.TF;
-import org.apache.mahout.utils.vectors.TFIDF;
import org.apache.mahout.utils.vectors.TermInfo;
-import org.apache.mahout.utils.vectors.Weight;
import org.apache.mahout.utils.vectors.io.JWriterTermInfoWriter;
import org.apache.mahout.utils.vectors.io.JWriterVectorWriter;
import org.apache.mahout.utils.vectors.io.SequenceFileVectorWriter;
import org.apache.mahout.utils.vectors.io.VectorWriter;
+import org.apache.mahout.vectorizer.TF;
+import org.apache.mahout.vectorizer.TFIDF;
+import org.apache.mahout.vectorizer.Weight;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/TFDFMapper.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/TFDFMapper.java?rev=1004024&r1=1004023&r2=1004024&view=diff
==============================================================================
---
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/TFDFMapper.java
(original)
+++
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/TFDFMapper.java
Sun Oct 3 18:43:20 2010
@@ -23,7 +23,7 @@ import org.apache.mahout.math.RandomAcce
import org.apache.mahout.math.Vector;
import org.apache.mahout.utils.vectors.TermEntry;
import org.apache.mahout.utils.vectors.TermInfo;
-import org.apache.mahout.utils.vectors.Weight;
+import org.apache.mahout.vectorizer.Weight;
/**
Modified:
mahout/trunk/utils/src/test/java/org/apache/mahout/clustering/TestClusterDumper.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/utils/src/test/java/org/apache/mahout/clustering/TestClusterDumper.java?rev=1004024&r1=1004023&r2=1004024&view=diff
==============================================================================
---
mahout/trunk/utils/src/test/java/org/apache/mahout/clustering/TestClusterDumper.java
(original)
+++
mahout/trunk/utils/src/test/java/org/apache/mahout/clustering/TestClusterDumper.java
Sun Oct 3 18:43:20 2010
@@ -59,14 +59,14 @@ import org.apache.mahout.math.hadoop.Dis
import org.apache.mahout.math.hadoop.decomposer.DistributedLanczosSolver;
import org.apache.mahout.math.hadoop.decomposer.EigenVerificationJob;
import org.apache.mahout.utils.clustering.ClusterDumper;
-import org.apache.mahout.utils.vectors.TFIDF;
import org.apache.mahout.utils.vectors.TermEntry;
import org.apache.mahout.utils.vectors.TermInfo;
-import org.apache.mahout.utils.vectors.Weight;
import org.apache.mahout.utils.vectors.lucene.CachedTermInfo;
import org.apache.mahout.utils.vectors.lucene.LuceneIterable;
import org.apache.mahout.utils.vectors.lucene.TFDFMapper;
import org.apache.mahout.utils.vectors.lucene.VectorMapper;
+import org.apache.mahout.vectorizer.TFIDF;
+import org.apache.mahout.vectorizer.Weight;
import org.junit.Before;
import org.junit.Test;
Modified:
mahout/trunk/utils/src/test/java/org/apache/mahout/clustering/dirichlet/TestL1ModelClustering.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/utils/src/test/java/org/apache/mahout/clustering/dirichlet/TestL1ModelClustering.java?rev=1004024&r1=1004023&r2=1004024&view=diff
==============================================================================
---
mahout/trunk/utils/src/test/java/org/apache/mahout/clustering/dirichlet/TestL1ModelClustering.java
(original)
+++
mahout/trunk/utils/src/test/java/org/apache/mahout/clustering/dirichlet/TestL1ModelClustering.java
Sun Oct 3 18:43:20 2010
@@ -39,13 +39,13 @@ import org.apache.mahout.clustering.diri
import org.apache.mahout.math.Vector;
import org.apache.mahout.math.VectorWritable;
import org.apache.mahout.utils.MahoutTestCase;
-import org.apache.mahout.utils.vectors.TFIDF;
import org.apache.mahout.utils.vectors.TermInfo;
-import org.apache.mahout.utils.vectors.Weight;
import org.apache.mahout.utils.vectors.lucene.CachedTermInfo;
import org.apache.mahout.utils.vectors.lucene.LuceneIterable;
import org.apache.mahout.utils.vectors.lucene.TFDFMapper;
import org.apache.mahout.utils.vectors.lucene.VectorMapper;
+import org.apache.mahout.vectorizer.TFIDF;
+import org.apache.mahout.vectorizer.Weight;
import org.junit.Test;
public final class TestL1ModelClustering extends MahoutTestCase {
Modified:
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/lucene/LuceneIterableTest.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/lucene/LuceneIterableTest.java?rev=1004024&r1=1004023&r2=1004024&view=diff
==============================================================================
---
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/lucene/LuceneIterableTest.java
(original)
+++
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/lucene/LuceneIterableTest.java
Sun Oct 3 18:43:20 2010
@@ -28,9 +28,9 @@ import org.apache.lucene.util.Version;
import org.apache.mahout.math.NamedVector;
import org.apache.mahout.math.Vector;
import org.apache.mahout.utils.MahoutTestCase;
-import org.apache.mahout.utils.vectors.TFIDF;
import org.apache.mahout.utils.vectors.TermInfo;
-import org.apache.mahout.utils.vectors.Weight;
+import org.apache.mahout.vectorizer.TFIDF;
+import org.apache.mahout.vectorizer.Weight;
import org.junit.Test;
public final class LuceneIterableTest extends MahoutTestCase {
