add AddHealth example to HE_manova vignette

friendly · Apr 27, 2024 · c16e280 · c16e280
1 parent 2257c42
commit c16e280
Show file tree

Hide file tree

Showing 87 changed files with 388 additions and 144 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,7 +1,9 @@
 ## Version 1.6.3 (2024-03-05)
 
-* Correct documentation error in `cqplot`
+* Correct documentation error in `cqplot()`
 * `cqplot()` now returns DSQ values for identified points
+* Fixed small buglet re: labeling of hypothesis ellipses in `heplot()`
+* Added a new example (`AddHealth` data) to the `HE_manova` vignette
 
 ## Version 1.6.2 (2024-02-14)
 

diff --git a/R/cqplot.R b/R/cqplot.R
@@ -243,7 +243,7 @@ cqplot.default <-
   	noteworthy <- car::showLabels(chi2q, y, labels=labs, id.method=id.method, 
   		id.n=id.n,  id.cex = id.cex, id.col = id.col)
 
-  	res <- data.frame(dsq[noteworthy])
+  	res <- data.frame(DSQ = dsq.y[noteworthy], quantile = chi2q[noteworthy])
   	rownames(res) <- labs[noteworthy]
   	return(invisible(res))
   }

diff --git a/R/datasets.R b/R/datasets.R
@@ -1,6 +1,6 @@
 
 
-#' Adolescent Health Data
+#' Adolescent Mental Health Data
 #' 
 #' This data was taken from the National Longitudinal Study of Adolescent
 #' Health.  It is a cross-sectional sample of participants from grades 7--12,
@@ -34,13 +34,44 @@
 #' @examples
 #' 
 #' data(AddHealth)
+#' 
+#' if(require(dplyr) & require(ggplot2)) {
+#' # find means & std.errors by grade
+#' means <- AddHealth |>
+#' group_by(grade) |>
+#'   summarise(
+#'     n = n(),
+#'     dep_se = sd(depression, na.rm = TRUE) / sqrt(n),
+#'     anx_se = sd(anxiety, na.rm = TRUE) / sqrt(n),
+#'     depression = mean(depression),
+#'     anxiety = mean(anxiety) ) |> 
+#'   relocate(depression, anxiety, .after = grade) |>
+#'   print()
+#'   
+#' # plot means with std.error bars
+#' ggplot(data = means, aes(x = anxiety, y = depression, 
+#' color = grade)) +
+#'   geom_point(size = 3) +
+#'   geom_errorbarh(aes(xmin = anxiety - anx_se, 
+#'                      xmax = anxiety + anx_se)) +
+#'   geom_errorbar(aes(ymin = depression - dep_se, 
+#'                     ymax = depression + dep_se)) +
+#'   geom_line(aes(group = 1), linewidth = 1.5) +
+#'   geom_label(aes(label = grade), 
+#'              nudge_x = -0.015, nudge_y = 0.02) +
+#'   scale_color_discrete(guide = "none") +
+#'   theme_bw(base_size = 15)
+#' }
+#' 
 #' # fit mlm
-#' AH.mod <- lm(cbind(depression, anxiety) ~ grade, data=AddHealth)
+#' AH.mod <- lm(cbind(anxiety, depression) ~ grade, data=AddHealth)
 #' 
 #' car::Anova(AH.mod)
 #' summary(car::Anova(AH.mod))
 #' 
-#' heplot(AH.mod, hypotheses="grade.L", fill=c(TRUE, FALSE))
+#' heplot(AH.mod, hypotheses="grade.L", 
+#'        fill=c(TRUE, FALSE),
+#'        level = 0.4)
 #' 
 NULL
 

diff --git a/R/heplot.R b/R/heplot.R
@@ -586,7 +586,7 @@ heplot.mlm <-
 			ell <- n.terms + hyp
 #			lines(H.ellipse[[ell]], col=col[ell], lty=lty[ell], lwd=lwd[ell])
 			polygon(H.ellipse[[ell]], col=fill.col[ell], border=col[ell],  lty=lty[ell], lwd=lwd[ell])
-			label.ellipse(H.ellipse[[ell]], hyp.labels[hyp], col=col[ell], label.pos=label.pos[ell], ...)
+			label.ellipse(H.ellipse[[ell]], hyp.labels[hyp], col=col[ell], label.pos=label.pos[hyp], ...)
 		}
 	if (!add && (!is.logical(factor.means) || factor.means)){
 		for (fac in factors){

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/articles/HE_manova.html b/docs/articles/HE_manova.html
diff --git a/docs/articles/HE_mmra.html b/docs/articles/HE_mmra.html
diff --git a/docs/articles/index.html b/docs/articles/index.html
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/news/index.html b/docs/news/index.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -4,7 +4,7 @@ pkgdown_sha: ~
 articles:
   HE_manova: HE_manova.html
   HE_mmra: HE_mmra.html
-last_built: 2024-02-15T15:34Z
+last_built: 2024-03-05T16:38Z
 urls:
   reference: https://friendly.github.io/heplots/reference
   article: https://friendly.github.io/heplots/articles

diff --git a/docs/reference/AddHealth.html b/docs/reference/AddHealth.html
diff --git a/docs/reference/Adopted.html b/docs/reference/Adopted.html
diff --git a/docs/reference/Bees.html b/docs/reference/Bees.html
diff --git a/docs/reference/Diabetes.html b/docs/reference/Diabetes.html
diff --git a/docs/reference/Ellipsoid.html b/docs/reference/Ellipsoid.html
diff --git a/docs/reference/FootHead.html b/docs/reference/FootHead.html
diff --git a/docs/reference/Headache.html b/docs/reference/Headache.html
diff --git a/docs/reference/Hernior.html b/docs/reference/Hernior.html
diff --git a/docs/reference/Iwasaki_Big_Five.html b/docs/reference/Iwasaki_Big_Five.html
diff --git a/docs/reference/Mahalanobis.html b/docs/reference/Mahalanobis.html
diff --git a/docs/reference/MockJury.html b/docs/reference/MockJury.html
diff --git a/docs/reference/NLSY.html b/docs/reference/NLSY.html
diff --git a/docs/reference/NeuroCog.html b/docs/reference/NeuroCog.html