Fixed (?) an inconsistency in pyNN.brian

Author: Andrew Davison

pyNN/brian/projections.py

@@ -11,6 +11,7 @@
 from pyNN import common
 from pyNN.standardmodels.synapses import TsodyksMarkramSynapse
 from pyNN.core import is_listlike
+from .populations import PopulationView
 from pyNN.parameters import ParameterSpace
 from pyNN.space import Space
 from . import simulator
@@ -139,7 +140,7 @@ def _partition(self, indices):
         else:
             partitions = [indices]
         return partitions
-    
+
     def _localize_index(self, index):
         """determine which group the postsynaptic index belongs to """
         if isinstance(self.post, common.Assembly):
@@ -192,7 +193,7 @@ def _set_attributes(self, connection_parameters):
             value = value.T
             filtered_value = value[syn_obj.postsynaptic, syn_obj.presynaptic]
             setattr(syn_obj, name, filtered_value)
-    
+
     def _get_attributes_as_arrays(self, attribute_names, multiple_synapses='sum'):
         if isinstance(self.post, common.Assembly) or isinstance(self.pre, common.Assembly):
             raise NotImplementedError
@@ -215,8 +216,12 @@ def _get_attributes_as_list(self, attribute_names):
         for name in attribute_names:
             if name == "presynaptic_index":
                 value = self._brian_synapses[0][0].presynaptic
+                if isinstance(self.pre, PopulationView):
+                    value = self.pre.id_to_index(value)
             elif name == "postsynaptic_index":
                 value = self._brian_synapses[0][0].postsynaptic
+                if isinstance(self.post, PopulationView):
+                    value = self.post.id_to_index(value)
             else:
                 data_obj = getattr(self._brian_synapses[0][0], name).data
                 if hasattr(data_obj, "tolist"):

test/system/scenarios/test_connectors.py

@@ -206,8 +206,8 @@ def issue622(sim):
     sim.setup()
     pop = sim.Population(10, sim.IF_cond_exp, {}, label="pop")
 
-    view1 = sim.PopulationView(pop , [2,3,4])
-    view2 = sim.PopulationView(pop , [2,3,4])
+    view1 = sim.PopulationView(pop, [2,3,4])
+    view2 = sim.PopulationView(pop, [2,3,4])
 
     proj1 = sim.Projection(view1, view2, sim.AllToAllConnector(allow_self_connections = False), sim.StaticSynapse(
         weight=0.015, delay=1.0), receptor_type='excitatory')