diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2015-12-09 11:44:58 +0100 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2015-12-09 12:30:43 +0100 |
| commit | 00b8c6fb49a5f2fb15022f725fbf3565ccca0eaa (patch) | |
| tree | 90ab464ec177927a16c684eefda85cc672c72f2d | |
| parent | 54729e55912608fefc1b1be08d01d9cbeb381d12 (diff) | |
Fix sorting of tables in results view
| -rw-r--r-- | DESCRIPTION | 4 | ||||
| -rw-r--r-- | NEWS.md | 6 | ||||
| -rw-r--r-- | inst/GUI/gmkin.R | 10 | ||||
| -rw-r--r-- | vignettes/gmkin_manual.html | 4 |
4 files changed, 15 insertions, 9 deletions
diff --git a/DESCRIPTION b/DESCRIPTION index 7e8335a..3496504 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.3 -Date: 2015-11-28 +Version: 0.6.4 +Date: 2015-12-09 Authors@R: c(person("Johannes", "Ranke", role = c("aut", "cre", "cph"), email = "jranke@uni-bremen.de"), person("Eurofins Regulatory AG", role = "cph")) @@ -1,8 +1,12 @@ # NEWS for package 'gmkin' +## gmkin 0.6-4 (2015-12-09) + +- Various small corrections of unexpected or incorrect GUI behaviour. See git commit logs for details. + ## gmkin 0.6-3 (2015-11-28) -- Various small layout and GUI logic improvements based on the suggestions by Stefan Meinecke (Umweltbundesamt Germany). Thanks! +- Various small layout and GUI logic improvements based on the suggestions by Stefan Meinecke (Umweltbundesamt Germany). Thanks, also for the financial support from the Umweltbundesamt! ### Minor changes diff --git a/inst/GUI/gmkin.R b/inst/GUI/gmkin.R index 954fe74..b58f2e7 100644 --- a/inst/GUI/gmkin.R +++ b/inst/GUI/gmkin.R @@ -314,12 +314,14 @@ update_f_conf <- function() { # {{{3 }
update_f_results <- function() { # {{{3
svalue(r.name) <- ftmp$name
- r.parameters[] <- cbind(rownames(stmp$bpar), stmp$bpar[, c(1, 4, 5, 6)])
+ r.parameters[] <- cbind(Parameter = rownames(stmp$bpar), stmp$bpar[, c(1, 4, 5, 6)])
err.min <- 100 * stmp$errmin$err.min
- r.frames.chi2.gt[] <- cbind(rownames(stmp$errmin), signif(err.min, 3),
- stmp$errmin[, c(2, 3)])
+ r.frames.chi2.gt[] <- cbind(Variable = rownames(stmp$errmin),
+ Error = signif(err.min, 3),
+ n.opt = stmp$errmin$n.optim,
+ df = stmp$errmin$df)
if (is.null(stmp$ff)) r.frames.ff.gt[] <- ff.df.empty
- else r.frames.ff.gt[] <- cbind(names(stmp$ff), round(stmp$ff, 4))
+ else r.frames.ff.gt[] <- cbind(Path = names(stmp$ff), ff = round(stmp$ff, 4))
distimes <- format(stmp$distimes, digits = 3)
delete(r.frames.distimes, r.frames.distimes.gt)
delete(r.frames, r.frames.distimes)
diff --git a/vignettes/gmkin_manual.html b/vignettes/gmkin_manual.html index ed3ca7f..e9e90a5 100644 --- a/vignettes/gmkin_manual.html +++ b/vignettes/gmkin_manual.html @@ -10,7 +10,7 @@ <meta name="author" content="Johannes Ranke" /> -<meta name="date" content="2015-11-28" /> +<meta name="date" content="2015-12-09" /> <title>Manual for gmkin</title> @@ -65,7 +65,7 @@ img { <div id="header"> <h1 class="title">Manual for gmkin</h1> <h4 class="author"><em>Johannes Ranke</em></h4> -<h4 class="date"><em>2015-11-28</em></h4> +<h4 class="date"><em>2015-12-09</em></h4> </div> <div id="TOC"> |