Ungroups the data to avoid issues with the model matrix

pachadotdev · May 14, 2024 · 5fe36d0 · 5fe36d0
1 parent cec1ef7
commit 5fe36d0
Show file tree

Hide file tree

Showing 15 changed files with 83 additions and 12 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -20,6 +20,7 @@ Imports:
     rlang,
     stats
 Suggests: 
+    fixest,
     knitr,
     rmarkdown,
     testthat (>= 3.0.0),

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+# capybara 0.4.5
+
+* Ungroups the data to avoid issues with the model matrix
+
 # capybara 0.4
 
 * Uses R's C API efficiently to add a bit more of memory optimizations

diff --git a/R/feglm.R b/R/feglm.R
@@ -52,6 +52,14 @@
 #' )
 #'
 #' summary(mod)
+#'
+#' mod <- feglm(
+#'   trade ~ log_dist + lang + cntg + clny | exp_year + imp_year | pair,
+#'   trade_panel,
+#'   family = poisson(link = "log")
+#' )
+#'
+#' summary(mod, type = "clustered")
 #' @export
 feglm <- function(
     formula = NULL,

diff --git a/R/helpers.R b/R/helpers.R
@@ -108,7 +108,7 @@ update_formula_ <- function(formula) {
 }
 
 model_frame_ <- function(data, formula, weights) {
-  data <- select(data, all_of(c(all.vars(formula), weights)))
+  data <- select(ungroup(data), all_of(c(all.vars(formula), weights)))
 
   lhs <- names(data)[[1L]]
 

diff --git a/README.Rmd b/README.Rmd
@@ -6,10 +6,10 @@ output: github_document
 
 ```{r, include = FALSE}
 knitr::opts_chunk$set(
-    collapse = TRUE,
-    comment = "#>",
-    fig.path = "man/figures/README-",
-    out.width = "100%"
+  collapse = TRUE,
+  comment = "#>",
+  fig.path = "man/figures/README-",
+  out.width = "100%"
 )
 ```
 

diff --git a/docs/news/index.html b/docs/news/index.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -3,5 +3,5 @@ pkgdown: 2.0.7
 pkgdown_sha: ~
 articles:
   intro: intro.html
-last_built: 2024-04-09T14:22Z
+last_built: 2024-05-14T01:44Z
 
diff --git a/docs/reference/apes.html b/docs/reference/apes.html
diff --git a/docs/reference/bias_corr.html b/docs/reference/bias_corr.html
diff --git a/docs/reference/feglm.html b/docs/reference/feglm.html
diff --git a/docs/reference/felm.html b/docs/reference/felm.html
diff --git a/docs/reference/fenegbin.html b/docs/reference/fenegbin.html
diff --git a/docs/reference/fepoisson.html b/docs/reference/fepoisson.html
diff --git a/man/feglm.Rd b/man/feglm.Rd
diff --git a/tests/testthat/test-feglm.R b/tests/testthat/test-feglm.R
@@ -0,0 +1,17 @@
+test_that("fepoisson is similar to fixest", {
+  mod <- fepoisson(
+    trade ~ log_dist + lang + cntg + clny | exp_year + imp_year | pair,
+    trade_panel
+  )
+
+  mod_fixest <- fixest::fepois(
+    trade ~ log_dist + lang + cntg + clny | exp_year + imp_year,
+    trade_panel,
+    cluster = ~pair
+  )
+
+  summary_mod <- summary(mod, type = "clustered")
+  summary_mod_fixest <- summary(mod_fixest)
+
+  expect_equal(unname(round(summary_mod$cm[,2] - summary_mod_fixest$coeftable[,2], 2)), rep(0, 4))
+})
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,6 +20,7 @@ Imports: @@
         rlang,
         stats
     Suggests:
+        fixest,
         knitr,
         rmarkdown,
         testthat (>= 3.0.0),
@@ Expand Down @@