fixed CRAN check issues in code contributed by Manuel Arnold

brandmaier · Apr 3, 2023 · 77e70e3 · 77e70e3
1 parent 8f659ac
commit 77e70e3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/R/minus2logLik_from_fitted_models.R b/R/minus2logLik_from_fitted_models.R
@@ -1,9 +1,9 @@
 minus2logLik_from_fitted_models <- function(x) {
-  if (class(x) %in% c("OpenMx", "MxRAMModel")) {
+  if (is(x,"OpenMx") || is(x,"MxRAMModel")) {
     x$output$Minus2LogLikelihood
-  } else if (class(x) == "ctsemFit") {
+  } else if (is(x, "ctsemFit")) {
     x$mxobj$output$Minus2LogLikelihood
-  } else if (class(x) ==  "lavaan") {
+  } else if (is(x,"lavaan")) {
     -2*lavaan::logLik(x)
   } else {
     stop("minus2logLik_from_fitted_models() does not recognize the model")

diff --git a/R/plotParDiffForest.R b/R/plotParDiffForest.R
@@ -48,6 +48,11 @@ plotParDiffForest <- function(forest, plot = "boxplot", measure = "wald",
   df$Predictor <- factor(df$Predictor, ordered = TRUE,
                          levels = forest$covariates)
 
+  # stupid fix to stop CRAN from complaining (one possible way out could be aes_string())
+  Parameter <- NULL
+  Node <- NULL
+  Value <- NULL
+
   # ballon
   if (plot == "boxplot") {
 

diff --git a/R/plotParDiffTree.R b/R/plotParDiffTree.R
@@ -39,6 +39,11 @@ plotParDiffTree <- function(tree, plot = "ballon", measure = "wald",
 
   df$Parameter <- factor(df$Parameter, ordered = TRUE, levels = tree$param_names)
 
+  # stupid fix to stop CRAN from complaining (one possible way out could be aes_string())
+  Parameter <- NULL
+  Node <- NULL
+  Value <- NULL
+
   # ballon
   if (plot == "ballon") {
     p <- ggplot2::ggplot(df, ggplot2::aes(x = Node, y = Parameter)) +