avoid rounding to 3 decimal places in classify

jhmigueles · jhmigueles · commit cc4b91241c32 · 2024-09-17T07:23:06.000+02:00
diff --git a/R/classify.R b/R/classify.R
@@ -73,8 +73,6 @@ classify = function(data = NULL, parameters = NULL, sf = NULL,
     ts = as.data.frame(cbind(subject, timestamp, ts))
   }
   # round numeric columns
-  numeric_columns = sapply(ts, mode) == 'numeric'
-  ts[numeric_columns] =  round(ts[numeric_columns], 3)
   ts  = do.call(data.frame,lapply(ts, function(x) replace(x, is.infinite(x), NA)))
   ts[is.na(ts)] = 0
   # -------------------------------------------------------------------------
diff --git a/R/runActimetric.R b/R/runActimetric.R
@@ -287,6 +287,8 @@ runActimetric = function(input_directory = NULL, output_directory = NULL, studyn
                 nw = rep(0, nrow(data) / (epoch*sf))
               }
             }
+          } else {
+            nw = rep(0, nrow(data) / (epoch*sf))
           }
           nonwear = c(nonwear, nw)
           # enmo per epoch

Original file line number	Diff line number	Diff line change
`@@ -73,8 +73,6 @@ classify = function(data = NULL, parameters = NULL, sf = NULL,`
`73`	`73`	`ts = as.data.frame(cbind(subject, timestamp, ts))`
`74`	`74`	`}`
`75`	`75`	`# round numeric columns`
`76`		`- numeric_columns = sapply(ts, mode) == 'numeric'`
`77`		`- ts[numeric_columns] = round(ts[numeric_columns], 3)`
`78`	`76`	`ts = do.call(data.frame,lapply(ts, function(x) replace(x, is.infinite(x), NA)))`
`79`	`77`	`ts[is.na(ts)] = 0`
`80`	`78`	`# -------------------------------------------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -287,6 +287,8 @@ runActimetric = function(input_directory = NULL, output_directory = NULL, studyn`
`287`	`287`	`nw = rep(0, nrow(data) / (epoch*sf))`
`288`	`288`	`}`
`289`	`289`	`}`
	`290`	`+ } else {`
	`291`	`+ nw = rep(0, nrow(data) / (epoch*sf))`
`290`	`292`	`}`
`291`	`293`	`nonwear = c(nonwear, nw)`
`292`	`294`	`# enmo per epoch`