Changeset 994 for branches

Timestamp:

10/03/11 15:13:54 (8 months ago)

Author:

apdavison

Message:

Ported r993 to 0.7 branch (ticket:195)

Location:

branches/0.7

Files:

• setup.py (modified) (1 diff)
• src/common.py (modified) (2 diffs)
• test/system/scenarios.py (modified) (1 diff)
• test/unittests/test_lowlevelapi.py (modified) (1 diff)

branches/0.7/setup.py

@@ -41 +41 @@
 setup(
     name = "PyNN",
-    version = "0.7.1",
+    version = "0.7.2",
     package_dir={'pyNN': 'src'},
     packages = ['pyNN','pyNN.nest', 'pyNN.pcsim', 'pyNN.neuron', 'pyNN.brian',

branches/0.7/src/common.py

@@ -234 +234 @@
         self.parent._set_cell_initial_value(self, variable, value)
 
+    def as_view(self):
+        """Return a PopulationView containing just this cell.""" 
+        index = self.parent.id_to_index(self) 
+        return self.parent[index:index+1] 
 
 # =============================================================================
@@ -329 +333 @@
         """
         if isinstance(source, IDMixin):
-            source = source.parent
+            source = source.as_view()
         if isinstance(target, IDMixin):
-            target = target.parent
+            target = target.as_view()
         connector = connector_class(p_connect=p, weights=weight, delays=delay)
         return projection_class(source, target, connector, target=synapse_type, rng=rng)

branches/0.7/test/system/scenarios.py

@@ -492 +492 @@
 
     sim.end()
+
+@register()
+def ticket195(sim):
+    """
+    Check that the `connect()` function works correctly with single IDs (see
+    http://neuralensemble.org/trac/PyNN/ticket/195)
+    """
+    sim.setup(timestep=0.01)
+    pre = sim.Population(10, sim.SpikeSourceArray, cellparams={'spike_times':range(1,10)})
+    post = sim.Population(10, sim.IF_cond_exp)
+    sim.connect(pre[0], post[0], weight=0.01, delay=0.1, p=1)
+    post.record()
+    sim.run(100.0)
+    assert_arrays_almost_equal(post.getSpikes(), numpy.array([[0.0, 13.4]]), 0.5)
+

branches/0.7/test/unittests/test_lowlevelapi.py

@@ -24 +24 @@
     
     class MockID(common.IDMixin):
-        def __init__(self):
-            self.parent = "parent"
-        
+       def as_view(self):
+            return "view"
+ 
     prj = connect_function(MockID(), MockID(), "weight", "delay", "synapse_type", "p", "rng")
-    projection_class.assert_called_with("parent", "parent", "connector", target="synapse_type", rng="rng")
+    projection_class.assert_called_with("view", "view", "connector", target="synapse_type", rng="rng")
     
 def test_set():