Merge branch 'release/v0.2.2'

cnn_models.py

@@ -14,7 +14,7 @@ import tensorflow as tf
 sys.path.insert(0, '') # trick to enable import of main folder module
 
 import custom_config as cfg
-from modules.models import metrics
+from models import metrics
 
 def generate_model_2D(_input_shape):
 

models/metrics.py

@@ -0,0 +1,9 @@
+# model imports
+from keras import backend as K
+import tensorflow as tf
+
+def auc(y_true, y_pred):
+    auc = tf.metrics.auc(y_true, y_pred)[1]
+    K.get_session().run(tf.local_variables_initializer())
+    
+    return auc

modules

@@ -1 +1 @@
-Subproject commit 4d35e5fbc4cb7145bf524a609d9500da4a4433df
+Subproject commit 917b396477d60a96dbc233554b4324cf7d9ae8c4

run_tl_test.sh

@@ -27,10 +27,11 @@ all_features="${svd_metric},${ipca_metric},${fast_ica_metric}"
 
 # RUN LATER
 # compute using all transformation methods
-ipca_batch_size=55
+
 begin=100
 end=200
 ipca_component=30
+ipca_batch_size=55
 fast_ica_component=60
 zone=12
 
@@ -39,9 +40,9 @@ OUTPUT_DATA_FILE="${svd_metric}_B${begin}_E${end}_${ipca_metric}__N${ipca_compon
 
 python generate/generate_reconstructed_data.py --features ${svd_metric} --params "${begin}, ${end}"
 
-python generate/generate_reconstructed_data.py --features ${ipca_component} --params "${component},${ipca_batch_size}"
+python generate/generate_reconstructed_data.py --features ${ipca_metric} --params "${ipca_component},${ipca_batch_size}"
 
-python generate/generate_reconstructed_data.py --features ${fast_ica_component} --params "${component}"
+python generate/generate_reconstructed_data.py --features ${fast_ica_metric} --params "${fast_ica_component}"
 
 
 if grep -xq "${OUTPUT_DATA_FILE}" "${file_path}"; then