Skip to content

Commit 46e84da

Browse files
authored
Merge pull request #44 from PhysicalActivityOpenTools/issue41_documentation
Documentation
2 parents d18d0dd + 55d69dc commit 46e84da

File tree

4 files changed

+7
-1
lines changed

4 files changed

+7
-1
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: actimetric
22
Type: Package
33
Title: Classifies Accelerometer Data Into Physical Activity Types
4-
Version: 0.1.1
4+
Version: 0.1.2
55
Authors@R: c(person("Jairo H","Migueles", role = c("aut","cre"),
66
email = "[email protected]",
77
comment = c(ORCID = "0000-0003-0366-6935")),

NEWS.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# actimetric 0.1.2
2+
3+
* Documentation: include references to papers, other pieces of code, packages, and authorships #41
4+
15
# actimetric 0.1.1
26

37
* Data reading: fix minor bug when reading short files #25

R/featuresTrost2017.R

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#' accelerometer data. J Sci Med Sport. 2017 Jan;20(1):75-80.
1616
#' doi: 10.1016/j.jsams.2016.06.003
1717
#' @author Matthew N. Ahmadi <[email protected]>
18+
#' @author Stewart G. Trost <[email protected]>
1819
featuresTrost2017 = function(data, epoch, sf) {
1920
# original code provided by Matthew N. Ahmadi
2021
window = epoch * sf

R/featuresTrost2018.R

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#' @import stats
2929
#' @importFrom e1071 skewness kurtosis
3030
#' @author Matthew N. Ahmadi <[email protected]>
31+
#' @author Stewart G. Trost <[email protected]>
3132
featuresTrost2018 = function(data, vm, epoch, overlap, sf,
3233
lowerBound = 0.25, upperBound = 5) {
3334
# INTERNAL FUNCTIONS (only used here) -------------------------------------

0 commit comments

Comments
 (0)