remove melt

R/el_pairwise.R

@@ -122,7 +122,7 @@ el_pairwise <- function(formula, data, control = NULL, k = 1L, alpha = 0.05,
   # General block design
   gbd <-
     list("model_matrix" = x, "incidence_matrix" = c, "trt" = levels(mf[[2L]]))
-  class(gbd) <- c("gbd", "melt")
+  class(gbd) <- c("gbd", "elgbd")
   # Check whether all pairwise comparisons or comparisons to control
   match.arg(control, gbd$trt)
   if (is.null(control)) {

R/el_test.R

@@ -111,7 +111,7 @@ el_test <- function(formula, data, lhs, rhs = NULL, maxit = 1e+04,
   # General block design
   gbd <-
     list("model_matrix" = x, "incidence_matrix" = c, "trt" = levels(mf[[2L]]))
-  class(gbd) <- c("gbd", "melt")
+  class(gbd) <- c("gbd", "elgbd")
 
   # Test for lhs and rhs
   if (is.null(rhs)) {

R/elgbd-S3.R

@@ -1,19 +1,19 @@
 #' @export
 print.el_aov <- function(x, ...) {
-  stopifnot(inherits(x, "melt"))
+  stopifnot(inherits(x, "elgbd"))
   cat("Call:\n")
   dput(x$call, control = NULL)
-  cat("\nminimizer:\n")
-  cat(format(round(x$optim$par, 4), scientific = FALSE))
+  cat("\nMinimizer:\n")
+  cat(format(round(x$optim$par, 4L), scientific = FALSE))
   cat("\n\n")
-  cat("statistic:\n")
-  cat(format(round(x$optim$n2logLR, 4), scientific = FALSE))
+  cat("Statistic:\n")
+  cat(format(round(x$optim$n2logLR, 4L), scientific = FALSE))
   cat("\n\n")
 }
 
 #' @export
 print.pairwise <- function(x, ...) {
-  stopifnot(inherits(x, "melt"))
+  stopifnot(inherits(x, "elgbd"))
   cat("\n\tEmpirical Likelihood Multiple Tests\n\n")
   if (is.null(x$control)) {
     cat("All pairwise comparisons\n\n")

cran-comments.md

@@ -0,0 +1,5 @@
+## R CMD check results
+
+0 errors | 0 warnings | 1 note
+
+* This is a new release.

src/gbd.cpp

@@ -35,6 +35,6 @@ Rcpp::List ELtest(const Eigen::MatrixXd& x,
     Rcpp::Named("n2logLR") = 2 * el.nlogLR,
     Rcpp::Named("iterations") = el.iterations,
     Rcpp::Named("convergence") = el.convergence);
-  result.attr("class") = "melt";
+  result.attr("class") = "elgbd";
   return result;
 }

src/pairwise.cpp

@@ -115,6 +115,6 @@ Rcpp::List pairwise(const Eigen::MatrixXd& x,
   result["level"] = level;
   result["method"] = method;
   result["B"] = bootstrap_statistics_pairwise.size();
-  result.attr("class") = Rcpp::CharacterVector({"pairwise", "melt"});
+  result.attr("class") = Rcpp::CharacterVector({"pairwise", "elgbd"});
   return result;
 }