Merge branch 'master' into wavreadfix

wadpac · Aug 6, 2017 · 3e4006f · 3e4006f
2 parents 8acab48 + 551a065
commit 3e4006f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd
@@ -1,9 +1,11 @@
 \name{NEWS}
 \title{News for Package \pkg{GGIR}}
 \newcommand{\cpkg}{\href{http://CRAN.R-project.org/package=#1}{\pkg{#1}}}
-\section{Changes in version 1.5-11 (release date:01-8-2017)}{
+\section{Changes in version 1.5-11 (release date:07-8-2017)}{
 \itemize{
-  \item Codecov badge added to the README file
+  \item Fixed bug introduced in 1.5-1: large window size of 3600 seconds was accidentally
+  hardcoded when the g.readaccfile function was added to GGIR in version 1.5-1
+  \item Codecov testing added and badge added to the README file
   \item Functions added to create dummy accelerometer file (csv) and dummy sleeplog (csv), 
 	needed for testing
   \item Default IVIS_epochsize_seconds parameter updated from 30 to 3600
@@ -19,6 +21,7 @@
 	the user to select which metric to use to describe behavior
   \item Argument dayborder is now included in g.part5 to consider the whole measurement in case the protocol
 	starts after midnight
+	\item Jairo Migueles added to list contributors
   }
 }
 

diff --git a/man/g.readaccfile.Rd b/man/g.readaccfile.Rd
@@ -10,7 +10,7 @@ for memory management.
 }
 \usage{
 g.readaccfile(filename,blocksize,blocknumber,selectdaysfile=c(),filequality,
-                         decn,dayborder)
+                         decn,dayborder,ws)
 }
 \arguments{
   \item{filename}{
@@ -37,6 +37,10 @@ and  filedoesnotholdday. All with the value TRUE or FALSE
   \item{dayborder}{
   See documentation \link{g.part1}
   }
+    \item{ws}{
+  Larger windowsize for non-detection, see documentation \link{g.part2}
+  }
+
 }
 \value{
 P=P,filequality=filequality, switchoffLD = switchoffLD