Merge pull request nest#759 from pnbabu/vectors_bug

Fix bug in vectors when there is a single vector state variable

Author: clinssen

pynestml/codegeneration/resources_nest/point_neuron/directives/DynamicStateElement.jinja2

@@ -15,15 +15,15 @@ inline double get_state_element(size_t elem)
     else if
 {%-  endif %}
 
-{%- if loop.index != len %}
+{%- if len == 1 or loop.index < len %}
 {%-   if variable.has_vector_parameter() %}
 {%-   set size =  variable.get_vector_parameter() %}
 {%-     if size|int == 0 %}
 {%-     set size = printer.print_vector_size_parameter(variable) %}
 {%-     endif -%}
     (elem >= State_::{{names.name(variable).upper()}} && elem < State_::{{names.name(variable).upper()}} + {{size}})
     {
-      return S_.{{names.name(variable)}}[ elem - State_::{{names.name(variable).upper()}}];
+      return S_.{{names.name(variable)}}[ elem - State_::{{names.name(variable).upper()}} ];
     }
 {%-   else %}
     (elem == State_::{{names.name(variable).upper()}})
@@ -34,7 +34,7 @@ inline double get_state_element(size_t elem)
 {%- else %}
 {%-   if variable.has_vector_parameter() %}
     {
-      return S_.{{names.name(variable)}}[ elem - State_::{{names.name(variable).upper()}}];
+      return S_.{{names.name(variable)}}[ elem - State_::{{names.name(variable).upper()}} ];
     }
 {%-   else %}
     {

tests/resources/SimpleVectorsModel.nestml

@@ -0,0 +1,36 @@
+"""
+
+SimpleVectorsModel.nestml
+#########################
+
+Copyright statement
++++++++++++++++++++
+
+This file is part of NEST.
+
+Copyright (C) 2004 The NEST Initiative
+
+NEST is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+NEST is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with NEST.  If not, see <http://www.gnu.org/licenses/>.
+
+"""
+
+neuron simple_vectors_model:
+  state:
+   g_ex [20] real = 1.2
+  end
+
+  update:
+    g_ex[2] = 10.5
+  end
+end

tests/vector_code_generator_test.py

@@ -22,6 +22,7 @@
 import unittest
 
 from pynestml.codegeneration.nest_code_generator import NESTCodeGenerator
+from pynestml.frontend.pynestml_frontend import generate_nest_target
 
 from pynestml.utils.model_parser import ModelParser
 
@@ -72,6 +73,13 @@ def test_vector_code_generation(self):
         nestCodeGenerator = NESTCodeGenerator()
         nestCodeGenerator.generate_code(compilation_unit.get_neuron_list())
 
+    def test_vector_code_generation_and_build(self):
+        input_path = str(os.path.realpath(os.path.join(os.path.dirname(__file__), "resources",
+                                                       "SimpleVectorsModel.nestml")))
+        generate_nest_target(input_path=input_path,
+                             target_path=self.target_path,
+                             logging_level="INFO")
+
     def tearDown(self) -> None:
         import shutil
         shutil.rmtree(self.target_path)