diff --git a/.gitignore b/.gitignore index 98999d372c6..00d0b5c98e5 100644 --- a/.gitignore +++ b/.gitignore @@ -70,6 +70,7 @@ smalldata/ # Stuff created by 'gradle dist' h2o-dist/tmp target +h2o-test-accuracy/testng.xml # stuff created by sphinx-build (python docs) ./h2o-py/docs/docs/_static diff --git a/git_private_jenkins.sh b/git_private_jenkins.sh index 3600d0dd426..8e2a98cc862 100644 --- a/git_private_jenkins.sh +++ b/git_private_jenkins.sh @@ -7,6 +7,7 @@ git status # Wipe out old private jenkins both locally and remotely git branch -D cliffc_jenkins +# Replace 'origin' as-needed with full url+pass git push origin :cliffc_jenkins # Make the current stuff as a new cliffc_jenkins branch git checkout -b cliffc_jenkins diff --git a/h2o-core/src/main/java/water/fvec/Frame.java b/h2o-core/src/main/java/water/fvec/Frame.java index bd5b87375d6..4e3369448dd 100644 --- a/h2o-core/src/main/java/water/fvec/Frame.java +++ b/h2o-core/src/main/java/water/fvec/Frame.java @@ -1043,13 +1043,11 @@ else if (orows instanceof long[]) { } - - - // Convert first 100 rows to a 2-d table + // Convert len rows starting at off to a 2-d ascii table @Override public String toString( ) { return toString(0,20); } - // Convert len rows starting at off to a 2-d ascii table - public String toString( long off, int len ) { + public String toString(long off, int len) { return toTwoDimTable(off, len).toString(); } + public TwoDimTable toTwoDimTable(long off, int len ) { if( off > numRows() ) off = numRows(); if( off+len > numRows() ) len = (int)(numRows()-off); @@ -1109,7 +1107,7 @@ public String toString( long off, int len ) { throw H2O.fail(); } } - return new TwoDimTable("Frame "+_key,numRows()+" rows and "+numCols()+" cols",rowHeaders,/* clone the names, the TwoDimTable will replace nulls with ""*/_names.clone(),coltypes,null, "", strCells, dblCells).toString(); + return new TwoDimTable("Frame "+_key,numRows()+" rows and "+numCols()+" cols",rowHeaders,/* clone the names, the TwoDimTable will replace nulls with ""*/_names.clone(),coltypes,null, "", strCells, dblCells); } diff --git a/h2o-test-accuracy/testng.xml b/h2o-test-accuracy/testng.xml deleted file mode 100644 index 6b637479be5..00000000000 --- a/h2o-test-accuracy/testng.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file