Modified result directory creation prcess

config_files/config.yml

@@ -48,7 +48,7 @@ Classification:
   algos_multiview: ["all"]
   # The number of times the benchamrk is repeated with different train/test
   # split, to have more statistically significant results
-  stats_iter: 2
+  stats_iter: 1
   # The metrics that will be use din the result analysis
   metrics: ["accuracy_score", "f1_score"]
   # The metric that will be used in the hyper-parameter optimization process
@@ -157,7 +157,7 @@ gradient_boosting:
 ######################################
 
 weighted_linear_early_fusion:
-  view_weights: [None]
+  view_weights: [null]
   monoview_classifier_name: ["decision_tree"]
   monoview_classifier_config:
     decision_tree:
@@ -234,6 +234,6 @@ weighted_linear_late_fusion:
       splitter: ["best"]
 
 mumbo:
-  base_estimator: [None]
+  base_estimator: [null]
   n_estimators: [10]
   best_view_mode: ["edge"]
\ No newline at end of file

config_files/config_test.yml

@@ -204,10 +204,6 @@ mumbo:
   n_estimators: [10]
   best_view_mode: ["edge"]
 
-easy_mkl:
-  degrees: [1]
-  lam: [0.1]
-
 lp_norm_mkl:
   lmbda: [0.1]
   n_loops: [50]

multiview_platform/mono_multi_view_classifiers/utils/execution.py

@@ -151,25 +151,20 @@ def init_log_file(name, views, cl_type, log, debug, label,
     """
     if views is None:
         views=[]
-    noise_string = "/n_"+str(int(noise_std*100))
+    noise_string = "n_"+str(int(noise_std*100))
     if debug:
-        result_directory = result_directory + name + noise_string + \
-                           "/debug_started_" + \
-                           time.strftime(
-                               "%Y_%m_%d-%H_%M_%S") + "_" + label + "/"
+        result_directory = os.path.join(result_directory, name, noise_string,
+                           "debug_started_" + time.strftime("%Y_%m_%d-%H_%M_%S") + "_" + label)
     else:
-        result_directory = result_directory + name + noise_string+ "/started_" + time.strftime(
-            "%Y_%m_%d-%H_%M") + "_" + label + "/"
-    log_file_name = time.strftime("%Y_%m_%d-%H_%M") + "-" + ''.join(
-        cl_type) + "-" + "_".join(
-        views) + "-" + name + "-LOG"
-    if os.path.exists(os.path.dirname(result_directory)):
+        result_directory = os.path.join(result_directory, name,  noise_string,
+                                        "started_" + time.strftime("%Y_%m_%d-%H_%M") + "_" + label)
+    log_file_name = time.strftime("%Y_%m_%d-%H_%M") + "-" + ''.join(cl_type) + "-" + "_".join(views) + "-" + name + "-LOG.log"
+    if os.path.exists(result_directory):
         raise NameError("The result dir already exists, wait 1 min and retry")
-    os.makedirs(os.path.dirname(result_directory + log_file_name))
-    log_file = result_directory + log_file_name
-    log_file += ".log"
+    log_file_path = os.path.join(result_directory, log_file_name)
+    os.makedirs(os.path.dirname(log_file_path))
     logging.basicConfig(format='%(asctime)s %(levelname)s: %(message)s',
-                        filename=log_file, level=logging.DEBUG,
+                        filename=log_file_path, level=logging.DEBUG,
                         filemode='w')
     if log:
         logging.getLogger().addHandler(logging.StreamHandler())

requirements.txt

@@ -15,5 +15,4 @@ m2r==0.2.1
 docutils==0.12
 pyyaml==3.12
 cvxopt==1.2.0
--e git+https://github.com/IvanoLauriola/MKLpy.git#egg=MKLpy
 plotly==4.2.1

setup.py

@@ -55,7 +55,6 @@ def setup_package():
     install_requires=['numpy>=1.16', 'scipy>=0.16','scikit-learn==0.19',
                       'matplotlib', 'h5py', 'joblib',
                       'pandas', 'm2r', 'pyyaml', 'pyscm @ git+https://github.com/aldro61/pyscm',
-                      'MKLpy @ git+https://github.com/IvanoLauriola/MKLpy',
                       'cvxopt', 'plotly==4.2.1'],
 
     # Il est d'usage de mettre quelques metadata à propos de sa lib