From d4a49b4837de347d34b2c198de7342c34b0fab63 Mon Sep 17 00:00:00 2001
From: Johannes Ranke <jranke@uni-bremen.de>
Date: Tue, 14 Apr 2020 11:45:49 +0200
Subject: Keep order of datasets in nlme_data, add a plot

---
 R/nlme.R | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'R/nlme.R')

diff --git a/R/nlme.R b/R/nlme.R
index 79e4e9c1..12a3104c 100644
--- a/R/nlme.R
+++ b/R/nlme.R
@@ -33,6 +33,11 @@
 #' mean_dp <- mean_degparms(f)
 #' grouped_data <- nlme_data(f)
 #' nlme_f <- nlme_function(f)
+#' # These assignments are necessary for these objects to be
+#' # visible to nlme and augPred when evaluation is done by
+#' # pkgdown to generated the html docs.
+#' assign("nlme_f", nlme_f, globalenv())
+#' assign("grouped_data", grouped_data, globalenv())
 #'
 #' library(nlme)
 #' m_nlme <- nlme(value ~ nlme_f(name, time, parent_0, log_k_parent_sink),
@@ -41,6 +46,7 @@
 #'   random = pdDiag(parent_0 + log_k_parent_sink ~ 1),
 #'   start = mean_dp)
 #' summary(m_nlme)
+#' plot(augPred(m_nlme, level = 0:1), layout = c(3, 1))
 #'
 #' \dontrun{
 #'   # Test on some real data
@@ -111,7 +117,7 @@
 #'
 #'   anova(f_nlme_fomc_sfo, f_nlme_sfo_sfo)
 #' }
-#' @return A function that can be used with \code{link{nlme}}
+#' @return A function that can be used with nlme
 #' @export
 nlme_function <- function(object) {
   if (nrow(object) > 1) stop("Only row objects allowed")
@@ -204,9 +210,10 @@ nlme_data <- function(object) {
   names(ds_list) <- ds_names
   ds_nlme <- purrr::map_dfr(ds_list, function(x) x, .id = "ds")
   ds_nlme$variable <- as.character(ds_nlme$variable)
+  ds_nlme$ds <- ordered(ds_nlme$ds, levels = unique(ds_nlme$ds))
   ds_nlme_renamed <- data.frame(ds = ds_nlme$ds, name = ds_nlme$variable,
     time = ds_nlme$time, value = ds_nlme$observed,
     stringsAsFactors = FALSE)
-  ds_nlme_grouped <- groupedData(value ~ time | ds, ds_nlme_renamed)
+  ds_nlme_grouped <- groupedData(value ~ time | ds, ds_nlme_renamed, order.groups = FALSE)
   return(ds_nlme_grouped)
 }
-- 
cgit v1.2.1