25.06

scratch.py

@@ -0,0 +1,17 @@
+
+#second_try scratch
+minimum = min(len(frequency[0]), len(frequency[1]))
+f1 = frequency[0][:minimum]
+f2 = frequency[1][:minimum]
+
+frequency = np.array(frequency)
+
+mean = np.mean(frequency, axis=0)
+
+for i in range(len(minimum)):
+    mean(frequency[0][i], frequency[1][i])
+
+for f in frequency:
+    print(np.mean(f))
+
+# mean_f = np.mean(x) for x in zip(freqeuncies1, frequencies2)

second_try.py

@@ -10,36 +10,24 @@ from jar_functions import parse_dataset
 datasets = [(os.path.join('D:\\jar_project\\JAR\\2020-06-22-ab\\beats-eod.dat'))]
 #           (os.path.join('D:\\jar_project\\JAR\\2020-06-22-ac\\beats-eod.dat'))]
 
+eodf = []
+deltaf = []
+stimulusf = []
+
 time = []
 frequency = []
 amplitude = []
 
+
 for dataset in datasets:
-    t, f, a, e= parse_dataset(dataset)
-    embed()
+    t, f, a, e, d, s= parse_dataset(dataset)
+
     time.append(t)
     frequency.append(f)
     amplitude.append(a)
-
-
-minimum = min(len(frequency[0]), len(frequency[1]))
-f1 = frequency[0][:minimum]
-f2 = frequency[1][:minimum]
-
-frequency = f1 + f2
-embed()
-#frequency = np.array(frequency)
-
-mean = np.mean(frequency, axis=0)
-
-for i in range(len(minimum)):
-    mean(frequency[0][i], frequency[1][i])
-
-for f in frequency:
-    print(np.mean(f))
-
-# mean_f = np.mean(x) for x in zip(freqeuncies1, frequencies2)
-
+    eodf.append(e)
+    deltaf.append(d)
+    stimulusf.append(s)
 
 embed()