Skip to content
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.

Sign up for GitHub

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

Compatibility with StateSpaceSets v2 #392

Merged
merged 17 commits into from
Nov 16, 2024
Merged

Compatibility with StateSpaceSets v2 #392

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
4770c75
update compat with statespacesets 2
kahaaga Oct 6, 2024
0622d72
Depend on AbstractStateSpaceSet, not deprecated AbstractDataset
kahaaga Oct 6, 2024
00b1ad3
sssets v2
kahaaga Oct 6, 2024
ec9ce77
temporary constructor for multiple dataset inputs
kahaaga Nov 16, 2024
0949ad1
Fix transfer entropy transfer operator estimation
kahaaga Nov 16, 2024
366f81b
shuffle order, so utils are loaded first
kahaaga Nov 16, 2024
0e4573a
horizontal concatenation
kahaaga Nov 16, 2024
de5c7e5
Use correct name, not the deprecated one
kahaaga Nov 16, 2024
79e28f7
Use local variables
kahaaga Nov 16, 2024
b4a00d3
Explicitly test vector + statespaceset input
kahaaga Nov 16, 2024
6837205
move agreement test to utils
kahaaga Nov 16, 2024
a3dc935
Add more OCE tests
kahaaga Nov 16, 2024
2065e59
Fix marginal construction
kahaaga Nov 16, 2024
82a6569
use local variables
kahaaga Nov 16, 2024
4037edf
Improve docstrings
kahaaga Nov 16, 2024
db7a6d4
Update changelog
kahaaga Nov 16, 2024
0e845b1
Set minimum julia version to LTS release
kahaaga Nov 16, 2024
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
Prev Previous commit
Next Next commit
Fix marginal construction
  • Loading branch information
@kahaaga
kahaaga committed Nov 16, 2024
commit 2065e596ea98ce4a01d6a3562036e33ac5233389
5 changes: 2 additions & 3 deletions src/methods/information/definitions/mutual_informations/mutual_informations.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,12 @@ end

function marginal_entropies_mi3h_discrete(est::EntropyDecomposition{<:MutualInformation, <:DiscreteInfoEstimator}, x, y)
# Encode marginals to integers based on the outcome space.
eX, eY = codified_marginals(est.discretization, x, y)
eXY = StateSpaceSet(eX, eY)
eX::StateSpaceSet, eY::StateSpaceSet = StateSpaceSet.(codified_marginals(est.discretization, x, y))
eXY::StateSpaceSet = StateSpaceSet(eX, eY)

# The outcome space is no longer relevant from this point on. We're done discretizing,
# so now we can just count (i.e. use `UniqueElements` as the outcome space).
o = UniqueElements()

modified_est = estimator_with_overridden_parameters(est.definition, est.est)
HX = information(modified_est, est.pest, o, eX) # estimates entropy in the X marginal
HY = information(modified_est, est.pest, o, eY) # estimates entropy in the Y marginal
Expand Down