ggplot2 version of the z-curve plot (#14)

FBartos · Oct 30, 2023 · 2e87b6e · 2e87b6e
1 parent 1708a14
commit 2e87b6e
Show file tree

Hide file tree

Showing 22 changed files with 915 additions and 103 deletions.
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -6,13 +6,11 @@ on:
       - main
       - master
       - pre-release
-      - censored
   pull_request:
     branches:
       - main
       - master
       - pre-release
-      - censored
 
 name: R-CMD-check
 
@@ -28,21 +26,21 @@ jobs:
         config:
           - {os: windows-latest, r: 'release'}
           - {os: macOS-latest,   r: 'release'}
-          - {os: ubuntu-20.04,   r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
+          - {os: ubuntu-latest,  r: 'release'}
 
     env:
       R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
       RSPM: ${{ matrix.config.rspm }}
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - uses: r-lib/actions/setup-r@v1
+      - uses: r-lib/actions/setup-r@v2
         with:
           r-version: ${{ matrix.config.r }}
 
-      - uses: r-lib/actions/setup-pandoc@v1
+      - uses: r-lib/actions/setup-pandoc@v2
 
       - name: Query dependencies
         run: |
@@ -64,8 +62,7 @@ jobs:
           while read -r cmd
           do
             eval sudo $cmd
-          apt-get install libcurl4-openssl-dev
-          done < <(Rscript -e 'writeLines(remotes::system_requirements("ubuntu", "20.04"))')
+          sudo apt-get install libcurl4-openssl-dev
 
       - name: Install dependencies
         run: |
@@ -90,7 +87,6 @@ jobs:
         if: runner.os == 'Windows'
         env:
           _R_CHECK_CRAN_INCOMING_REMOTE_: false
-          JAGS_ROOT: "/c/progra~1/JAGS/JAGS-4.2.0"
         run: |
           options(crayon.enabled = TRUE)
           rcmdcheck::rcmdcheck(

diff --git a/.github/workflows/R-CMD-tests.yaml b/.github/workflows/R-CMD-tests.yaml
@@ -6,13 +6,11 @@ on:
       - main
       - master
       - pre-release
-      - censored
   pull_request:
     branches:
       - main
       - master
       - pre-release
-      - censored
 
 name: R-CMD-tests
 
@@ -28,21 +26,21 @@ jobs:
         config:
           - {os: windows-latest, r: 'release'}
           - {os: macOS-latest,   r: 'release'}
-          - {os: ubuntu-20.04,   r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
+          - {os: ubuntu-latest,  r: 'release'}
 
     env:
       R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
       RSPM: ${{ matrix.config.rspm }}
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - uses: r-lib/actions/setup-r@v1
+      - uses: r-lib/actions/setup-r@v2
         with:
           r-version: ${{ matrix.config.r }}
 
-      - uses: r-lib/actions/setup-pandoc@v1
+      - uses: r-lib/actions/setup-pandoc@v2
 
       - name: Query dependencies
         run: |
@@ -64,7 +62,6 @@ jobs:
           while read -r cmd
           do
             eval sudo $cmd
-          done < <(Rscript -e 'writeLines(remotes::system_requirements("ubuntu", "20.04"))')
 
 
       - name: Install and test z-curve (non-Windows)

diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml
@@ -14,11 +14,11 @@ jobs:
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - uses: r-lib/actions/setup-r@v1
+      - uses: r-lib/actions/setup-r@v2
 
-      - uses: r-lib/actions/setup-pandoc@v1
+      - uses: r-lib/actions/setup-pandoc@v2
 
       - name: Query dependencies
         run: |

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")))
@@ -17,14 +17,16 @@ License: GPL-3
 Encoding: UTF-8
 LazyData: true
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.1
+RoxygenNote: 7.2.3
 Imports: 
     Rcpp (>= 1.0.2),
     nleqslv,
     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.