Author: srowen
Date: Sat Apr 23 15:53:32 2011
New Revision: 1096170
URL: http://svn.apache.org/viewvc?rev=1096170&view=rev
Log:
Style-ish stuff like copyright headers
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/ClusterClassifier.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/ClusterIterator.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/ClusteringPolicy.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/DirichletClusteringPolicy.java
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayDirichlet.java
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayKMeans.java
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/Bump125.java
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/LuceneIterable.java
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/LuceneIterator.java
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/Bump125Test.java
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/lucene/LuceneIterableTest.java
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/ClusterClassifier.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/ClusterClassifier.java?rev=1096170&r1=1096169&r2=1096170&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/ClusterClassifier.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/ClusterClassifier.java
Sat Apr 23 15:53:32 2011
@@ -42,8 +42,7 @@ import org.apache.mahout.math.function.T
* asking the actual model to observe the vector and closing the classifier
* causes all the models to computeParameters.
*/
-public class ClusterClassifier extends AbstractVectorClassifier implements
- OnlineLearner, Writable {
+public class ClusterClassifier extends AbstractVectorClassifier implements
OnlineLearner, Writable {
private List<Cluster> models;
@@ -65,11 +64,11 @@ public class ClusterClassifier extends A
@Override
public Vector classify(Vector instance) {
- Vector pdfs = new DenseVector(getModels().size());
- if (getModels().get(0) instanceof SoftCluster) {
+ Vector pdfs = new DenseVector(models.size());
+ if (models.get(0) instanceof SoftCluster) {
Collection<SoftCluster> clusters = new ArrayList<SoftCluster>();
List<Double> distances = new ArrayList<Double>();
- for (Cluster model : getModels()) {
+ for (Cluster model : models) {
SoftCluster sc = (SoftCluster) model;
clusters.add(sc);
distances.add(sc.getMeasure().distance(instance, sc.getCenter()));
@@ -77,7 +76,7 @@ public class ClusterClassifier extends A
return new FuzzyKMeansClusterer().computePi(clusters, distances);
} else {
int i = 0;
- for (Cluster model : getModels()) {
+ for (Cluster model : models) {
pdfs.set(i++, model.pdf(new VectorWritable(instance)));
}
return pdfs.assign(new TimesFunction(), 1.0 / pdfs.zSum());
@@ -86,9 +85,9 @@ public class ClusterClassifier extends A
@Override
public double classifyScalar(Vector instance) {
- if (getModels().size() == 2) {
- double pdf0 = getModels().get(0).pdf(new VectorWritable(instance));
- double pdf1 = getModels().get(1).pdf(new VectorWritable(instance));
+ if (models.size() == 2) {
+ double pdf0 = models.get(0).pdf(new VectorWritable(instance));
+ double pdf1 = models.get(1).pdf(new VectorWritable(instance));
return pdf0 / (pdf0 + pdf1);
}
throw new IllegalStateException();
@@ -96,17 +95,19 @@ public class ClusterClassifier extends A
@Override
public int numCategories() {
- return getModels().size();
+ return models.size();
}
+ @Override
public void write(DataOutput out) throws IOException {
- out.writeInt(getModels().size());
+ out.writeInt(models.size());
out.writeUTF(modelClass);
- for (Cluster cluster : getModels()) {
+ for (Cluster cluster : models) {
cluster.write(out);
}
}
+ @Override
public void readFields(DataInput in) throws IOException {
int size = in.readInt();
modelClass = in.readUTF();
@@ -119,7 +120,7 @@ public class ClusterClassifier extends A
for (int i = 0; i < size; i++) {
Cluster element = factory.newInstance();
element.readFields(in);
- getModels().add(element);
+ models.add(element);
}
} catch (ClassNotFoundException e) {
throw new IllegalStateException(e);
@@ -130,8 +131,9 @@ public class ClusterClassifier extends A
}
}
+ @Override
public void train(int actual, Vector instance) {
- getModels().get(actual).observe(new VectorWritable(instance));
+ models.get(actual).observe(new VectorWritable(instance));
}
/**
@@ -145,20 +147,22 @@ public class ClusterClassifier extends A
* a double weighting factor
*/
public void train(int actual, Vector data, double weight) {
- getModels().get(actual).observe(new VectorWritable(data), weight);
+ models.get(actual).observe(new VectorWritable(data), weight);
}
- public void train(long trackingKey, String groupKey, int actual,
- Vector instance) {
- getModels().get(actual).observe(new VectorWritable(instance));
+ @Override
+ public void train(long trackingKey, String groupKey, int actual, Vector
instance) {
+ models.get(actual).observe(new VectorWritable(instance));
}
+ @Override
public void train(long trackingKey, int actual, Vector instance) {
- getModels().get(actual).observe(new VectorWritable(instance));
+ models.get(actual).observe(new VectorWritable(instance));
}
+ @Override
public void close() {
- for (Cluster cluster : getModels()) {
+ for (Cluster cluster : models) {
cluster.computeParameters();
}
}
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/ClusterIterator.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/ClusterIterator.java?rev=1096170&r1=1096169&r2=1096170&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/ClusterIterator.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/ClusterIterator.java
Sat Apr 23 15:53:32 2011
@@ -32,11 +32,10 @@ import org.apache.mahout.math.Vector;
public class ClusterIterator {
public ClusterIterator(ClusteringPolicy policy) {
- super();
this.policy = policy;
}
- private ClusteringPolicy policy;
+ private final ClusteringPolicy policy;
/**
* Iterate over data using a prior-trained ClusterClassifier, for a number of
@@ -51,7 +50,8 @@ public class ClusterIterator {
* @return the posterior ClusterClassifier
*/
public ClusterClassifier iterate(List<Vector> data,
- ClusterClassifier classifier, int numIterations) {
+ ClusterClassifier classifier,
+ int numIterations) {
for (int iteration = 1; iteration <= numIterations; iteration++) {
for (Vector vector : data) {
// classification yields probabilities
@@ -59,8 +59,7 @@ public class ClusterIterator {
// policy selects weights for models given those probabilities
Vector weights = policy.select(probabilities);
// training causes all models to observe data
- for (Iterator<Vector.Element> it = weights.iterateNonZero(); it
- .hasNext();) {
+ for (Iterator<Vector.Element> it = weights.iterateNonZero();
it.hasNext();) {
int index = it.next().index();
classifier.train(index, vector, weights.get(index));
}
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/ClusteringPolicy.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/ClusteringPolicy.java?rev=1096170&r1=1096169&r2=1096170&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/ClusteringPolicy.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/ClusteringPolicy.java
Sat Apr 23 15:53:32 2011
@@ -31,7 +31,7 @@ public interface ClusteringPolicy {
* a Vector of pdfs
* @return a Vector of weights
*/
- public abstract Vector select(Vector probabilities);
+ Vector select(Vector probabilities);
/**
* Update the policy with the given classifier
@@ -39,6 +39,6 @@ public interface ClusteringPolicy {
* @param posterior
* a ClusterClassifier
*/
- public abstract void update(ClusterClassifier posterior);
+ void update(ClusterClassifier posterior);
}
\ No newline at end of file
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/DirichletClusteringPolicy.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/DirichletClusteringPolicy.java?rev=1096170&r1=1096169&r2=1096170&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/DirichletClusteringPolicy.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/DirichletClusteringPolicy.java
Sat Apr 23 15:53:32 2011
@@ -24,7 +24,6 @@ import org.apache.mahout.math.Vector;
public class DirichletClusteringPolicy implements ClusteringPolicy {
public DirichletClusteringPolicy(int k, double alpha0) {
- super();
this.totalCounts = new DenseVector(k);
this.alpha0 = alpha0;
this.mixture = UncommonDistributions.rDirichlet(totalCounts, alpha0);
@@ -35,11 +34,12 @@ public class DirichletClusteringPolicy i
private Vector mixture;
// Alpha_0 primes the Dirichlet distribution
- private double alpha0;
+ private final double alpha0;
// Total observed over all time
- private Vector totalCounts;
+ private final Vector totalCounts;
+ @Override
public Vector select(Vector probabilities) {
int rMultinom =
UncommonDistributions.rMultinom(probabilities.times(mixture));
Vector weights = new SequentialAccessSparseVector(probabilities.size());
@@ -48,6 +48,7 @@ public class DirichletClusteringPolicy i
}
// update the total counts and then the mixture
+ @Override
public void update(ClusterClassifier prior) {
for (int i = 0; i < totalCounts.size(); i++) {
long nObserved = prior.getModels().get(i).getNumPoints();
Modified:
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayDirichlet.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayDirichlet.java?rev=1096170&r1=1096169&r2=1096170&view=diff
==============================================================================
---
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayDirichlet.java
(original)
+++
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayDirichlet.java
Sat Apr 23 15:53:32 2011
@@ -110,7 +110,9 @@ public class DisplayDirichlet extends Di
ClusterClassifier posterior = iterator.iterate(points, prior, 5);
List<Cluster> models2 = posterior.getModels();
for (Iterator<Cluster> it = models2.iterator(); it.hasNext();) {
- if (!isSignificant(it.next())) it.remove();
+ if (!isSignificant(it.next())) {
+ it.remove();
+ }
}
CLUSTERS.add(models2);
}
Modified:
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayKMeans.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayKMeans.java?rev=1096170&r1=1096169&r2=1096170&view=diff
==============================================================================
---
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayKMeans.java
(original)
+++
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayKMeans.java
Sat Apr 23 15:53:32 2011
@@ -60,11 +60,11 @@ class DisplayKMeans extends DisplayClust
DisplayClustering.generateSamples();
writeSampleData(samples);
boolean b = false;
- int maxIter = 10;
- double distanceThreshold = 0.001;
if (b) {
Path clusters = RandomSeedGenerator.buildRandom(conf, samples, new Path(
output, "clusters-0"), 3, measure);
+ int maxIter = 10;
+ double distanceThreshold = 0.001;
KMeansDriver.run(samples, clusters, output, measure, distanceThreshold,
maxIter, true, true);
loadClusters(output);
Modified: mahout/trunk/utils/src/main/java/org/apache/mahout/utils/Bump125.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/Bump125.java?rev=1096170&r1=1096169&r2=1096170&view=diff
==============================================================================
--- mahout/trunk/utils/src/main/java/org/apache/mahout/utils/Bump125.java
(original)
+++ mahout/trunk/utils/src/main/java/org/apache/mahout/utils/Bump125.java Sat
Apr 23 15:53:32 2011
@@ -1,3 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.mahout.utils;
/**
@@ -33,9 +50,9 @@ public class Bump125 {
public long increment() {
long delta;
if (counter >= 10) {
- final long base = base(counter / 4.0);
+ long base = base(counter / 4.0);
int scale = scale(counter / 4.0, base);
- delta = (long) (base * scale);
+ delta = base * scale;
} else {
delta = 1;
}
Modified:
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/LuceneIterable.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/LuceneIterable.java?rev=1096170&r1=1096169&r2=1096170&view=diff
==============================================================================
---
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/LuceneIterable.java
(original)
+++
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/LuceneIterable.java
Sat Apr 23 15:53:32 2011
@@ -54,7 +54,12 @@ public final class LuceneIterable implem
* @param mapper {@link VectorMapper} for creating {@link Vector}s from
Lucene's TermVectors.
* @param normPower the normalization value. Must be nonnegative, or {@link
#NO_NORMALIZING}
*/
- public LuceneIterable(IndexReader indexReader, String idField, String field,
VectorMapper mapper, double normPower, double maxPercentErrorDocs) {
+ public LuceneIterable(IndexReader indexReader,
+ String idField,
+ String field,
+ VectorMapper mapper,
+ double normPower,
+ double maxPercentErrorDocs) {
this.indexReader = indexReader;
this.idField = idField;
this.field = field;
Modified:
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/LuceneIterator.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/LuceneIterator.java?rev=1096170&r1=1096169&r2=1096170&view=diff
==============================================================================
---
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/LuceneIterator.java
(original)
+++
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/LuceneIterator.java
Sat Apr 23 15:53:32 2011
@@ -52,7 +52,7 @@ public final class LuceneIterator extend
private int numErrorDocs = 0;
private int maxErrorDocs = 0;
- private Bump125 bump = new Bump125();
+ private final Bump125 bump = new Bump125();
private long nextLogRecord = bump.increment();
private int skippedErrorMessages = 0;
Modified:
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/Bump125Test.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/Bump125Test.java?rev=1096170&r1=1096169&r2=1096170&view=diff
==============================================================================
--- mahout/trunk/utils/src/test/java/org/apache/mahout/utils/Bump125Test.java
(original)
+++ mahout/trunk/utils/src/test/java/org/apache/mahout/utils/Bump125Test.java
Sat Apr 23 15:53:32 2011
@@ -1,3 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.mahout.utils;
import com.google.common.collect.Lists;
@@ -16,7 +33,7 @@ public class Bump125Test extends MahoutT
.iterator();
Bump125 b = new Bump125();
for (int i = 0; i < 50; i++) {
- final long x = b.increment();
+ long x = b.increment();
assertEquals(ref.next().longValue(), x);
}
}
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=1096170&r1=1096169&r2=1096170&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
Sat Apr 23 15:53:32 2011
@@ -39,11 +39,11 @@ import java.util.Iterator;
public final class LuceneIterableTest extends MahoutTestCase {
private static final String [] DOCS = {
- "The quick red fox jumped over the
lazy brown dogs.",
- "Mary had a little lamb whose fleece
was white as snow.",
- "Moby Dick is a story of a whale and
a man obsessed.",
- "The robber wore a black fleece
jacket and a baseball cap.",
- "The English Springer Spaniel is the
best of all dogs."
+ "The quick red fox jumped over the lazy brown dogs.",
+ "Mary had a little lamb whose fleece was white as snow.",
+ "Moby Dick is a story of a whale and a man obsessed.",
+ "The robber wore a black fleece jacket and a baseball cap.",
+ "The English Springer Spaniel is the best of all dogs."
};
private RAMDirectory directory;
@@ -163,7 +163,10 @@ public final class LuceneIterableTest ex
return createTestIndex(termVector, new RAMDirectory(), true, 0);
}
- private static RAMDirectory createTestIndex(Field.TermVector termVector,
RAMDirectory directory, boolean createNew, int startingId) throws IOException {
+ private static RAMDirectory createTestIndex(Field.TermVector termVector,
+ RAMDirectory directory,
+ boolean createNew,
+ int startingId) throws
IOException {
IndexWriter writer = new IndexWriter(
directory,
new StandardAnalyzer(Version.LUCENE_30),
