Skip to content

Commit

Permalink
Service part II: service computation (#42)
Browse files Browse the repository at this point in the history 
* Add Service in input

* Updated service paths namefile in output

* Add service calculation

* Update output files for service computation

* Update input/output tests for service computation
  • Loading branch information
@martinateruzzi
martinateruzzi committed Nov 23, 2020
1 parent aa8f7a9 commit c649af8
Show file tree
Hide file tree
Showing 9 changed files with 404 additions and 132 deletions.
60 changes: 30 additions & 30 deletions examples/Area_perturbation/input_file/TOY_graph.csv
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
,"Mark","Father_cond","Father_mark","Area","PerturbationResistant","InitStatus","Description","Type","Service"
,"1","ORPHAN","NULL","area1","0",,,"SOURCE",0.0
,"2","SINGLE","1","area1","1","1","isolation_A","HUB",1.0
,"3","SINGLE","1","area1","1","1","isolation_A","HUB",1.0
,"4","SINGLE","2","area1","1",,,"HUB",1.0
,"5","SINGLE","3","area1","1",,,"HUB",1.0
,"6","SINGLE","4","area4","0",,,"HUB",1.0
,"6","SINGLE","7","area4","0",,,"HUB",1.0
,"7","SINGLE","6","area4","0",,,"HUB",1.0
,"8","SINGLE","6","area4","0",,,"HUB",1.0
,"6","SINGLE","8","area4","0",,,"HUB",1.0
,"9","OR","8","area3","0",,,"HUB",1.0
,"9","OR","15","area3","0",,,"HUB",1.0
,"15","ORPHAN","NULL","area3","0",,,"SOURCE",1.0
,"16","SINGLE","9","area3","0",,,"HUB",1.0
,"16","SINGLE","17","area3","0",,,"HUB",1.0
,"17","SINGLE","16","area3","0",,,"HUB",1.0
,"10","SINGLE","17","area3","0",,,"HUB",1.0
,"11","AND","10","area2","0",,,"HUB",1.0
,"11","AND","5","area2","0",,,"HUB",1.0
,"19","SINGLE","11","area2","0",,,"HUB",1.0
,"19","SINGLE","12","area2","0",,,"HUB",1.0
,"19","SINGLE","14","area2","0",,,"HUB",1.0
,"12","SINGLE","19","area2","0",,,"HUB",1.0
,"12","SINGLE","13","area2","0",,,"HUB",1.0
,"13","SINGLE","14","area2","0",,,"HUB",1.0
,"13","SINGLE","12","area2","0",,,"HUB",1.0
,"14","SINGLE","19","area2","0",,,"HUB",1.0
,"14","SINGLE","13","area2","0",,,"HUB",1.0
,"18","SINGLE","14","area2","0",,,"USER",1.0
,"Mark","Father_cond","Father_mark","Area","PerturbationResistant","InitStatus","Description","Type","Weight","Service"
,"1","ORPHAN","NULL","area1","0",,,"SOURCE",1.0,1.0
,"2","SINGLE","1","area1","1","1","isolation_A","HUB",1.0,0.0
,"3","SINGLE","1","area1","1","1","isolation_A","HUB",1.0,0.0
,"4","SINGLE","2","area1","1",,,"HUB",1.0,0.0
,"5","SINGLE","3","area1","1",,,"HUB",1.0,0.0
,"6","SINGLE","4","area4","0",,,"HUB",1.0,0.0
,"6","SINGLE","7","area4","0",,,"HUB",1.0,0.0
,"7","SINGLE","6","area4","0",,,"HUB",1.0,0.0
,"8","SINGLE","6","area4","0",,,"HUB",1.0,0.0
,"6","SINGLE","8","area4","0",,,"HUB",1.0,0.0
,"9","OR","8","area3","0",,,"HUB",1.0,0.0
,"9","OR","15","area3","0",,,"HUB",1.0,0.0
,"15","ORPHAN","NULL","area3","0",,,"SOURCE",1.0,2.0
,"16","SINGLE","9","area3","0",,,"HUB",1.0,0.0
,"16","SINGLE","17","area3","0",,,"HUB",1.0,0.0
,"17","SINGLE","16","area3","0",,,"HUB",1.0,0.0
,"10","SINGLE","17","area3","0",,,"HUB",1.0,0.0
,"11","AND","10","area2","0",,,"HUB",1.0,0.0
,"11","AND","5","area2","0",,,"HUB",1.0,0.0
,"19","SINGLE","11","area2","0",,,"HUB",1.0,0.0
,"19","SINGLE","12","area2","0",,,"HUB",1.0,0.0
,"19","SINGLE","14","area2","0",,,"HUB",1.0,0.0
,"12","SINGLE","19","area2","0",,,"HUB",1.0,0.0
,"12","SINGLE","13","area2","0",,,"HUB",1.0,0.0
,"13","SINGLE","14","area2","0",,,"HUB",1.0,0.0
,"13","SINGLE","12","area2","0",,,"HUB",1.0,0.0
,"14","SINGLE","19","area2","0",,,"HUB",1.0,0.0
,"14","SINGLE","13","area2","0",,,"HUB",1.0,0.0
,"18","SINGLE","14","area2","0",,,"USER",1.0,0.0
40 changes: 20 additions & 20 deletions examples/Area_perturbation/output_files/area_perturbation.csv
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
Mark,Description,InitStatus,IntermediateStatus,FinalStatus,Mark_Status,PerturbationResistant,Area,Status_Area,closeness_centrality,betweenness_centrality,indegree_centrality,original_local_eff,final_local_eff,original_global_eff,final_global_eff,original_avg_global_eff,final_avg_global_eff
1,,, , ,NOT_ACTIVE,0,area1,DAMAGED,0,0.0,0,0.17437369729036395, ,0.3213624338624339, ,0.17591917504198207,0.16783899399640143
2,isolation_A,1, , ,ACTIVE,1,area1,DAMAGED,0.05555555555555555,0.05161290322580645,0.05555555555555555,0.20222663139329808,0.21412231559290384,0.19689554272887605,0.20847763347763348,0.17591917504198207,0.16783899399640143
3,isolation_A,1, , ,ACTIVE,1,area1,DAMAGED,0.05555555555555555,0.04516129032258064,0.05555555555555555,0.14814814814814814,0.1568627450980392,0.15185185185185185,0.1607843137254902,0.17591917504198207,0.16783899399640143
4,,, , ,ACTIVE,1,area1,DAMAGED,0.07407407407407407,0.12903225806451613,0.05555555555555555,0.22583774250440916,0.2391223155929038,0.20222663139329808,0.21412231559290384,0.17591917504198207,0.16783899399640143
5,,, , ,ACTIVE,1,area1,DAMAGED,0.07407407407407407,0.07741935483870968,0.05555555555555555,0.14814814814814817,0.15686274509803924,0.14814814814814814,0.1568627450980392,0.17591917504198207,0.16783899399640143
6,,, , ,ACTIVE,0,area4,AVAILABLE,0.1736111111111111,0.2709677419354839,0.16666666666666666,0.21182760141093476,0.22428804855275447,0.22583774250440916,0.2391223155929038,0.17591917504198207,0.16783899399640143
7,,, , ,ACTIVE,0,area4,AVAILABLE,0.11574074074074076,0.0,0.05555555555555555,0.22583774250440916,0.2391223155929038,0.1744488536155203,0.18471055088702149,0.17591917504198207,0.16783899399640143
8,,, , ,ACTIVE,0,area4,AVAILABLE,0.11574074074074076,0.2838709677419355,0.05555555555555555,0.1935405643738977,0.2049253034547152,0.24920634920634926,0.26386554621848746,0.17591917504198207,0.16783899399640143
9,,, , ,ACTIVE,0,area3,AVAILABLE,0.14327485380116958,0.36774193548387096,0.1111111111111111,0.15648148148148147,0.16568627450980392,0.16124338624338622,0.1707282913165266,0.17591917504198207,0.16783899399640143
15,,, , ,ACTIVE,0,area3,AVAILABLE,0,0.0,0,0.16124338624338622,0.1707282913165266,0.16587301587301584,0.17563025210084032,0.17591917504198207,0.16783899399640143
16,,, , ,ACTIVE,0,area3,AVAILABLE,0.16071428571428573,0.3741935483870968,0.1111111111111111,0.20740740740740743,0.21960784313725493,0.15648148148148147,0.16568627450980392,0.17591917504198207,0.16783899399640143
17,,, , ,ACTIVE,0,area3,AVAILABLE,0.125,0.36774193548387096,0.05555555555555555,0.1523148148148148,0.16127450980392155,0.20740740740740743,0.21960784313725493,0.17591917504198207,0.16783899399640143
10,,, , ,ACTIVE,0,area3,AVAILABLE,0.12077294685990338,0.34838709677419355,0.05555555555555555,0.14814814814814817,0.15686274509803924,0.14814814814814814,0.1568627450980392,0.17591917504198207,0.16783899399640143
11,,, , ,ACTIVE,0,area2,AVAILABLE,0.17386831275720163,0.41935483870967744,0.1111111111111111,0.16666666666666666,0.17647058823529413,0.14814814814814817,0.15686274509803924,0.17591917504198207,0.16783899399640143
19,,, , ,ACTIVE,0,area2,AVAILABLE,0.22299382716049382,0.38064516129032255,0.16666666666666666,0.17592592592592593,0.18627450980392157,0.16666666666666666,0.17647058823529413,0.17591917504198207,0.16783899399640143
12,,, , ,ACTIVE,0,area2,AVAILABLE,0.1866925064599483,0.1032258064516129,0.1111111111111111,0.16666666666666666,0.17647058823529413,0.1574074074074074,0.16666666666666669,0.17591917504198207,0.16783899399640143
14,,, , ,ACTIVE,0,area2,AVAILABLE,0.1866925064599483,0.10967741935483871,0.1111111111111111,0.1111111111111111,0.11764705882352942,0.19444444444444445,0.20588235294117646,0.17591917504198207,0.16783899399640143
13,,, , ,ACTIVE,0,area2,AVAILABLE,0.16055555555555556,0.0,0.1111111111111111,0.17592592592592593,0.18627450980392157,0.16666666666666666,0.17647058823529413,0.17591917504198207,0.16783899399640143
18,,, , ,ACTIVE,0,area2,AVAILABLE,0.17307692307692307,0.0,0.05555555555555555,0,0,0.0,0.0,0.17591917504198207,0.16783899399640143
Mark,Description,InitStatus,IntermediateStatus,FinalStatus,Mark_Status,PerturbationResistant,Area,Status_Area,closeness_centrality,betweenness_centrality,indegree_centrality,original_local_eff,final_local_eff,original_global_eff,final_global_eff,original_avg_global_eff,final_avg_global_eff,original_service,residual_service
1,,, , ,NOT_ACTIVE,0,area1,DAMAGED,0,0.0,0,0.17437369729036395, ,0.3213624338624339, ,0.17591917504198207,0.16783899399640143,1.0,0.0
2,isolation_A,1, , ,ACTIVE,1,area1,DAMAGED,0.05555555555555555,0.05161290322580645,0.05555555555555555,0.20222663139329808,0.21412231559290384,0.19689554272887605,0.20847763347763348,0.17591917504198207,0.16783899399640143,0.0,0.0
3,isolation_A,1, , ,ACTIVE,1,area1,DAMAGED,0.05555555555555555,0.04516129032258064,0.05555555555555555,0.14814814814814814,0.1568627450980392,0.15185185185185185,0.1607843137254902,0.17591917504198207,0.16783899399640143,1.0,0.0
4,,, , ,ACTIVE,1,area1,DAMAGED,0.07407407407407407,0.12903225806451613,0.05555555555555555,0.22583774250440916,0.2391223155929038,0.20222663139329808,0.21412231559290384,0.17591917504198207,0.16783899399640143,0.0,0.0
5,,, , ,ACTIVE,1,area1,DAMAGED,0.07407407407407407,0.07741935483870968,0.05555555555555555,0.14814814814814817,0.15686274509803924,0.14814814814814814,0.1568627450980392,0.17591917504198207,0.16783899399640143,1.0,0.0
6,,, , ,ACTIVE,0,area4,AVAILABLE,0.1736111111111111,0.2709677419354839,0.16666666666666666,0.21182760141093476,0.22428804855275447,0.22583774250440916,0.2391223155929038,0.17591917504198207,0.16783899399640143,0.0,0.0
7,,, , ,ACTIVE,0,area4,AVAILABLE,0.11574074074074076,0.0,0.05555555555555555,0.22583774250440916,0.2391223155929038,0.1744488536155203,0.18471055088702149,0.17591917504198207,0.16783899399640143,0.0,0.0
8,,, , ,ACTIVE,0,area4,AVAILABLE,0.11574074074074076,0.2838709677419355,0.05555555555555555,0.1935405643738977,0.2049253034547152,0.24920634920634926,0.26386554621848746,0.17591917504198207,0.16783899399640143,0.0,0.0
9,,, , ,ACTIVE,0,area3,AVAILABLE,0.14327485380116958,0.36774193548387096,0.1111111111111111,0.15648148148148147,0.16568627450980392,0.16124338624338622,0.1707282913165266,0.17591917504198207,0.16783899399640143,2.0,2.0
15,,, , ,ACTIVE,0,area3,AVAILABLE,0,0.0,0,0.16124338624338622,0.1707282913165266,0.16587301587301584,0.17563025210084032,0.17591917504198207,0.16783899399640143,2.0,2.0
16,,, , ,ACTIVE,0,area3,AVAILABLE,0.16071428571428573,0.3741935483870968,0.1111111111111111,0.20740740740740743,0.21960784313725493,0.15648148148148147,0.16568627450980392,0.17591917504198207,0.16783899399640143,2.0,2.0
17,,, , ,ACTIVE,0,area3,AVAILABLE,0.125,0.36774193548387096,0.05555555555555555,0.1523148148148148,0.16127450980392155,0.20740740740740743,0.21960784313725493,0.17591917504198207,0.16783899399640143,2.0,2.0
10,,, , ,ACTIVE,0,area3,AVAILABLE,0.12077294685990338,0.34838709677419355,0.05555555555555555,0.14814814814814817,0.15686274509803924,0.14814814814814814,0.1568627450980392,0.17591917504198207,0.16783899399640143,2.0,2.0
11,,, , ,ACTIVE,0,area2,AVAILABLE,0.17386831275720163,0.41935483870967744,0.1111111111111111,0.16666666666666666,0.17647058823529413,0.14814814814814817,0.15686274509803924,0.17591917504198207,0.16783899399640143,3.0,2.0
19,,, , ,ACTIVE,0,area2,AVAILABLE,0.22299382716049382,0.38064516129032255,0.16666666666666666,0.17592592592592593,0.18627450980392157,0.16666666666666666,0.17647058823529413,0.17591917504198207,0.16783899399640143,3.0,2.0
12,,, , ,ACTIVE,0,area2,AVAILABLE,0.1866925064599483,0.1032258064516129,0.1111111111111111,0.16666666666666666,0.17647058823529413,0.1574074074074074,0.16666666666666669,0.17591917504198207,0.16783899399640143,0.0,0.0
14,,, , ,ACTIVE,0,area2,AVAILABLE,0.1866925064599483,0.10967741935483871,0.1111111111111111,0.1111111111111111,0.11764705882352942,0.19444444444444445,0.20588235294117646,0.17591917504198207,0.16783899399640143,3.0,2.0
13,,, , ,ACTIVE,0,area2,AVAILABLE,0.16055555555555556,0.0,0.1111111111111111,0.17592592592592593,0.18627450980392157,0.16666666666666666,0.17647058823529413,0.17591917504198207,0.16783899399640143,0.0,0.0
18,,, , ,ACTIVE,0,area2,AVAILABLE,0.17307692307692307,0.0,0.05555555555555555,0,0,0.0,0.0,0.17591917504198207,0.16783899399640143,3.0,2.0
0 ...service_paths_multi_area_perturbation.csv → ...files/service_paths_area_perturbation.csv
View file
File renamed without changes.
60 changes: 30 additions & 30 deletions examples/Element_perturbation/input_file/TOY_graph.csv
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
,"Mark","Father_cond","Father_mark","Area","PerturbationResistant","InitStatus","Description","Type","Service"
,"1","ORPHAN","NULL","area1","0",,,"SOURCE",0.0
,"2","SINGLE","1","area1","1","1","isolation_A","HUB",1.0
,"3","SINGLE","1","area1","1","1","isolation_A","HUB",1.0
,"4","SINGLE","2","area1","1",,,"HUB",1.0
,"5","SINGLE","3","area1","1",,,"HUB",1.0
,"6","SINGLE","4","area4","0",,,"HUB",1.0
,"6","SINGLE","7","area4","0",,,"HUB",1.0
,"7","SINGLE","6","area4","0",,,"HUB",1.0
,"8","SINGLE","6","area4","0",,,"HUB",1.0
,"6","SINGLE","8","area4","0",,,"HUB",1.0
,"9","OR","8","area3","0",,,"HUB",1.0
,"9","OR","15","area3","0",,,"HUB",1.0
,"15","ORPHAN","NULL","area3","0",,,"SOURCE",1.0
,"16","SINGLE","9","area3","0",,,"HUB",1.0
,"16","SINGLE","17","area3","0",,,"HUB",1.0
,"17","SINGLE","16","area3","0",,,"HUB",1.0
,"10","SINGLE","17","area3","0",,,"HUB",1.0
,"11","AND","10","area2","0",,,"HUB",1.0
,"11","AND","5","area2","0",,,"HUB",1.0
,"19","SINGLE","11","area2","0",,,"HUB",1.0
,"19","SINGLE","12","area2","0",,,"HUB",1.0
,"19","SINGLE","14","area2","0",,,"HUB",1.0
,"12","SINGLE","19","area2","0",,,"HUB",1.0
,"12","SINGLE","13","area2","0",,,"HUB",1.0
,"13","SINGLE","14","area2","0",,,"HUB",1.0
,"13","SINGLE","12","area2","0",,,"HUB",1.0
,"14","SINGLE","19","area2","0",,,"HUB",1.0
,"14","SINGLE","13","area2","0",,,"HUB",1.0
,"18","SINGLE","14","area2","0",,,"USER",1.0
,"Mark","Father_cond","Father_mark","Area","PerturbationResistant","InitStatus","Description","Type","Weight","Service"
,"1","ORPHAN","NULL","area1","0",,,"SOURCE",1.0,1.0
,"2","SINGLE","1","area1","1","1","isolation_A","HUB",1.0,0.0
,"3","SINGLE","1","area1","1","1","isolation_A","HUB",1.0,0.0
,"4","SINGLE","2","area1","1",,,"HUB",1.0,0.0
,"5","SINGLE","3","area1","1",,,"HUB",1.0,0.0
,"6","SINGLE","4","area4","0",,,"HUB",1.0,0.0
,"6","SINGLE","7","area4","0",,,"HUB",1.0,0.0
,"7","SINGLE","6","area4","0",,,"HUB",1.0,0.0
,"8","SINGLE","6","area4","0",,,"HUB",1.0,0.0
,"6","SINGLE","8","area4","0",,,"HUB",1.0,0.0
,"9","OR","8","area3","0",,,"HUB",1.0,0.0
,"9","OR","15","area3","0",,,"HUB",1.0,0.0
,"15","ORPHAN","NULL","area3","0",,,"SOURCE",1.0,2.0
,"16","SINGLE","9","area3","0",,,"HUB",1.0,0.0
,"16","SINGLE","17","area3","0",,,"HUB",1.0,0.0
,"17","SINGLE","16","area3","0",,,"HUB",1.0,0.0
,"10","SINGLE","17","area3","0",,,"HUB",1.0,0.0
,"11","AND","10","area2","0",,,"HUB",1.0,0.0
,"11","AND","5","area2","0",,,"HUB",1.0,0.0
,"19","SINGLE","11","area2","0",,,"HUB",1.0,0.0
,"19","SINGLE","12","area2","0",,,"HUB",1.0,0.0
,"19","SINGLE","14","area2","0",,,"HUB",1.0,0.0
,"12","SINGLE","19","area2","0",,,"HUB",1.0,0.0
,"12","SINGLE","13","area2","0",,,"HUB",1.0,0.0
,"13","SINGLE","14","area2","0",,,"HUB",1.0,0.0
,"13","SINGLE","12","area2","0",,,"HUB",1.0,0.0
,"14","SINGLE","19","area2","0",,,"HUB",1.0,0.0
,"14","SINGLE","13","area2","0",,,"HUB",1.0,0.0
,"18","SINGLE","14","area2","0",,,"USER",1.0,0.0

0 comments on commit c649af8

Please sign in to comment.