From b72c3098c4fa83580d958ee7347e1322b0c529c9 Mon Sep 17 00:00:00 2001
From: AndiMajore <andi.majore@googlemail.com>
Date: Fri, 10 Mar 2023 18:16:49 +0100
Subject: [PATCH] all camis active
---
cami_src/cami_suite.py | 54 +++---
data/tmp/example_run/DIAMOnD/DIAMOnD_out.txt | 18 +-
data/tmp/example_run/ROBUST/ROBUST_out.txt | 185 ++++++++++---------
3 files changed, 130 insertions(+), 127 deletions(-)
diff --git a/cami_src/cami_suite.py b/cami_src/cami_suite.py
index da61d58..a087e11 100644
--- a/cami_src/cami_suite.py
+++ b/cami_src/cami_suite.py
@@ -287,45 +287,45 @@ class cami():
camis = {
'cami_v1': {'function': cami_v1.run_cami, 'params': {'consens_threshold': consens_threshold}},
- # 'cami_v2_param1_tr': {'function': cami_v2.run_cami, 'params': {
- # 'hub_penalty': 0.8, 'damping_factor': 0.5, 'confidence_level': 0.75
- # }},
- # 'cami_v2_param1_bc': {'function': cami_v2.run_cami, 'params': {
- # 'hub_penalty': 0.8, 'damping_factor': 0.5, 'confidence_level': 0.75, 'ranking': 'betweenness'
- # }},
- # 'cami_v2_param1_m': {'function': cami_v2.run_cami, 'params': {
- # 'hub_penalty': 0.8, 'damping_factor': 0.5, 'confidence_level': 0.75, 'ranking': 'must'
- # }},
+ 'cami_v2_param1_tr': {'function': cami_v2.run_cami, 'params': {
+ 'hub_penalty': 0.8, 'damping_factor': 0.5, 'confidence_level': 0.75
+ }},
+ 'cami_v2_param1_bc': {'function': cami_v2.run_cami, 'params': {
+ 'hub_penalty': 0.8, 'damping_factor': 0.5, 'confidence_level': 0.75, 'ranking': 'betweenness'
+ }},
+ 'cami_v2_param1_m': {'function': cami_v2.run_cami, 'params': {
+ 'hub_penalty': 0.8, 'damping_factor': 0.5, 'confidence_level': 0.75, 'ranking': 'must'
+ }},
'cami_v2_param2_tr': {'function': cami_v2.run_cami, 'params': {
'hub_penalty': 0, 'damping_factor': 0.7, 'confidence_level': 0.5
}},
'cami_v2_param2_m': {'function': cami_v2.run_cami, 'params': {
'hub_penalty': 0, 'damping_factor': 0.7, 'ranking': 'must',
}},
- # 'cami_v2_param2_bc': {'function': cami_v2.run_cami, 'params': {
- # 'hub_penalty': 0, 'damping_factor': 0.7, 'confidence_level': 0.5, 'ranking': 'betweenness'
- # }},
- # 'cami_v3_param1_tr': {'function': cami_v3.run_cami, 'params': {
- # 'hub_penalty': 0.8, 'damping_factor': 0.5, 'confidence_level': 0.75
- # }},
- # 'cami_v3_param1_bc': {'function': cami_v3.run_cami, 'params': {
- # 'hub_penalty': 0.8, 'damping_factor': 0.5, 'confidence_level': 0.75, 'ranking': 'betweenness'
- # }},
- # 'cami_v3_param1_m': {'function': cami_v3.run_cami, 'params': {
- # 'hub_penalty': 0.8, 'damping_factor': 0.5, 'confidence_level': 0.75, 'ranking': 'must'
- # }},
+ 'cami_v2_param2_bc': {'function': cami_v2.run_cami, 'params': {
+ 'hub_penalty': 0, 'damping_factor': 0.7, 'confidence_level': 0.5, 'ranking': 'betweenness'
+ }},
+ 'cami_v3_param1_tr': {'function': cami_v3.run_cami, 'params': {
+ 'hub_penalty': 0.8, 'damping_factor': 0.5, 'confidence_level': 0.75
+ }},
+ 'cami_v3_param1_bc': {'function': cami_v3.run_cami, 'params': {
+ 'hub_penalty': 0.8, 'damping_factor': 0.5, 'confidence_level': 0.75, 'ranking': 'betweenness'
+ }},
+ 'cami_v3_param1_m': {'function': cami_v3.run_cami, 'params': {
+ 'hub_penalty': 0.8, 'damping_factor': 0.5, 'confidence_level': 0.75, 'ranking': 'must'
+ }},
'cami_v3_param2_tr': {'function': cami_v3.run_cami, 'params': {
'hub_penalty': 0, 'damping_factor': 0.7, 'confidence_level': 0.5, 'ranking': 'trustrank'
}},
- # 'cami_v3_param2_bc': {'function': cami_v3.run_cami, 'params': {
- # 'hub_penalty': 0, 'damping_factor': 0.7, 'confidence_level': 0.5, 'ranking': 'betweenness'
- # }},
+ 'cami_v3_param2_bc': {'function': cami_v3.run_cami, 'params': {
+ 'hub_penalty': 0, 'damping_factor': 0.7, 'confidence_level': 0.5, 'ranking': 'betweenness'
+ }},
'cami_v3_param2_m': {'function': cami_v3.run_cami, 'params': {
'hub_penalty': 0, 'damping_factor': 0.7, 'confidence_level': 0.5, 'ranking': 'must'
}},
- # 'cami_v3_param3_m': {'function': cami_v3.run_cami, 'params': {
- # 'hub_penalty': 0, 'damping_factor': 0.7, 'confidence_level': 0.5, 'ranking': 'must', 'trees': 15
- # }},
+ 'cami_v3_param3_m': {'function': cami_v3.run_cami, 'params': {
+ 'hub_penalty': 0, 'damping_factor': 0.7, 'confidence_level': 0.5, 'ranking': 'must', 'trees': 15
+ }},
}
for cami_method_name, cami_params in camis.items():
diff --git a/data/tmp/example_run/DIAMOnD/DIAMOnD_out.txt b/data/tmp/example_run/DIAMOnD/DIAMOnD_out.txt
index c437918..b919a4e 100644
--- a/data/tmp/example_run/DIAMOnD/DIAMOnD_out.txt
+++ b/data/tmp/example_run/DIAMOnD/DIAMOnD_out.txt
@@ -5,9 +5,9 @@
4 20662 9.854602493455391e-16
5 4538 1.4901569377288262e-15
6 20753 8.016884001570942e-18
-7 9325 6.263567028730509e-18
+7 4587 6.263567028730509e-18
8 15251 6.190983401441531e-19
-9 4587 2.4259191061742027e-20
+9 9325 2.4259191061742027e-20
10 20642 1.0540752325081272e-18
11 4575 7.503376809979676e-16
12 12502 4.90800391980581e-14
@@ -36,13 +36,13 @@
35 3989 4.929325451244205e-14
36 6685 1.2333649268213917e-11
37 11672 2.4548179875754814e-11
-38 21313 2.6731662685839115e-11
-39 21312 2.851377353156071e-11
-40 21331 3.0383529172974295e-11
-41 21214 3.234375686155525e-11
-42 21321 3.43973287257814e-11
-43 21342 3.6547161771142566e-11
-44 21319 3.8796217880136875e-11
+38 21319 2.6731662685839115e-11
+39 21313 2.851377353156071e-11
+40 21321 3.0383529172974295e-11
+41 21331 3.234375686155525e-11
+42 21342 3.43973287257814e-11
+43 21214 3.6547161771142566e-11
+44 21312 3.8796217880136875e-11
45 9430 1.753322593604545e-10
46 12155 7.726323004315891e-11
47 11350 1.070505090400452e-11
diff --git a/data/tmp/example_run/ROBUST/ROBUST_out.txt b/data/tmp/example_run/ROBUST/ROBUST_out.txt
index eb5cc02..2db5615 100644
--- a/data/tmp/example_run/ROBUST/ROBUST_out.txt
+++ b/data/tmp/example_run/ROBUST/ROBUST_out.txt
@@ -1,106 +1,109 @@
-20659 21366
-20659 20662
-12270 4587
-12270 4153
-12270 25067
-12270 4227
-12270 9325
-12270 6686
-12270 510
-563 21357
-563 9823
-563 21213
-563 8034
-563 4245
-563 6673
-563 14665
-563 9285
-563 14795
-21340 21366
-21340 17216
-21210 21279
-21210 14693
-21210 510
-21210 6686
-21209 17873
-21209 21213
-21209 67
-21209 21279
-20663 20660
-20663 20661
-20663 20662
-21310 15917
-21310 11972
-21310 20662
-21310 4227
-20661 20662
-8907 288
+21341 21328
+21357 563
+20662 20659
+20662 21310
+20662 20663
+20662 20660
+17873 11972
+17873 9238
+17873 431
+17873 9285
+17873 345
+17873 4153
+17873 4227
+17873 6673
+20663 20659
+21279 21210
21279 11972
21279 21328
21279 20023
21279 15917
21279 20787
-4587 11972
-4587 20787
-4587 20023
+14487 16935
+14487 8350
+856 4103
+856 12155
+856 345
+856 9430
+856 67
+856 9751
+21352 9238
+21352 237
+21352 340
+15917 21310
+15917 14665
+15917 6686
+15917 9751
+15917 14795
+15917 510
237 20166
-237 21352
-16935 14487
+12155 11972
+12155 20787
+4103 9369
+4227 12270
+4227 11972
+4227 21310
+4227 21328
+4227 18437
+21209 11972
+21209 67
+21209 21211
16935 16155
-11972 17873
+563 4245
+563 9285
+563 21328
+563 14665
+563 9823
+563 8034
+563 6673
+563 14795
+563 21211
+12270 25067
+12270 9325
+12270 4587
+12270 4153
+12270 510
+12270 6686
+20661 20659
+20023 11972
+20023 510
+20023 4587
+510 18437
+510 21328
+510 21210
+510 20787
+510 21310
+20787 11972
+20787 8034
+20787 25067
+20787 6686
+20787 4587
+8350 21366
+23285 288
11972 18437
+11972 21310
+11972 4245
11972 6907
-11972 9823
-11972 14693
11972 25067
-11972 8034
11972 6686
-11972 9325
11972 25258
-11972 4245
+11972 9325
+11972 14693
+11972 9823
+11972 4587
11972 9430
-11972 4227
-11972 510
-23285 288
-21341 21328
-21328 510
-21328 4227
-20660 21366
-9369 4103
-9369 6907
-14487 8350
-21366 8350
-15917 20787
-15917 14665
-15917 9751
-15917 9325
-15917 14795
-21352 9238
-21352 340
-20023 17873
-20023 510
-288 431
-20787 6686
-20787 8034
-20787 25067
-20166 340
+11972 8034
20166 25545
-4103 856
-431 17873
-9238 17873
-17873 4153
-17873 345
-17873 6673
-17873 4227
-17873 9285
-17873 510
-17873 14795
-16155 17216
-16155 25545
+20166 340
+21210 6686
+21210 14693
+20660 20659
+21340 21366
+21340 17216
+21366 20659
+8907 288
+431 288
+25545 16155
+9369 6907
16155 25258
-340 856
-856 25545
-856 345
-856 9751
-856 67
-856 9430
+16155 17216
--
GitLab