edited consensus

cami_src/cami_suite.py

@@ -369,37 +369,58 @@ class cami():
 
         params_tr1 = {'hub_penalty': [0.5],
                      'damping_factor': [0.85],
-                     'confidence_level': [0.35, 0.5],
+                     'confidence_level': [0.2, 0.5],
                      'ranking': ['trustrank'],
                      'function': {'cami_v2': cami_v2.run_cami}}
        
         params_tr2 = {'hub_penalty': [0.5],
-                     'damping_factor': [0.1],
-                     'confidence_level': [0.2],
+                     'damping_factor': [0.85, 0.75],
+                     'confidence_level': [0.2, 0.35],
                      'ranking': ['trustrank'],
                      'function': {'cami_v3': cami_v3.run_cami}
        }
        
         params_tr3 = {'hub_penalty': [0.5],
-                     'damping_factor': [0.1, 0.25, 0.75],
+                     'damping_factor': [0.1, 0.25],
                      'confidence_level': [0.2],
                      'ranking': ['trustrank'],
                      'function': {'cami_v2': cami_v2.run_cami}
        }
         
-        params_tr4 = {'hub_penalty': [0.5],
-                     'damping_factor': [0.85],
-                     'confidence_level': [0.35, 0.5],
-                     'ranking': ['trustrank'],
-                     'function': {'cami_v2': cami_v2.run_cami}
-       }
+    # best for each disease set
+    #     params_tr1 = {'hub_penalty': [0.5],
+    #                  'damping_factor': [0.85],
+    #                  'confidence_level': [0.35, 0.5],
+    #                  'ranking': ['trustrank'],
+    #                  'function': {'cami_v2': cami_v2.run_cami}}
        
-        params_tr5 = {'hub_penalty': [0.5],
-                     'damping_factor': [0.75],
-                     'confidence_level': [0.2, 0.5],
-                     'ranking': ['trustrank'],
-                     'function': {'cami_v3': cami_v3.run_cami}
-       }              
+    #     params_tr2 = {'hub_penalty': [0.5],
+    #                  'damping_factor': [0.1],
+    #                  'confidence_level': [0.2],
+    #                  'ranking': ['trustrank'],
+    #                  'function': {'cami_v3': cami_v3.run_cami}
+    #    }
+       
+    #     params_tr3 = {'hub_penalty': [0.5],
+    #                  'damping_factor': [0.1, 0.25, 0.75],
+    #                  'confidence_level': [0.2],
+    #                  'ranking': ['trustrank'],
+    #                  'function': {'cami_v2': cami_v2.run_cami}
+    #    }
+       
+    #     params_tr4 = {'hub_penalty': [0.5],
+    #                  'damping_factor': [0.85],
+    #                  'confidence_level': [0.35, 0.5],
+    #                  'ranking': ['trustrank'],
+    #                  'function': {'cami_v2': cami_v2.run_cami}
+    #    }
+       
+    #     params_tr5 = {'hub_penalty': [0.5],
+    #                  'damping_factor': [0.75],
+    #                  'confidence_level': [0.2, 0.5],
+    #                  'ranking': ['trustrank'],
+    #                  'function': {'cami_v3': cami_v3.run_cami}
+    #    }              
         
         # params_tr = {'hub_penalty': [0.5], 
         #              'damping_factor': [0.1, 0.25, 0.5, 0.75, 0.85], 
@@ -418,9 +439,9 @@ class cami():
                             generate_param_combinations(params_1)+\
                             generate_param_combinations(params_tr1)+\
                             generate_param_combinations(params_tr2)+\
-                            generate_param_combinations(params_tr3)+\
-                            generate_param_combinations(params_tr4)+\
-                            generate_param_combinations(params_tr5)
+                            generate_param_combinations(params_tr3)#+\
+                           # generate_param_combinations(params_tr4)#+\
+                           # generate_param_combinations(params_tr5)
                            #generate_param_combinations(params_b_m)
         camis = {}
         for setting in cami_setting_list: