ggplot2

FBartos · Jan 13, 2023 · 485ca77 · 485ca77
1 parent 1708a14
commit 485ca77
Show file tree

Hide file tree

Showing 13 changed files with 890 additions and 74 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: zcurve
 Title: An Implementation of Z-Curves
-Version: 2.3.0
+Version: 2.4.0
 Authors@R: c(
     person("František", "Bartoš", email = "[email protected]", role = c("aut", "cre")),
     person("Ulrich", "Schimmack", email = "[email protected]", role = c("aut")))
@@ -24,7 +24,9 @@ Imports:
     stats,
     evmix,
     graphics,
-    Rdpack
+    ggplot2,
+    Rdpack,
+    rlang
 LinkingTo: Rcpp
 Suggests:
     parallel,

diff --git a/NAMESPACE b/NAMESPACE
@@ -33,5 +33,6 @@ export(zcurve_clustered)
 export(zcurve_data)
 importFrom(Rcpp,sourceCpp)
 importFrom(Rdpack,reprompt)
+importFrom(rlang,.data)
 importFrom(utils,head)
 useDynLib(zcurve, .registration = TRUE)
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,6 @@
+## version 2.4.0
+- Implementation of ggploting function.
+
 ## version 2.3.0
 - Implementation of parallel bootstrap.
 

diff --git a/R/main.R b/R/main.R
diff --git a/R/zcurve-package.R b/R/zcurve-package.R
@@ -8,5 +8,6 @@
 #' @useDynLib zcurve, .registration = TRUE
 #' @importFrom Rcpp sourceCpp
 #' @importFrom Rdpack reprompt
+#' @importFrom rlang .data
 ## usethis namespace: end
 NULL
diff --git a/man/plot.zcurve.Rd b/man/plot.zcurve.Rd
diff --git a/tests/testthat/_snaps/zcurve/z-curve-cens-em-ggplot.svg b/tests/testthat/_snaps/zcurve/z-curve-cens-em-ggplot.svg
diff --git a/tests/testthat/_snaps/zcurve/z-curve-clustered-mixed-ggplot-1.svg b/tests/testthat/_snaps/zcurve/z-curve-clustered-mixed-ggplot-1.svg
diff --git a/tests/testthat/_snaps/zcurve/z-curve-clustered-mixed-ggplot-2.svg b/tests/testthat/_snaps/zcurve/z-curve-clustered-mixed-ggplot-2.svg
diff --git a/tests/testthat/_snaps/zcurve/z-curve-em-ggplot.svg b/tests/testthat/_snaps/zcurve/z-curve-em-ggplot.svg
diff --git a/tests/testthat/_snaps/zcurve/z-curve-kd2-ggplot.svg b/tests/testthat/_snaps/zcurve/z-curve-kd2-ggplot.svg
diff --git a/tests/testthat/_snaps/zcurve/z-curve-mixed-em-ggplot.svg b/tests/testthat/_snaps/zcurve/z-curve-mixed-em-ggplot.svg
diff --git a/tests/testthat/test-zcurve.R b/tests/testthat/test-zcurve.R
@@ -60,6 +60,7 @@ test_that("z-curve EM can be fitted and reproduces OSC results", {
 
   # plot
   expect_doppelganger("z-curve EM", function()plot(fit.EM, main = "OSC (with EM)", annotation = TRUE, CI = TRUE))
+  expect_doppelganger("z-curve EM (ggplot)", suppressWarnings(plot(fit.EM, main = "OSC (with EM)", annotation = TRUE, CI = TRUE, plot_type = "ggplot")))
 
 })
 test_that("z-curve KD2 can be fitted and reproduces OSC results", {
@@ -100,6 +101,7 @@ test_that("z-curve KD2 can be fitted and reproduces OSC results", {
 
   # plot
   expect_doppelganger("z-curve KD2", function()plot(fit.KD2))
+  expect_doppelganger("z-curve KD2 (ggplot)", plot(fit.KD2, plot_type = "ggplot"))
 
 })
 test_that("z-curve EM censoring works", {
@@ -131,6 +133,7 @@ test_that("z-curve EM censoring works", {
 
   # plot
   expect_doppelganger("z-curve mixed EM", function()plot(fit.mixed, CI = TRUE))
+  expect_doppelganger("z-curve mixed EM (ggplot)", plot(fit.mixed, CI = TRUE, plot_type = "ggplot"))
 
 
   # censoring only
@@ -155,6 +158,7 @@ test_that("z-curve EM censoring works", {
 
   # plot
   expect_doppelganger("z-curve cens EM", function()plot(fit.cens, CI = TRUE))
+  expect_doppelganger("z-curve cens EM (ggplot)", plot(fit.cens, CI = TRUE, plot_type = "ggplot"))
 })
 test_that("z-curve clustered works", {
 
@@ -208,7 +212,7 @@ test_that("z-curve clustered works", {
     plot(fitw)
   })
 
-
+    
   # precise
   data <- paste0("z = ",z)
   data <- zcurve_data(data, id)
@@ -301,4 +305,7 @@ test_that("z-curve clustered works", {
     plot(fitb)
     plot(fitw)
   })
+
+  expect_doppelganger("z-curve clustered mixed (ggplot-1)", plot(fitb, plot_type = "ggplot"))
+  expect_doppelganger("z-curve clustered mixed (ggplot-2)", plot(fitw, plot_type = "ggplot"))
 })