Skip to content

Commit

Permalink
Development (#31)
Browse files Browse the repository at this point in the history
* Improved code quality using pylint

* Set order to start in run_on_event method

* Numerous documentation changes

* Added examples for synaptic models

* Changed order of dspikes to "before_groups"

* More documentation updates

* Documentation changes

* Added cadif to equations

* Many  additions of new and updates of old examples

* Last touches before new release

* Add project URLs to setup.py

* Fixed bugs introduced by vs code autoformatter

* More bug fixes
  • Loading branch information
mpgl committed Mar 13, 2024
1 parent 591a9b7 commit 475d226
Showing 1 changed file with 7 additions and 14 deletions.
21 changes: 7 additions & 14 deletions dendrify/compartment.py
Original file line number Diff line number Diff line change
Expand Up @@ -794,27 +794,22 @@ def dspikes(self, name: str,
dspike_currents = f"I_rise_{event_id} + I_fall_{event_id}"

# Both currents take into account the reversal potential of Na/K
current_rise_eqs = f"I_rise_{event_id} = g_rise_{
event_id} * (E_rise_{name}-V_{comp}) :amp"
current_fall_eqs = f"I_fall_{event_id} = g_fall_{
event_id} * (E_fall_{name}-V_{comp}) :amp"
current_rise_eqs = f"I_rise_{event_id} = g_rise_{event_id} * (E_rise_{name}-V_{comp}) :amp"
current_fall_eqs = f"I_fall_{event_id} = g_fall_{event_id} * (E_fall_{name}-V_{comp}) :amp"

# Ion conductances
g_rise_eqs = (
f"g_rise_{event_id} = "
f"g_rise_max_{event_id} * "
f"int(t_in_timesteps <= spiketime_{
event_id} + duration_rise_{event_id}) * "
f"int(t_in_timesteps <= spiketime_{event_id} + duration_rise_{event_id}) * "
f"gate_{event_id} "
":siemens"
)
g_fall_eqs = (
f"g_fall_{event_id} = "
f"g_fall_max_{event_id} * "
f"int(t_in_timesteps <= spiketime_{
event_id} + offset_fall_{event_id} + duration_fall_{event_id}) * "
f"int(t_in_timesteps >= spiketime_{
event_id} + offset_fall_{event_id}) * "
f"int(t_in_timesteps <= spiketime_{event_id} + offset_fall_{event_id} + duration_fall_{event_id}) * "
f"int(t_in_timesteps >= spiketime_{event_id} + offset_fall_{event_id}) * "
f"gate_{event_id} "
":siemens"
)
Expand All @@ -835,15 +830,13 @@ def dspikes(self, name: str,
# Create and add custom dspike event
event_name = f"spike_{event_id}"
condition = (f"V_{comp} >= Vth_{event_id} and "
f"t_in_timesteps >= spiketime_{
event_id} + refractory_{event_id} * gate_{event_id}"
f"t_in_timesteps >= spiketime_{event_id} + refractory_{event_id} * gate_{event_id}"
)

self._events[event_name] = condition

# Specify what is going to happen inside run_on_event()
action = {f"spike_{event_id}": f"spiketime_{
event_id} = t_in_timesteps; gate_{event_id} = 1"}
action = {f"spike_{event_id}": f"spiketime_{event_id} = t_in_timesteps; gate_{event_id} = 1"}
if not self._event_actions:
self._event_actions = action
else:
Expand Down

0 comments on commit 475d226

Please sign in to comment.