Skip to content

Triangulation-based estimators #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 30 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
9fd3876
Triangulation transfer operator estimators
kahaaga Feb 20, 2021
37ee36a
Docs and type requirements
kahaaga Feb 20, 2021
c11e750
Remove ipynb files
kahaaga Feb 20, 2021
3dc8507
Use generators for transfer operator approximations
kahaaga Feb 20, 2021
4b8e6e5
Remove old stuff
kahaaga Feb 20, 2021
99bc594
Update docs
kahaaga Feb 20, 2021
886f9e9
Add convenience methods
kahaaga Feb 20, 2021
a89aedd
Fix tests
kahaaga Feb 20, 2021
0671782
Update project.toml
kahaaga Feb 20, 2021
8ee148b
Set version to 1.0.0
kahaaga Feb 20, 2021
d84bd68
Update docs
kahaaga Feb 20, 2021
a11f58b
Add compat for Requires
kahaaga Feb 20, 2021
f57fb41
Install python dependencies in tests
kahaaga Feb 20, 2021
6e8966a
Temporarily reduce version to fix tests
kahaaga Feb 20, 2021
923cb12
Attempt to use test/Project.toml
kahaaga Feb 20, 2021
6274d7e
Try old variant, but with [extras]
kahaaga Feb 20, 2021
2f71fd8
Try old variant, but with [extras]
kahaaga Feb 20, 2021
eceaf3c
Merge remote-tracking branch 'origin/triangulation' into triangulation
kahaaga Feb 20, 2021
17f3bc4
Update Project.toml
kahaaga Feb 20, 2021
3711000
Remove unneccessary test imports
kahaaga Feb 20, 2021
60a94fa
See if adding Pkg to [extras] solves CI test error
kahaaga Feb 20, 2021
535c5af
Make sure to return named tuples for parameters
kahaaga Feb 20, 2021
9be9310
Rename transfermatrix to transitioninfo, and use return struct
kahaaga Feb 20, 2021
ecd1ff2
Update docs.
kahaaga Feb 20, 2021
829f14b
Add examples to estimator docstring
kahaaga Feb 20, 2021
3cdc3a9
Abstract type for triangulation estimators
kahaaga Feb 20, 2021
b33b190
Restructure docs
kahaaga Feb 20, 2021
24d4106
Add missing docs
kahaaga Feb 20, 2021
5559ccb
Make sure to return named tuple
kahaaga Feb 20, 2021
89a19f2
Update tagbot
kahaaga Apr 8, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions .github/workflows/TagBot.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
name: TagBot
name: Julia TagBot
on:
schedule:
- cron: 0 * * * *
issue_comment:
types:
- created
workflow_dispatch:
jobs:
TagBot:
if: github.event_name == 'workflow_dispatch' || github.actor == 'JuliaTagBot'
runs-on: ubuntu-latest
steps:
- uses: JuliaRegistries/TagBot@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
ssh: ${{ secrets.DOCUMENTER_KEY }}

ssh: ${{ secrets.DOCUMENTER_KEY }}
24 changes: 17 additions & 7 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,35 @@ version = "0.11.1"
[deps]
DelayEmbeddings = "5732040d-69e3-5649-938a-b6b4f237613f"
Distances = "b4f34e82-e78d-54a5-968a-f98e89d6e8f7"
Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
NearestNeighbors = "b8a86587-4115-5ab1-83bc-aa920d37bbce"
Requires = "ae029012-a4dd-5104-9daa-d747884805df"
Simplices = "d5428e67-3037-59ba-9ab1-57a04f0a3b6a"
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
Wavelets = "29a6e085-ba6d-5f35-a997-948ac2efa89a"

[compat]
DelayEmbeddings = "1.10"
Distances = "0.9, 0.10"
NearestNeighbors = "0.4"
SpecialFunctions = "0.10, 1.0"
StaticArrays = "0.12, 1.0"
Wavelets = "0.9"
DelayEmbeddings = "^1.20"
Distances = "0.9, ^0.10"
Distributions = "^0.24"
NearestNeighbors = "^0.4"
Requires = "^1.1"
SpecialFunctions = "^0.10, ^1"
StaticArrays = "^0.12, ^1"
Wavelets = "^0.9"
julia = "1.5"

[extras]
Conda = "8f4d0f93-b110-5947-807f-2305c1781a2d"
PyCall = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0"
Simplices = "d5428e67-3037-59ba-9ab1-57a04f0a3b6a"
StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"

[targets]
test = ["Test"]
test = ["Test", "Conda", "PyCall", "Simplices", "StatsBase", "Pkg"]
3 changes: 2 additions & 1 deletion docs/Project.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
[deps]
Conda = "8f4d0f93-b110-5947-807f-2305c1781a2d"
DelayEmbeddings = "5732040d-69e3-5649-938a-b6b4f237613f"
Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
DocumenterTools = "35a29f4d-8980-5a13-9543-d66fff28ecb8"
DynamicalSystems = "61744808-ddfa-5f27-97ff-6e42cc95d634"
Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
PyCall = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0"
PyPlot = "d330b81b-6aea-500a-939a-2ce795aea3ee"
Simplices = "d5428e67-3037-59ba-9ab1-57a04f0a3b6a"
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
Wavelets = "29a6e085-ba6d-5f35-a997-948ac2efa89a"
1 change: 1 addition & 0 deletions docs/make.jl
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ using Entropies
using PyPlot
using DynamicalSystems
using Wavelets
using Simplices

# %% JuliaDynamics theme.
# download the themes
Expand Down
21 changes: 20 additions & 1 deletion docs/src/TransferOperator.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,29 @@
TransferOperator
```

## Triangulation estimators

```@docs
SimplexExact
SimplexPoint
```

## Rectangular estimators

For rectangular binnings, use [`RectangularBinning`](@ref).

## Utility methods/types

```@docs
InvariantMeasure
invariantmeasure
transfermatrix
```

### Transition information

```@docs
transferoperator
TransferOperatorApproximation
transitioninfo
TransitionInfo
```
12 changes: 11 additions & 1 deletion src/Entropies.jl
Original file line number Diff line number Diff line change
@@ -1,10 +1,20 @@

module Entropies
using Requires

include("core.jl")
include("histogram_estimation.jl")
include("counting_based/CountOccurrences.jl")
include("symbolic/symbolic.jl")
include("binning_based/rectangular/rectangular_estimators.jl")
include("kerneldensity/kerneldensity.jl")
include("wavelet/wavelet.jl")
include("nearest_neighbors/nearest_neighbors.jl")
include("binning_based/rectangular_estimators.jl")

function __init__()
@require Simplices="d5428e67-3037-59ba-9ab1-57a04f0a3b6a" begin
using .Simplices
include("binning_based/transferoperator/triangular/triangular.jl")
end
end
end
2 changes: 2 additions & 0 deletions src/binning_based/binningbased.jl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
abstract type BinningProbabilitiesEstimator <: ProbabilitiesEstimator end
include("rectangular/rectangular_estimators.jl")
Loading