Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMahoutEvaluator.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMahoutEvaluator.java?rev=688364&r1=688363&r2=688364&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMahoutEvaluator.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMahoutEvaluator.java Sat Aug 23 09:48:28 2008 @@ -17,11 +17,6 @@ * limitations under the License. */ -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.LongWritable; @@ -31,12 +26,17 @@ import org.apache.hadoop.mapred.JobConf; import org.apache.hadoop.mapred.SequenceFileOutputFormat; import org.apache.mahout.ga.watchmaker.OutputUtils; -import org.apache.mahout.utils.StringUtils; import org.apache.mahout.ga.watchmaker.cd.CDFitness; import org.apache.mahout.ga.watchmaker.cd.DataSet; import org.apache.mahout.ga.watchmaker.cd.FileInfoParser; import org.apache.mahout.ga.watchmaker.cd.Rule; import org.apache.mahout.ga.watchmaker.cd.hadoop.DatasetSplit.DatasetTextInputFormat; +import org.apache.mahout.utils.StringUtils; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; /** * Mahout distributed evaluator. takes a list of classification rules and an
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMapper.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMapper.java?rev=688364&r1=688363&r2=688364&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMapper.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMapper.java Sat Aug 23 09:48:28 2008 @@ -17,9 +17,6 @@ package org.apache.mahout.ga.watchmaker.cd.hadoop; -import java.io.IOException; -import java.util.List; - import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.Text; import org.apache.hadoop.mapred.JobConf; @@ -27,11 +24,14 @@ import org.apache.hadoop.mapred.Mapper; import org.apache.hadoop.mapred.OutputCollector; import org.apache.hadoop.mapred.Reporter; -import org.apache.mahout.utils.StringUtils; import org.apache.mahout.ga.watchmaker.cd.CDFitness; import org.apache.mahout.ga.watchmaker.cd.DataLine; import org.apache.mahout.ga.watchmaker.cd.DataSet; import org.apache.mahout.ga.watchmaker.cd.Rule; +import org.apache.mahout.utils.StringUtils; + +import java.io.IOException; +import java.util.List; /** * Hadoop Mapper. Evaluate all the rules with the input data line. Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDReducer.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDReducer.java?rev=688364&r1=688363&r2=688364&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDReducer.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDReducer.java Sat Aug 23 09:48:28 2008 @@ -17,9 +17,6 @@ package org.apache.mahout.ga.watchmaker.cd.hadoop; -import java.io.IOException; -import java.util.Iterator; - import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.mapred.MapReduceBase; import org.apache.hadoop.mapred.OutputCollector; @@ -27,6 +24,9 @@ import org.apache.hadoop.mapred.Reporter; import org.apache.mahout.ga.watchmaker.cd.CDFitness; +import java.io.IOException; +import java.util.Iterator; + /** * Hadoop Reducer, combines many evaluations (CDFitness) into a single one. */ Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/DatasetSplit.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/DatasetSplit.java?rev=688364&r1=688363&r2=688364&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/DatasetSplit.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/DatasetSplit.java Sat Aug 23 09:48:28 2008 @@ -17,9 +17,6 @@ package org.apache.mahout.ga.watchmaker.cd.hadoop; -import java.io.IOException; -import java.util.Random; - import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.Text; import org.apache.hadoop.mapred.FileSplit; @@ -32,6 +29,9 @@ import org.apache.mahout.utils.StringUtils; import org.uncommons.maths.random.MersenneTwisterRNG; +import java.io.IOException; +import java.util.Random; + /** * Separate the input data into a training and testing set. */ Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosTool.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosTool.java?rev=688364&r1=688363&r2=688364&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosTool.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosTool.java Sat Aug 23 09:48:28 2008 @@ -17,22 +17,15 @@ * limitations under the License. */ -import java.io.BufferedWriter; -import java.io.IOException; -import java.io.OutputStreamWriter; -import java.util.ArrayList; -import java.util.List; -import java.util.Scanner; - import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.FSDataOutputStream; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.LongWritable; -import org.apache.hadoop.io.Text; import org.apache.hadoop.io.SequenceFile.Reader; import org.apache.hadoop.io.SequenceFile.Sorter; +import org.apache.hadoop.io.Text; import org.apache.hadoop.mapred.JobClient; import org.apache.hadoop.mapred.JobConf; import org.apache.hadoop.mapred.SequenceFileOutputFormat; @@ -41,6 +34,13 @@ import org.apache.mahout.ga.watchmaker.cd.FileInfoParser; import org.apache.mahout.utils.StringUtils; +import java.io.BufferedWriter; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.util.ArrayList; +import java.util.List; +import java.util.Scanner; + /** * Gathers additional information about a given dataset. Takes a descriptor * about the attributes, and generates a description for each one. @@ -200,7 +200,7 @@ // command-line parameters if (args.length == 0) { System.out.println("Usage: CDInfosTool dataset_path"); - System.exit(-1); + throw new IllegalArgumentException(); } FileSystem fs = FileSystem.get(new Configuration()); Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolCombiner.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolCombiner.java?rev=688364&r1=688363&r2=688364&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolCombiner.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolCombiner.java Sat Aug 23 09:48:28 2008 @@ -17,11 +17,6 @@ package org.apache.mahout.ga.watchmaker.cd.tool; -import java.io.IOException; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Set; - import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.Text; import org.apache.hadoop.mapred.JobConf; @@ -31,6 +26,11 @@ import org.apache.hadoop.mapred.Reporter; import org.apache.mahout.utils.StringUtils; +import java.io.IOException; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Set; + /** * Combines attribute values into a String.<br> * <ul> @@ -45,7 +45,7 @@ public class ToolCombiner extends MapReduceBase implements Reducer<LongWritable, Text, LongWritable, Text> { - private Set<String> distinct = new HashSet<String>(); + private final Set<String> distinct = new HashSet<String>(); private Descriptors descriptors; Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolMapper.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolMapper.java?rev=688364&r1=688363&r2=688364&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolMapper.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolMapper.java Sat Aug 23 09:48:28 2008 @@ -17,11 +17,6 @@ package org.apache.mahout.ga.watchmaker.cd.tool; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.StringTokenizer; - import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.Text; import org.apache.hadoop.mapred.JobConf; @@ -31,6 +26,11 @@ import org.apache.hadoop.mapred.Reporter; import org.apache.mahout.utils.StringUtils; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.StringTokenizer; + /** * Extract the attribute values from a dataline. Skip ignored attributes<br> * Input:<br> @@ -52,7 +52,7 @@ public static final String ATTRIBUTES = "cdtool.attributes"; - private List<String> attributes = new ArrayList<String>(); + private final List<String> attributes = new ArrayList<String>(); private Descriptors descriptors; Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolReducer.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolReducer.java?rev=688364&r1=688363&r2=688364&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolReducer.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolReducer.java Sat Aug 23 09:48:28 2008 @@ -17,11 +17,6 @@ package org.apache.mahout.ga.watchmaker.cd.tool; -import java.io.IOException; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Set; - import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.Text; import org.apache.hadoop.mapred.JobConf; @@ -32,6 +27,11 @@ import org.apache.mahout.ga.watchmaker.cd.tool.DescriptionUtils.Range; import org.apache.mahout.utils.StringUtils; +import java.io.IOException; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Set; + /** * Combines attribute description strings into a String.<br> * <ul> @@ -48,7 +48,7 @@ private Descriptors descriptors; - private Set<String> distinct = new HashSet<String>(); + private final Set<String> distinct = new HashSet<String>(); @Override public void configure(JobConf job) { Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/BruteForceTravellingSalesman.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/BruteForceTravellingSalesman.java?rev=688364&r1=688363&r2=688364&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/BruteForceTravellingSalesman.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/BruteForceTravellingSalesman.java Sat Aug 23 09:48:28 2008 @@ -15,12 +15,13 @@ // ============================================================================ package org.apache.mahout.ga.watchmaker.travellingsalesman; +import org.uncommons.maths.PermutationGenerator; +import org.uncommons.watchmaker.framework.FitnessEvaluator; + import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import java.util.List; -import org.uncommons.maths.PermutationGenerator; -import org.uncommons.watchmaker.framework.FitnessEvaluator; /** * Naive brute-force solution to the travelling salesman problem. It would take about Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/EvolutionaryTravellingSalesman.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/EvolutionaryTravellingSalesman.java?rev=688364&r1=688363&r2=688364&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/EvolutionaryTravellingSalesman.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/EvolutionaryTravellingSalesman.java Sat Aug 23 09:48:28 2008 @@ -16,12 +16,6 @@ */ package org.apache.mahout.ga.watchmaker.travellingsalesman; -import java.util.ArrayList; -import java.util.Collection; -import java.util.LinkedList; -import java.util.List; -import java.util.Random; - import org.apache.mahout.ga.watchmaker.MahoutFitnessEvaluator; import org.apache.mahout.ga.watchmaker.STEvolutionEngine; import org.apache.mahout.ga.watchmaker.STFitnessEvaluator; @@ -40,6 +34,12 @@ import org.uncommons.watchmaker.framework.operators.ListOrderMutation; import org.uncommons.watchmaker.framework.termination.GenerationCount; +import java.util.ArrayList; +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; +import java.util.Random; + /** * Evolutionary algorithm for finding (approximate) solutions to the travelling * salesman problem. Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/RouteEvaluator.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/RouteEvaluator.java?rev=688364&r1=688363&r2=688364&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/RouteEvaluator.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/RouteEvaluator.java Sat Aug 23 09:48:28 2008 @@ -16,9 +16,10 @@ */ package org.apache.mahout.ga.watchmaker.travellingsalesman; -import java.util.List; import org.uncommons.watchmaker.framework.FitnessEvaluator; +import java.util.List; + /** * Fitness evalator that measures the total distance of a route in the travelling salesman * problem. The fitness score of a route is the total distance (in km). A route Modified: lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/CDCrossoverTest.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/CDCrossoverTest.java?rev=688364&r1=688363&r2=688364&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/CDCrossoverTest.java (original) +++ lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/CDCrossoverTest.java Sat Aug 23 09:48:28 2008 @@ -17,18 +17,13 @@ package org.apache.mahout.ga.watchmaker.cd; +import junit.framework.TestCase; +import static org.easymock.classextension.EasyMock.*; +import org.uncommons.maths.random.MersenneTwisterRNG; + import java.util.List; import java.util.Random; -import org.apache.mahout.ga.watchmaker.cd.CDCrossover; -import org.apache.mahout.ga.watchmaker.cd.CDRule; -import org.uncommons.maths.random.MersenneTwisterRNG; -import static org.easymock.classextension.EasyMock.*; -import junit.framework.TestCase; - -/** - * - */ public class CDCrossoverTest extends TestCase { /** Modified: lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/CDFitnessTest.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/CDFitnessTest.java?rev=688364&r1=688363&r2=688364&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/CDFitnessTest.java (original) +++ lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/CDFitnessTest.java Sat Aug 23 09:48:28 2008 @@ -17,15 +17,11 @@ package org.apache.mahout.ga.watchmaker.cd; -import java.util.Random; - +import junit.framework.TestCase; import org.uncommons.maths.random.MersenneTwisterRNG; -import junit.framework.TestCase; +import java.util.Random; -/** - * - */ public class CDFitnessTest extends TestCase { /** Modified: lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/CDMutationTest.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/CDMutationTest.java?rev=688364&r1=688363&r2=688364&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/CDMutationTest.java (original) +++ lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/CDMutationTest.java Sat Aug 23 09:48:28 2008 @@ -17,16 +17,12 @@ package org.apache.mahout.ga.watchmaker.cd; -import java.util.Random; - import junit.framework.TestCase; - import org.apache.mahout.ga.watchmaker.cd.utils.MockDataSet; import org.uncommons.maths.random.MersenneTwisterRNG; -/** - * - */ +import java.util.Random; + public class CDMutationTest extends TestCase { private Random rng; Modified: lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/CDRuleTest.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/CDRuleTest.java?rev=688364&r1=688363&r2=688364&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/CDRuleTest.java (original) +++ lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/CDRuleTest.java Sat Aug 23 09:48:28 2008 @@ -1,14 +1,11 @@ package org.apache.mahout.ga.watchmaker.cd; -import java.util.Random; - -import org.apache.mahout.ga.watchmaker.cd.CDRule; -import org.apache.mahout.ga.watchmaker.cd.DataLine; +import junit.framework.TestCase; import org.apache.mahout.ga.watchmaker.cd.utils.MockDataSet; import org.uncommons.maths.random.MersenneTwisterRNG; import static org.easymock.classextension.EasyMock.*; -import junit.framework.TestCase; +import java.util.Random; public class CDRuleTest extends TestCase { Modified: lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/FileInfosDatasetTest.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/FileInfosDatasetTest.java?rev=688364&r1=688363&r2=688364&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/FileInfosDatasetTest.java (original) +++ lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/FileInfosDatasetTest.java Sat Aug 23 09:48:28 2008 @@ -17,16 +17,15 @@ package org.apache.mahout.ga.watchmaker.cd; -import java.io.BufferedReader; -import java.io.FileReader; -import java.io.IOException; - import junit.framework.TestCase; - import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; +import java.io.BufferedReader; +import java.io.FileReader; +import java.io.IOException; + /** * */ Modified: lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMahoutEvaluatorTest.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMahoutEvaluatorTest.java?rev=688364&r1=688363&r2=688364&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMahoutEvaluatorTest.java (original) +++ lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMahoutEvaluatorTest.java Sat Aug 23 09:48:28 2008 @@ -1,19 +1,17 @@ package org.apache.mahout.ga.watchmaker.cd.hadoop; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - import junit.framework.TestCase; - import org.apache.hadoop.fs.Path; import org.apache.mahout.ga.watchmaker.cd.CDFitness; import org.apache.mahout.ga.watchmaker.cd.Rule; -import org.apache.mahout.ga.watchmaker.cd.hadoop.CDMahoutEvaluator; import org.apache.mahout.ga.watchmaker.cd.utils.RandomRule; import org.apache.mahout.ga.watchmaker.cd.utils.RandomRuleResults; import org.uncommons.maths.random.MersenneTwisterRNG; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + public class CDMahoutEvaluatorTest extends TestCase { public void testEvaluate() throws Exception { Modified: lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMapperTest.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMapperTest.java?rev=688364&r1=688363&r2=688364&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMapperTest.java (original) +++ lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMapperTest.java Sat Aug 23 09:48:28 2008 @@ -17,39 +17,35 @@ package org.apache.mahout.ga.watchmaker.cd.hadoop; +import junit.framework.TestCase; +import org.apache.hadoop.io.LongWritable; +import org.apache.mahout.ga.watchmaker.cd.CDFitness; +import org.apache.mahout.ga.watchmaker.cd.DataLine; +import org.apache.mahout.ga.watchmaker.cd.Rule; +import org.apache.mahout.utils.DummyOutputCollector; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; - import org.easymock.classextension.EasyMock; import java.util.Arrays; import java.util.List; import java.util.Set; -import junit.framework.TestCase; - -import org.apache.hadoop.io.LongWritable; -import org.apache.mahout.ga.watchmaker.cd.CDFitness; -import org.apache.mahout.ga.watchmaker.cd.DataLine; -import org.apache.mahout.ga.watchmaker.cd.Rule; -import org.apache.mahout.ga.watchmaker.cd.hadoop.CDMapper; -import org.apache.mahout.utils.DummyOutputCollector; - public class CDMapperTest extends TestCase { DataLine dl; Rule rule; - CDFitness TP = new CDFitness(1, 0, 0, 0); + final CDFitness TP = new CDFitness(1, 0, 0, 0); - CDFitness FP = new CDFitness(0, 1, 0, 0); + final CDFitness FP = new CDFitness(0, 1, 0, 0); - CDFitness TN = new CDFitness(0, 0, 1, 0); + final CDFitness TN = new CDFitness(0, 0, 1, 0); - CDFitness FN = new CDFitness(0, 0, 0, 1); + final CDFitness FN = new CDFitness(0, 0, 0, 1); @Override protected void setUp() throws Exception { Modified: lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDReducerTest.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDReducerTest.java?rev=688364&r1=688363&r2=688364&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDReducerTest.java (original) +++ lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDReducerTest.java Sat Aug 23 09:48:28 2008 @@ -1,21 +1,19 @@ package org.apache.mahout.ga.watchmaker.cd.hadoop; +import junit.framework.TestCase; +import org.apache.hadoop.io.LongWritable; +import org.apache.mahout.ga.watchmaker.cd.CDFitness; +import org.apache.mahout.utils.DummyOutputCollector; + import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.Random; import java.util.Set; -import junit.framework.TestCase; - -import org.apache.hadoop.io.LongWritable; -import org.apache.mahout.ga.watchmaker.cd.CDFitness; -import org.apache.mahout.ga.watchmaker.cd.hadoop.CDReducer; -import org.apache.mahout.utils.DummyOutputCollector; - public class CDReducerTest extends TestCase { - private int nbevals = 100; + private final int nbevals = 100; private List<CDFitness> evaluations; Modified: lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/hadoop/DatasetSplitTest.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/hadoop/DatasetSplitTest.java?rev=688364&r1=688363&r2=688364&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/hadoop/DatasetSplitTest.java (original) +++ lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/hadoop/DatasetSplitTest.java Sat Aug 23 09:48:28 2008 @@ -17,21 +17,19 @@ package org.apache.mahout.ga.watchmaker.cd.hadoop; -import java.io.IOException; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; - import junit.framework.TestCase; - import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.Text; import org.apache.hadoop.mapred.JobConf; import org.apache.hadoop.mapred.RecordReader; -import org.apache.mahout.ga.watchmaker.cd.hadoop.DatasetSplit; import org.apache.mahout.ga.watchmaker.cd.hadoop.DatasetSplit.RndLineRecordReader; import org.uncommons.maths.random.MersenneTwisterRNG; +import java.io.IOException; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + /** * */ Modified: lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosToolTest.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosToolTest.java?rev=688364&r1=688363&r2=688364&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosToolTest.java (original) +++ lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosToolTest.java Sat Aug 23 09:48:28 2008 @@ -16,17 +16,7 @@ * limitations under the License. */ -import java.io.BufferedWriter; -import java.io.IOException; -import java.io.OutputStreamWriter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.Random; - import junit.framework.TestCase; - import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataOutputStream; import org.apache.hadoop.fs.FileSystem; @@ -35,6 +25,15 @@ import org.apache.mahout.ga.watchmaker.cd.tool.DescriptionUtils.Range; import org.uncommons.maths.random.MersenneTwisterRNG; +import java.io.BufferedWriter; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Random; + public class CDInfosToolTest extends TestCase { Random rng; Modified: lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/DescriptionUtilsTest.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/DescriptionUtilsTest.java?rev=688364&r1=688363&r2=688364&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/DescriptionUtilsTest.java (original) +++ lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/DescriptionUtilsTest.java Sat Aug 23 09:48:28 2008 @@ -16,14 +16,13 @@ * limitations under the License. */ +import junit.framework.TestCase; +import org.apache.mahout.ga.watchmaker.cd.tool.DescriptionUtils.Range; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.mahout.ga.watchmaker.cd.tool.DescriptionUtils.Range; - -import junit.framework.TestCase; - public class DescriptionUtilsTest extends TestCase { public void testCreateNominalDescription() { Modified: lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolCombinerTest.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolCombinerTest.java?rev=688364&r1=688363&r2=688364&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolCombinerTest.java (original) +++ lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolCombinerTest.java Sat Aug 23 09:48:28 2008 @@ -16,14 +16,13 @@ * limitations under the License. */ +import junit.framework.TestCase; +import org.apache.hadoop.io.Text; + import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; -import junit.framework.TestCase; - -import org.apache.hadoop.io.Text; - public class ToolCombinerTest extends TestCase { public void testCreateDescriptionNumerical() throws Exception { Modified: lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolMapperTest.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolMapperTest.java?rev=688364&r1=688363&r2=688364&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolMapperTest.java (original) +++ lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolMapperTest.java Sat Aug 23 09:48:28 2008 @@ -16,14 +16,13 @@ * limitations under the License. */ -import java.util.List; - import junit.framework.TestCase; - import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.Text; import org.apache.mahout.utils.DummyOutputCollector; +import java.util.List; + public class ToolMapperTest extends TestCase { public void testExtractAttributes() throws Exception { Modified: lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolReducerTest.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolReducerTest.java?rev=688364&r1=688363&r2=688364&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolReducerTest.java (original) +++ lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolReducerTest.java Sat Aug 23 09:48:28 2008 @@ -16,15 +16,14 @@ * limitations under the License. */ +import junit.framework.TestCase; +import org.apache.hadoop.io.Text; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.List; -import junit.framework.TestCase; - -import org.apache.hadoop.io.Text; - public class ToolReducerTest extends TestCase { public void testCreateDescriptionNumerical() throws Exception { Modified: lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/utils/MockDataSet.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/utils/MockDataSet.java?rev=688364&r1=688363&r2=688364&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/utils/MockDataSet.java (original) +++ lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/utils/MockDataSet.java Sat Aug 23 09:48:28 2008 @@ -17,16 +17,15 @@ package org.apache.mahout.ga.watchmaker.cd.utils; -import static org.easymock.classextension.EasyMock.expect; +import org.apache.mahout.ga.watchmaker.cd.DataSet; +import org.easymock.classextension.EasyMock; import static org.easymock.classextension.EasyMock.createMock; +import static org.easymock.classextension.EasyMock.expect; import static org.easymock.classextension.EasyMock.replay; import static org.easymock.classextension.EasyMock.reset; import java.util.Random; -import org.apache.mahout.ga.watchmaker.cd.DataSet; -import org.easymock.classextension.EasyMock; - /** * Generate a mock dataset using EasyMock. The dataset contains a random number * of attributes. Each attribute can be numerical or categorical (choosen Modified: lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/utils/RandomRule.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/utils/RandomRule.java?rev=688364&r1=688363&r2=688364&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/utils/RandomRule.java (original) +++ lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/utils/RandomRule.java Sat Aug 23 09:48:28 2008 @@ -1,12 +1,12 @@ package org.apache.mahout.ga.watchmaker.cd.utils; -import java.util.Random; - import org.apache.mahout.ga.watchmaker.cd.CDFitness; import org.apache.mahout.ga.watchmaker.cd.DataLine; import org.apache.mahout.ga.watchmaker.cd.Rule; import org.apache.mahout.ga.watchmaker.cd.hadoop.CDMapper; +import java.util.Random; + public class RandomRule implements Rule { private final Random rng; Modified: lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/utils/RandomRuleResults.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/utils/RandomRuleResults.java?rev=688364&r1=688363&r2=688364&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/utils/RandomRuleResults.java (original) +++ lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/utils/RandomRuleResults.java Sat Aug 23 09:48:28 2008 @@ -1,13 +1,13 @@ package org.apache.mahout.ga.watchmaker.cd.utils; +import org.apache.mahout.ga.watchmaker.cd.CDFitness; + import java.util.HashMap; import java.util.Map; -import org.apache.mahout.ga.watchmaker.cd.CDFitness; - public class RandomRuleResults { - private static Map<Integer, CDFitness> results = new HashMap<Integer, CDFitness>(); + private static final Map<Integer, CDFitness> results = new HashMap<Integer, CDFitness>(); public static synchronized void addResult(int ruleid, CDFitness fit) { CDFitness f = results.get(ruleid);
