Skip to content

Commit

Permalink
Merge pull request #947 from zcx980605/fix_typo_in_g.report.part2
Browse files Browse the repository at this point in the history
Fix typo in g.report.part2
  • Loading branch information
vincentvanhees authored Oct 26, 2023
2 parents e2521bd + 0fce998 commit c8e991e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ Authors@R: c(person("Vincent T","van Hees",role=c("aut","cre"),
person(given = "Taren",family = "Sanders", role = "ctb"),
person("Medical Research Council UK", role = c("cph", "fnd")),
person("Accelting", role = c("cph", "fnd")),
person("French National Research Agency", role = c("cph", "fnd")))
person("French National Research Agency", role = c("cph", "fnd")),
person("Chenxuan","Zhao",role="ctb"))
Maintainer: Vincent T van Hees <[email protected]>
Description: A tool to process and analyse data collected with wearable raw acceleration sensors as described in Migueles and colleagues (JMPB 2019), and van Hees and colleagues (JApplPhysiol 2014; PLoSONE 2015). The package has been developed and tested for binary data from 'GENEActiv' <https://activinsights.com/> and GENEA devices (not for sale), .csv-export data from 'Actigraph' <https://theactigraph.com> devices, and .cwa and .wav-format data from 'Axivity' <https://axivity.com>. These devices are currently widely used in research on human daily physical activity. Further, the package can handle accelerometer data file from any other sensor brand providing that the data is stored in csv format and has either no header or a two column header. Also the package allows for external function embedding.
URL: https://github.com/wadpac/GGIR/, https://groups.google.com/forum/#!forum/RpackageGGIR, https://wadpac.github.io/GGIR/
Expand Down
2 changes: 1 addition & 1 deletion R/g.report.part2.R
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ g.report.part2 = function(metadatadir = c(), f0 = c(), f1 = c(), maxdur = 0,
QC = QC[, colnames(QCout)] # reorder to match order of QCout
} else if (n1 < n2) {
newcolnames = colnames(QC)[which(colnames(QC) %in% colnames(QCout) == FALSE)]
newcols = (n2 + 1):(n1 + length(newcolnames))
newcols = (n1 + 1):(n1 + length(newcolnames))
QCout = cbind(QCout, matrix(" ", 1, n2 - n1))
colnames(QCout)[newcols] = newcolnames
QCout = QCout[, colnames(QC)] # reorder to match order of QC
Expand Down

0 comments on commit c8e991e

Please sign in to comment.