From 3532d769c1a3561de37e0d10cffa9801fe9df7c6 Mon Sep 17 00:00:00 2001
From: Johannes Ranke <jranke@uni-bremen.de>
Date: Sat, 13 Feb 2021 06:54:46 +0100
Subject: Update for gmkin 0.6.12

mkinfit: Keep model names stored in mkinmod objects, avoiding their loss in gmkin
---
 R/mkinfit.R | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'R')

diff --git a/R/mkinfit.R b/R/mkinfit.R
index 704e70a9..4da39841 100644
--- a/R/mkinfit.R
+++ b/R/mkinfit.R
@@ -261,8 +261,15 @@ mkinfit <- function(mkinmod, observed,
   summary_warnings <- character()
 
   # Derive the name used for the model
-  if (is.character(mkinmod)) mkinmod_name <- mkinmod
-  else mkinmod_name <- deparse(substitute(mkinmod))
+  if (is.character(mkinmod)) {
+    mkinmod_name <- mkinmod
+  } else {
+    if (is.null(mkinmod$name)) {
+      mkinmod_name <- deparse(substitute(mkinmod))
+    } else {
+      mkinmod_name <- mkinmod$name
+    }
+  }
 
   # Check mkinmod and generate a model for the variable whith the highest value
   # if a suitable string is given
-- 
cgit v1.2.1