Skip to content

Commit

Permalink
update links
Browse files Browse the repository at this point in the history
  • Loading branch information
fmichonneau committed Jan 24, 2024
1 parent 7e8299c commit 00ca67f
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion R/checkdata.R
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
##' \code{checkTree}. The rules for \code{phylo4} objects essentially
##' follow those for \code{phylo} objects from the \code{ape} package,
##' which are in turn defined in
##' \url{http://ape-package.ird.fr/misc/FormatTreeR_24Oct2012.pdf}.
##' \url{https://emmanuelparadis.github.io/misc/FormatTreeR.pdf}.
##' These are essentially that: \itemize{ \item if the tree has edge
##' lengths defined, the number of edge lengths must match the number
##' of edges; \item the number of tip labels must match the number of
Expand Down
12 changes: 6 additions & 6 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ knitr::opts_chunk$set(

<!-- badges: start -->
[![R-CMD-check](https://github.com/fmichonneau/phylobase/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/fmichonneau/phylobase/actions/workflows/R-CMD-check.yaml)
[![codecov.io](http://codecov.io/github/fmichonneau/phylobase/coverage.svg?branch=master)](http://codecov.io/github/fmichonneau/phylobase?branch=master)
![](http://cranlogs.r-pkg.org/badges/phylobase)
[![CRAN version](http://www.r-pkg.org/badges/version/phylobase)](http://cran.r-project.org/package=phylobase)
[![codecov.io](https://codecov.io/github/fmichonneau/phylobase/coverage.svg?branch=master)](https://codecov.io/github/fmichonneau/phylobase?branch=master)
![](https://cranlogs.r-pkg.org/badges/phylobase)
[![CRAN version](https://www.r-pkg.org/badges/version/phylobase)](http://cran.r-project.org/package=phylobase)
<!-- badges: end -->

## About this package
Expand All @@ -39,7 +39,7 @@ focusing on method development instead of having to rewrite the base functions.
- Maintainer: Francois Michonneau
- Licence: GPL (>= 2)
- Issues, bug reports, feature requests, discussion:
http://github.com/fmichonneau/phylobase/issues
https://github.com/fmichonneau/phylobase/issues

## Installation

Expand All @@ -56,7 +56,7 @@ install.packages("phylobase")

The development version (the patch version number is odd, e.g., 0.6.9) is
available on GitHub (https://github.com/fmichonneau/phylobase), and can be
installed using the [`devtools`](http://cran.r-project.org/package=devtools)
installed using the [`devtools`](https://cran.r-project.org/package=devtools)
package.

```{r, eval=FALSE}
Expand Down Expand Up @@ -106,7 +106,7 @@ head(g2)

`phylobase` has a robust parser for NEXUS files (it uses the NEXUS Class Library
from Paul Lewis and Mark Holder,
[NCL](http://sourceforge.net/projects/ncl/files/)). It can be used to import
[NCL](https://sourceforge.net/projects/ncl/files/)). It can be used to import
simultaneously tree and species data.

```{r}
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<!-- badges: start -->

[![R-CMD-check](https://github.com/fmichonneau/phylobase/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/fmichonneau/phylobase/actions/workflows/R-CMD-check.yaml)
[![codecov.io](http://codecov.io/github/fmichonneau/phylobase/coverage.svg?branch=master)](http://codecov.io/github/fmichonneau/phylobase?branch=master)
![](http://cranlogs.r-pkg.org/badges/phylobase) [![CRAN
version](http://www.r-pkg.org/badges/version/phylobase)](http://cran.r-project.org/package=phylobase)
[![codecov.io](https://codecov.io/github/fmichonneau/phylobase/coverage.svg?branch=master)](https://codecov.io/github/fmichonneau/phylobase?branch=master)
![](https://cranlogs.r-pkg.org/badges/phylobase) [![CRAN
version](https://www.r-pkg.org/badges/version/phylobase)](http://cran.r-project.org/package=phylobase)
<!-- badges: end -->

## About this package
Expand All @@ -29,7 +29,7 @@ instead of having to rewrite the base functions.
- Maintainer: Francois Michonneau
- Licence: GPL (\>= 2)
- Issues, bug reports, feature requests, discussion:
<http://github.com/fmichonneau/phylobase/issues>
<https://github.com/fmichonneau/phylobase/issues>

## Installation

Expand All @@ -47,7 +47,7 @@ install.packages("phylobase")
The development version (the patch version number is odd, e.g., 0.6.9)
is available on GitHub (<https://github.com/fmichonneau/phylobase>), and
can be installed using the
[`devtools`](http://cran.r-project.org/package=devtools) package.
[`devtools`](https://cran.r-project.org/package=devtools) package.

``` r
pak::install_github("fmichonneau/phylobase")
Expand Down Expand Up @@ -137,7 +137,7 @@ head(g2)

`phylobase` has a robust parser for NEXUS files (it uses the NEXUS Class
Library from Paul Lewis and Mark Holder,
[NCL](http://sourceforge.net/projects/ncl/files/)). It can be used to
[NCL](https://sourceforge.net/projects/ncl/files/)). It can be used to
import simultaneously tree and species data.

``` r
Expand Down
2 changes: 1 addition & 1 deletion man/checkPhylo4.Rd

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

Binary file modified vignettes/fig-vignettes-plotvcvphylo-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions vignettes/phylobase.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -802,9 +802,9 @@ separately with `tdata(x,"tip")`, `tdata(x,"internal")` or
`tdata(x,"all")`. There is no separate slot for edge data, but these can
be stored as node data associated with the descendant node.

[^1]: <http://ape.mpl.ird.fr/>
[^1]: <https://emmanuelparadis.github.io/ape_development.html>

[^2]: see <http://en.wikipedia.org/wiki/Tree_traversal> for more
[^2]: see <https://en.wikipedia.org/wiki/Tree_traversal> for more
information on orderings. (`ape`'s "pruningwise" is "bottom-up"
ordering).

Expand Down
4 changes: 2 additions & 2 deletions vignettes/phylobase.Rmd.orig
Original file line number Diff line number Diff line change
Expand Up @@ -622,9 +622,9 @@ separately with `tdata(x,"tip")`, `tdata(x,"internal")` or
`tdata(x,"all")`. There is no separate slot for edge data, but these can
be stored as node data associated with the descendant node.

[^1]: <http://ape.mpl.ird.fr/>
[^1]: <https://emmanuelparadis.github.io/ape_development.html>

[^2]: see <http://en.wikipedia.org/wiki/Tree_traversal> for more
[^2]: see <https://en.wikipedia.org/wiki/Tree_traversal> for more
information on orderings. (`ape`'s "pruningwise" is "bottom-up"
ordering).

Expand Down

0 comments on commit 00ca67f

Please sign in to comment.