修复统计各类别图片,逻辑错误问题。

This commit is contained in:
2026-03-02 17:32:41 +08:00
parent 7af923f1ce
commit 8a50e2973b
2 changed files with 14 additions and 7 deletions
+13 -6
View File
@@ -59,22 +59,29 @@ def count_images_by_class(dataset_root: str, output_file: str = None):
test_count = 0 test_count = 0
# 统计train目录 # 统计train目录
image_exts = {'.jpg', '.jpeg', '.png'}
train_class_dir = train_dir / class_name train_class_dir = train_dir / class_name
if train_class_dir.exists(): if train_class_dir.exists():
for ext in ['*.jpg', '*.jpeg', '*.png', '*.JPG', '*.JPEG', '*.PNG']: train_count = sum(
train_count += len(list(train_class_dir.glob(ext))) 1 for f in train_class_dir.iterdir()
if f.is_file() and f.suffix.lower() in image_exts
)
# 统计val目录 # 统计val目录
val_class_dir = val_dir / class_name val_class_dir = val_dir / class_name
if val_class_dir.exists(): if val_class_dir.exists():
for ext in ['*.jpg', '*.jpeg', '*.png', '*.JPG', '*.JPEG', '*.PNG']: val_count = sum(
val_count += len(list(val_class_dir.glob(ext))) 1 for f in val_class_dir.iterdir()
if f.is_file() and f.suffix.lower() in image_exts
)
# 统计test目录 # 统计test目录
test_class_dir = test_dir / class_name test_class_dir = test_dir / class_name
if test_class_dir.exists(): if test_class_dir.exists():
for ext in ['*.jpg', '*.jpeg', '*.png', '*.JPG', '*.JPEG', '*.PNG']: test_count = sum(
test_count += len(list(test_class_dir.glob(ext))) 1 for f in test_class_dir.iterdir()
if f.is_file() and f.suffix.lower() in image_exts
)
total = train_count + val_count + test_count total = train_count + val_count + test_count
class_counts[class_name] = total class_counts[class_name] = total
+1 -1
View File
@@ -57,7 +57,7 @@ GRID_PARAMS = {
'm': [0.32, 0.35, 0.38, 0.40,0.45,0.50], # margin参数 'm': [0.32, 0.35, 0.38, 0.40,0.45,0.50], # margin参数
}, },
'whole_ingredient': { 'whole_ingredient': {
's': [64.0, 68.0], 's': [64.0],
'm': [0.40, 0.42, 0.43, 0.45], 'm': [0.40, 0.42, 0.43, 0.45],
}, },
'processed_ingredient': { 'processed_ingredient': {