Skip to content

Commit

Permalink
Finish v0.1.7
Browse files Browse the repository at this point in the history
  • Loading branch information
franzbischoff committed Nov 26, 2021
2 parents 2895185 + af0cbfe commit 4d9d2c7
Show file tree
Hide file tree
Showing 33 changed files with 5,836 additions and 5,506 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,13 @@ vignettes/*.R

# Personalized

desktop.ini

# use github-actions to build the webpage
/pkgdown/
/docs/

dev/
/dev/*
LOCAL_APPDATA_FONTCONFIG_CACHE/
src-*/
packrat/lib*/
Expand Down
3 changes: 2 additions & 1 deletion .lintr
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@ exclusions: list(
"dev/*",
"**/renv/**",
"R/RcppExports.R",
"README.Rmd"
"README.Rmd",
".Rhistory"
)
8 changes: 4 additions & 4 deletions .vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"name": "Rtools40-x64",
"intelliSenseMode": "gcc-x64",
"includePath": [
"C:/Program Files/R/R-4.1.0/include",
"C:/Program Files/R/R-4.1.1/include",
"${workspaceFolder}/src",
"${workspaceFolder}/renv/library/R-4.1/x86_64-w64-mingw32/Rcpp/include",
"${workspaceFolder}/renv/library/R-4.1/x86_64-w64-mingw32/RcppParallel/include",
Expand All @@ -18,7 +18,7 @@
"STRICT_R_HEADERS",
"NDEBUG"
],
"compilerPath": "C:/rtools40/mingw64/bin/g++.exe",
"compilerPath": "D:/rtools40/mingw64/bin/g++.exe",
"cStandard": "gnu11",
"cppStandard": "gnu++11",
"customConfigurationVariables": {
Expand All @@ -30,7 +30,7 @@
"name": "Rtools40-x86",
"intelliSenseMode": "gcc-x86",
"includePath": [ // renv might be on i386-w64-mingw32 if R-32bits
"C:/Program Files/R/R-4.1.0/include",
"C:/Program Files/R/R-4.1.1/include",
"${workspaceFolder}/src",
"${workspaceFolder}/renv/library/R-4.1/x86_64-w64-mingw32/Rcpp/include",
"${workspaceFolder}/renv/library/R-4.1/x86_64-w64-mingw32/RcppParallel/include",
Expand All @@ -44,7 +44,7 @@
"STRICT_R_HEADERS",
"NDEBUG"
],
"compilerPath": "C:/rtools40/mingw32/bin/g++.exe",
"compilerPath": "D:/rtools40/mingw32/bin/g++.exe",
"compilerArgs": [
"-m32"
], // redundant, but...
Expand Down
8 changes: 4 additions & 4 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
{
"type": "process",
"label": "R: lint package",
"command": "C:/Program Files/R/R-4.1.0/bin/x64/Rscript.exe",
"command": "C:/Program Files/R/R-4.1.1/bin/x64/Rscript.exe",
"linux": {
"command": "/usr/lib/R/bin/Rscript"
},
Expand Down Expand Up @@ -114,7 +114,7 @@
{
"type": "process",
"label": "R: test units",
"command": "C:/Program Files/R/R-4.1.0/bin/x64/Rscript.exe",
"command": "C:/Program Files/R/R-4.1.1/bin/x64/Rscript.exe",
"linux": {
"command": "/usr/lib/R/bin/Rscript"
},
Expand All @@ -140,7 +140,7 @@
"type": "process",
"label": "R: test coverage",
"dependsOn": "R: test units",
"command": "C:/Program Files/R/R-4.1.0/bin/x64/Rscript.exe",
"command": "C:/Program Files/R/R-4.1.1/bin/x64/Rscript.exe",
"linux": {
"command": "/usr/lib/R/bin/Rscript"
},
Expand All @@ -162,7 +162,7 @@
{
"type": "shell",
"label": "R: build current package",
"command": "C:/Program Files/R/R-4.1.0/bin/x64/Rscript.exe",
"command": "C:/Program Files/R/R-4.1.1/bin/x64/Rscript.exe",
"linux": {
"command": "/usr/lib/R/bin/Rscript"
},
Expand Down
2 changes: 2 additions & 0 deletions CRAN-RELEASE
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
This package was submitted to CRAN on 2021-11-23.
Once it is accepted, delete this file and tag the release (commit 865dad7).
9 changes: 4 additions & 5 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Type: Package
Package: matrixprofiler
Title: Matrix Profile for R
Version: 0.1.5
Version: 0.1.7.9000
Authors@R:
c(person(given = "Francisco",
family = "Bischoff",
Expand Down Expand Up @@ -40,8 +40,7 @@ Description: This is the core functions needed by the 'tsmp' package. The
created by CS-UCR <http://www.cs.ucr.edu/~eamonn/MatrixProfile.html>.
License: GPL-3
URL: https://github.com/matrix-profile-foundation/matrixprofiler
BugReports:
https://github.com/matrix-profile-foundation/matrixprofiler/issues
BugReports: https://github.com/matrix-profile-foundation/matrixprofiler/issues
Depends:
R (>= 4.0)
Imports:
Expand All @@ -51,7 +50,7 @@ Imports:
Suggests:
testthat (>= 3.0.2),
debugme (>= 1.1.0),
spelling (>= 2.2.0)
spelling (>= 2.2.0),
LinkingTo:
Rcpp (>= 1.0.6),
RcppParallel (>= 5.1.4),
Expand All @@ -62,7 +61,7 @@ Language: en-US
LazyData: true
NeedsCompilation: yes
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.1.1
RoxygenNote: 7.1.2
SystemRequirements: GNU make
Config/testthat/edition: 3
Config/testthat/parallel: true
23 changes: 19 additions & 4 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,19 +1,34 @@
<!-- NEWS.md is generated from NEWS.Rmd. Please edit that file -->

## matrixprofiler 0.1.5
matrixprofiler 0.1.7
--------------------

- Fixed issue on Makefile for Unix/Mac systems that triggered some
CRAN policy about “Packages should not attempt to disable compiler
diagnostics, nor to remove other diagnostic information such as
symbols in shared objects.” The objective was to reduce the compiled
library that even in release mode have being compiled in debug mode.
More info at
<a href="http://dirk.eddelbuettel.com/blog/2017/08/14/" class="uri">http://dirk.eddelbuettel.com/blog/2017/08/14/</a>

matrixprofiler 0.1.5
--------------------

- Fixed `Rcpp` as specified by the PR \#15 from Dirk @eddelbuettel

## matrixprofiler 0.1.4
matrixprofiler 0.1.4
--------------------

- Dropped PAA algorithm
- Added some math helper functions

## matrixprofiler 0.1.3
matrixprofiler 0.1.3
--------------------

- CRAN fixes

## matrixprofiler 0.1.0
matrixprofiler 0.1.0
--------------------

- Initial implementation of this package.
- This package will keep all core functions that will allow you to use
Expand Down
7 changes: 7 additions & 0 deletions NEWS.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,13 @@ knitr::opts_chunk$set(
)
```

## matrixprofiler 0.1.7
- Fixed issue on Makefile for Unix/Mac systems that triggered some CRAN policy about
"Packages should not attempt to disable compiler diagnostics, nor to remove other diagnostic
information such as symbols in shared objects." The objective was to reduce the compiled
library that even in release mode have being compiled in debug mode.
More info at http://dirk.eddelbuettel.com/blog/2017/08/14/

## matrixprofiler 0.1.5
- Fixed `Rcpp` as specified by the PR #15 from Dirk @eddelbuettel

Expand Down
26 changes: 17 additions & 9 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,28 +1,36 @@
NEWS
================
Francisco Bischoff

26 mai 2021
23 Nov 2021

<!-- NEWS.md is generated from NEWS.Rmd. Please edit that file -->

## matrixprofiler 0.1.7

- Fixed issue on Makefile for Unix/Mac systems that triggered some
CRAN policy about “Packages should not attempt to disable compiler
diagnostics, nor to remove other diagnostic information such as
symbols in shared objects.” The objective was to reduce the compiled
library that even in release mode have being compiled in debug mode.
More info at <http://dirk.eddelbuettel.com/blog/2017/08/14/>

## matrixprofiler 0.1.5

- Fixed `Rcpp` as specified by the PR \#15 from Dirk @eddelbuettel
- Fixed `Rcpp` as specified by the PR \#15 from Dirk @eddelbuettel

## matrixprofiler 0.1.4

- Dropped PAA algorithm
- Added some math helper functions
- Dropped PAA algorithm
- Added some math helper functions

## matrixprofiler 0.1.3

- CRAN fixes
- CRAN fixes

## matrixprofiler 0.1.0

- Initial implementation of this package.
- This package will keep all core functions that will allow you to use
- Initial implementation of this package.
- This package will keep all core functions that will allow you to use
the Matrix Profile concept as a toolkit.
- It will be the main dependency of the already available package
- It will be the main dependency of the already available package
`tsmp`.
Loading

0 comments on commit 4d9d2c7

Please sign in to comment.