diff --git a/h2o-r/tests/testdir_algos/generic/runit_generic_model_mojo_drf.R b/h2o-r/tests/testdir_algos/generic/runit_generic_model_mojo_drf.R index 39c74e602288..6472fac40c5b 100644 --- a/h2o-r/tests/testdir_algos/generic/runit_generic_model_mojo_drf.R +++ b/h2o-r/tests/testdir_algos/generic/runit_generic_model_mojo_drf.R @@ -21,8 +21,8 @@ test.model.generic.drf <- function() { original_output <- capture.output(print(original_model)) generic_output <- capture.output(print(generic_model)) compare_output(original_output, generic_output, - c("Extract .+ frame","H2OBinomialModel: drf", "Model ID", "H2OBinomialMetrics: drf"), - c("H2OBinomialModel: generic", "Model ID", "H2OBinomialMetrics: generic")) + c("Extract .+ frame","H2OBinomialModel: drf", "Model ID", "H2OBinomialMetrics: drf", "AIC"), + c("H2OBinomialModel: generic", "Model ID", "H2OBinomialMetrics: generic", "AIC", "loglikelihood")) generic_model_preds <- h2o.predict(generic_model, data) expect_equal(length(generic_model_preds), 3) @@ -45,8 +45,8 @@ test.model.generic.drf <- function() { original_output <- capture.output(print(original_model)) generic_output <- capture.output(print(generic_model)) compare_output(original_output, generic_output, - c("Extract .+ frame", "H2OMultinomialModel: drf", "Model ID", "H2OMultinomialMetrics: drf"), - c("H2OMultinomialModel: generic", "Model ID", "H2OMultinomialMetrics: generic")) + c("Extract .+ frame", "H2OMultinomialModel: drf", "Model ID", "H2OMultinomialMetrics: drf", "AIC"), + c("H2OMultinomialModel: generic", "Model ID", "H2OMultinomialMetrics: generic", "AIC")) # Regression cols <- c("Origin", "Dest") diff --git a/h2o-r/tests/testdir_algos/generic/runit_generic_model_mojo_gbm.R b/h2o-r/tests/testdir_algos/generic/runit_generic_model_mojo_gbm.R index a625fb15feb7..15155063634c 100644 --- a/h2o-r/tests/testdir_algos/generic/runit_generic_model_mojo_gbm.R +++ b/h2o-r/tests/testdir_algos/generic/runit_generic_model_mojo_gbm.R @@ -16,8 +16,8 @@ test.model.generic.gbm <- function() { original_output <- capture.output(print(original_model)) generic_output <- capture.output(print(generic_model)) compare_output(original_output, generic_output, - c("Extract .+ frame","H2OBinomialModel: gbm", "Model ID", "H2OBinomialMetrics: gbm"), - c("H2OBinomialModel: generic", "Model ID", "H2OBinomialMetrics: generic")) + c("Extract .+ frame","H2OBinomialModel: gbm", "Model ID", "H2OBinomialMetrics: gbm", "AIC"), + c("H2OBinomialModel: generic", "Model ID", "H2OBinomialMetrics: generic", "AIC")) generic_model_preds <- h2o.predict(generic_model, data) expect_equal(length(generic_model_preds), 3) @@ -54,8 +54,8 @@ test.model.generic.gbm <- function() { original_output <- capture.output(print(original_model)) generic_output <- capture.output(print(generic_model)) compare_output(original_output, generic_output, - c("Extract .+ frame", "H2OMultinomialModel: gbm", "Model ID", "H2OMultinomialMetrics: gbm"), - c("H2OMultinomialModel: generic", "Model ID", "H2OMultinomialMetrics: generic")) + c("Extract .+ frame", "H2OMultinomialModel: gbm", "Model ID", "H2OMultinomialMetrics: gbm", "AIC"), + c("H2OMultinomialModel: generic", "Model ID", "H2OMultinomialMetrics: generic", "AIC")) } diff --git a/h2o-r/tests/testdir_algos/generic/runit_generic_model_mojo_glm.R b/h2o-r/tests/testdir_algos/generic/runit_generic_model_mojo_glm.R index 5f3c7f317474..b8441b5971f1 100644 --- a/h2o-r/tests/testdir_algos/generic/runit_generic_model_mojo_glm.R +++ b/h2o-r/tests/testdir_algos/generic/runit_generic_model_mojo_glm.R @@ -46,9 +46,8 @@ test.model.generic.glm <- function() { original_output <- capture.output(print(original_model)) generic_output <- capture.output(print(generic_model)) compare_output(original_output, generic_output, - c("Extract .+ frame","H2OBinomialModel: glm", "Model ID", "H2OBinomialMetrics: glm"), - c("H2OBinomialModel: generic", "Model ID", "H2OBinomialMetrics: generic")) - + c("Extract .+ frame","H2OBinomialModel: glm", "Model ID", "H2OBinomialMetrics: glm", "AIC"), + c("H2OBinomialModel: generic", "Model ID", "H2OBinomialMetrics: generic", "AIC")) # Multinomial cols <- c("Origin", "Distance") @@ -64,9 +63,8 @@ test.model.generic.glm <- function() { original_output <- capture.output(print(original_model)) generic_output <- capture.output(print(generic_model)) compare_output(original_output, generic_output, - c("Extract .+ frame","H2OMultinomialModel: glm", "Model ID", "H2OMultinomialMetrics: glm"), - c("H2OMultinomialModel: generic", "Model ID", "H2OMultinomialMetrics: generic")) - + c("Extract .+ frame","H2OMultinomialModel: glm", "Model ID", "H2OMultinomialMetrics: glm", "AIC"), + c("H2OMultinomialModel: generic", "Model ID", "H2OMultinomialMetrics: generic", "AIC")) # Ordinal cols <- c("Origin", "Distance") diff --git a/h2o-r/tests/testdir_algos/generic/runit_generic_model_mojo_xgboost.R b/h2o-r/tests/testdir_algos/generic/runit_generic_model_mojo_xgboost.R index 761540cd8d92..62571ba7a0c5 100644 --- a/h2o-r/tests/testdir_algos/generic/runit_generic_model_mojo_xgboost.R +++ b/h2o-r/tests/testdir_algos/generic/runit_generic_model_mojo_xgboost.R @@ -16,8 +16,8 @@ test.model.generic.gbm <- function() { original_output <- capture.output(print(original_model)) generic_output <- capture.output(print(generic_model)) compare_output(original_output, generic_output, - c("Extract .+ frame","H2OBinomialModel: xgboost", "Model ID", "H2OBinomialMetrics: xgboost"), - c("H2OBinomialModel: generic", "Model ID", "H2OBinomialMetrics: generic")) + c("Extract .+ frame","H2OBinomialModel: xgboost", "Model ID", "H2OBinomialMetrics: xgboost", "AIC"), + c("H2OBinomialModel: generic", "Model ID", "H2OBinomialMetrics: generic", "AIC")) generic_model_preds <- h2o.predict(generic_model, data) expect_equal(length(generic_model_preds), 3) @@ -54,8 +54,8 @@ test.model.generic.gbm <- function() { original_output <- capture.output(print(original_model)) generic_output <- capture.output(print(generic_model)) compare_output(original_output, generic_output, - c("Extract .+ frame", "H2OMultinomialModel: xgboost", "Model ID", "H2OMultinomialMetrics: xgboost"), - c("H2OMultinomialModel: generic", "Model ID", "H2OMultinomialMetrics: generic")) + c("Extract .+ frame", "H2OMultinomialModel: xgboost", "Model ID", "H2OMultinomialMetrics: xgboost", "AIC"), + c("H2OMultinomialModel: generic", "Model ID", "H2OMultinomialMetrics: generic", "AIC")) }