From fcba8a833c5f920b12e1d7f17ef2d5236a81b354 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Thu, 13 Sep 2018 19:30:51 +0200 Subject: Enable the two-component error model --- DESCRIPTION | 6 +++--- NEWS.md | 10 +++++++++- inst/GUI/gmkin.R | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 8f3f66c..8af8910 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: gmkin Type: Package Title: Graphical User Interface for Fitting Kinetic Models to Chemical Degradation Data -Version: 0.6.8 -Date: 2016-03-06 +Version: 0.6.9 +Date: 2018-09-13 Authors@R: c(person("Johannes", "Ranke", role = c("aut", "cre", "cph"), email = "jranke@uni-bremen.de"), person("Stefan", "Meinecke", role = "ctb"), @@ -10,7 +10,7 @@ Authors@R: c(person("Johannes", "Ranke", role = c("aut", "cre", "cph"), Description: Browser based graphical user interface for R package mkin, based on the gWidgetsWWW2 package. Both gmkin and gWidgetsWWW2 are developed on GitHub, but are also available from the R-Forge repository. -Depends: mkin (> 0.9-40), gWidgetsWWW2 (>= 0.4-7) +Depends: mkin (>= 0.9.47.1), gWidgetsWWW2 (>= 0.4-7) Imports: R6, markdown, plyr Suggests: knitr, rmarkdown License: GPL diff --git a/NEWS.md b/NEWS.md index aa016f0..907a6a1 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,14 @@ # NEWS for package 'gmkin' -## gmkin 0.6-7 (2016-01-25) +## gmkin 0.6-9 (2018-09-13) + +- Enable fits with the two-component error model during iterative reweighting (IRLS) + +## gmkin 0.6-8 (2016-01-25) + +- Formal improvements mainly in the docs + +## gmkin 0.6-7 (2017-03-06) ### Bug fixes diff --git a/inst/GUI/gmkin.R b/inst/GUI/gmkin.R index 7e6e273..3692509 100644 --- a/inst/GUI/gmkin.R +++ b/inst/GUI/gmkin.R @@ -1173,7 +1173,7 @@ f.gg.opts.transform_fractions <- gcheckbox("transform_fractions", weights <- c("manual", "none", "std", "mean") f.gg.opts.weight <- gcombobox(weights, selected = 1, label = "weight", width = 180, cont = f.gg.opts.2) -f.gg.opts.reweight.method <- gcombobox(c("none", "obs"), selected = 1, +f.gg.opts.reweight.method <- gcombobox(c("none", "obs", "tc"), selected = 1, label = "IRLS", width = 180, cont = f.gg.opts.2) -- cgit v1.2.1