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.

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

Switching default Jansen-Rit to ODE #343

Merged
merged 5 commits into from
Mar 15, 2024
Merged

Switching default Jansen-Rit to ODE #343

merged 5 commits into from
Mar 15, 2024

Conversation

agchesebro
Copy link
Member

Current Jansen-Rit is renamed JansenRitDelayed, and JansenRit is now back to being an ODE

Current Jansen-Rit is renamed JansenRitDelayed, and JansenRit is now back to being an ODE
Instead of separate `JansenRit()` and `JansenRitDelayed` constructors, create a single constructor with flag `delayed=false` default.
Copy link
Contributor

@MasonProtter MasonProtter left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we also have some tests of the delayed system?

Comment on lines 156 to 181
"""
JansenRit(name, namespace, τ, H, λ, r, cortical)

Create a Jansen Rit blox with optional delays as described in Liu et al.
The formal definition of this blox is:

```math
\\frac{dx}{dt} = y-\\frac{2}{\\tau}x
\\frac{dy}{dt} = -\\frac{x}{\\tau^2} + \\frac{H}{\\tau} [\\frac{2\\lambda}{1+\\text{exp}(-r*\\sum{jcn})} - \\lambda]
```

where ``jcn`` is any input to the blox.

Arguments:
- name: Name given to ODESystem object within the blox.
- namespace: Additional namespace above name if needed for inheritance.
- τ: Time constant. This is changed from the original source as the time constant was in seconds, while all our blocks are in milliseconds.
- H: See equation for use.
- λ: See equation for use.
- r: See equation for use.
- cortical: Boolean to determine whether to use cortical or subcortical parameters. Specifying any of the parameters above will override this.

Citations:
1. Liu C, Zhou C, Wang J, Fietkiewicz C, Loparo KA. The role of coupling connections in a model of the cortico-basal ganglia-thalamocortical neural loop for the generation of beta oscillations. Neural Netw. 2020 Mar;123:381-392. doi: 10.1016/j.neunet.2019.12.021.

"""
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this duplicated on purpose?

@hstrey hstrey merged commit f15e768 into master Mar 15, 2024
2 checks passed
@hstrey hstrey deleted the fixing-jansen-rit branch March 15, 2024 17:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants