From 6533eace48d4c5cc56b6e4a9d9ffa592b25942bf Mon Sep 17 00:00:00 2001
From: Matthew Fidler <matthew.fidler@gmail.com>
Date: Mon, 16 Sep 2024 21:35:34 -0500
Subject: [PATCH 1/2] Change keep interpolation to na

---
 NEWS.md     | 2 ++
 R/rxsolve.R | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/NEWS.md b/NEWS.md
index 6e8c9248f..8e7ababd0 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -72,6 +72,8 @@
    - Note: when interpolation is linear/midpoint for
      factors/characters it changes to locf with a warning (#759)
 
+   - Also note, that the default keep interpolation is `na`
+
 - Now you can specify the interpolation method per covariate in the model:
 
   - `linear(var1, var2)` says both `var1` and `var2` would use linear
diff --git a/R/rxsolve.R b/R/rxsolve.R
index 00db8f555..92fede70e 100644
--- a/R/rxsolve.R
+++ b/R/rxsolve.R
@@ -705,7 +705,7 @@ rxSolve <- function(object, params = NULL, events = NULL, inits = NULL,
                     cores,
                     covsInterpolation = c("locf", "linear", "nocb", "midpoint"),
                     naInterpolation = c("locf", "nocb"),
-                    keepInterpolation=c("locf", "nocb", "na"),
+                    keepInterpolation=c("na", "locf", "nocb"),
                     addCov = TRUE, sigma = NULL, sigmaDf = NULL,
                     sigmaLower = -Inf, sigmaUpper = Inf,
                     nCoresRV = 1L, sigmaIsChol = FALSE,

From f34260424e3779ee22b2ab638139c9c2866a8035 Mon Sep 17 00:00:00 2001
From: Matthew Fidler <matthew.fidler@gmail.com>
Date: Mon, 16 Sep 2024 22:16:35 -0500
Subject: [PATCH 2/2] Update docs

---
 man/forderForceBase.Rd | 5 +++--
 man/reexports.Rd       | 1 -
 man/rxSolve.Rd         | 2 +-
 man/rxode2.Rd          | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/man/forderForceBase.Rd b/man/forderForceBase.Rd
index af21425e9..52490c7be 100644
--- a/man/forderForceBase.Rd
+++ b/man/forderForceBase.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/RcppExports.R
+% Please edit documentation in R/forder.R
 \name{forderForceBase}
 \alias{forderForceBase}
 \title{Force using base order for rxode2 radix sorting}
@@ -12,7 +12,8 @@ forderForceBase(forceBase = FALSE)
 \code{data.table}'s parallel radix sorting.}
 }
 \value{
-NILL; called for side effects
+value of \code{forceBase} (can change if \code{data.table} is not
+available)
 }
 \description{
 Force using base order for rxode2 radix sorting
diff --git a/man/reexports.Rd b/man/reexports.Rd
index 2857ff16d..8cba3d62e 100644
--- a/man/reexports.Rd
+++ b/man/reexports.Rd
@@ -38,4 +38,3 @@ below to see their documentation.
   \item{magrittr}{\code{\link[magrittr:pipe]{\%>\%}}}
 }}
 
-\value{ Inherited from parent routine }
diff --git a/man/rxSolve.Rd b/man/rxSolve.Rd
index 6c1e519af..1d04267e5 100644
--- a/man/rxSolve.Rd
+++ b/man/rxSolve.Rd
@@ -48,7 +48,7 @@ rxSolve(
   cores,
   covsInterpolation = c("locf", "linear", "nocb", "midpoint"),
   naInterpolation = c("locf", "nocb"),
-  keepInterpolation = c("locf", "nocb", "na"),
+  keepInterpolation = c("na", "locf", "nocb"),
   addCov = TRUE,
   sigma = NULL,
   sigmaDf = NULL,
diff --git a/man/rxode2.Rd b/man/rxode2.Rd
index f9ac50073..170135588 100644
--- a/man/rxode2.Rd
+++ b/man/rxode2.Rd
@@ -333,7 +333,7 @@ compilation model.
 
 \if{html}{\out{<div class="sourceCode">}}\preformatted{## using C compiler: ‘gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0’
 
-## rxode2 3.0.0 model named rx_d8d85acfdea2c0afa009adb7e0af7f5b model (ready). 
+## rxode2 3.0.0 model named rx_7f23dac9f52d5c38466f059bf630b9f9 model (ready). 
 ## x$state: depot, center
 ## x$stateExtra: cp
 ## x$params: tka, tcl, tv, add.sd, eta.ka, eta.cl, eta.v, rxerr.cp
@@ -346,7 +346,7 @@ mod$simulationIniModel
 
 \if{html}{\out{<div class="sourceCode">}}\preformatted{## using C compiler: ‘gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0’
 
-## rxode2 3.0.0 model named rx_88f081801f9a4016288bbc266540eae1 model (ready). 
+## rxode2 3.0.0 model named rx_9caa587f6510b0f4918d927ca6ffdf14 model (ready). 
 ## x$state: depot, center
 ## x$stateExtra: cp
 ## x$params: tka, tcl, tv, add.sd, eta.ka, eta.cl, eta.v, rxerr.cp