diff --git a/config_files/config.yml b/config_files/config.yml index ffa9ea2e6bb7f09ca423ddc3bad36b7eb5e300a8..eeaa3a6b403d0d1d697781caaf1fa4fe962386e2 100644 --- a/config_files/config.yml +++ b/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 diff --git a/config_files/config_test.yml b/config_files/config_test.yml index a3d3fbc25d98738538e0d1d5b36f46400a71bca4..5633883c9d96d5c4d875338703fe478e6b52b1af 100644 --- a/config_files/config_test.yml +++ b/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] diff --git a/multiview_platform/mono_multi_view_classifiers/utils/execution.py b/multiview_platform/mono_multi_view_classifiers/utils/execution.py index a91684796716772ec25bd11d74505cca8b514bf7..5165cb4f8f9dfa852504da83475689fd1b4a629d 100644 --- a/multiview_platform/mono_multi_view_classifiers/utils/execution.py +++ b/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()) diff --git a/requirements.txt b/requirements.txt index 2db0c7eda8a0cf170f342967ce54b19a7e70ea1d..9802205da58de97cd73721246224142ca250bc89 100755 --- a/requirements.txt +++ b/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 diff --git a/setup.py b/setup.py index 6ce0e776fa03b342229182d40253500f14a4c5ec..885aa563ed0c272941262dd22fa4ef9bd33553f8 100644 --- a/setup.py +++ b/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