aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Ranke <jranke@uni-bremen.de>2015-05-15 18:11:01 +0200
committerJohannes Ranke <jranke@uni-bremen.de>2015-05-15 18:11:01 +0200
commit8294ab8932b299577f6a0db551a2ae9b401d3dd4 (patch)
tree54b39769b1a7673cd23430498a107390e1db4408
parent93cad3b4b3a5cd1a2be74cb5ab3e1ca1a90270b6 (diff)
parent79da06cda38a8dc1d79937704f028a2562451fbf (diff)
Merge branch 'master' into compile_odes
-rw-r--r--GNUmakefile2
-rw-r--r--README.md11
2 files changed, 6 insertions, 7 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 3fe25aad..30576682 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -95,7 +95,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
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

Contact - Imprint