Merge branch 'master' into rlang-update

.travis.yml

@@ -47,7 +47,6 @@ env:
   - secure: MirTPzseZG12au6r9/Wda7R3R4NwjPCqjakjyw5DscxXdtbFH9UGO9NWhSq6C2bdeBTTS/QL0IpoGlubobTrPCbFKhVHeNrDPZ+o/fqdDWBKGr3w4U4xlX4AwGw61rweXkw9/1B52sWkLJx77eSP/0ZJcfbaG6+6TQipXRr2D46GvhRD2zM3u4H7TxgdfxCVmvlSQrxfvtTr6jI0s1goBbiBU7l/McMlajbHCYw3p2DrbuSmQbDWU7/hLlrwfGBAUXQK68n5s7igXJZfBFsOiYMCldQwa7bwPilPQwZQ9jn0oRu6CATYGRvyLdXbQwmKD91LUB8bgSmD1m7ndMvpBI8QqAETj5EipUPrB2xDFqGeU2yBYsIgnkXN5twcogK7jEzhococfYmX3QMEBASHijYRSAQsS3icqRqJO5Sm+GHkNhLPUZezXTIF8phU6SP4kszbCzPwrhOuj4Zk5wpcS7LUMDLLc6LtAGoyS+gFstMu0NFAEDBkLrxSEYZdHKFMx3SrH3ljIDUa0FFWEqSbkrp6JxQlONlJhEAUciTsSoPBA6rghZMRuYAljPt5wBDdvK2hHpRs2lDSoHLU9QYKO6DAwXmZy+c/Tt0PqcU43xp6tnrSAcvZruXDGHKSSo4oM+areRso6wakLGUafwu/Tmh0nG1p1Sx4wp/1ZLas41o=
   - secure: nj+3AWAxDUVkMtZ3UQzQuWhjmhw6/A2s6KydDfEdjJdUpWqiMBQV2D0hYlCqGFt1RsocnOgclgzBOJN1UNKdk3jeDdVEQBhOFzc/hGrnPcVciRBhoFmDAEE0ErnWWeX/qN3Mkx4UZH+mGXjY0VEWn4VRa5CTEG1szuvqr/zIqEanHqTUvgQR/ER040OyweIoj3A4iAgXJuRGqKgf+BH4MdRPrSXw4UL3idPl5lsWEYttmGb8WKkb1jX73jbHKtEVlQkcvd7GLqp707+8avlUK9gjAaquBLp5amDPDKWLWH41K1ZnhzsfzyMAW1EeDqUfHdK97oVYrspU1HQFyeysQWW+JrqHeTxLSIYEH+qV5WEoeSvM643bVMQryL1tqy+AKz2l3J1jRd713yVCJ3heFdtpaltQ1xgVzxshNfqzKC9FGFB3Z0911k8REnjrpTjb28NZfPHY3/t14bpQjvs5kznn7P8ZdmSUUw+w3shd2RuM2YymmB6vSggLxekq7JqKYf9VDYfJsP+ggfrI4MtJrRqkGs41DdUm3l1KwsKepjdLhBY955dBis7XtEbt3cHFHQY1d5DHTGITSfS9uCYOMAOLoAZALrJ2CM2w4uTgLzUtnZR+3MbZJBWbn/pb5xyYSOlwQHObxXNkCD49lfCEcojMBLWsAfgHfm5GD/pCdek=
   - secure: UoCUQNU8EAGUDm17Q2egxyjYpqxORIDn7BEsX672KdjEuYLvuH81sjwZ91XeSXZ6j7zXUx/a/1p6VJAeBhLFrWlNhofKUjSVxVNZBjpVgz65tNW1R5v3qN1wtKdY2H17WawFHZCAXqbI+uWkuRmoCoBkoEE7aULhNtxWtQ0mE+YLIc/NIlyw2bDYvjtrwCQuk5i/f69q/T73KOHAZluhuxlJUNdV0cz/lQANvm9D7x1PUd891j5EgbBWIyN60BBGPA/evo32c0ZMSSl/UrfkEfoF2580OCvsE+mGNjZRHX3n/NXuzqqw0zDgCz2rbVm5EF6MM6VdQOmgKfE75KwzHI05WeSTBua39BxCgq8xQF+UA3hcj8Se15B9bjJ6JWqTErv9ESEA7lib4i4GS9oM0cYuQqHd6PFFukKfZMnh6VL3xoFSGEfsxxED0teg7lGNrje8LUpAE390XGqemev8MdpkkbprHBziAxNamywco+u2ggQwLkreT3cuxs6FMvlHk7x57dAX4lAlrR7TWJcGvBuqZly+5AU8IP359xEJaFd7QjWMOULSTnZYgprNRaOGo3oM/VnhxwZgXtOZYlrzPn7ytqnRqSKszRxWqzbAijPVYsXP7uYlVzQp+Upg9mK3j/t5Rs7YmByCUr4pwTO5eMnigeWSTRTVr4CWoY2+Q/8=
-r_github_packages:
-- DeclareDesign/DDtools
+
 after_success:
 - Rscript -e DDtools::after_build

tests/testthat/test-compare-diagnoses.R

@@ -11,40 +11,40 @@ design_a <-
 design_b <- redesign(design_a, prob_assgn = 0.1)
 set.seed(2000)
 
-comparison <- compare_diagnoses(design_a, design_b, sims = 20)
+comparison <- compare_diagnoses(design_a, design_b, sims = 3)
 
 test_that("compare_diagnoses works", {
   set.seed(2000)
-  expect_is(compare_diagnoses(design_a, design_b), "compared_diagnoses")
+  expect_is(compare_diagnoses(design_a, design_b, sims = 3), "compared_diagnoses")
 })
 
 
 
 test_that("merge_by_estimator working in compare_diagnoses", {
 
   # 1:1 comparison 
-  diagnosis_a <- diagnose_design(design_a, sims = 40, bootstrap_sims = 0)
+  diagnosis_a <- diagnose_design(design_a, sims = 3, bootstrap_sims = 0)
   design_c <- insert_step(design_a, declare_estimator(Y ~  Z + X, estimand =  "ATE", term = "Z", model = lm_robust, label = "est2"), after = "est1")
-  comparison <- compare_diagnoses(design_a, design_c, sims = 40, merge_by_estimator = TRUE)
+  comparison <- compare_diagnoses(design_a, design_c, sims = 3, merge_by_estimator = TRUE)
   n1 <- length(diagnosis_a$diagnosand_names)
   n2 <- nrow(comparison$compared_diagnoses_df)
   expect_equal(n1, n2)
 
   # 1:2
-  comparison <- compare_diagnoses(design_a, design_c, sims = 40,  merge_by_estimator = FALSE)
+  comparison <- compare_diagnoses(design_a, design_c, sims = 3,  merge_by_estimator = FALSE)
   n2 <- nrow(comparison$compared_diagnoses_df)
   expect_equal(n1*2, n2)
 
   # 2:2
-  comparison <- compare_diagnoses(design_c, design_c, merge_by_estimator = FALSE)
+  comparison <- compare_diagnoses(design_c, design_c, sims = 3, merge_by_estimator = FALSE)
   n2 <- nrow(comparison$compared_diagnoses_df)
   expect_equal(n1*4, n2)
 })
 
 
 test_that("compare_diagnoses errors when it should", {
   # bootstrap errors
-  expect_error(compare_diagnoses(design_a, design_b, bootstrap_sims = 0))
+  expect_error(compare_diagnoses(design_a, design_b, sims = 3, bootstrap_sims = 0))
 
 
 
@@ -58,11 +58,11 @@ test_that("compare_diagnoses errors when it should", {
   }
 
   designs <- expand_design(designer , N = c(20, 30))
-  expect_error(compare_diagnoses(designs, design_a)) 
+  expect_error(compare_diagnoses(designs, design_a, sims = 3)) 
   design_c <- designer(N = 30)
-  expect_error(compare_diagnoses(design_a, design_c)) 
+  expect_error(compare_diagnoses(design_a, design_c, sims = 3)) 
   design_d <- delete_step(design_c, "estimator")
-  expect_warning(compare_diagnoses(design_c, design_d, sims = 40)) 
+  expect_warning(compare_diagnoses(design_c, design_d, sims = 3)) 
 })