Skip to content

Commit

Permalink
Merge pull request #231 from hendersontrent/trent-dev
Browse files Browse the repository at this point in the history
additional vignette notes
  • Loading branch information
hendersontrent authored Feb 6, 2023
2 parents 174d1a9 + 1a6242a commit 31b31fa
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 11 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Package: theft
Type: Package
Title: Tools for Handling Extraction of Features from Time Series
Version: 0.4.2.2
Date: 2023-02-02
Date: 2023-02-06
Authors@R: c(
person("Trent", "Henderson", email = "then6675@uni.sydney.edu.au", role = c("cre", "aut")),
person("Annie", "Bryant", role = "ctb", comment = "Balanced classification accuracy")
Expand Down
14 changes: 9 additions & 5 deletions docs/articles/theft.html

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

2 changes: 1 addition & 1 deletion docs/pkgdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pkgdown: 2.0.6
pkgdown_sha: ~
articles:
theft: theft.html
last_built: 2023-02-02T06:12Z
last_built: 2023-02-06T02:05Z
urls:
reference: https://hendersontrent.github.io/theft/reference
article: https://hendersontrent.github.io/theft/articles
Expand Down
2 changes: 1 addition & 1 deletion docs/search.json

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions vignettes/theft.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,14 @@ feature_matrix <- calculate_features(data = simData,
seed = 123)
```

Note that if you want to use any of the Python-based packages, you must first tell R (prior to running `calculate_features`) which Python and virtual environment on your computer contains the installed libraries. This can be done via the `init_theft` function, which has two arguments:
Note that if you want to use any of the Python-based packages, you must first tell R (prior to running `calculate_features`) which Python and/or virtual environment on your computer contains the installed libraries. This can be done in `theft` via the `init_theft` function, which has two arguments:

1. `python_path` --- string specifying the filepath to the version of Python you wish to use
1. `venv_path` --- string specifying the filepath to the Python virtual environment where `tsfresh`, `TSFEL`, and/or `Kats` are installed
2. `venv_path` --- string specifying the filepath to the Python virtual environment where `tsfresh`, `TSFEL`, and/or `Kats` are installed

**NOTE: You only need to call ** `init_theft` **once per session.**
However, you do not necessarily have to use this convenience function. If you have another method for pointing R to the correct Python (such as `reticulate` or `findpython`), you can use those in your workflow instead.

**NOTE: You only need to call ** `init_theft` **or your other solution once per session.**

A tidy dataframe of *most* of the included features and the set they correspond to is available in the dataframe `feature_list`:

Expand Down

0 comments on commit 31b31fa

Please sign in to comment.