Update app.py

app.py

@@ -135,86 +135,18 @@ def Match_Cores(input_midi,
 
     #===============================================================================
 
-    cscore, tones_chords, tones_chords_idxs = load_midi(input_midi.name)
+    src_core_chords = load_midi(input_midi.name)
     
     #===============================================================================
     
-    print('Prepping chords chunks...')
-
-    chunk_len = chords_chunks_len
-    
-    all_chords_chunks = Counter()
-    
-    for i in range(0, len(tones_chords)):
-        chunk = tones_chords[i:i+chunk_len]
-        if len(chunk) == chunk_len:
-            all_chords_chunks[tuple(chunk)] += 1
-
-    print('Done!')
-    print('=' * 70)
-    print('Number of chords chunks:', len(all_chords_chunks))
-    print('=' * 70)
-
     #==================================================================
     
-    print('Remixing MIDI...')
+    print('Matching MIDI cores...')
     print('=' * 70)
 
-    other_chunks = [list(k) for k, v in all_chords_chunks.most_common(10)]
-
-    all_match_chunks = {}
-
-    for mc_chunk in other_chunks:
-        chunk_lens = fuzzy_find([len(l) for l in split_by_sublist(tones_chords, mc_chunk) if len(l) > chunk_len])
-        match_chunks = [l for l in split_by_sublist(tones_chords, mc_chunk) if len(l) in chunk_lens]
-        all_match_chunks[tuple(mc_chunk)] = match_chunks
-
-    #==================================================================
-
-    chunks_map = random.choices(other_chunks, k=num_mix_chunks)
-
-    #==================================================================
-
-    matched_chunks = []
-    start_chunk = []
-    res = -1
-    tries = 0
-    while  res == -1 and len(start_chunk[:res]) < chunk_len and tries < 100:
-    
-        start_chunk = random.choice(all_match_chunks[tuple(chunks_map[0])])
-        res = kmp_search(start_chunk, chunks_map[1])[0]
-    
-        tries += 1
-    
-        #print(res)
-    if tries < 100:
-        matched_chunks.append(start_chunk[:res])
-    
-    else:
-        print('FAIL!')
-
-    #==================================================================
+    match_idx = find_max_exact_match(src_core_chords, all_core_chords)
 
-    mchunks = [-1]
-    tries = 0
-    while -1 in mchunks and tries < 100:
-    
-        mchunks = []
-        
-        for i, chunk in enumerate(chunks_map[1:-1]):
-            start_chunk = random.choice(all_match_chunks[tuple(chunk)])
-            res = kmp_search(start_chunk, chunks_map[i+2])[0]
-        
-            #print(res)
-            mchunks.append(start_chunk[:res])
-    
-        tries += 1
-    
-    if tries < 100:
-        matched_chunks.extend(mchunks)
-    
-    else:
-        print('FAIL!')
+    print('MATCH IDX', match_idx)
 
     #==================================================================