From 7b053553f45906ea0ca91e7375b5c5774e1310ac Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Thu, 8 May 2014 20:07:30 +0200 Subject: README update, fix the vignette title for FOCUS Z --- README.md | 40 ++++++++++++------------- vignettes/FOCUS_Z.Rnw | 2 +- vignettes/FOCUS_Z.pdf | Bin 218511 -> 218652 bytes vignettes/figure/FOCUS_2006_Z_fits_1.pdf | Bin 5670 -> 5670 bytes vignettes/figure/FOCUS_2006_Z_fits_10.pdf | Bin 7587 -> 7587 bytes vignettes/figure/FOCUS_2006_Z_fits_11.pdf | Bin 7598 -> 7598 bytes vignettes/figure/FOCUS_2006_Z_fits_11b.pdf | Bin 5021 -> 5021 bytes vignettes/figure/FOCUS_2006_Z_fits_2.pdf | Bin 5670 -> 5670 bytes vignettes/figure/FOCUS_2006_Z_fits_3.pdf | Bin 5670 -> 5670 bytes vignettes/figure/FOCUS_2006_Z_fits_5.pdf | Bin 6155 -> 6155 bytes vignettes/figure/FOCUS_2006_Z_fits_6.pdf | Bin 6966 -> 6966 bytes vignettes/figure/FOCUS_2006_Z_fits_6_ff.pdf | Bin 6937 -> 6937 bytes vignettes/figure/FOCUS_2006_Z_fits_7.pdf | Bin 6967 -> 6967 bytes vignettes/figure/FOCUS_2006_Z_fits_8.pdf | Bin 6158 -> 6158 bytes vignettes/figure/FOCUS_2006_Z_fits_9.pdf | Bin 6785 -> 6785 bytes vignettes/figure/FOCUS_2006_Z_residuals_11.pdf | Bin 5940 -> 5940 bytes vignettes/figure/FOCUS_2006_Z_residuals_6.pdf | Bin 5959 -> 5959 bytes 17 files changed, 21 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 57b9d21c..ea59c643 100644 --- a/README.md +++ b/README.md @@ -14,16 +14,10 @@ You can install the latest released version from install.packages('mkin') ``` -A development version is usually available from [R-Forge](http://r-forge.r-project.org/R/?group_id=615): - -```s -install.packages('mkin', repos = 'http://r-forge.r-project.org') -``` - -If R-Forge is lacking behind or if you prefer, you can install directly from -github using the `devtools` package. Using `quick = TRUE` skips docs, -multiple-architecture builds, demos, and vignettes, to make installation as fast -and painless as possible. +If looking for the latest features, you can install directly from +[github](http://github.com/jranke/mkin), e.g. using the `devtools` package. +Using `quick = TRUE` skips docs, multiple-architecture builds, demos, and +vignettes, to make installation as fast and painless as possible. ```s require(devtools) @@ -128,12 +122,14 @@ as detailed in ther guidance document from 2006, slightly updated in 2011. Also, it was inspired by the first version of KinGUI developed by BayerCropScience, which is based on the MatLab runtime environment. -The companion package [kinfit](http://kinfit.r-forge.r-project.org/kinfit_static/index.html) was [started in 2008](https://r-forge.r-project.org/scm/viewvc.php?view=rev&root=kinfit&revision=2) and -[first published on -CRAN](http://cran.r-project.org/src/contrib/Archive/kinfit/) on 01 May -2010. +The companion package +[kinfit](http://kinfit.r-forge.r-project.org/kinfit_static/index.html) was +[started in 2008](https://r-forge.r-project.org/scm/viewvc.php?view=rev&root=kinfit&revision=2) and +[first published](http://cran.r-project.org/src/contrib/Archive/kinfit/) on +CRAN on 01 May 2010. -The first `mkin` code was [published on 11 May 2010](https://r-forge.r-project.org/scm/viewvc.php?view=rev&root=kinfit&revision=8) and the +The first `mkin` code was +[published on 11 May 2010](https://r-forge.r-project.org/scm/viewvc.php?view=rev&root=kinfit&revision=8) and the [first CRAN version](http://cran.r-project.org/src/contrib/Archive/mkin) on 18 May 2010. @@ -158,9 +154,13 @@ a further development of the scripts used for KinGUII, so the different tools will hopefully be able to learn from each other in the future as well. -## Contribute +## Development -Contributions are welcome! Your [mkin fork](https://help.github.com/articles/fork-a-repo) is just a mouse click away... This git repository is now the -master branch, but I figured out how to merge changes in both directions, -thanks to [this blog entry](http://cameron.bracken.bz/git-with-r-forge) -by Cameron Bracken, so contributors from r-forge are welcome as well. +Contributions are welcome! Your +[mkin fork](https://help.github.com/articles/fork-a-repo) is just a mouse click +away... The master branch on github should always be in good shape, I implement +new features in separate branches now. If you prefer subversion, project +members for the +[r-forge project](http://r-forge.r-project.org/R/?group_id=615) are welcome as well. +Generally, the source code of the latest CRAN version should be checked in to +r-forge. diff --git a/vignettes/FOCUS_Z.Rnw b/vignettes/FOCUS_Z.Rnw index b551007f..aff49e69 100644 --- a/vignettes/FOCUS_Z.Rnw +++ b/vignettes/FOCUS_Z.Rnw @@ -1,4 +1,4 @@ -%\VignetteIndexEntry{Examples evaluation of FOCUS dataset Z} +%\VignetteIndexEntry{Example evaluation of FOCUS dataset Z} %\VignetteEngine{knitr::knitr} \documentclass[12pt,a4paper]{article} \usepackage{a4wide} diff --git a/vignettes/FOCUS_Z.pdf b/vignettes/FOCUS_Z.pdf index e6138d0b..53c89bc3 100644 Binary files a/vignettes/FOCUS_Z.pdf and b/vignettes/FOCUS_Z.pdf differ diff --git a/vignettes/figure/FOCUS_2006_Z_fits_1.pdf b/vignettes/figure/FOCUS_2006_Z_fits_1.pdf index 7533073b..f0560e59 100644 Binary files a/vignettes/figure/FOCUS_2006_Z_fits_1.pdf and b/vignettes/figure/FOCUS_2006_Z_fits_1.pdf differ diff --git a/vignettes/figure/FOCUS_2006_Z_fits_10.pdf b/vignettes/figure/FOCUS_2006_Z_fits_10.pdf index 5ebd3813..073e31a9 100644 Binary files a/vignettes/figure/FOCUS_2006_Z_fits_10.pdf and b/vignettes/figure/FOCUS_2006_Z_fits_10.pdf differ diff --git a/vignettes/figure/FOCUS_2006_Z_fits_11.pdf b/vignettes/figure/FOCUS_2006_Z_fits_11.pdf index 1ccff789..5e32cc1c 100644 Binary files a/vignettes/figure/FOCUS_2006_Z_fits_11.pdf and b/vignettes/figure/FOCUS_2006_Z_fits_11.pdf differ diff --git a/vignettes/figure/FOCUS_2006_Z_fits_11b.pdf b/vignettes/figure/FOCUS_2006_Z_fits_11b.pdf index 4224b939..034fd5ec 100644 Binary files a/vignettes/figure/FOCUS_2006_Z_fits_11b.pdf and b/vignettes/figure/FOCUS_2006_Z_fits_11b.pdf differ diff --git a/vignettes/figure/FOCUS_2006_Z_fits_2.pdf b/vignettes/figure/FOCUS_2006_Z_fits_2.pdf index fef7b274..a15b0823 100644 Binary files a/vignettes/figure/FOCUS_2006_Z_fits_2.pdf and b/vignettes/figure/FOCUS_2006_Z_fits_2.pdf differ diff --git a/vignettes/figure/FOCUS_2006_Z_fits_3.pdf b/vignettes/figure/FOCUS_2006_Z_fits_3.pdf index 48961362..a15b0823 100644 Binary files a/vignettes/figure/FOCUS_2006_Z_fits_3.pdf and b/vignettes/figure/FOCUS_2006_Z_fits_3.pdf differ diff --git a/vignettes/figure/FOCUS_2006_Z_fits_5.pdf b/vignettes/figure/FOCUS_2006_Z_fits_5.pdf index 91a06bae..754627da 100644 Binary files a/vignettes/figure/FOCUS_2006_Z_fits_5.pdf and b/vignettes/figure/FOCUS_2006_Z_fits_5.pdf differ diff --git a/vignettes/figure/FOCUS_2006_Z_fits_6.pdf b/vignettes/figure/FOCUS_2006_Z_fits_6.pdf index 967da639..b09a4f7b 100644 Binary files a/vignettes/figure/FOCUS_2006_Z_fits_6.pdf and b/vignettes/figure/FOCUS_2006_Z_fits_6.pdf differ diff --git a/vignettes/figure/FOCUS_2006_Z_fits_6_ff.pdf b/vignettes/figure/FOCUS_2006_Z_fits_6_ff.pdf index c4fe0945..10bf6780 100644 Binary files a/vignettes/figure/FOCUS_2006_Z_fits_6_ff.pdf and b/vignettes/figure/FOCUS_2006_Z_fits_6_ff.pdf differ diff --git a/vignettes/figure/FOCUS_2006_Z_fits_7.pdf b/vignettes/figure/FOCUS_2006_Z_fits_7.pdf index f40ea632..a2facafd 100644 Binary files a/vignettes/figure/FOCUS_2006_Z_fits_7.pdf and b/vignettes/figure/FOCUS_2006_Z_fits_7.pdf differ diff --git a/vignettes/figure/FOCUS_2006_Z_fits_8.pdf b/vignettes/figure/FOCUS_2006_Z_fits_8.pdf index e0f9b941..940563b9 100644 Binary files a/vignettes/figure/FOCUS_2006_Z_fits_8.pdf and b/vignettes/figure/FOCUS_2006_Z_fits_8.pdf differ diff --git a/vignettes/figure/FOCUS_2006_Z_fits_9.pdf b/vignettes/figure/FOCUS_2006_Z_fits_9.pdf index 9b6f5701..58065ce8 100644 Binary files a/vignettes/figure/FOCUS_2006_Z_fits_9.pdf and b/vignettes/figure/FOCUS_2006_Z_fits_9.pdf differ diff --git a/vignettes/figure/FOCUS_2006_Z_residuals_11.pdf b/vignettes/figure/FOCUS_2006_Z_residuals_11.pdf index 5a41904d..5de6b982 100644 Binary files a/vignettes/figure/FOCUS_2006_Z_residuals_11.pdf and b/vignettes/figure/FOCUS_2006_Z_residuals_11.pdf differ diff --git a/vignettes/figure/FOCUS_2006_Z_residuals_6.pdf b/vignettes/figure/FOCUS_2006_Z_residuals_6.pdf index 3e6649d7..43086c2a 100644 Binary files a/vignettes/figure/FOCUS_2006_Z_residuals_6.pdf and b/vignettes/figure/FOCUS_2006_Z_residuals_6.pdf differ -- cgit v1.2.1