aboutsummaryrefslogtreecommitdiff
path: root/R/mkinmod.R
AgeCommit message (Collapse)AuthorFilesLines
2015-12-10Improve print method for mkinmodJohannes Ranke1-2/+3
2015-12-09Improve mkinmod error message for missing target compartment definitionJohannes Ranke1-0/+1
Closes #6.
2015-10-24Improve printing method for mkinmodJohannes Ranke1-1/+1
2015-10-19Add a print method for mkinmod objectsJohannes Ranke1-0/+16
2015-06-23Hopefully fix compiling on Solaris, verbose optionJohannes Ranke1-11/+23
- Only declare the time variable in the C code when needed in the derivatives. - Add the option to show verbose output of cfunction() when compiling the model to a shared library.
2015-06-20Suppress compiler warning for sometimes unused time variableJohannes Ranke1-1/+3
2015-06-20Low-level generation of compiled modelsJohannes Ranke1-31/+62
As it is unclear if and when ccSolve will be published on CRAN, the generation, compilation and use of the C version of the system of differential equations was developed for mkin, inspired and guided by the code from the ccSolve package. Many thanks again to Karline Soetaert for all of her work on this and other R packages. Now all model types, including the Hockey-Stick model for the parent compund and the IORE model for parent and/or metabolites can be compiled.
2015-05-15Make mkinmod quiet in testsJohannes Ranke1-4/+4
2015-04-18Add a vignette showing the performance of compiled modelsJohannes Ranke1-3/+6
2015-04-17Make compiled FOMC and DFOP models workJohannes Ranke1-5/+4
- Many thanks @karlines for the hint in ccSolve#1 how to declare the time variable and for writing the ccSolve package in the first place - Add tests for the compiled versions of the FOMC and DFOP models
2015-04-16Update copyright header, improve documentation of solution_typeJohannes Ranke1-1/+1
2015-04-14Compile differential equation models with ccSolve packageJohannes Ranke1-0/+34
If the ccSolve package is available, and time is not in the right hand side of the equations (i.e. if only SFO and SFORB models are used), the differential equation model is compiled from auto-generated C code. Currently, one test (FOCUS 2006 D SFO_SFO) fails
2014-11-12Fix for IORE in mkinmodJohannes Ranke1-4/+4
2014-07-14Nearly complete support for IORE, pending mkinerrminJohannes Ranke1-10/+16
2014-07-12First working fits with IORE modelJohannes Ranke1-6/+22
2014-07-07Coefficient matrix for formation fractions, no sink and one pathwayJohannes Ranke1-22/+26
2014-07-02Do not introduce formation fractions for singular pathwaysJohannes Ranke1-4/+13
- As a consequence, we do not need implicit formation fractions in mkinfit
2014-07-02Support formation fractions without sink pathway, updatesJohannes Ranke1-3/+0
2014-07-01One more check, update source code commentJohannes Ranke1-2/+3
2013-12-04Remove mkinmod warning based on a misconceptionJohannes Ranke1-13/+2
2013-10-08- Added the possibility to specify the observed variable in mkinmod in a ↵jranke1-3/+4
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
2013-04-14- Update the TODO list, setting some requirements for version 1.0jranke1-0/+1
- Check that initial values specified using parms.ini are actually needed for the model, stop otherwise - List all formation fractions in the same place in the summary, also if they were fitted in the model - Include an FOMC model coupled to two metabolites in the unit tests - Some updates needed because of the above - Update of static documentation including the vignettes - Update of the mkin vignettes in the vignettes directory git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@82 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-02-18More work on the examples vignettejranke1-8/+16
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@65 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2012-12-13Small formatting improvementsjranke1-5/+8
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@59 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2012-06-28- Formatting improvement of mkinmodjranke1-14/+15
- Small fix in mkinplot git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@45 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2012-05-16Fixed a bug in mkinmod that produced a erroneous coefficient matrix if more ↵jranke1-4/+7
than one SFORB submodel is used git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@38 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2012-04-23- Fixed a couple of thingsjranke1-1/+5
- Now the eigenvalue based solutions are nicely consistent with the deSolve solutions, if enough output times are specified (100, sometimes more are needed, see test.R) - Workaround for invilr not to produce NaN values so often - Still a lot to do (see TODO) git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@30 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2012-04-16Overhaul of mkinmod in order to make it possible to choose between different ↵jranke1-52/+108
model specifications - a variant with minimal use of formation fractions, and a variant with formation fractions everywhere. git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@26 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2012-04-15- Fixed the SFORB coefficient matrix, at least for the case where parent is ↵jranke1-2/+9
SFORB - This version works but is slower and less stable than mkin 0.8-11 - mkinplot is not adapted to this version git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@25 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2012-04-11- Testing of the new fitting process with transformed parameters shows that ↵jranke1-40/+37
it is less stable than the way of fitting used in mkin 0.8. Presumably this is due to the frequent presence of products of two parameters (formation fractions and kinetic rate constants) in the differential equations. - mkinmod documentation was adapted to the new version - Introduce vim fold markers to the mkinmod source for convenience git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@24 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2012-04-11Added subversion keyword substitution to R source files in order to get ↵jranke1-1/+1
correct Id tags git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@23 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2012-03-27Start of the transition to fitting transformed parameters.jranke1-107/+61
Many things are broken now (see TODO list) git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@20 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2012-03-15Update kinfit and mkin to the latest version published on BerliOS.jranke1-22/+132
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@17 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2010-05-18Much more complete version that was just submitted to CRAN.jranke1-17/+49
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@9 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2010-05-11Initial upload of the upcoming multicompartment version of kinfit.jranke1-0/+76
Some functionality is still missing (chi2), some may never be implemented (FOMC model), but in general it is much more powerful than kinfit, owing to the powerful FME package. git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@8 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

Contact - Imprint