Update app.py

app.py

@@ -58,6 +58,61 @@ print('=' * 70)
 
 #==================================================================================
 
+def find_matches(src_array, trg_array):
+
+    matches = np.all(src_array == trg_array, axis=1)
+    matching_indices = np.where(matches)[0]
+    
+    return matching_indices.tolist()
+
+#==================================================================================
+
+def find_closest_tuple(tuples_list, src_tuple):
+    def euclidean_distance(t1, t2):
+        return sum((a - b) ** 2 for a, b in zip(t1, t2)) ** 0.5
+
+    closest_tuple = None
+    min_distance = float('inf')
+
+    for t in tuples_list:
+        distance = euclidean_distance(t, src_tuple)
+        if distance < min_distance:
+            min_distance = distance
+            closest_tuple = t
+
+    return closest_tuple
+
+#==================================================================================
+
+def find_best_midx(midxs, trg_midx):
+
+    all_midxs = midxs + [trg_midx]
+    sidxs = [int(midx // 6) for midx in all_midxs]
+
+    times_durs = []
+
+    for sidx in sidxs:
+        
+        score = midi_loops[sidx][2]
+        dtimes = [e[0] for e in score if e[0] != 0]
+        durs = [e[1] for e in score]
+
+        avg_dtime = int(sum(dtimes) / len(dtimes))
+        avg_dur = int(sum(durs) / len(durs))
+
+        mode_dtimes= statistics.mode(dtimes)
+        mode_durs = statistics.mode(durs)
+
+        times_durs.append([avg_dtime, avg_dur, mode_dtimes, mode_durs])
+
+    best_time_dur = find_closest_tuple(times_durs[:-1], times_durs[-1])
+
+    best_midx = midxs[times_durs.index(best_time_dur)]
+
+    return best_midx
+
+#==================================================================================
+
 def Mix_Loops(input_midi, 
                generation_type,
                melody_patch,
@@ -90,9 +145,7 @@ def Mix_Loops(input_midi,
 
     #==================================================================
 
-    score, score_list = load_midi(input_midi.name)
 
-    print('Sample score events', score[:12])
 
     #==================================================================
     
@@ -110,41 +163,12 @@ def Mix_Loops(input_midi,
     print('Rendering results...')
     
     print('=' * 70)
-    print('Sample INTs', final_song[:15])
+    print('Sample MIDI events:', final_song[:3])
     print('=' * 70)
 
-    song_f = []
-    
-    if len(final_song) != 0:
-    
-        time = 0
-        dur = 0
-        vel = 90
-        pitch = 0
-        channel = 0
-        patch = 0
-    
-        channels_map = [0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 11, 9, 12, 13, 14, 15]
-        patches_map = [40, 0, 10, 19, 24, 35, 40, 52, 56, 9, 65, 73, 0, 0, 0, 0]
-        velocities_map = [125, 80, 100, 80, 90, 100, 100, 80, 110, 110, 110, 110, 80, 80, 80, 80]
-    
-        for m in final_song:
-    
-            if 0 <= m < 128:
-                time += m * 32
-    
-            elif 128 < m < 256:
-                dur = (m-128) * 32
-    
-            elif 256 < m < 1792:
-                cha = (m-256) // 128
-                pitch = (m-256) % 128
-    
-                channel = channels_map[cha]
-                patch = patches_map[channel]
-                vel = velocities_map[channel]
-    
-                song_f.append(['note', time, dur, channel, pitch, vel, patch])
+    final_song_abs = TMIDIX.delta_score_to_abs_score(final_song)
+
+    output_score, patches, overflow_patches = TMIDIX.patch_enhanced_score_notes(final_song_abs)
 
     fn1 = "MIDI-Loops-Mixer-Composition"
     
@@ -173,7 +197,11 @@ def Mix_Loops(input_midi,
     output_midi = str(new_fn)
     output_audio = (16000, audio)
     
-    output_plot = TMIDIX.plot_ms_SONG(song_f, plot_title=output_midi, return_plt=True)
+    output_plot = TMIDIX.plot_ms_SONG(song_f, 
+                                      plot_title=output_midi,
+                                      timings_multiplier=16,
+                                      return_plt=True
+                                     )
 
     print('Output MIDI file name:', output_midi)
     print('=' * 70)