finish up?

vincentarelbundock · Jul 16, 2023 · 2c4f5e4 · 2c4f5e4
1 parent 897f6d2
commit 2c4f5e4
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/R/get_jacobian.R b/R/get_jacobian.R
@@ -23,7 +23,7 @@ get_jacobian <- function(func, x, numderiv) {
 }
 
 
-get_jacobian_fdforward <- function(func, x, eps) {
+get_jacobian_fdforward <- function(func, x, eps = NULL) {
     # old version. probably not optimal. Keep for posterity.
     # h <- max(1e-8, 1e-4 * min(abs(x), na.rm = TRUE))
     baseline <- func(x)
@@ -42,7 +42,7 @@ get_jacobian_fdforward <- function(func, x, eps) {
 }
 
 
-get_jacobian_fdcenter <- function(func, x, eps) {
+get_jacobian_fdcenter <- function(func, x, eps = NULL) {
     baseline <- func(x)
     df <- matrix(NA_real_, length(baseline), length(x))
     for (i in seq_along(x)) {

diff --git a/R/sanitize_numderiv.R b/R/sanitize_numderiv.R
@@ -10,7 +10,7 @@ sanitize_numderiv <- function(numderiv) {
 
     if (length(numderiv) > 1) {
         if (numderiv[[1]] %in% c("fdforward", "fdcenter")) {
-            if (any(names(numderiv)[2:length(numderiv)] %in% "eps")) {
+            if (any(!names(numderiv)[2:length(numderiv)] %in% "eps")) {
                 stop("The only valid argument for this numeric differentiation method is `eps`.")
             }
         } else if (numderiv[[1]] == "richardson") {

diff --git a/R/slopes.R b/R/slopes.R
@@ -395,6 +395,7 @@ avg_slopes <- function(model,
         p_adjust = p_adjust,
         df = df,
         eps = eps,
+        numderiv = numderiv,
         ...)
 
     return(out)

diff --git a/inst/tinytest/test-elasticity.R b/inst/tinytest/test-elasticity.R
@@ -2,8 +2,6 @@ source("helpers.R")
 using("marginaleffects")
 set.seed(1024)
 
-options(marginaleffects_numDeriv = "richardson")
-
 tol <- tolse <- 1e-4
 
 results <- readRDS(testing_path("stata/stata.rds"))