Merge pull request #117 from SpiNNakerManchester/change_celltype

ubber
SpiNNakerManchester · Feb 20, 2018 · 14dfd72 · 14dfd72
2 parents 9e86e0a + b07fcbc
commit 14dfd72
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/spynnaker8/models/populations/population.py b/spynnaker8/models/populations/population.py
@@ -30,10 +30,10 @@ def __init__(self, size, cellclass, cellparams=None, structure=None,
             initial_values = {}
 
         if isinstance(cellclass, DataHolder):
-            vertex_holder = cellclass
-            vertex_holder.add_item(
+            self._vertex_holder = cellclass
+            self._vertex_holder.add_item(
                 'label', self.create_label(
-                    vertex_holder.data_items['label'], label))
+                    self._vertex_holder.data_items['label'], label))
             assert cellparams is None
         # cellparams being retained for backwards compatibility, but use
         # is deprecated
@@ -43,32 +43,33 @@ def __init__(self, size, cellclass, cellparams=None, structure=None,
             if 'label' in internal_params:
                 cell_label = internal_params['label']
             internal_params['label'] = self.create_label(cell_label, label)
-            vertex_holder = cellclass(**internal_params)
+            self._vertex_holder = cellclass(**internal_params)
             # emit deprecation warning
         else:
             raise TypeError(
                 "cellclass must be an instance or subclass of BaseCellType,"
                 " not a %s" % type(cellclass))
 
-        if 'n_neurons' in vertex_holder.data_items:
+        if 'n_neurons' in self._vertex_holder.data_items:
             if size is None:
-                size = vertex_holder.data_items['n_neurons']
+                size = self._vertex_holder.data_items['n_neurons']
             else:
-                if size != vertex_holder.data_items['n_neurons']:
+                if size != self._vertex_holder.data_items['n_neurons']:
                     raise ConfigurationException(
                         "Size parameter is {} but the {} expects a size of {}"
                         "".format(size, cellclass,
-                                  vertex_holder.data_items['n_neurons']))
+                                  self._vertex_holder.data_items['n_neurons']))
         else:
             if size is None:
                 raise ConfigurationException(
                     "Size parameter can not be None for {}".format(cellclass))
             else:
-                vertex_holder.add_item('n_neurons', size)
+                self._vertex_holder.add_item('n_neurons', size)
 
         # convert between data holder and model (uses ** so that its taken
         # the dictionary to be the parameters themselves)
-        vertex = vertex_holder.build_model()(**vertex_holder.data_items)
+        vertex = self._vertex_holder.build_model()(
+            **self._vertex_holder.data_items)
 
         # build our initial objects
         PyNNPopulationCommon.__init__(
@@ -94,7 +95,7 @@ def celltype(self):
         Implements the pynn expected celltype propery
         :return: The celltype this property has been set to
         """
-        return self._vertex
+        return self._vertex_holder
 
     def record(self, variables, to_file=None, sampling_interval=None):
         """

diff --git a/unittests/test_using_virtual_baord/test_celltype.py b/unittests/test_using_virtual_baord/test_celltype.py
@@ -20,7 +20,7 @@ class Test_celltype(BaseTestCase):
     def test_before_run(self):
         nNeurons = 20  # number of neurons in each population
         celltype = before_run(nNeurons)
-        self.assertEqual(p.IF_curr_exp.build_model(), type(celltype))
+        self.assertEqual(p.IF_curr_exp, type(celltype))
 
 
 if __name__ == '__main__':