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/03/13 02:08:10 UTC
svn commit: r753080 - in /lucene/mahout/trunk: core/
core/src/test/java/org/apache/mahout/clustering/meanshift/ examples/
examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/
examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/hadoop/ examp...
Author: srowen
Date: Fri Mar 13 01:08:10 2009
New Revision: 753080
URL: http://svn.apache.org/viewvc?rev=753080&view=rev
Log:
Update to EasyMock 2.4 / SLF4J 1.5.6
Modified:
lucene/mahout/trunk/core/pom.xml
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java
lucene/mahout/trunk/examples/pom.xml
lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/CDCrossoverTest.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/hadoop/CDMapperTest.java
lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/utils/MockDataSet.java
Modified: lucene/mahout/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/pom.xml?rev=753080&r1=753079&r2=753080&view=diff
==============================================================================
--- lucene/mahout/trunk/core/pom.xml (original)
+++ lucene/mahout/trunk/core/pom.xml Fri Mar 13 01:08:10 2009
@@ -486,13 +486,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.5.5</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jcl</artifactId>
- <version>1.5.5</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java?rev=753080&r1=753079&r2=753080&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java Fri Mar 13 01:08:10 2009
@@ -226,7 +226,7 @@
}
// build a map of the combiner output
Map<String, MeanShiftCanopy> canopyMap = new HashMap<String, MeanShiftCanopy>();
- for (WritableComparable d : data) {
+ for (WritableComparable<?> d : data) {
MeanShiftCanopy dc = MeanShiftCanopy.decodeCanopy(d.toString());
canopyMap.put(dc.getIdentifier(), dc);
}
Modified: lucene/mahout/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/pom.xml?rev=753080&r1=753079&r2=753080&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/pom.xml (original)
+++ lucene/mahout/trunk/examples/pom.xml Fri Mar 13 01:08:10 2009
@@ -174,14 +174,14 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>2.0</version>
+ <version>2.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
- <version>2.2</version>
+ <version>2.4</version>
<scope>test</scope>
</dependency>
@@ -204,13 +204,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.5.5</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jcl</artifactId>
- <version>1.5.5</version>
+ <version>1.5.6</version>
</dependency>
</dependencies>
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=753080&r1=753079&r2=753080&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 Fri Mar 13 01:08:10 2009
@@ -18,8 +18,8 @@
package org.apache.mahout.ga.watchmaker.cd;
import junit.framework.TestCase;
-import static org.easymock.classextension.EasyMock.*;
import org.uncommons.maths.random.MersenneTwisterRNG;
+import org.easymock.classextension.EasyMock;
import java.util.List;
import java.util.Random;
@@ -37,7 +37,7 @@
Random rng = new MersenneTwisterRNG();
// Initialize dataset
- DataSet dataset = createMock(DataSet.class);
+ DataSet dataset = EasyMock.createMock(DataSet.class);
DataSet.initialize(dataset);
for (int nloop = 0; nloop < n; nloop++) {
@@ -47,9 +47,9 @@
int crosspnts = rng.nextInt(maxcrosspnts) + 1;
// prepare dataset mock
- reset(dataset);
- expect(dataset.getNbAttributes()).andReturn(nbattributes).times(2);
- replay(dataset);
+ EasyMock.reset(dataset);
+ EasyMock.expect(dataset.getNbAttributes()).andReturn(nbattributes).times(2);
+ EasyMock.replay(dataset);
CDCrossover crossover = new CDCrossover(crosspnts);
@@ -69,7 +69,7 @@
offspring1, offspring2, index));
}
- verify(dataset);
+ EasyMock.verify(dataset);
}
}
@@ -84,7 +84,7 @@
Random rng = new MersenneTwisterRNG();
// Initialize dataset
- DataSet dataset = createMock(DataSet.class);
+ DataSet dataset = EasyMock.createMock(DataSet.class);
DataSet.initialize(dataset);
for (int nloop = 0; nloop < n; nloop++) {
@@ -95,9 +95,9 @@
crosspnts = nbattributes - 1;
// prepare dataset mock
- reset(dataset);
- expect(dataset.getNbAttributes()).andReturn(nbattributes).times(2);
- replay(dataset);
+ EasyMock.reset(dataset);
+ EasyMock.expect(dataset.getNbAttributes()).andReturn(nbattributes).times(2);
+ EasyMock.replay(dataset);
CDCrossover crossover = new CDCrossover(crosspnts);
@@ -122,7 +122,7 @@
nbareas <= (crosspnts + 1));
}
- verify(dataset);
+ EasyMock.verify(dataset);
}
}
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=753080&r1=753079&r2=753080&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 Fri Mar 13 01:08:10 2009
@@ -18,9 +18,10 @@
package org.apache.mahout.ga.watchmaker.cd;
import junit.framework.TestCase;
+import junit.framework.Assert;
import org.apache.mahout.ga.watchmaker.cd.utils.MockDataSet;
import org.uncommons.maths.random.MersenneTwisterRNG;
-import static org.easymock.classextension.EasyMock.*;
+import org.easymock.classextension.EasyMock;
import java.util.Random;
@@ -61,8 +62,8 @@
}
private void assertInRange(double value, double min, double max) {
- TestCase.assertTrue("value < min", value >= min);
- TestCase.assertTrue("value > max", value <= max);
+ Assert.assertTrue("value < min", value >= min);
+ Assert.assertTrue("value > max", value <= max);
}
@Override
@@ -79,9 +80,9 @@
int n = 100; // repeat the test n times
// the dataline has all its attributes set to 0d
- DataLine dl = createMock(DataLine.class);
- expect(dl.getAttribut(anyInt())).andReturn(0d).atLeastOnce();
- replay(dl);
+ DataLine dl = EasyMock.createMock(DataLine.class);
+ EasyMock.expect(dl.getAttribut(EasyMock.anyInt())).andReturn(0d).atLeastOnce();
+ EasyMock.replay(dl);
// all the conditions are : attribut < 0
for (int nloop = 0; nloop < n; nloop++) {
@@ -107,7 +108,7 @@
mock.verify();
}
- verify(dl);
+ EasyMock.verify(dl);
}
/**
@@ -118,9 +119,9 @@
int n = 100; // repeat the test n times
// the dataline has all its attributes set to 1d
- DataLine dl = createMock(DataLine.class);
- expect(dl.getAttribut(anyInt())).andReturn(1d).atLeastOnce();
- replay(dl);
+ DataLine dl = EasyMock.createMock(DataLine.class);
+ EasyMock.expect(dl.getAttribut(EasyMock.anyInt())).andReturn(1d).atLeastOnce();
+ EasyMock.replay(dl);
for (int nloop = 0; nloop < n; nloop++) {
mock.numericalDataset();
@@ -143,7 +144,7 @@
mock.verify();
}
- verify(dl);
+ EasyMock.verify(dl);
}
/**
@@ -154,9 +155,9 @@
int n = 100; // repeat the test n times
// the dataline has all its attributes set to 1d
- DataLine dl = createMock(DataLine.class);
- expect(dl.getAttribut(anyInt())).andReturn(1d).atLeastOnce();
- replay(dl);
+ DataLine dl = EasyMock.createMock(DataLine.class);
+ EasyMock.expect(dl.getAttribut(EasyMock.anyInt())).andReturn(1d).atLeastOnce();
+ EasyMock.replay(dl);
Random rng = new MersenneTwisterRNG();
for (int nloop = 0; nloop < n; nloop++) {
@@ -184,7 +185,7 @@
mock.verify();
}
- verify(dl);
+ EasyMock.verify(dl);
}
}
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=753080&r1=753079&r2=753080&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 Fri Mar 13 01:08:10 2009
@@ -23,10 +23,6 @@
import org.apache.mahout.ga.watchmaker.cd.DataLine;
import org.apache.mahout.ga.watchmaker.cd.Rule;
import org.apache.mahout.utils.DummyOutputCollector;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
import org.easymock.classextension.EasyMock;
import java.util.Arrays;
@@ -62,11 +58,11 @@
EasyMock.expect(dl.getLabel()).andReturn(0);
EasyMock.expect(dl.getLabel()).andReturn(1);
- rule = createMock(Rule.class);
- expect(rule.classify(dl)).andReturn(1);
- expect(rule.classify(dl)).andReturn(1);
- expect(rule.classify(dl)).andReturn(0);
- expect(rule.classify(dl)).andReturn(0);
+ rule = EasyMock.createMock(Rule.class);
+ EasyMock.expect(rule.classify(dl)).andReturn(1);
+ EasyMock.expect(rule.classify(dl)).andReturn(1);
+ EasyMock.expect(rule.classify(dl)).andReturn(0);
+ EasyMock.expect(rule.classify(dl)).andReturn(0);
super.setUp();
}
@@ -80,7 +76,7 @@
}
public void testMap() throws Exception {
- replay(rule);
+ EasyMock.replay(rule);
EasyMock.replay(dl);
// create and configure the mapper
@@ -105,7 +101,7 @@
assertEquals("Evaluation of the rule " + key, expected[index], eval);
}
- verify(rule);
+ EasyMock.verify(rule);
EasyMock.verify(dl);
}
Modified: lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/utils/MockDataSet.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/utils/MockDataSet.java?rev=753080&r1=753079&r2=753080&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/utils/MockDataSet.java (original)
+++ lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/utils/MockDataSet.java Fri Mar 13 01:08:10 2009
@@ -19,10 +19,6 @@
import org.apache.mahout.ga.watchmaker.cd.DataSet;
import org.easymock.classextension.EasyMock;
-import static org.easymock.classextension.EasyMock.createMock;
-import static org.easymock.classextension.EasyMock.expect;
-import static org.easymock.classextension.EasyMock.replay;
-import static org.easymock.classextension.EasyMock.reset;
import java.util.Random;
@@ -49,7 +45,7 @@
this.rng = rng;
this.maxnba = maxnba;
- dataset = createMock(DataSet.class);
+ dataset = EasyMock.createMock(DataSet.class);
DataSet.initialize(dataset);
}
@@ -62,14 +58,14 @@
* otherwise : both numerical an categorical attributes are probable
*/
public void randomDataset(double numRate) {
- reset(dataset);
+ EasyMock.reset(dataset);
int nba = rng.nextInt(maxnba) + 1;
- expect(dataset.getNbAttributes()).andReturn(nba).anyTimes();
+ EasyMock.expect(dataset.getNbAttributes()).andReturn(nba).anyTimes();
// label at random position
int labelpos = rng.nextInt(nba);
- expect(dataset.getLabelIndex()).andReturn(labelpos).anyTimes();
+ EasyMock.expect(dataset.getLabelIndex()).andReturn(labelpos).anyTimes();
for (int index = 0; index < nba; index++) {
if (index == labelpos) {
@@ -81,7 +77,7 @@
prepareCategoricalAttribute(index, rng.nextInt(100) + 1);
}
- replay(dataset);
+ EasyMock.replay(dataset);
}
/**
@@ -122,14 +118,14 @@
double max = rng.nextDouble() * ((long) Integer.MAX_VALUE - Integer.MIN_VALUE) + Integer.MIN_VALUE;
double min = rng.nextDouble() * (max - Integer.MIN_VALUE) + Integer.MIN_VALUE;
- expect(dataset.isNumerical(index)).andReturn(true).anyTimes();
- expect(dataset.getMax(index)).andReturn(max).anyTimes();
- expect(dataset.getMin(index)).andReturn(min).anyTimes();
+ EasyMock.expect(dataset.isNumerical(index)).andReturn(true).anyTimes();
+ EasyMock.expect(dataset.getMax(index)).andReturn(max).anyTimes();
+ EasyMock.expect(dataset.getMin(index)).andReturn(min).anyTimes();
}
private void prepareCategoricalAttribute(int index, int nbcats) {
- expect(dataset.isNumerical(index)).andReturn(false).anyTimes();
- expect(dataset.getNbValues(index)).andReturn(nbcats).anyTimes();
+ EasyMock.expect(dataset.isNumerical(index)).andReturn(false).anyTimes();
+ EasyMock.expect(dataset.getNbValues(index)).andReturn(nbcats).anyTimes();
}
}