From c203bcd1d3e51ac7f268208dcc23d85ee43ec490 Mon Sep 17 00:00:00 2001 From: Alexey Serenko Date: Thu, 6 Jun 2019 21:06:56 +0300 Subject: [PATCH] Revert "Work around the synapse count exceeding issue" This reverts commit 54045ac191d84885bf3478e821c77892e2753fcb. Now that Issue #1043 is closed, there is no need for such workaround. So, I restore the original version of test_common_props_setting.sli, for it was cleaner. --- .../unittests/test_common_props_setting.sli | 29 +++++++------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/testsuite/unittests/test_common_props_setting.sli b/testsuite/unittests/test_common_props_setting.sli index 0108c42691..63c47a0800 100644 --- a/testsuite/unittests/test_common_props_setting.sli +++ b/testsuite/unittests/test_common_props_setting.sli @@ -44,20 +44,16 @@ Author: Hans E Plesser { synapsedict exch known } Select def +% prepare stdp_dopamine_synapse, which needs a +% volume transmitter assigned to it before connecting +/vol /volume_transmitter Create def +/stdp_dopamine_synapse << /vt vol >> SetDefaults + % first test: do everything correctly { true synmodels { - % Reset the kernel to work around exceeding the maximum possible - % number of synapse models (see Issue #1043). - ResetKernel - - % prepare stdp_dopamine_synapse, which needs a - % volume transmitter assigned to it before connecting - /vol /volume_transmitter Create def - /stdp_dopamine_synapse << /vt vol >> SetDefaults - /synmod Set synmod << /tau_plus 5.0 /weight 2.0 >> SetDefaults synmod GetDefaults [[/tau_plus /weight]] get [5.0 2.0] eq @@ -72,19 +68,16 @@ def } Fold } assert_or_die +ResetKernel + +% prepare stdp_dopamine_synapse, which needs a +% volume transmitter assigned to it before connecting +/vol /volume_transmitter Create def +/stdp_dopamine_synapse << /vt vol >> SetDefaults % second test: set common prop on synapse synmodels { - % Reset the kernel to work around exceeding the maximum possible - % number of synapse models (see Issue #1043). - ResetKernel - - % prepare stdp_dopamine_synapse, which needs a - % volume transmitter assigned to it before connecting - /vol /volume_transmitter Create def - /stdp_dopamine_synapse << /vt vol >> SetDefaults - /synmod Set synmod GetDefaults /tau_plus get /tpref Set