fix convolutions integration and enhance integrate_odes() to integrat…

…e specific ODEs
clinssen · Nov 14, 2023 · 2a7b4d4 · 2a7b4d4
1 parent 3674dde
commit 2a7b4d4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/extras/nestml_model_doc_generator.py → ...eneration/autodoc_code_generator_utils.py b/extras/nestml_model_doc_generator.py → ...eneration/autodoc_code_generator_utils.py
@@ -42,7 +42,7 @@ def get_model_doc_title(model_fname: str):
         return re.compile(r'\"\"\"[^#]*###').search(model).group()[3:-3].strip()
 
 
-class NESTMLModelDocGenerator:
+class AutoDocCodeGeneratorUtils:
 
     def generate_all_models(self):
         codegen_opts = {}
@@ -148,13 +148,13 @@ def _test_model_equivalence_subthreshold(self, nest_model_name, nestml_model_nam
         synapse_models.append(("static_synapse", "static_synapse.nestml"))
         synapse_models.append(("noisy_synapse", "noisy_synapse.nestml"))
         synapse_models.append(("stdp_synapse", "stdp_synapse.nestml"))
-        synapse_models.append(("stdp_nn_pre_centered_synapse", "stdp_nn_pre_centered.nestml"))
-        synapse_models.append(("stdp_nn_restr_symm_synapse", "stdp_nn_restr_symm.nestml"))
-        synapse_models.append(("stdp_nn_symm_synapse", "stdp_nn_symm.nestml"))
+        synapse_models.append(("stdp_nn_pre_centered_synapse", "stdp_nn_pre_centered_synapse.nestml"))
+        synapse_models.append(("stdp_nn_restr_symm_synapse", "stdp_nn_restr_symm_synapse.nestml"))
+        synapse_models.append(("stdp_nn_symm_synapse", "stdp_nn_symm_synapse.nestml"))
         synapse_models.append(("stdp_triplet_nn_synapse", "triplet_stdp_synapse.nestml"))
         synapse_models.append(("stdp_triplet_synapse", "stdp_triplet_naive.nestml"))
         synapse_models.append(("third_factor_stdp_synapse", "third_factor_stdp_synapse.nestml"))
-        synapse_models.append(("neuromodulated_stdp_synapse", "neuromodulated_stdp.nestml"))
+        synapse_models.append(("neuromodulated_stdp_synapse", "neuromodulated_stdp_synapse.nestml"))
 
         all_synapse_models = [s[:-7] for s in list(os.walk("models/synapses"))[0][2] if s[-7:] == ".nestml"]
         s += self.generate_synapse_models_documentation(synapse_models, all_synapse_models)

diff --git a/pynestml/utils/ast_utils.py b/pynestml/utils/ast_utils.py
@@ -1728,7 +1728,6 @@ def _visit(self, node):
         visitor = IntegrateODEsFunctionCallVisitor()
         model.accept(visitor)
         print(visitor.calls)
-        import pdb;pdb.set_trace()
 
         return visitor.calls