Skip to content

move delay out of integration loop #310

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

Closed
JohnWangDataAnalyst wants to merge 1 commit into from
Closed

move delay out of integration loop #310

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 15 additions & 13 deletions whobpyt/models/jansen_rit/jansen_rit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,22 +442,24 @@ def forward(self, external, hx, hE):
# For each sample point, run the model by solving the differential
# equations for a defined number of integration steps,
# and keep only the final activity state within this set of steps
for step_i in range(self.steps_per_TR):

# Collect the delayed inputs:

# i) index the history of E
Ed = pttranspose(hE.clone().gather(1,self.delays), 0, 1)


# i) index the history of E
Ed = pttranspose(hE.clone().gather(1,self.delays), 0, 1)

# ii) multiply the past states by the connectivity weights matrix, and sum over rows
LEd_p2e = ptsum(w_n_f * Ed, 1)
LEd_p2i = -ptsum(w_n_b * Ed, 1)
LEd_p2p = ptsum(w_n_l * Ed, 1)
# ii) multiply the past states by the connectivity weights matrix, and sum over rows
LEd_p2e = ptsum(w_n_f * Ed, 1)
LEd_p2i = -ptsum(w_n_b * Ed, 1)
LEd_p2p = ptsum(w_n_l * Ed, 1)

# iii) reshape for next step
LEd_p2e = ptreshape(LEd_p2e, (n_nodes, 1))
LEd_p2i = ptreshape(LEd_p2i, (n_nodes, 1))
LEd_p2p = ptreshape(LEd_p2p, (n_nodes, 1))
for step_i in range(self.steps_per_TR):

# iii) reshape for next step
LEd_p2e = ptreshape(LEd_p2e, (n_nodes, 1))
LEd_p2i = ptreshape(LEd_p2i, (n_nodes, 1))
LEd_p2p = ptreshape(LEd_p2p, (n_nodes, 1))
# Collect the delayed inputs:

# iv) if specified, add the laplacian component (self-connections from diagonals)
if self.use_laplacian:
Expand Down