diff --git a/cami_src/cami_suite.py b/cami_src/cami_suite.py index c068d96798ff0d4f80122df05b3a3223d36b852e..3d79bad3328d233e93aa915980bad7a219764c82 100644 --- a/cami_src/cami_suite.py +++ b/cami_src/cami_suite.py @@ -18,9 +18,9 @@ def generate_param_combinations(params_dict): params_values = [params_dict[k] for k in params_keys if k != 'function'] function_dict = params_dict['function'] function_names = list(function_dict.keys()) - param_combinations = itertools.product(*params_values) result = [] for function_name, function in function_dict.items(): + param_combinations = itertools.product(*params_values) for combination in param_combinations: param_dict = dict(zip(params_keys[:-1], combination)) params_str = '_'.join([f"{k}_{v}".replace(' ', '') for k, v in param_dict.items()]) @@ -357,9 +357,10 @@ class cami(): params_b_m = {'hub_penalty': [0, 0.25, 0.5, 0.75, 1.0], 'confidence_level': [0.2, 0.35, 0.5, 0.75], 'ranking': ['betweenness', 'harmonic'], - 'function': {'cami_v2': cami_v2.run_cami, + 'function': {'cami_v2': cami_v2.run_cami, 'cami_v3':cami_v3.run_cami}} + c = generate_param_combinations(params_0) cami_setting_list = generate_param_combinations(params_0)+\ generate_param_combinations(params_1)+\ generate_param_combinations(params_tr)+\