tests, correct stimulus-type for fi-curve, general changes

unittests/testFrequencyFunctions.py

@@ -126,7 +126,7 @@ class FrequencyFunctionsTester(unittest.TestCase):
         freq_traces = [test1_f, test2_f]
         time, mean = hF.calculate_mean_of_frequency_traces(time_traces, freq_traces, 0.5)
 
-        expected_time = np.arange(0.5, 7.5, 0.5)
+        expected_time = np.arange(0.5, 7, 0.5)
 
         expected_mean = [0.75, 1.25, 1.25, 2, 2, 2.5]
         time_equal = np.all([time[i] == expected_time[i] for i in range(len(time))])
@@ -137,7 +137,11 @@ class FrequencyFunctionsTester(unittest.TestCase):
         self.assertEqual(len(expected_time), len(time), msg="expected:\n" + str(expected_time) + "\n actual: \n" + str(time))
 
     # TODO:
-    # all_calculate_mean_isi_frequency_traces(spiketimes, sampling_interval, time_in_ms=True):
+    # all_calculate_mean_isi_frequency_traces(spiketimes, sampling_interval, time_in_ms=False):
+
+
+    #def test_all_calculate_mean_isi_frequency_traces(self):
+    #    hF.all_calculate_mean_isi_frequency_traces(,
 
 
 def generate_jittered_spiketimes(frequency, noise_level=0., start=0, end=5, method='normal'):

unittests/testHelperFunctions.py

@@ -30,8 +30,24 @@ class HelperFunctionsTester(unittest.TestCase):
 
         self.assertEqual(0, round(hF.__vector_strength__(rel_spike_times, eod_durations), 5))
 
+    # def test_eods_around_spikes(self):
+    #
+    #     time = np.arange(0, 3, 0.01)
+    #     eod = np.sin(2*np.pi * 2 * time)
+    #
+    #     spikes = [0.2, 0.5, 0.6]
+    #     indices = np.searchsorted(time, spikes)
+    #
+    #     rel_spike_time, eod_duration = hF.eods_around_spikes(time, eod, indices)
+    #
+    #     print("meep")
 
 
+    # todo
+    #  search_eod_start_and_end_times ? (not used anymore ?)
+    #  eods_around_spikes
+    #  calculate_phases
+
     # def test(self):
     #    test_distribution()