change implementation to more efficient way. adapt signature

This commit is contained in:
a.ott
2020-03-02 16:37:37 +01:00
parent 8997e56618
commit 7e65ebae4e
5 changed files with 28 additions and 14 deletions

View File

@@ -31,7 +31,7 @@ class FrequencyFunctionsTester(unittest.TestCase):
for freq in self.frequencies:
for n in self.noise_levels:
spikes = generate_jittered_spiketimes(freq, n, end=simulation_time)
sim_freq = hF.mean_freq_of_spiketimes_after_time_x(spikes, 0.00005, simulation_time/4, time_in_ms=False)
sim_freq = hF.mean_freq_of_spiketimes_after_time_x(spikes, simulation_time / 4, time_in_ms=False)
max_diff = round(n*(10+0.7*np.sqrt(freq)), 2)
# print("noise: {:.2f}".format(n), "\texpected: {:.2f}".format(freq), "\tgotten: {:.2f}".format(round(sim_freq, 2)), "\tfreq diff: {:.2f}".format(abs(freq-round(sim_freq, 2))), "\tmax_diff:", max_diff)
@@ -223,7 +223,7 @@ def test_distribution():
print("#### - freq:", freq, "noise level:", n )
for reps in range(repetitions):
spikes = generate_jittered_spiketimes(freq, n, end=simulation_time)
sim_freq = hF.mean_freq_of_spiketimes_after_time_x(spikes, 0.0002, simulation_time / 4, time_in_ms=False)
sim_freq = hF.mean_freq_of_spiketimes_after_time_x(spikes, simulation_time / 4, time_in_ms=False)
diffs.append(sim_freq-freq)
diffs_per_noise.append(diffs)

View File

@@ -55,7 +55,7 @@ class HelperFunctionsTester(unittest.TestCase):
test_model.set_variable("v_offset", offset)
_, spikes = test_model.simulate_fast(stimulus, 5)
goal_freq = hF.mean_freq_of_spiketimes_after_time_x(spikes, 0.0005, 1)
goal_freq = hF.mean_freq_of_spiketimes_after_time_x(spikes, 1)
if goal_freq <= threshold:
print("test Offset ({:.1f}) generates a too low frequency: {:.2f}".format(offset, goal_freq))