aboutsummaryrefslogtreecommitdiff
path: root/inst
AgeCommit message (Collapse)AuthorFilesLines
2014-05-02Improve formattingJohannes Ranke1-1/+2
2014-05-02Plot parameter confidence intervalsJohannes Ranke1-3/+14
2014-04-30Overhaul of gmkin - should be useful nowJohannes Ranke1-59/+161
- Improve widget layout + Size of widgets in left pane + Enable scrolling in left pane + Smaller plot + Control width of summary text file - Upload of data with flexible format - Parameter transformation is now optional - Get initial values from selected previous fit - Fix initial plots for the case of zero parameter values
2014-04-28Option to add residual plot to plot.mkinfitJohannes Ranke1-9/+2
2014-04-28Fix uploading of workspace filesJohannes Ranke1-0/+3
2014-04-28Complete the introduction of plot optionsJohannes Ranke1-24/+27
2014-04-26New layout for plotting and fitting, add residual plotJohannes Ranke1-122/+92
2014-03-21Small variation to last commit, in reality fixes #2Johannes Ranke1-1/+1
2014-03-21Update interval variabel list on saving a dataset, fixes #1Johannes Ranke1-0/+1
2014-02-27Format of gmkin workspace files, copyright, updatesJohannes Ranke2-33/+60
- Change the format of the workspace files of gmkin so they can be distributed in the mkin package - Add gmkin workspace datasets FOCUS_2006_gmkin and FOCUS_2006_Z_gmkin - Restrict the unit test with the Schaefer data to parent and primary metabolites as formation fraction and DT50 for A2 are higly correlated and passing the test is platform dependent. For example, the test fails in 1 out of 14 platforms on CRAN as of today - Add Eurofins Regulatory AG copyright notices - Import FME and deSolve instead of depending on them to have cleaner startup
2013-11-18Add GUI start function, keep GUI here in mkinJohannes Ranke3-4/+2
2013-11-13Squashed commit of the following:jranke1-4/+48
commit d8dbf2ad866fb9d34cd1100000b9c116219ecef6 Author: Johannes Ranke <jranke@uni-bremen.de> Date: Wed Nov 13 22:09:41 2013 +0100 Add possibility to control more mkinfit arguments from the GUI commit 8f1bae2142b37a0ff6b8989b2d1569686937f68e Author: Johannes Ranke <jranke@uni-bremen.de> Date: Wed Nov 13 20:30:11 2013 +0100 Add initial weighting choice to GUI commit c99b5c298713a7c14e8ab5604c68613d0b7af27a Author: Johannes Ranke <jranke@uni-bremen.de> Date: Wed Nov 13 16:25:31 2013 +0100 Update of TODO from git bash on Windows commit 8bf2a6f8f6bd752433f06b26b5da334e958f5166 Author: Johannes Ranke <jranke@uni-bremen.de> Date: Wed Nov 13 16:00:01 2013 +0100 Update of README using TortoiseGit git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@162 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-11-11- Add a simple makefilejranke1-1/+0
- Add a .Rbuildignore file - Clean up unit tests a bit - Test the gwidgets notebook from the knitr demo git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@150 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-11-09GUI: Fixed a bug that occurred when deleting the last fit from the fit listjranke1-1/+1
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@149 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-11-07- Added additional plots, including residual plotsjranke1-7/+75
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@148 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-11-06GUI:jranke1-19/+30
- Uploading of text files works - The current summary is always shown git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@144 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-11-06Start to enable the import of CSV files.jranke1-0/+31
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@143 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-11-06- New candidate for release containing the latest changes to the GUIjranke5-724/+100
- Checking and releasing myself as r-forge has a stuffed build pipeline git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@139 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-11-04- Now the eigenvalue based solution for FOCUS 2006 D works flawlessly withjranke1-20/+2
default starting parameters - Took out a relatively long-lasting test that did not say much git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@136 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-11-04Fixing parameters (initial state and differential equation parameters) nowjranke1-6/+12
also works in the experimental GUI git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@134 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-10-30Fits can now be saved in the project file in the experimental GUI, and ↵jranke1-15/+39
reloaded from it, together with the datasets and models. git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@131 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-10-30Improved fit management in the experimental GUIjranke1-47/+99
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@130 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-10-29- Just one little formatting change in mkinfit.Rjranke1-5/+128
- Some very basic fitting now works in the experimental GUI with the new widget layout git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@128 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-10-28Make the left pane in the new experimental GUI layout smaller and the study ↵jranke1-12/+9
data simpler as editing study details is not the purpose of the GUI git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@127 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-10-25A new layout for the GUI and an update of the staticdocs, as I just jranke1-0/+445
uploaded 0.9-22 for publication on CRAN git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@125 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-10-21Some more progress towards the gcombobox selection of modelsjranke1-32/+50
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@122 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-10-21- Half way through replacing gnotebooks for the fitsjranke1-57/+32
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@121 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
2013-10-17- See ChangeLog entry for today (2 small bugfixes and lots of GUI progress)jranke2-26/+109
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@117 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
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

Contact - Imprint