Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/TransactionTreeTest.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/TransactionTreeTest.java?rev=900199&r1=900198&r2=900199&view=diff ============================================================================== --- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/TransactionTreeTest.java (original) +++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/TransactionTreeTest.java Sun Jan 17 19:41:24 2010 @@ -24,12 +24,13 @@ import junit.framework.TestCase; +import org.apache.mahout.common.MahoutTestCase; import org.apache.mahout.common.Pair; import org.apache.mahout.common.RandomUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TransactionTreeTest extends TestCase { +public class TransactionTreeTest extends MahoutTestCase { private static final Logger log = LoggerFactory.getLogger(TransactionTreeTest.class); private static final int MAX_DUPLICATION = 50; @@ -48,7 +49,13 @@ private static final int SKIP_RATE = 10; - private final Random gen = RandomUtils.getRandom(); + private Random gen; + + @Override + public void setUp() throws Exception { + super.setUp(); + gen = RandomUtils.getRandom(); + } public List<Integer> generateRandomArray() { List<Integer> list = new ArrayList<Integer>();
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth/FrequentPatternMaxHeapTest.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth/FrequentPatternMaxHeapTest.java?rev=900199&r1=900198&r2=900199&view=diff ============================================================================== --- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth/FrequentPatternMaxHeapTest.java (original) +++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth/FrequentPatternMaxHeapTest.java Sun Jan 17 19:41:24 2010 @@ -22,10 +22,10 @@ import java.util.HashSet; import java.util.Random; -import junit.framework.TestCase; +import org.apache.mahout.common.MahoutTestCase; import org.apache.mahout.common.RandomUtils; -public class FrequentPatternMaxHeapTest extends TestCase { +public class FrequentPatternMaxHeapTest extends MahoutTestCase { public void testMapHeap() { Random gen = RandomUtils.getRandom(); Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/ga/watchmaker/EvalMapperTest.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/ga/watchmaker/EvalMapperTest.java?rev=900199&r1=900198&r2=900199&view=diff ============================================================================== --- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/ga/watchmaker/EvalMapperTest.java (original) +++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/ga/watchmaker/EvalMapperTest.java Sun Jan 17 19:41:24 2010 @@ -17,29 +17,22 @@ package org.apache.mahout.ga.watchmaker; -import junit.framework.TestCase; import org.apache.hadoop.io.DoubleWritable; import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.Text; import org.apache.hadoop.mapred.JobConf; +import org.apache.mahout.common.MahoutTestCase; import org.apache.mahout.ga.watchmaker.utils.DummyCandidate; import org.apache.mahout.ga.watchmaker.utils.DummyEvaluator; import org.apache.mahout.common.DummyOutputCollector; import org.apache.mahout.common.StringUtils; -import org.apache.mahout.common.RandomUtils; import org.uncommons.watchmaker.framework.FitnessEvaluator; import java.util.List; import java.util.Set; -public class EvalMapperTest extends TestCase { +public class EvalMapperTest extends MahoutTestCase { - @Override - protected void setUp() throws Exception { - super.setUp(); - RandomUtils.useTestSeed(); - } - public void testMap() throws Exception { // population to evaluate int populationSize = 100; Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/ga/watchmaker/MahoutEvaluatorTest.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/ga/watchmaker/MahoutEvaluatorTest.java?rev=900199&r1=900198&r2=900199&view=diff ============================================================================== --- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/ga/watchmaker/MahoutEvaluatorTest.java (original) +++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/ga/watchmaker/MahoutEvaluatorTest.java Sun Jan 17 19:41:24 2010 @@ -17,29 +17,22 @@ package org.apache.mahout.ga.watchmaker; -import junit.framework.TestCase; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; +import org.apache.mahout.common.MahoutTestCase; import org.apache.mahout.ga.watchmaker.utils.DummyCandidate; import org.apache.mahout.ga.watchmaker.utils.DummyEvaluator; import org.apache.mahout.common.StringUtils; import org.apache.mahout.common.FileLineIterable; -import org.apache.mahout.common.RandomUtils; import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.Collection; -public class MahoutEvaluatorTest extends TestCase { - - @Override - protected void setUp() throws Exception { - super.setUp(); - RandomUtils.useTestSeed(); - } +public class MahoutEvaluatorTest extends MahoutTestCase { public <T> void testEvaluate() throws Exception { // candidate population Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/ga/watchmaker/STFitnessEvaluatorTest.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/ga/watchmaker/STFitnessEvaluatorTest.java?rev=900199&r1=900198&r2=900199&view=diff ============================================================================== --- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/ga/watchmaker/STFitnessEvaluatorTest.java (original) +++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/ga/watchmaker/STFitnessEvaluatorTest.java Sun Jan 17 19:41:24 2010 @@ -17,14 +17,14 @@ package org.apache.mahout.ga.watchmaker; -import junit.framework.TestCase; +import org.apache.mahout.common.MahoutTestCase; import org.apache.mahout.common.RandomUtils; import java.util.ArrayList; import java.util.List; import java.util.Random; -public class STFitnessEvaluatorTest extends TestCase { +public class STFitnessEvaluatorTest extends MahoutTestCase { private static class STFitnessEvaluatorMock<T> extends STFitnessEvaluator<T> { private int nbcalls; Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/df/mapreduce/BuildForest.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/df/mapreduce/BuildForest.java?rev=900199&r1=900198&r2=900199&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/df/mapreduce/BuildForest.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/df/mapreduce/BuildForest.java Sun Jan 17 19:41:24 2010 @@ -34,6 +34,7 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.util.Tool; import org.apache.hadoop.util.ToolRunner; +import org.apache.mahout.common.RandomUtils; import org.apache.mahout.df.DecisionForest; import org.apache.mahout.df.ErrorEstimate; import org.apache.mahout.df.DFUtils; @@ -202,10 +203,11 @@ if (isOob) { Random rng; - if (seed != null) - rng = new Random(seed); - else - rng = new Random(); + if (seed != null) { + rng = RandomUtils.getRandom(seed); + } else { + rng = RandomUtils.getRandom(); + } FileSystem fs = dataPath.getFileSystem(getConf()); int[] labels = Data.extractLabels(dataset, fs, dataPath); 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=900199&r1=900198&r2=900199&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 Sun Jan 17 19:41:24 2010 @@ -26,8 +26,9 @@ import org.apache.hadoop.mapred.RecordReader; import org.apache.hadoop.mapred.Reporter; import org.apache.hadoop.mapred.TextInputFormat; +import org.apache.mahout.common.RandomUtils; import org.apache.mahout.common.StringUtils; -import org.uncommons.maths.random.MersenneTwisterRNG; +import org.uncommons.maths.random.RepeatableRNG; import java.io.IOException; import java.util.Random; @@ -43,7 +44,7 @@ private static final String TRAINING = "traintest.training"; - private final byte[] seed; + private final long seed; private final double threshold; @@ -55,14 +56,14 @@ * @param threshold fraction of the total dataset that will be used for * training */ - public DatasetSplit(byte[] seed, double threshold) { + public DatasetSplit(long seed, double threshold) { this.seed = seed; this.threshold = threshold; this.training = true; } public DatasetSplit(double threshold) { - this(new MersenneTwisterRNG().getSeed(), threshold); + this(RandomUtils.seedBytesToLong(((RepeatableRNG) RandomUtils.getRandom()).getSeed()), threshold); } public DatasetSplit(JobConf conf) { @@ -71,7 +72,7 @@ training = isTraining(conf); } - public byte[] getSeed() { + public long getSeed() { return seed; } @@ -93,12 +94,12 @@ conf.setBoolean(TRAINING, training); } - static byte[] getSeed(JobConf conf) { + static long getSeed(JobConf conf) { String seedstr = conf.get(SEED); if (seedstr == null) throw new IllegalArgumentException("SEED job parameter not found"); - return StringUtils.fromString(seedstr); + return StringUtils.<Long>fromString(seedstr); } static double getThreshold(JobConf conf) { @@ -146,7 +147,7 @@ DatasetSplit split = new DatasetSplit(conf); - rng = new MersenneTwisterRNG(split.getSeed()); + rng = RandomUtils.getRandom(split.getSeed()); threshold = split.getThreshold(); training = split.isTraining(); } 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=900199&r1=900198&r2=900199&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 Sun Jan 17 19:41:24 2010 @@ -17,19 +17,14 @@ package org.apache.mahout.ga.watchmaker.cd; -import junit.framework.TestCase; +import org.apache.mahout.common.MahoutTestCase; import org.easymock.classextension.EasyMock; import org.apache.mahout.common.RandomUtils; import java.util.List; import java.util.Random; -public class CDCrossoverTest extends TestCase { - - @Override - public void setUp() { - RandomUtils.useTestSeed(); - } +public class CDCrossoverTest extends MahoutTestCase { /** * if the parents have different values for all their genes, then the 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=900199&r1=900198&r2=900199&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 Sun Jan 17 19:41:24 2010 @@ -17,17 +17,12 @@ package org.apache.mahout.ga.watchmaker.cd; -import junit.framework.TestCase; +import org.apache.mahout.common.MahoutTestCase; import org.apache.mahout.common.RandomUtils; import java.util.Random; -public class CDFitnessTest extends TestCase { - - @Override - public void setUp() { - RandomUtils.useTestSeed(); - } +public class CDFitnessTest extends MahoutTestCase { /** * Test method for {...@link org.apache.mahout.ga.watchmaker.cd.CDFitness#get()}. 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=900199&r1=900198&r2=900199&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 Sun Jan 17 19:41:24 2010 @@ -18,21 +18,21 @@ package org.apache.mahout.ga.watchmaker.cd; import junit.framework.Assert; -import junit.framework.TestCase; +import org.apache.mahout.common.MahoutTestCase; import org.apache.mahout.ga.watchmaker.cd.utils.MockDataSet; import org.apache.mahout.common.RandomUtils; import java.util.Random; -public class CDMutationTest extends TestCase { +public class CDMutationTest extends MahoutTestCase { private Random rng; private MockDataSet mock; @Override - protected void setUp() { - RandomUtils.useTestSeed(); + protected void setUp() throws Exception { + super.setUp(); rng = RandomUtils.getRandom(); mock = new MockDataSet(rng, 100); } 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=900199&r1=900198&r2=900199&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 Sun Jan 17 19:41:24 2010 @@ -19,13 +19,14 @@ import junit.framework.TestCase; import junit.framework.Assert; +import org.apache.mahout.common.MahoutTestCase; import org.apache.mahout.ga.watchmaker.cd.utils.MockDataSet; import org.apache.mahout.common.RandomUtils; import org.easymock.classextension.EasyMock; import java.util.Random; -public class CDRuleTest extends TestCase { +public class CDRuleTest extends MahoutTestCase { private Random rng; @@ -67,8 +68,8 @@ } @Override - protected void setUp() { - RandomUtils.useTestSeed(); + protected void setUp() throws Exception { + super.setUp(); rng = RandomUtils.getRandom(); mock = new MockDataSet(rng, 50); } Modified: lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/DataLineTest.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/DataLineTest.java?rev=900199&r1=900198&r2=900199&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/DataLineTest.java (original) +++ lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/DataLineTest.java Sun Jan 17 19:41:24 2010 @@ -17,13 +17,12 @@ package org.apache.mahout.ga.watchmaker.cd; -import junit.framework.TestCase; - import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; +import org.apache.mahout.common.MahoutTestCase; -public class DataLineTest extends TestCase { +public class DataLineTest extends MahoutTestCase { private static final String[] datalines = { "842302,M,17.99,10.38,122.8,1001,0.1184,0.2776,0.3001,0.1471,0.2419,0.07871,1.095,0.9053,8.589,153.4,0.006399,0.04904,0.05373,0.01587,0.03003,0.006193,25.38,17.33,184.6,2019,0.1622,0.6656,0.7119,0.2654,0.4601,0.1189", 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=900199&r1=900198&r2=900199&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 Sun Jan 17 19:41:24 2010 @@ -17,17 +17,17 @@ package org.apache.mahout.ga.watchmaker.cd; -import junit.framework.TestCase; import junit.framework.Assert; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.mahout.common.FileLineIterable; +import org.apache.mahout.common.MahoutTestCase; import java.io.IOException; import java.io.File; -public class FileInfosDatasetTest extends TestCase { +public class FileInfosDatasetTest extends MahoutTestCase { public void testRanges() throws IOException { Path inpath = new Path("target/test-classes/wdbc"); 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=900199&r1=900198&r2=900199&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 Sun Jan 17 19:41:24 2010 @@ -17,8 +17,8 @@ package org.apache.mahout.ga.watchmaker.cd.hadoop; -import junit.framework.TestCase; import org.apache.hadoop.fs.Path; +import org.apache.mahout.common.MahoutTestCase; import org.apache.mahout.ga.watchmaker.cd.CDFitness; import org.apache.mahout.ga.watchmaker.cd.Rule; import org.apache.mahout.ga.watchmaker.cd.utils.RandomRule; @@ -29,12 +29,7 @@ import java.util.List; import java.util.Random; -public class CDMahoutEvaluatorTest extends TestCase { - - @Override - public void setUp() { - RandomUtils.useTestSeed(); - } +public class CDMahoutEvaluatorTest extends MahoutTestCase { public void testEvaluate() throws Exception { int nbrules = 100; 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=900199&r1=900198&r2=900199&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 Sun Jan 17 19:41:24 2010 @@ -17,8 +17,8 @@ package org.apache.mahout.ga.watchmaker.cd.hadoop; -import junit.framework.TestCase; import org.apache.hadoop.io.LongWritable; +import org.apache.mahout.common.MahoutTestCase; import org.apache.mahout.ga.watchmaker.cd.CDFitness; import org.apache.mahout.ga.watchmaker.cd.DataLine; import org.apache.mahout.ga.watchmaker.cd.Rule; @@ -29,7 +29,7 @@ import java.util.List; import java.util.Set; -public class CDMapperTest extends TestCase { +public class CDMapperTest extends MahoutTestCase { private DataLine dl; private Rule rule; @@ -40,6 +40,8 @@ @Override protected void setUp() throws Exception { + super.setUp(); + // we assume 2 classes 0 and 1 // their are 4 tests // TP: dataline label 1, rule returns 1 @@ -58,8 +60,6 @@ EasyMock.expect(rule.classify(dl)).andReturn(1); EasyMock.expect(rule.classify(dl)).andReturn(0); EasyMock.expect(rule.classify(dl)).andReturn(0); - - super.setUp(); } public void testEvaluate() { 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=900199&r1=900198&r2=900199&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 Sun Jan 17 19:41:24 2010 @@ -17,8 +17,8 @@ package org.apache.mahout.ga.watchmaker.cd.hadoop; -import junit.framework.TestCase; import org.apache.hadoop.io.LongWritable; +import org.apache.mahout.common.MahoutTestCase; import org.apache.mahout.ga.watchmaker.cd.CDFitness; import org.apache.mahout.common.DummyOutputCollector; import org.apache.mahout.common.RandomUtils; @@ -29,7 +29,7 @@ import java.util.Random; import java.util.Set; -public class CDReducerTest extends TestCase { +public class CDReducerTest extends MahoutTestCase { private static final int nbevals = 100; @@ -38,10 +38,10 @@ private CDFitness expected; @Override - protected void setUp() { + protected void setUp() throws Exception { + super.setUp(); // generate random evaluatons and calculate expectations evaluations = new ArrayList<CDFitness>(); - RandomUtils.useTestSeed(); Random rng = RandomUtils.getRandom(); int tp = 0; int fp = 0; 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=900199&r1=900198&r2=900199&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 Sun Jan 17 19:41:24 2010 @@ -17,11 +17,11 @@ package org.apache.mahout.ga.watchmaker.cd.hadoop; -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.common.MahoutTestCase; import org.apache.mahout.ga.watchmaker.cd.hadoop.DatasetSplit.RndLineRecordReader; import org.apache.mahout.common.RandomUtils; import org.uncommons.maths.random.MersenneTwisterRNG; @@ -31,12 +31,7 @@ import java.util.HashSet; import java.util.Set; -public class DatasetSplitTest extends TestCase { - - @Override - public void setUp() { - RandomUtils.useTestSeed(); - } +public class DatasetSplitTest extends MahoutTestCase { /** * Mock RecordReader that returns a sequence of keys in the range [0, size[ @@ -94,7 +89,6 @@ for (int nloop = 0; nloop < n; nloop++) { MersenneTwisterRNG rng = (MersenneTwisterRNG) RandomUtils.getRandom(); - byte[] seed = rng.getSeed(); double threshold = rng.nextDouble(); JobConf conf = new JobConf(); @@ -102,7 +96,7 @@ LongWritable key = new LongWritable(); Text value = new Text(); - DatasetSplit split = new DatasetSplit(seed, threshold); + DatasetSplit split = new DatasetSplit(RandomUtils.seedBytesToLong(rng.getSeed()), threshold); // read the training set split.storeJobParameters(conf); @@ -130,7 +124,7 @@ for (int nloop = 0; nloop < n; nloop++) { MersenneTwisterRNG rng = (MersenneTwisterRNG) RandomUtils.getRandom(); - byte[] seed = rng.getSeed(); + long seed = RandomUtils.seedBytesToLong(rng.getSeed()); double threshold = rng.nextDouble(); boolean training = rng.nextBoolean(); @@ -140,7 +134,7 @@ JobConf conf = new JobConf(); split.storeJobParameters(conf); - assertTrue("bad seed", Arrays.equals(seed, DatasetSplit.getSeed(conf))); + assertEquals("bad seed", seed, DatasetSplit.getSeed(conf)); assertEquals("bad threshold", threshold, DatasetSplit.getThreshold(conf)); assertEquals("bad training", training, DatasetSplit.isTraining(conf)); } 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=900199&r1=900198&r2=900199&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 Sun Jan 17 19:41:24 2010 @@ -17,13 +17,13 @@ package org.apache.mahout.ga.watchmaker.cd.tool; -import junit.framework.TestCase; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataOutputStream; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.apache.mahout.ga.watchmaker.cd.tool.DescriptionUtils.Range; +import org.apache.mahout.common.MahoutTestCase; import org.apache.mahout.common.RandomUtils; +import org.apache.mahout.ga.watchmaker.cd.tool.DescriptionUtils.Range; import org.apache.commons.lang.ArrayUtils; import java.io.BufferedWriter; @@ -35,15 +35,15 @@ import java.util.List; import java.util.Random; -public class CDInfosToolTest extends TestCase { +public class CDInfosToolTest extends MahoutTestCase { /** max number of distinct values for any nominal attribute */ private static final int MAX_NOMINAL_VALUES = 50; private Random rng; @Override - protected void setUp() { - RandomUtils.useTestSeed(); + protected void setUp() throws Exception { + super.setUp(); rng = RandomUtils.getRandom(); } 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=900199&r1=900198&r2=900199&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 Sun Jan 17 19:41:24 2010 @@ -17,14 +17,14 @@ package org.apache.mahout.ga.watchmaker.cd.tool; -import junit.framework.TestCase; +import org.apache.mahout.common.MahoutTestCase; import org.apache.mahout.ga.watchmaker.cd.tool.DescriptionUtils.Range; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -public class DescriptionUtilsTest extends TestCase { +public class DescriptionUtilsTest extends MahoutTestCase { public void testCreateNominalDescription() { List<String> values = Arrays.asList("val1", "val2", "val3"); 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=900199&r1=900198&r2=900199&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 Sun Jan 17 19:41:24 2010 @@ -17,14 +17,14 @@ package org.apache.mahout.ga.watchmaker.cd.tool; -import junit.framework.TestCase; import org.apache.hadoop.io.Text; +import org.apache.mahout.common.MahoutTestCase; import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; -public class ToolCombinerTest extends TestCase { +public class ToolCombinerTest extends MahoutTestCase { public void testCreateDescriptionNumerical() throws Exception { ToolCombiner combiner = new ToolCombiner(); 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=900199&r1=900198&r2=900199&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 Sun Jan 17 19:41:24 2010 @@ -17,14 +17,14 @@ package org.apache.mahout.ga.watchmaker.cd.tool; -import junit.framework.TestCase; import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.Text; import org.apache.mahout.common.DummyOutputCollector; +import org.apache.mahout.common.MahoutTestCase; import java.util.List; -public class ToolMapperTest extends TestCase { +public class ToolMapperTest extends MahoutTestCase { public void testExtractAttributes() throws Exception { LongWritable key = new LongWritable(); 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=900199&r1=900198&r2=900199&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 Sun Jan 17 19:41:24 2010 @@ -17,15 +17,15 @@ package org.apache.mahout.ga.watchmaker.cd.tool; -import junit.framework.TestCase; import org.apache.hadoop.io.Text; +import org.apache.mahout.common.MahoutTestCase; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.List; -public class ToolReducerTest extends TestCase { +public class ToolReducerTest extends MahoutTestCase { public void testCreateDescriptionNumerical() throws Exception { ToolReducer reducer = new ToolReducer(); Modified: lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/GenericSortingTest.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/GenericSortingTest.java?rev=900199&r1=900198&r2=900199&view=diff ============================================================================== --- lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/GenericSortingTest.java (original) +++ lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/GenericSortingTest.java Sun Jan 17 19:41:24 2010 @@ -17,8 +17,6 @@ package org.apache.mahout.math; -import org.apache.mahout.math.GenericSorting; -import org.apache.mahout.math.Swapper; import org.apache.mahout.math.function.IntComparator; import org.junit.Assert; import org.junit.Test; Modified: lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/MatrixTest.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/MatrixTest.java?rev=900199&r1=900198&r2=900199&view=diff ============================================================================== --- lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/MatrixTest.java (original) +++ lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/MatrixTest.java Sun Jan 17 19:41:24 2010 @@ -32,7 +32,7 @@ protected final double[] vectorAValues = {1.0 / 1.1, 2.0 / 1.1}; - protected final double[] vectorBValues = {5.0, 10.0, 100.0}; + //protected final double[] vectorBValues = {5.0, 10.0, 100.0}; protected Matrix test; @@ -57,7 +57,7 @@ public void testCopy() { int[] c = test.size(); Matrix copy = test.clone(); - assertEquals("wrong class", copy.getClass(), test.getClass()); + assertSame("wrong class", copy.getClass(), test.getClass()); for (int row = 0; row < c[ROW]; row++) { for (int col = 0; col < c[COL]; col++) { assertEquals("value[" + row + "][" + col + ']', @@ -78,14 +78,14 @@ public void testLike() { Matrix like = test.like(); - assertEquals("type", like.getClass(), test.getClass()); + assertSame("type", like.getClass(), test.getClass()); assertEquals("rows", test.size()[ROW], like.size()[ROW]); assertEquals("columns", test.size()[COL], like.size()[COL]); } public void testLikeIntInt() { Matrix like = test.like(4, 4); - assertEquals("type", like.getClass(), test.getClass()); + assertSame("type", like.getClass(), test.getClass()); assertEquals("rows", 4, like.size()[ROW]); assertEquals("columns", 4, like.size()[COL]); } Modified: lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/SortingTest.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/SortingTest.java?rev=900199&r1=900198&r2=900199&view=diff ============================================================================== --- lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/SortingTest.java (original) +++ lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/SortingTest.java Sun Jan 17 19:41:24 2010 @@ -103,7 +103,7 @@ private Integer i; ForSorting(int i) { - this.i = Integer.valueOf(i); + this.i = i; } @Override Modified: lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestDenseMatrix.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestDenseMatrix.java?rev=900199&r1=900198&r2=900199&view=diff ============================================================================== --- lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestDenseMatrix.java (original) +++ lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestDenseMatrix.java Sun Jan 17 19:41:24 2010 @@ -17,9 +17,6 @@ package org.apache.mahout.math; -import org.apache.mahout.math.DenseMatrix; -import org.apache.mahout.math.Matrix; - public class TestDenseMatrix extends MatrixTest { public TestDenseMatrix(String name) { Modified: lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestDenseVector.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestDenseVector.java?rev=900199&r1=900198&r2=900199&view=diff ============================================================================== --- lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestDenseVector.java (original) +++ lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestDenseVector.java Sun Jan 17 19:41:24 2010 @@ -23,16 +23,6 @@ import java.util.Iterator; import java.util.Map; -import org.apache.mahout.math.AbstractVector; -import org.apache.mahout.math.CardinalityException; -import org.apache.mahout.math.DenseVector; -import org.apache.mahout.math.IndexException; -import org.apache.mahout.math.Matrix; -import org.apache.mahout.math.NegateFunction; -import org.apache.mahout.math.PlusFunction; -import org.apache.mahout.math.TimesFunction; -import org.apache.mahout.math.Vector; - public class TestDenseVector extends TestCase { final double[] values = {1.1, 2.2, 3.3}; Modified: lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestOrderedIntDoubleMapping.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestOrderedIntDoubleMapping.java?rev=900199&r1=900198&r2=900199&view=diff ============================================================================== --- lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestOrderedIntDoubleMapping.java (original) +++ lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestOrderedIntDoubleMapping.java Sun Jan 17 19:41:24 2010 @@ -17,8 +17,6 @@ package org.apache.mahout.math; -import org.apache.mahout.math.OrderedIntDoubleMapping; - import junit.framework.TestCase; public class TestOrderedIntDoubleMapping extends TestCase { Modified: lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestSparseColumnMatrix.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestSparseColumnMatrix.java?rev=900199&r1=900198&r2=900199&view=diff ============================================================================== --- lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestSparseColumnMatrix.java (original) +++ lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestSparseColumnMatrix.java Sun Jan 17 19:41:24 2010 @@ -17,9 +17,6 @@ package org.apache.mahout.math; -import org.apache.mahout.math.Matrix; -import org.apache.mahout.math.SparseColumnMatrix; - public class TestSparseColumnMatrix extends MatrixTest { public TestSparseColumnMatrix(String name) { Modified: lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestSparseMatrix.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestSparseMatrix.java?rev=900199&r1=900198&r2=900199&view=diff ============================================================================== --- lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestSparseMatrix.java (original) +++ lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestSparseMatrix.java Sun Jan 17 19:41:24 2010 @@ -17,9 +17,6 @@ package org.apache.mahout.math; -import org.apache.mahout.math.Matrix; -import org.apache.mahout.math.SparseMatrix; - public class TestSparseMatrix extends MatrixTest { public TestSparseMatrix(String name) { Modified: lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestSparseRowMatrix.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestSparseRowMatrix.java?rev=900199&r1=900198&r2=900199&view=diff ============================================================================== --- lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestSparseRowMatrix.java (original) +++ lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestSparseRowMatrix.java Sun Jan 17 19:41:24 2010 @@ -17,9 +17,6 @@ package org.apache.mahout.math; -import org.apache.mahout.math.Matrix; -import org.apache.mahout.math.SparseRowMatrix; - public class TestSparseRowMatrix extends MatrixTest { public TestSparseRowMatrix(String name) { Modified: lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestVectorView.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestVectorView.java?rev=900199&r1=900198&r2=900199&view=diff ============================================================================== --- lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestVectorView.java (original) +++ lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestVectorView.java Sun Jan 17 19:41:24 2010 @@ -21,17 +21,6 @@ import java.util.Iterator; -import org.apache.mahout.math.AbstractVector; -import org.apache.mahout.math.CardinalityException; -import org.apache.mahout.math.DenseVector; -import org.apache.mahout.math.IndexException; -import org.apache.mahout.math.Matrix; -import org.apache.mahout.math.NegateFunction; -import org.apache.mahout.math.PlusFunction; -import org.apache.mahout.math.TimesFunction; -import org.apache.mahout.math.Vector; -import org.apache.mahout.math.VectorView; - public class TestVectorView extends TestCase { private static final int cardinality = 3; Modified: lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/stats/LogLikelihoodTest.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/stats/LogLikelihoodTest.java?rev=900199&r1=900198&r2=900199&view=diff ============================================================================== --- lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/stats/LogLikelihoodTest.java (original) +++ lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/stats/LogLikelihoodTest.java Sun Jan 17 19:41:24 2010 @@ -19,36 +19,16 @@ import org.junit.Assert; import org.junit.Test; -/** - * - * - **/ -public class LogLikelihoodTest extends Assert{ - /* - *> entropy(c(1,1)) -[1] 1.386294 -llr(matrix(c(1,0,0,1), nrow=2)) -[1] 2.772589 -llr(matrix(c(10,0,0,10), nrow=2)) -[1] 27.72589 -llr(matrix(c(5,1995,0,100000), nrow=2)) -[1] 39.33052 -llr(matrix(c(1000,1995,1000,100000), nrow=2)) -[1] 4730.737 -llr(matrix(c(1000,1000,1000,100000), nrow=2)) -[1] 5734.343 -llr(matrix(c(1000,1000,1000,99000), nrow=2)) -[1] 5714.932 -* - */ +public class LogLikelihoodTest extends Assert { + @Test public void testEntropy() throws Exception { - assertEquals(LogLikelihood.entropy(1, 1), 1.386294, 0.0001); + assertEquals(1.386294, LogLikelihood.entropy(1, 1), 0.0001); //TODO: more tests here try { LogLikelihood.entropy(-1, -1);//exception - assertFalse(true); + fail(); } catch (IllegalArgumentException e) { } @@ -57,12 +37,12 @@ @Test public void testLogLikelihood() throws Exception { //TODO: check the epsilons - assertEquals(LogLikelihood.logLikelihoodRatio(1,0,0,1), 2.772589, 0.0001); - assertEquals(LogLikelihood.logLikelihoodRatio(10,0,0,10), 27.72589, 0.0001); - assertEquals(LogLikelihood.logLikelihoodRatio(5,1995,0,100000), 39.33052, 0.0001); - assertEquals(LogLikelihood.logLikelihoodRatio(1000,1995, 1000, 100000), 4730.737, 0.001); - assertEquals(LogLikelihood.logLikelihoodRatio(1000,1000,1000, 100000), 5734.343, 0.001); - assertEquals(LogLikelihood.logLikelihoodRatio(1000,1000,1000, 99000), 5714.932, 0.001); + assertEquals(2.772589, LogLikelihood.logLikelihoodRatio(1, 0, 0, 1), 0.0001); + assertEquals(27.72589, LogLikelihood.logLikelihoodRatio(10, 0, 0, 10), 0.0001); + assertEquals(39.33052, LogLikelihood.logLikelihoodRatio(5, 1995, 0, 100000), 0.0001); + assertEquals(4730.737, LogLikelihood.logLikelihoodRatio(1000, 1995, 1000, 100000), 0.001); + assertEquals(5734.343, LogLikelihood.logLikelihoodRatio(1000, 1000, 1000, 100000), 0.001); + assertEquals(5714.932, LogLikelihood.logLikelihoodRatio(1000, 1000, 1000, 99000), 0.001); } @Test Modified: lucene/mahout/trunk/maven/pom.xml URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/maven/pom.xml?rev=900199&r1=900198&r2=900199&view=diff ============================================================================== --- lucene/mahout/trunk/maven/pom.xml (original) +++ lucene/mahout/trunk/maven/pom.xml Sun Jan 17 19:41:24 2010 @@ -300,7 +300,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <forkMode>pertest</forkMode> + <forkMode>once</forkMode> <argLine>-Xms256m -Xmx512m</argLine> <testFailureIgnore>false</testFailureIgnore> <redirectTestOutputToFile>true</redirectTestOutputToFile> Modified: lucene/mahout/trunk/utils/pom.xml URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/utils/pom.xml?rev=900199&r1=900198&r2=900199&view=diff ============================================================================== --- lucene/mahout/trunk/utils/pom.xml (original) +++ lucene/mahout/trunk/utils/pom.xml Sun Jan 17 19:41:24 2010 @@ -118,6 +118,13 @@ <artifactId>mahout-core</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.mahout</groupId> + <artifactId>mahout-core</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> <dependency> <groupId>junit</groupId> @@ -137,6 +144,11 @@ <version>1.5.8</version> </dependency> + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-core</artifactId> + </dependency> + </dependencies> Modified: lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/ClusterLabels.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/ClusterLabels.java?rev=900199&r1=900198&r2=900199&view=diff ============================================================================== --- lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/ClusterLabels.java (original) +++ lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/ClusterLabels.java Sun Jan 17 19:41:24 2010 @@ -1,4 +1,3 @@ -package org.apache.mahout.utils.vectors.lucene; /** * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +15,8 @@ * limitations under the License. */ +package org.apache.mahout.utils.vectors.lucene; + import org.apache.commons.cli2.CommandLine; import org.apache.commons.cli2.Group; import org.apache.commons.cli2.Option; @@ -87,16 +88,6 @@ } return res; } - /* - * new Comparator<TermInfoClusterInOut>() { - // sort in descending order on LLR value - @Override - public int compare(TermInfoClusterInOut arg0, TermInfoClusterInOut arg1) { - return new Double(arg1.logLikelihoodRatio).compareTo(arg0.logLikelihoodRatio); - } - } - * - * */ public int getInClusterDiff() { return this.inClusterDF - this.outClusterDF; @@ -105,16 +96,16 @@ private static final Logger log = LoggerFactory.getLogger(ClusterLabels.class); private static final String LINE_SEP = System.getProperty("line.separator"); - - String seqFileDir; - String pointsDir; - String indexDir; - String contentField; - String idField; - Map<String, List<String>> clusterIdToPoints = null; - String output; public static final int DEFAULT_MIN_IDS = 50; public static final int DEFAULT_MAX_LABELS = 25; + + private String seqFileDir; + private String pointsDir; + private String indexDir; + private String contentField; + private String idField; + private Map<String, List<String>> clusterIdToPoints = null; + private String output; private int minNumIds = DEFAULT_MIN_IDS; private int maxLabels = DEFAULT_MAX_LABELS; @@ -133,9 +124,9 @@ this.clusterIdToPoints = clusterDumper.getClusterIdToPoints(); } - public void getLabels() throws CorruptIndexException, IOException { + public void getLabels() throws IOException { - Writer writer = null; + Writer writer; if (this.output != null) { writer = new FileWriter(this.output); } else { @@ -256,7 +247,7 @@ } - private OpenBitSet getClusterDocBitset(IndexReader reader, Set<String> idSet, String idField) throws CorruptIndexException, IOException { + private OpenBitSet getClusterDocBitset(IndexReader reader, Set<String> idSet, String idField) throws IOException { int numDocs = reader.numDocs(); OpenBitSet bitset = new OpenBitSet(numDocs); @@ -286,9 +277,6 @@ return LogLikelihood.logLikelihoodRatio(inDF, k12, outDF, k22); } - - - public String getIdField() { return idField; } @@ -305,10 +293,6 @@ this.output = output; } - /** - * @param args - * @throws IOException - */ public static void main(String[] args) { DefaultOptionBuilder obuilder = new DefaultOptionBuilder(); Modified: lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/LuceneIterable.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/LuceneIterable.java?rev=900199&r1=900198&r2=900199&view=diff ============================================================================== --- lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/LuceneIterable.java (original) +++ lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/LuceneIterable.java Sun Jan 17 19:41:24 2010 @@ -28,7 +28,7 @@ import java.util.Iterator; /** - * A LuceneIterable is an Iterable<Vector> that uses a Lucene index as the source for creating the {...@link org.apache.mahout.math.Vector}. + * A LuceneIterable is an Iterable<Vector> that uses a Lucene index as the source for creating the {...@link Vector}. * The Field used to create the Vector currently must have Term Vectors stored for it. */ public class LuceneIterable implements Iterable<Vector> { Modified: lucene/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/SequenceFileVectorIterableTest.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/SequenceFileVectorIterableTest.java?rev=900199&r1=900198&r2=900199&view=diff ============================================================================== --- lucene/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/SequenceFileVectorIterableTest.java (original) +++ lucene/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/SequenceFileVectorIterableTest.java Sun Jan 17 19:41:24 2010 @@ -17,19 +17,19 @@ package org.apache.mahout.utils.vectors; -import junit.framework.TestCase; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.SequenceFile; +import org.apache.mahout.common.MahoutTestCase; import org.apache.mahout.math.Vector; import org.apache.mahout.math.VectorWritable; import org.apache.mahout.utils.vectors.io.SequenceFileVectorWriter; import java.io.File; -public class SequenceFileVectorIterableTest extends TestCase { +public class SequenceFileVectorIterableTest extends MahoutTestCase { public void testIterable() throws Exception { File tmpDir = new File(System.getProperty("java.io.tmpdir")); File tmpLoc = new File(tmpDir, "sfvit"); Modified: lucene/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/arff/ARFFVectorIterableTest.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/arff/ARFFVectorIterableTest.java?rev=900199&r1=900198&r2=900199&view=diff ============================================================================== --- lucene/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/arff/ARFFVectorIterableTest.java (original) +++ lucene/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/arff/ARFFVectorIterableTest.java Sun Jan 17 19:41:24 2010 @@ -17,8 +17,7 @@ package org.apache.mahout.utils.vectors.arff; -import junit.framework.TestCase; - +import org.apache.mahout.common.MahoutTestCase; import org.apache.mahout.math.DenseVector; import org.apache.mahout.math.RandomAccessSparseVector; import org.apache.mahout.math.Vector; @@ -28,7 +27,7 @@ import java.util.Iterator; import java.util.Map; -public class ARFFVectorIterableTest extends TestCase { +public class ARFFVectorIterableTest extends MahoutTestCase { public void testValues() throws Exception { StringBuilder builder = new StringBuilder(); @@ -116,7 +115,7 @@ Map<String, Long> words = model.getWords(); assertNotNull("words null", words); assertEquals(10, words.size()); - System.out.println("Words: " + words); + //System.out.println("Words: " + words); Map<Integer, DateFormat> integerDateFormatMap = model.getDateMap(); assertNotNull("date format null", integerDateFormatMap); assertEquals(1, integerDateFormatMap.size()); @@ -144,7 +143,7 @@ Map<String, Long> words = model.getWords(); assertNotNull("words null", words); assertEquals(10, words.size()); - System.out.println("Words: " + words); + //System.out.println("Words: " + words); Map<Integer, DateFormat> integerDateFormatMap = model.getDateMap(); assertNotNull("date format null", integerDateFormatMap); assertEquals(1, integerDateFormatMap.size()); Modified: lucene/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/io/VectorWriterTest.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/io/VectorWriterTest.java?rev=900199&r1=900198&r2=900199&view=diff ============================================================================== --- lucene/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/io/VectorWriterTest.java (original) +++ lucene/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/io/VectorWriterTest.java Sun Jan 17 19:41:24 2010 @@ -23,6 +23,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.SequenceFile; import org.apache.hadoop.io.LongWritable; +import org.apache.mahout.common.MahoutTestCase; import org.apache.mahout.math.DenseVector; import org.apache.mahout.math.Vector; import org.apache.mahout.math.VectorWritable; @@ -33,7 +34,7 @@ import java.util.List; import java.util.ArrayList; -public class VectorWriterTest extends TestCase { +public class VectorWriterTest extends MahoutTestCase { public void testSFVW() throws Exception { File tmpDir = new File(System.getProperty("java.io.tmpdir")); Modified: lucene/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/lucene/LuceneIterableTest.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/lucene/LuceneIterableTest.java?rev=900199&r1=900198&r2=900199&view=diff ============================================================================== --- lucene/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/lucene/LuceneIterableTest.java (original) +++ lucene/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/lucene/LuceneIterableTest.java Sun Jan 17 19:41:24 2010 @@ -17,7 +17,6 @@ package org.apache.mahout.utils.vectors.lucene; -import junit.framework.TestCase; import org.apache.lucene.store.RAMDirectory; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexReader; @@ -25,13 +24,14 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.Document; import org.apache.lucene.util.Version; +import org.apache.mahout.common.MahoutTestCase; import org.apache.mahout.math.RandomAccessSparseVector; import org.apache.mahout.utils.vectors.Weight; import org.apache.mahout.utils.vectors.TFIDF; import org.apache.mahout.utils.vectors.TermInfo; import org.apache.mahout.math.Vector; -public class LuceneIterableTest extends TestCase { +public class LuceneIterableTest extends MahoutTestCase { private RAMDirectory directory; private static final String [] DOCS = { Modified: lucene/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/text/DictionaryVectorizerTest.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/text/DictionaryVectorizerTest.java?rev=900199&r1=900198&r2=900199&view=diff ============================================================================== --- lucene/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/text/DictionaryVectorizerTest.java (original) +++ lucene/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/text/DictionaryVectorizerTest.java Sun Jan 17 19:41:24 2010 @@ -22,8 +22,6 @@ import java.net.URISyntaxException; import java.util.Random; -import junit.framework.TestCase; - import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; @@ -32,12 +30,13 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.util.Version; +import org.apache.mahout.common.MahoutTestCase; +import org.apache.mahout.common.RandomUtils; /** * Test the dictionary Vector - * */ -public class DictionaryVectorizerTest extends TestCase { +public class DictionaryVectorizerTest extends MahoutTestCase { public static final int AVG_DOCUMENT_LENGTH = 20; @@ -54,7 +53,7 @@ public static final String ERRORSET = "`1234567890" + "-...@#$%^&*()_+[]{}'\"/<>|\\"; - private static Random random = new Random(); + private static final Random random = RandomUtils.getRandom(); private FileSystem fs; @@ -108,7 +107,9 @@ } } + @Override public void setUp() throws Exception { + super.setUp(); rmr("output"); rmr("testdata"); Configuration conf = new Configuration();
