Update h5_to_db.py

h5_to_db.py

@@ -112,30 +112,46 @@ def add_keypoints(db, h5_path, image_path, img_ext, camera_model, single_camera
     
 
 def add_matches(db, h5_path, fname_to_id):
+    """
+    matches.h5から直接マッチを追加
+    """
     match_file = h5py.File(os.path.join(h5_path, 'matches.h5'), 'r')
     
     added = set()
     n_keys = len(match_file.keys())
-    n_total = (n_keys * (n_keys - 1)) // 2
-
-    with tqdm(total=n_total) as pbar:
-        for key_1 in match_file.keys():
-            group = match_file[key_1]
-            for key_2 in group.keys():
-                id_1 = fname_to_id[key_1]
-                id_2 = fname_to_id[key_2]
-
-                pair_id = image_ids_to_pair_id(id_1, id_2)
-                if pair_id in added:
-                    warnings.warn(f'Pair {pair_id} ({id_1}, {id_2}) already added!')
-                    continue
+    
+    with tqdm(total=n_keys, desc="Adding matches") as pbar:
+        for pair_key in match_file.keys():
+            # pair_key = "image_000_image_001" の形式を分割
+            # "image_000_image_001" → ["image_000", "image_001"]
+            parts = pair_key.split('_')
             
-                matches = group[key_2][()]
-                db.add_matches(id_1, id_2, matches)
-
-                added.add(pair_id)
-
+            # "image" + "000" + "image" + "001" → "image_000" と "image_001"
+            # 中央で分割（前半と後半に分ける）
+            mid = len(parts) // 2
+            key_1 = '_'.join(parts[:mid])
+            key_2 = '_'.join(parts[mid:])
+            
+            if key_1 not in fname_to_id or key_2 not in fname_to_id:
+                print(f"Warning: {key_1} or {key_2} not found in fname_to_id")
+                pbar.update(1)
+                continue
+            
+            id_1 = fname_to_id[key_1]
+            id_2 = fname_to_id[key_2]
+            pair_id = image_ids_to_pair_id(id_1, id_2)
+            
+            if pair_id in added:
                 pbar.update(1)
+                continue
+            
+            matches = match_file[pair_key][()]
+            db.add_matches(id_1, id_2, matches)
+            added.add(pair_id)
+            pbar.update(1)
+    
+    match_file.close()
+    
 
 def import_into_colmap(img_dir,
                        feature_dir ='.featureout',