Merge branch 'master' of github.com:0xdata/h2o

nuoncul · Feb 2, 2014 · 79f9779 · 79f9779
2 parents bbb550e + 0455f0f
commit 79f9779
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/py/testdir_multi_jvm/test_KMeans_params_rand2_fvec.py b/py/testdir_multi_jvm/test_KMeans_params_rand2_fvec.py
@@ -7,10 +7,9 @@ def define_params(SEED):
         'k': [2, 5], # seems two slow tih 12 clusters if all cols
         'initialization': ['None', 'PlusPlus', 'Furthest'],
         'ignored_cols': [None, "0", "3", "0,1,2,3,4"],
-        'max_iter': [1, 5, 10],
         'seed': [None, 12345678, SEED],
         'normalize': [None, 0, 1],
-        'max_iter': [None, 10,20,50],
+        'max_iter': [10,20,50],
         # 'destination_key:': "junk",
 
         }

diff --git a/py/testdir_multi_jvm/test_parse_libsvm.py b/py/testdir_multi_jvm/test_parse_libsvm.py
@@ -152,8 +152,8 @@ def test_parse_libsvm(self):
                     # if we're allowed to do size checks. ccompare the full json response!
                     print "Comparing original inspect to the inspect after parsing the downloaded csv"
                     # vice_versa=True
-                    self.assertGreater(len(df.difference), 29,
-                        msg="Want >=30 , not %d differences between the two rfView json responses. %s" % \
+                    self.assertLess(len(df.difference), 3,
+                        msg="Want < 3, not %d differences between the two rfView json responses. %s" % \
                             (len(df.difference), h2o.dump_json(df.difference)))
 
                     # this fails because h2o writes out zeroes as 0.0000* which gets loaded as fp even if col is all zeroes

diff --git a/py/testdir_multi_jvm/test_rf_brutal2_fvec.py b/py/testdir_multi_jvm/test_rf_brutal2_fvec.py
@@ -148,13 +148,14 @@ def test_RF(self):
         print "\nScore2\n=========="
         h2o_rf.simpleCheckRFScore(node=None, rfv=scoreResult2, noPrint=False, **kwargs)
 
-        print "\nTraining: JsonDiff sorted data results, to non-sorted results (json responses)"
-        df = h2o_util.JsonDiff(trainResult1, trainResult2, with_values=True)
-        print "df.difference:", h2o.dump_json(df.difference)
-
-        print "\nScoring: JsonDiff sorted data results, to non-sorted results (json responses)"
-        df = h2o_util.JsonDiff(scoreResult1, scoreResult2, with_values=True)
-        print "df.difference:", h2o.dump_json(df.difference)
+        if 1==0:
+            print "\nTraining: JsonDiff sorted data results, to non-sorted results (json responses)"
+            df = h2o_util.JsonDiff(trainResult1, trainResult2, with_values=True)
+            print "df.difference:", h2o.dump_json(df.difference)
+
+            print "\nScoring: JsonDiff sorted data results, to non-sorted results (json responses)"
+            df = h2o_util.JsonDiff(scoreResult1, scoreResult2, with_values=True)
+            print "df.difference:", h2o.dump_json(df.difference)
 
 if __name__ == '__main__':
     h2o.unit_main()