Skip to content

Commit

Permalink
prep. new release
Browse files Browse the repository at this point in the history
  • Loading branch information
raphywink committed Jun 10, 2021
1 parent 2c14788 commit 5b1af57
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 9 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: emuR
Version: 2.2.0.9011
Version: 2.3.0
Title: Main Package of the EMU Speech Database Management System
Authors@R: c(
person("Raphael", "Winkelmann", , "[email protected]", c("aut", "cre")),
Expand Down
2 changes: 1 addition & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# emuR 2.2.0.9011
# emuR 2.3.0

## new features / performance tweaks / improvements

Expand Down
10 changes: 7 additions & 3 deletions R/emuR-bundleList.R
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ read_bundleList <- function(emuDBhandle,
##' \code{bundleList} parameter will be ignored and a bundleList will be created by
##' collapsing the segments as timeAnchors into the \code{_bundleList.json}
##' @param updateDBconfig if set to TRUE (the default) DBconfig will be updated
##' with the fields
##' with the fields
##' @param verbose be verbose
##' \itemize{
##' \item \code{"bundleComments": true}
##' \item \code{"bundleFinishedEditing": true}
Expand All @@ -45,7 +46,8 @@ write_bundleList <- function(emuDBhandle,
name,
bundleList,
seglist,
updateDBconfig = T){
updateDBconfig = T,
verbose = T){

if(missing(name)){
stop("name parameter must be given")
Expand All @@ -54,7 +56,9 @@ write_bundleList <- function(emuDBhandle,
bl_dir_path = file.path(emuDBhandle$basePath, "bundleLists")

if(!dir.exists(bl_dir_path)){
print(paste0("INFO: No bundleList dir found in emuDB (path: ", bl_dir_path, ")! Creating directory..."))
if(verbose){
print(paste0("INFO: No bundleList dir found in emuDB (path: ", bl_dir_path, ")! Creating directory..."))
}
created = dir.create(bl_dir_path)
if(!created){
stop("Couldn't create ", bl_dir_path)
Expand Down
1 change: 0 additions & 1 deletion R/emuR-get_trackdata.R
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,6 @@

#############################
# calculate size of and create new data matrix
browser()
rowSeq <- seq(timeStampSeq[curStartDataIdx], timeStampSeq[curEndDataIdx], fSampleRateInMS)
curData <- matrix(ncol = ncol(tmpData), nrow = length(rowSeq))

Expand Down
2 changes: 1 addition & 1 deletion cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Test environments

* local OSX & Windows 10 x64 installs, R version 4.0.3 (2020-10-10)
* local OSX (Platform: aarch64-apple-darwin20 (64-bit)) & Windows 10 x64 installs, R version 4.1.0 (2021-05-18)
* Ubuntu 16.04.6 LTS (on travis-ci), R version 4.0.2 (2020-06-22)
* devtools::check_rhub(); devtools::check_win_devel();

Expand Down
13 changes: 11 additions & 2 deletions man/write_bundleList.Rd

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

0 comments on commit 5b1af57

Please sign in to comment.