From 03e6ac6d5c5feb12a0942b59b0ef745952fc19f7 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Fri, 15 May 2015 14:24:21 +0200 Subject: Remove missing files from svn before commiting to r-forge --- GNUmakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GNUmakefile b/GNUmakefile index 979caca9..f37dfe06 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -92,7 +92,7 @@ move-sd: r-forge: sd move-sd git archive master > $(HOME)/mkin.tar;\ cd $(RFDIR) && rm -r `ls` && tar -xf $(HOME)/mkin.tar;\ - svn add --force .; cd $(RFSVN) && svn commit -m 'sync with git' + svn add --force .; svn rm --force `svn status | grep "\!" | cut -d " " -f 8`; cd $(RFSVN) && svn commit -m 'sync with git' winbuilder: build date -- cgit v1.2.1 From 79da06cda38a8dc1d79937704f028a2562451fbf Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Fri, 15 May 2015 14:42:26 +0200 Subject: Remove dead link to KinGUII page --- README.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 886577fd..5a7aabea 100644 --- a/README.md +++ b/README.md @@ -157,12 +157,11 @@ The first `mkin` code was on 18 May 2010. In 2011, Bayer Crop Science started to distribute an R based successor to KinGUI named -[KinGUII](https://kinguii.github.io) -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. +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 -- cgit v1.2.1