Skip to content

Commit

Permalink
new version number for new release 1.5-15
Browse files Browse the repository at this point in the history
  • Loading branch information
vincentvanhees committed Dec 23, 2017
1 parent fae794e commit 05d4275
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 5 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: GGIR
Type: Package
Title: Raw Accelerometer Data Analysis
Version: 1.5-12
Date: 2017-8-8
Version: 1.5-15
Date: 2017-12-23
Authors@R: c(person("Vincent T","van Hees",role=c("aut","cre"),
email="[email protected]"),
person("Zhou","Fang",role="ctb"),
Expand Down
9 changes: 9 additions & 0 deletions inst/NEWS.Rd
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
\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-15 (release date:23-12-2017)}{
\itemize{
\item cwaread issue #57 fixed
\item cpp code fixed which did not compile anymore
\item a machine specific function test removed
}
}

\section{Changes in version 1.5-12 (release date:08-8-2017)}{
\itemize{
\item Fixed bug introduced in 1.5-1: large window size of 3600 seconds was accidentally
Expand Down
4 changes: 2 additions & 2 deletions man/GGIR-package.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ journal/conference publications.
\tabular{ll}{
Package: \tab GGIR\cr
Type: \tab Package\cr
Version: \tab 1.5-12\cr
Date: \tab 2017-8-8\cr
Version: \tab 1.5-15\cr
Date: \tab 2017-12-23\cr
License: \tab LGPL (>= 2.0, < 3)\cr
Discussion group: \tab https://groups.google.com/forum/#!forum/rpackageggir\cr
}
Expand Down
2 changes: 1 addition & 1 deletion tests/testthat/test_chainof5parts.R
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ test_that("chainof5parts", {
expect_that(ncol(output),equals(134))
expect_that(round(as.numeric(output$acc_wake[1]),digits=4),equals(31.1708))
expect_that(round(as.numeric(output$dur_day_min[3]),digits=4),equals(639.75))
expect_that(output$L5TIME[1],equals("2016-06-25T00:00:05+0100"))
# expect_that(output$L5TIME[1],equals("2016-06-25T00:00:05+0100"))

# Somehow, the following test to now work yet on Travis, but they do work locally.
# Possibly I will need to break down the problem by splitting up function g.part5 and designing
Expand Down

0 comments on commit 05d4275

Please sign in to comment.