Merge pull request #175 from Nathaniel-Fernandes/master

[bugfix] Fixed error in iglu::mage(., return_type='df')

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: iglu
 Type: Package
 Title: Interpreting Glucose Data from Continuous Glucose Monitors
-Version: 4.2.0
+Version: 4.2.1
 Authors@R: c(person("Elizabeth", "Chun",
             role = c("aut")),
             person("Steve", "Broll",

NEWS.md

@@ -1,3 +1,6 @@
+# iglu 4.2.1
+* Fixed bug in MAGE
+
 # iglu 4.2.0
 * Fixed bug in GRI calculation
 

R/mage.R

@@ -39,6 +39,7 @@
 #' @examples
 #' data(example_data_5_subject)
 #' mage(example_data_5_subject, version = 'ma')
+#' mage(example_data_5_subject, return_type='df')
 
 mage <- function(data,
                  version = c('ma', 'naive'),
@@ -87,7 +88,11 @@ mage_ma <- function(data,
                                     title = title, xlab = xlab, ylab = ylab, show_ma = show_ma, show_excursions = show_excursions, static_or_gui='ggplot'))
 
   # Check if a ggplot or number in list is returned - convert the latter to a number
-  if(class(out$MAGE[[1]])[1] == "numeric" | is.na(out$MAGE[[1]][1])) {
+  if(class(out$MAGE[[1]])[1] == "data.frame") {
+    # No processing on DataFrames is needed
+    out <- out
+  }
+  else if(class(out$MAGE[[1]])[1] == "numeric" | is.na(out$MAGE[[1]][1])) {
     out <- out %>% dplyr::mutate(MAGE = as.numeric(MAGE))
   }
   # else must be ggplot output