updates

jaxleyverse · Dec 6, 2023 · 5621204 · 5621204
1 parent 2bcefa3
commit 5621204
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/jaxley/modules/branch.py b/jaxley/modules/branch.py
@@ -63,7 +63,7 @@ def __init__(
 
         # Synapse indexing.
         self.syn_edges = pd.DataFrame(
-            dict(pre_comp_index=[], post_comp_index=[], type="")
+            dict(global_pre_comp_index=[], global_post_comp_index=[], type="")
         )
         self.branch_edges = pd.DataFrame(
             dict(parent_branch_index=[], child_branch_index=[])

diff --git a/jaxley/modules/cell.py b/jaxley/modules/cell.py
@@ -90,7 +90,7 @@ def __init__(
 
         # Synapse indexing.
         self.syn_edges = pd.DataFrame(
-            dict(pre_comp_index=[], post_comp_index=[], type="")
+            dict(global_pre_comp_index=[], global_post_comp_index=[], type="")
         )
         self.branch_edges = pd.DataFrame(
             dict(

diff --git a/jaxley/modules/compartment.py b/jaxley/modules/compartment.py
@@ -31,7 +31,7 @@ def __init__(self):
         )
         # Synapse indexing.
         self.syn_edges = pd.DataFrame(
-            dict(pre_comp_index=[], post_comp_index=[], type="")
+            dict(global_pre_comp_index=[], global_post_comp_index=[], type="")
         )
         self.branch_edges = pd.DataFrame(
             dict(parent_branch_index=[], child_branch_index=[])

diff --git a/jaxley/modules/network.py b/jaxley/modules/network.py
@@ -290,8 +290,8 @@ def _step_synapse(
         voltages = u["voltages"]
 
         grouped_syns = edges.groupby("type", sort=False, group_keys=False)
-        pre_syn_inds = grouped_syns["pre_comp_index"].apply(list)
-        post_syn_inds = grouped_syns["post_comp_index"].apply(list)
+        pre_syn_inds = grouped_syns["global_pre_comp_index"].apply(list)
+        post_syn_inds = grouped_syns["global_post_comp_index"].apply(list)
         synapse_names = list(grouped_syns.indices.keys())
 
         syn_voltage_terms = jnp.zeros_like(voltages)