Merge pull request #3717 from thomaskroi1996/replace-numpy.in1d

Replace numpy.in1d() with numpy.isin() in testsuite

Author: heplesser

testsuite/pytests/sli2py_recording/test_compare_delta.py

@@ -63,5 +63,5 @@ def test_simulation_completes():
 
     spike_recs = spike_recorder.get("events", ["senders", "times"])
 
-    assert np.all(np.in1d(np.array([1, 2]), spike_recs["senders"].T[:2]))
+    assert np.all(np.isin(np.array([1, 2]), spike_recs["senders"].T[:2]))
     assert np.all(spike_recs["times"].T[:2] == pytest.approx(4.1))

testsuite/pytests/sli2py_regressions/test_ticket_941.py

@@ -95,4 +95,4 @@ def test_different_connections():
 
     synapses = nest.GetConnections(source=pn1, target=pn2).get("synapse_model")
     expected_synapses = ["static_synapse", "static_synapse", "static_synapse_hom_w"]
-    assert np.all(np.in1d(expected_synapses, synapses))
+    assert np.all(np.isin(expected_synapses, synapses))

testsuite/pytests/test_urbanczik_synapse.py

@@ -229,7 +229,7 @@ def test_SynapseDepressionFacilitation(self):
         if len(spike_times_soma) > 0:
             t = np.around(t, 4)
             spike_times_soma = np.around(spike_times_soma + 0.2, 4)
-            idx = np.nonzero(np.in1d(t, spike_times_soma))[0]
+            idx = np.nonzero(np.isin(t, spike_times_soma))[0]
             rate[idx] -= 1.0 / resolution
 
         w_change_raw = -15.0 * C_m_prox * rate * h * alpha_response
@@ -247,7 +247,7 @@ def test_SynapseDepressionFacilitation(self):
         comparison between Nest and python implementation
         """
         # extract the weight computed in python at the times of the presynaptic spikes
-        idx = np.nonzero(np.in1d(np.around(t, 4), np.around(pre_syn_spike_times + resolution, 4)))[0]
+        idx = np.nonzero(np.isin(np.around(t, 4), np.around(pre_syn_spike_times + resolution, 4)))[0]
         syn_w_comp_at_spike_times = syn_weight_comp[idx]
         realtive_error = (weights[-1] - syn_w_comp_at_spike_times[-1]) / (weights[-1] - init_w)