aboutsummaryrefslogtreecommitdiff
path: root/inst
AgeCommit message (Collapse)AuthorFilesLines
2013-10-16- One possibility to handle the parameters each with several named widgets, ↵jranke1-19/+22
a bit clumsy git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@116 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-10-16- More consistent output regarding optimised and fixed parameters (see ↵jranke1-48/+97
ChangeLog) - Switch from gcanvas to gsvg - Start setting up the fits in the GUI - add files for testing gWidgetsWWW2 functionality git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@115 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-10-14- set svn keyword for Id tag in simple.Rjranke1-3/+3
- set initial foldlevel for two files to 0 git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@114 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-10-14- Added the header to the GUI filejranke1-44/+76
- Code reformatting and some reorganisation git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@113 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-10-11Some more plotting experimentsjranke1-4/+27
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@112 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-10-11Added a button...jranke1-20/+32
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@111 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-10-10- Added a ChangeLogjranke1-0/+17
- Do not use time zero values of 0 for chi2 error level calculations (see changelog) - Show weighting method in summary - Correct the output of the data in the case of manual weights - Some reformatting in mkinfit.R - GUI: First attempt at representing a fit in the GUI git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@108 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-10-08- Added the possibility to specify the observed variable in mkinmod in a ↵jranke1-11/+130
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-10-07- Added a list of models to select fromjranke2-14/+64
- Started the model editor - Added two session files used for testing git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@106 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-10-07It seems that study and dataset handling now works as desired.jranke1-20/+21
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@105 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-10-05- There was not really a bug, only the page load takes long using FF on Linuxjranke2-28/+37
- Switching datasets now works fast and seems to be reliable - Moved the save changes button to a new line after the forms - Took out some ggroups that were not necessary any more - The study selector in the dataset editor is now renewed when the dataframe with the studies is edited git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@104 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-10-04Switching datasets is much quicker now, but somehow I introduced a bug that jranke1-47/+33
makes the Javascript engine throw an error.. And updating the study selector box in the dataset editor does not work at the moment. git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@103 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-10-04Start to change the dataset editor head from glayout to gformlayout, hoping ↵jranke1-23/+26
that this will make it possible to manipulate the gedit instances from within a function. git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@102 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-10-03Just a small bugfix, took me a while to find this, to have a working versionjranke1-1/+1
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@101 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-10-02Saving, editing and reloading of datasets now works.jranke2-41/+125
New TODO item is handling the observed variables correctly, and generating an empty grid git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@100 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-10-01- Remove mkin GUI project files, as they can be a source of error during ↵jranke4-17/+24
development - Make the index to the dataset list ds a character, in order to be able to count the entries correctly after deleting an entry - Make the dataset switcher a handler only for the click event, as otherwise it was called by the assignment of the new data to the gtable widget git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@98 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-09-25- Fixed the NOTES listed by R CMD checkjranke1-0/+0
Candidate for publication on CRAN git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@97 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-09-14Started a TODO listjranke1-0/+1
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@96 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-09-14Now the titles of the datasets can be edited. jranke1-37/+51
Saving and reloading datasets is not implemented yet git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@95 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-09-14- Selection of datasets for editing now worksjranke1-38/+48
- Button for saving dataset changes introduced git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@94 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-09-13A little more progressjranke1-1/+1
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@93 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-09-13Add and update a study combobox in the dataset editorjranke1-19/+39
Various other small things git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@92 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-09-13Just resolved a small conflict caused by a local change before updatingjranke1-1/+1
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@91 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-09-06Start a dataset editorjranke3-5/+81
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@90 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-09-05Clean up the GUI directory, the old stuff does not really help a lotjranke15-279/+58
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@89 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
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-04-14- Update the TODO list, setting some requirements for version 1.0jranke1-31/+8
- 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-02-18- Completion of the multicompartment part of the mkin examples vignettejranke1-22/+22
- 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
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-06-25- Document endpoints() functionjranke2-28/+29
- 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-04-25- Some more unit testsjranke1-0/+75
- 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 mkinpredictjranke2-0/+87
- 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 packagejranke2-159/+232
- 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-10- Fitting and summaries now work with the new parameter transformations.jranke8-24236/+56
- The SFORB models with metabolites is broken (see TODO) - Moved the vignette to the location recommended since R 2.14 - Added the missing documentation - Commented out the schaefer_complex_case test, as this version of mkin is not able to fit a model without sink and therefore mkin estimated parameters are quite different git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@22 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2012-03-15Update kinfit and mkin to the latest version published on BerliOS.jranke12-16/+24140
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@17 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2010-06-09New version number, remove dependency on kinfit as it is currentlyjranke1-0/+0
not needed. git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@15 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2010-06-03- Add the documentation of the KinGUI test data resultsjranke1-1/+1
- Fix the corresponding test based on these results git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@12 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2010-05-31- Added a test based on the KinGUI paper "complex case"jranke1-0/+35
- Fix the DT50 calculation for the SFORB model - Added a bit more of a description git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@11 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2010-05-18Much more complete version that was just submitted to CRAN.jranke3-24/+66
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.jranke7-0/+314
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