Bugfix for a recently introduced breakage of fixed_initials

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

3 files changed, 9 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 2cc89714..2e19322f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-04  Johannes Ranke <jranke@uni-bremen.de> for mkin (0.9-24)

+

+	* Bugfix re-enabling the fixing of initial values for state variables

+

 2013-10-30  Johannes Ranke <jranke@uni-bremen.de> for mkin (0.9-23)

 

 	* Backtransform fixed ODE parameters for the summary

diff --git a/DESCRIPTION b/DESCRIPTION
index 57c34214..f900fd4b 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -3,7 +3,7 @@ Type: Package
 Title: Routines for fitting kinetic models with one or more state
   variables to chemical degradation data
 Version: 0.9-23
-Date: 2013-10-30
+Date: 2013-11-04
 Author: Johannes Ranke, with contributions from Katrin Lindenberger, René Lehmann
 Maintainer: Johannes Ranke <jranke@uni-bremen.de>
 Description: Calculation routines based on the FOCUS Kinetics Report (2006).
diff --git a/R/mkinfit.R b/R/mkinfit.R
index 2be55151..635ec292 100644
--- a/R/mkinfit.R
+++ b/R/mkinfit.R
@@ -145,7 +145,10 @@ mkinfit <- function(mkinmod, observed,
     if(length(state.ini.optim) > 0) {

       odeini <- c(P[1:length(state.ini.optim)], state.ini.fixed)

       names(odeini) <- c(state.ini.optim.boxnames, state.ini.fixed.boxnames)

-    } else odeini <- state.ini.fixed.boxnames

+    } else {

+      odeini <- state.ini.fixed

+      names(odeini) <- state.ini.fixed.boxnames

+    }

 

     odeparms <- c(P[(length(state.ini.optim) + 1):length(P)], parms.fixed)