experiment

functions/calc_matches.py

@@ -3,42 +3,8 @@ import numpy as np
 from scipy.sparse import csr_matrix, lil_matrix
 import streamlit as st
 
-"""
-def calc_matches(filtered_df, project_df, similarity_matrix, top_x):
-    # matching project2 can be any project
-    # indecies (rows) = project1
-    # columns = project2
-    # -> find matches
-
-    # filter out all row considering the filter
-    filtered_df_indecies_list = filtered_df.index
-    project_df_indecies_list = project_df.index
-
-    np.fill_diagonal(similarity_matrix, 0)
-    match_matrix = similarity_matrix[filtered_df_indecies_list, :][:, project_df_indecies_list]
-
-    best_matches_list = np.argsort(match_matrix, axis=None)
-
-    if len(best_matches_list) < top_x:
-        top_x = len(best_matches_list)
-
-    # get row (project1) and column (project2) with highest similarity in filtered df
-    top_indices = np.unravel_index(best_matches_list[-top_x:], match_matrix.shape)
-
-    # get the corresponding similarity values
-    top_values = match_matrix[top_indices]
-
-    p1_df = filtered_df.iloc[top_indices[0]]
-    p1_df["similarity"] = top_values
-    p2_df = project_df.iloc[top_indices[1]]
-    p2_df["similarity"] = top_values
-
-    return p1_df, p2_df
-"""
-
 # multi_project_matching
 def calc_matches(filtered_df, project_df, similarity_matrix, top_x):
-    st.dataframe(project_df.head(5))
     st.write(filtered_df.shape)
     st.write(project_df.shape)
     st.write(similarity_matrix.shape)
@@ -56,7 +22,8 @@ def calc_matches(filtered_df, project_df, similarity_matrix, top_x):
     project_df_index_map = {i: index for i, index in enumerate(project_df_indices)}
 
     # Select submatrix based on indices from both dataframes
-    match_matrix = similarity_matrix[filtered_df_indices, :][:, project_df_indices]
+    #match_matrix = similarity_matrix[filtered_df_indices, :][:, project_df_indices]
+    match_matrix = similarity_matrix[np.ix_(filtered_df_indices, project_df_indices)]
 
     st.write(match_matrix.shape)
 

similarity_page.py

@@ -272,10 +272,10 @@ def show_multi_matching_page():
         ## if show only different orgas checkbox is activated
         if different_orga_checkbox:
             with st.spinner('Please wait...'):
-                p1_df, p2_df = calc_matches(filtered_df, projects_df, nonsameorgas_sim_matrix, TOP_X_PROJECTS)
+                p1_df, p2_df = calc_matches(filtered_df, compare_df, nonsameorgas_sim_matrix, TOP_X_PROJECTS)
         else:
             with st.spinner('Please wait...'):
-                p1_df, p2_df = calc_matches(filtered_df, projects_df, sim_matrix, TOP_X_PROJECTS)
+                p1_df, p2_df = calc_matches(filtered_df, compare_df, sim_matrix, TOP_X_PROJECTS)
 
         # SHOW THE RESULT
         show_multi_table(p1_df, p2_df)