change NULL to NA

wangmiao1981 · wangmiao1981 · commit 95a69106ca52 · 2017-01-14T13:55:27.000-08:00
diff --git a/R/pkg/R/mllib_clustering.R b/R/pkg/R/mllib_clustering.R
@@ -414,12 +414,12 @@ setMethod("summary", signature(object = "LDAModel"),
             trainingLogLikelihood <- if (isDistributed) {
               callJMethod(jobj, "trainingLogLikelihood")
             } else {
-              NULL
+              NA
             }
             logPrior <- if (isDistributed) {
               callJMethod(jobj, "logPrior")
             } else {
-              NULL
+              NA
             }
             list(docConcentration = unlist(docConcentration),
                  topicConcentration = topicConcentration,
diff --git a/R/pkg/inst/tests/testthat/test_mllib_clustering.R b/R/pkg/inst/tests/testthat/test_mllib_clustering.R
@@ -196,8 +196,8 @@ test_that("spark.lda with text input", {
   expect_true(logPerplexity >= 0 & is.finite(logPerplexity))
   expect_equal(vocabSize, 10)
   expect_true(setequal(stats$vocabulary, c("0", "1", "2", "3", "4", "5", "6", "7", "8", "9")))
-  expect_true(is.null(trainingLogLikelihood))
-  expect_true(is.null(logPrior))
+  expect_true(is.na(trainingLogLikelihood))
+  expect_true(is.na(logPrior))
 
   # Test model save/load
   modelPath <- tempfile(pattern = "spark-lda-text", fileext = ".tmp")
@@ -212,8 +212,8 @@ test_that("spark.lda with text input", {
   expect_equal(logPerplexity, stats2$logPerplexity)
   expect_equal(vocabSize, stats2$vocabSize)
   expect_true(all.equal(vocabulary, stats2$vocabulary))
-  expect_true(is.null(stats2$trainingLogLikelihood))
-  expect_true(is.null(stats2$logPrior))
+  expect_true(is.na(stats2$trainingLogLikelihood))
+  expect_true(is.na(stats2$logPrior))
 
   unlink(modelPath)
 })
