Skip to content

Commit

Permalink
compressing chronogram database with 'xz'
Browse files Browse the repository at this point in the history
  • Loading branch information
LunaSare committed Jun 18, 2022
1 parent 672d4ba commit f17b129
Show file tree
Hide file tree
Showing 178 changed files with 233 additions and 229 deletions.
6 changes: 3 additions & 3 deletions CRAN-SUBMISSION
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Version: 0.6.3
Date: 2022-06-09 06:48:13 UTC
SHA: 40287aa21bc8cec52ccc21e676a222ba2f7768bc
Version: 0.6.4
Date: 2022-06-13 05:40:15 UTC
SHA: 672d4ba276afb5c4bade87cc67c7b6034c7cbcb3
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: datelife
Title: Scientific Data on Time of Lineage Divergence for Your Taxa
Version: 0.6.4
Version: 0.6.5
Maintainer: Luna L. Sanchez Reyes <[email protected]>
Authors@R: c(
person("Brian", "O'Meara", email = "[email protected]", role=c("aut")),
Expand Down
8 changes: 5 additions & 3 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
DONE:
-->

# datelife 0.6.4
- data: updated `opentree_chronograms` object. It now has 253 chronograms from Open Tree of Life
- examples: set to not run most examples
# datelife 0.6.5
- data:
- updated `opentree_chronograms` object. It now has 253 chronograms from Open Tree of Life and uses "xz" compression.
- examples:
- set to not test examples
- functions:
- added functions `matrix_to_table` and `matrices_to_table` that go from a matrix of patristic distances to a table of taxon name pairs and respective node ages.
- bug fix on `use_calibrations_bladj` that used element $present_calibrations instead of $matched_calibrations
Expand Down
6 changes: 3 additions & 3 deletions R/opentree_chronograms.R
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#'
#' @name opentree_chronograms
#' @docType data
#' @format A list of four elements, containing data from OpenTree of Life chronograms
#' @format A list of four elements, containing data from Open Tree of Life chronograms
#' \describe{
#' \item{authors}{A list of lists of author names of the original studies that
#' published chronograms in the Open Tree of Life database.}
Expand All @@ -26,8 +26,8 @@
#' remotes::install_github("ROpenSci/bibtex")'
#' opentree_chronograms <- get_opentree_chronograms()
#' opentree_chronograms$update <- Sys.time()
#' opentree_chronograms$version <- '0.6.2'
#' usethis::use_data(opentree_chronograms, overwrite = T)
#' opentree_chronograms$version <- '2022.01.28'
#' usethis::use_data(opentree_chronograms, overwrite = T, compress = "xz")

This comment has been minimized.

Copy link
@LunaSare

LunaSare Jan 8, 2024

Author Member

Fix to #76

#' and updated with update_datelife_cache()
"opentree_chronograms"

Expand Down
2 changes: 1 addition & 1 deletion R/tree_fix_brlen.R
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# functions to fix negative or null branch lengths from an ultranetric treem, and to add dates of missing taxa at random

#' Take a tree with branch lengths and fix negative or zero length branches.
#' @param tree A tree either as a newick character string or as a phylo object
#' @param tree A tree either as a newick character string or as a `phylo` object.
#' @param fixing_criterion A character vector specifying the type of branch length to be fixed: "negative" or "zero" (the number 0 is also allowed).
#' @param fixing_method A character vector specifying the method to fix branch lengths: "bladj", "mrbayes" or a number to be assigned to all branches meeting fixing_criterion
#' @param ultrametric Boolean indicating whether to force ultrametric or not.
Expand Down
3 changes: 2 additions & 1 deletion R/tree_processing.R
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@ phylo_check <- function(phy = NULL, brlen = FALSE, dated = FALSE) {
}
}

#' Checks if a tree is a phylo class object otherwise it uses input_process. Additionally it can check if tree is a chronogram with phylo_check
#' Checks if a tree is a phylo class object otherwise it uses input_process.
#' Additionally it can check if tree is a chronogram with phylo_check
#' @inheritParams tree_fix_brlen
#' @inheritDotParams phylo_check -phy
#' @return If tree is correctly formatted, it returns a `phylo` object.
Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
[![CRAN
status](https://www.r-pkg.org/badges/version/datelife)](https://CRAN.R-project.org/package=datelife)
![GitHub R package
version](https://img.shields.io/github/r-package/v/phylotastic/datelife?color=pink&label=GitHub)
version](https://img.shields.io/github/r-package/v/phylotastic/datelife?color=green&label=GitHub)
[![R-CMD-check](https://github.com/phylotastic/datelife/workflows/R-CMD-check/badge.svg)](https://github.com/phylotastic/datelife/actions)
[![codecov](https://codecov.io/gh/phylotastic/datelife/branch/master/graph/badge.svg)](https://app.codecov.io/gh/phylotastic/datelife)
[![Github Open
Expand All @@ -20,6 +20,8 @@ Issues](https://img.shields.io/github/issues-closed-raw/phylotastic/datelife.svg
[![NSF-1458603](https://img.shields.io/badge/NSF-1458603-white.svg)](https://nsf.gov/awardsearch/showAward?AWD_ID=1458603)
[![NSF-0905606](https://img.shields.io/badge/NSF-0905606-white.svg)](https://nsf.gov/awardsearch/showAward?AWD_ID=0905606)
[![NSF-1458572](https://img.shields.io/badge/NSF-1458572-white.svg)](https://nsf.gov/awardsearch/showAward?AWD_ID=1458572)
[![CRAN RStudio mirror
downloads](https://cranlogs.r-pkg.org/badges/datelife)](https://www.r-pkg.org/pkg/datelife)
<!-- badges: end -->

# Welcome to DateLife’s R package GitHub repository!
Expand Down Expand Up @@ -95,7 +97,7 @@ the accompanying paper:
O’Meara B, Sanchez-Reyes L, Eastman J, Heath T, Wright A, Schliep K,
Chamberlain S, Midford P, Harmon L, Brown J, Pennell M, Alfaro M (2022).
<em>datelife: Scientific Data on Time of Lineage Divergence for Your
Taxa</em>. R package version 0.6.2,
Taxa</em>. R package version 0.6.4,
<a href="https://doi.org/10.5281/zenodo.593938">https://doi.org/10.5281/zenodo.593938</a>.
</p>
<p>
Expand Down
28 changes: 6 additions & 22 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
## New submission v 0.6.4
## New submission v 0.6.5
This is a new submission where I have:

* addressed note on package size: The package hosts a database of 4.7Mb that is needed to run main functions
* Removed unnecessary "if (interactive())" from examples
* Fixed R code problem by useing `inherits` instead of if() conditions comparing class() to string
* Fixed examples that were failing in some Linux environments.
* compressed database with "xz" compression, so the package size is now under 5 Mb
* started the process of moving database object and functions used to create it to its own package

### Test environments:

Expand All @@ -20,24 +18,10 @@ This is a new submission where I have:
- R 4.3 Under development (2022-06-08 r82470)

### Results
0 errors ✔ | 0 warnings ✔ | 4 notes ✖
0 errors ✔ | 0 warnings ✔ | 3 notes ✖

* Note 1

```
checking installed package size ... NOTE
installed size is 6.1Mb
sub-directories of 1Mb or more:
data 4.7Mb
```

**Comments**: <br/>
The package is hosting a database (`data/opentree_chronograms.rda`), increasing the size of the data dir.
This database is needed to run main functions.


* Note 2

```
❯ checking package dependencies ... NOTE
Packages suggested but not available for checking: 'msa', 'Biostrings'
Expand All @@ -50,7 +34,7 @@ This database is needed to run main functions.
**Comments**: <br/>
All the packages imported are needed for the datelife workflow.

* Note 3
* Note 2

```
Possibly misspelled words in DESCRIPTION:
Expand All @@ -76,7 +60,7 @@ Possibly misspelled words in DESCRIPTION:
**Comments**: <br/>
None of these word are misspelled

* Note 4
* Note 3

```
Found the following (possibly) invalid DOIs:
Expand Down
Binary file modified data/opentree_chronograms.rda
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/404.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/articles/Getting_started_with_datelife.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/articles/fringiliidae.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/articles/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions docs/authors.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 8 additions & 4 deletions docs/news/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/pkgdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pkgdown_sha: ~
articles:
Getting_started_with_datelife: Getting_started_with_datelife.html
fringiliidae: fringiliidae.html
last_built: 2022-06-13T05:35Z
last_built: 2022-06-20T07:28Z
urls:
reference: http://phylotastic.org/datelife/reference
article: http://phylotastic.org/datelife/articles
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/birds_and_cats.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/build_grove_list.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/build_grove_matrix.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/check_conflicting_calibrations.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/check_ott_input.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/choose_cluster.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/classification_paths_from_taxonomy.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/clean_ott_chronogram.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/clean_taxon_info_children.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/clean_tnrs.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/cluster_patristicmatrix.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/congruify_and_check.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/congruify_and_mrca_multiPhylo.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit f17b129

Please sign in to comment.