From 459b0edad5ccccffe710b9db0c4c22a08ba880cb Mon Sep 17 00:00:00 2001 From: jranke Date: Wed, 13 Nov 2013 21:16:17 +0000 Subject: Squashed commit of the following: commit d8dbf2ad866fb9d34cd1100000b9c116219ecef6 Author: Johannes Ranke Date: Wed Nov 13 22:09:41 2013 +0100 Add possibility to control more mkinfit arguments from the GUI commit 8f1bae2142b37a0ff6b8989b2d1569686937f68e Author: Johannes Ranke Date: Wed Nov 13 20:30:11 2013 +0100 Add initial weighting choice to GUI commit c99b5c298713a7c14e8ab5604c68613d0b7af27a Author: Johannes Ranke Date: Wed Nov 13 16:25:31 2013 +0100 Update of TODO from git bash on Windows commit 8bf2a6f8f6bd752433f06b26b5da334e958f5166 Author: Johannes Ranke Date: Wed Nov 13 16:00:01 2013 +0100 Update of README using TortoiseGit git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@162 edb9625f-4e0d-4859-8d74-9fd3b1da38cb --- R/mkinfit.R | 2 ++ 1 file changed, 2 insertions(+) (limited to 'R') diff --git a/R/mkinfit.R b/R/mkinfit.R index d04d1ea..3e47479 100644 --- a/R/mkinfit.R +++ b/R/mkinfit.R @@ -281,6 +281,8 @@ mkinfit <- function(mkinmod, observed, fit$rtol <- rtol fit$weight.ini <- weight.ini fit$reweight.method <- reweight.method + fit$reweight.tol <- reweight.tol + fit$reweight.max.iter <- reweight.max.iter # Return all backtransformed parameters for summary fit$bparms.optim <- bparms.optim -- cgit v1.2.1