Support DCchoice

vincentarelbundock · Aug 1, 2023 · d104851 · d104851
1 parent 7814bb8
commit d104851
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 5 deletions.
diff --git a/R/sanity_model.R b/R/sanity_model.R
@@ -80,6 +80,7 @@ sanity_model_supported_class <- function(model) {
         c("negbin", "glm", "lm"),
         c("ols", "rms", "lm"),
         c("orm", "rms"),
+        c("oohbchoice", "dbchoice"),
         "phylolm",
         "phyloglm",
         c("plm", "panelmodel"),

diff --git a/R/type_dictionary.R b/R/type_dictionary.R
@@ -104,6 +104,8 @@ mlogit,response
 negbin,response
 negbin,link
 ols,lp
+"oohbchoice", "probability",
+"oohbchoice", "utility",
 orm,fitted
 orm,mean
 orm,lp

diff --git a/data-raw/supported_models.csv b/data-raw/supported_models.csv
@@ -19,6 +19,7 @@ brglm2,brmultinom,TRUE,TRUE,,,U,U,U,U
 brms,brm,TRUE,TRUE,,,U,U,TRUE,TRUE
 crch,crch,TRUE,TRUE,,,U,U,U,U
 crch,hxlr,TRUE,TRUE,,,U,U,U,U
+DCchoice,oohbchoice,TRUE,TRUE,,,,,,
 estimatr,lm_lin,TRUE,TRUE,,,,,,
 estimatr,lm_robust,TRUE,TRUE,TRUE,TRUE,TRUE,U,TRUE,TRUE
 estimatr,iv_robust,TRUE,TRUE,TRUE,TRUE,U,U,U,U

diff --git a/inst/tinytest/test-pkg-DCchoice.R b/inst/tinytest/test-pkg-DCchoice.R
@@ -0,0 +1,24 @@
+# No validity test whatsoever
+
+source("helpers.R")
+using("marginaleffects")
+requiet("DCchoice")
+
+data(oohbsyn)
+mod <- oohbchoice(R1 + R2 ~ age + gender | log(BL) + log(BH), data = oohbsyn)
+
+# weird result seems to make sense manually
+p1 <- transform(oohbsyn, BH = 5)
+p2 <- transform(oohbsyn, BH = 7)
+p1 <- predict(mod, newdata = p1)
+p2 <- predict(mod, newdata = p2)
+bh_comparison <- p2 - p1
+expect_true(all(bh_comparison == 0))
+
+slo <- avg_slopes(mod)
+pre <- predictions(mod, by = "gender")
+cmp <- comparisons(mod)
+
+expect_inherits(cmp, "comparisons")
+expect_inherits(pre, "predictions")
+expect_inherits(slo, "slopes")
diff --git a/man/comparisons.Rd b/man/comparisons.Rd
diff --git a/man/marginal_means.Rd b/man/marginal_means.Rd
diff --git a/man/marginalmeans.Rd b/man/marginalmeans.Rd
diff --git a/man/predictions.Rd b/man/predictions.Rd
diff --git a/man/slopes.Rd b/man/slopes.Rd