Merge branch 'release/v0.0.7'

config/attributes_config.py

@@ -1,4 +1,4 @@
-from config.metrics_config import *
+from . import metrics_config
 
 # store all variables from metrics config
 context_vars = vars()

config/cnn_config.py

@@ -1,4 +1,4 @@
-from config.global_config import *
+from . import global_config
 
 # store all variables from global config
 context_vars = vars()
@@ -11,7 +11,7 @@ not_noisy_folder                = 'notNoisy'
 post_image_name_separator       = '___'
 
 # variables
-features_choices_labels         = ['all',  'static', 'svd_reconstruction', 'fast_ica_reconstruction', 'ipca_reconstruction']
+features_choices_labels         = ['static', 'svd_reconstruction', 'fast_ica_reconstruction', 'ipca_reconstruction']
 
 # parameters
 keras_epochs                    = 30

config/metrics_config.py

@@ -1,4 +1,4 @@
-from config.global_config import *
+from . import global_config
 
 # store all variables from global config
 context_vars = vars()

models/cnn_models.py

@@ -5,8 +5,12 @@ from keras.layers import Activation, Dropout, Flatten, Dense, BatchNormalization
 from keras import backend as K
 import tensorflow as tf
 
-from modules.utils import config as cfg
-from modules.models import metrics
+# trick to enable import of config
+import sys
+sys.path.insert(0, '..')
+
+from . import metrics
+from config import cnn_config as cfg
 
 def generate_model_2D(_input_shape):