From 2f9b4ee3e956ee36af8a94f9d75bc8fbd9033dbf Mon Sep 17 00:00:00 2001 From: jranke Date: Thu, 10 Oct 2013 05:41:59 +0000 Subject: - Added a ChangeLog - 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 --- inst/GUI/simple.R | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'inst/GUI') diff --git a/inst/GUI/simple.R b/inst/GUI/simple.R index 54fea68..8947972 100644 --- a/inst/GUI/simple.R +++ b/inst/GUI/simple.R @@ -432,5 +432,22 @@ update_m_editor <- function() { # 3}}} # 2}}} +# Fit the models to the data {{{1 +mf <- gnotebook(cont = g) +fits <- s <- s.gt <- list() +override <- function(d) { + data.frame(name = d$name, time = d$time, + value = ifelse(d$override == "NA", d$value, d$override), + weight = d$weight) +} +fits[[1]] <- mkinfit(m[[1]], override(ds[[1]]$data), err = "weight") +fits[[1]]$name <- "SFO fit to FOCUS dataset A" +s[[1]] <- summary(fits[[1]]) +for (i in 1:length(fits)) { + fits[[i]] <- gframe(fits[[1]]$name, cont = mf, label = i) + s.tmp <- capture.output(print(s[[i]])) + s.gt[[i]] <- gtext(s.tmp, width = 600, cont = fits[[i]], + use.codemirror = TRUE) +} # 1}}} # vim: set foldmethod=marker ts=2 sw=2 expandtab: -- cgit v1.2.1