Changeset 34438

Timestamp:

2020-10-04T23:47:43+13:00 (4 years ago)

Author:

davidb

Message:

Next step of coding development; using OrderedDict to store the values by key, but still in order they appear in the CSV file

File:

• main/trunk/model-sites-dev/mars/collect/deam/MERGE-CSV-FEATURES-AND-AV-FILES.py (modified) (5 diffs)

main/trunk/model-sites-dev/mars/collect/deam/MERGE-CSV-FEATURES-AND-AV-FILES.py

@@ -5 +5 @@
 from collections import OrderedDict
 
-# result = OrderedDict()
-
 def csv_features_to_dict(csv_filename):
-    # csv_features_file = open('etc/deam-essentia-features-collated.csv')
     csv_features_file = open(csv_filename)
     csv_features_reader = csv.reader(csv_features_file, delimiter=',', quotechar='"')
@@ -21 +18 @@
             row.pop(0)
             header_row = row
-        #        print(f'Column names are {", ".join(row)}')
         else:
             full_file_id = row[0]
@@ -47 +43 @@
 
     csv_file = open(csv_filename)
-    csv_reader = csv.reader(csv_features_file, delimiter=',')
+    csv_reader = csv.reader(csv_file, delimiter=',')
 
     csv_gt_dict = {}
@@ -56 +52 @@
     for row in csv_reader:
         if line_count == 0:
+            row.pop(0)
             header_row = row
-        #        print(f'Column names are {", ".join(row)}')
         else:
-            song_id = row[0]
+            song_id = int(row[0])
+            row.pop(0)
 
-            #        print(f'\tsong-id: {song_id}')
-            csv_gt_dict[song_id] = row
+            row_ordered_dict = OrderedDict()
+
+            for i in range(0, len(row)):
+                field = header_row[i];
+                value = row[i];
+
+                row_ordered_dict[field] = value
+                
+            csv_gt_dict[song_id] = row_ordered_dict
 
         line_count += 1
@@ -71 +75 @@
 csv_features_dict = csv_features_to_dict('etc/deam-essentia-features-collated.csv')
 
-#for song_id_key in csv_features_dict:
-#    print(song_id_key + "\n" + str(csv_features_dict[song_id_key])) 
+print("Essentia Features (sample of first 3 ids):")
+i = 1
+for song_id_key, ordered_feature_vals in sorted(csv_features_dict.items()): 
+#    print(str(song_id_key) + "\n" + str(ordered_feature_vals))
+    if i >= 3:
+        break
+    i = i + 1
 
 
-for song_id_key, ordered_feature_vals in sorted(csv_features_dict.items()): 
-    print(str(song_id_key) + "\n" + str(ordered_feature_vals))
-
-
-groundtruth_dir = 'prepare/annotations/annotations\ averaged\ per\ song/dynamic\ \(per\ second\ annotations\)'
+groundtruth_dir = 'prepare/annotations/annotations averaged per song/dynamic (per second annotations)'
 arousal_csv_filename = groundtruth_dir + '/arousal.csv'
-valance_csv_filename = groundtruth_dir + '/valance.csv'
+valence_csv_filename = groundtruth_dir + '/valence.csv'
 
 
 arousal_groundtruth_dict = csv_groundtruth_to_dict(arousal_csv_filename)
-valance_groundtruth_dict = csv_groundtruth_to_dict(valance_csv_filename)
+valence_groundtruth_dict = csv_groundtruth_to_dict(valence_csv_filename)
 
-#print(f'Processed {line_count} lines.')
+print("Arousal Ground-truth (sample of first 3 ids):")
+i = 1
+for song_id_key, ordered_feature_vals in sorted(arousal_groundtruth_dict.items()): 
+    print(str(song_id_key) + "\n" + str(ordered_feature_vals))
+    if i >= 3:
+        break
+    i = i + 1