Commit 61528ac6 authored by Elias Dohmen's avatar Elias Dohmen 🎓

integrationTest coverage update

parent 12541e9e
......@@ -636,9 +636,33 @@ check_termGain(map< unsigned int,vector<string>> posorder, vector<int> singleDom
termGain_event = 0;
fission_event = 0;
lost_arr_run = true;
events_per_da[actNode->id][posorder[i]][0]--;
for (auto dom = posorder[i].begin(); dom != posorder[i].end(); ++dom) {
#pragma omp atomic
events_per_domain[*dom][0]--;
}
}
} else {
vector<string> lost_doms;
vector<unsigned int> fis_answ = check_fission_termLoss_event(
domainorder, posorder, helperFissions, lost_doms, actNode_data,
parentNode_data, i);
unsigned int fission_pair = fis_answ[2];
++fission_event;
events_per_da[actNode->id][posorder[i]][1]++;
events_per_da[actNode->id][posorder[fission_pair]][1]++;
for (auto dom = posorder[i].begin(); dom != posorder[i].end(); ++dom) {
#pragma omp atomic
events_per_domain[*dom][1]++;
}
for (auto sdom = posorder[fission_pair].begin();
sdom != posorder[fission_pair].end(); ++sdom) {
#pragma omp atomic
events_per_domain[*sdom][1]++;
}
}
}
......
......@@ -67,7 +67,7 @@ A0020 21 30 21 30 PF00023 ATP-synt_C Family 3 46
A0021 1 10 1 10 PF00031 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
A0021 11 20 11 20 PF00032 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
A0021 21 30 21 30 PF00033 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
A0021 31 40 31 40 PF00030 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
A0021 31 40 31 40 PF00040 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
A0022 1 10 1 10 PF00031 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
A0022 11 20 11 20 PF00032 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
A0023 21 30 21 30 PF00033 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
......@@ -70,4 +70,4 @@ B0020 21 30 21 30 PF00023 ATP-synt_C Family 3 46
B0021 1 10 1 10 PF00031 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
B0021 11 20 11 20 PF00032 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
B0021 21 30 21 30 PF00033 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
B0022 31 40 31 40 PF00030 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
B0022 31 40 31 40 PF00040 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
......@@ -64,7 +64,7 @@ C0020 21 30 21 30 PF00023 ATP-synt_C Family 3 46
C0021 1 10 1 10 PF00031 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
C0021 11 20 11 20 PF00032 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
C0021 21 30 21 30 PF00033 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
C0021 31 40 31 40 PF00030 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
C0021 31 40 31 40 PF00040 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
C0022 1 10 1 10 PF00031 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
C0022 11 20 11 20 PF00032 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
C0023 21 30 21 30 PF00033 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
......@@ -48,7 +48,7 @@ D0016 31 40 31 40 PF00023 ATP-synt_C Family 3 46
D0021 1 10 1 10 PF00031 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
D0021 11 20 11 20 PF00032 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
D0021 21 30 21 30 PF00033 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
D0021 31 40 31 40 PF00030 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
D0021 31 40 31 40 PF00040 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
D0022 1 10 1 10 PF00031 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
D0022 11 20 11 20 PF00032 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
D0023 21 30 21 30 PF00033 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
......@@ -57,7 +57,7 @@ E0020 21 30 21 30 PF00023 ATP-synt_C Family 3 46
E0021 1 10 1 10 PF00031 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
E0021 11 20 11 20 PF00032 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
E0021 21 30 21 30 PF00033 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
E0021 31 40 31 40 PF00030 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
E0021 31 40 31 40 PF00040 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
E0022 1 10 1 10 PF00031 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
E0022 11 20 11 20 PF00032 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
E0023 21 30 21 30 PF00033 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
......@@ -56,7 +56,7 @@ OG0020 21 30 21 30 PF00023 ATP-synt_C Family 3 4
OG0021 1 10 1 10 PF00031 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
OG0021 11 20 11 20 PF00032 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
OG0021 21 30 21 30 PF00033 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
OG0021 31 40 31 40 PF00030 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
OG0021 31 40 31 40 PF00040 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
OG0022 1 10 1 10 PF00031 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
OG0022 11 20 11 20 PF00032 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
OG0023 21 30 21 30 PF00033 ATP-synt_C Family 3 46 63 26.4 5.3e-06 1 No_clan
......@@ -36,7 +36,7 @@ PF00020 1 0 0 0 0 0 14
PF00021 1 0 0 0 0 0 14
PF00022 1 0 0 0 0 0 14
PF00023 1 0 0 0 0 0 14
PF00030 0 1 0 0 0 0 7
PF00031 0 1 0 0 0 0 14
PF00032 0 1 0 0 0 0 14
PF00033 0 1 0 0 0 0 14
PF00040 0 1 0 0 0 0 7
......@@ -12,7 +12,7 @@
2 PF00021 PF00022 PF00023 0 0 0 0 0 0 1
2 PF00022 PF00023 0 0 0 0 0 0 1
2 PF00031 PF00032 0 0 0 0 0 0 1
2 PF00031 PF00032 PF00033 PF00030 0 0 0 0 0 0 1
2 PF00031 PF00032 PF00033 PF00040 0 0 0 0 0 0 1
2 PF00033 0 0 0 0 0 0 1
3 PF00001 0 0 0 0 0 0 1
3 PF00006 PF00007 PF00008 0 0 2 0 0 0 0
......@@ -28,7 +28,7 @@
3 PF00021 PF00022 PF00023 0 0 0 0 0 0 1
3 PF00022 PF00023 0 0 0 0 0 0 1
3 PF00031 PF00032 0 0 0 0 0 0 1
3 PF00031 PF00032 PF00033 PF00030 0 0 0 0 0 0 1
3 PF00031 PF00032 PF00033 PF00040 0 0 0 0 0 0 1
3 PF00033 0 0 0 0 0 0 1
4 PF00001 0 0 0 0 0 0 1
4 PF00006 PF00007 PF00008 PF00009 PF00010 0 0 0 0 0 0 1
......@@ -41,7 +41,7 @@
4 PF00021 PF00022 PF00023 0 0 0 0 0 0 1
4 PF00022 PF00023 0 0 0 0 0 0 1
4 PF00031 PF00032 0 0 0 0 0 0 1
4 PF00031 PF00032 PF00033 PF00030 0 0 0 0 0 0 1
4 PF00031 PF00032 PF00033 PF00040 0 0 0 0 0 0 1
4 PF00033 0 0 0 0 0 0 1
5 PF00001 0 0 0 0 0 0 1
5 PF00001 PF00004 0 0 0 1 0 0 0
......@@ -59,7 +59,7 @@
5 PF00021 PF00022 PF00023 0 0 0 0 0 0 1
5 PF00022 PF00023 0 0 0 0 0 0 1
5 PF00031 PF00032 0 0 0 0 0 0 1
5 PF00031 PF00032 PF00033 PF00030 0 0 0 0 0 0 1
5 PF00031 PF00032 PF00033 PF00040 0 0 0 0 0 0 1
5 PF00033 0 0 0 0 0 0 1
6 PF00001 0 0 0 0 0 0 1
6 PF00001 PF00011 PF00012 1 0 0 0 0 0 0
......@@ -77,8 +77,8 @@
6 PF00020 PF00021 0 0 0 0 0 0 1
6 PF00021 PF00022 PF00023 0 0 0 0 0 0 1
6 PF00022 PF00023 0 0 0 0 0 0 1
6 PF00030 0 1 0 0 0 0 0
6 PF00031 PF00032 PF00033 0 1 0 0 0 0 0
6 PF00040 0 1 0 0 0 0 0
7 PF00001 0 0 0 0 0 0 1
7 PF00003 0 0 0 0 0 0 1
7 PF00006 PF00007 PF00008 PF00009 PF00010 0 0 0 0 0 0 1
......@@ -91,7 +91,7 @@
7 PF00021 PF00022 PF00023 0 0 0 0 0 0 1
7 PF00022 PF00023 0 0 0 0 0 0 1
7 PF00031 PF00032 0 0 0 0 0 0 1
7 PF00031 PF00032 PF00033 PF00030 0 0 0 0 0 0 1
7 PF00031 PF00032 PF00033 PF00040 0 0 0 0 0 0 1
7 PF00033 0 0 0 0 0 0 1
8 PF00001 0 0 0 0 0 0 1
8 PF00003 0 0 0 0 0 0 1
......@@ -100,7 +100,7 @@
8 PF00016 PF00017 PF00018 1 0 1 0 0 0 0
8 PF00020 PF00021 PF00022 PF00023 1 0 0 0 0 0 0
8 PF00031 PF00032 0 0 0 0 0 0 1
8 PF00031 PF00032 PF00033 PF00030 0 0 0 0 0 0 1
8 PF00031 PF00032 PF00033 PF00040 0 0 0 0 0 0 1
8 PF00033 0 0 0 0 0 0 1
9 PF00001 0 0 0 0 0 0 1
9 PF00002 0 0 0 0 0 1 0
......@@ -116,7 +116,7 @@
9 PF00021 PF00022 PF00023 0 0 0 0 0 0 1
9 PF00022 PF00023 0 0 0 0 0 0 1
9 PF00031 PF00032 0 0 0 0 0 0 1
9 PF00031 PF00032 PF00033 PF00030 0 0 0 0 0 0 1
9 PF00031 PF00032 PF00033 PF00040 0 0 0 0 0 0 1
9 PF00033 0 0 0 0 0 0 1
# Complex solutions:
4 PF00011 PF00012 0 0 0 0 0 0 0
......
......@@ -36,10 +36,10 @@ PF00020 1 0 0 0 0 0 14
PF00021 1 0 0 0 0 0 14
PF00022 1 0 0 0 0 0 14
PF00023 1 0 0 0 0 0 14
PF00030 0 1 0 0 0 0 7
PF00031 0 1 0 0 0 0 14
PF00032 0 1 0 0 0 0 14
PF00033 0 1 0 0 0 0 14
PF00040 0 1 0 0 0 0 7
# Number of events per domain arrangement for last common ancestor between A:B.
# Domain arrangement #Fusions #Fissions #TerminalLosses #TerminalEmergences #SingleDomainLosses #SingleDomainEmergences #Identities
PF00001 0 0 0 0 0 0 1
......@@ -53,5 +53,5 @@ PF00020 PF00021 0 0 0 0 0 0 1
PF00021 PF00022 PF00023 0 0 0 0 0 0 1
PF00022 PF00023 0 0 0 0 0 0 1
PF00031 PF00032 0 0 0 0 0 0 1
PF00031 PF00032 PF00033 PF00030 0 0 0 0 0 0 1
PF00031 PF00032 PF00033 PF00040 0 0 0 0 0 0 1
PF00033 0 0 0 0 0 0 1
......@@ -12,7 +12,7 @@
2 PF00021 PF00022 PF00023 0 0 0 0 0 0 1
2 PF00022 PF00023 0 0 0 0 0 0 1
2 PF00031 PF00032 0 0 0 0 0 0 1
2 PF00031 PF00032 PF00033 PF00030 0 0 0 0 0 0 1
2 PF00031 PF00032 PF00033 PF00040 0 0 0 0 0 0 1
2 PF00033 0 0 0 0 0 0 1
3 PF00001 0 0 0 0 0 0 1
3 PF00006 PF00007 PF00008 0 0 2 0 0 0 0
......@@ -28,7 +28,7 @@
3 PF00021 PF00022 PF00023 0 0 0 0 0 0 1
3 PF00022 PF00023 0 0 0 0 0 0 1
3 PF00031 PF00032 0 0 0 0 0 0 1
3 PF00031 PF00032 PF00033 PF00030 0 0 0 0 0 0 1
3 PF00031 PF00032 PF00033 PF00040 0 0 0 0 0 0 1
3 PF00033 0 0 0 0 0 0 1
4 PF00001 0 0 0 0 0 0 1
4 PF00006 PF00007 PF00008 PF00009 PF00010 0 0 0 0 0 0 1
......@@ -41,7 +41,7 @@
4 PF00021 PF00022 PF00023 0 0 0 0 0 0 1
4 PF00022 PF00023 0 0 0 0 0 0 1
4 PF00031 PF00032 0 0 0 0 0 0 1
4 PF00031 PF00032 PF00033 PF00030 0 0 0 0 0 0 1
4 PF00031 PF00032 PF00033 PF00040 0 0 0 0 0 0 1
4 PF00033 0 0 0 0 0 0 1
5 PF00001 0 0 0 0 0 0 1
5 PF00001 PF00004 0 0 0 1 0 0 0
......@@ -59,7 +59,7 @@
5 PF00021 PF00022 PF00023 0 0 0 0 0 0 1
5 PF00022 PF00023 0 0 0 0 0 0 1
5 PF00031 PF00032 0 0 0 0 0 0 1
5 PF00031 PF00032 PF00033 PF00030 0 0 0 0 0 0 1
5 PF00031 PF00032 PF00033 PF00040 0 0 0 0 0 0 1
5 PF00033 0 0 0 0 0 0 1
6 PF00001 0 0 0 0 0 0 1
6 PF00001 PF00011 PF00012 1 0 0 0 0 0 0
......@@ -77,8 +77,8 @@
6 PF00020 PF00021 0 0 0 0 0 0 1
6 PF00021 PF00022 PF00023 0 0 0 0 0 0 1
6 PF00022 PF00023 0 0 0 0 0 0 1
6 PF00030 0 1 0 0 0 0 0
6 PF00031 PF00032 PF00033 0 1 0 0 0 0 0
6 PF00040 0 1 0 0 0 0 0
7 PF00001 0 0 0 0 0 0 1
7 PF00003 0 0 0 0 0 0 1
7 PF00006 PF00007 PF00008 PF00009 PF00010 0 0 0 0 0 0 1
......@@ -91,7 +91,7 @@
7 PF00021 PF00022 PF00023 0 0 0 0 0 0 1
7 PF00022 PF00023 0 0 0 0 0 0 1
7 PF00031 PF00032 0 0 0 0 0 0 1
7 PF00031 PF00032 PF00033 PF00030 0 0 0 0 0 0 1
7 PF00031 PF00032 PF00033 PF00040 0 0 0 0 0 0 1
7 PF00033 0 0 0 0 0 0 1
8 PF00001 0 0 0 0 0 0 1
8 PF00003 0 0 0 0 0 0 1
......@@ -100,7 +100,7 @@
8 PF00016 PF00017 PF00018 1 0 1 0 0 0 0
8 PF00020 PF00021 PF00022 PF00023 1 0 0 0 0 0 0
8 PF00031 PF00032 0 0 0 0 0 0 1
8 PF00031 PF00032 PF00033 PF00030 0 0 0 0 0 0 1
8 PF00031 PF00032 PF00033 PF00040 0 0 0 0 0 0 1
8 PF00033 0 0 0 0 0 0 1
9 PF00001 0 0 0 0 0 0 1
9 PF00002 0 0 0 0 0 1 0
......@@ -116,7 +116,7 @@
9 PF00021 PF00022 PF00023 0 0 0 0 0 0 1
9 PF00022 PF00023 0 0 0 0 0 0 1
9 PF00031 PF00032 0 0 0 0 0 0 1
9 PF00031 PF00032 PF00033 PF00030 0 0 0 0 0 0 1
9 PF00031 PF00032 PF00033 PF00040 0 0 0 0 0 0 1
9 PF00033 0 0 0 0 0 0 1
# Complex solutions:
4 PF00011 PF00012 0 0 0 0 0 0 0
......
......@@ -36,7 +36,7 @@ PF00020 1 0 0 0 0 0
PF00021 1 0 0 0 0 0
PF00022 1 0 0 0 0 0
PF00023 1 0 0 0 0 0
PF00030 0 1 0 0 0 0
PF00031 0 1 0 0 0 0
PF00032 0 1 0 0 0 0
PF00033 0 1 0 0 0 0
PF00040 0 1 0 0 0 0
......@@ -13,8 +13,8 @@
6 PF00005 PF00001 0 0 0 1 0 0
6 PF00006 PF00007 0 0 3 0 0 0
6 PF00011 PF00012 PF00001 1 0 0 0 0 0
6 PF00030 0 1 0 0 0 0
6 PF00031 PF00032 PF00033 0 1 0 0 0 0
6 PF00040 0 1 0 0 0 0
8 PF00016 PF00017 PF00018 1 0 1 0 0 0
8 PF00020 PF00021 PF00022 PF00023 1 0 0 0 0 0
9 PF00002 0 0 0 0 0 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment