Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 3506101
Author: Francisco Bischoff <[email protected]>
Date:   Thu Aug 18 17:17:38 2022 +0100

    allfixed

commit 4700800
Author: Francisco Bischoff <[email protected]>
Date:   Thu Aug 18 14:02:50 2022 +0100

    siteok

commit 843e1e1
Author: Francisco Bischoff <[email protected]>
Date:   Thu Aug 18 12:32:37 2022 +0100

    recoding

commit 8b9fb0c
Author: Francisco Bischoff <[email protected]>
Date:   Mon Aug 8 09:56:24 2022 +0100

    checklist
  • Loading branch information
franzbischoff committed Aug 18, 2022
1 parent a1f2937 commit 24c9ff2
Show file tree
Hide file tree
Showing 225 changed files with 6,156 additions and 30,065 deletions.
14 changes: 12 additions & 2 deletions .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
^renv$
^renv\.lock$
^\.history$
^\.vscode$
^\.editorconfig$
^.*\.code-workspace$
^.*\.Rout$
^.*\.Rproj$
^.*\.yml$
^\..*$
^\.Rproj\.user$
^cran-comments\.md$
^CRAN-RELEASE$
^\..*$
^dev$
^docs$
^examples_.*$
^lastMiKTeXException$
^LICENSE\.md$
^LOCAL_APPDATA_FONTCONFIG_CACHE$
^NEWS\.md$
^NEWS\.Rmd$
^packrat$
^pkgdown$
Expand All @@ -25,3 +31,7 @@
^tsmp.*\.tgz$
^tsmp\.Rcheck$
^API$
^doc$
^Meta$
^codemeta\.json$
^CRAN-SUBMISSION$
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@ vignettes/*.R
# End of https://www.gitignore.io/api/r

# Personalized
.Renviron
.Rprofile
workspace.RData
.history
docs
dev
dev/
LOCAL_APPDATA_FONTCONFIG_CACHE/
src-*/
Expand All @@ -64,3 +70,5 @@ Rplots.pdf
/revdep/data.sqlite
/revdep/*.html
/CRAN-RELEASE
/doc/
/Meta/
53 changes: 43 additions & 10 deletions .lintr
Original file line number Diff line number Diff line change
@@ -1,10 +1,43 @@
linters: with_defaults(T_and_F_symbol_linter, assignment_linter, closed_curly_linter(FALSE), commas_linter,
commented_code_linter, cyclocomp_linter(50), object_name_linter(styles = "snake_case"), object_length_linter(30),
equals_na_linter, function_left_parentheses_linter, infix_spaces_linter,
line_length_linter = NULL, no_tab_linter, object_usage_linter, open_curly_linter(FALSE), paren_brace_linter,
absolute_path_linter(lax = FALSE), nonportable_path_linter(lax = FALSE), pipe_continuation_linter,
semicolon_terminator_linter(semicolon = "trailing"), seq_linter, single_quotes_linter,
spaces_inside_linter, spaces_left_parentheses_linter, trailing_blank_lines_linter,
trailing_whitespace_linter, undesirable_function_linter, undesirable_operator_linter,
unneeded_concatenation_linter
)
linters: linters_with_defaults(
absolute_path_linter(lax = TRUE),
any_duplicated_linter(),
any_is_na_linter(),
backport_linter(),
class_equals_linter(),
commented_code_linter = NULL,
condition_message_linter(),
consecutive_stopifnot_linter(),
cyclocomp_linter(50),
duplicate_argument_linter(),
fixed_regex_linter(),
ifelse_censor_linter(),
inner_combine_linter(),
line_length_linter(150),
literal_coercion_linter(),
missing_argument_linter(),
missing_package_linter(),
namespace_linter(),
nested_ifelse_linter(),
nonportable_path_linter(lax = TRUE),
numeric_leading_zero_linter(),
object_length_linter(30),
object_usage_linter = NULL,
outer_negation_linter(),
package_hooks_linter(),
paste_linter(),
pipe_call_linter(),
redundant_ifelse_linter(),
regex_subset_linter(),
semicolon_linter(allow_compound = TRUE),
sprintf_linter(),
string_boundary_linter(),
strings_as_factors_linter(),
system_file_linter(),
undesirable_function_linter(all_undesirable_functions),
undesirable_operator_linter(all_undesirable_operators),
unneeded_concatenation_linter(),
unreachable_code_linter(),
unused_import_linter(),
yoda_test_linter()
)
exclusions: list("dev", "tests", "renv", "R/RcppExports.R", "README.Rmd")
23 changes: 0 additions & 23 deletions .theia/settings.json

This file was deleted.

32 changes: 0 additions & 32 deletions .travis.yml

This file was deleted.

3 changes: 3 additions & 0 deletions CRAN-SUBMISSION
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Version: 0.4.15
Date: 2022-08-18 16:31:48 UTC
SHA: df773cc75d8a7236177046e860cc02bdf03a8993
17 changes: 8 additions & 9 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Type: Package
Package: tsmp
Title: Time Series with Matrix Profile
Version: 0.4.14.9000
Authors@R:
Version: 0.4.15
Authors@R:
c(person(given = "Francisco",
family = "Bischoff",
role = c("aut", "cre"),
Expand Down Expand Up @@ -39,10 +39,9 @@ Description: A toolkit implementing the Matrix Profile concept
<http://www.cs.ucr.edu/~eamonn/MatrixProfile.html>.
License: Apache License (>= 2.0)
URL: https://github.com/matrix-profile-foundation/tsmp
BugReports:
https://github.com/matrix-profile-foundation/tsmp/issues
Depends:
R (>= 3.5.0)
BugReports: https://github.com/matrix-profile-foundation/tsmp/issues
Depends:
R (>= 4.0)
Imports:
audio,
checkmate,
Expand All @@ -63,15 +62,15 @@ Suggests:
spelling,
testthat (>= 2.1.0),
vdiffr
LinkingTo:
LinkingTo:
Rcpp (>= 1.0.3),
RcppParallel (>= 5.0.0)
VignetteBuilder:
VignetteBuilder:
knitr
Encoding: UTF-8
Language: en-US
LazyData: true
NeedsCompilation: no
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.1.0
RoxygenNote: 7.2.1
SystemRequirements: GNU make
10 changes: 10 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,23 @@ S3method("[",Chain)
S3method("[",Discord)
S3method("[",Floss)
S3method("[",Fluss)
S3method("[",MPdistProfile)
S3method("[",MatrixProfile)
S3method("[",Motif)
S3method("[",MultiMatrixProfile)
S3method("[",MultiMotif)
S3method("[",PMP)
S3method("[",Salient)
S3method("[",SimpleMatrixProfile)
S3method("[",Snippet)
S3method(find_discord,MatrixProfile)
S3method(find_discord,PMP)
S3method(find_motif,MatrixProfile)
S3method(find_motif,MultiMatrixProfile)
S3method(find_motif,PMP)
S3method(head,MatrixProfile)
S3method(head,MultiMatrixProfile)
S3method(head,SimpleMatrixProfile)
S3method(plot,ArcCount)
S3method(plot,Chain)
S3method(plot,Discord)
Expand Down Expand Up @@ -47,6 +52,9 @@ S3method(print,SimpleMatrixProfile)
S3method(print,Snippet)
S3method(print,Valmod)
S3method(read,default)
S3method(tail,MatrixProfile)
S3method(tail,MultiMatrixProfile)
S3method(tail,SimpleMatrixProfile)
S3method(write,MatrixProfile)
S3method(write,PMP)
S3method(write,default)
Expand Down Expand Up @@ -124,4 +132,6 @@ importFrom(Rcpp,sourceCpp)
importFrom(RcppParallel,RcppParallelLibs)
importFrom(magrittr,"%>%")
importFrom(magrittr,"%T>%")
importFrom(utils,head)
importFrom(utils,tail)
useDynLib(tsmp, .registration = TRUE)
49 changes: 19 additions & 30 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<!-- NEWS.md is generated from NEWS.Rmd. Please edit that file -->

tsmp 0.4.14
===========
# tsmp 0.4.15

- Fix UBSAN error

# tsmp 0.4.14

- Fix ASAN/UBSAN errors using RcppParallel

tsmp 0.4.11
===========
# tsmp 0.4.11

- Fix in `mpx()`.

tsmp 0.4.9
==========
# tsmp 0.4.9

- Fixed MacOSX build.

tsmp 0.4.8
==========
# tsmp 0.4.8

- Added MPdist algorithm to compare two time series.
- Added `find_snippet()` that uses MPdist to show representative data.
Expand All @@ -27,8 +27,7 @@ tsmp 0.4.8
- Added `compute()`, `analyze()` and `visualize()`. Starting point in
the unified API from MPF.

tsmp 0.3.5
==========
# tsmp 0.3.5

- Changed `mass()` to `dist_profile()`, including options to different
algorithms.
Expand All @@ -45,22 +44,19 @@ tsmp 0.3.5
- Changed `find_motif()` for `MultiMatrixProfile` to report Motifs
correctly.

tsmp 0.3.4
==========
# tsmp 0.3.4

- Added `find_discord()` and its `print()` and `plot()` functions.
- Changed `plot()` for motifs to show where are the neighbors. Same
for discord.
- Added `valmod()` for Variable Length Motif Discovery.
- Changed `find_motif()` for compatibility with `valmod()`.

tsmp 0.3.3
==========
# tsmp 0.3.3

- Fixed `find_chains()` not returning the longest chain. Issue \#33

tsmp 0.3.2
==========
# tsmp 0.3.2

- Fixed Matrix Profile print, dimensions are now reported correctly.
- Fixed pipe imports. Issue \#22
Expand All @@ -74,18 +70,15 @@ tsmp 0.3.2
- Added Print and Plot to SiMPle. Issue \#24
- Added Print and Plot to Salient.

tsmp 0.3.1
==========
# tsmp 0.3.1

IMPORTANT
---------
## IMPORTANT

- This version is a complete restructuration. The API has changed, and
the workflow is more friendly. This API is intended to be stable,
and from now on any change will pass through the “Deprecated” stage.

Added Features
--------------
## Added Features

- Outputs have a prettier print format.
- Outputs have a plot function. Try to plot a `tsmp()` output for
Expand All @@ -104,14 +97,12 @@ Added Features
- Added support to query &lt; data in Joins.
- SCRIMP (experimental).

tsmp 0.2.15
===========
# tsmp 0.2.15

- Code linting.
- Added Salient Subsequences search.

tsmp 0.2.14
===========
# tsmp 0.2.14

- Added SiMPle (Fast Similarity Matrix Profile for Music Analysis and
Exploration).
Expand All @@ -122,14 +113,12 @@ tsmp 0.2.14
audio, so fewer dependencies).
- Added a `NEWS.md` file to track changes to the package.

tsmp 0.2.12
===========
# tsmp 0.2.12

- Added Multivariate STOMP parallel version.
- Added SDTS algorithm (Scalable Dictionary learning for Time Series).

tsmp 0.1.0
==========
# tsmp 0.1.0

- STAMP and STAMP parallel Algorithm.
- Multivariate STOMP algorithm.
Expand Down
5 changes: 4 additions & 1 deletion NEWS.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ knitr::opts_chunk$set(
)
```

# tsmp 0.4.15
* Fix UBSAN error

# tsmp 0.4.14
* Fix ASAN/UBSAN errors using RcppParallel

Expand Down Expand Up @@ -52,7 +55,7 @@ knitr::opts_chunk$set(

# tsmp 0.3.4
* Added `find_discord()` and its `print()` and `plot()` functions.
* Changed `plot()` for motifs to show where are the neighbors. Same for discord.
* Changed `plot()` for motifs to show where are the neighbors. Same for discord.
* Added `valmod()` for Variable Length Motif Discovery.
* Changed `find_motif()` for compatibility with `valmod()`.

Expand Down
Loading

0 comments on commit 24c9ff2

Please sign in to comment.