aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-09-05Saving the contents of the data frame with the observed variable names and ↵jranke7-17/+59
reloading works in simple3.R git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@88 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-09-04git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@87 ↵jranke3-0/+82
edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-07-31Add a test script for trying out the shiny way to build R GUIs.jranke1-0/+4
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@86 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-06-28A bit of experimentation with shinyjranke2-0/+23
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@85 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-06-18Start of new versionjranke1-2/+2
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@84 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-06-18Pending check-in of stuff started at east one month ago:jranke2-2/+5
- avoid returning factors in the data frame in mkin_wide_to_long - stop returning useless results with eigenvalue based solutions when observed absolute values are all very small - better test case for schaefer97 data making use of stepwise fitting - but the solution obtained in one step is better... git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@83 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-04-14- Update the TODO list, setting some requirements for version 1.0jranke11-52/+92
- 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-04-12Remove unnecessary.Rhistory file, as R CMD check gives a NOTE about it.jranke1-3/+0
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@81 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-04-08Update of todo and added linkjranke1-0/+1
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@80 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-04-05Update of the TODO listjranke1-1/+3
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@79 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-03-15Forgot to update the date in the last commitjranke1-1/+1
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@78 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-03-15Add the solution type used in the fit to the summaryjranke2-1/+5
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@77 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-03-12Improve formatting of data in print.summary.mkinfit()jranke2-3/+3
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@76 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-03-05Update of vignettes and static HTML documentationjranke2-0/+0
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@75 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-03-05- Calculate confidence intervals for parameters based on the t distributionjranke7-91/+134
Thanks to the CAKE developers at Tessella for the call to qt() - Calculate asymetric confidence intervals for backtransformed parameters - Overhaul and recompile vignettes git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@74 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-03-04Small updates of two mkin help filesjranke2-2/+2
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@73 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-03-04Introduce the possibility to place the legend with mkin using arguments lpos ↵jranke3-5/+12
and inset git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@72 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-02-21Make the use of globalVariable() conditional on R Version >= 2.15.1,jranke6-6/+9
in order to make mkin build on such R versions again. git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@70 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-02-18- Completion of the multicompartment part of the mkin examples vignettejranke11-88/+100
- Fix to chi2 error level calculation by correctly returning backtransformed parameters as bparms.optim and bparms.fixed - Adaptations of unit tests, summary and plot functions git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@67 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-02-18- Some more work on the vignettejranke2-31/+47
- Don't plot a main title in mkinresplot git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@66 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-02-18More work on the examples vignettejranke4-11/+207
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@65 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-02-18- Fix the line types in plot.mkinfit again.jranke2-2/+4
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@64 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-02-17- Removed vignette files that are built during generationjranke22-25660/+0
- Updated the staticdoc documentation git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@63 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-02-17- Added the examples vignette to the kinfit packagejranke8-10/+52
- Added calls to utils::globalVariables to make R CMD check pass cleanly without NOTES git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@62 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-02-16- Some maintenance fixesjranke30-11/+2059
- Start of the examples vignette git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@61 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-02-05- Prevent wrong association of colors and linetypes in plots during mkinfit ↵jranke2-8/+9
operation - Make solid lines the default in such plots, as in plot.mkinfit git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@60 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-11-26- Added an S3 plot method for mkinfit modelsjranke6-70/+123
- Fixed a bug in the mkinfit summary method which crashed on missing covariance matrices git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@58 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2012-09-20Some updates of the mkin vignettejranke4-70/+90
Added the kinfit vignette file to the repository git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@57 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2012-08-02One more TODO item based on a comment by Marie Laure Delignette-Mullerjranke1-0/+1
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@54 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2012-08-02Better wording in the TODO listjranke1-2/+2
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@53 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2012-07-23Remove the superfluous .RData filejranke1-0/+0
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@52 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2012-07-04Add two TODO itemsjranke1-0/+4
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@51 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2012-07-03- Add rtol argument in order to increase the precision of deSolve basedjranke6-22/+33
predictions for complex models - Improve default values for atol and set rtol default to 1e-10 git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@49 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2012-06-28Update DESCRIPTION files to bump versionsjranke1-2/+2
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@47 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2012-06-28Delete the PDF versions of the vignette to have them rebuilt on r-forge/CRANjranke1-0/+0
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@46 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2012-06-28- Formatting improvement of mkinmodjranke2-18/+19
- 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-06-26- Created an html index instead of a php indexjranke1-0/+0
- Rebuilt the mkin documentation git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@44 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2012-06-26Some stuff I did not check in yesterday for some reason.jranke1-0/+6
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@43 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2012-06-25- Document endpoints() functionjranke9-48/+86
- Fix unit tests that were broken by introduction of the endpoints function - Small documentation fixes - Format output of backtransformed parameters - Integrate snippet for making static documentation using staticdocs by Hadley Wickham git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@41 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2012-06-18Put the calculation of dissipation times, formation fractions and SFORB ↵jranke3-94/+100
eigenvalues into a separate function Some testing of this functionality in test.R git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@40 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2012-05-16Update of the DESCRIPTION file to produce a new version, as an important ↵jranke1-2/+2
error was fixed. git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@39 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-05-07- Moved the call to mkinerrmin to summary.mkinfitjranke4-60/+84
- The argument to mkinerrmin is now an object of class mkinfit - Fixed the allocation of parameters to observed variables in mkinerrmin git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@37 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2012-04-25- Some more unit testsjranke4-83/+95
- Some more other tests in test.R - Adaptation of mkinplot git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@36 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2012-04-25- Transferred some testing code from test.R to unit tests for mkinpredictjranke4-6/+92
- Fixed the output format of mkinpredict to be uniform across solution types git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@33 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2012-04-24- Added the reference fit data for FOCUS 2006 datasets from the kinfit packagejranke15-171/+443
- Used these data in unit tests for parent only models - Fixed SFORB data and calculation of formation fractions along the way - Reintroduced the test for the Schaefer 2007 data - Got rid of the mkinmod unit tests - they are too hard to maintain and the mkinfit tests test the model definitions as well git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@32 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2012-04-23- Fixed the example in the mkinmod documentationjranke3-14/+21
- Fixed the vignette - Did not fix the unit tests for mkinmod yet git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@31 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2012-04-23- Fixed a couple of thingsjranke5-3/+21
- 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-23- Some fixes to mkinfit, to account for the changes in mkinmodjranke3-25/+43
- See TODO for what remains to be done (not complete) git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@29 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

Contact - Imprint