Merge branch 'master' into r-forge

git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@160 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

1 files changed, 23 insertions, 16 deletions

diff --git a/README.md b/README.md
index fb070eac..ed1d263e 100644
--- a/README.md
+++ b/README.md
@@ -78,7 +78,8 @@ or the package vignettes referenced from the
   componenent for each of the observed variables will be optimised
   in a second stage after the primary optimisation algorithm has converged.
 
-## Credits
+  
+## Credits and historical remarks
 
 `mkin` would not be possible without the underlying software stack consisting
 of R and the packages [deSolve](http://cran.r-project.org/package=deSolve),
@@ -88,26 +89,32 @@ of R and the packages [deSolve](http://cran.r-project.org/package=deSolve),
 Also, it was inspired by the first version of KinGUI developed by
 BayerCropScience, which is based on the MatLab runtime environment.
 
-Bayer has developed a successor named KinGUII whose R code is based on `mkin`, but which
-added, amongst other refinements, a closed source graphical user interface
-(GUI), iteratively reweighted least squares (IRLS) optimisation of the variance
-for each of the observed variables, and Markov Chain Monte Carlo (MCMC)
-simulation functionality, similar to what is available e.g. in the `FME`
-package.
-
-Syngenta has sponsored the development of an `mkin` (and KinGUII?) based GUI
-application called CAKE, which adds IRLS and MCMC, is more limited in the model
-formulation, but puts more weight on usability.  CAKE is available for download
-from the [CAKE website](http://projects.tessella.com/cake), where you can also
+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 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.
+
+After this, Bayer has developed an R based successor to KinGUI named KinGUII
+whose R code is based on `mkin`, but which added, amongst other refinements, a
+closed source graphical user interface (GUI), iteratively reweighted least
+squares (IRLS) optimisation of the variance for each of the observed
+variables, and Markov Chain Monte Carlo (MCMC) simulation functionality,
+similar to what is available e.g. in the `FME` package.
+
+Somewhat in parallel, Syngenta has sponsored the development of an `mkin` (and
+KinGUII?) based GUI application called CAKE, which also adds IRLS and MCMC, is
+more limited in the model formulation, but puts more weight on usability.
+CAKE is available for download from the [CAKE
+website](http://projects.tessella.com/cake), where you can also
 find a zip archive of the R scripts derived from `mkin`, published under the GPL
 license.
 
 Finally, I just (2013-11-11) noticed the github repositories
 [StudyKin](http://github.com/zhenglei-gao/StudyKin) and
 [KineticEval](http://github.com/zhenglei-gao/KineticEval), the latter of which appears to be 
-<<<<<<< HEAD
-actively developed.
-=======
 actively developed, so the different tools will hopefully be able to learn
 from each other in the future as well.
->>>>>>> master