feat(nml.py): use natsort to properly sort segments/groups when optim…

…ising
NeuralEnsemble · Aug 16, 2023 · 2d109fe · 2d109fe
1 parent e03f060
commit 2d109fe
Show file tree

Hide file tree

Showing 4 changed files with 604 additions and 587 deletions.
diff --git a/neuroml/nml/gds_imports-template.py b/neuroml/nml/gds_imports-template.py
@@ -4,6 +4,7 @@
 import inspect
 import networkx as nx
 import numpy
+import natsort
 
 import neuroml
 import neuroml.neuro_lex_ids
diff --git a/neuroml/nml/helper_methods.py b/neuroml/nml/helper_methods.py
@@ -1772,7 +1772,8 @@ def optimise_segment_group(self, seg_group_id):
             if i not in new_includes:
                 new_includes.append(i)
         includes = set(new_includes)
-        seg_group.includes = list(includes)
+        # sorted
+        seg_group.includes = natsort.natsorted(includes, key=lambda x:x.segment_groups)
 
         # remove members that are included by included segment groups
         if len(includes) > 0 and len(members) > 0:
@@ -1782,7 +1783,8 @@ def optimise_segment_group(self, seg_group_id):
                 for i in members:
                     if i.segments not in all_segment_ids_in_group:
                         new_members.append(i)
-            seg_group.members = list(new_members)
+            # sorted
+            seg_group.members = natsort.natsorted(new_members, key=lambda x: x.segments)
 
 
     def set_spike_thresh(self, v, group_id="all"):