Browse Source

Update of extraction scripts

Jérôme BUISINE 7 months ago
parent
commit
329a2e1df3
4 changed files with 21 additions and 15 deletions
  1. 1 3
      .gitignore
  2. 1 0
      dataset
  3. 0 0
      extractions/calibration_errors.py
  4. 19 12
      extractions/match_extracts_scene_mean.py

+ 1 - 3
.gitignore

@@ -104,7 +104,5 @@ venv.bak/
 .mypy_cache/
 
 # data folder
-links/data
-links/expe
 .vscode
-media
+dataset

+ 1 - 0
dataset

@@ -0,0 +1 @@
+../data/Scenes/

calibration_errors.py → extractions/calibration_errors.py


+ 19 - 12
extractions/match_extracts_scene_mean.py

@@ -1,7 +1,7 @@
 # main imports
 import argparse
 import numpy as np
-import sys
+import sys, os
 
 # mongo import
 from pymongo import MongoClient
@@ -18,7 +18,7 @@ def main():
 
     parser.add_argument('--expeId', type=str, help='Experiment identifier')
     parser.add_argument('--experiment', type=str, help='Experiment name', choices=cfg.experiment_list, required=True)
-    parser.add_argument('--scene', type=str, help='Scene identifier to use', choices=cfg.scenes_indices)
+    parser.add_argument('--scene', type=str, help='Scene identifier to use', choices=cfg.scenes_indices, required=True)
 
     args = parser.parse_args()
 
@@ -40,27 +40,34 @@ def main():
         print("Expe id used", p_expe_id)
         query['data.experimentId'] = p_expe_id
 
-    if p_scene:
+    index = cfg.scenes_indices.index(p_scene.strip())
+    scene_name = cfg.scenes_names[index]
 
-        index = cfg.scenes_indices.index(p_scene.strip())
-        scene_name = cfg.scenes_names[index]
+    # from dataset retrieve human thresholds for each zone  
+    zone_thresholds = []
+    scene_folder = os.path.join(cfg.dataset_path, scene_name)
+    zone_folders = sorted([zone for zone in os.listdir(scene_folder) if 'zone' in zone])
+    
+    for zone in zone_folders:
+        threshold_file_path = os.path.join(scene_folder, zone, cfg.seuil_expe_filename)
 
-        print("Scene used", scene_name)
-        query['data.msg.sceneName'] = scene_name
+        with open(threshold_file_path, 'r') as f:
+            current_threshold = int(f.readline())
+            zone_thresholds.append(current_threshold)
+    
+    print(zone_thresholds)
 
-    print(query)
+    print("Scene used", scene_name)
+    query['data.msg.sceneName'] = scene_name
 
-    res = db.datas.find(query)
+    print(query)
 
-    zone_index = np.arange(16)
-    threshold_img = (zone_index / 15) * 100
 
     for cursor in res:
         user_data = cursor['data']
         user_id = user_data['userId']
 
         experiment_user_thresholds = []
-        experiment_error_thresholds = []
         for id, val in enumerate(user_data['msg']['extracts']):
             experiment_user_thresholds.append(val['quality'])