diff --git a/NAMESPACE b/NAMESPACE index 940fa92..401cd37 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -20,7 +20,6 @@ export(structure_data) import(foreach) import(ggplot2) import(ggpubr) -importFrom(GENEAread,g.downsample) importFrom(GENEAread,read.bin) importFrom(GGIRread,readAxivity) importFrom(GGIRread,resample) diff --git a/R/autocalibration.R b/R/autocalibration.R index e2f5af8..b5c729a 100644 --- a/R/autocalibration.R +++ b/R/autocalibration.R @@ -95,9 +95,7 @@ autocalibration = function(data, sr, printsummary= TRUE, brand) { D1 = g.downsample(Gx,sr,ws4,ws2); GxM2 = D1$var2 D1 = g.downsample(Gy,sr,ws4,ws2); GyM2 = D1$var2 D1 = g.downsample(Gz,sr,ws4,ws2); GzM2 = D1$var2 - - - + #sd acceleration dim(Gx) = c(sr*ws4,ceiling(length(Gx)/(sr*ws4))); GxSD2 = apply(Gx,2,sd) dim(Gy) = c(sr*ws4,ceiling(length(Gy)/(sr*ws4))); GySD2 = apply(Gy,2,sd)