- Added the possibility to specify the observed variable in mkinmod in a checklist

- Added the spec list the the mkinmod objects
- It seems that the GUI model editor is fully functional
- Version bump due to the changes in the mkinmod function arguments, thought they are backward compatible

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

1 files changed, 4 insertions, 3 deletions

diff --git a/R/mkinmod.R b/R/mkinmod.R
index 09deea44..c743777b 100644
--- a/R/mkinmod.R
+++ b/R/mkinmod.R
@@ -18,9 +18,10 @@
 # You should have received a copy of the GNU General Public License along with

 # this program. If not, see <http://www.gnu.org/licenses/> }}}

 

-mkinmod <- function(..., use_of_ff = "min")

+mkinmod <- function(..., use_of_ff = "min", speclist = NULL)

 {

-  spec <- list(...)

+  if (is.null(speclist)) spec <- list(...)

+  else spec <- speclist

   obs_vars <- names(spec)

 

   # Check if any of the names of the observed variables contains any other

@@ -185,7 +186,7 @@ mkinmod <- function(..., use_of_ff = "min")
     } #}}}

   } #}}}

 

-  model <- list(diffs = diffs, parms = parms, map = map, use_of_ff = use_of_ff)

+  model <- list(diffs = diffs, parms = parms, map = map, spec = spec, use_of_ff = use_of_ff)

 

   # Create coefficient matrix if appropriate#{{{

   if (mat) {