diff --git a/DESCRIPTION b/DESCRIPTION index d158ccc..9b4bc09 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -13,7 +13,7 @@ Description: A toolkit implementing the Matrix Profile concept that was created License: MIT + file LICENSE URL: https://github.com/franzbischoff/tsmp BugReports: https://github.com/franzbischoff/tsmp/issues -Depends: R (>= 2.10), beepr, doSNOW, parallel, foreach +Depends: R (>= 2.10), audio, doSNOW, parallel, foreach Encoding: UTF-8 LazyData: true Roxygen: list(markdown = TRUE) diff --git a/NAMESPACE b/NAMESPACE index 1310e89..738335e 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -19,6 +19,7 @@ export(simple.fast) export(stamp) export(stamp.par) export(unconstrain.search) +import(audio) import(beepr) import(doSNOW) import(foreach) diff --git a/NEWS b/NEWS index 7ed38e8..5d9c893 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,12 @@ -tsmp 0.2.30 +tsmp 0.2.14 =========== +- Added SiMPle algorithm for sound data. +- Added FLUSS algorithm. +- Added \[find.chains()\] to look for chains primitives. +- Changed dependency from beepr to audio (actually beepr depends on + audio, so less dependencies) - Added a `NEWS.md` file to track changes to the package. tsmp 0.2.x diff --git a/NEWS.Rmd b/NEWS.Rmd index 3bba9df..fd0d548 100644 --- a/NEWS.Rmd +++ b/NEWS.Rmd @@ -21,8 +21,12 @@ knitr::opts_chunk$set( ) ``` -# tsmp 0.2.30 +# tsmp 0.2.14 +* Added SiMPle algorithm for sound data. +* Added FLUSS algorithm. +* Added [find.chains()] to look for chains primitives. +* Changed dependency from beepr to audio (actually beepr depends on audio, so less dependencies) * Added a `NEWS.md` file to track changes to the package. # tsmp 0.2.x diff --git a/NEWS.md b/NEWS.md index 5e1640b..a162d02 100644 --- a/NEWS.md +++ b/NEWS.md @@ -5,8 +5,13 @@ Francisco Bischoff -# tsmp 0.2.30 +# tsmp 0.2.14 + - Added SiMPle algorithm for sound data. + - Added FLUSS algorithm. + - Added \[find.chains()\] to look for chains primitives. + - Changed dependency from beepr to audio (actually beepr depends on + audio, so less dependencies) - Added a `NEWS.md` file to track changes to the package. # tsmp 0.2.x diff --git a/R/mstomp.R b/R/mstomp.R index f299029..be68679 100644 --- a/R/mstomp.R +++ b/R/mstomp.R @@ -114,7 +114,7 @@ mstomp <- function(data, window.size, must.dim = NULL, exc.dim = NULL, exclusion on.exit(close(pb)) } if (verbose > 1) { - on.exit(beepr::beep(10), TRUE) + on.exit(audio::play(sounds[[1]]), TRUE) } ## initialization diff --git a/R/mstomp_par.R b/R/mstomp_par.R index bb71220..cdfe947 100644 --- a/R/mstomp_par.R +++ b/R/mstomp_par.R @@ -31,7 +31,7 @@ #' # using all dimensions #' Sys.sleep(1) # sometimes sleep is needed if you run parallel multiple times in a row #' mp <- mstomp.par(toy_data$data[1:100,], 30, verbose = 0) -#' @import beepr doSNOW foreach parallel +#' @import audio doSNOW foreach parallel mstomp.par <- function(data, window.size, must.dim = NULL, exc.dim = NULL, exclusion.zone = 1 / 2, verbose = 2, n.workers = 2) { eps <- .Machine$double.eps^0.5 @@ -140,10 +140,7 @@ mstomp.par <- function(data, window.size, must.dim = NULL, exc.dim = NULL, exclu on.exit(close(pb), TRUE) } if (verbose > 1) { - on.exit(beepr::beep(10), TRUE) - # # sound_path <- system.file("sounds/microwave_ping_mono.wav", package = "beepr") - # # sfx <- audio::load.wave(sound_path) - # on.exit(audio::play(sfx), TRUE) + on.exit(audio::play(sounds[[1]]), TRUE) } ## initialize variable diff --git a/R/sdts_train.R b/R/sdts_train.R index dfcd9fb..57d39a3 100644 --- a/R/sdts_train.R +++ b/R/sdts_train.R @@ -148,7 +148,7 @@ sdts.train <- function(data, label, window.size, beta = 1, pat.max = Inf, parall on.exit(close(pb)) } if (verbose > 1) { - on.exit(beepr::beep(10), TRUE) + on.exit(audio::play(sounds[[1]]), TRUE) } for (i in 1:n.window.size) { diff --git a/R/simple.R b/R/simple.R index 70e6173..e31156c 100644 --- a/R/simple.R +++ b/R/simple.R @@ -76,7 +76,7 @@ simple.fast <- function(data, window.size, exclusion.zone = 1 / 2, verbose = 2) on.exit(close(pb)) } if (verbose > 1) { - on.exit(beepr::beep(10), TRUE) + on.exit(audio::play(sounds[[1]]), TRUE) } ## compute necessary values diff --git a/R/stamp.R b/R/stamp.R index 72213b1..d6f4809 100644 --- a/R/stamp.R +++ b/R/stamp.R @@ -98,7 +98,7 @@ stamp <- function(..., window.size, exclusion.zone = 1 / 2, s.size = Inf, verbos on.exit(close(pb)) } if (verbose > 1) { - on.exit(beepr::beep(10), TRUE) + on.exit(audio::play(sounds[[1]]), TRUE) } # anytime must return the result always on.exit(return(list( diff --git a/R/stamp_par.R b/R/stamp_par.R index 3b4af25..8b451be 100644 --- a/R/stamp_par.R +++ b/R/stamp_par.R @@ -107,7 +107,7 @@ stamp.par <- function(..., window.size, exclusion.zone = 1 / 2, s.size = Inf, n. on.exit(close(pb), TRUE) } if (verbose > 1) { - on.exit(beepr::beep(10), TRUE) + on.exit(audio::play(sounds[[1]]), TRUE) } # anytime must return the result always on.exit(return(list( diff --git a/R/sysdata.rda b/R/sysdata.rda new file mode 100644 index 0000000..e159947 Binary files /dev/null and b/R/sysdata.rda differ diff --git a/cran-comments.md b/cran-comments.md index a1287a4..24d81b0 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,4 +1,5 @@ -This is a point release fixing failing tests on CRAN. +* Changed dependency from beepr to audio (actually beepr depends on audio, so less dependencies). +* Added persons to DESCRIPTION as their code/research was implemented in this package. ## Test environments * local Windows 10 install, R 3.5.1 diff --git a/docs/news/index.html b/docs/news/index.html index 2f8a1fd..bf298ca 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -104,11 +104,15 @@
NEWS.md
- NEWS.md
file to track changes to the package.