Update app.py

app.py

@@ -235,26 +235,31 @@ def get_next_trial_info(current_trial_idx_in_run, current_run_image_list_for_tri
     target_full_path = os.path.join(TARGET_DIR, img_filename_original)
     trial_number_for_display = current_trial_idx_in_run + 1
 
-    pool = []
+    generated_pool = []
+    other_pool = []
+    
     for m_root_path in METHOD_ROOTS:
         method_name = os.path.basename(m_root_path)
-        
-        subjects_for_method = SUBJECTS # 默认使用所有 subjects
-        if method_name.lower() == "takagi": # 对 "takagi" 方法的特殊处理 (大小写不敏感)
+        is_generated_color = method_name == "generated_images_color"
+    
+        subjects_for_method = SUBJECTS
+        if method_name.lower() == "takagi":
             if "subj01" in SUBJECTS:
                 subjects_for_method = ["subj01"]
-                # print(f"调试：方法 'takagi' 将仅使用 'subj01'")
             else:
-                # print(f"调试：方法 'takagi' 希望使用 'subj01'，但其不在全局 SUBJECTS 列表中。此方法此次不产生候选图。")
-                continue # 如果 subj01 不可用，则跳过 takagi 方法的此次循环
-
+                continue
+    
         for s_id in subjects_for_method:
             base, ext = os.path.splitext(img_filename_original)
             reconstructed_filename = f"{base}_0{ext}"
             candidate_path = os.path.join(m_root_path, s_id, reconstructed_filename)
             if os.path.exists(candidate_path):
                 internal_label = f"{method_name}/{s_id}/{reconstructed_filename}"
-                pool.append((internal_label, candidate_path))
+                if is_generated_color:
+                    generated_pool.append((internal_label, candidate_path))
+                else:
+                    other_pool.append((internal_label, candidate_path))
+
 
     trial_info = {"image_id": img_filename_original, "target_path": target_full_path, "cur_no": trial_number_for_display, "is_sentinel": False,
                   "left_display_label": "N/A", "left_internal_label": "N/A", "left_path": None,
@@ -289,9 +294,11 @@ def get_next_trial_info(current_trial_idx_in_run, current_run_image_list_for_tri
 
         target_global_history_set = global_shown_pairs_cache.setdefault(img_filename_original, set())
         all_possible_pairs_in_pool = []
-        for c1, c2 in combinations(pool, 2):
-            pair_labels_fset = frozenset({c1[0], c2[0]})
-            all_possible_pairs_in_pool.append( ((c1, c2), pair_labels_fset) )
+        for c1 in generated_pool:
+            for c2 in other_pool:
+                pair_labels_fset = frozenset({c1[0], c2[0]})
+                all_possible_pairs_in_pool.append(((c1, c2), pair_labels_fset))
+
 
         unseen_globally_pairs_with_data = [
             item for item in all_possible_pairs_in_pool if item[1] not in target_global_history_set