Skip to content

Commit

Permalink
some polishing and tiny changes before release
Browse files Browse the repository at this point in the history
  • Loading branch information
gisler committed Mar 26, 2020
1 parent 5dd2342 commit 7464a97
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
^.*\.Rproj$
^\.Rproj\.user$
^\.travis\.yml$
^cran-comments.md$
^cran-comments\.md$
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Package: DTSg
Type: Package
Title: A Class for Working with Time Series Based on 'data.table' and 'R6' with
Largely Optional Reference Semantics
Version: 0.3.0.9000
Version: 0.4.0
Authors@R: person("Gerold", "Hepp", email = "ghepp@iwag.tuwien.ac.at", role = c("aut", "cre"))
Description: Basic time series functionalities such as listing of missing
values, application of arbitrary aggregation as well as rolling window
Expand Down Expand Up @@ -33,6 +33,6 @@ Suggests:
RColorBrewer,
rmarkdown,
tinytest
RoxygenNote: 7.0.2
RoxygenNote: 7.1.0
Roxygen: list(r6 = FALSE)
VignetteBuilder: knitr
8 changes: 4 additions & 4 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
## DTSg v0.3.0.9000
## DTSg v0.4.0

* Added `memoryOverCPU` argument to `rollapply` method: allows for preferring CPU over memory usage, which makes the method more flexible in terms of resource consumption
* Fixed pointless coercion of `POSIXct` *.dateTime* columns in case they contained at least one `NA` value
* Switched to unit testing framework of the `tinytest` instead of the `testthat` package
* Fixed automatic setting of option `DTSgClone` to `TRUE` on package loading, i.e. the option's setting in e.g. *.RProfile* is no longer overwritten
* Settings of option `DTSgClone` in e.g. *.RProfile* are now respected and not overwritten by `TRUE` when the package is loaded
* Fixed useless coercion of `POSIXct` *.dateTime* columns to `POSIXct` upon object creation in case they contained at least one `NA` value
* Switched to unit testing framework of the `tinytest` package instead of the `testthat` package
* Slightly improved vignettes and documentation
* Minor internal code improvements

Expand Down
6 changes: 3 additions & 3 deletions R/ClassDTSg.R
Original file line number Diff line number Diff line change
Expand Up @@ -699,12 +699,12 @@ DTSg <- R6Class(
if (private$.parameter != "") {
cat("Parameter: ", private$.parameter , "\n", sep = "")
}
if (private$.variant != "") {
cat("Variant: ", private$.variant , "\n", sep = "")
}
if (private$.unit != "") {
cat("Unit: ", private$.unit , "\n", sep = "")
}
if (private$.variant != "") {
cat("Variant: ", private$.variant , "\n", sep = "")
}
cat( "Aggregated: ", private$.isAggregated, "\n", sep = "")
cat( "Regular: ", private$.isRegular , "\n", sep = "")
if (is.character(private$.periodicity)) {
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ Install the latest release from CRAN:

[![CRAN Version](https://www.r-pkg.org/badges/version/DTSg)](https://cran.r-project.org/package=DTSg) [![CRAN Checks](https://cranchecks.info/badges/summary/DTSg)](https://cran.r-project.org/web/checks/check_results_DTSg.html)

Install the development version from GitHub (requires the `devtools` package):
Install the development version from GitHub (requires the `remotes` package):

`devtools::install_github("gisler/DTSg")`
`remotes::install_github("gisler/DTSg")`

[![Build Status](https://travis-ci.org/gisler/DTSg.svg?branch=master)](https://travis-ci.org/gisler/DTSg) [![Coverage Status](https://coveralls.io/repos/github/gisler/DTSg/badge.svg?branch=master)](https://coveralls.io/github/gisler/DTSg?branch=master)

Expand Down
6 changes: 4 additions & 2 deletions man/flow.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 7464a97

Please sign in to comment.