Skip to content

Commit 8863073

Browse files
committed
fix invalid url note
1 parent 1ed18f2 commit 8863073

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.Rbuildignore

+1
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@
1212
^src\/scrm\/random\/mersenne_twister\.cc$
1313
^src\/scrm\/random\/mersenne_twister\.h$
1414
^src\/scrm\/random\/speedtest\.cc$
15+
^cran-comments\.md$

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[![Linux Build Status](https://travis-ci.org/scrm/scrm-r.svg?branch=master)](https://travis-ci.org/scrm/scrm-r)
22
[![Windows Build Status](https://ci.appveyor.com/api/projects/status/octt2w69byiq198s/branch/master?svg=true)](https://ci.appveyor.com/project/paulstaab/scrm-r/branch/master)
33
[![Coverage Status](https://coveralls.io/repos/github/scrm/scrm-r/badge.svg?branch=master)](https://coveralls.io/github/scrm/scrm-r?branch=master)
4-
[![CRAN Status](http://www.r-pkg.org/badges/version/scrm)](http://cran.r-project.org/web/packages/scrm)
5-
[![CRAN RStudio Mirror Downloads](http://cranlogs.r-pkg.org/badges/scrm)](https://cran.r-project.org/package=scrm)
4+
[![CRAN Status](http://www.r-pkg.org/badges/version/scrm)](https://cran.r-project.org/package=scrm)
5+
66

77
scrm R Package
88
=======================

inst/CITATION

-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,5 @@ bibentry(
1010
volume = 31,
1111
number = 10,
1212
pages = '1680-1682',
13-
doi = '10.1093/bioinformatics/btu861',
1413
url = 'http://bioinformatics.oxfordjournals.org/content/31/10/1680'
1514
)

vignettes/scrm-Arguments.Rmd

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ scrm is uses a syntax compatible with the popular program [ms][1]. There are, ho
2222
* `-eI` (sampling haplotypes at multiple time points) and
2323
* `-oSFS` (generates frequency spectra).
2424

25-
For all other options, you can also refer to [ms' manual][2] to get a detailed description of what the commands are doing. scrm should happily execute any ms command that does not contain `-c` and `-s`. Also scrm has somewhat stricter requirements regarding the order of arguments if population admixture (`-es`) is involved.
25+
For all other options, you can also refer to [ms' manual][1] to get a detailed description of what the commands are doing. scrm should happily execute any ms command that does not contain `-c` and `-s`. Also scrm has somewhat stricter requirements regarding the order of arguments if population admixture (`-es`) is involved.
2626

2727
## General Syntax
2828
The arguments for calling _scrm_ are
@@ -61,7 +61,7 @@ decline in population sizes.
6161
* `-t < $\theta$ >`: Set the mutation rate to $\theta = 4N_0u$, where _u_ is the neutral mutation rate per locus. If this options is given, scrm generates the segregating sites output.
6262
* `-transpose-segsites` or `--transpose-segsites`: If given, the segregating sites are printed with each row representing a mutation and each column representing a haplotype, rather than the other way round. Additionally, the time at which a mutation occurred is reported (in units of _4 * N0_ generations) [since v1.7.0].
6363
* `-T`: Print the local genealogies in newick format.
64-
* `-O`: Print the local genealogies in the `oriented forest` format as described in [Kelleher _et al._ (2014)](http://dx.doi.org/10.1016/j.tpb.2014.05.001) [since v1.2].
64+
* `-O`: Print the local genealogies in the `oriented forest` format as described in [Kelleher _et al._ (2014)][2] [since v1.2].
6565
* `-L`: Print the TMRCA and the local tree length for each segment (behaves different to ms). Both values are scaled in coalescent time units, e.g. in _4 * N0_ generations.
6666
* `-oSFS`: Print the site frequency spectrum. Requires that the mutation rate $\theta$ is given with the '-t' option.
6767
* `-SC [ms|rel|abs]`: Scaling of sequence positions. Either relative to the locus length between 0 and 1 (`rel`), absolute in base pairs (`abs`) or `ms`'s scaling (default) where the positions in the _segregating sites_ output are relative, and the positions in the trees output are absolute (`ms`) [since v1.3.0].
@@ -117,4 +117,4 @@ length of the sequence as second argument, while `-sr` just has the rate as argu
117117

118118

119119
[1]: http://home.uchicago.edu/~rhudson1/source/mksamples.html
120-
[2]: https://webshare.uchicago.edu/users/rhudson1/Public/ms.folder/msdoc.pdf?ticket=t_DunQ7c99
120+
[2]: http://www.sciencedirect.com/science/article/pii/S0040580914000355

0 commit comments

Comments
 (0)