Author: gsingers
Date: Tue Nov 29 16:35:19 2011
New Revision: 1207951
URL: http://svn.apache.org/viewvc?rev=1207951&view=rev
Log:
move the ClusterWriter code to be in the correct package
Added:
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/AbstractClusterWriter.java
- copied, changed from r1207859,
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/AbstractClusterWriter.java
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/CSVClusterWriter.java
- copied, changed from r1207859,
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/CSVClusterWriter.java
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/ClusterDumperWriter.java
- copied, changed from r1207859,
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/ClusterDumperWriter.java
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/ClusterWriter.java
- copied, changed from r1207859,
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/ClusterWriter.java
Removed:
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/AbstractClusterWriter.java
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/CSVClusterWriter.java
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/ClusterDumperWriter.java
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/ClusterWriter.java
Modified:
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/ClusterDumper.java
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/GraphMLClusterWriter.java
Copied:
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/AbstractClusterWriter.java
(from r1207859,
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/AbstractClusterWriter.java)
URL:
http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/AbstractClusterWriter.java?p2=mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/AbstractClusterWriter.java&p1=mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/AbstractClusterWriter.java&r1=1207859&r2=1207951&rev=1207951&view=diff
==============================================================================
---
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/AbstractClusterWriter.java
(original)
+++
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/AbstractClusterWriter.java
Tue Nov 29 16:35:19 2011
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.vectors.io;
+package org.apache.mahout.utils.clustering;
import com.google.common.collect.Lists;
import org.apache.commons.lang.StringUtils;
Copied:
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/CSVClusterWriter.java
(from r1207859,
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/CSVClusterWriter.java)
URL:
http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/CSVClusterWriter.java?p2=mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/CSVClusterWriter.java&p1=mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/CSVClusterWriter.java&r1=1207859&r2=1207951&rev=1207951&view=diff
==============================================================================
---
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/CSVClusterWriter.java
(original)
+++
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/CSVClusterWriter.java
Tue Nov 29 16:35:19 2011
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.vectors.io;
+package org.apache.mahout.utils.clustering;
import org.apache.mahout.clustering.Cluster;
import org.apache.mahout.clustering.WeightedVectorWritable;
Modified:
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/ClusterDumper.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/ClusterDumper.java?rev=1207951&r1=1207950&r2=1207951&view=diff
==============================================================================
---
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/ClusterDumper.java
(original)
+++
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/ClusterDumper.java
Tue Nov 29 16:35:19 2011
@@ -30,7 +30,6 @@ import org.apache.mahout.clustering.Weig
import org.apache.mahout.clustering.cdbw.CDbwEvaluator;
import org.apache.mahout.clustering.evaluation.ClusterEvaluator;
import org.apache.mahout.clustering.evaluation.RepresentativePointsDriver;
-import org.apache.mahout.clustering.evaluation.RepresentativePointsMapper;
import org.apache.mahout.common.AbstractJob;
import org.apache.mahout.common.ClassUtils;
import org.apache.mahout.common.HadoopUtil;
@@ -42,9 +41,6 @@ import org.apache.mahout.common.iterator
import org.apache.mahout.common.iterator.sequencefile.SequenceFileDirIterable;
import
org.apache.mahout.common.iterator.sequencefile.SequenceFileDirValueIterable;
import org.apache.mahout.utils.vectors.VectorHelper;
-import org.apache.mahout.utils.vectors.io.CSVClusterWriter;
-import org.apache.mahout.utils.vectors.io.ClusterDumperWriter;
-import org.apache.mahout.utils.vectors.io.ClusterWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied:
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/ClusterDumperWriter.java
(from r1207859,
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/ClusterDumperWriter.java)
URL:
http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/ClusterDumperWriter.java?p2=mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/ClusterDumperWriter.java&p1=mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/ClusterDumperWriter.java&r1=1207859&r2=1207951&rev=1207951&view=diff
==============================================================================
---
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/ClusterDumperWriter.java
(original)
+++
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/ClusterDumperWriter.java
Tue Nov 29 16:35:19 2011
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.vectors.io;
+package org.apache.mahout.utils.clustering;
import org.apache.hadoop.io.Text;
import org.apache.mahout.clustering.AbstractCluster;
Copied:
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/ClusterWriter.java
(from r1207859,
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/ClusterWriter.java)
URL:
http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/ClusterWriter.java?p2=mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/ClusterWriter.java&p1=mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/ClusterWriter.java&r1=1207859&r2=1207951&rev=1207951&view=diff
==============================================================================
---
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/ClusterWriter.java
(original)
+++
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/ClusterWriter.java
Tue Nov 29 16:35:19 2011
@@ -1,4 +1,4 @@
-package org.apache.mahout.utils.vectors.io;
+package org.apache.mahout.utils.clustering;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
Modified:
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/GraphMLClusterWriter.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/GraphMLClusterWriter.java?rev=1207951&r1=1207950&r2=1207951&view=diff
==============================================================================
---
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/GraphMLClusterWriter.java
(original)
+++
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/GraphMLClusterWriter.java
Tue Nov 29 16:35:19 2011
@@ -21,7 +21,6 @@ import org.apache.mahout.clustering.Clus
import org.apache.mahout.clustering.WeightedVectorWritable;
import org.apache.mahout.math.NamedVector;
import org.apache.mahout.math.Vector;
-import org.apache.mahout.utils.vectors.io.AbstractClusterWriter;
import java.io.IOException;
import java.io.Writer;
