浏览代码

Update of scripts

Jérôme BUISINE 5 年之前
父节点
当前提交
5aede5ae1e
共有 3 个文件被更改,包括 4 次插入5 次删除
  1. 2 3
      display_simulation_curves.py
  2. 1 1
      runAll_maxwell_keras_corr.sh
  3. 1 1
      runAll_maxwell_keras_corr_custom.sh

+ 2 - 3
display_simulation_curves.py

@@ -21,17 +21,14 @@ def display_curves(folder_path, model_name):
     """
 
     for name in models_name:
-        print(name in model_name)
         if name in model_name:
             data_filename = model_name
             learned_zones_folder_path = os.path.join(learned_zones_folder, data_filename)
 
-    print(learned_zones_folder_path)
     data_files = [x for x in os.listdir(folder_path) if '.png' not in x]
 
     scene_names = [f.split('_')[3] for f in data_files]
 
-    print(scene_names)
     for id, f in enumerate(data_files):
 
         print(scene_names[id])
@@ -103,5 +100,7 @@ def main():
 
     display_curves(p_folder, p_model)
 
+    print(p_folder)
+
 if __name__== "__main__":
     main()

+ 1 - 1
runAll_maxwell_keras_corr.sh

@@ -40,7 +40,7 @@ for label in {"0","1"}; do
 
                         echo "${MODEL_NAME} results already generated..."
                     else
-                        python generate_data_model_corr_random.py --output ${FILENAME} --n ${size} --highest ${highest} --label ${label} --kind ${mode} --metric ${metric} --scenes "${scenes}" --nb_zones "${nb_zones}" --percent 1 --renderer "maxwell" --step 10 --random 1 --custom 1
+                        python generate_data_model_corr_random.py --output ${FILENAME} --n ${size} --highest ${highest} --label ${label} --kind ${mode} --metric ${metric} --scenes "${scenes}" --nb_zones "${nb_zones}" --percent 1 --renderer "maxwell" --step 10 --random 1
                         python deep_network_keras_svd.py --data ${FILENAME} --output ${MODEL_NAME} --size ${size}
 
                         # use of interval but it is not really an interval..

+ 1 - 1
runAll_maxwell_keras_corr_custom.sh

@@ -40,7 +40,7 @@ for label in {"0","1"}; do
 
                         echo "${MODEL_NAME} results already generated..."
                     else
-                        python generate_data_model_corr_random.py --output ${FILENAME} --n ${size} --highest ${highest} --label ${label} --kind ${mode} --metric ${metric} --scenes "${scenes}" --nb_zones "${nb_zones}" --percent 1 --renderer "maxwell" --step 10 --random 1
+                        python generate_data_model_corr_random.py --output ${FILENAME} --n ${size} --highest ${highest} --label ${label} --kind ${mode} --metric ${metric} --scenes "${scenes}" --nb_zones "${nb_zones}" --percent 1 --renderer "maxwell" --step 10 --random 1 --custom 1
                         python deep_network_keras_svd.py --data ${FILENAME} --output ${MODEL_NAME} --size ${size}
 
                         # use of interval but it is not really an interval..