Skip to content

Commit

Permalink
Trim down DdplyTest big so runtime is shorter than 25sec
Browse files Browse the repository at this point in the history
  • Loading branch information
cliffclick committed Apr 15, 2014
1 parent 31c9126 commit 16ff6bb
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
2 changes: 1 addition & 1 deletion prj.el
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
'(jde-run-option-debug nil)
'(jde-run-option-vm-args (quote ("-XX:+PrintGC")))
'(jde-compile-option-directory "./target/classes")
'(jde-run-option-application-args (quote ("-beta" "-mainClass" "org.junit.runner.JUnitCore" "water.exec.Expr2Test")))
'(jde-run-option-application-args (quote ("-beta" "-mainClass" "org.junit.runner.JUnitCore" "water.exec.DdplyTest")))
'(jde-debugger (quote ("JDEbug")))
'(jde-compile-option-source (quote ("1.6")))
'(jde-compile-option-classpath (quote ("./target/classes" "./lib/javassist.jar" "./lib/hadoop/cdh4/hadoop-common.jar" "./lib/hadoop/cdh4/hadoop-auth.jar" "./lib/hadoop/cdh4/slf4j-api-1.6.1.jar" "./lib/hadoop/cdh4/slf4j-nop-1.6.1.jar" "./lib/hadoop/cdh4/hadoop-hdfs.jar" "./lib/hadoop/cdh4/protobuf-java-2.4.0a.jar" "./lib/apache/commons-codec-1.4.jar" "./lib/apache/commons-configuration-1.6.jar" "./lib/apache/commons-lang-2.4.jar" "./lib/apache/commons-logging-1.1.1.jar" "./lib/apache/httpclient-4.1.1.jar" "./lib/apache/httpcore-4.1.jar" "./lib/junit/junit-4.11.jar" "./lib/apache/guava-12.0.1.jar" "./lib/gson/gson-2.2.2.jar" "./lib/poi/poi-3.8-20120326.jar" "./lib/poi/poi-ooxml-3.8-20120326.jar" "./lib/poi/poi-ooxml-schemas-3.8-20120326.jar" "./lib/poi/dom4j-1.6.1.jar" "./lib/Jama/Jama.jar" "./lib/s3/aws-java-sdk-1.3.27.jar" "./lib/log4j/log4j-1.2.15.jar" "./lib/joda/joda-time-2.3.jar")))
Expand Down
12 changes: 4 additions & 8 deletions src/test/java/water/exec/DdplyTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ public class DdplyTest extends TestUtil {
@Test public void testDdplyBig() {
Key k0 = Key.make("cars.hex");
Key k1 = Key.make("orange.hex");
Key k2 = Key.make("covtype.hex");
try {
Frame fr0 = parseFrame(k0,"smalldata/cars.csv");
checkStr("ddply(cars.hex,c(3),nrow)");
Expand All @@ -27,9 +26,10 @@ public class DdplyTest extends TestUtil {
checkStr("ddply(cars.hex,c(3),function(x) {cbind(mean(x[,2]),mean(x[,3]))})");

// A big enough file to distribute across multiple nodes.
Frame fr1 = parseFrame(k1,"smalldata/unbalanced/orange_small_train.data.zip");
checkStr("ddply(orange.hex,c(7),nrow)");
checkStr("ddply(orange.hex,c(206,207),function(x){ cbind( mean(x$Var6), sum(x$Var6+x$Var7+x$Var13) ) })");
// Trimmed down to run in reasonable time.
//Frame fr1 = parseFrame(k1,"smalldata/unbalanced/orange_small_train.data.zip");
//checkStr("ddply(orange.hex,c(7),nrow)");
//checkStr("ddply(orange.hex,c(206,207),function(x){ cbind( mean(x$Var6), sum(x$Var6+x$Var7) ) })");
// A more complex ddply that works as of 3/1/2014 but is slow for a junit
//checkStr("ddply(orange.hex,c(206,207),function(x){"+
// "max6 = max(x$Var6);"+
Expand All @@ -39,13 +39,9 @@ public class DdplyTest extends TestUtil {
// "avg = tot/len"+
// "})");

//Frame fr2 = parseFrame(k2,"../datasets/UCI/UCI-large/covtype/covtype.data");
//checkStr("ddply(covtype.hex,c(11),nrow)");

} finally {
Lockable.delete(k0); // Remove original hex frame key
Lockable.delete(k1); // Remove original hex frame key
Lockable.delete(k2); // Remove original hex frame key
}
}

Expand Down

0 comments on commit 16ff6bb

Please sign in to comment.