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

Add new package infrastructure (epichains classes and methods) #33

Merged
merged 300 commits into from
Sep 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
300 commits
Select commit Hold shift + click to select a range
173b535
Replaced subset() call with [ call
jamesmbaazam Jun 14, 2023
4a82acd
Removed old chain_ll() tests
jamesmbaazam Jun 14, 2023
38f7827
Replaced calls to sim_chain_tree() with simulate_tree()
jamesmbaazam Jun 14, 2023
fde4d28
Fixed wrong call to simulate_vect() as simulate_vec()
jamesmbaazam Jun 14, 2023
61399dd
Fixed examples with right function and argument names
jamesmbaazam Jun 14, 2023
3d35345
Added export tags
jamesmbaazam Jun 14, 2023
5061df1
Fixed the documentation of plot()
jamesmbaazam Jun 14, 2023
f9ebb90
Added explicit namespacing for imports
jamesmbaazam Jun 14, 2023
face313
Removed example tag from format method
jamesmbaazam Jun 14, 2023
2f60dcc
Added code to calculate cases per generation
jamesmbaazam Jun 14, 2023
e4ed273
Cleaned up documentation of the head and tail methods
jamesmbaazam Jun 14, 2023
84f7eea
Documented validate_epichains() and is_epichains()
jamesmbaazam Jun 14, 2023
d418294
Replaced "x" with "object" in summary method to align with generic
jamesmbaazam Jun 14, 2023
e29ff97
Cleaned up documentation of update_chain_stat()
jamesmbaazam Jun 14, 2023
802bddb
Cleaned up documentation of get_offspring_func()
jamesmbaazam Jun 14, 2023
426fafb
Deleted old arguments of get_offspring_func()
jamesmbaazam Jun 14, 2023
e4ea41b
Added required arguments to truncated poisson function
jamesmbaazam Jun 14, 2023
e28486d
Replaced old tests with a minimal set of tests for the simulate_ fami…
jamesmbaazam Jun 14, 2023
3aceca7
Reworded title of estimate_likelihood
jamesmbaazam Jun 14, 2023
7cf1be3
Redocumented estimate_likelihood() owing to new and renamed arguments
jamesmbaazam Jun 14, 2023
59939c6
Reset up the arguments to estimate_likelihood()
jamesmbaazam Jun 14, 2023
08ac9d6
Renamed infinite to chain_stat_max and offspring to offspring_sampler
jamesmbaazam Jun 14, 2023
2503074
Minor styling
jamesmbaazam Jun 14, 2023
57da0cf
Renamed "stat" to "chain_statistic"
jamesmbaazam Jun 14, 2023
1fafb51
Renamed "x" to "chains_observed"
jamesmbaazam Jun 14, 2023
3b7311c
Ignore test_refactoring script
jamesmbaazam Jun 14, 2023
e8099f8
Added comments to offspring_ll
jamesmbaazam Jun 14, 2023
73a64dc
Renamed the arguments in offspring_ll
jamesmbaazam Jun 14, 2023
7845256
Replaced chain_sim() with simulate_tree() in offspring_ll()
jamesmbaazam Jun 14, 2023
28bbab5
Replaced chain_ll() and chain_sim() with new versions
jamesmbaazam Jun 14, 2023
3139128
Moved ecdf calculation under new comment
jamesmbaazam Jun 14, 2023
1d29c0e
Introduced the log_trans argument to log transform output of offsprin…
jamesmbaazam Jun 14, 2023
a066f64
Redocumented offspring_ll()
jamesmbaazam Jun 14, 2023
7b6e8d8
Minor: added new lines
jamesmbaazam Jun 14, 2023
1703cbe
Documented check_offspring_valid()
jamesmbaazam Jun 14, 2023
b13d455
Documented check_offspring_func_valid()
jamesmbaazam Jun 14, 2023
bd2c9e4
Documented check_nchains_valid()
jamesmbaazam Jun 14, 2023
606e2d9
Documented check_serial_valid()
jamesmbaazam Jun 14, 2023
5690692
Renamed "offspring" to "offspring_sampler" in check_offspring_valid()
jamesmbaazam Jun 14, 2023
100a568
Fixed linting issues
jamesmbaazam Jun 14, 2023
34cc03c
Deleted forecasting vignette as belongs to bpmodels
jamesmbaazam Jun 14, 2023
f9f50de
Deleted references file (for now)
jamesmbaazam Jun 14, 2023
1babf8f
Regenerated roxygen docs
jamesmbaazam Jun 14, 2023
e7c8628
Regenerated docs for offspring_ll
jamesmbaazam Jun 14, 2023
7f5a4ff
Added two more helper functions
jamesmbaazam Jun 14, 2023
2d57173
Replaced a wrong call of simulate_tree() with simulate_vect()
jamesmbaazam Jun 14, 2023
d5251b6
Added a log_trans argument for log-transforming the likelihoods
jamesmbaazam Jun 14, 2023
31ba0ec
Replaced input checking with a helper function
jamesmbaazam Jun 14, 2023
2f4e354
Added curly brackets to inline function to improve readability
jamesmbaazam Jun 14, 2023
934e2e7
Replaced explicit code with helper functions
jamesmbaazam Jun 14, 2023
6ed4696
Linting
jamesmbaazam Jun 14, 2023
e235b32
Changed n to nchains to fix a partial matching issue
jamesmbaazam Jun 15, 2023
6d95e49
Added a check for the chains_tree attribute
jamesmbaazam Jun 15, 2023
491b96a
Added aggregate to NAMESPACE
jamesmbaazam Jun 15, 2023
9b8ddca
Added a check for the epichains_aggregate_df class
jamesmbaazam Jun 15, 2023
85610b2
Rewrote plot() to use objects aggregated through aggregate()
jamesmbaazam Jun 15, 2023
c7423f8
Added an aggregate method
jamesmbaazam Jun 15, 2023
92d525a
Regenerated roxygen docs
jamesmbaazam Jun 15, 2023
51d5905
Cleaned up documentation for the plot method
jamesmbaazam Jun 16, 2023
0455c2c
Added utils to imports
jamesmbaazam Jun 16, 2023
11404b1
Unexported is_epichains()
jamesmbaazam Jun 16, 2023
ee8ab1b
Imported functions from graphics and stats
jamesmbaazam Jun 16, 2023
bdbec4f
Add keyword internal to is_epichains
jamesmbaazam Jun 16, 2023
7016ec6
Redocumented the plot method
jamesmbaazam Jun 16, 2023
bb6cab2
Made is_epichains internal
jamesmbaazam Jun 16, 2023
04fb50b
Cleaned up plotting method roxygen docs
jamesmbaazam Jun 16, 2023
ab50748
Fixed example tag
jamesmbaazam Jun 16, 2023
4ec7258
Fixed the returned structure from the aggregate method
jamesmbaazam Jun 16, 2023
f9ec21a
Tightened the check for the chains_tree attribute in the aggregate me…
jamesmbaazam Jun 16, 2023
920afe4
Styled the code
jamesmbaazam Jun 16, 2023
991e92e
Removed the type argument passed to barplot
jamesmbaazam Jun 16, 2023
db3c3f4
Imported aggregate generic
jamesmbaazam Jun 16, 2023
0c98810
Removed plotting method
jamesmbaazam Jun 16, 2023
1392f9d
Linting
jamesmbaazam Jun 16, 2023
eb35919
Added demo vignette
jamesmbaazam Jul 26, 2023
fd3cf16
Added print and summary methods for epichains class
jamesmbaazam Jun 6, 2023
4f7ef31
Added separate simulators for transmission chain trees and transmissi…
jamesmbaazam Jun 6, 2023
06d18ab
Added a script with input checking functions
jamesmbaazam Jun 12, 2023
6d0fd28
Added a script for helper functions
jamesmbaazam Jun 12, 2023
78e2bb6
Restructured the references
jamesmbaazam Jun 12, 2023
62f7c3d
Renamed infinite to chain_stat_max
jamesmbaazam Jun 12, 2023
bde57b7
Deleted chain_sim function
jamesmbaazam Jun 12, 2023
4cfd97c
Renamed tdf to tree_df
jamesmbaazam Jun 12, 2023
5965d7a
Renamed infinite to chain_stat_max
jamesmbaazam Jun 12, 2023
cf51d65
Modified simulate_tree title
jamesmbaazam Jun 12, 2023
5d00099
Changed the tree_df column names
jamesmbaazam Jun 12, 2023
3877b51
FixModified epichains object attributes
jamesmbaazam Jun 12, 2023
d0d14c0
Replaced old function names with new in function docs
jamesmbaazam Jun 12, 2023
e6ad11e
Documented chain_stat_max in simulate_vec()
jamesmbaazam Jun 12, 2023
82c79be
Moved checking functions
jamesmbaazam Jun 12, 2023
e5905b5
Updated the column names for col-type validation
jamesmbaazam Jun 12, 2023
003900e
Restructured the format method for epichains objects
jamesmbaazam Jun 12, 2023
8a15d98
Added a functions for simulating infections with an initial susceptib…
jamesmbaazam Jun 12, 2023
debfd09
Added an epichains attribute to indicate if pop is tracked
jamesmbaazam Jun 12, 2023
8c67f09
Now summarising maximum generations
jamesmbaazam Jun 12, 2023
cfafb53
Added epichains validation to summary method
jamesmbaazam Jun 12, 2023
558b8d1
Removed chain_id column as an invariant of epichains class
jamesmbaazam Jun 12, 2023
0daed65
Added a function to extract truncated poisson or nbinom function
jamesmbaazam Jun 12, 2023
8c9912d
Added epichains class to simulation function
jamesmbaazam Jun 12, 2023
8a0d3d6
Moved the offspring function definition to the helper script
jamesmbaazam Jun 12, 2023
7c37c60
Documented the simulation function
jamesmbaazam Jun 12, 2023
3236f3a
Reworded an error and warning
jamesmbaazam Jun 12, 2023
ae52501
Renamed the function
jamesmbaazam Jun 12, 2023
888c6d9
Added an example for negative binomial offspring
jamesmbaazam Jun 12, 2023
9871238
Renamed some variables
jamesmbaazam Jun 12, 2023
39c5b19
Linting: removed whitespaces
jamesmbaazam Jun 12, 2023
be75f98
Added methods for head() and tail()
jamesmbaazam Jun 13, 2023
e49f2f1
Added a plotting method for epichains objects with chains_tree attribute
jamesmbaazam Jun 13, 2023
6c1f71e
Moved chain_ll and helpers here
jamesmbaazam Jun 13, 2023
b179704
Moved chain_ll from here
jamesmbaazam Jun 13, 2023
2a5878a
Added script for testing refactored functions
jamesmbaazam Jun 13, 2023
bbd3871
Removed redundant roxygen tags
jamesmbaazam Jun 13, 2023
3c63ef2
Added stats to imports
jamesmbaazam Jun 14, 2023
da955f2
Regenerated function docs
jamesmbaazam Jun 14, 2023
0f3a3e6
Regenerated NAMESPACE
jamesmbaazam Jun 14, 2023
156a4f7
Changed old argument documentation to sentence case
jamesmbaazam Jun 14, 2023
fa684fc
Documented the print method
jamesmbaazam Jun 14, 2023
63c0218
Removed tibble import
jamesmbaazam Jun 14, 2023
a44f9dd
Replaced subset() call with [ call
jamesmbaazam Jun 14, 2023
d6f3dbe
Removed old chain_ll() tests
jamesmbaazam Jun 14, 2023
23a87b1
Replaced calls to sim_chain_tree() with simulate_tree()
jamesmbaazam Jun 14, 2023
078838c
Fixed wrong call to simulate_vect() as simulate_vec()
jamesmbaazam Jun 14, 2023
f8aef61
Fixed examples with right function and argument names
jamesmbaazam Jun 14, 2023
15bd6a3
Added export tags
jamesmbaazam Jun 14, 2023
fd08286
Fixed the documentation of plot()
jamesmbaazam Jun 14, 2023
bbee2e4
Added explicit namespacing for imports
jamesmbaazam Jun 14, 2023
48a8e08
Removed example tag from format method
jamesmbaazam Jun 14, 2023
2d53694
Added code to calculate cases per generation
jamesmbaazam Jun 14, 2023
30d9b31
Cleaned up documentation of the head and tail methods
jamesmbaazam Jun 14, 2023
1ea1d28
Documented validate_epichains() and is_epichains()
jamesmbaazam Jun 14, 2023
385e844
Replaced "x" with "object" in summary method to align with generic
jamesmbaazam Jun 14, 2023
fd63974
Cleaned up documentation of update_chain_stat()
jamesmbaazam Jun 14, 2023
529472c
Cleaned up documentation of get_offspring_func()
jamesmbaazam Jun 14, 2023
de77b1d
Deleted old arguments of get_offspring_func()
jamesmbaazam Jun 14, 2023
1ff61a0
Added required arguments to truncated poisson function
jamesmbaazam Jun 14, 2023
de705a3
Reworded title of estimate_likelihood
jamesmbaazam Jun 14, 2023
5c10e03
Redocumented estimate_likelihood() owing to new and renamed arguments
jamesmbaazam Jun 14, 2023
549f1a3
Reset up the arguments to estimate_likelihood()
jamesmbaazam Jun 14, 2023
c4f1b35
Renamed infinite to chain_stat_max and offspring to offspring_sampler
jamesmbaazam Jun 14, 2023
6d05f19
Minor styling
jamesmbaazam Jun 14, 2023
f3cffca
Renamed "stat" to "chain_statistic"
jamesmbaazam Jun 14, 2023
792bea4
Renamed "x" to "chains_observed"
jamesmbaazam Jun 14, 2023
b8be0a4
Ignore test_refactoring script
jamesmbaazam Jun 14, 2023
41fa15b
Added comments to offspring_ll
jamesmbaazam Jun 14, 2023
1a5fe6a
Renamed the arguments in offspring_ll
jamesmbaazam Jun 14, 2023
46bedc5
Replaced chain_sim() with simulate_tree() in offspring_ll()
jamesmbaazam Jun 14, 2023
59e3ddc
Moved ecdf calculation under new comment
jamesmbaazam Jun 14, 2023
e928f56
Introduced the log_trans argument to log transform output of offsprin…
jamesmbaazam Jun 14, 2023
ca456fa
Minor: added new lines
jamesmbaazam Jun 14, 2023
0a76ea6
Documented check_offspring_valid()
jamesmbaazam Jun 14, 2023
27a9601
Documented check_offspring_func_valid()
jamesmbaazam Jun 14, 2023
b3123a5
Documented check_nchains_valid()
jamesmbaazam Jun 14, 2023
3814cfc
Documented check_serial_valid()
jamesmbaazam Jun 14, 2023
f3b5663
Renamed "offspring" to "offspring_sampler" in check_offspring_valid()
jamesmbaazam Jun 14, 2023
54a6fc9
Fixed linting issues
jamesmbaazam Jun 14, 2023
ea76a99
Deleted references file (for now)
jamesmbaazam Jun 14, 2023
d1a5f4b
Regenerated docs for offspring_ll
jamesmbaazam Jun 14, 2023
0ee43be
Added two more helper functions
jamesmbaazam Jun 14, 2023
f4ad055
Replaced a wrong call of simulate_tree() with simulate_vect()
jamesmbaazam Jun 14, 2023
ef3bb32
Added a log_trans argument for log-transforming the likelihoods
jamesmbaazam Jun 14, 2023
cbb576b
Replaced input checking with a helper function
jamesmbaazam Jun 14, 2023
68ada76
Added curly brackets to inline function to improve readability
jamesmbaazam Jun 14, 2023
af65b8c
Replaced explicit code with helper functions
jamesmbaazam Jun 14, 2023
dcb7626
Linting
jamesmbaazam Jun 14, 2023
1c9927e
Changed n to nchains to fix a partial matching issue
jamesmbaazam Jun 15, 2023
ede06d2
Added a check for the chains_tree attribute
jamesmbaazam Jun 15, 2023
af56693
Added aggregate to NAMESPACE
jamesmbaazam Jun 15, 2023
3197cab
Added a check for the epichains_aggregate_df class
jamesmbaazam Jun 15, 2023
17560c5
Rewrote plot() to use objects aggregated through aggregate()
jamesmbaazam Jun 15, 2023
bf160c5
Added an aggregate method
jamesmbaazam Jun 15, 2023
74a3a47
Regenerated roxygen docs
jamesmbaazam Jun 15, 2023
5b2f8fe
Cleaned up documentation for the plot method
jamesmbaazam Jun 16, 2023
6f51a08
Added utils to imports
jamesmbaazam Jun 16, 2023
5e3a231
Unexported is_epichains()
jamesmbaazam Jun 16, 2023
96ad40b
Imported functions from graphics and stats
jamesmbaazam Jun 16, 2023
77ce75b
Add keyword internal to is_epichains
jamesmbaazam Jun 16, 2023
9deae2c
Redocumented the plot method
jamesmbaazam Jun 16, 2023
18d8ad2
Made is_epichains internal
jamesmbaazam Jun 16, 2023
76367c4
Cleaned up plotting method roxygen docs
jamesmbaazam Jun 16, 2023
d765e66
Fixed example tag
jamesmbaazam Jun 16, 2023
86b4ae0
Fixed the returned structure from the aggregate method
jamesmbaazam Jun 16, 2023
f31305e
Tightened the check for the chains_tree attribute in the aggregate me…
jamesmbaazam Jun 16, 2023
667fcf2
Styled the code
jamesmbaazam Jun 16, 2023
be409b4
Removed the type argument passed to barplot
jamesmbaazam Jun 16, 2023
5f9dad1
Imported aggregate generic
jamesmbaazam Jun 16, 2023
edb6572
Removed plotting method
jamesmbaazam Jun 16, 2023
1dbd00f
Linting
jamesmbaazam Jun 16, 2023
30ed39b
Updated .lintr to match up with packagetemplate
jamesmbaazam Jul 26, 2023
c8c62e9
Fixed minor issues with the .lintr file
jamesmbaazam Jul 26, 2023
b73c47b
Modified some comments to avoid lintr issues with commented code
jamesmbaazam Jul 26, 2023
b342ee5
Removed line in gitignore
jamesmbaazam Jul 26, 2023
93360b0
Revised the package title and description
jamesmbaazam Jul 26, 2023
5cb4f11
Added a workflow for keeping the CITATION.cff file up to date
jamesmbaazam Jul 26, 2023
fbc70f2
Changed the version to 0.1.0 and rearranged the author/contributor names
jamesmbaazam Jul 26, 2023
a05d82b
Added a draft of NEWS for epichains v0.1.0
jamesmbaazam Jul 26, 2023
1717ece
Replaced custom tests with checkmate functions
jamesmbaazam Jul 26, 2023
2272cb8
Renamed the demo vignette
jamesmbaazam Jul 26, 2023
0fd8790
Ordered the tree data.frame by sim_id and ancestor for printing
jamesmbaazam Jul 26, 2023
ae9aed0
Replaced `View()` with `as.data.frame()` in the printed comments
jamesmbaazam Jul 26, 2023
4739a03
Replaced duplicated checks for attributes with helper functions
jamesmbaazam Jul 26, 2023
161cac0
Improved the summary method to deal with all-infinite chain stats
jamesmbaazam Jul 26, 2023
aa24baa
Moved this function elsewhere
jamesmbaazam Jul 26, 2023
6e4ca8b
Replaced custom checks with equivalents from checkmate pkg
jamesmbaazam Jul 26, 2023
573d35f
Modified function to return a logical
jamesmbaazam Jul 26, 2023
dae341c
Replaced custom checks for attributes with helper functions
jamesmbaazam Jul 26, 2023
aef6381
Added author tags
jamesmbaazam Jul 26, 2023
d1f6179
Revised the function docs
jamesmbaazam Jul 26, 2023
80cc3c4
Revised the README
jamesmbaazam Jul 26, 2023
1d0c54d
Added a references file
jamesmbaazam Jul 26, 2023
62c7f9f
Generated the MD version of the README
jamesmbaazam Jul 26, 2023
880de10
Fixed an error resulting from the author list
jamesmbaazam Jul 26, 2023
1076b8b
Now exporting the "is_" family of internal functions
jamesmbaazam Jul 26, 2023
0b67feb
Fixed some linting issues
jamesmbaazam Jul 26, 2023
704c4b3
Regenerated the function .Rd files and NAMESPACE
jamesmbaazam Jul 26, 2023
c79e884
Update CITATION.cff
actions-user Jul 26, 2023
4c768a8
Used is_ function to check for attributes
jamesmbaazam Jul 27, 2023
6009087
Removed the "time" column from the invariants
jamesmbaazam Jul 27, 2023
858e7b1
Customized the head() and tail() to sort the object before printing t…
jamesmbaazam Jul 27, 2023
714080d
Updated the title for get_offspring_func()
jamesmbaazam Jul 27, 2023
525a55c
Removed an indentation.R
jamesmbaazam Jul 27, 2023
6e7a169
Remove "tbl" from the list of classes
jamesmbaazam Aug 1, 2023
9791af1
Now sorting tree_df by sim_id and ancestor in the simulation functions
jamesmbaazam Aug 1, 2023
788864f
Modified the epichains vector printing method
jamesmbaazam Aug 1, 2023
5f5f873
Moved the sorting operation to the simulation functions
jamesmbaazam Aug 1, 2023
590c493
Moved the headers from the format method to the head and tail methods
jamesmbaazam Aug 1, 2023
ee37fa1
Edited the details
jamesmbaazam Aug 1, 2023
025ada8
Deleted unused function
jamesmbaazam Aug 1, 2023
cd95587
Removed "chain" from argument and function names
jamesmbaazam Aug 1, 2023
adabc28
Removed doc file of deleted function
jamesmbaazam Aug 1, 2023
8258ee4
Added details to the head() and tail() methods
jamesmbaazam Aug 1, 2023
fb495ac
Replaced the old argument names in the vignette
jamesmbaazam Aug 1, 2023
8f2dc39
Added an example of likelihood estimation to the vignette
jamesmbaazam Aug 1, 2023
348d082
Replaced the renamed arguments
jamesmbaazam Aug 1, 2023
450e8f5
Renamed chains_vec/vect to chains_summary
jamesmbaazam Aug 7, 2023
1a57d09
Renamed data to covid19_sa
jamesmbaazam Aug 7, 2023
2c095a6
Renamed likelihoods.R to stat_likelihoods.R and estimate_likelihood()…
jamesmbaazam Aug 7, 2023
de2329e
Linting
jamesmbaazam Aug 7, 2023
a0aa152
Removed unnecessary summaries
jamesmbaazam Aug 7, 2023
214f1f0
Cleaned up number of chains calculation
jamesmbaazam Aug 7, 2023
d5e0e46
Revised object names in the vignette
jamesmbaazam Aug 7, 2023
1498e3a
Used explicit arguments in the vignette
jamesmbaazam Aug 7, 2023
7668071
Loaded epichains in the vignette
jamesmbaazam Aug 7, 2023
59268b5
Fixed the duplicated chains_ran calculation
jamesmbaazam Aug 7, 2023
c03bc07
Cleaned up the summary method
jamesmbaazam Aug 7, 2023
444eb93
Added the statistic argument to the attributes returned by simulate_s…
jamesmbaazam Aug 7, 2023
aab09cc
Changed the chains simulated to 50 from 10
jamesmbaazam Aug 7, 2023
3a3bbf6
Fixed an error in the chains simulated summary extraction
jamesmbaazam Aug 7, 2023
a93a566
Remove NextMethod() calls
jamesmbaazam Aug 8, 2023
4fe4868
Improved error message
jamesmbaazam Aug 31, 2023
7e9665a
Cleaned up the changelog
jamesmbaazam Aug 31, 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
49 changes: 49 additions & 0 deletions .github/workflows/update-citation-cff.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
# The action runs when:
# - A new release is published
# - The DESCRIPTION or inst/CITATION are modified
# - Can be run manually
# For customizing the triggers, visit https://docs.github.com/en/actions/learn-github-actions/events-that-trigger-workflows
on:
release:
types: [published]
push:
paths:
- DESCRIPTION
- inst/CITATION
- .github/workflows/update-citation-cff.yaml
workflow_dispatch:

name: Update CITATION.cff

jobs:
update-citation-cff:
runs-on: ubuntu-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v3
- uses: r-lib/actions/setup-r@v2
- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: |
any::cffr
any::V8
- name: Update CITATION.cff
run: |
library(cffr)
# Customize with your own code
# See https://docs.ropensci.org/cffr/articles/cffr.html
# Write your own keys
mykeys <- list()
# Create your CITATION.cff file
cff_write(keys = mykeys)
shell: Rscript {0}

- name: Commit results
run: |
git config --local user.email "[email protected]"
git config --local user.name "GitHub Action"
git add CITATION.cff
git commit -m 'Update CITATION.cff' || echo "No changes to commit"
git push origin || echo "No changes to commit"
10 changes: 7 additions & 3 deletions .lintr
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ linters: linters_with_tags(
extraction_operator_linter = NULL,
todo_comment_linter = NULL,
function_argument_linter = NULL,
cyclocomp_linter = NULL,
# Use minimum R declared in DESCRIPTION or fall back to current R version
indentation_linter = NULL, # unstable as of lintr 3.1.0
# Use minimum R declared in DESCRIPTION or fall back to current R version.
# Install etdev package from https://github.com/epiverse-trace/etdev
backport_linter(if (length(x <- etdev::extract_min_r_version())) x else getRversion())
)
)
exclusions: list(
"tests/testthat.R" = list(unused_import_linter = Inf)
)
128 changes: 97 additions & 31 deletions CITATION.cff
Original file line number Diff line number Diff line change
@@ -1,47 +1,57 @@
# -----------------------------------------------------------
# CITATION file created with {cffr} R package, v0.4.1
# CITATION file created with {cffr} R package, v0.5.0
# See also: https://docs.ropensci.org/cffr/
# -----------------------------------------------------------

cff-version: 1.2.0
message: 'To cite package "bpmodels" in publications use:'
message: 'To cite package "epichains" in publications use:'
type: software
license: MIT
title: 'bpmodels: Analysing transmission chain statistics using branching process
models'
version: 0.2.0
abstract: Provides methods to analyse and simulate the size and length of branching
title: 'epichains: Simulating and Analysing Transmission Chain Statistics Using Branching
Process Models'
version: 0.1.0
abstract: Provides methods to simulate and analyse the size and length of branching
processes with an arbitrary offspring distribution. These can be used, for example,
to analyse the distribution of chain sizes or length of infectious disease outbreaks,
as discussed in Farrington et al. (2003) <doi:10.1093/biostatistics/4.2.279>.
authors:
- family-names: Funk
given-names: Sebastian
email: [email protected]
orcid: https://orcid.org/0000-0002-2842-3406
- family-names: Finger
given-names: Flavio
email: [email protected]
orcid: https://orcid.org/0000-0002-8613-5170
- family-names: Azam
given-names: James M.
email: [email protected]
orcid: https://orcid.org/0000-0001-5782-7330
repository-code: https://github.com/epiverse-trace/bpmodels
url: https://epiverse-trace.github.io/bpmodels/
- family-names: Finger
given-names: Flavio
email: [email protected]
orcid: https://orcid.org/0000-0002-8613-5170
- family-names: Funk
given-names: Sebastian
email: [email protected]
orcid: https://orcid.org/0000-0002-2842-3406
preferred-citation:
type: manual
title: 'epichains: Analysing transmission chain statistics using branching process
models'
sbfnk marked this conversation as resolved.
Show resolved Hide resolved
authors:
- name: Sebastian Funk
- name: Flavio Finger
- name: James M. Azam
year: '2023'
url: https://github.com/epiverse-trace/epichains/
repository-code: https://github.com/epiverse-trace/epichains
url: https://epiverse-trace.github.io/epichains/
contact:
- family-names: Azam
given-names: James M.
email: [email protected]
orcid: https://orcid.org/0000-0001-5782-7330
keywords:
- branching-process
- branching-processes
- epidemic-dynamics
- epidemic-modelling
- epidemic-simulations
- outbreak-simulator
- r
- r-package
- r-stats
- transmission-chain
- transmission-chain-reconstruction
references:
Expand All @@ -56,7 +66,41 @@ references:
year: '2023'
institution:
name: R Foundation for Statistical Computing
version: '>= 3.0.0'
version: '>= 3.6.0'
- type: software
title: checkmate
abstract: 'checkmate: Fast and Versatile Argument Checks'
notes: Imports
url: https://mllg.github.io/checkmate/
repository: https://CRAN.R-project.org/package=checkmate
authors:
- family-names: Lang
given-names: Michel
email: [email protected]
orcid: https://orcid.org/0000-0001-9754-0393
year: '2023'
- type: software
title: stats
abstract: 'R: A Language and Environment for Statistical Computing'
notes: Imports
authors:
- name: R Core Team
location:
name: Vienna, Austria
year: '2023'
institution:
name: R Foundation for Statistical Computing
- type: software
title: utils
abstract: 'R: A Language and Environment for Statistical Computing'
notes: Imports
authors:
- name: R Core Team
location:
name: Vienna, Austria
year: '2023'
institution:
name: R Foundation for Statistical Computing
- type: software
title: bookdown
abstract: 'bookdown: Authoring Books and Technical Documents with R Markdown'
Expand Down Expand Up @@ -190,37 +234,55 @@ references:
authors:
- family-names: Allaire
given-names: JJ
email: jj@rstudio.com
email: jj@posit.co
- family-names: Xie
given-names: Yihui
email: [email protected]
orcid: https://orcid.org/0000-0003-0645-5666
- family-names: Dervieux
given-names: Christophe
email: [email protected]
orcid: https://orcid.org/0000-0003-4474-2498
- family-names: McPherson
given-names: Jonathan
email: jonathan@rstudio.com
email: jonathan@posit.co
- family-names: Luraschi
given-names: Javier
email: [email protected]
- family-names: Ushey
given-names: Kevin
email: kevin@rstudio.com
email: kevin@posit.co
- family-names: Atkins
given-names: Aron
email: aron@rstudio.com
email: aron@posit.co
- family-names: Wickham
given-names: Hadley
email: hadley@rstudio.com
email: hadley@posit.co
- family-names: Cheng
given-names: Joe
email: joe@rstudio.com
email: joe@posit.co
- family-names: Chang
given-names: Winston
email: winston@rstudio.com
email: winston@posit.co
- family-names: Iannone
given-names: Richard
email: rich@rstudio.com
email: rich@posit.co
orcid: https://orcid.org/0000-0003-3925-190X
year: '2023'
- type: software
title: spelling
abstract: 'spelling: Tools for Spell Checking in R'
notes: Suggests
url: https://docs.ropensci.org/spelling/
repository: https://CRAN.R-project.org/package=spelling
authors:
- family-names: Ooms
given-names: Jeroen
email: [email protected]
orcid: https://orcid.org/0000-0002-4035-0289
- family-names: Hester
given-names: Jim
email: [email protected]
year: '2023'
- type: software
title: testthat
abstract: 'testthat: Unit Testing for R'
Expand All @@ -230,7 +292,7 @@ references:
authors:
- family-names: Wickham
given-names: Hadley
email: hadley@rstudio.com
email: hadley@posit.co
year: '2023'
- type: software
title: truncdist
Expand All @@ -254,14 +316,18 @@ references:
authors:
- family-names: Wickham
given-names: Hadley
email: hadley@rstudio.com
email: hadley@posit.co
orcid: https://orcid.org/0000-0003-4757-117X
- family-names: Bryan
given-names: Jennifer
email: jenny@rstudio.com
email: jenny@posit.co
orcid: https://orcid.org/0000-0002-6983-2759
- family-names: Barrett
given-names: Malcolm
email: [email protected]
orcid: https://orcid.org/0000-0003-0299-5825
- family-names: Teucher
given-names: Andy
email: [email protected]
orcid: https://orcid.org/0000-0002-7840-692X
year: '2023'
53 changes: 20 additions & 33 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,45 +1,32 @@
Package: epichains
Title: Analysing transmission chain statistics using branching process models
Version: 0.2.1
Title: Simulating and Analysing Transmission Chain Statistics Using Branching Process
Models
Version: 0.1.0
Authors@R: c(
person(
given = "Sebastian",
family = "Funk",
email = "[email protected]",
role = "aut",
comment = c(ORCHID = "https://orcid.org/0000-0002-2842-3406")
),
person(
given = "Zhian N.",
family = "Kamvar",
email = "[email protected]",
role = "ctb",
comment = c(ORCHID = "https://orcid.org/0000-0003-1458-7108")
),
person(
given = "Flavio",
family = "Finger",
email = "[email protected]",
role = "aut",
comment = c(ORCHID = "https://orcid.org/0000-0002-8613-5170")
),
person(
given = "James M.",
family = "Azam",
email = "[email protected]",
role = c("aut", "cre"),
comment = c(ORCHID = "https://orcid.org/0000-0001-5782-7330"))
)
Description: Provides methods to analyse and simulate the size and length
person("James M.", "Azam", , "[email protected]", role = c("aut", "cre"),
comment = c(ORCID = "https://orcid.org/0000-0001-5782-7330")),
person("Zhian N.", "Kamvar", , "[email protected]", role = "ctb",
comment = c(ORCID = "https://orcid.org/0000-0003-1458-7108")),
person("Flavio", "Finger", , "[email protected]", role = "aut",
comment = c(ORCID = "https://orcid.org/0000-0002-8613-5170")),
person("Sebastian", "Funk", , "[email protected]", role = "aut",
comment = c(ORCID = "https://orcid.org/0000-0002-2842-3406"))
)
Description: Provides methods to simulate and analyse the size and length
of branching processes with an arbitrary offspring distribution. These
can be used, for example, to analyse the distribution of chain sizes
or length of infectious disease outbreaks, as discussed in Farrington
et al. (2003) <doi:10.1093/biostatistics/4.2.279>.
License: MIT + file LICENSE
URL: https://github.com/epiverse-trace/epichains, https://epiverse-trace.github.io/epichains/
URL: https://github.com/epiverse-trace/epichains,
https://epiverse-trace.github.io/epichains/
BugReports: https://github.com/epiverse-trace/epichains/issues
Depends:
R (>= 3.6.0)
Imports:
checkmate,
stats,
utils
Suggests:
bookdown,
covr,
Expand All @@ -53,11 +40,11 @@ Suggests:
testthat,
truncdist,
usethis
Config/testthat/edition: 3
VignetteBuilder:
knitr
Remotes:
github::epiverse-trace/epiparameter
Config/testthat/edition: 3
Encoding: UTF-8
LazyData: true
Roxygen: list(markdown = TRUE)
Expand Down
24 changes: 21 additions & 3 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,6 +1,24 @@
# Generated by roxygen2: do not edit by hand

export(chain_ll)
export(chain_sim)
export(chain_sim_susc)
S3method(aggregate,epichains)
S3method(format,epichains)
S3method(head,epichains)
S3method(print,epichains)
S3method(summary,epichains)
S3method(tail,epichains)
export(dborel)
export(is_chains_summary)
export(is_chains_tree)
export(is_epichains)
export(is_epichains_aggregate_df)
export(likelihood)
export(offspring_ll)
export(rborel)
export(rnbinom_mean_disp)
export(simulate_summary)
export(simulate_tree)
export(simulate_tree_from_pop)
export(validate_epichains)
importFrom(stats,aggregate)
importFrom(utils,head)
importFrom(utils,tail)
Loading