Configuration separation

config/attributes_config.py

@@ -0,0 +1,15 @@
+from config.metrics_config import *
+
+# store all variables from metrics config
+context_vars = vars()
+
+# folders
+
+# file or extensions
+
+# variables 
+
+# override metrics_choices_labels
+features_choices_labels         = ['filters_statistics']
+
+# parameters

config/cnn_config.py

@@ -0,0 +1,21 @@
+from config.global_config import *
+
+# store all variables from global config
+context_vars = vars()
+
+# folders
+noisy_folder                    = 'noisy'
+not_noisy_folder                = 'notNoisy'
+
+# file or extensions
+post_image_name_separator       = '___'
+
+# variables
+features_choices_labels         = ['all',  'static', 'svd_reconstruction', 'fast_ica_reconstruction', 'ipca_reconstruction']
+
+# parameters
+keras_epochs                    = 30
+keras_batch                     = 32
+val_dataset_size                = 0.2
+
+keras_img_size                  = (200, 200)

utils/config.py

@@ -1,26 +1,22 @@
 import numpy as np
 
-zone_folder                     = "zone"
+# folders
+zone_folder                     = 'zone'
 output_data_folder              = 'data'
 dataset_path                    = 'dataset'
 threshold_map_folder            = 'threshold_map'
 models_information_folder       = 'models_info'
+results_information_folder      = 'results'
 saved_models_folder             = 'saved_models'
 min_max_custom_folder           = 'custom_norm'
 learned_zones_folder            = 'learned_zones'
-correlation_indices_folder      = 'corr_indices'
 
-csv_model_comparisons_filename  = "models_comparisons.csv"
+# files or extensions
+csv_model_comparisons_filename  = 'models_comparisons.csv'
 seuil_expe_filename             = 'seuilExpe'
-min_max_filename_extension      = "_min_max_values"
-config_filename                 = "config"
+config_filename                 = 'config'
 
-noisy_folder                    = 'noisy'
-not_noisy_folder                = 'notNoisy'
-
-models_names_list               = ["svm_model","ensemble_model","ensemble_model_v2","deep_keras"]
-
-# define all scenes values
+# variables 
 renderer_choices                = ['all', 'maxwell', 'igloo', 'cycle']
 
 scenes_names                    = ['Appart1opt02', 'Bureau1', 'Cendrier', 'Cuisine01', 'EchecsBas', 'PNDVuePlongeante', 'SdbCentre', 'SdbDroite', 'Selles']
@@ -35,15 +31,6 @@ igloo_scenes_indices            = ['B', 'F']
 cycle_scenes_names              = ['EchecBas', 'Selles']
 cycle_scenes_indices            = ['E', 'I']
 
-normalization_choices           = ['svd', 'svdn', 'svdne']
 zones_indices                   = np.arange(16)
 
-metric_choices_labels           = ['all',  'static', 'svd_reconstruction', 'fast_ica_reconstruction', 'ipca_reconstruction']
-
-post_image_name_separator       = '___'
-
-keras_epochs                    = 30
-keras_batch                     = 32
-val_dataset_size                = 0.2
-
-keras_img_size                  = (200, 200)
+# parameters

models/models.py

@@ -8,7 +8,6 @@ import tensorflow as tf
 from modules.utils import config as cfg
 from modules.models import metrics
 
-
 def generate_model_2D(_input_shape):
 
     model = Sequential()