Merge pull request #10 from PKU-NIP-Lab/develop

Support dynamics analysis
brainpy · Nov 11, 2020 · eff27b1 · eff27b1
2 parents a9f1304 + a1ed513
commit eff27b1
Show file tree

Hide file tree

Showing 22 changed files with 1,176 additions and 116 deletions.
diff --git a/brainpy/core_system/runner.py b/brainpy/core_system/runner.py
@@ -882,12 +882,12 @@ def __step_mode_nb_scalar(self):
                 code_arg2call[f'{self._name}_pre2syn'] = f'{self._name}.pre2syn'
                 code_args.add(f'{self._name}_pre_indices')
                 code_arg2call[f'{self._name}_pre_indices'] = f'{self._name}.pre_group.indices'
-                # # f'for _pre_i_ in numba.prange({self.ensemble.pre_group.num}):',
+                # f'for _pre_i_ in numba.prange({self.ensemble.pre_group.num}):',
                 code_lines = [f'{self._name}_pre_indices = {self._name}_pre_indices.flatten()',
                               f'for _pre_i_ in numba.prange({self.ensemble.pre_group.num}):',
                               f'  _pre_i_ = {self._name}_pre_indices[_pre_i_]',
-                              f'  for _syn_i_ in {self._name}_pre2syn[_pre_i_]:',
-                              f'    _obj_i_ = {self._name}_post_idx[_syn_i_]']
+                              f'  for _obj_i_ in {self._name}_pre2syn[_pre_i_]:',
+                              f'    _post_i_ = {self._name}_post_idx[_obj_i_]']
                 blank = '  ' * 2
             elif has_pre:
                 code_args.add(f'{self._name}_pre2syn')

diff --git a/brainpy/dynamics/__init__.py b/brainpy/dynamics/__init__.py
@@ -2,3 +2,5 @@
 
 AUTONOMOUS_SYSTEM = 'autonomous_system'
 NON_AUTONOMOUS_SYSTEM = 'non_autonomous_system'
+
+from .analyzer import *
diff --git a/brainpy/dynamics/analyst.py b/brainpy/dynamics/analyst.py