Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge dev branch into master branch #143

Merged
merged 71 commits into from
Sep 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
4374b32
dabestr rebuild
sunroofgod Aug 22, 2023
f474720
update: site url
sunroofgod Aug 22, 2023
3d59e52
Merge pull request #142 from sunroofgod/dev
sangyu Aug 23, 2023
d513c76
update: checking validity of all treatment groups in idx
sunroofgod Aug 23, 2023
6af1b99
Merge branch 'ACCLAB:dev' into dev
sunroofgod Aug 23, 2023
e8040ea
add: devside testing.Rmd - dabestr.Rmd
sunroofgod Aug 24, 2023
916457b
bug: fixed sankey_alpha, now raw_flow_alpha not working as intended
sunroofgod Aug 24, 2023
e857409
Merge pull request #2 from sunroofgod/feat-sankeyalpha
sunroofgod Aug 24, 2023
0cd9649
Added documentation for df_for_plots
junyangliao Aug 24, 2023
f8cf5c8
Merge pull request #1 from junyangliao/junyangliao-patch-1
junyangliao Aug 24, 2023
d3e34f1
Added documentation for plot_api
junyangliao Aug 24, 2023
a6c2337
Merge pull request #3 from junyangliao/dev
sunroofgod Aug 25, 2023
302d43b
add: tufte_lines_df colnames
sunroofgod Aug 25, 2023
c20776f
refactor: create_df_for_tufte to account for when sd == 0
sunroofgod Aug 25, 2023
5d81508
refactor: abstracted calculations for tufte lines into helper function
sunroofgod Aug 25, 2023
3e4f7be
update: handling of tufte lines
sunroofgod Aug 25, 2023
896b110
Merge pull request #4 from sunroofgod/feat-pairedproportions
sunroofgod Aug 25, 2023
336f6f2
update: vignette values referencing and dataset to show effect
sunroofgod Aug 28, 2023
75fe474
Merge pull request #5 from sunroofgod/feat-vignettes
sunroofgod Aug 28, 2023
055de4c
update: standardised code format according to tidyverse style guide
sunroofgod Aug 28, 2023
63fcd35
Merge pull request #6 from sunroofgod/cleaning-code
sunroofgod Aug 28, 2023
4b30f09
bugs: proper referencing of p-values for printing
sunroofgod Aug 28, 2023
743e181
Merge pull request #7 from sunroofgod/feat-print
sunroofgod Aug 28, 2023
d76c451
bugs: printing of dabestobj for delta2 now displaying delta2 comparis…
sunroofgod Aug 28, 2023
0ffcba1
Merge pull request #8 from sunroofgod/feat-print
sunroofgod Aug 28, 2023
064d60b
bugs: fixed pvalues not being referenced properly
sunroofgod Aug 28, 2023
a7cf5eb
Merge pull request #9 from sunroofgod/feat-print
sunroofgod Aug 28, 2023
a3a8db3
bugs: fixed pvalues not being referenced properly
sunroofgod Sep 3, 2023
0153e07
update: changed generation of datasets for testing
sunroofgod Sep 3, 2023
ed2a8ad
add: printing functions
sunroofgod Sep 3, 2023
0bdcf9c
add: unit testing for printing of dabestr objects
sunroofgod Sep 3, 2023
77b1b7e
Merge pull request #10 from sunroofgod/feat-print
sunroofgod Sep 3, 2023
0749e3c
add: cran related files
sunroofgod Sep 5, 2023
d3137bb
Merge pull request #12 from sunroofgod/cran
sunroofgod Sep 5, 2023
1563adf
Update 005_printing.R to address bug causing idx to always assume pai…
junyangliao Sep 7, 2023
55adcd8
Merge pull request #13 from junyangliao/dev
junyangliao Sep 7, 2023
249b892
Update 005_printing.R to address paired==NULL
junyangliao Sep 8, 2023
c439013
Update test-001_load.R to include testing for baseline and sequential
junyangliao Sep 8, 2023
1d31988
Merge pull request #14 from junyangliao/dev
junyangliao Sep 8, 2023
98a5d28
add: changed maintainer
sunroofgod Sep 8, 2023
c4b7cd7
add: gitignore for figures
sunroofgod Sep 8, 2023
806ce82
update: unit testing for printing of dabestr objects
sunroofgod Sep 8, 2023
180154c
update: added p-values warning
sunroofgod Sep 8, 2023
45a620e
Merge pull request #15 from sunroofgod/feat-print
sunroofgod Sep 8, 2023
2506be4
Fixed comparism for dabest_effsize object so that paired=="sequential…
junyangliao Sep 8, 2023
5128b17
Merge pull request #16 from junyangliao/dev
junyangliao Sep 8, 2023
f84efcd
bugs: fixed DESCRIPTION due to merge error
sunroofgod Sep 9, 2023
fb96cc2
update: formatting of code and tables
sunroofgod Sep 9, 2023
ccc9bb6
Merge pull request #17 from sunroofgod/formatting
sunroofgod Sep 9, 2023
efe4eb1
bugs: fixed printing no longer working for dabest object
sunroofgod Sep 9, 2023
b178468
add: unit testing for printing of paired = sequential dabest effectsi…
sunroofgod Sep 9, 2023
aa953ed
Merge pull request #18 from sunroofgod/feat-print
sunroofgod Sep 9, 2023
79241d8
add: reverse dependency checks
sunroofgod Sep 10, 2023
05040d8
add: reverse dependency checks
sunroofgod Sep 10, 2023
678a6ee
add: maintainers
sunroofgod Sep 10, 2023
942d3c3
update: cran-comments
sunroofgod Sep 10, 2023
92b9ebe
bugs: changed to bibentry() instead of citEntry()
sunroofgod Sep 10, 2023
88bc266
bugs: no longer comparing class() to string
sunroofgod Sep 10, 2023
5596ff9
update: hyperlinks
sunroofgod Sep 10, 2023
e2c8dea
update: removed preview of available estimation plot types
sunroofgod Sep 10, 2023
aa5aae5
update: added cran dates for changelog
sunroofgod Sep 10, 2023
1e14de2
update: tidied README
sunroofgod Sep 10, 2023
8cd7b95
add: changelog for dabestr v2023.9.12
sunroofgod Sep 10, 2023
daf584b
update: applied echo = FALSE to specific code chunks
sunroofgod Sep 10, 2023
7df44e9
update: fixed instructions for downloading development version from g…
sunroofgod Sep 11, 2023
5bbc338
update: branch references for ci/cd
sunroofgod Sep 11, 2023
183c625
Merge pull request #144 from sunroofgod/dev
sunroofgod Sep 11, 2023
ddb4bb9
update: authors
sunroofgod Sep 12, 2023
ac69e8c
update: authors
sunroofgod Sep 12, 2023
036fdcb
Merge branch 'dev' of https://github.com/sunroofgod/dabestr into dev
sunroofgod Sep 12, 2023
61517ab
Merge pull request #145 from sunroofgod/dev
sunroofgod Sep 12, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
^Meta$
^doc$
^CRAN-RELEASE$
^.*\.Rproj$
^\.Rproj\.user$
^\.travis\.yml$
^cran-comments\.md$
^LICENSE\.md$
^_pkgdown\.yml$
^docs$
^pkgdown$
^\.github$
^README\.Rmd$
^README-.*\.png$
^CODE_OF_CONDUCT.md$
^CONTRIBUTING.MD$
^packrat/
^\.Rprofile$
^figures$
^dabestr.Rmd$
^cran-comments\.md$
^revdep$
1 change: 1 addition & 0 deletions .github/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.html
29 changes: 29 additions & 0 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [dev, master]
pull_request:
branches: [dev, master]

name: R-CMD-check

jobs:
R-CMD-check:
runs-on: ubuntu-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
R_KEEP_PKG_SOURCE: yes
steps:
- uses: actions/checkout@v3

- uses: r-lib/actions/setup-r@v2
with:
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::rcmdcheck
needs: check

- uses: r-lib/actions/check-r-package@v2
48 changes: 48 additions & 0 deletions .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [master]
pull_request:
branches: [master]
release:
types: [published]
workflow_dispatch:

name: pkgdown

jobs:
pkgdown:
runs-on: ubuntu-latest
# Only restrict concurrency for non-PR jobs
concurrency:
group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
permissions:
contents: write
steps:
- uses: actions/checkout@v3

- uses: r-lib/actions/setup-pandoc@v2

- uses: r-lib/actions/setup-r@v2
with:
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::pkgdown, local::.
needs: website

- name: Build site
run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)
shell: Rscript {0}

- name: Deploy to GitHub pages 🚀
if: github.event_name != 'pull_request'
uses: JamesIves/[email protected]
with:
clean: false
branch: gh-pages
folder: docs
25 changes: 13 additions & 12 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
Meta
doc
# Byte-compiled / optimized / DLL files

# Testing Files
dabestr.Rmd

# Mac
**/.DS_Store

# RProj
.Rproj.user
.Rhistory
.RData
.Rhistory
.Ruserdata
.Rprofile
.DS_Store
*.DS_Store
.RProfile
docs
inst/doc
# revdevcheck temp folder
revdep
# test figures
tests/testthat/Rplots.pdf
packrat/lib*/
packrat/src/
figures
30 changes: 0 additions & 30 deletions .travis.yml

This file was deleted.

114 changes: 63 additions & 51 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,60 +1,72 @@
Package: dabestr
Type: Package
Title: Data Analysis using Bootstrap-Coupled Estimation
Version: 0.3.0
Version: 2023.9.12
Authors@R: c(
person("Joses W.", "Ho",
email = "[email protected]", role = c("cre", "aut")),
person("Tayfun", "Tumkaya",
role = c("aut"))
)
Maintainer: Joses W. Ho <[email protected]>
person("Yishan", "Mai", email = "[email protected]", role = c("cre", "ctb"),
comment = c(ORCID = "0000-0002-7199-380X")),
person("Kah Seng", "Lian", email = "[email protected]", role = c("aut")),
person("Zhuoyu", "Wang", email = "[email protected],edu", role = "aut"),
person("Jun Yang", "Liao", email = "[email protected]", role = "aut"),
person("Joses W.", "Ho", email = "[email protected]", role = "aut",
comment = c(ORCID = "0000-0002-9186-6322")),
person("Tayfun", "Tumkaya", role = "aut",
comment = c(ORCID = "0000-0001-8425-3360")),
person("Felicia", "Low", role = "aut", email = "[email protected]"),
person("Adam", "Claridge-Chang", role = "ctb",
comment = c(ORCID = "0000-0002-4583-3650")),
person("Hyungwon", "Choi", role = "ctb",
comment = c(ORCID = "0000-0002-6687-3088")),
person("Sangyu", "Xu", role = "ctb",
comment = c(ORCID = "0000-0002-4927-9204")),
person("ACCLAB", role = c("cph", "fnd")))
Description: Data Analysis using Bootstrap-Coupled ESTimation.
Estimation statistics is a simple framework that avoids the pitfalls of
significance testing. It uses familiar statistical concepts: means,
mean differences, and error bars. More importantly, it focuses on the
effect size of one's experiment/intervention, as opposed to a false
dichotomy engendered by P values.
An estimation plot has two key features:
1. It presents all datapoints as a swarmplot, which orders each point to
display the underlying distribution.
2. It presents the effect size as a bootstrap 95% confidence interval on a
separate but aligned axes.
Estimation plots are introduced in Ho et al., Nature Methods 2019, 1548-7105.
<doi:10.1038/s41592-019-0470-3>.
The free-to-view PDF is located at <https://rdcu.be/bHhJ4>.
License: file LICENSE
URL: https://github.com/ACCLAB/dabestr
BugReports: https://github.com/ACCLAB/dabestr/issues
Estimation statistics is a simple framework that avoids the pitfalls of
significance testing. It uses familiar statistical concepts: means,
mean differences, and error bars. More importantly, it focuses on the
effect size of one's experiment/intervention, as opposed to a false
dichotomy engendered by P values.
An estimation plot has two key features:
1. It presents all datapoints as a swarmplot, which orders each point to
display the underlying distribution.
2. It presents the effect size as a bootstrap 95% confidence interval on a
separate but aligned axes.
Estimation plots are introduced in Ho et al., Nature Methods 2019, 1548-7105.
<doi:10.1038/s41592-019-0470-3>.
The free-to-view PDF is located at <https://www.nature.com/articles/s41592-019-0470-3.epdf?author_access_token=Euy6APITxsYA3huBKOFBvNRgN0jAjWel9jnR3ZoTv0Pr6zJiJ3AA5aH4989gOJS_dajtNr1Wt17D0fh-t4GFcvqwMYN03qb8C33na_UrCUcGrt-Z0J9aPL6TPSbOxIC-pbHWKUDo2XsUOr3hQmlRew%3D%3D>.
License: Apache License (>= 2)
Encoding: UTF-8
LazyData: true
URL: https://github.com/ACCLAB/dabestr,
https://acclab.github.io/dabestr/
Depends:
R (>= 3.5.0),
magrittr,
stats,
utils
Imports:
boot,
cowplot,
dplyr,
effsize,
ellipsis,
ggplot2 (>= 3.2),
forcats,
ggforce,
ggbeeswarm,
plyr,
RColorBrewer,
rlang,
simpleboot,
stringr,
tibble,
tidyr,
RoxygenNote: 7.1.0
Suggests:
R (>= 2.10)
Imports:
ggplot2,
cowplot,
tidyr,
dplyr,
tibble,
rlang,
magrittr,
ggbeeswarm,
effsize,
grid,
scales,
ggsci,
cli,
boot,
stats,
stringr,
brunnermunzel,
methods
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.2.3
Suggests:
testthat (>= 3.0.0),
vdiffr,
knitr,
rmarkdown,
tufte,
testthat,
vdiffr
VignetteBuilder: knitr
kableExtra
Config/testthat/edition: 3
LazyData: true
VignetteBuilder: knitr, kableExtra
31 changes: 0 additions & 31 deletions LICENSE

This file was deleted.

Loading