Merge pull request #466 from SpiNNakerManchester/u3232_scaling

Add test for u3232 scaling, and fix incorrect tests

p8_integration_tests/quick_test/test_connectors/test_one_to_one_connector.py

@@ -14,6 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import spynnaker8 as sim
+import numpy
 from p8_integration_tests.base_test_case import BaseTestCase
 
 SOURCES = 5
@@ -33,10 +34,26 @@ def do_one_to_one_test(
         sim.run(0)
         conns = proj.get(["weight", "delay"], "list")
         sim.end()
-        for pre, post, weight, delay in conns:
+        for pre, post, w, d in conns:
             assert pre == post
-            assert weight == weight
-            assert delay == delay
+            assert w == weight
+            assert d == delay
+
+    def do_one_to_one_conductance_test(
+            self, neurons_per_core, pre_size, post_size, weight, delay):
+        sim.setup(1.0)
+        sim.set_number_of_neurons_per_core(sim.IF_cond_exp, neurons_per_core)
+        pre = sim.Population(pre_size, sim.IF_cond_exp())
+        post = sim.Population(post_size, sim.IF_cond_exp())
+        proj = sim.Projection(pre, post, sim.OneToOneConnector(),
+                              sim.StaticSynapse(weight=weight, delay=delay))
+        sim.run(0)
+        conns = proj.get(["weight", "delay"], "list")
+        sim.end()
+        for pre, post, w, d in conns:
+            assert pre == post
+            assert numpy.allclose(w, weight, rtol=0.0001)
+            assert d == delay
 
     def test_pre_same_as_post(self):
         self.do_one_to_one_test(10, 23, 23, 2.0, 3.0)
@@ -46,3 +63,6 @@ def test_pre_bigger_than_post(self):
 
     def test_post_bigger_than_pre(self):
         self.do_one_to_one_test(10, 23, 100, 3.0, 2.0)
+
+    def test_post_bigger_than_pre_low_weight(self):
+        self.do_one_to_one_conductance_test(10, 5, 4, 0.1, 1.0)