You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by ro...@apache.org on 2010/05/26 07:35:22 UTC
svn commit: r948324 - in /mahout/trunk: ./
examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/
examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/hadoop/
Author: robinanil
Date: Wed May 26 05:35:22 2010
New Revision: 948324
URL: http://svn.apache.org/viewvc?rev=948324&view=rev
Log:
Fixed site:site thanks to Drew
Fixed tests to run on Hudson
Removed old clover artifacts
Upgraded Findbugs to 2.2 version
Modified:
mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/DataLineTest.java
mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/FileInfosDatasetTest.java
mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMahoutEvaluatorTest.java
mahout/trunk/pom.xml
Modified: mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/DataLineTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/DataLineTest.java?rev=948324&r1=948323&r2=948324&view=diff
==============================================================================
--- mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/DataLineTest.java (original)
+++ mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/DataLineTest.java Wed May 26 05:35:22 2010
@@ -30,7 +30,7 @@ public class DataLineTest extends Mahout
"852781,M,18.61,20.25,122.1,1094,0.0944,0.1066,0.149,0.07731,0.1697,0.05699,0.8529,1.849,5.632,93.54,0.01075,0.02722,0.05081,0.01911,0.02293,0.004217,21.31,27.26,139.9,1403,0.1338,0.2117,0.3446,0.149,0.2341,0.07421" };
public void testSet() throws Exception {
- Path inpath = new Path("target/test-classes/wdbc");
+ Path inpath = new Path(this.getClass().getResource("/wdbc/").getPath());
FileSystem fs = FileSystem.get(inpath.toUri(), new Configuration());
DataSet dataset = FileInfoParser.parseFile(fs, inpath);
DataSet.initialize(dataset);
Modified: mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/FileInfosDatasetTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/FileInfosDatasetTest.java?rev=948324&r1=948323&r2=948324&view=diff
==============================================================================
--- mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/FileInfosDatasetTest.java (original)
+++ mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/FileInfosDatasetTest.java Wed May 26 05:35:22 2010
@@ -30,14 +30,14 @@ import java.io.File;
public class FileInfosDatasetTest extends MahoutTestCase {
public void testRanges() throws IOException {
- Path inpath = new Path("target/test-classes/wdbc");
+ Path inpath = new Path(this.getClass().getResource("/wdbc/").getPath());
FileSystem fs = FileSystem.get(inpath.toUri(), new Configuration());
DataSet dataset = FileInfoParser.parseFile(fs, inpath);
DataSet.initialize(dataset);
DataLine dl = new DataLine();
- for (String line : new FileLineIterable(new File("target/test-classes/wdbc/wdbc.data"))) {
+ for (String line : new FileLineIterable(new File(this.getClass().getResource("/wdbc/wdbc.data").getPath()))) {
dl.set(line);
for (int index = 0; index < dataset.getNbAttributes(); index++) {
if (dataset.isNumerical(index)) {
Modified: mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMahoutEvaluatorTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMahoutEvaluatorTest.java?rev=948324&r1=948323&r2=948324&view=diff
==============================================================================
--- mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMahoutEvaluatorTest.java (original)
+++ mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMahoutEvaluatorTest.java Wed May 26 05:35:22 2010
@@ -46,7 +46,7 @@ public class CDMahoutEvaluatorTest exten
// dataset
// This is sensitive to the working directory where the test is run:
- Path input = new Path("target/test-classes/wdbc");
+ Path input = new Path(this.getClass().getResource("/wdbc/").getPath());
CDMahoutEvaluator.initializeDataSet(input);
// evaluate the rules
Modified: mahout/trunk/pom.xml
URL: http://svn.apache.org/viewvc/mahout/trunk/pom.xml?rev=948324&r1=948323&r2=948324&view=diff
==============================================================================
--- mahout/trunk/pom.xml (original)
+++ mahout/trunk/pom.xml Wed May 26 05:35:22 2010
@@ -299,23 +299,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clover-plugin</artifactId>
- <configuration>
- <licenseLocation>${maven.clover.license}</licenseLocation>
- <jdk>1.5</jdk>
- </configuration>
- <executions>
- <execution>
- <phase>pre-site</phase>
- <goals>
- <goal>instrument</goal>
- <goal>aggregate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<configuration>
@@ -339,13 +322,13 @@
<configuration>
<encoding>UTF-8</encoding>
</configuration>
+ <!--
<executions>
<execution>
<id>validate</id>
<phase>validate</phase>
<configuration>
- <!-- classpath -->
- <configLocation>${project.build.directory}/../maven/src/main/resources/mahout-checkstyle.xml</configLocation>
+ <configLocation>../maven/src/main/resources/mahout-checkstyle.xml</configLocation>
<consoleOutput>true</consoleOutput>
<failsOnError>false</failsOnError>
<linkXRef>false</linkXRef>
@@ -356,6 +339,7 @@
</goals>
</execution>
</executions>
+ -->
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -371,7 +355,7 @@
<configuration>
<rulesets>
<!-- classpath -->
- <ruleset>maven/src/main/resources/mahout-pmd-ruleset.xml</ruleset>
+ <ruleset>../maven/src/main/resources/mahout-pmd-ruleset.xml</ruleset>
</rulesets>
<sourceEncoding>UTF-8</sourceEncoding>
<targetJdk>1.5</targetJdk>
@@ -379,6 +363,7 @@
<includeTests>true</includeTests>
<verbose>true</verbose>
</configuration>
+ <!--
<executions>
<execution>
<id>validate</id>
@@ -388,6 +373,7 @@
</goals>
</execution>
</executions>
+ -->
</plugin>
</plugins>
</pluginManagement>
@@ -592,6 +578,12 @@
</distributionManagement>
<reporting>
<plugins>
+ <!-- surefire runs unit tests -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ </plugin>
+ <!-- checkstyle -->
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
@@ -599,16 +591,6 @@
<consoleOutput>true</consoleOutput>
</configuration>
</plugin>
- <!-- generate java doc -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- <!-- surefire runs unit tests -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
<!-- test coverage plugin -->
<plugin>
<groupId>com.atlassian.maven.plugins</groupId>
@@ -623,20 +605,18 @@
<jdk>1.5</jdk>
</configuration>
</plugin>
+ <!-- generate java doc -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clover-plugin</artifactId>
- <configuration>
- <licenseLocation>${maven.clover.license}</licenseLocation>
- <jdk>1.5</jdk>
- </configuration>
+ <artifactId>maven-javadoc-plugin</artifactId>
</plugin>
<!-- code duplication - copy and paste detection -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<configuration>
<rulesets>
- <ruleset>/mahout-pmd-ruleset.xml</ruleset>
+ <ruleset>../maven/src/main/resources/mahout-pmd-ruleset.xml</ruleset>
</rulesets>
<sourceEncoding>UTF-8</sourceEncoding>
<targetJdk>1.5</targetJdk>
@@ -660,7 +640,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>2.0.1</version>
+ <version>2.2</version>
<configuration>
<xmlOutput>true</xmlOutput>
<xmlOutputDirectory>target/findbugs</xmlOutputDirectory>