Merge 21be06d into 87a7ddc

DeclareDesign · May 30, 2018 · ee89052 · ee89052
2 parents 87a7ddc + 21be06d
commit ee89052
Show file tree

Hide file tree

Showing 17 changed files with 1,238 additions and 208 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -44,12 +44,12 @@ r_github_packages:
 - DeclareDesign/DDtools
 - ropensci/git2r
 - DeclareDesign/fabricatr
-- DeclareDesign/randomizr
 
 r_packages:
 - broom
 - texreg
 - clubSandwich
+- stargazer
 
 after_success:
 - Rscript -e DDtools::after_build

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -10,7 +10,7 @@ Authors@R: c(person("Graeme", "Blair", email = "graeme.blair@ucla.edu", role = c
              person("Luke", "Sonnet", email = "luke.sonnet@gmail.com", role = c("aut")),
              person("Neal", "Fultz", email = "nfultz@gmail.com", role = c("ctb")))
 Description: Fast procedures for small set of commonly-used, design-appropriate estimators with robust standard errors and confidence intervals. Includes estimators for linear regression, instrumental variables regression, difference-in-means, Horvitz-Thompson estimation, and regression improving precision of experimental estimates by interacting treatment with centered pre-treatment covariates introduced by Lin (2013) <doi:10.1214/12-AOAS583>.
-URL: http://estimatr.declaredesign.org, https://github.com/DeclareDesign/estimatr
+URL: https://declaredesign.org/r/estimatr/, https://github.com/DeclareDesign/estimatr
 BugReports: https://github.com/DeclareDesign/estimatr/issues
 License: MIT + file LICENSE
 Depends: R (>= 3.4.0)

diff --git a/NAMESPACE b/NAMESPACE
@@ -29,6 +29,7 @@ S3method(vcov,difference_in_means)
 S3method(vcov,horvitz_thompson)
 S3method(vcov,iv_robust)
 S3method(vcov,lm_robust)
+export(commarobust)
 export(declaration_to_condition_pr_mat)
 export(difference_in_means)
 export(gen_pr_matrix_cluster)
@@ -38,6 +39,7 @@ export(lm_lin)
 export(lm_robust)
 export(lm_robust_fit)
 export(permutations_to_condition_pr_mat)
+export(starprep)
 export(tidy)
 export(tidy.difference_in_means)
 export(tidy.horvitz_thompson)
@@ -63,24 +65,30 @@ importFrom(stats,.getXlevels)
 importFrom(stats,coef)
 importFrom(stats,complete.cases)
 importFrom(stats,delete.response)
+importFrom(stats,df.residual)
+importFrom(stats,fitted.values)
+importFrom(stats,formula)
 importFrom(stats,lm)
 importFrom(stats,model.extract)
 importFrom(stats,model.frame)
 importFrom(stats,model.frame.default)
 importFrom(stats,model.matrix)
 importFrom(stats,model.matrix.default)
+importFrom(stats,model.matrix.lm)
 importFrom(stats,model.response)
 importFrom(stats,na.pass)
 importFrom(stats,nobs)
 importFrom(stats,pf)
 importFrom(stats,pt)
 importFrom(stats,qt)
 importFrom(stats,reformulate)
+importFrom(stats,resid)
 importFrom(stats,sd)
 importFrom(stats,setNames)
 importFrom(stats,terms)
 importFrom(stats,update)
 importFrom(stats,var)
 importFrom(stats,vcov)
 importFrom(stats,weighted.mean)
+importFrom(stats,weights)
 useDynLib(estimatr, .registration = TRUE)
diff --git a/R/estimatr.R b/R/estimatr.R
@@ -6,7 +6,8 @@
 #' @importFrom stats sd var model.matrix.default pt qt var weighted.mean lm
 #' vcov model.frame.default model.response complete.cases terms reformulate
 #' update model.extract setNames delete.response .checkMFClasses model.frame
-#' model.matrix na.pass nobs coef pf .getXlevels
+#' model.matrix na.pass nobs coef pf .getXlevels df.residual fitted.values
+#' formula model.matrix.lm resid weights
 #' @importFrom methods setGeneric setMethod isGeneric className
 #' @importFrom Formula as.Formula
 #' @importFrom rlang enquos enquo eval_tidy quo_get_expr quo_set_expr quo_is_missing sym quo

diff --git a/R/estimatr_iv_robust.R b/R/estimatr_iv_robust.R
@@ -183,9 +183,9 @@ iv_robust <- function(formula,
       has_int = attr(model_data$terms, "intercept"),
       alpha = alpha,
       return_fit = TRUE,
-      return_unweighted_fit = TRUE,
       return_vcov = return_vcov,
-      try_cholesky = try_cholesky
+      try_cholesky = try_cholesky,
+      iv_first_stage = TRUE
     )
 
   # ------