Browse Source

Update of projects scripts and dependencies

Jérôme BUISINE 1 year ago
parent
commit
897cf6d922
4 changed files with 6 additions and 5 deletions
  1. 3 3
      README.md
  2. 1 0
      generate/generate_dataset.py
  3. 1 1
      modules
  4. 1 1
      prediction/predict_seuil_expe_curve.py

+ 3 - 3
README.md

@@ -14,12 +14,12 @@ pip install -r requirements.txt
 
 Generate reconstructed data from specific method of reconstruction (run only once time or clean data folder before):
 ```
-python generate_reconstructed_data.py -h
+python generate/generate_reconstructed_data.py -h
 ```
 
 Generate custom dataset from one reconstructed method or multiples (implemented later)
 ```
-python generate_dataset.py -h
+python generate/generate_dataset.py -h
 ```
 
 ### Reconstruction parameter (--params)
@@ -40,7 +40,7 @@ List of expected parameter by reconstruction method:
 
 **__Example:__**
 ```bash
-python generate_dataset.py --output data/output_data_filename --metrics "svd_reconstruction, ipca_reconstruction, fast_ica_reconstruction" --renderer "maxwell" --scenes "A, D, G, H" --params "100, 200 :: 50, 10 :: 50" --nb_zones 10 --random 1
+python generate/generate_dataset.py --output data/output_data_filename --features "svd_reconstruction, ipca_reconstruction, fast_ica_reconstruction" --renderer "maxwell" --scenes "A, D, G, H" --params "100, 200 :: 50, 10 :: 50" --nb_zones 10 --random 1
 ```
 
 

+ 1 - 0
generate/generate_dataset.py

@@ -9,6 +9,7 @@ Created on Wed Jun 19 11:47:42 2019
 # main imports
 import sys, os, argparse
 import numpy as np
+import random
 
 # images processing imports
 from PIL import Image

+ 1 - 1
modules

@@ -1 +1 @@
-Subproject commit 7e65b752b6367df1177992f28ebffbc14cb62adb
+Subproject commit d5de038bdccaa58ff2123d5227482dc6c0ea2500

+ 1 - 1
prediction/predict_seuil_expe_curve.py

@@ -109,7 +109,7 @@ def main():
                 block_predictions_str.append(index_str + ";" + p_model_file + ";" + str(threshold) + ";" + str(start_quality_image) + ";" + str(quality_step_image))
 
             # for each images
-            for id_img, img_path in enumerate(scene_images):
+            for img_path in scene_images:
 
                 current_img = Image.open(img_path)
                 img_blocks = divide_in_blocks(current_img, cfg.keras_img_size)