You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by sr...@apache.org on 2009/05/30 09:19:29 UTC
svn commit: r780195 - in /lucene/mahout/trunk:
core/src/main/java/org/apache/mahout/cf/taste/impl/common/
core/src/main/java/org/apache/mahout/cf/taste/impl/model/
core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/
core/src/main/java/org/ap...
Author: srowen
Date: Sat May 30 07:19:28 2009
New Revision: 780195
URL: http://svn.apache.org/viewvc?rev=780195&view=rev
Log:
Patch to address MAHOUT-127
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastMap.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastSet.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericPreferenceArray.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/AbstractSimilarity.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/BayesFileFormatter.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/Classify.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/ClusterMapper.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/STEvolutionEngine.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedDistanceMeasure.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/ClassParameter.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/utils/DummyOutputCollector.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/bookcrossing/Book.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/PrepareTwentyNewsgroups.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/TestClassifier.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/TrainClassifier.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreator.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaXmlSplitter.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/ExecutionPanel.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/ItineraryPanel.java
lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/CDMutationTest.java
lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/CDRuleTest.java
lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosToolTest.java
lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolReducerTest.java
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastMap.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastMap.java?rev=780195&r1=780194&r2=780195&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastMap.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastMap.java Sat May 30 07:19:28 2009
@@ -324,6 +324,7 @@
numEntries--;
}
+ @SuppressWarnings("unchecked")
@Override
public FastMap<K,V> clone() {
FastMap<K,V> clone;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastSet.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastSet.java?rev=780195&r1=780194&r2=780195&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastSet.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastSet.java Sat May 30 07:19:28 2009
@@ -280,6 +280,7 @@
return count;
}
+ @SuppressWarnings("unchecked")
@Override
public FastSet<K> clone() {
FastSet<K> clone;
@@ -338,4 +339,4 @@
}
-}
\ No newline at end of file
+}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericPreferenceArray.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericPreferenceArray.java?rev=780195&r1=780194&r2=780195&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericPreferenceArray.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/GenericPreferenceArray.java Sat May 30 07:19:28 2009
@@ -87,4 +87,4 @@
values[i] = value;
}
-}
\ No newline at end of file
+}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/AbstractSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/AbstractSimilarity.java?rev=780195&r1=780194&r2=780195&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/AbstractSimilarity.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/AbstractSimilarity.java Sat May 30 07:19:28 2009
@@ -30,9 +30,6 @@
import org.apache.mahout.cf.taste.model.User;
import org.apache.mahout.cf.taste.transforms.SimilarityTransform;
import org.apache.mahout.cf.taste.transforms.PreferenceTransform;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import java.util.Collection;
import java.util.concurrent.Callable;
@@ -42,8 +39,6 @@
*/
abstract class AbstractSimilarity implements UserSimilarity, ItemSimilarity {
- private static final Logger log = LoggerFactory.getLogger(AbstractSimilarity.class);
-
private final DataModel dataModel;
private PreferenceInferrer inferrer;
private PreferenceTransform prefTransform;
@@ -364,4 +359,4 @@
return this.getClass().getSimpleName() + "[dataModel:" + dataModel + ",inferrer:" + inferrer + ']';
}
-}
\ No newline at end of file
+}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/BayesFileFormatter.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/BayesFileFormatter.java?rev=780195&r1=780194&r2=780195&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/BayesFileFormatter.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/BayesFileFormatter.java Sat May 30 07:19:28 2009
@@ -259,8 +259,7 @@
* @throws InstantiationException if the Analyzer can't be constructed
* @throws IOException if the files can't be dealt with properly
*/
- @SuppressWarnings("static-access")
- public static void main(String[] args) throws ClassNotFoundException,
+ public static void main(String[] args) throws ClassNotFoundException,
IllegalAccessException, InstantiationException, IOException {
DefaultOptionBuilder obuilder = new DefaultOptionBuilder();
ArgumentBuilder abuilder = new ArgumentBuilder();
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/Classify.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/Classify.java?rev=780195&r1=780194&r2=780195&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/Classify.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/Classify.java Sat May 30 07:19:28 2009
@@ -56,7 +56,6 @@
private Classify() {
}
- @SuppressWarnings({ "static-access" })
public static void main(String[] args)
throws IOException, ClassNotFoundException, IllegalAccessException, InstantiationException, OptionException {
DefaultOptionBuilder obuilder = new DefaultOptionBuilder();
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/ClusterMapper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/ClusterMapper.java?rev=780195&r1=780194&r2=780195&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/ClusterMapper.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/ClusterMapper.java Sat May 30 07:19:28 2009
@@ -33,7 +33,6 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.slf4j.LoggerFactory;
public class ClusterMapper extends MapReduceBase implements
Mapper<WritableComparable<?>, Text, Text, Text> {
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/STEvolutionEngine.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/STEvolutionEngine.java?rev=780195&r1=780194&r2=780195&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/STEvolutionEngine.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/STEvolutionEngine.java Sat May 30 07:19:28 2009
@@ -45,7 +45,6 @@
* @see org.uncommons.watchmaker.framework.AbstractEvolutionEngine#evaluatePopulation(java.util.List)
*/
@Override
- @SuppressWarnings("unchecked")
protected List<EvaluatedCandidate<T>> evaluatePopulation(List<T> population) {
List<Double> evaluations = new ArrayList<Double>();
STFitnessEvaluator<? super T> evaluator = (STFitnessEvaluator<? super T>) getFitnessEvaluator();
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedDistanceMeasure.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedDistanceMeasure.java?rev=780195&r1=780194&r2=780195&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedDistanceMeasure.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedDistanceMeasure.java Sat May 30 07:19:28 2009
@@ -40,6 +40,7 @@
private List<Parameter<?>> parameters;
private Parameter<Path> weightsFile;
+ @SuppressWarnings("unchecked")
private Parameter<Class> vectorClass;
protected Vector weights;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/ClassParameter.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/ClassParameter.java?rev=780195&r1=780194&r2=780195&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/ClassParameter.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/ClassParameter.java Sat May 30 07:19:28 2009
@@ -19,6 +19,7 @@
import org.apache.hadoop.mapred.JobConf;
+@SuppressWarnings("unchecked")
public class ClassParameter extends AbstractParameter<Class> {
public ClassParameter(String prefix, String name, JobConf jobConf, Class<?> defaultValue, String description) {
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=780195&r1=780194&r2=780195&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 Sat May 30 07:19:28 2009
@@ -252,7 +252,7 @@
// now compare the expected clusters with actual
File outDir = new File("output/points");
assertTrue("output dir exists?", outDir.exists());
- String[] outFiles = outDir.list();
+ outDir.list();
// assertEquals("output dir files?", 4, outFiles.length);
BufferedReader reader = new BufferedReader(new InputStreamReader(
new FileInputStream("output/points/part-00000"), Charset
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/utils/DummyOutputCollector.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/utils/DummyOutputCollector.java?rev=780195&r1=780194&r2=780195&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/utils/DummyOutputCollector.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/utils/DummyOutputCollector.java Sat May 30 07:19:28 2009
@@ -28,7 +28,7 @@
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>>();
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/bookcrossing/Book.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/bookcrossing/Book.java?rev=780195&r1=780194&r2=780195&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/bookcrossing/Book.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/bookcrossing/Book.java Sat May 30 07:19:28 2009
@@ -57,4 +57,4 @@
return publisher;
}
-}
\ No newline at end of file
+}
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/PrepareTwentyNewsgroups.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/PrepareTwentyNewsgroups.java?rev=780195&r1=780194&r2=780195&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/PrepareTwentyNewsgroups.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/PrepareTwentyNewsgroups.java Sat May 30 07:19:28 2009
@@ -45,7 +45,6 @@
private PrepareTwentyNewsgroups() {
}
- @SuppressWarnings("static-access")
public static void main(String[] args) throws IOException,
ClassNotFoundException, InstantiationException, IllegalAccessException, OptionException {
DefaultOptionBuilder obuilder = new DefaultOptionBuilder();
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/TestClassifier.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/TestClassifier.java?rev=780195&r1=780194&r2=780195&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/TestClassifier.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/TestClassifier.java Sat May 30 07:19:28 2009
@@ -55,7 +55,6 @@
// do nothing
}
- @SuppressWarnings({ "static-access", "unchecked" })
public static void main(String[] args) throws IOException,
OptionException {
DefaultOptionBuilder obuilder = new DefaultOptionBuilder();
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/TrainClassifier.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/TrainClassifier.java?rev=780195&r1=780194&r2=780195&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/TrainClassifier.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/TrainClassifier.java Sat May 30 07:19:28 2009
@@ -66,7 +66,6 @@
CBayesDriver.runJob(dir, outputDir, gramSize);
}
- @SuppressWarnings("static-access")
public static void main(String[] args) throws IOException, OptionException {
DefaultOptionBuilder obuilder = new DefaultOptionBuilder();
ArgumentBuilder abuilder = new ArgumentBuilder();
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreator.java?rev=780195&r1=780194&r2=780195&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreator.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreator.java Sat May 30 07:19:28 2009
@@ -32,7 +32,6 @@
private WikipediaDatasetCreator() {
}
- @SuppressWarnings("static-access")
public static void main(String[] args) throws IOException,
OptionException {
DefaultOptionBuilder obuilder = new DefaultOptionBuilder();
Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaXmlSplitter.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaXmlSplitter.java?rev=780195&r1=780194&r2=780195&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaXmlSplitter.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaXmlSplitter.java Sat May 30 07:19:28 2009
@@ -41,7 +41,6 @@
private WikipediaXmlSplitter() {
}
- @SuppressWarnings("static-access")
public static void main(String[] args) throws IOException, OptionException {
DefaultOptionBuilder obuilder = new DefaultOptionBuilder();
ArgumentBuilder abuilder = new ArgumentBuilder();
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=780195&r1=780194&r2=780195&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 Sat May 30 07:19:28 2009
@@ -37,14 +37,13 @@
* The original code is from <b>the Watchmaker project</b>
* (https://watchmaker.dev.java.net/).
*/
-final class ExecutionPanel extends JPanel implements ProgressListener
-{
+final class ExecutionPanel extends JPanel implements ProgressListener {
+
private final JButton startButton;
private final JTextArea output;
private final JScrollPane scroller;
private final JProgressBar progressBar;
-
ExecutionPanel()
{
super(new BorderLayout());
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=780195&r1=780194&r2=780195&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 Sat May 30 07:19:28 2009
@@ -39,8 +39,8 @@
* The original code is from <b>the Watchmaker project</b>
* (https://watchmaker.dev.java.net/).
*/
-final class ItineraryPanel extends JPanel
-{
+final class ItineraryPanel extends JPanel {
+
private final Collection<JCheckBox> checkBoxes;
private final JButton selectAllButton;
private final JButton clearButton;
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=780195&r1=780194&r2=780195&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 May 30 07:19:28 2009
@@ -60,7 +60,7 @@
int nbcats;
for (int condInd = 0; condInd < mutated.getNbConditions(); condInd++) {
- int attrInd = rule.attributeIndex(condInd);
+ int attrInd = CDRule.attributeIndex(condInd);
value = rule.getV(condInd);
newval = mutated.getV(condInd);
modified = modified || (value != newval);
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=780195&r1=780194&r2=780195&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 May 30 07:19:28 2009
@@ -45,7 +45,7 @@
CDRule rule = new CDRule(threshold, rng);
for (int condInd = 0; condInd < rule.getNbConditions(); condInd++) {
- int attrInd = rule.attributeIndex(condInd);
+ int attrInd = CDRule.attributeIndex(condInd);
assertInRange(rule.getW(condInd), 0, 1);
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=780195&r1=780194&r2=780195&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 May 30 07:19:28 2009
@@ -21,7 +21,6 @@
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.fs.Path;
import org.apache.mahout.ga.watchmaker.cd.tool.DescriptionUtils.Range;
import org.uncommons.maths.random.MersenneTwisterRNG;
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=780195&r1=780194&r2=780195&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 May 30 07:19:28 2009
@@ -35,7 +35,7 @@
List<Text> values = asList("0,5", "-2,12", "-32,3",
"0.5,25", "-30,20");
- String descriptor = reducer.numericDescription(values.iterator());
+ String descriptor = ToolReducer.numericDescription(values.iterator());
assertEquals("-32.0,25.0", descriptor);
}