Author: srowen
Date: Mon Jan 18 01:28:36 2010
New Revision: 900264
URL: http://svn.apache.org/viewvc?rev=900264&view=rev
Log:
Code style changes to test -- mostly addressing protected/package visible fields
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/Step0Job.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/TasteTestCase.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/GenericUserBasedRecommenderTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/BayesClassifierTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/BayesFileFormatterTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/CBayesClassifierTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/discriminative/LinearModelTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/VisibleCanopy.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/JsonModelHolderAdapter.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/ModelHolder.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestRandomSeedGenerator.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/VisibleCluster.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/DummyOutputCollector.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/DefaultDistanceMeasureTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/iterator/Integers.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/iterator/SamplerCase.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DataLoaderTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DataTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DatasetTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DescriptorUtilsTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/Utils.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/inmem/InMemInputSplitTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/PartialBuilderTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/PartialOutputCollector.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/PartialSequentialBuilder.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/PartitionBugTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/Step0JobTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/Step1MapperTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/Step2MapperTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/inmem/InMemInputSplitTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/InterResultsTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/MockContext.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/PartialBuilderTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/Step0JobTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/node/NodeTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/split/DefaultIgSplitTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/split/OptIgSplitTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/TransactionTreeTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth/FrequentPatternMaxHeapTest.java
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/Step0Job.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/Step0Job.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/Step0Job.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/partial/Step0Job.java
Mon Jan 18 01:28:36 2010
@@ -237,7 +237,7 @@
* Output of the step0's mappers
*
*/
- protected static class Step0Output implements Writable,
+ public static class Step0Output implements Writable,
Comparable<Step0Output> {
/**
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/TasteTestCase.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/TasteTestCase.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/TasteTestCase.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/TasteTestCase.java
Mon Jan 18 01:28:36 2010
@@ -32,7 +32,7 @@
public abstract class TasteTestCase extends MahoutTestCase {
/** "Close enough" value for floating-point comparisons. */
- public static final double EPSILON = 0.00001;
+ protected static final double EPSILON = 0.00001;
public static DataModel getDataModel(long[] userIDs, Double[][] prefValues) {
FastByIDMap<PreferenceArray> result = new FastByIDMap<PreferenceArray>();
@@ -50,7 +50,7 @@
return new GenericDataModel(result);
}
- public static DataModel getDataModel() {
+ protected static DataModel getDataModel() {
return getDataModel(
new long[] {1, 2, 3, 4},
new Double[][] {
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/GenericUserBasedRecommenderTest.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/GenericUserBasedRecommenderTest.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/GenericUserBasedRecommenderTest.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/GenericUserBasedRecommenderTest.java
Mon Jan 18 01:28:36 2010
@@ -17,6 +17,7 @@
package org.apache.mahout.cf.taste.impl.recommender;
+import org.apache.mahout.cf.taste.common.TasteException;
import org.apache.mahout.cf.taste.impl.TasteTestCase;
import org.apache.mahout.cf.taste.impl.neighborhood.NearestNUserNeighborhood;
import org.apache.mahout.cf.taste.impl.similarity.PearsonCorrelationSimilarity;
@@ -133,7 +134,7 @@
assertEquals(0, mostSimilar.length);
}
- private static UserBasedRecommender buildRecommender() throws Exception {
+ private static UserBasedRecommender buildRecommender() throws TasteException
{
DataModel dataModel = getDataModel();
UserSimilarity similarity = new PearsonCorrelationSimilarity(dataModel);
UserNeighborhood neighborhood = new NearestNUserNeighborhood(1,
similarity, dataModel);
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/BayesClassifierTest.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/BayesClassifierTest.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/BayesClassifierTest.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/BayesClassifierTest.java
Mon Jan 18 01:28:36 2010
@@ -28,9 +28,9 @@
public class BayesClassifierTest extends MahoutTestCase {
- protected Algorithm algorithm;
+ private Algorithm algorithm;
- protected InMemoryBayesDatastore store;
+ private InMemoryBayesDatastore store;
@Override
protected void setUp() throws Exception {
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/BayesFileFormatterTest.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/BayesFileFormatterTest.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/BayesFileFormatterTest.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/BayesFileFormatterTest.java
Mon Jan 18 01:28:36 2010
@@ -33,9 +33,9 @@
public class BayesFileFormatterTest extends MahoutTestCase {
- protected File input;
- protected File out;
- protected String[] words;
+ private File input;
+ private File out;
+ private String[] words;
@Override
protected void setUp() throws Exception {
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/CBayesClassifierTest.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/CBayesClassifierTest.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/CBayesClassifierTest.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/CBayesClassifierTest.java
Mon Jan 18 01:28:36 2010
@@ -28,8 +28,8 @@
public class CBayesClassifierTest extends MahoutTestCase {
- protected Algorithm algorithm;
- protected InMemoryBayesDatastore store;
+ private Algorithm algorithm;
+ private InMemoryBayesDatastore store;
@Override
protected void setUp() throws Exception {
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/discriminative/LinearModelTest.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/discriminative/LinearModelTest.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/discriminative/LinearModelTest.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/discriminative/LinearModelTest.java
Mon Jan 18 01:28:36 2010
@@ -24,14 +24,13 @@
public class LinearModelTest extends MahoutTestCase {
private LinearModel model;
- private Vector hyperplane;
@Override
protected void setUp() throws Exception {
super.setUp();
double[] values = {0.0, 1.0, 0.0, 1.0, 0.0};
- this.hyperplane = new DenseVector(values);
- this.model = new LinearModel(this.hyperplane, 0.1, 0.5);
+ Vector hyperplane = new DenseVector(values);
+ this.model = new LinearModel(hyperplane, 0.1, 0.5);
}
public void testClassify() {
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java
Mon Jan 18 01:28:36 2010
@@ -45,22 +45,22 @@
public class TestCanopyCreation extends MahoutTestCase {
- static final double[][] raw = {{1, 1}, {2, 1}, {1, 2}, {2, 2},
+ private static final double[][] raw = {{1, 1}, {2, 1}, {1, 2}, {2, 2},
{3, 3}, {4, 4}, {5, 4}, {4, 5}, {5, 5}};
- List<Canopy> referenceManhattan;
+ private List<Canopy> referenceManhattan;
- final DistanceMeasure manhattanDistanceMeasure = new
ManhattanDistanceMeasure();
+ private final DistanceMeasure manhattanDistanceMeasure = new
ManhattanDistanceMeasure();
- List<Vector> manhattanCentroids;
+ private List<Vector> manhattanCentroids;
- List<Canopy> referenceEuclidean;
+ private List<Canopy> referenceEuclidean;
- final DistanceMeasure euclideanDistanceMeasure = new
EuclideanDistanceMeasure();
+ private final DistanceMeasure euclideanDistanceMeasure = new
EuclideanDistanceMeasure();
- List<Vector> euclideanCentroids;
+ private List<Vector> euclideanCentroids;
- FileSystem fs;
+ private FileSystem fs;
private static List<VectorWritable> getPoints(double[][] raw) {
List<VectorWritable> points = new ArrayList<VectorWritable>();
@@ -116,7 +116,7 @@
}
- private static void rmr(String path) throws Exception {
+ private static void rmr(String path) {
File f = new File(path);
if (f.exists()) {
if (f.isDirectory()) {
@@ -150,7 +150,7 @@
* @param canopies a List<Canopy>
* @return the List<Vector>
*/
- static List<Vector> populateCentroids(List<Canopy> canopies) {
+ private static List<Vector> populateCentroids(List<Canopy> canopies) {
List<Vector> result = new ArrayList<Vector>();
for (Canopy canopy : canopies) {
result.add(canopy.computeCentroid());
@@ -167,7 +167,7 @@
* @param t2 the T2 distance threshold
* @return the List<Canopy> created
*/
- static List<Canopy> populateCanopies(DistanceMeasure measure,
+ private static List<Canopy> populateCanopies(DistanceMeasure measure,
List<VectorWritable> points, double t1,
double t2) {
List<Canopy> canopies = new ArrayList<Canopy>();
/**
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/VisibleCanopy.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/VisibleCanopy.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/VisibleCanopy.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/VisibleCanopy.java
Mon Jan 18 01:28:36 2010
@@ -26,7 +26,7 @@
* This Canopy subclass maintains a list of points in the canopy so it can
include them in its toString method. Useful
* for debugging but not practical for production use since it holds onto all
its points.
*/
-public class VisibleCanopy extends Canopy {
+class VisibleCanopy extends Canopy {
private final List<Vector> points = new ArrayList<Vector>();
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/JsonModelHolderAdapter.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/JsonModelHolderAdapter.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/JsonModelHolderAdapter.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/JsonModelHolderAdapter.java
Mon Jan 18 01:28:36 2010
@@ -32,10 +32,10 @@
import java.lang.reflect.Type;
-public class JsonModelHolderAdapter implements JsonSerializer<ModelHolder<?>>,
+class JsonModelHolderAdapter implements JsonSerializer<ModelHolder<?>>,
JsonDeserializer<ModelHolder<?>> {
- final Type typeOfModel = new TypeToken<Model<Vector>>() {
+ private final Type typeOfModel = new TypeToken<Model<Vector>>() {
}.getType();
@Override
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/ModelHolder.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/ModelHolder.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/ModelHolder.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/ModelHolder.java
Mon Jan 18 01:28:36 2010
@@ -19,7 +19,7 @@
import org.apache.mahout.clustering.dirichlet.models.Model;
-final class ModelHolder<O> {
+public final class ModelHolder<O> {
private Model<O> model;
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.java
Mon Jan 18 01:28:36 2010
@@ -40,9 +40,9 @@
public class TestFuzzyKmeansClustering extends MahoutTestCase {
- FileSystem fs;
+ private FileSystem fs;
- private static void rmr(String path) throws Exception {
+ private static void rmr(String path) {
File f = new File(path);
if (f.exists()) {
if (f.isDirectory()) {
@@ -64,7 +64,7 @@
fs = FileSystem.get(conf);
}
- public static double round(double val, int places) {
+ private static double round(double val, int places) {
long factor = (long) Math.pow(10, places);
// Shift the decimal the correct number of places
@@ -79,12 +79,12 @@
return (double) tmp / factor;
}
- public static Vector tweakValue(Vector point) {
+ private static Vector tweakValue(Vector point) {
return point.plus(0.1);
}
- public static void referenceFuzzyKMeans(List<VectorWritable> points,
+ private static void referenceFuzzyKMeans(List<VectorWritable> points,
List<SoftCluster> clusterList,
Map<String, String> pointClusterInfo,
String distanceMeasureClass, double
threshold, double m, int numIter)
throws Exception {
@@ -100,7 +100,7 @@
computeCluster(points, clusterList, clusterer, pointClusterInfo);
}
- public static boolean iterateReference(List<VectorWritable> points,
+ private static boolean iterateReference(List<VectorWritable> points,
List<SoftCluster> clusterList,
FuzzyKMeansClusterer clusterer) {
// for each
for (VectorWritable pointWritable : points) {
@@ -133,7 +133,7 @@
}
- public static void computeCluster(List<VectorWritable> points,
+ private static void computeCluster(List<VectorWritable> points,
List<SoftCluster> clusterList,
FuzzyKMeansClusterer clusterer,
Map<String, String> pointClusterInfo) {
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java
Mon Jan 18 01:28:36 2010
@@ -49,14 +49,14 @@
public static final double[][] reference = {{1, 1}, {2, 1}, {1, 2},
{2, 2}, {3, 3}, {4, 4}, {5, 4}, {4, 5}, {5, 5}};
- public static final int[][] expectedNumPoints = {{9}, {4, 5},
+ private static final int[][] expectedNumPoints = {{9}, {4, 5},
{4, 4, 1}, {1, 2, 1, 5}, {1, 1, 1, 2, 4}, {1, 1, 1, 1, 1, 4},
{1, 1, 1, 1, 1, 2, 2}, {1, 1, 1, 1, 1, 1, 2, 1},
{1, 1, 1, 1, 1, 1, 1, 1, 1}};
- FileSystem fs;
+ private FileSystem fs;
- private static void rmr(String path) throws Exception {
+ private static void rmr(String path) {
File f = new File(path);
if (f.exists()) {
if (f.isDirectory()) {
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestRandomSeedGenerator.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestRandomSeedGenerator.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestRandomSeedGenerator.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestRandomSeedGenerator.java
Mon Jan 18 01:28:36 2010
@@ -37,7 +37,7 @@
public class TestRandomSeedGenerator extends MahoutTestCase {
- static final double[][] raw = {{1, 1}, {2, 1}, {1, 2}, {2, 2},
+ private static final double[][] raw = {{1, 1}, {2, 1}, {1, 2}, {2, 2},
{3, 3}, {4, 4}, {5, 4}, {4, 5}, {5, 5}};
private FileSystem fs;
@@ -111,7 +111,7 @@
assertEquals(4, clusterCount); // validate sample count
}
- public static void assertVectorEquals(double[] raw, Vector v) {
+ private static void assertVectorEquals(double[] raw, Vector v) {
assertEquals(raw.length, v.size());
for (int i=0; i < raw.length; i++) {
assertEquals(raw[i], v.getQuick(i));
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/VisibleCluster.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/VisibleCluster.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/VisibleCluster.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/VisibleCluster.java
Mon Jan 18 01:28:36 2010
@@ -26,11 +26,11 @@
* This Cluster subclass maintains a list of points in the cluster so it can
include them in its toString method. Useful
* for debugging but not practical for production use since it holds onto all
its points.
*/
-public class VisibleCluster extends Cluster {
+class VisibleCluster extends Cluster {
private List<Vector> points;
- public VisibleCluster(Vector point) {
+ VisibleCluster(Vector point) {
super(point);
points = new ArrayList<Vector>();
}
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java
Mon Jan 18 01:28:36 2010
@@ -17,7 +17,6 @@
package org.apache.mahout.clustering.meanshift;
-import junit.framework.TestCase;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -49,7 +48,7 @@
// DistanceMeasure manhattanDistanceMeasure = new ManhattanDistanceMeasure();
- final DistanceMeasure euclideanDistanceMeasure = new
EuclideanDistanceMeasure();
+ private final DistanceMeasure euclideanDistanceMeasure = new
EuclideanDistanceMeasure();
/**
* Print the canopies to the transcript
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/DummyOutputCollector.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/DummyOutputCollector.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/DummyOutputCollector.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/DummyOutputCollector.java
Mon Jan 18 01:28:36 2010
@@ -28,9 +28,10 @@
import java.util.Set;
import java.util.TreeMap;
-public class DummyOutputCollector<K extends WritableComparable, V extends
Writable> implements OutputCollector<K, V> {
+public class DummyOutputCollector<K extends WritableComparable<?>, V extends
Writable>
+ implements OutputCollector<K, V> {
- final Map<String, List<V>> data = new TreeMap<String, List<V>>();
+ private final Map<String, List<V>> data = new TreeMap<String, List<V>>();
@Override
public void collect(K key, V values)
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/DefaultDistanceMeasureTest.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/DefaultDistanceMeasureTest.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/DefaultDistanceMeasureTest.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/DefaultDistanceMeasureTest.java
Mon Jan 18 01:28:36 2010
@@ -24,7 +24,7 @@
public abstract class DefaultDistanceMeasureTest extends MahoutTestCase {
- public abstract DistanceMeasure distanceMeasureFactory();
+ protected abstract DistanceMeasure distanceMeasureFactory();
public void testMeasure() {
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/iterator/Integers.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/iterator/Integers.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/iterator/Integers.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/iterator/Integers.java
Mon Jan 18 01:28:36 2010
@@ -23,16 +23,16 @@
/**
* Handy source of well characterized Iterators and Iterables.
*/
-public final class Integers {
+final class Integers {
private Integers() {
}
- public static Iterator<Integer> iterator(int n) {
+ static Iterator<Integer> iterator(int n) {
return new IntegerIterator(n);
}
- public static Iterable<Integer> iterable(final int n) {
+ static Iterable<Integer> iterable(final int n) {
return new Iterable<Integer>() {
@Override
public Iterator<Integer> iterator() {
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/iterator/SamplerCase.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/iterator/SamplerCase.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/iterator/SamplerCase.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/iterator/SamplerCase.java
Mon Jan 18 01:28:36 2010
@@ -21,7 +21,6 @@
import java.util.Arrays;
import org.apache.mahout.common.MahoutTestCase;
-import org.apache.mahout.common.RandomUtils;
public abstract class SamplerCase extends MahoutTestCase {
// these provide access to the underlying implementation
@@ -29,12 +28,6 @@
protected abstract boolean isSorted();
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- RandomUtils.useTestSeed();
- }
-
public void testEmptyCase() {
assertFalse(createSampler(100, Integers.iterator(0)).hasNext());
}
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DataLoaderTest.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DataLoaderTest.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DataLoaderTest.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DataLoaderTest.java
Mon Jan 18 01:28:36 2010
@@ -30,7 +30,7 @@
public class DataLoaderTest extends MahoutTestCase {
- protected Random rng;
+ private Random rng;
@Override
protected void setUp() throws Exception {
@@ -38,7 +38,7 @@
rng = RandomUtils.getRandom();
}
- public void testLoadDataWithDescriptor() throws Exception {
+ public void testLoadDataWithDescriptor() throws DescriptorException {
int nbAttributes = 10;
int datasize = 100;
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DataTest.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DataTest.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DataTest.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DataTest.java
Mon Jan 18 01:28:36 2010
@@ -27,13 +27,13 @@
public class DataTest extends MahoutTestCase {
- protected static final int nbAttributes = 10;
+ private static final int nbAttributes = 10;
- protected static final int datasize = 100;
+ private static final int datasize = 100;
- protected Random rng;
+ private Random rng;
- protected Data data;
+ private Data data;
@Override
protected void setUp() throws Exception {
@@ -94,7 +94,7 @@
}
- public static int count(double[] values, double value) {
+ private static int count(double[] values, double value) {
int count = 0;
for (double v : values) {
if (v == value)
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DatasetTest.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DatasetTest.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DatasetTest.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DatasetTest.java
Mon Jan 18 01:28:36 2010
@@ -33,10 +33,10 @@
private static final int nbAttributes = 10;
- protected ByteArrayOutputStream byteOutStream;
- protected DataOutput out;
+ private ByteArrayOutputStream byteOutStream;
+ private DataOutput out;
- protected static Dataset readDataset(byte[] bytes) throws IOException {
+ private static Dataset readDataset(byte[] bytes) throws IOException {
ByteArrayInputStream byteInStream = new ByteArrayInputStream(bytes);
DataInput in = new DataInputStream(byteInStream);
return Dataset.read(in);
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DescriptorUtilsTest.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DescriptorUtilsTest.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DescriptorUtilsTest.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DescriptorUtilsTest.java
Mon Jan 18 01:28:36 2010
@@ -82,7 +82,8 @@
}
}
- protected static void validate(String descriptor, String description) throws
DescriptorException {
+ private static void validate(String descriptor, String description) throws
DescriptorException {
assertEquals(descriptor, DescriptorUtils.generateDescriptor(description));
}
+
}
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/Utils.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/Utils.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/Utils.java
(original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/Utils.java
Mon Jan 18 01:28:36 2010
@@ -59,7 +59,7 @@
}
/** Used when generating random CATEGORICAL values */
- static final int CATEGORICAL_RANGE = 100;
+ private static final int CATEGORICAL_RANGE = 100;
/**
* Generates a random list of tokens
@@ -197,7 +197,7 @@
* @param attrs attributes description
* @return
*/
- static double[] randomVector(Random rng, Attribute[] attrs) {
+ private static double[] randomVector(Random rng, Attribute[] attrs) {
double[] vector = new double[attrs.length];
for (int attr = 0; attr < attrs.length; attr++) {
@@ -219,7 +219,7 @@
* @param v double array
* @return comma-separated string
*/
- static String double2String(double[] v) {
+ private static String double2String(double[] v) {
StringBuilder builder = new StringBuilder();
for (double aV : v) {
@@ -280,7 +280,7 @@
return ArrayUtils.indexOf(attrs, Attribute.LABEL);
}
- public static void writeDataToFile(String[] sData, Path path) throws
IOException {
+ private static void writeDataToFile(String[] sData, Path path) throws
IOException {
BufferedWriter output = new BufferedWriter(new OutputStreamWriter(
new FileOutputStream(path.toString()), Charset.forName("UTF-8")));
try {
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/inmem/InMemInputSplitTest.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/inmem/InMemInputSplitTest.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/inmem/InMemInputSplitTest.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/inmem/InMemInputSplitTest.java
Mon Jan 18 01:28:36 2010
@@ -70,7 +70,7 @@
assertEquals(split, readSplit());
}
- protected InMemInputSplit readSplit() throws IOException {
+ InMemInputSplit readSplit() throws IOException {
ByteArrayInputStream byteInStream = new
ByteArrayInputStream(byteOutStream.toByteArray());
DataInput in = new DataInputStream(byteInStream);
return InMemInputSplit.read(in);
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/PartialBuilderTest.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/PartialBuilderTest.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/PartialBuilderTest.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/PartialBuilderTest.java
Mon Jan 18 01:28:36 2010
@@ -154,26 +154,26 @@
protected static class PartialBuilderChecker extends PartialBuilder {
- protected final Long _seed;
+ private final Long seed;
- protected final TreeBuilder _treeBuilder;
+ private final TreeBuilder treeBuilder;
- protected final Path _datasetPath;
+ private final Path datasetPath;
protected PartialBuilderChecker(TreeBuilder treeBuilder, Path dataPath,
Path datasetPath, Long seed) {
super(treeBuilder, dataPath, datasetPath, seed);
- _seed = seed;
- _treeBuilder = treeBuilder;
- _datasetPath = datasetPath;
+ this.seed = seed;
+ this.treeBuilder = treeBuilder;
+ this.datasetPath = datasetPath;
}
@Override
protected void runJob(JobConf job) throws IOException {
// no need to run the job, just check if the params are correct
- assertEquals(_seed, getRandomSeed(job));
+ assertEquals(seed, getRandomSeed(job));
// PartialBuilder should detect the 'local' mode and overrides the number
// of map tasks
@@ -184,9 +184,9 @@
assertFalse(isOutput(job));
assertTrue(isOobEstimate(job));
- assertEquals(_treeBuilder, getTreeBuilder(job));
+ assertEquals(treeBuilder, getTreeBuilder(job));
- assertEquals(_datasetPath, getDistributedCacheFile(job, 0));
+ assertEquals(datasetPath, getDistributedCacheFile(job, 0));
}
}
@@ -197,9 +197,9 @@
*/
protected static class TestCallback implements PredictionCallback {
- protected final TreeID[] keys;
+ private final TreeID[] keys;
- protected final MapredOutput[] values;
+ private final MapredOutput[] values;
protected TestCallback(TreeID[] keys, MapredOutput[] values) {
this.keys = keys;
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/PartialOutputCollector.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/PartialOutputCollector.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/PartialOutputCollector.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/PartialOutputCollector.java
Mon Jan 18 01:28:36 2010
@@ -23,7 +23,7 @@
import org.apache.mahout.df.mapreduce.MapredOutput;
import org.apache.mahout.df.mapreduce.partial.TreeID;
-public class PartialOutputCollector implements OutputCollector<TreeID,
MapredOutput> {
+class PartialOutputCollector implements OutputCollector<TreeID, MapredOutput> {
private final TreeID[] keys;
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/PartialSequentialBuilder.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/PartialSequentialBuilder.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/PartialSequentialBuilder.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/PartialSequentialBuilder.java
Mon Jan 18 01:28:36 2010
@@ -50,7 +50,7 @@
* Simulates the Partial mapreduce implementation in a sequential manner. Must
* receive a seed
*/
-public class PartialSequentialBuilder extends PartialBuilder {
+class PartialSequentialBuilder extends PartialBuilder {
private static final Logger log =
LoggerFactory.getLogger(PartialSequentialBuilder.class);
@@ -176,7 +176,7 @@
* @param callback
* @return
*/
- protected DecisionForest processOutput(TreeID[] keys, MapredOutput[] values,
PredictionCallback callback) {
+ DecisionForest processOutput(TreeID[] keys, MapredOutput[] values,
PredictionCallback callback) {
List<Node> trees = new ArrayList<Node>();
for (int index = 0; index < keys.length; index++) {
@@ -202,7 +202,7 @@
* @throws IOException
*
*/
- protected void secondStep(JobConf job, Path forestPath,
+ void secondStep(JobConf job, Path forestPath,
PredictionCallback callback) throws IOException {
// retrieve the splits
TextInputFormat input = (TextInputFormat) job.getInputFormat();
@@ -267,8 +267,8 @@
* Special Step1Mapper that can be configured without using a Configuration
*
*/
- protected static class MockStep1Mapper extends Step1Mapper {
- protected MockStep1Mapper(TreeBuilder treeBuilder, Dataset dataset, Long
seed,
+ static class MockStep1Mapper extends Step1Mapper {
+ MockStep1Mapper(TreeBuilder treeBuilder, Dataset dataset, Long seed,
int partition, int numMapTasks, int numTrees) {
configure(false, true, treeBuilder, dataset);
configure(seed, partition, numMapTasks, numTrees);
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/PartitionBugTest.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/PartitionBugTest.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/PartitionBugTest.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/PartitionBugTest.java
Mon Jan 18 01:28:36 2010
@@ -37,13 +37,13 @@
import org.apache.mahout.df.node.Node;
public class PartitionBugTest extends MahoutTestCase {
- static final int numAttributes = 40;
+ private static final int numAttributes = 40;
- static final int numInstances = 200;
+ private static final int numInstances = 200;
- static final int numTrees = 10;
+ private static final int numTrees = 10;
- static final int numMaps = 5;
+ private static final int numMaps = 5;
/**
* Make sure that the correct instance ids are being computed
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/Step0JobTest.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/Step0JobTest.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/Step0JobTest.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/Step0JobTest.java
Mon Jan 18 01:28:36 2010
@@ -184,7 +184,7 @@
+ Arrays.toString(actualIds), Arrays.equals(expectedIds, actualIds));
}
- protected static class Step0OutputCollector implements
+ static class Step0OutputCollector implements
OutputCollector<IntWritable, Step0Output> {
private final int[] keys;
@@ -193,7 +193,7 @@
private int index = 0;
- protected Step0OutputCollector(int numMaps) {
+ Step0OutputCollector(int numMaps) {
keys = new int[numMaps];
values = new Step0Output[numMaps];
}
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/Step1MapperTest.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/Step1MapperTest.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/Step1MapperTest.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/Step1MapperTest.java
Mon Jan 18 01:28:36 2010
@@ -42,7 +42,7 @@
*/
private static class MockTreeBuilder implements TreeBuilder {
- protected Data expected;
+ private Data expected;
public void setExpected(Data data) {
expected = data;
@@ -62,8 +62,8 @@
* Special Step1Mapper that can be configured without using a Configuration
*
*/
- protected static class MockStep1Mapper extends Step1Mapper {
- protected MockStep1Mapper(TreeBuilder treeBuilder, Dataset dataset, Long
seed,
+ static class MockStep1Mapper extends Step1Mapper {
+ MockStep1Mapper(TreeBuilder treeBuilder, Dataset dataset, Long seed,
int partition, int numMapTasks, int numTrees) {
configure(false, true, treeBuilder, dataset);
configure(seed, partition, numMapTasks, numTrees);
@@ -72,16 +72,16 @@
}
/** nb attributes per generated data instance */
- protected static final int nbAttributes = 4;
+ private static final int nbAttributes = 4;
/** nb generated data instances */
- protected static final int nbInstances = 100;
+ private static final int nbInstances = 100;
/** nb trees to build */
- protected static final int nbTrees = 10;
+ private static final int nbTrees = 10;
/** nb mappers to use */
- protected static final int nbMappers = 2;
+ private static final int nbMappers = 2;
public void testMapper() throws Exception {
Long seed = null;
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/Step2MapperTest.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/Step2MapperTest.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/Step2MapperTest.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/Step2MapperTest.java
Mon Jan 18 01:28:36 2010
@@ -51,16 +51,16 @@
}
/** nb attributes per generated data instance */
- protected static final int nbAttributes = 4;
+ private static final int nbAttributes = 4;
/** nb generated data instances */
- protected static final int nbInstances = 100;
+ private static final int nbInstances = 100;
/** nb trees to build */
- protected static final int nbTrees = 11;
+ private static final int nbTrees = 11;
/** nb mappers to use */
- protected static final int nbMappers = 5;
+ private static final int nbMappers = 5;
public void testMapper() throws Exception {
Random rng = RandomUtils.getRandom();
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/inmem/InMemInputSplitTest.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/inmem/InMemInputSplitTest.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/inmem/InMemInputSplitTest.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/inmem/InMemInputSplitTest.java
Mon Jan 18 01:28:36 2010
@@ -32,10 +32,10 @@
public class InMemInputSplitTest extends MahoutTestCase {
- protected Random rng;
+ private Random rng;
- protected ByteArrayOutputStream byteOutStream;
- protected DataOutput out;
+ private ByteArrayOutputStream byteOutStream;
+ private DataOutput out;
@Override
protected void setUp() throws Exception {
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/InterResultsTest.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/InterResultsTest.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/InterResultsTest.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/InterResultsTest.java
Mon Jan 18 01:28:36 2010
@@ -31,24 +31,24 @@
public class InterResultsTest extends MahoutTestCase {
/** nb attributes per generated data instance */
- protected static final int nbAttributes = 4;
+ private static final int nbAttributes = 4;
/** nb generated data instances */
- protected static final int nbInstances = 100;
+ private static final int nbInstances = 100;
/** nb trees to build */
- protected static final int nbTrees = 11;
+ private static final int nbTrees = 11;
/** nb mappers to use */
- protected static final int nbMappers = 5;
+ private static final int nbMappers = 5;
- protected String[][] splits;
+ private String[][] splits;
- TreeID[] keys;
+ private TreeID[] keys;
- Node[] trees;
+ private Node[] trees;
- int[] sizes;
+ private int[] sizes;
@Override
protected void setUp() throws Exception {
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/MockContext.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/MockContext.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/MockContext.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/MockContext.java
Mon Jan 18 01:28:36 2010
@@ -27,7 +27,7 @@
/**
* Special implementation that collects the output of the mappers
*/
-public class MockContext extends Context {
+class MockContext extends Context {
private final TreeID[] keys;
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/PartialBuilderTest.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/PartialBuilderTest.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/PartialBuilderTest.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/PartialBuilderTest.java
Mon Jan 18 01:28:36 2010
@@ -41,12 +41,12 @@
public class PartialBuilderTest extends MahoutTestCase {
- protected static final int numMaps = 5;
+ private static final int numMaps = 5;
- protected static final int numTrees = 32;
+ private static final int numTrees = 32;
/** instances per partition */
- protected static final int numInstances = 20;
+ private static final int numInstances = 20;
public void testProcessOutput() throws Exception {
Configuration conf = new Configuration();
@@ -111,7 +111,7 @@
* @param values
* @param firstIds partitions's first ids in hadoop's order
*/
- protected static void randomKeyValues(Random rng, TreeID[] keys,
+ private static void randomKeyValues(Random rng, TreeID[] keys,
MapredOutput[] values, int[] firstIds) {
int index = 0;
int firstId = 0;
@@ -143,7 +143,7 @@
}
- protected static int[] nextIntArray(Random rng, int size) {
+ private static int[] nextIntArray(Random rng, int size) {
int[] array = new int[size];
for (int index = 0; index < size; index++) {
array[index] = rng.nextInt(101) - 1;
@@ -152,15 +152,15 @@
return array;
}
- protected static class PartialBuilderChecker extends PartialBuilder {
+ static class PartialBuilderChecker extends PartialBuilder {
- protected final Long _seed;
+ final Long _seed;
- protected final TreeBuilder _treeBuilder;
+ final TreeBuilder _treeBuilder;
- protected final Path _datasetPath;
+ final Path _datasetPath;
- protected PartialBuilderChecker(TreeBuilder treeBuilder, Path dataPath,
+ PartialBuilderChecker(TreeBuilder treeBuilder, Path dataPath,
Path datasetPath, Long seed) {
super(treeBuilder, dataPath, datasetPath, seed);
@@ -199,13 +199,13 @@
* Mock Callback. Make sure that the callback receives the correct
predictions
*
*/
- protected static class TestCallback implements PredictionCallback {
+ static class TestCallback implements PredictionCallback {
- protected final TreeID[] keys;
+ final TreeID[] keys;
- protected final MapredOutput[] values;
+ final MapredOutput[] values;
- protected TestCallback(TreeID[] keys, MapredOutput[] values) {
+ TestCallback(TreeID[] keys, MapredOutput[] values) {
this.keys = keys;
this.values = values;
}
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/Step0JobTest.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/Step0JobTest.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/Step0JobTest.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/Step0JobTest.java
Mon Jan 18 01:28:36 2010
@@ -23,8 +23,6 @@
import java.util.List;
import java.util.Random;
-import junit.framework.TestCase;
-
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
@@ -55,15 +53,15 @@
// the generated data must be big enough to be splited by FileInputFormat
- static final int numAttributes = 40;
+ private static final int numAttributes = 40;
- static final int numInstances = 2000;
+ private static final int numInstances = 2000;
//int numTrees = 10;
- static final int numMaps = 5;
+ private static final int numMaps = 5;
- Step0Context context;
+ private Step0Context context;
/**
* Computes the "mapred.max.split.size" that will generate the desired number
@@ -75,7 +73,7 @@
* @throws Exception
*/
public static void setMaxSplitSize(Configuration conf, Path inputPath,
- int numMaps) throws Exception {
+ int numMaps) throws IOException {
FileSystem fs = inputPath.getFileSystem(conf);
FileStatus status = fs.getFileStatus(inputPath);
long goalSize = status.getLen() / numMaps;
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/node/NodeTest.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/node/NodeTest.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/node/NodeTest.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/node/NodeTest.java
Mon Jan 18 01:28:36 2010
@@ -67,7 +67,7 @@
assertEquals(root, readNode());
}
- protected Node readNode() throws IOException {
+ Node readNode() throws IOException {
ByteArrayInputStream byteInStream = new
ByteArrayInputStream(byteOutStream.toByteArray());
DataInput in = new DataInputStream(byteInStream);
return Node.read(in);
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/split/DefaultIgSplitTest.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/split/DefaultIgSplitTest.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/split/DefaultIgSplitTest.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/split/DefaultIgSplitTest.java
Mon Jan 18 01:28:36 2010
@@ -28,7 +28,7 @@
public class DefaultIgSplitTest extends MahoutTestCase {
- protected static final int nbAttributes = 10;
+ private static final int nbAttributes = 10;
public void testEntropy() throws Exception {
Random rng = RandomUtils.getRandom();
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/split/OptIgSplitTest.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/split/OptIgSplitTest.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/split/OptIgSplitTest.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/split/OptIgSplitTest.java
Mon Jan 18 01:28:36 2010
@@ -26,9 +26,9 @@
public class OptIgSplitTest extends MahoutTestCase {
- protected static final int nbAttributes = 20;
+ private static final int nbAttributes = 20;
- protected static final int numInstances = 100;
+ private static final int numInstances = 100;
public void testComputeSplit() throws Exception {
int n = 100;
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/TransactionTreeTest.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/TransactionTreeTest.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/TransactionTreeTest.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/TransactionTreeTest.java
Mon Jan 18 01:28:36 2010
@@ -22,8 +22,6 @@
import java.util.List;
import java.util.Random;
-import junit.framework.TestCase;
-
import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.Pair;
import org.apache.mahout.common.RandomUtils;
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth/FrequentPatternMaxHeapTest.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth/FrequentPatternMaxHeapTest.java?rev=900264&r1=900263&r2=900264&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth/FrequentPatternMaxHeapTest.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth/FrequentPatternMaxHeapTest.java
Mon Jan 18 01:28:36 2010
@@ -43,7 +43,7 @@
}
}
- public static Pattern generateRandomPattern(Random gen) {
+ private static Pattern generateRandomPattern(Random gen) {
int length = 1 + Math.abs(gen.nextInt() % 6);
Pattern p = new Pattern();
Collection<Integer> set = new HashSet<Integer>();
