Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/OutputDriver.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/OutputDriver.java?rev=729175&r1=729174&r2=729175&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/OutputDriver.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/OutputDriver.java Tue Dec 23 15:32:31 2008 @@ -29,6 +29,8 @@ import java.io.IOException; public class OutputDriver { + private OutputDriver() { + } public static void main(String[] args) throws IOException { runJob(args[0], args[1]);
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/OutputMapper.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/OutputMapper.java?rev=729175&r1=729174&r2=729175&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/OutputMapper.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/OutputMapper.java Tue Dec 23 15:32:31 2008 @@ -32,6 +32,7 @@ public class OutputMapper extends MapReduceBase implements Mapper<LongWritable, Text, Text, Text> { + @Override public void map(LongWritable key, Text values, OutputCollector<Text, Text> output, Reporter reporter) throws IOException { String foo = values.toString(); Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/kmeans/Job.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/kmeans/Job.java?rev=729175&r1=729174&r2=729175&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/kmeans/Job.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/kmeans/Job.java Tue Dec 23 15:32:31 2008 @@ -28,6 +28,8 @@ import java.io.IOException; public class Job { + private Job() { + } public static void main(String[] args) throws IOException { if (args.length == 7) { Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/kmeans/OutputDriver.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/kmeans/OutputDriver.java?rev=729175&r1=729174&r2=729175&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/kmeans/OutputDriver.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/kmeans/OutputDriver.java Tue Dec 23 15:32:31 2008 @@ -29,6 +29,8 @@ import java.io.IOException; public class OutputDriver { + private OutputDriver() { + } public static void main(String[] args) throws IOException { runJob(args[0], args[1]); Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/kmeans/OutputMapper.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/kmeans/OutputMapper.java?rev=729175&r1=729174&r2=729175&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/kmeans/OutputMapper.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/kmeans/OutputMapper.java Tue Dec 23 15:32:31 2008 @@ -32,6 +32,7 @@ public class OutputMapper extends MapReduceBase implements Mapper<LongWritable, Text, Text, Text> { + @Override public void map(LongWritable key, Text values, OutputCollector<Text, Text> output, Reporter reporter) throws IOException { String foo = values.toString(); Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/InputDriver.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/InputDriver.java?rev=729175&r1=729174&r2=729175&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/InputDriver.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/InputDriver.java Tue Dec 23 15:32:31 2008 @@ -29,6 +29,8 @@ import java.io.IOException; public class InputDriver { + private InputDriver() { + } public static void main(String[] args) throws IOException { runJob(args[0], args[1]); Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/InputMapper.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/InputMapper.java?rev=729175&r1=729174&r2=729175&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/InputMapper.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/InputMapper.java Tue Dec 23 15:32:31 2008 @@ -34,6 +34,7 @@ public class InputMapper extends MapReduceBase implements Mapper<LongWritable, Text, Text, Text> { + @Override public void map(LongWritable key, Text values, OutputCollector<Text, Text> output, Reporter reporter) throws IOException { String[] numbers = values.toString().split(" "); Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/Job.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/Job.java?rev=729175&r1=729174&r2=729175&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/Job.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/Job.java Tue Dec 23 15:32:31 2008 @@ -27,6 +27,8 @@ import java.io.IOException; public class Job { + private Job() { + } public static void main(String[] args) throws IOException { if (args.length == 7) { Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/OutputDriver.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/OutputDriver.java?rev=729175&r1=729174&r2=729175&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/OutputDriver.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/OutputDriver.java Tue Dec 23 15:32:31 2008 @@ -30,6 +30,8 @@ import java.io.IOException; public class OutputDriver { + private OutputDriver() { + } public static void main(String[] args) throws IOException { runJob(args[0], args[1]); Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/OutputMapper.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/OutputMapper.java?rev=729175&r1=729174&r2=729175&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/OutputMapper.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/OutputMapper.java Tue Dec 23 15:32:31 2008 @@ -36,6 +36,7 @@ private int clusters = 0; + @Override public void map(Text key, Text values, OutputCollector<Text, Text> output, Reporter reporter) throws IOException { clusters++; Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDCrossover.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDCrossover.java?rev=729175&r1=729174&r2=729175&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDCrossover.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDCrossover.java Tue Dec 23 15:32:31 2008 @@ -64,17 +64,15 @@ return result; } - void swap(CDRule ind1, CDRule ind2, int index) { - double dtemp; - boolean btemp; - + static void swap(CDRule ind1, CDRule ind2, int index) { + // swap W - dtemp = ind1.getW(index); + double dtemp = ind1.getW(index); ind1.setW(index, ind2.getW(index)); ind2.setW(index, dtemp); // swap O - btemp = ind1.getO(index); + boolean btemp = ind1.getO(index); ind1.setO(index, ind2.getO(index)); ind2.setO(index, btemp); Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDFitness.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDFitness.java?rev=729175&r1=729174&r2=729175&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDFitness.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDFitness.java Tue Dec 23 15:32:31 2008 @@ -100,7 +100,7 @@ @Override public String toString() { - return "[TP=" + tp + ", FP=" + fp + ", TN=" + tn + ", FN=" + fn + "]"; + return "[TP=" + tp + ", FP=" + fp + ", TN=" + tn + ", FN=" + fn + ']'; } /** @@ -114,6 +114,7 @@ return se * sp; } + @Override public void readFields(DataInput in) throws IOException { tp = in.readInt(); fp = in.readInt(); @@ -121,6 +122,7 @@ fn = in.readInt(); } + @Override public void write(DataOutput out) throws IOException { out.writeInt(tp); out.writeInt(fp); Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDGA.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDGA.java?rev=729175&r1=729174&r2=729175&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDGA.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDGA.java Tue Dec 23 15:32:31 2008 @@ -67,6 +67,9 @@ private static final Logger log = LoggerFactory.getLogger(CDGA.class); + private CDGA() { + } + public static void main(String[] args) throws IOException { String dataset = "build/classes/wdbc"; int target = 1; @@ -109,28 +112,29 @@ CDMahoutEvaluator.InitializeDataSet(inpath); // Candidate Factory - CandidateFactory factory = new CDFactory(threshold); + CandidateFactory<CDRule> factory = new CDFactory(threshold); // Evolution Scheme - List<EvolutionaryOperator<? extends Rule>> operators = new ArrayList<EvolutionaryOperator<? extends Rule>>(); + List<EvolutionaryOperator<? super CDRule>> operators = new ArrayList<EvolutionaryOperator<? super CDRule>>(); operators.add(new CDCrossover(crosspnts)); operators.add(new CDMutation(mutrate, mutrange, mutprec)); - EvolutionPipeline pipeline = new EvolutionPipeline(operators); + EvolutionPipeline<CDRule> pipeline = new EvolutionPipeline<CDRule>(operators); // 75 % of the dataset is dedicated to training DatasetSplit split = new DatasetSplit(0.75); // Fitness Evaluator (defaults to training) - STFitnessEvaluator<? super Rule> evaluator = new CDFitnessEvaluator( + STFitnessEvaluator<? super CDRule> evaluator = new CDFitnessEvaluator( dataset, target, split); // Selection Strategy - SelectionStrategy selection = new RouletteWheelSelection(); + SelectionStrategy<? super CDRule> selection = new RouletteWheelSelection(); - EvolutionEngine<Rule> engine = new STEvolutionEngine<Rule>(factory, + EvolutionEngine<CDRule> engine = new STEvolutionEngine<CDRule>(factory, pipeline, evaluator, selection, new MersenneTwisterRNG()); - engine.addEvolutionObserver(new EvolutionObserver<Rule>() { - public void populationUpdate(PopulationData<Rule> data) { + engine.addEvolutionObserver(new EvolutionObserver<CDRule>() { + @Override + public void populationUpdate(PopulationData<CDRule> data) { log.info("Generation {}", data.getGenerationNumber()); } }); Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDMutation.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDMutation.java?rev=729175&r1=729174&r2=729175&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDMutation.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDMutation.java Tue Dec 23 15:32:31 2008 @@ -29,16 +29,16 @@ public class CDMutation implements EvolutionaryOperator<CDRule> { /** probability of mutating a variable */ - private double rate; + private final double rate; /** max size of the change (step-size) for each mutated variable */ - private double range; + private final double range; /** * mutation precision. Defines indirectly the minimal step-size and the * distribution of mutation steps inside the mutation range. */ - private int k; + private final int k; /** * @@ -63,6 +63,7 @@ this.k = k; } + @Override @SuppressWarnings("unchecked") public <S extends CDRule> List<S> apply(List<S> selectedCandidates, Random rng) { List<S> mutatedPopulation = new ArrayList<S>(selectedCandidates.size()); @@ -79,7 +80,7 @@ if (rng.nextDouble() > rate) continue; - int attrInd = rule.attributeIndex(condInd); + int attrInd = CDRule.attributeIndex(condInd); rule.setW(condInd, rndDouble(rule.getW(condInd), 0.0, 1.0, rng)); @@ -113,7 +114,7 @@ return value; } - int rndInt(double value, int nbcategories, Random rng) { + static int rndInt(double value, int nbcategories, Random rng) { return rng.nextInt(nbcategories); } } Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDRule.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDRule.java?rev=729175&r1=729174&r2=729175&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDRule.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDRule.java Tue Dec 23 15:32:31 2008 @@ -94,13 +94,13 @@ } } - protected double randomNumerical(DataSet dataset, int attrInd, Random rng) { + protected static double randomNumerical(DataSet dataset, int attrInd, Random rng) { double max = dataset.getMax(attrInd); double min = dataset.getMin(attrInd); return rng.nextDouble() * (max - min) + min; } - protected double randomCategorical(DataSet dataset, int attrInd, Random rng) { + protected static double randomCategorical(DataSet dataset, int attrInd, Random rng) { int nbcategories = dataset.getNbValues(attrInd); return rng.nextInt(nbcategories); } @@ -122,6 +122,7 @@ /** * if all the active conditions are met returns 1, else returns 0. */ + @Override public int classify(DataLine dl) { for (int condInd = 0; condInd < nbConditions; condInd++) { if (!condition(condInd, dl)) @@ -136,7 +137,7 @@ * @param condInd condition index * @return attribute index */ - public int attributeIndex(int condInd) { + public static int attributeIndex(int condInd) { int labelpos = DataSet.getDataSet().getLabelIndex(); return (condInd < labelpos) ? condInd : condInd + 1; } @@ -180,7 +181,7 @@ @Override public String toString() { - StringBuffer buffer = new StringBuffer(); + StringBuilder buffer = new StringBuilder(); buffer.append("CDRule = ["); boolean empty = true; @@ -189,13 +190,13 @@ if (!empty) buffer.append(" && "); - buffer.append("attr").append(attributeIndex(condInd)).append(" ").append(getO(condInd) ? ">=" : "<"); - buffer.append(" ").append(getV(condInd)); + buffer.append("attr").append(attributeIndex(condInd)).append(' ').append(getO(condInd) ? ">=" : "<"); + buffer.append(' ').append(getV(condInd)); empty = false; } } - buffer.append("]"); + buffer.append(']'); return buffer.toString(); } Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/DataSet.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/DataSet.java?rev=729175&r1=729174&r2=729175&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/DataSet.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/DataSet.java Tue Dec 23 15:32:31 2008 @@ -43,6 +43,7 @@ return values.length; } + @Override public boolean isNumerical() { return false; } @@ -65,7 +66,8 @@ } public static class NumericalAttr implements Attribute { - private final double min, max; + private final double min; + private final double max; public NumericalAttr(double min, double max) { this.min = min; @@ -80,6 +82,7 @@ return max; } + @Override public boolean isNumerical() { return true; } Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/FileInfoParser.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/FileInfoParser.java?rev=729175&r1=729174&r2=729175&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/FileInfoParser.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/FileInfoParser.java Tue Dec 23 15:32:31 2008 @@ -55,6 +55,9 @@ public static final String NUMERICAL_TOKEN = "NUMERICAL"; + private FileInfoParser() { + } + /** * Initializes a dataset using an info file. * @@ -73,13 +76,12 @@ List<Attribute> attributes = new ArrayList<Attribute>(); int labelIndex = -1; - String line, token; int index = 0; while (reader.hasNextLine()) { - line = reader.nextLine(); + String line = reader.nextLine(); StringTokenizer tokenizer = new StringTokenizer(line, ", "); - token = nextToken(tokenizer); + String token = nextToken(tokenizer); if (IGNORED_TOKEN.equals(token)) { ignored.add(index); } else if (LABEL_TOKEN.equals(token)) { @@ -121,8 +123,7 @@ throw new RuntimeException("Input path should be a directory"); // info file name - Path infoPath = new Path(inpath.getParent(), inpath.getName().concat( - ".infos")); + Path infoPath = new Path(inpath.getParent(), inpath.getName() + ".infos"); if (!fs.exists(infoPath)) throw new RuntimeException("Info file does not exist"); 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=729175&r1=729174&r2=729175&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 Tue Dec 23 15:32:31 2008 @@ -25,6 +25,8 @@ import org.apache.hadoop.mapred.JobClient; import org.apache.hadoop.mapred.JobConf; import org.apache.hadoop.mapred.SequenceFileOutputFormat; +import org.apache.hadoop.mapred.FileOutputFormat; +import org.apache.hadoop.mapred.FileInputFormat; import org.apache.mahout.ga.watchmaker.OutputUtils; import org.apache.mahout.ga.watchmaker.cd.CDFitness; import org.apache.mahout.ga.watchmaker.cd.DataSet; @@ -44,6 +46,8 @@ * the end loads the evaluations from the job output. */ public class CDMahoutEvaluator { + private CDMahoutEvaluator() { + } /** * Uses Mahout to evaluate the classification rules using the given evaluator. @@ -139,8 +143,8 @@ int target, Path inpath, Path outpath, DatasetSplit split) { split.storeJobParameters(conf); - DatasetTextInputFormat.setInputPaths(conf, inpath); - SequenceFileOutputFormat.setOutputPath(conf, outpath); + FileInputFormat.setInputPaths(conf, inpath); + FileOutputFormat.setOutputPath(conf, outpath); conf.setOutputKeyClass(LongWritable.class); conf.setOutputValueClass(CDFitness.class); 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=729175&r1=729174&r2=729175&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 Tue Dec 23 15:32:31 2008 @@ -50,6 +50,7 @@ private int target; @Override + @SuppressWarnings("unchecked") public void configure(JobConf job) { String rstr = job.get(CLASSDISCOVERY_RULES); if (rstr == null) @@ -72,7 +73,7 @@ super.configure(job); } - void initializeDataSet(DataSet dataset) { + static void initializeDataSet(DataSet dataset) { assert dataset != null : "bad 'dataset' configuration parameter"; DataSet.initialize(dataset); } @@ -86,6 +87,7 @@ } + @Override public void map(LongWritable key, Text value, OutputCollector<LongWritable, CDFitness> output, Reporter reporter) throws IOException { 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=729175&r1=729174&r2=729175&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 Tue Dec 23 15:32:31 2008 @@ -33,6 +33,7 @@ public class CDReducer extends MapReduceBase implements Reducer<LongWritable, CDFitness, LongWritable, CDFitness> { + @Override public void reduce(LongWritable key, Iterator<CDFitness> values, OutputCollector<LongWritable, CDFitness> output, Reporter reporter) throws IOException { 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=729175&r1=729174&r2=729175&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 Tue Dec 23 15:32:31 2008 @@ -149,26 +149,32 @@ training = split.isTraining(); } + @Override public void close() throws IOException { reader.close(); } + @Override public LongWritable createKey() { return reader.createKey(); } + @Override public Text createValue() { return reader.createValue(); } + @Override public long getPos() throws IOException { return reader.getPos(); } + @Override public float getProgress() throws IOException { return reader.getProgress(); } + @Override public boolean next(LongWritable key, Text value) throws IOException { boolean read; do { 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=729175&r1=729174&r2=729175&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 Tue Dec 23 15:32:31 2008 @@ -30,6 +30,8 @@ import org.apache.hadoop.mapred.JobConf; import org.apache.hadoop.mapred.SequenceFileOutputFormat; import org.apache.hadoop.mapred.TextInputFormat; +import org.apache.hadoop.mapred.FileOutputFormat; +import org.apache.hadoop.mapred.FileInputFormat; import org.apache.mahout.ga.watchmaker.OutputUtils; import org.apache.mahout.ga.watchmaker.cd.FileInfoParser; import org.apache.mahout.utils.StringUtils; @@ -51,6 +53,9 @@ private static final Logger log = LoggerFactory.getLogger(CDInfosTool.class); + private CDInfosTool() { + } + /** * Uses Mahout to gather the information about a dataset. * @@ -87,8 +92,8 @@ */ private static void configureJob(JobConf conf, Descriptors descriptors, Path inpath, Path outpath) { - TextInputFormat.setInputPaths(conf, inpath); - SequenceFileOutputFormat.setOutputPath(conf, outpath); + FileInputFormat.setInputPaths(conf, inpath); + FileOutputFormat.setOutputPath(conf, outpath); conf.setOutputKeyClass(LongWritable.class); conf.setOutputValueClass(Text.class); Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/DescriptionUtils.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/DescriptionUtils.java?rev=729175&r1=729174&r2=729175&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/DescriptionUtils.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/DescriptionUtils.java Tue Dec 23 15:32:31 2008 @@ -24,6 +24,8 @@ * Utility functions to handle Attribute's description strings. */ public class DescriptionUtils { + private DescriptionUtils() { + } public static class Range { public final double min; @@ -53,7 +55,7 @@ * @return */ public static String createNominalDescription(Collection<String> values) { - StringBuffer buffer = new StringBuffer(); + StringBuilder buffer = new StringBuilder(); int ind = 0; for (String value : values) { Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/Descriptors.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/Descriptors.java?rev=729175&r1=729174&r2=729175&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/Descriptors.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/Descriptors.java Tue Dec 23 15:32:31 2008 @@ -31,7 +31,7 @@ */ public class Descriptors { - private char[] descriptors; + private final char[] descriptors; public Descriptors(char[] descriptors) { assert descriptors != null && descriptors.length > 0; 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=729175&r1=729174&r2=729175&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 Tue Dec 23 15:32:31 2008 @@ -66,6 +66,7 @@ this.descriptors = new Descriptors(descriptors); } + @Override public void reduce(LongWritable key, Iterator<Text> values, OutputCollector<LongWritable, Text> output, Reporter reporter) throws IOException { @@ -101,7 +102,7 @@ return DescriptionUtils.createNominalDescription(distinct); } - String numericalDescription(Iterator<Text> values) { + static String numericalDescription(Iterator<Text> values) { double min = Double.POSITIVE_INFINITY; double max = Double.NEGATIVE_INFINITY; 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=729175&r1=729174&r2=729175&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 Tue Dec 23 15:32:31 2008 @@ -73,6 +73,7 @@ this.descriptors = new Descriptors(descriptors); } + @Override public void map(LongWritable key, Text value, OutputCollector<LongWritable, Text> output, Reporter reporter) throws IOException { @@ -97,7 +98,7 @@ * @param value * @param attributes */ - void extractAttributes(Text value, List<String> attributes) { + static void extractAttributes(Text value, List<String> attributes) { StringTokenizer tokenizer = new StringTokenizer(value.toString(), ","); attributes.clear(); 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=729175&r1=729174&r2=729175&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 Tue Dec 23 15:32:31 2008 @@ -67,6 +67,7 @@ this.descriptors = new Descriptors(descriptors); } + @Override public void reduce(LongWritable key, Iterator<Text> values, OutputCollector<LongWritable, Text> output, Reporter reporter) throws IOException { @@ -90,7 +91,7 @@ throw new RuntimeException(""); } - String numericDescription(Iterator<Text> values) { + static String numericDescription(Iterator<Text> values) { double min = Double.POSITIVE_INFINITY; double max = Double.NEGATIVE_INFINITY; 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=729175&r1=729174&r2=729175&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 Tue Dec 23 15:32:31 2008 @@ -49,6 +49,7 @@ this.distances = distances; } + @Override public String getDescription() { return "Brute Force"; @@ -66,6 +67,7 @@ * algorithm as it progresses. May be null. * @return The shortest route that visits each of the specified cities once. */ + @Override public List<String> calculateShortestRoute(Collection<String> cities, ProgressListener progressListener) { Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/EuropeanDistanceLookup.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/EuropeanDistanceLookup.java?rev=729175&r1=729174&r2=729175&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/EuropeanDistanceLookup.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/EuropeanDistanceLookup.java Tue Dec 23 15:32:31 2008 @@ -309,6 +309,7 @@ DISTANCES.put("Vienna", vienna); } + @Override public List<String> getKnownCities() { List<String> cities = new ArrayList<String>(DISTANCES.keySet()); @@ -316,6 +317,7 @@ return cities; } + @Override public int getDistance(String startingCity, String destinationCity) { return DISTANCES.get(startingCity).get(destinationCity); 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=729175&r1=729174&r2=729175&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 Tue Dec 23 15:32:31 2008 @@ -108,11 +108,12 @@ this.mahout = mahout; } + @Override public String getDescription() { String selectionName = selectionStrategy.getClass().getSimpleName(); return (mahout ? "Mahout " : "") + "Evolution (pop: " + populationSize + ", gen: " + generationCount + ", elite: " + eliteCount + ", " - + selectionName + ")"; + + selectionName + ')'; } /** @@ -125,6 +126,7 @@ * @return The (approximate) shortest route that visits each of the specified * cities once. */ + @Override public List<String> calculateShortestRoute(Collection<String> cities, final ProgressListener progressListener) { Random rng = new MersenneTwisterRNG(); @@ -148,6 +150,7 @@ EvolutionEngine<List<String>> engine = getEngine(candidateFactory, pipeline, rng); engine.addEvolutionObserver(new EvolutionObserver<List<String>>() { + @Override public void populationUpdate(PopulationData<List<String>> data) { if (progressListener != null) { progressListener Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/ExecutionPanel.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/ExecutionPanel.java?rev=729175&r1=729174&r2=729175&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/ExecutionPanel.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/ExecutionPanel.java Tue Dec 23 15:32:31 2008 @@ -45,7 +45,7 @@ private final JProgressBar progressBar; - public ExecutionPanel() + ExecutionPanel() { super(new BorderLayout()); JPanel controlPanel = new JPanel(new BorderLayout()); @@ -80,10 +80,12 @@ /** * Updates the position of the progress bar. */ + @Override public void updateProgress(final double percentComplete) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { progressBar.setValue((int) percentComplete); Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/ItineraryPanel.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/ItineraryPanel.java?rev=729175&r1=729174&r2=729175&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/ItineraryPanel.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/ItineraryPanel.java Tue Dec 23 15:32:31 2008 @@ -45,7 +45,7 @@ private final JButton selectAllButton; private final JButton clearButton; - public ItineraryPanel(List<String> cities) + ItineraryPanel(List<String> cities) { super(new BorderLayout()); @@ -67,6 +67,7 @@ ActionListener buttonListener = new ActionListener() { + @Override public void actionPerformed(ActionEvent actionEvent) { boolean select = actionEvent.getSource() == selectAllButton; 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=729175&r1=729174&r2=729175&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 Tue Dec 23 15:32:31 2008 @@ -53,6 +53,7 @@ * @return The total distance (in kilometres) of a journey that visits * each city in order and returns to the starting point. */ + @Override public double getFitness(List<String> candidate, List<? extends List<String>> population) { @@ -73,6 +74,7 @@ * Returns false since shorter distances represent fitter candidates. * @return false */ + @Override public boolean isNatural() { return false; Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/StrategyPanel.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/StrategyPanel.java?rev=729175&r1=729174&r2=729175&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/StrategyPanel.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/StrategyPanel.java Tue Dec 23 15:32:31 2008 @@ -71,12 +71,13 @@ * @param distances Data used by the strategy in order to calculate shortest * routes. */ - public StrategyPanel(DistanceLookup distances) { + StrategyPanel(DistanceLookup distances) { super(new BorderLayout()); this.distances = distances; evolutionOption = new JRadioButton("Evolution", true); bruteForceOption = new JRadioButton("Brute Force", false); evolutionOption.addItemListener(new ItemListener() { + @Override public void itemStateChanged(ItemEvent itemEvent) { evolutionPanel.setEnabled(evolutionOption.isSelected()); } @@ -133,7 +134,7 @@ private final JCheckBox distributedCheckbox; - public EvolutionPanel() { + EvolutionPanel() { super(new FlowLayout(FlowLayout.LEFT, 0, 0)); JPanel innerPanel = new JPanel(new SpringLayout()); Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/TravellingSalesman.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/TravellingSalesman.java?rev=729175&r1=729174&r2=729175&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/TravellingSalesman.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/TravellingSalesman.java Tue Dec 23 15:32:31 2008 @@ -24,14 +24,15 @@ import java.util.Collection; import java.util.List; -import javax.swing.JApplet; -import javax.swing.JDialog; -import javax.swing.JOptionPane; -import javax.swing.JPanel; - import org.uncommons.swing.SwingBackgroundTask; import org.uncommons.watchmaker.framework.FitnessEvaluator; +import javax.swing.JApplet; +import javax.swing.JPanel; +import javax.swing.JOptionPane; +import javax.swing.JDialog; +import javax.swing.WindowConstants; + /** * Applet for comparing evolutionary and brute force approaches to the * Travelling Salesman problem. @@ -66,6 +67,7 @@ add(innerPanel, BorderLayout.CENTER); executionPanel.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent actionEvent) { Collection<String> cities = itineraryPanel.getSelectedCities(); if (cities.size() < 4) { @@ -101,6 +103,7 @@ return new SwingBackgroundTask<List<String>>() { private long elapsedTime = 0; + @Override protected List<String> performTask() { long startTime = System.currentTimeMillis(); List<String> result = strategy.calculateShortestRoute(cities, @@ -109,6 +112,7 @@ return result; } + @Override protected void postProcessing(List<String> result) { executionPanel.appendOutput(createResultString(strategy .getDescription(), result, evaluator.getFitness(result, null), @@ -121,7 +125,7 @@ /** * Helper method for formatting a result as a string for display. */ - private String createResultString(String strategyDescription, + private static String createResultString(String strategyDescription, List<String> shortestRoute, double distance, long elapsedTime) { StringBuilder buffer = new StringBuilder(); buffer.append('['); @@ -161,7 +165,7 @@ public static void main(String[] args) { JDialog dialog = new JDialog((Frame) null, "Travelling Salesman Frame", true); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); + dialog.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); dialog.getContentPane().add(new TravellingSalesman()); dialog.pack();
