Merge pull request #792 from nlmixr2/792-keep-na

the keep interpolaton default should be "na"
nlmixr2 · Sep 17, 2024 · 6004041 · 6004041
2 parents 9597d65 + f342604
commit 6004041
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git 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
@@ -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,

diff --git a/man/forderForceBase.Rd b/man/forderForceBase.Rd
diff --git a/man/reexports.Rd b/man/reexports.Rd
diff --git a/man/rxSolve.Rd b/man/rxSolve.Rd
diff --git a/man/rxode2.Rd b/man/rxode2.Rd