aboutsummaryrefslogtreecommitdiffstats
path: root/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs
diff options
context:
space:
mode:
Diffstat (limited to 'Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs')
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/10_1.xmi103
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/1_1.xmi103
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/2_1.xmi103
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/3_1.xmi103
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/4_1.xmi103
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/5_1.xmi103
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/6_1.xmi103
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/7_1.xmi103
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/8_1.xmi103
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/9_1.xmi103
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/10_1.xmi103
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/1_1.xmi103
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/2_1.xmi103
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/3_1.xmi103
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/4_1.xmi103
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/5_1.xmi103
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/6_1.xmi103
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/7_1.xmi103
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/8_1.xmi103
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/9_1.xmi103
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/10_1.xmi135
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/1_1.xmi131
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/2_1.xmi129
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/3_1.xmi131
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/4_1.xmi131
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/5_1.xmi129
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/6_1.xmi129
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/7_1.xmi129
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/8_1.xmi129
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/9_1.xmi132
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/10_1.xmi135
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/1_1.xmi137
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/2_1.xmi131
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/3_1.xmi134
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/4_1.xmi137
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/5_1.xmi141
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/6_1.xmi134
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/7_1.xmi131
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/8_1.xmi134
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/9_1.xmi137
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/10_1.xmi118
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/1_1.xmi118
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/2_1.xmi119
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/3_1.xmi118
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/4_1.xmi118
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/5_1.xmi118
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/6_1.xmi124
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/7_1.xmi119
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/8_1.xmi118
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/9_1.xmi118
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/10_1.xmi105
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/1_1.xmi105
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/2_1.xmi105
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/3_1.xmi111
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/4_1.xmi105
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/5_1.xmi105
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/6_1.xmi105
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/7_1.xmi112
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/8_1.xmi105
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/9_1.xmi105
-rw-r--r--Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/diversity.csv60
61 files changed, 7027 insertions, 0 deletions
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/10_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/10_1.xmi
new file mode 100644
index 00000000..cd445da5
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/10_1.xmi
@@ -0,0 +1,103 @@
1<?xml version="1.0" encoding="ASCII"?>
2<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree ../case.study.familyTree.model/model/familytree.ecore">
3 <members parents="//@members.3 //@members.13"/>
4 <members parents="//@members.60 //@members.86"/>
5 <members age="39" children="//@members.73" parents="//@members.29 //@members.61"/>
6 <members age="39" children="//@members.0 //@members.17" parents="//@members.31 //@members.52"/>
7 <members parents="//@members.6 //@members.58"/>
8 <members parents="//@members.15 //@members.62"/>
9 <members age="39" children="//@members.4 //@members.64" parents="//@members.28 //@members.41"/>
10 <members age="169" children="//@members.11 //@members.27 //@members.50 //@members.55 //@members.97" parents="//@members.62 //@members.85"/>
11 <members age="104" children="//@members.42 //@members.63 //@members.86 //@members.87 //@members.88 //@members.99" parents="//@members.35 //@members.70"/>
12 <members age="156" children="//@members.10 //@members.24 //@members.60 //@members.63 //@members.69 //@members.91 //@members.98" parents="//@members.62 //@members.85"/>
13 <members age="78" children="//@members.17 //@members.29 //@members.32 //@members.36 //@members.61" parents="//@members.9 //@members.87"/>
14 <members parents="//@members.7 //@members.97"/>
15 <members age="78" children="//@members.20 //@members.26" parents="//@members.66 //@members.70"/>
16 <members age="13" children="//@members.0" parents="//@members.20 //@members.36"/>
17 <members age="13" children="//@members.56" parents="//@members.64 //@members.97"/>
18 <members age="208" children="//@members.5 //@members.16 //@members.20 //@members.62 //@members.85" parents="//@members.25 //@members.70"/>
19 <members parents="//@members.15 //@members.21"/>
20 <members age="26" children="//@members.75 //@members.96" parents="//@members.3 //@members.10"/>
21 <members age="13" children="//@members.90" parents="//@members.27 //@members.54"/>
22 <members parents="//@members.20 //@members.76"/>
23 <members age="65" children="//@members.13 //@members.19 //@members.41 //@members.82" parents="//@members.12 //@members.15"/>
24 <members age="39" children="//@members.16 //@members.73 //@members.86 //@members.89 //@members.90" parents="//@members.62 //@members.70"/>
25 <members parents="//@members.39 //@members.61"/>
26 <members age="143" children="//@members.31 //@members.35 //@members.40 //@members.53" parents="//@members.55 //@members.81"/>
27 <members age="117" children="//@members.26 //@members.34 //@members.51 //@members.59" parents="//@members.9 //@members.35"/>
28 <members age="221" children="//@members.15 //@members.33 //@members.43 //@members.49 //@members.57 //@members.83 //@members.85" parents="//@members.39 //@members.70"/>
29 <members age="13" children="//@members.40" parents="//@members.12 //@members.24"/>
30 <members age="117" children="//@members.18 //@members.60 //@members.66 //@members.80" parents="//@members.7 //@members.55"/>
31 <members age="52" children="//@members.6 //@members.47" parents="//@members.35 //@members.69"/>
32 <members age="65" children="//@members.2 //@members.41" parents="//@members.10 //@members.37"/>
33 <members parents="//@members.31 //@members.98"/>
34 <members age="52" children="//@members.3 //@members.30 //@members.46 //@members.65" parents="//@members.23 //@members.33"/>
35 <members parents="//@members.10 //@members.88"/>
36 <members age="65" children="//@members.31" parents="//@members.25 //@members.60"/>
37 <members parents="//@members.24 //@members.47"/>
38 <members age="130" children="//@members.8 //@members.24 //@members.28 //@members.54 //@members.67 //@members.88" parents="//@members.23 //@members.49"/>
39 <members age="39" children="//@members.13 //@members.45 //@members.79 //@members.98" parents="//@members.10 //@members.67"/>
40 <members age="78" children="//@members.29" parents="//@members.52 //@members.58"/>
41 <members parents="//@members.52 //@members.86"/>
42 <members age="273" children="//@members.22 //@members.25 //@members.68 //@members.70 //@members.71 //@members.82 //@members.93 //@members.95"/>
43 <members parents="//@members.23 //@members.26"/>
44 <members age="52" children="//@members.6" parents="//@members.20 //@members.29"/>
45 <members age="39" children="//@members.64" parents="//@members.8 //@members.52"/>
46 <members age="117" children="//@members.59 //@members.67" parents="//@members.25 //@members.50"/>
47 <members parents="//@members.86 //@members.94"/>
48 <members parents="//@members.36 //@members.54"/>
49 <members age="13" children="//@members.68" parents="//@members.31 //@members.51"/>
50 <members age="13" children="//@members.34" parents="//@members.28 //@members.98"/>
51 <members parents="//@members.62 //@members.80"/>
52 <members age="143" children="//@members.35 //@members.58 //@members.89" parents="//@members.25 //@members.62"/>
53 <members age="130" children="//@members.43 //@members.52 //@members.74" parents="//@members.7 //@members.69"/>
54 <members age="26" children="//@members.46" parents="//@members.24 //@members.80"/>
55 <members age="91" children="//@members.3 //@members.37 //@members.38 //@members.42 //@members.94" parents="//@members.50 //@members.59"/>
56 <members parents="//@members.23 //@members.76"/>
57 <members age="26" children="//@members.18 //@members.45" parents="//@members.35 //@members.71"/>
58 <members age="156" children="//@members.23 //@members.27 //@members.92" parents="//@members.7 //@members.81"/>
59 <members parents="//@members.14 //@members.72"/>
60 <members parents="//@members.25"/>
61 <members age="91" children="//@members.4 //@members.37 //@members.79" parents="//@members.49 //@members.80"/>
62 <members age="104" children="//@members.52 //@members.72 //@members.87" parents="//@members.24 //@members.43"/>
63 <members age="78" children="//@members.1 //@members.33 //@members.94 //@members.97" parents="//@members.9 //@members.27"/>
64 <members age="52" children="//@members.2 //@members.22" parents="//@members.10 //@members.69"/>
65 <members age="182" children="//@members.5 //@members.7 //@members.9 //@members.21 //@members.48 //@members.49 //@members.78 //@members.81" parents="//@members.15 //@members.85"/>
66 <members parents="//@members.8 //@members.9"/>
67 <members age="26" children="//@members.14" parents="//@members.6 //@members.42"/>
68 <members age="26" children="//@members.76" parents="//@members.31 //@members.82"/>
69 <members age="91" children="//@members.12" parents="//@members.27 //@members.69"/>
70 <members age="52" children="//@members.36" parents="//@members.35 //@members.43"/>
71 <members parents="//@members.39 //@members.46"/>
72 <members age="143" children="//@members.28 //@members.50 //@members.61 //@members.66 //@members.80" parents="//@members.9 //@members.81"/>
73 <members age="234" children="//@members.8 //@members.12 //@members.15 //@members.21 //@members.25 //@members.74" parents="//@members.39 //@members.71"/>
74 <members age="247" children="//@members.54 //@members.70" parents="//@members.39 //@members.93"/>
75 <members age="13" children="//@members.56 //@members.84" parents="//@members.59 //@members.87"/>
76 <members age="26" children="//@members.76" parents="//@members.2 //@members.21"/>
77 <members parents="//@members.50 //@members.70"/>
78 <members parents="//@members.17 //@members.97"/>
79 <members age="13" children="//@members.19 //@members.53" parents="//@members.65 //@members.73"/>
80 <members parents="//@members.81 //@members.85"/>
81 <members age="13" children="//@members.91" parents="//@members.62 //@members.86"/>
82 <members parents="//@members.36 //@members.58"/>
83 <members age="104" children="//@members.48 //@members.51 //@members.58 //@members.92 //@members.95" parents="//@members.27 //@members.69"/>
84 <members age="169" children="//@members.23 //@members.55 //@members.69 //@members.77" parents="//@members.62 //@members.85"/>
85 <members age="39" children="//@members.65" parents="//@members.20 //@members.39"/>
86 <members parents="//@members.25 //@members.87"/>
87 <members parents="//@members.72 //@members.97"/>
88 <members age="195" children="//@members.7 //@members.9 //@members.62 //@members.77 //@members.81" parents="//@members.15 //@members.25"/>
89 <members age="26" children="//@members.1 //@members.38 //@members.44 //@members.78" parents="//@members.8 //@members.21"/>
90 <members age="91" children="//@members.10 //@members.72 //@members.83" parents="//@members.8 //@members.59"/>
91 <members age="26" children="//@members.32 //@members.96" parents="//@members.8 //@members.35"/>
92 <members parents="//@members.21 //@members.49"/>
93 <members parents="//@members.18 //@members.21"/>
94 <members parents="//@members.9 //@members.78"/>
95 <members parents="//@members.55 //@members.80"/>
96 <members age="260" children="//@members.71" parents="//@members.39"/>
97 <members age="13" children="//@members.44" parents="//@members.52 //@members.60"/>
98 <members parents="//@members.39 //@members.80"/>
99 <members age="13" children="//@members.99" parents="//@members.17 //@members.88"/>
100 <members age="26" children="//@members.11 //@members.14 //@members.75 //@members.84" parents="//@members.7 //@members.60"/>
101 <members age="26" children="//@members.30 //@members.47" parents="//@members.9 //@members.36"/>
102 <members parents="//@members.8 //@members.96"/>
103</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/1_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/1_1.xmi
new file mode 100644
index 00000000..4d55d654
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/1_1.xmi
@@ -0,0 +1,103 @@
1<?xml version="1.0" encoding="ASCII"?>
2<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree ../case.study.familyTree.model/model/familytree.ecore">
3 <members parents="//@members.30 //@members.74"/>
4 <members age="182" children="//@members.6 //@members.55 //@members.58" parents="//@members.42 //@members.74"/>
5 <members age="104" children="//@members.3 //@members.16 //@members.26 //@members.76" parents="//@members.38 //@members.47"/>
6 <members parents="//@members.2 //@members.65"/>
7 <members age="13" children="//@members.18 //@members.24" parents="//@members.69 //@members.73"/>
8 <members age="39" children="//@members.23 //@members.34 //@members.71" parents="//@members.58 //@members.65"/>
9 <members age="156" children="//@members.28 //@members.85" parents="//@members.1 //@members.74"/>
10 <members age="13" children="//@members.71 //@members.79" parents="//@members.74 //@members.88"/>
11 <members parents="//@members.64 //@members.69"/>
12 <members parents="//@members.67 //@members.69"/>
13 <members parents="//@members.28 //@members.40"/>
14 <members age="26" children="//@members.59 //@members.86 //@members.87" parents="//@members.63 //@members.82"/>
15 <members age="13" children="//@members.91" parents="//@members.44 //@members.60"/>
16 <members age="39" children="//@members.17 //@members.23" parents="//@members.77 //@members.80"/>
17 <members age="52" children="//@members.41" parents="//@members.47 //@members.60"/>
18 <members age="39" children="//@members.69 //@members.72" parents="//@members.47 //@members.60"/>
19 <members age="78" children="//@members.29 //@members.61" parents="//@members.2 //@members.19"/>
20 <members parents="//@members.13 //@members.19"/>
21 <members parents="//@members.4 //@members.73"/>
22 <members age="91" children="//@members.16 //@members.17 //@members.35 //@members.43" parents="//@members.20 //@members.85"/>
23 <members age="104" children="//@members.19 //@members.45 //@members.49" parents="//@members.42 //@members.56"/>
24 <members age="78" children="//@members.33 //@members.90" parents="//@members.56 //@members.62"/>
25 <members parents="//@members.33 //@members.43"/>
26 <members age="26" children="//@members.52 //@members.84" parents="//@members.5 //@members.13"/>
27 <members parents="//@members.4 //@members.90"/>
28 <members age="39" children="//@members.78 //@members.88 //@members.89 //@members.94" parents="//@members.48 //@members.77"/>
29 <members age="91" children="//@members.45 //@members.88" parents="//@members.2 //@members.77"/>
30 <members parents="//@members.41 //@members.55"/>
31 <members age="143" children="//@members.10 //@members.48" parents="//@members.6 //@members.65"/>
32 <members age="65" children="//@members.30 //@members.34 //@members.61" parents="//@members.16 //@members.96"/>
33 <members age="13" children="//@members.0" parents="//@members.29 //@members.35"/>
34 <members parents="//@members.39 //@members.45"/>
35 <members age="117" children="//@members.40 //@members.98" parents="//@members.38 //@members.60"/>
36 <members age="65" children="//@members.22 //@members.43 //@members.64 //@members.80" parents="//@members.21 //@members.45"/>
37 <members parents="//@members.5 //@members.29"/>
38 <members age="26" children="//@members.30" parents="//@members.19 //@members.38"/>
39 <members parents="//@members.49 //@members.57"/>
40 <members age="52" children="//@members.41 //@members.63" parents="//@members.58 //@members.65"/>
41 <members age="221" children="//@members.2 //@members.32 //@members.35 //@members.42 //@members.69 //@members.74 //@members.77" parents="//@members.83 //@members.97"/>
42 <members age="273" children="//@members.31 //@members.68 //@members.97"/>
43 <members age="104" children="//@members.10 //@members.62 //@members.75" parents="//@members.32 //@members.58"/>
44 <members age="39" children="//@members.27 //@members.70 //@members.73 //@members.91" parents="//@members.14 //@members.37"/>
45 <members age="208" children="//@members.1 //@members.20 //@members.60 //@members.65 //@members.72 //@members.74 //@members.78" parents="//@members.38 //@members.83"/>
46 <members age="39" children="//@members.22 //@members.46" parents="//@members.19 //@members.33"/>
47 <members age="52" children="//@members.12 //@members.57 //@members.95" parents="//@members.67 //@members.83"/>
48 <members age="78" children="//@members.31 //@members.33 //@members.90" parents="//@members.20 //@members.26"/>
49 <members age="26" children="//@members.51" parents="//@members.43 //@members.74"/>
50 <members age="117" children="//@members.2 //@members.14 //@members.15 //@members.55 //@members.82 //@members.87" parents="//@members.58 //@members.81"/>
51 <members age="130" children="//@members.25 //@members.56 //@members.94" parents="//@members.28 //@members.65"/>
52 <members age="26" children="//@members.36 //@members.70" parents="//@members.20 //@members.57"/>
53 <members parents="//@members.92 //@members.97"/>
54 <members age="13" children="//@members.93" parents="//@members.46 //@members.85"/>
55 <members age="13" children="//@members.84" parents="//@members.23 //@members.77"/>
56 <members parents="//@members.70 //@members.97"/>
57 <members parents="//@members.87"/>
58 <members age="104" children="//@members.27 //@members.59 //@members.67 //@members.82" parents="//@members.1 //@members.47"/>
59 <members age="117" children="//@members.20 //@members.21 //@members.57 //@members.96" parents="//@members.48 //@members.81"/>
60 <members age="39" children="//@members.36 //@members.49 //@members.66" parents="//@members.44 //@members.56"/>
61 <members age="169" children="//@members.5 //@members.37 //@members.40 //@members.47 //@members.65" parents="//@members.1 //@members.74"/>
62 <members age="13" children="//@members.93" parents="//@members.11 //@members.55"/>
63 <members age="130" children="//@members.12 //@members.14 //@members.15 //@members.32 //@members.89 //@members.99" parents="//@members.42 //@members.81"/>
64 <members age="52" children="//@members.63 //@members.79" parents="//@members.16 //@members.29"/>
65 <members age="91" children="//@members.21 //@members.64" parents="//@members.40 //@members.85"/>
66 <members age="39" children="//@members.11" parents="//@members.37 //@members.61"/>
67 <members age="13" children="//@members.8" parents="//@members.33 //@members.62"/>
68 <members age="156" children="//@members.3 //@members.5 //@members.28 //@members.37 //@members.48 //@members.81 //@members.85" parents="//@members.42 //@members.58"/>
69 <members parents="//@members.57 //@members.81"/>
70 <members age="65" children="//@members.9 //@members.44" parents="//@members.55 //@members.82"/>
71 <members age="247" children="//@members.83 //@members.92" parents="//@members.39 //@members.97"/>
72 <members age="26" children="//@members.4 //@members.8 //@members.9 //@members.92" parents="//@members.15 //@members.38"/>
73 <members age="13" children="//@members.53" parents="//@members.41 //@members.49"/>
74 <members parents="//@members.5 //@members.7"/>
75 <members parents="//@members.15 //@members.42"/>
76 <members age="26" children="//@members.4 //@members.18 //@members.75" parents="//@members.41 //@members.83"/>
77 <members age="195" children="//@members.0 //@members.1 //@members.6 //@members.7 //@members.46 //@members.58 //@members.81" parents="//@members.38 //@members.42"/>
78 <members parents="//@members.40 //@members.73"/>
79 <members parents="//@members.2 //@members.81"/>
80 <members age="104" children="//@members.13 //@members.25 //@members.26 //@members.52" parents="//@members.38 //@members.81"/>
81 <members parents="//@members.25 //@members.42"/>
82 <members parents="//@members.7 //@members.61"/>
83 <members age="52" children="//@members.13" parents="//@members.33 //@members.90"/>
84 <members age="143" children="//@members.47 //@members.56 //@members.60 //@members.66 //@members.76 //@members.77" parents="//@members.65 //@members.74"/>
85 <members age="91" children="//@members.11 //@members.67 //@members.96 //@members.99" parents="//@members.47 //@members.55"/>
86 <members age="234" children="//@members.38 //@members.42 //@members.44 //@members.73" parents="//@members.68 //@members.97"/>
87 <members parents="//@members.23 //@members.52"/>
88 <members age="104" children="//@members.19 //@members.51 //@members.62 //@members.95" parents="//@members.6 //@members.65"/>
89 <members parents="//@members.11 //@members.92"/>
90 <members age="13" children="//@members.54" parents="//@members.11 //@members.47"/>
91 <members age="26" children="//@members.7" parents="//@members.25 //@members.26"/>
92 <members age="13" children="//@members.98" parents="//@members.25 //@members.60"/>
93 <members age="65" children="//@members.24 //@members.80" parents="//@members.21 //@members.45"/>
94 <members parents="//@members.12 //@members.41"/>
95 <members age="13" children="//@members.50 //@members.86" parents="//@members.68 //@members.69"/>
96 <members parents="//@members.51 //@members.59"/>
97 <members parents="//@members.25 //@members.48"/>
98 <members parents="//@members.44 //@members.85"/>
99 <members age="78" children="//@members.29" parents="//@members.56 //@members.82"/>
100 <members age="260" children="//@members.38 //@members.50 //@members.53 //@members.68 //@members.83" parents="//@members.39"/>
101 <members parents="//@members.32 //@members.89"/>
102 <members parents="//@members.60 //@members.82"/>
103</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/2_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/2_1.xmi
new file mode 100644
index 00000000..690b7492
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/2_1.xmi
@@ -0,0 +1,103 @@
1<?xml version="1.0" encoding="ASCII"?>
2<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree ../case.study.familyTree.model/model/familytree.ecore">
3 <members age="13" children="//@members.30 //@members.59" parents="//@members.64 //@members.88"/>
4 <members parents="//@members.53 //@members.65"/>
5 <members age="208" children="//@members.7 //@members.27 //@members.86" parents="//@members.23 //@members.44"/>
6 <members age="39" children="//@members.27 //@members.98" parents="//@members.80 //@members.88"/>
7 <members age="26" children="//@members.11 //@members.48 //@members.72" parents="//@members.51 //@members.68"/>
8 <members age="13" children="//@members.40 //@members.45" parents="//@members.23 //@members.99"/>
9 <members age="26" children="//@members.53" parents="//@members.31 //@members.39"/>
10 <members age="195" children="//@members.9 //@members.18 //@members.71 //@members.76 //@members.78 //@members.92" parents="//@members.2 //@members.23"/>
11 <members parents="//@members.39 //@members.76"/>
12 <members age="182" children="//@members.13 //@members.70 //@members.71" parents="//@members.7 //@members.23"/>
13 <members age="13" children="//@members.69" parents="//@members.42 //@members.78"/>
14 <members parents="//@members.4 //@members.22"/>
15 <members parents="//@members.62 //@members.99"/>
16 <members age="26" children="//@members.20 //@members.36 //@members.70" parents="//@members.9 //@members.89"/>
17 <members age="13" children="//@members.47" parents="//@members.22 //@members.57"/>
18 <members age="26" children="//@members.53" parents="//@members.42 //@members.64"/>
19 <members age="26" children="//@members.83" parents="//@members.78 //@members.87"/>
20 <members parents="//@members.31 //@members.92"/>
21 <members age="156" children="//@members.19 //@members.26 //@members.51 //@members.57 //@members.59 //@members.68 //@members.78" parents="//@members.7 //@members.71"/>
22 <members age="104" children="//@members.26 //@members.45 //@members.54 //@members.64 //@members.88 //@members.89" parents="//@members.18 //@members.76"/>
23 <members age="13" children="//@members.34" parents="//@members.13 //@members.54"/>
24 <members age="13" children="//@members.81" parents="//@members.50 //@members.51"/>
25 <members age="65" children="//@members.11 //@members.14 //@members.37 //@members.47 //@members.61 //@members.80" parents="//@members.68 //@members.92"/>
26 <members age="234" children="//@members.2 //@members.5 //@members.7 //@members.9 //@members.44 //@members.77" parents="//@members.43"/>
27 <members age="52" children="//@members.89" parents="//@members.75 //@members.94"/>
28 <members parents="//@members.58 //@members.91"/>
29 <members age="78" children="//@members.58 //@members.87 //@members.90 //@members.94" parents="//@members.18 //@members.19"/>
30 <members age="26" children="//@members.30 //@members.48 //@members.97" parents="//@members.2 //@members.3"/>
31 <members parents="//@members.52 //@members.78"/>
32 <members parents="//@members.52 //@members.94"/>
33 <members parents="//@members.0 //@members.27"/>
34 <members age="39" children="//@members.6 //@members.17 //@members.57" parents="//@members.46 //@members.76"/>
35 <members age="13" children="//@members.34" parents="//@members.51 //@members.71"/>
36 <members age="52" children="//@members.41 //@members.52" parents="//@members.92 //@members.96"/>
37 <members parents="//@members.20 //@members.32"/>
38 <members parents="//@members.68 //@members.90"/>
39 <members parents="//@members.13 //@members.52"/>
40 <members parents="//@members.22 //@members.48"/>
41 <members age="65" children="//@members.87" parents="//@members.84 //@members.88"/>
42 <members age="39" children="//@members.6 //@members.8" parents="//@members.87 //@members.96"/>
43 <members parents="//@members.5 //@members.52"/>
44 <members parents="//@members.33 //@members.91"/>
45 <members age="39" children="//@members.10 //@members.15" parents="//@members.68 //@members.96"/>
46 <members age="247" children="//@members.23 //@members.44"/>
47 <members age="221" children="//@members.2 //@members.56 //@members.99" parents="//@members.23 //@members.43"/>
48 <members parents="//@members.5 //@members.19"/>
49 <members age="104" children="//@members.31 //@members.51 //@members.62 //@members.64 //@members.73 //@members.96" parents="//@members.78 //@members.92"/>
50 <members parents="//@members.14 //@members.22"/>
51 <members age="13" children="//@members.37" parents="//@members.4 //@members.27"/>
52 <members parents="//@members.76 //@members.94"/>
53 <members age="78" children="//@members.21 //@members.80 //@members.96 //@members.98" parents="//@members.68 //@members.92"/>
54 <members age="91" children="//@members.4 //@members.21 //@members.32 //@members.88 //@members.97" parents="//@members.18 //@members.46"/>
55 <members age="39" children="//@members.28 //@members.29 //@members.36 //@members.40 //@members.54 //@members.63 //@members.67 //@members.79 //@members.90" parents="//@members.33 //@members.73"/>
56 <members age="13" children="//@members.1" parents="//@members.6 //@members.15"/>
57 <members age="26" children="//@members.20" parents="//@members.19 //@members.52"/>
58 <members age="13" children="//@members.74" parents="//@members.67 //@members.99"/>
59 <members parents="//@members.44 //@members.89"/>
60 <members age="26" children="//@members.14" parents="//@members.18 //@members.31"/>
61 <members age="13" children="//@members.25" parents="//@members.26 //@members.82"/>
62 <members parents="//@members.0 //@members.18"/>
63 <members age="39" children="//@members.99" parents="//@members.71 //@members.82"/>
64 <members parents="//@members.22 //@members.68"/>
65 <members age="78" children="//@members.12 //@members.94" parents="//@members.46 //@members.75"/>
66 <members parents="//@members.52 //@members.87"/>
67 <members age="91" children="//@members.0 //@members.15 //@members.67 //@members.84" parents="//@members.19 //@members.46"/>
68 <members age="13" children="//@members.1" parents="//@members.91 //@members.94"/>
69 <members parents="//@members.88 //@members.96"/>
70 <members age="26" children="//@members.55" parents="//@members.52 //@members.64"/>
71 <members age="104" children="//@members.4 //@members.22 //@members.35 //@members.42 //@members.50 //@members.61 //@members.75 //@members.91" parents="//@members.18 //@members.78"/>
72 <members parents="//@members.10 //@members.98"/>
73 <members parents="//@members.9 //@members.13"/>
74 <members age="169" children="//@members.18 //@members.32 //@members.60 //@members.73" parents="//@members.7 //@members.9"/>
75 <members parents="//@members.4 //@members.88"/>
76 <members age="65" children="//@members.52 //@members.82" parents="//@members.46 //@members.71"/>
77 <members parents="//@members.55 //@members.94"/>
78 <members age="91" children="//@members.24 //@members.62 //@members.82" parents="//@members.68 //@members.92"/>
79 <members age="117" children="//@members.8 //@members.19 //@members.31 //@members.49" parents="//@members.7 //@members.92"/>
80 <members parents="//@members.23"/>
81 <members age="143" children="//@members.10 //@members.16 //@members.28 //@members.46 //@members.68 //@members.83 //@members.92" parents="//@members.7 //@members.18"/>
82 <members parents="//@members.52 //@members.94"/>
83 <members age="52" children="//@members.3 //@members.91" parents="//@members.22 //@members.50"/>
84 <members parents="//@members.21 //@members.87"/>
85 <members age="52" children="//@members.58 //@members.60" parents="//@members.73 //@members.75"/>
86 <members age="13" children="//@members.85" parents="//@members.16 //@members.78"/>
87 <members age="78" children="//@members.38 //@members.85 //@members.93 //@members.95" parents="//@members.64 //@members.92"/>
88 <members parents="//@members.83 //@members.84"/>
89 <members parents="//@members.2 //@members.98"/>
90 <members age="52" children="//@members.16 //@members.39 //@members.63 //@members.81" parents="//@members.26 //@members.38"/>
91 <members age="78" children="//@members.0 //@members.3 //@members.38 //@members.66 //@members.72 //@members.95" parents="//@members.19 //@members.51"/>
92 <members age="39" children="//@members.13 //@members.56 //@members.93" parents="//@members.19 //@members.24"/>
93 <members age="13" children="//@members.35" parents="//@members.26 //@members.52"/>
94 <members age="26" children="//@members.25 //@members.41 //@members.65" parents="//@members.68 //@members.80"/>
95 <members age="130" children="//@members.17 //@members.22 //@members.33 //@members.46 //@members.50 //@members.75 //@members.76 //@members.84" parents="//@members.7 //@members.78"/>
96 <members parents="//@members.84 //@members.89"/>
97 <members age="65" children="//@members.24 //@members.29 //@members.49 //@members.65 //@members.74 //@members.79" parents="//@members.26 //@members.62"/>
98 <members parents="//@members.84 //@members.88"/>
99 <members age="65" children="//@members.33 //@members.39 //@members.42 //@members.66" parents="//@members.46 //@members.50"/>
100 <members parents="//@members.27 //@members.51"/>
101 <members age="13" children="//@members.69 //@members.86" parents="//@members.3 //@members.50"/>
102 <members age="26" children="//@members.5 //@members.12 //@members.55" parents="//@members.44 //@members.60"/>
103</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/3_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/3_1.xmi
new file mode 100644
index 00000000..a1e10f7d
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/3_1.xmi
@@ -0,0 +1,103 @@
1<?xml version="1.0" encoding="ASCII"?>
2<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree ../case.study.familyTree.model/model/familytree.ecore">
3 <members age="39" children="//@members.20 //@members.70 //@members.92" parents="//@members.64 //@members.91"/>
4 <members parents="//@members.79 //@members.87"/>
5 <members parents="//@members.51 //@members.91"/>
6 <members parents="//@members.27 //@members.89"/>
7 <members parents="//@members.35 //@members.65"/>
8 <members age="52" children="//@members.18 //@members.19 //@members.25 //@members.79" parents="//@members.43 //@members.51"/>
9 <members age="13" children="//@members.34 //@members.59" parents="//@members.7 //@members.9"/>
10 <members age="104" children="//@members.6 //@members.14 //@members.77" parents="//@members.64 //@members.91"/>
11 <members parents="//@members.51 //@members.86"/>
12 <members age="26" children="//@members.6 //@members.27 //@members.38" parents="//@members.18 //@members.64"/>
13 <members age="65" children="//@members.58 //@members.85" parents="//@members.64 //@members.72"/>
14 <members age="26" children="//@members.97" parents="//@members.57 //@members.91"/>
15 <members parents="//@members.28 //@members.40"/>
16 <members age="26" children="//@members.79 //@members.89" parents="//@members.33 //@members.86"/>
17 <members age="91" children="//@members.40 //@members.68 //@members.73 //@members.74 //@members.78 //@members.86" parents="//@members.7 //@members.76"/>
18 <members age="91" children="//@members.44 //@members.50 //@members.67" parents="//@members.64 //@members.91"/>
19 <members age="221" children="//@members.21 //@members.43 //@members.48 //@members.84 //@members.92" parents="//@members.88"/>
20 <members parents="//@members.35 //@members.95"/>
21 <members age="39" children="//@members.9 //@members.27" parents="//@members.5 //@members.51"/>
22 <members age="26" children="//@members.97" parents="//@members.5 //@members.22"/>
23 <members age="13" children="//@members.36" parents="//@members.0 //@members.57"/>
24 <members age="208" children="//@members.23 //@members.26 //@members.43 //@members.44 //@members.83" parents="//@members.16 //@members.88"/>
25 <members age="39" children="//@members.19 //@members.23" parents="//@members.39 //@members.84"/>
26 <members parents="//@members.21 //@members.22"/>
27 <members age="143" children="//@members.35 //@members.57 //@members.64 //@members.69 //@members.91 //@members.94" parents="//@members.28 //@members.61"/>
28 <members parents="//@members.5 //@members.50"/>
29 <members parents="//@members.21 //@members.90"/>
30 <members age="13" children="//@members.3" parents="//@members.9 //@members.18"/>
31 <members age="156" children="//@members.12 //@members.24 //@members.53 //@members.57 //@members.63 //@members.80 //@members.91" parents="//@members.43 //@members.61"/>
32 <members parents="//@members.60 //@members.89"/>
33 <members parents="//@members.50 //@members.66"/>
34 <members parents="//@members.76 //@members.91"/>
35 <members parents="//@members.39 //@members.90"/>
36 <members age="52" children="//@members.13 //@members.38 //@members.41 //@members.47 //@members.55 //@members.56 //@members.62 //@members.77" parents="//@members.61 //@members.69"/>
37 <members parents="//@members.6 //@members.97"/>
38 <members age="13" children="//@members.4 //@members.17" parents="//@members.24 //@members.69"/>
39 <members parents="//@members.20 //@members.80"/>
40 <members parents="//@members.41 //@members.77"/>
41 <members parents="//@members.9 //@members.33"/>
42 <members age="52" children="//@members.22 //@members.32 //@members.45 //@members.52 //@members.96" parents="//@members.43 //@members.76"/>
43 <members age="13" children="//@members.12" parents="//@members.14 //@members.83"/>
44 <members age="26" children="//@members.37 //@members.67 //@members.87" parents="//@members.33 //@members.91"/>
45 <members parents="//@members.55 //@members.96"/>
46 <members age="195" children="//@members.5 //@members.28 //@members.39 //@members.58 //@members.61 //@members.69 //@members.72 //@members.83" parents="//@members.16 //@members.21"/>
47 <members age="78" children="//@members.82 //@members.94" parents="//@members.15 //@members.21"/>
48 <members parents="//@members.39 //@members.72"/>
49 <members parents="//@members.76"/>
50 <members parents="//@members.33 //@members.88"/>
51 <members age="13" children="//@members.63" parents="//@members.16 //@members.91"/>
52 <members parents="//@members.66 //@members.70"/>
53 <members age="13" children="//@members.25 //@members.30 //@members.99" parents="//@members.15 //@members.96"/>
54 <members age="117" children="//@members.2 //@members.5 //@members.8 //@members.18 //@members.72 //@members.73 //@members.76" parents="//@members.61 //@members.91"/>
55 <members parents="//@members.39 //@members.89"/>
56 <members parents="//@members.28 //@members.95"/>
57 <members parents="//@members.78 //@members.88"/>
58 <members age="39" children="//@members.42 //@members.60 //@members.70 //@members.98" parents="//@members.33 //@members.73"/>
59 <members age="26" children="//@members.60" parents="//@members.33 //@members.90"/>
60 <members age="39" children="//@members.11 //@members.20" parents="//@members.24 //@members.28"/>
61 <members age="52" children="//@members.85 //@members.99" parents="//@members.10 //@members.43"/>
62 <members parents="//@members.6 //@members.92"/>
63 <members age="13" children="//@members.29 //@members.74" parents="//@members.55 //@members.56"/>
64 <members age="169" children="//@members.24 //@members.28 //@members.33 //@members.51 //@members.64 //@members.75" parents="//@members.43 //@members.83"/>
65 <members age="13" children="//@members.93" parents="//@members.33 //@members.72"/>
66 <members parents="//@members.28 //@members.48"/>
67 <members age="117" children="//@members.0 //@members.7 //@members.9 //@members.10 //@members.15 //@members.76 //@members.86 //@members.96" parents="//@members.24 //@members.61"/>
68 <members age="13" children="//@members.4" parents="//@members.82 //@members.84"/>
69 <members age="13" children="//@members.30 //@members.49" parents="//@members.70 //@members.88"/>
70 <members parents="//@members.15 //@members.41"/>
71 <members age="13" children="//@members.75" parents="//@members.14 //@members.81"/>
72 <members age="65" children="//@members.33 //@members.35" parents="//@members.24 //@members.43"/>
73 <members age="26" children="//@members.49 //@members.66" parents="//@members.0 //@members.55"/>
74 <members parents="//@members.72 //@members.85"/>
75 <members age="78" children="//@members.10 //@members.45 //@members.62 //@members.71 //@members.80" parents="//@members.43 //@members.51"/>
76 <members age="52" children="//@members.55" parents="//@members.14 //@members.51"/>
77 <members parents="//@members.14 //@members.60"/>
78 <members parents="//@members.61 //@members.68"/>
79 <members age="104" children="//@members.14 //@members.31 //@members.39 //@members.46" parents="//@members.51 //@members.64"/>
80 <members age="26" children="//@members.37 //@members.87" parents="//@members.7 //@members.33"/>
81 <members age="13" children="//@members.54" parents="//@members.14 //@members.94"/>
82 <members age="13" children="//@members.1" parents="//@members.5 //@members.13"/>
83 <members age="13" children="//@members.36" parents="//@members.28 //@members.72"/>
84 <members age="26" children="//@members.68" parents="//@members.85 //@members.86"/>
85 <members age="65" children="//@members.65 //@members.84 //@members.95" parents="//@members.44 //@members.86"/>
86 <members age="182" children="//@members.40 //@members.61 //@members.90" parents="//@members.21 //@members.43"/>
87 <members age="52" children="//@members.22 //@members.65" parents="//@members.16 //@members.82"/>
88 <members age="39" children="//@members.71 //@members.81 //@members.95" parents="//@members.10 //@members.58"/>
89 <members age="78" children="//@members.8 //@members.13 //@members.81 //@members.82" parents="//@members.14 //@members.64"/>
90 <members age="13" children="//@members.1" parents="//@members.41 //@members.77"/>
91 <members age="234" children="//@members.16 //@members.21 //@members.47 //@members.54 //@members.66"/>
92 <members age="13" children="//@members.3 //@members.29 //@members.52" parents="//@members.13 //@members.95"/>
93 <members age="39" children="//@members.26 //@members.32 //@members.56 //@members.98" parents="//@members.83 //@members.91"/>
94 <members age="130" children="//@members.0 //@members.2 //@members.7 //@members.11 //@members.15 //@members.31 //@members.41 //@members.48 //@members.51 //@members.90 //@members.93" parents="//@members.24 //@members.28"/>
95 <members age="13" children="//@members.59" parents="//@members.0 //@members.16"/>
96 <members parents="//@members.62 //@members.91"/>
97 <members age="26" children="//@members.78" parents="//@members.24 //@members.44"/>
98 <members age="26" children="//@members.17 //@members.53 //@members.89" parents="//@members.82 //@members.85"/>
99 <members age="26" children="//@members.42 //@members.50" parents="//@members.39 //@members.64"/>
100 <members age="13" children="//@members.34" parents="//@members.11 //@members.19"/>
101 <members parents="//@members.55 //@members.90"/>
102 <members parents="//@members.50 //@members.58"/>
103</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/4_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/4_1.xmi
new file mode 100644
index 00000000..9e950b3b
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/4_1.xmi
@@ -0,0 +1,103 @@
1<?xml version="1.0" encoding="ASCII"?>
2<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree ../case.study.familyTree.model/model/familytree.ecore">
3 <members age="65" children="//@members.14 //@members.20 //@members.37 //@members.57" parents="//@members.2 //@members.73"/>
4 <members parents="//@members.2 //@members.28"/>
5 <members age="130" children="//@members.0 //@members.1 //@members.8 //@members.15 //@members.16 //@members.34 //@members.50 //@members.72" parents="//@members.27 //@members.98"/>
6 <members age="52" children="//@members.28 //@members.57 //@members.76" parents="//@members.40 //@members.78"/>
7 <members age="26" children="//@members.43" parents="//@members.65 //@members.67"/>
8 <members parents="//@members.18 //@members.73"/>
9 <members age="52" children="//@members.33 //@members.38 //@members.56" parents="//@members.17 //@members.40"/>
10 <members age="13" children="//@members.68" parents="//@members.44 //@members.73"/>
11 <members age="52" children="//@members.71 //@members.92 //@members.97" parents="//@members.2 //@members.34"/>
12 <members age="52" children="//@members.36 //@members.47" parents="//@members.17 //@members.83"/>
13 <members age="143" children="//@members.53 //@members.65 //@members.77 //@members.83 //@members.86" parents="//@members.30 //@members.42"/>
14 <members age="65" children="//@members.44 //@members.67" parents="//@members.40 //@members.88"/>
15 <members age="13" children="//@members.13" parents="//@members.84 //@members.98"/>
16 <members parents="//@members.12 //@members.76"/>
17 <members parents="//@members.0 //@members.93"/>
18 <members parents="//@members.2 //@members.22"/>
19 <members age="91" children="//@members.88" parents="//@members.2 //@members.40"/>
20 <members age="195" children="//@members.6 //@members.9 //@members.27 //@members.29 //@members.30 //@members.75 //@members.81 //@members.86 //@members.90" parents="//@members.49 //@members.78"/>
21 <members age="39" children="//@members.5 //@members.41 //@members.93 //@members.96" parents="//@members.20 //@members.32"/>
22 <members age="13" children="//@members.63" parents="//@members.49 //@members.57"/>
23 <members age="52" children="//@members.18 //@members.47 //@members.51" parents="//@members.0 //@members.42"/>
24 <members age="13" children="//@members.63" parents="//@members.79 //@members.93"/>
25 <members age="91" children="//@members.15 //@members.23 //@members.28 //@members.35 //@members.50 //@members.59 //@members.88" parents="//@members.29 //@members.32"/>
26 <members age="26" children="//@members.55 //@members.76" parents="//@members.22 //@members.98"/>
27 <members parents="//@members.40 //@members.97"/>
28 <members age="26" children="//@members.43 //@members.60" parents="//@members.26 //@members.45"/>
29 <members age="65" children="//@members.25 //@members.46 //@members.51 //@members.52" parents="//@members.29 //@members.81"/>
30 <members age="182" children="//@members.2 //@members.30 //@members.42 //@members.81" parents="//@members.17 //@members.49"/>
31 <members age="26" children="//@members.1 //@members.82 //@members.87 //@members.97" parents="//@members.3 //@members.22"/>
32 <members age="117" children="//@members.22 //@members.26 //@members.31 //@members.32" parents="//@members.17 //@members.42"/>
33 <members age="156" children="//@members.10 //@members.35 //@members.39 //@members.58" parents="//@members.17 //@members.27"/>
34 <members parents="//@members.29 //@members.98"/>
35 <members age="104" children="//@members.18 //@members.22 //@members.41 //@members.69 //@members.96" parents="//@members.29 //@members.98"/>
36 <members parents="//@members.6 //@members.57"/>
37 <members age="117" children="//@members.8 //@members.40 //@members.55" parents="//@members.2 //@members.83"/>
38 <members parents="//@members.22 //@members.30"/>
39 <members age="39" children="//@members.84" parents="//@members.9 //@members.39"/>
40 <members age="39" children="//@members.70 //@members.74" parents="//@members.0 //@members.90"/>
41 <members age="39" children="//@members.84" parents="//@members.6 //@members.42"/>
42 <members age="52" children="//@members.36 //@members.58 //@members.62" parents="//@members.30 //@members.49"/>
43 <members age="104" children="//@members.3 //@members.6 //@members.11 //@members.16 //@members.24 //@members.79" parents="//@members.34 //@members.98"/>
44 <members parents="//@members.18 //@members.32"/>
45 <members age="156" children="//@members.10 //@members.20 //@members.29 //@members.38 //@members.71 //@members.85" parents="//@members.27 //@members.81"/>
46 <members age="13" children="//@members.60" parents="//@members.4 //@members.25"/>
47 <members age="26" children="//@members.7" parents="//@members.11 //@members.71"/>
48 <members age="39" children="//@members.25 //@members.56 //@members.94" parents="//@members.52 //@members.67"/>
49 <members age="52" children="//@members.65" parents="//@members.26 //@members.78"/>
50 <members parents="//@members.9 //@members.20"/>
51 <members age="13" children="//@members.61" parents="//@members.74 //@members.93"/>
52 <members age="208" children="//@members.17 //@members.19 //@members.27 //@members.39 //@members.69" parents="//@members.78 //@members.98"/>
53 <members parents="//@members.2 //@members.22"/>
54 <members age="13" children="//@members.82 //@members.87" parents="//@members.20 //@members.26"/>
55 <members age="52" children="//@members.45" parents="//@members.26 //@members.81"/>
56 <members parents="//@members.10 //@members.90"/>
57 <members age="13" children="//@members.99" parents="//@members.72 //@members.81"/>
58 <members parents="//@members.23 //@members.34"/>
59 <members parents="//@members.6 //@members.45"/>
60 <members age="39" children="//@members.19 //@members.33 //@members.66 //@members.93" parents="//@members.0 //@members.3"/>
61 <members age="13" children="//@members.66 //@members.95" parents="//@members.30 //@members.39"/>
62 <members parents="//@members.22 //@members.67"/>
63 <members parents="//@members.25 //@members.43"/>
64 <members parents="//@members.48"/>
65 <members parents="//@members.39 //@members.72"/>
66 <members parents="//@members.19 //@members.21"/>
67 <members parents="//@members.70 //@members.90"/>
68 <members age="39" children="//@members.4 //@members.91 //@members.95" parents="//@members.10 //@members.46"/>
69 <members parents="//@members.57 //@members.58"/>
70 <members age="52" children="//@members.4 //@members.45 //@members.59 //@members.75" parents="//@members.11 //@members.81"/>
71 <members parents="//@members.7 //@members.88"/>
72 <members age="39" children="//@members.72" parents="//@members.32 //@members.49"/>
73 <members age="13" children="//@members.64" parents="//@members.37 //@members.86"/>
74 <members age="39" children="//@members.44 //@members.91" parents="//@members.8 //@members.42"/>
75 <members age="26" children="//@members.54 //@members.62" parents="//@members.2 //@members.69"/>
76 <members age="247" children="//@members.0 //@members.5 //@members.7 //@members.78 //@members.85 //@members.98" parents="//@members.80 //@members.89"/>
77 <members age="26" children="//@members.48 //@members.99" parents="//@members.37 //@members.86"/>
78 <members parents="//@members.17 //@members.67"/>
79 <members age="13" children="//@members.13" parents="//@members.3 //@members.23"/>
80 <members parents="//@members.10 //@members.91"/>
81 <members age="221" children="//@members.3 //@members.17 //@members.46 //@members.49" parents="//@members.73 //@members.98"/>
82 <members age="26" children="//@members.21" parents="//@members.40 //@members.83"/>
83 <members age="273" children="//@members.73 //@members.89"/>
84 <members age="169" children="//@members.26 //@members.42 //@members.52 //@members.54 //@members.67 //@members.83 //@members.90" parents="//@members.17 //@members.27"/>
85 <members parents="//@members.28 //@members.51"/>
86 <members age="130" children="//@members.9 //@members.34 //@members.79 //@members.92" parents="//@members.10 //@members.81"/>
87 <members age="26" children="//@members.12" parents="//@members.36 //@members.38"/>
88 <members parents="//@members.42 //@members.73"/>
89 <members age="39" children="//@members.70 //@members.74" parents="//@members.10 //@members.17"/>
90 <members parents="//@members.28 //@members.51"/>
91 <members age="78" children="//@members.11 //@members.68" parents="//@members.16 //@members.22"/>
92 <members age="260" children="//@members.73 //@members.94 //@members.98" parents="//@members.80"/>
93 <members age="52" children="//@members.37 //@members.53 //@members.64" parents="//@members.17 //@members.81"/>
94 <members age="13" children="//@members.77" parents="//@members.65 //@members.71"/>
95 <members parents="//@members.8 //@members.83"/>
96 <members age="26" children="//@members.14 //@members.21 //@members.48" parents="//@members.18 //@members.57"/>
97 <members parents="//@members.45 //@members.89"/>
98 <members parents="//@members.58 //@members.65"/>
99 <members parents="//@members.18 //@members.32"/>
100 <members age="13" children="//@members.24" parents="//@members.8 //@members.28"/>
101 <members age="234" children="//@members.2 //@members.12 //@members.23 //@members.31 //@members.32 //@members.40 //@members.49 //@members.78" parents="//@members.73 //@members.89"/>
102 <members parents="//@members.54 //@members.74"/>
103</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/5_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/5_1.xmi
new file mode 100644
index 00000000..c1d02cfb
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/5_1.xmi
@@ -0,0 +1,103 @@
1<?xml version="1.0" encoding="ASCII"?>
2<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree ../case.study.familyTree.model/model/familytree.ecore">
3 <members age="78" children="//@members.24 //@members.51 //@members.60 //@members.66 //@members.75 //@members.87 //@members.88" parents="//@members.42 //@members.94"/>
4 <members parents="//@members.65 //@members.95"/>
5 <members age="182" children="//@members.14 //@members.24 //@members.31 //@members.83 //@members.86 //@members.91" parents="//@members.29 //@members.80"/>
6 <members age="13" children="//@members.50" parents="//@members.29 //@members.68"/>
7 <members age="52" children="//@members.70 //@members.90 //@members.98" parents="//@members.12 //@members.66"/>
8 <members age="26" children="//@members.13 //@members.26 //@members.61" parents="//@members.20 //@members.40"/>
9 <members age="13" children="//@members.63" parents="//@members.12 //@members.53"/>
10 <members age="52" children="//@members.11 //@members.36 //@members.56" parents="//@members.60 //@members.86"/>
11 <members age="39" children="//@members.59" parents="//@members.53 //@members.80"/>
12 <members parents="//@members.76 //@members.94"/>
13 <members parents="//@members.15 //@members.97"/>
14 <members age="13" children="//@members.82" parents="//@members.7 //@members.39"/>
15 <members age="91" children="//@members.4 //@members.6 //@members.25 //@members.33 //@members.39 //@members.72" parents="//@members.18 //@members.85"/>
16 <members parents="//@members.5 //@members.40"/>
17 <members age="13" children="//@members.36 //@members.46" parents="//@members.2 //@members.40"/>
18 <members age="13" children="//@members.10 //@members.93" parents="//@members.42 //@members.80"/>
19 <members parents="//@members.77 //@members.94"/>
20 <members parents="//@members.19 //@members.70"/>
21 <members age="104" children="//@members.12 //@members.38 //@members.47 //@members.66 //@members.92" parents="//@members.65 //@members.85"/>
22 <members age="13" children="//@members.17 //@members.57" parents="//@members.33 //@members.85"/>
23 <members age="39" children="//@members.5" parents="//@members.35 //@members.43"/>
24 <members age="13" children="//@members.30" parents="//@members.42 //@members.52"/>
25 <members age="13" children="//@members.48" parents="//@members.35 //@members.47"/>
26 <members age="13" children="//@members.45 //@members.73" parents="//@members.80 //@members.98"/>
27 <members parents="//@members.0 //@members.2"/>
28 <members parents="//@members.12 //@members.40"/>
29 <members parents="//@members.5 //@members.35"/>
30 <members age="234" children="//@members.29 //@members.70 //@members.80 //@members.84" parents="//@members.67"/>
31 <members age="65" children="//@members.41" parents="//@members.42 //@members.69"/>
32 <members age="208" children="//@members.2 //@members.3 //@members.80 //@members.91" parents="//@members.27 //@members.84"/>
33 <members parents="//@members.21 //@members.86"/>
34 <members parents="//@members.2 //@members.59"/>
35 <members parents="//@members.52 //@members.97"/>
36 <members age="65" children="//@members.19 //@members.41 //@members.73 //@members.97 //@members.99" parents="//@members.12 //@members.39"/>
37 <members parents="//@members.65"/>
38 <members age="52" children="//@members.20 //@members.22 //@members.26 //@members.58" parents="//@members.40 //@members.96"/>
39 <members parents="//@members.7 //@members.14"/>
40 <members age="13" children="//@members.49" parents="//@members.89 //@members.91"/>
41 <members age="26" children="//@members.76" parents="//@members.18 //@members.80"/>
42 <members age="78" children="//@members.11 //@members.33 //@members.78" parents="//@members.12 //@members.86"/>
43 <members age="65" children="//@members.5 //@members.13 //@members.14 //@members.25 //@members.35 //@members.44 //@members.55 //@members.71 //@members.98" parents="//@members.47 //@members.94"/>
44 <members age="52" children="//@members.56" parents="//@members.28 //@members.33"/>
45 <members age="91" children="//@members.0 //@members.15 //@members.21 //@members.28 //@members.47 //@members.51 //@members.62" parents="//@members.85 //@members.94"/>
46 <members age="130" children="//@members.20 //@members.52 //@members.65 //@members.96" parents="//@members.80 //@members.85"/>
47 <members age="26" children="//@members.82 //@members.95" parents="//@members.40 //@members.81"/>
48 <members parents="//@members.23 //@members.69"/>
49 <members parents="//@members.14 //@members.61"/>
50 <members age="78" children="//@members.22 //@members.40" parents="//@members.18 //@members.42"/>
51 <members parents="//@members.22 //@members.60"/>
52 <members parents="//@members.37 //@members.97"/>
53 <members parents="//@members.3 //@members.96"/>
54 <members age="13" children="//@members.62" parents="//@members.0 //@members.42"/>
55 <members age="26" children="//@members.21 //@members.32 //@members.76" parents="//@members.43 //@members.86"/>
56 <members age="52" children="//@members.6 //@members.8 //@members.57 //@members.97" parents="//@members.60 //@members.86"/>
57 <members parents="//@members.71 //@members.80"/>
58 <members parents="//@members.40 //@members.83"/>
59 <members age="39" children="//@members.68" parents="//@members.7 //@members.41"/>
60 <members parents="//@members.19 //@members.53"/>
61 <members parents="//@members.35 //@members.88"/>
62 <members age="26" children="//@members.31 //@members.61" parents="//@members.8 //@members.66"/>
63 <members age="65" children="//@members.7 //@members.48 //@members.53 //@members.93" parents="//@members.0 //@members.77"/>
64 <members age="13" children="//@members.46 //@members.63" parents="//@members.5 //@members.59"/>
65 <members parents="//@members.42 //@members.51"/>
66 <members parents="//@members.6 //@members.61"/>
67 <members parents="//@members.66 //@members.83"/>
68 <members age="117" children="//@members.1 //@members.18 //@members.34 //@members.77 //@members.83" parents="//@members.43 //@members.85"/>
69 <members age="65" children="//@members.4 //@members.59 //@members.64 //@members.79 //@members.81" parents="//@members.0 //@members.18"/>
70 <members age="247" children="//@members.27 //@members.84"/>
71 <members age="26" children="//@members.3" parents="//@members.56 //@members.98"/>
72 <members age="78" children="//@members.28 //@members.45" parents="//@members.85 //@members.96"/>
73 <members age="13" children="//@members.17" parents="//@members.4 //@members.27"/>
74 <members age="13" children="//@members.54" parents="//@members.40 //@members.94"/>
75 <members parents="//@members.12 //@members.88"/>
76 <members parents="//@members.23 //@members.33"/>
77 <members parents="//@members.86 //@members.94"/>
78 <members parents="//@members.0 //@members.92"/>
79 <members age="13" children="//@members.9" parents="//@members.38 //@members.52"/>
80 <members age="104" children="//@members.16 //@members.60 //@members.78 //@members.96" parents="//@members.65 //@members.85"/>
81 <members parents="//@members.39 //@members.77"/>
82 <members parents="//@members.66 //@members.99"/>
83 <members age="195" children="//@members.2 //@members.8 //@members.15 //@members.23 //@members.38 //@members.43 //@members.54 //@members.85 //@members.86 //@members.94" parents="//@members.27 //@members.29"/>
84 <members age="39" children="//@members.44" parents="//@members.66 //@members.85"/>
85 <members parents="//@members.11 //@members.44"/>
86 <members age="26" children="//@members.55 //@members.64 //@members.92" parents="//@members.2 //@members.65"/>
87 <members age="221" children="//@members.29" parents="//@members.27 //@members.67"/>
88 <members age="143" children="//@members.12 //@members.18 //@members.19 //@members.42 //@members.43 //@members.65 //@members.69 //@members.77 //@members.81 //@members.88" parents="//@members.80 //@members.94"/>
89 <members age="169" children="//@members.7 //@members.30 //@members.39 //@members.52 //@members.53 //@members.74 //@members.94" parents="//@members.2 //@members.80"/>
90 <members parents="//@members.0 //@members.97"/>
91 <members age="13" children="//@members.58 //@members.72 //@members.90" parents="//@members.0 //@members.85"/>
92 <members age="26" children="//@members.37 //@members.95" parents="//@members.94 //@members.97"/>
93 <members parents="//@members.4 //@members.88"/>
94 <members age="26" children="//@members.37" parents="//@members.2 //@members.29"/>
95 <members age="13" children="//@members.75" parents="//@members.18 //@members.83"/>
96 <members parents="//@members.15 //@members.60"/>
97 <members age="156" children="//@members.0 //@members.9 //@members.16 //@members.40 //@members.42 //@members.71 //@members.74 //@members.85 //@members.89 //@members.99" parents="//@members.80 //@members.86"/>
98 <members age="13" children="//@members.1" parents="//@members.44 //@members.89"/>
99 <members age="91" children="//@members.35 //@members.50 //@members.69" parents="//@members.43 //@members.77"/>
100 <members age="39" children="//@members.10 //@members.32 //@members.49 //@members.87 //@members.89" parents="//@members.33 //@members.53"/>
101 <members age="39" children="//@members.23 //@members.68" parents="//@members.4 //@members.40"/>
102 <members age="13" children="//@members.79" parents="//@members.33 //@members.94"/>
103</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/6_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/6_1.xmi
new file mode 100644
index 00000000..4e1092cb
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/6_1.xmi
@@ -0,0 +1,103 @@
1<?xml version="1.0" encoding="ASCII"?>
2<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree ../case.study.familyTree.model/model/familytree.ecore">
3 <members age="26" children="//@members.6" parents="//@members.16 //@members.79"/>
4 <members age="13" children="//@members.66" parents="//@members.36 //@members.91"/>
5 <members age="39" children="//@members.49 //@members.51" parents="//@members.64 //@members.72"/>
6 <members age="65" children="//@members.54 //@members.58 //@members.60 //@members.70 //@members.72 //@members.88" parents="//@members.64 //@members.85"/>
7 <members age="26" children="//@members.83 //@members.98" parents="//@members.45 //@members.87"/>
8 <members parents="//@members.26 //@members.83"/>
9 <members age="13" children="//@members.19" parents="//@members.0 //@members.45"/>
10 <members age="65" children="//@members.8 //@members.17 //@members.20 //@members.27" parents="//@members.26 //@members.80"/>
11 <members parents="//@members.7 //@members.14"/>
12 <members age="26" children="//@members.73 //@members.93 //@members.95" parents="//@members.25 //@members.68"/>
13 <members parents="//@members.70 //@members.80"/>
14 <members age="143" children="//@members.16 //@members.23 //@members.24 //@members.26 //@members.68 //@members.82 //@members.85 //@members.95" parents="//@members.43 //@members.80"/>
15 <members age="26" children="//@members.82 //@members.88" parents="//@members.50 //@members.94"/>
16 <members parents="//@members.71 //@members.85"/>
17 <members age="13" children="//@members.8" parents="//@members.69 //@members.70"/>
18 <members age="39" children="//@members.57" parents="//@members.54 //@members.70"/>
19 <members age="117" children="//@members.0 //@members.26 //@members.40 //@members.68 //@members.76 //@members.78 //@members.92 //@members.94" parents="//@members.11 //@members.85"/>
20 <members age="13" children="//@members.35 //@members.38" parents="//@members.7 //@members.55"/>
21 <members age="234" children="//@members.59 //@members.71 //@members.86"/>
22 <members parents="//@members.6"/>
23 <members age="13" children="//@members.28" parents="//@members.7 //@members.87"/>
24 <members age="13" children="//@members.89" parents="//@members.59 //@members.97"/>
25 <members parents="//@members.43 //@members.92"/>
26 <members age="13" children="//@members.89" parents="//@members.11 //@members.71"/>
27 <members age="39" children="//@members.33 //@members.97" parents="//@members.11 //@members.85"/>
28 <members age="39" children="//@members.9" parents="//@members.43 //@members.78"/>
29 <members age="104" children="//@members.5 //@members.7 //@members.36 //@members.45 //@members.53" parents="//@members.11 //@members.16"/>
30 <members age="52" children="//@members.62 //@members.65 //@members.98 //@members.99" parents="//@members.7 //@members.91"/>
31 <members parents="//@members.20 //@members.77"/>
32 <members parents="//@members.64 //@members.84"/>
33 <members age="13" children="//@members.74" parents="//@members.72 //@members.90"/>
34 <members parents="//@members.64 //@members.97"/>
35 <members parents="//@members.93 //@members.99"/>
36 <members parents="//@members.24 //@members.46"/>
37 <members parents="//@members.69 //@members.72"/>
38 <members parents="//@members.17 //@members.85"/>
39 <members age="65" children="//@members.1 //@members.53 //@members.55 //@members.79" parents="//@members.26 //@members.85"/>
40 <members parents="//@members.39 //@members.88"/>
41 <members parents="//@members.17 //@members.47"/>
42 <members age="13" children="//@members.37 //@members.56" parents="//@members.43 //@members.77"/>
43 <members age="78" children="//@members.48 //@members.72 //@members.84 //@members.90 //@members.91" parents="//@members.16 //@members.45"/>
44 <members parents="//@members.46 //@members.71"/>
45 <members parents="//@members.43 //@members.54"/>
46 <members age="156" children="//@members.11 //@members.22 //@members.25 //@members.39 //@members.42 //@members.47 //@members.87 //@members.90 //@members.94" parents="//@members.77 //@members.80"/>
47 <members age="13" children="//@members.51 //@members.86" parents="//@members.84 //@members.92"/>
48 <members age="91" children="//@members.4 //@members.6 //@members.40 //@members.60 //@members.63 //@members.64 //@members.92" parents="//@members.26 //@members.85"/>
49 <members age="13" children="//@members.33 //@members.41" parents="//@members.49 //@members.57"/>
50 <members age="13" children="//@members.38" parents="//@members.43 //@members.54"/>
51 <members parents="//@members.40 //@members.80"/>
52 <members age="26" children="//@members.46 //@members.52 //@members.81 //@members.96" parents="//@members.2 //@members.62"/>
53 <members age="39" children="//@members.12" parents="//@members.53 //@members.85"/>
54 <members parents="//@members.2 //@members.44"/>
55 <members parents="//@members.49 //@members.76"/>
56 <members age="52" children="//@members.50 //@members.67" parents="//@members.26 //@members.36"/>
57 <members age="52" children="//@members.15 //@members.42 //@members.47 //@members.57" parents="//@members.3 //@members.78"/>
58 <members age="52" children="//@members.17 //@members.63 //@members.87" parents="//@members.36 //@members.64"/>
59 <members parents="//@members.39 //@members.90"/>
60 <members age="26" children="//@members.46" parents="//@members.15 //@members.54"/>
61 <members parents="//@members.3 //@members.61"/>
62 <members age="221" children="//@members.21 //@members.71 //@members.77" parents="//@members.18"/>
63 <members parents="//@members.3 //@members.45"/>
64 <members age="182" children="//@members.58 //@members.80 //@members.91" parents="//@members.71 //@members.77"/>
65 <members age="39" children="//@members.49 //@members.73 //@members.99" parents="//@members.27 //@members.77"/>
66 <members parents="//@members.45 //@members.55"/>
67 <members age="78" children="//@members.2 //@members.3 //@members.29 //@members.31 //@members.55 //@members.79" parents="//@members.45 //@members.78"/>
68 <members age="13" children="//@members.66" parents="//@members.27 //@members.94"/>
69 <members parents="//@members.1 //@members.65"/>
70 <members parents="//@members.53 //@members.95"/>
71 <members age="104" children="//@members.9 //@members.78" parents="//@members.11 //@members.16"/>
72 <members age="26" children="//@members.14 //@members.34" parents="//@members.84 //@members.94"/>
73 <members age="52" children="//@members.10 //@members.14 //@members.15" parents="//@members.3 //@members.94"/>
74 <members age="208" children="//@members.13 //@members.23 //@members.41 //@members.61 //@members.77" parents="//@members.18 //@members.59"/>
75 <members age="52" children="//@members.2 //@members.30 //@members.34 //@members.75" parents="//@members.3 //@members.40"/>
76 <members parents="//@members.9 //@members.62"/>
77 <members parents="//@members.30 //@members.95"/>
78 <members age="26" children="//@members.76" parents="//@members.72 //@members.91"/>
79 <members age="13" children="//@members.52" parents="//@members.16 //@members.75"/>
80 <members age="195" children="//@members.28 //@members.39 //@members.43 //@members.61 //@members.62 //@members.80 //@members.83" parents="//@members.59 //@members.71"/>
81 <members age="91" children="//@members.25 //@members.54 //@members.64" parents="//@members.16 //@members.68"/>
82 <members age="39" children="//@members.0" parents="//@members.36 //@members.64"/>
83 <members age="169" children="//@members.7 //@members.10 //@members.11 //@members.43 //@members.48 //@members.85" parents="//@members.61 //@members.77"/>
84 <members parents="//@members.49 //@members.92"/>
85 <members parents="//@members.11 //@members.12"/>
86 <members age="13" children="//@members.5" parents="//@members.4 //@members.77"/>
87 <members age="39" children="//@members.29 //@members.44 //@members.69" parents="//@members.40 //@members.91"/>
88 <members age="130" children="//@members.3 //@members.13 //@members.16 //@members.24 //@members.35 //@members.36 //@members.45 //@members.50" parents="//@members.11 //@members.80"/>
89 <members parents="//@members.18 //@members.44"/>
90 <members age="39" children="//@members.4 //@members.20" parents="//@members.43 //@members.55"/>
91 <members age="13" children="//@members.37" parents="//@members.3 //@members.12"/>
92 <members parents="//@members.21 //@members.23"/>
93 <members age="26" children="//@members.30 //@members.56 //@members.93" parents="//@members.40 //@members.43"/>
94 <members age="65" children="//@members.1 //@members.27 //@members.75 //@members.84" parents="//@members.40 //@members.61"/>
95 <members age="26" children="//@members.22 //@members.44 //@members.81" parents="//@members.16 //@members.45"/>
96 <members age="13" children="//@members.32" parents="//@members.9 //@members.90"/>
97 <members age="65" children="//@members.12 //@members.65 //@members.69 //@members.70 //@members.97" parents="//@members.16 //@members.43"/>
98 <members age="13" children="//@members.67 //@members.74" parents="//@members.9 //@members.11"/>
99 <members parents="//@members.49 //@members.97"/>
100 <members age="26" children="//@members.21 //@members.31 //@members.96" parents="//@members.24 //@members.94"/>
101 <members parents="//@members.4 //@members.27"/>
102 <members age="13" children="//@members.32" parents="//@members.27 //@members.62"/>
103</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/7_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/7_1.xmi
new file mode 100644
index 00000000..3db68771
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/7_1.xmi
@@ -0,0 +1,103 @@
1<?xml version="1.0" encoding="ASCII"?>
2<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree ../case.study.familyTree.model/model/familytree.ecore">
3 <members age="13" children="//@members.73 //@members.99" parents="//@members.65 //@members.71"/>
4 <members age="65" children="//@members.66" parents="//@members.48 //@members.97"/>
5 <members age="117" children="//@members.11 //@members.19 //@members.38 //@members.52 //@members.60 //@members.79 //@members.88 //@members.93 //@members.97" parents="//@members.3 //@members.44"/>
6 <members age="143" children="//@members.2 //@members.19 //@members.21 //@members.37 //@members.44 //@members.71 //@members.75 //@members.88" parents="//@members.27 //@members.48"/>
7 <members age="13" children="//@members.51" parents="//@members.67 //@members.97"/>
8 <members parents="//@members.16 //@members.44"/>
9 <members parents="//@members.84"/>
10 <members age="13" children="//@members.18 //@members.25" parents="//@members.44 //@members.57"/>
11 <members age="65" children="//@members.24 //@members.38 //@members.65 //@members.67 //@members.89" parents="//@members.19 //@members.27"/>
12 <members parents="//@members.21 //@members.53"/>
13 <members parents="//@members.14 //@members.80"/>
14 <members age="39" children="//@members.16 //@members.33 //@members.70" parents="//@members.2 //@members.27"/>
15 <members age="39" children="//@members.75 //@members.85" parents="//@members.19 //@members.89"/>
16 <members age="39" children="//@members.16 //@members.24 //@members.43 //@members.59 //@members.68" parents="//@members.17 //@members.91"/>
17 <members age="13" children="//@members.10 //@members.77 //@members.98" parents="//@members.38 //@members.72"/>
18 <members parents="//@members.35 //@members.85"/>
19 <members age="13" children="//@members.5" parents="//@members.11 //@members.13"/>
20 <members age="65" children="//@members.13 //@members.36 //@members.49 //@members.59 //@members.61 //@members.87" parents="//@members.44 //@members.71"/>
21 <members parents="//@members.7 //@members.62"/>
22 <members age="104" children="//@members.8 //@members.12 //@members.50 //@members.57 //@members.64 //@members.84 //@members.86" parents="//@members.2 //@members.3"/>
23 <members age="13" children="//@members.56" parents="//@members.58 //@members.87"/>
24 <members age="13" children="//@members.9" parents="//@members.3 //@members.62"/>
25 <members parents="//@members.30 //@members.35"/>
26 <members age="13" children="//@members.26 //@members.31 //@members.99" parents="//@members.43 //@members.52"/>
27 <members age="13" children="//@members.55 //@members.90" parents="//@members.8 //@members.13"/>
28 <members parents="//@members.7 //@members.92"/>
29 <members parents="//@members.23 //@members.87"/>
30 <members age="156" children="//@members.3 //@members.8 //@members.11 //@members.44 //@members.57" parents="//@members.48 //@members.69"/>
31 <members parents="//@members.71 //@members.88"/>
32 <members age="221" children="//@members.69 //@members.91"/>
33 <members age="65" children="//@members.22 //@members.66 //@members.90 //@members.92" parents="//@members.64 //@members.88"/>
34 <members parents="//@members.23 //@members.71"/>
35 <members parents="//@members.70 //@members.86"/>
36 <members age="13" children="//@members.34 //@members.94" parents="//@members.11 //@members.86"/>
37 <members parents="//@members.33 //@members.71"/>
38 <members age="13" children="//@members.15 //@members.22" parents="//@members.86 //@members.87"/>
39 <members parents="//@members.17 //@members.86"/>
40 <members parents="//@members.3 //@members.71"/>
41 <members age="26" children="//@members.14" parents="//@members.2 //@members.8"/>
42 <members parents="//@members.43 //@members.86"/>
43 <members age="26" children="//@members.81" parents="//@members.64 //@members.83"/>
44 <members age="13" children="//@members.76" parents="//@members.63 //@members.70"/>
45 <members parents="//@members.57 //@members.86"/>
46 <members age="26" children="//@members.23 //@members.39 //@members.96" parents="//@members.13 //@members.52"/>
47 <members age="130" children="//@members.2 //@members.5 //@members.7 //@members.17 //@members.49" parents="//@members.3 //@members.27"/>
48 <members parents="//@members.65 //@members.71"/>
49 <members parents="//@members.86 //@members.88"/>
50 <members parents="//@members.88 //@members.97"/>
51 <members age="169" children="//@members.1 //@members.3 //@members.27 //@members.54 //@members.97" parents="//@members.69 //@members.74"/>
52 <members age="52" children="//@members.62 //@members.63" parents="//@members.17 //@members.44"/>
53 <members age="26" children="//@members.53" parents="//@members.19 //@members.74"/>
54 <members parents="//@members.4 //@members.87"/>
55 <members age="39" children="//@members.23 //@members.43 //@members.78 //@members.80" parents="//@members.2 //@members.74"/>
56 <members age="13" children="//@members.9 //@members.95" parents="//@members.50 //@members.67"/>
57 <members age="13" children="//@members.76" parents="//@members.48 //@members.78"/>
58 <members parents="//@members.24 //@members.84"/>
59 <members parents="//@members.20 //@members.71"/>
60 <members age="91" children="//@members.7 //@members.42 //@members.64" parents="//@members.19 //@members.27"/>
61 <members age="26" children="//@members.20" parents="//@members.74 //@members.97"/>
62 <members parents="//@members.13 //@members.17"/>
63 <members parents="//@members.2 //@members.81"/>
64 <members parents="//@members.17 //@members.87"/>
65 <members age="39" children="//@members.18 //@members.21 //@members.70" parents="//@members.49 //@members.66"/>
66 <members age="26" children="//@members.41 //@members.94" parents="//@members.49 //@members.97"/>
67 <members age="78" children="//@members.30 //@members.40 //@members.83" parents="//@members.19 //@members.57"/>
68 <members age="26" children="//@members.0 //@members.45" parents="//@members.8 //@members.86"/>
69 <members age="52" children="//@members.62 //@members.96" parents="//@members.1 //@members.30"/>
70 <members age="26" children="//@members.4 //@members.53 //@members.77" parents="//@members.8 //@members.97"/>
71 <members parents="//@members.13 //@members.87"/>
72 <members age="195" children="//@members.27 //@members.48 //@members.74" parents="//@members.29 //@members.91"/>
73 <members age="26" children="//@members.32 //@members.41" parents="//@members.11 //@members.62"/>
74 <members age="78" children="//@members.0 //@members.17 //@members.28 //@members.31 //@members.34 //@members.37 //@members.45 //@members.56 //@members.84" parents="//@members.3 //@members.88"/>
75 <members age="26" children="//@members.14" parents="//@members.86 //@members.97"/>
76 <members parents="//@members.0 //@members.86"/>
77 <members age="182" children="//@members.48 //@members.50 //@members.52 //@members.58 //@members.87 //@members.98" parents="//@members.69 //@members.91"/>
78 <members age="26" children="//@members.80" parents="//@members.3 //@members.12"/>
79 <members parents="//@members.41 //@members.54"/>
80 <members parents="//@members.14 //@members.67"/>
81 <members age="26" children="//@members.54 //@members.81" parents="//@members.52 //@members.88"/>
82 <members parents="//@members.2 //@members.81"/>
83 <members age="13" children="//@members.10" parents="//@members.52 //@members.75"/>
84 <members age="13" children="//@members.60 //@members.79" parents="//@members.40 //@members.78"/>
85 <members parents="//@members.84 //@members.86"/>
86 <members age="39" children="//@members.40" parents="//@members.64 //@members.88"/>
87 <members age="13" children="//@members.6 //@members.55 //@members.82" parents="//@members.19 //@members.71"/>
88 <members age="13" children="//@members.15" parents="//@members.12 //@members.97"/>
89 <members age="65" children="//@members.32 //@members.33 //@members.35 //@members.36 //@members.39 //@members.42 //@members.46 //@members.65 //@members.72 //@members.73 //@members.82 //@members.89" parents="//@members.19 //@members.91"/>
90 <members age="26" children="//@members.20 //@members.26 //@members.35 //@members.51 //@members.61 //@members.68 //@members.93" parents="//@members.17 //@members.74"/>
91 <members age="91" children="//@members.28 //@members.30 //@members.46 //@members.47 //@members.71 //@members.78 //@members.83" parents="//@members.2 //@members.3"/>
92 <members age="52" children="//@members.12" parents="//@members.8 //@members.86"/>
93 <members parents="//@members.24 //@members.30"/>
94 <members age="208" children="//@members.13 //@members.69 //@members.74 //@members.86 //@members.92 //@members.95" parents="//@members.29"/>
95 <members age="13" children="//@members.25" parents="//@members.30 //@members.91"/>
96 <members parents="//@members.2 //@members.87"/>
97 <members parents="//@members.33 //@members.63"/>
98 <members parents="//@members.53 //@members.91"/>
99 <members parents="//@members.43 //@members.66"/>
100 <members age="78" children="//@members.1 //@members.4 //@members.47 //@members.58 //@members.63 //@members.67 //@members.72 //@members.85" parents="//@members.2 //@members.48"/>
101 <members parents="//@members.14 //@members.74"/>
102 <members parents="//@members.0 //@members.23"/>
103</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/8_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/8_1.xmi
new file mode 100644
index 00000000..383b6c76
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/8_1.xmi
@@ -0,0 +1,103 @@
1<?xml version="1.0" encoding="ASCII"?>
2<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree ../case.study.familyTree.model/model/familytree.ecore">
3 <members age="78" children="//@members.27 //@members.77 //@members.79" parents="//@members.40 //@members.61"/>
4 <members age="208" children="//@members.6 //@members.7 //@members.19 //@members.30 //@members.37 //@members.61 //@members.63" parents="//@members.71 //@members.86"/>
5 <members age="26" children="//@members.26" parents="//@members.42 //@members.61"/>
6 <members age="117" children="//@members.61" parents="//@members.7 //@members.70"/>
7 <members age="39" children="//@members.11 //@members.34 //@members.96" parents="//@members.70 //@members.71"/>
8 <members age="13" children="//@members.69" parents="//@members.62 //@members.66"/>
9 <members age="169" children="//@members.42 //@members.43 //@members.65 //@members.68 //@members.78 //@members.87 //@members.89 //@members.99" parents="//@members.1 //@members.19"/>
10 <members age="195" children="//@members.3 //@members.19 //@members.20 //@members.25 //@members.55 //@members.57 //@members.87 //@members.95 //@members.97" parents="//@members.1 //@members.71"/>
11 <members age="13" children="//@members.77" parents="//@members.78 //@members.95"/>
12 <members parents="//@members.15 //@members.17"/>
13 <members age="52" children="//@members.94" parents="//@members.42 //@members.57"/>
14 <members parents="//@members.4 //@members.46"/>
15 <members parents="//@members.74 //@members.86"/>
16 <members parents="//@members.38 //@members.54"/>
17 <members age="13" children="//@members.82" parents="//@members.17 //@members.34"/>
18 <members age="65" children="//@members.9 //@members.28" parents="//@members.19 //@members.70"/>
19 <members parents="//@members.27 //@members.50"/>
20 <members age="52" children="//@members.9 //@members.14 //@members.49" parents="//@members.31 //@members.89"/>
21 <members age="247" children="//@members.71 //@members.86"/>
22 <members age="182" children="//@members.6 //@members.15 //@members.30 //@members.46 //@members.70 //@members.93 //@members.98 //@members.99" parents="//@members.1 //@members.7"/>
23 <members age="39" children="//@members.66" parents="//@members.7 //@members.32"/>
24 <members parents="//@members.61 //@members.74"/>
25 <members age="91" children="//@members.41 //@members.83 //@members.85 //@members.96 //@members.98" parents="//@members.42 //@members.74"/>
26 <members parents="//@members.40 //@members.83"/>
27 <members parents="//@members.55 //@members.57"/>
28 <members age="39" children="//@members.81" parents="//@members.7 //@members.63"/>
29 <members age="13" children="//@members.76" parents="//@members.2 //@members.97"/>
30 <members age="65" children="//@members.16 //@members.34 //@members.43 //@members.67 //@members.79" parents="//@members.0 //@members.41"/>
31 <members age="52" children="//@members.55 //@members.62 //@members.94" parents="//@members.15 //@members.42"/>
32 <members parents="//@members.42 //@members.56"/>
33 <members age="13" children="//@members.51" parents="//@members.1 //@members.19"/>
34 <members age="65" children="//@members.17 //@members.38 //@members.62 //@members.73" parents="//@members.42 //@members.71"/>
35 <members age="52" children="//@members.20 //@members.92" parents="//@members.70 //@members.89"/>
36 <members age="13" children="//@members.82" parents="//@members.53 //@members.97"/>
37 <members age="26" children="//@members.14" parents="//@members.4 //@members.27"/>
38 <members age="39" children="//@members.50 //@members.53 //@members.59" parents="//@members.70 //@members.90"/>
39 <members age="26" children="//@members.75" parents="//@members.41 //@members.87"/>
40 <members parents="//@members.1 //@members.61"/>
41 <members age="13" children="//@members.13" parents="//@members.31 //@members.71"/>
42 <members parents="//@members.57 //@members.75"/>
43 <members age="91" children="//@members.0 //@members.23 //@members.44" parents="//@members.61 //@members.70"/>
44 <members age="78" children="//@members.27 //@members.36 //@members.58 //@members.59 //@members.76" parents="//@members.22 //@members.87"/>
45 <members age="117" children="//@members.2 //@members.10 //@members.22 //@members.28 //@members.29 //@members.31 //@members.49 //@members.74" parents="//@members.6 //@members.99"/>
46 <members age="52" children="//@members.69 //@members.85" parents="//@members.6 //@members.27"/>
47 <members parents="//@members.40 //@members.50"/>
48 <members parents="//@members.47 //@members.78"/>
49 <members age="13" children="//@members.11 //@members.51" parents="//@members.19 //@members.81"/>
50 <members age="13" children="//@members.45 //@members.60 //@members.91" parents="//@members.90 //@members.96"/>
51 <members parents="//@members.54 //@members.75"/>
52 <members age="39" children="//@members.64" parents="//@members.17 //@members.42"/>
53 <members age="13" children="//@members.16 //@members.44" parents="//@members.35 //@members.64"/>
54 <members parents="//@members.30 //@members.46"/>
55 <members parents="//@members.89 //@members.98"/>
56 <members age="26" children="//@members.33 //@members.80" parents="//@members.35 //@members.85"/>
57 <members age="13" children="//@members.13 //@members.48" parents="//@members.68 //@members.78"/>
58 <members age="13" children="//@members.24" parents="//@members.7 //@members.28"/>
59 <members age="39" children="//@members.29 //@members.66 //@members.92" parents="//@members.57 //@members.93"/>
60 <members age="65" children="//@members.10 //@members.24 //@members.39 //@members.56 //@members.80 //@members.83" parents="//@members.7 //@members.70"/>
61 <members age="13" children="//@members.73" parents="//@members.41 //@members.88"/>
62 <members parents="//@members.35 //@members.41"/>
63 <members parents="//@members.47 //@members.96"/>
64 <members age="104" children="//@members.0 //@members.2 //@members.21 //@members.37 //@members.40 //@members.88" parents="//@members.1 //@members.3"/>
65 <members age="26" children="//@members.5" parents="//@members.28 //@members.31"/>
66 <members age="52" children="//@members.25" parents="//@members.1 //@members.99"/>
67 <members age="26" children="//@members.50" parents="//@members.49 //@members.72"/>
68 <members parents="//@members.6 //@members.92"/>
69 <members age="26" children="//@members.5" parents="//@members.20 //@members.56"/>
70 <members parents="//@members.27 //@members.90"/>
71 <members age="26" children="//@members.54" parents="//@members.6 //@members.86"/>
72 <members parents="//@members.5 //@members.43"/>
73 <members age="130" children="//@members.3 //@members.4 //@members.15 //@members.32 //@members.35 //@members.40 //@members.57 //@members.74 //@members.90" parents="//@members.19 //@members.93"/>
74 <members age="221" children="//@members.1 //@members.4 //@members.7 //@members.31 //@members.38" parents="//@members.18 //@members.86"/>
75 <members age="39" children="//@members.64" parents="//@members.89 //@members.93"/>
76 <members parents="//@members.31 //@members.58"/>
77 <members age="104" children="//@members.12 //@members.21 //@members.22 //@members.90" parents="//@members.42 //@members.70"/>
78 <members age="13" children="//@members.39 //@members.48" parents="//@members.36 //@members.79"/>
79 <members parents="//@members.26 //@members.41"/>
80 <members parents="//@members.0 //@members.8"/>
81 <members age="26" children="//@members.8 //@members.45 //@members.54" parents="//@members.6 //@members.95"/>
82 <members age="26" children="//@members.75" parents="//@members.0 //@members.27"/>
83 <members parents="//@members.53 //@members.57"/>
84 <members age="26" children="//@members.46" parents="//@members.25 //@members.86"/>
85 <members parents="//@members.14 //@members.33"/>
86 <members age="13" children="//@members.23" parents="//@members.22 //@members.57"/>
87 <members parents="//@members.93"/>
88 <members age="39" children="//@members.53" parents="//@members.22 //@members.43"/>
89 <members age="234" children="//@members.1 //@members.12 //@members.68 //@members.71 //@members.81" parents="//@members.18"/>
90 <members age="91" children="//@members.36 //@members.41" parents="//@members.6 //@members.7"/>
91 <members age="26" children="//@members.58" parents="//@members.61 //@members.90"/>
92 <members age="65" children="//@members.17 //@members.32 //@members.52 //@members.72" parents="//@members.6 //@members.90"/>
93 <members age="78" children="//@members.35 //@members.47 //@members.67 //@members.88 //@members.89" parents="//@members.70 //@members.74"/>
94 <members parents="//@members.47 //@members.96"/>
95 <members age="13" children="//@members.65" parents="//@members.32 //@members.56"/>
96 <members age="143" children="//@members.56 //@members.70 //@members.72 //@members.84 //@members.95" parents="//@members.19 //@members.99"/>
97 <members age="39" children="//@members.97" parents="//@members.10 //@members.28"/>
98 <members age="39" children="//@members.8 //@members.78" parents="//@members.7 //@members.93"/>
99 <members age="26" children="//@members.47 //@members.60 //@members.91" parents="//@members.4 //@members.22"/>
100 <members age="26" children="//@members.26 //@members.33" parents="//@members.7 //@members.94"/>
101 <members age="13" children="//@members.52" parents="//@members.19 //@members.22"/>
102 <members age="156" children="//@members.42 //@members.63 //@members.93" parents="//@members.6 //@members.19"/>
103</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/9_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/9_1.xmi
new file mode 100644
index 00000000..8b884bb4
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTree/9_1.xmi
@@ -0,0 +1,103 @@
1<?xml version="1.0" encoding="ASCII"?>
2<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree ../case.study.familyTree.model/model/familytree.ecore">
3 <members age="13" children="//@members.38" parents="//@members.12 //@members.73"/>
4 <members age="78" children="//@members.25 //@members.35 //@members.70" parents="//@members.4 //@members.62"/>
5 <members age="52" children="//@members.82" parents="//@members.9 //@members.40"/>
6 <members parents="//@members.7 //@members.59"/>
7 <members age="91" children="//@members.1 //@members.16 //@members.29 //@members.94" parents="//@members.13 //@members.15"/>
8 <members age="78" children="//@members.70" parents="//@members.23 //@members.64"/>
9 <members age="26" children="//@members.8 //@members.68" parents="//@members.49 //@members.74"/>
10 <members age="13" children="//@members.3 //@members.80" parents="//@members.49 //@members.54"/>
11 <members age="13" children="//@members.21 //@members.48" parents="//@members.6 //@members.84"/>
12 <members age="117" children="//@members.2 //@members.42 //@members.58 //@members.61 //@members.83" parents="//@members.10 //@members.84"/>
13 <members age="130" children="//@members.9 //@members.86 //@members.87" parents="//@members.53 //@members.88"/>
14 <members parents="//@members.78 //@members.90"/>
15 <members age="78" children="//@members.0 //@members.83" parents="//@members.88 //@members.95"/>
16 <members age="156" children="//@members.4 //@members.44 //@members.62 //@members.87" parents="//@members.15 //@members.73"/>
17 <members parents="//@members.63 //@members.69"/>
18 <members age="221" children="//@members.4 //@members.13 //@members.35 //@members.73 //@members.78 //@members.88 //@members.95 //@members.97" parents="//@members.17 //@members.54"/>
19 <members age="13" children="//@members.37" parents="//@members.4 //@members.35"/>
20 <members age="247" children="//@members.15 //@members.54 //@members.71"/>
21 <members age="65" children="//@members.58 //@members.89" parents="//@members.67 //@members.88"/>
22 <members age="26" children="//@members.98" parents="//@members.56 //@members.82"/>
23 <members age="13" children="//@members.68" parents="//@members.46 //@members.95"/>
24 <members parents="//@members.8 //@members.75"/>
25 <members age="169" children="//@members.69 //@members.93 //@members.95 //@members.99" parents="//@members.53 //@members.73"/>
26 <members age="117" children="//@members.5 //@members.33 //@members.39 //@members.45 //@members.47 //@members.90" parents="//@members.50 //@members.76"/>
27 <members age="26" children="//@members.30 //@members.86" parents="//@members.49 //@members.66"/>
28 <members parents="//@members.1 //@members.88"/>
29 <members parents="//@members.98"/>
30 <members parents="//@members.28 //@members.35"/>
31 <members age="13" children="//@members.27" parents="//@members.29 //@members.97"/>
32 <members age="26" children="//@members.28" parents="//@members.4 //@members.35"/>
33 <members parents="//@members.24 //@members.35"/>
34 <members parents="//@members.75 //@members.77"/>
35 <members age="91" children="//@members.67" parents="//@members.55 //@members.87"/>
36 <members parents="//@members.23 //@members.82"/>
37 <members parents="//@members.59 //@members.86"/>
38 <members age="39" children="//@members.16 //@members.27 //@members.29 //@members.30" parents="//@members.1 //@members.15"/>
39 <members parents="//@members.53 //@members.73"/>
40 <members parents="//@members.16 //@members.78"/>
41 <members parents="//@members.0 //@members.43"/>
42 <members age="26" children="//@members.51" parents="//@members.23 //@members.50"/>
43 <members age="65" children="//@members.2 //@members.43" parents="//@members.52 //@members.87"/>
44 <members parents="//@members.88 //@members.95"/>
45 <members age="26" children="//@members.75" parents="//@members.9 //@members.62"/>
46 <members age="13" children="//@members.38" parents="//@members.40 //@members.73"/>
47 <members age="13" children="//@members.72" parents="//@members.13 //@members.50"/>
48 <members age="13" children="//@members.65" parents="//@members.23 //@members.83"/>
49 <members age="117" children="//@members.20 //@members.47 //@members.48" parents="//@members.55 //@members.73"/>
50 <members age="104" children="//@members.92" parents="//@members.23 //@members.46"/>
51 <members parents="//@members.8 //@members.46"/>
52 <members age="156" children="//@members.6 //@members.7 //@members.24 //@members.62 //@members.81 //@members.84" parents="//@members.53 //@members.78"/>
53 <members age="130" children="//@members.23 //@members.39 //@members.44 //@members.60" parents="//@members.55 //@members.78"/>
54 <members age="13" children="//@members.81" parents="//@members.39 //@members.61"/>
55 <members age="78" children="//@members.40" parents="//@members.53 //@members.92"/>
56 <members age="182" children="//@members.10 //@members.22 //@members.36 //@members.49 //@members.52 //@members.66 //@members.76 //@members.84" parents="//@members.73 //@members.78"/>
57 <members age="234" children="//@members.7 //@members.15 //@members.78 //@members.94" parents="//@members.17"/>
58 <members age="143" children="//@members.32 //@members.46 //@members.50 //@members.59" parents="//@members.73 //@members.76"/>
59 <members age="39" children="//@members.19" parents="//@members.59 //@members.73"/>
60 <members age="13" children="//@members.71" parents="//@members.62 //@members.93"/>
61 <members parents="//@members.9 //@members.18"/>
62 <members age="65" children="//@members.3 //@members.34 //@members.56 //@members.79" parents="//@members.55 //@members.73"/>
63 <members age="13" children="//@members.85" parents="//@members.50 //@members.66"/>
64 <members age="104" children="//@members.51 //@members.92" parents="//@members.9 //@members.66"/>
65 <members age="143" children="//@members.1 //@members.42 //@members.57 //@members.74 //@members.99" parents="//@members.13 //@members.49"/>
66 <members age="13" children="//@members.14" parents="//@members.69 //@members.73"/>
67 <members age="91" children="//@members.5" parents="//@members.95 //@members.97"/>
68 <members parents="//@members.45 //@members.97"/>
69 <members age="117" children="//@members.24 //@members.60 //@members.61 //@members.80" parents="//@members.53 //@members.74"/>
70 <members age="78" children="//@members.18" parents="//@members.32 //@members.69"/>
71 <members parents="//@members.6 //@members.20"/>
72 <members age="91" children="//@members.14 //@members.63 //@members.67" parents="//@members.22 //@members.78"/>
73 <members age="65" children="//@members.75 //@members.79" parents="//@members.1 //@members.5"/>
74 <members parents="//@members.17 //@members.57"/>
75 <members parents="//@members.44 //@members.74"/>
76 <members age="195" children="//@members.0 //@members.13 //@members.22 //@members.36 //@members.43 //@members.46 //@members.53 //@members.55 //@members.56 //@members.59 //@members.63 //@members.76" parents="//@members.15 //@members.78"/>
77 <members age="130" children="//@members.6 //@members.66 //@members.72 //@members.77" parents="//@members.62 //@members.97"/>
78 <members age="13" children="//@members.21 //@members.31" parents="//@members.42 //@members.70"/>
79 <members age="156" children="//@members.23 //@members.55 //@members.90" parents="//@members.53 //@members.73"/>
80 <members age="13" children="//@members.31" parents="//@members.74 //@members.89"/>
81 <members age="208" children="//@members.11 //@members.37 //@members.49 //@members.50 //@members.53 //@members.69 //@members.73 //@members.88" parents="//@members.15 //@members.54"/>
82 <members age="52" children="//@members.91 //@members.96" parents="//@members.59 //@members.70"/>
83 <members parents="//@members.7 //@members.66"/>
84 <members parents="//@members.49 //@members.51"/>
85 <members age="39" children="//@members.19 //@members.33" parents="//@members.2 //@members.89"/>
86 <members age="65" children="//@members.45 //@members.89" parents="//@members.9 //@members.12"/>
87 <members age="130" children="//@members.8 //@members.9 //@members.91" parents="//@members.49 //@members.53"/>
88 <members parents="//@members.60 //@members.87"/>
89 <members age="13" children="//@members.34" parents="//@members.10 //@members.24"/>
90 <members age="104" children="//@members.32 //@members.40 //@members.85" parents="//@members.10 //@members.13"/>
91 <members age="143" children="//@members.10 //@members.12 //@members.18 //@members.25 //@members.41" parents="//@members.15 //@members.78"/>
92 <members age="52" children="//@members.77 //@members.82" parents="//@members.18 //@members.83"/>
93 <members age="13" children="//@members.11" parents="//@members.23 //@members.76"/>
94 <members age="39" children="//@members.93" parents="//@members.79 //@members.84"/>
95 <members age="91" children="//@members.52" parents="//@members.47 //@members.61"/>
96 <members age="26" children="//@members.57 //@members.96" parents="//@members.22 //@members.91"/>
97 <members parents="//@members.4 //@members.54"/>
98 <members age="156" children="//@members.12 //@members.20 //@members.41 //@members.64 //@members.97" parents="//@members.15 //@members.22"/>
99 <members parents="//@members.79 //@members.93"/>
100 <members age="143" children="//@members.28 //@members.64 //@members.65 //@members.74 //@members.98" parents="//@members.15 //@members.95"/>
101 <members age="13" children="//@members.26" parents="//@members.19 //@members.97"/>
102 <members parents="//@members.22 //@members.62"/>
103</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/10_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/10_1.xmi
new file mode 100644
index 00000000..c851f77c
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/10_1.xmi
@@ -0,0 +1,103 @@
1<?xml version="1.0" encoding="ASCII"?>
2<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree ../case.study.familyTree.model/model/familytree.ecore">
3 <members children="//@members.13 //@members.17 //@members.20 //@members.23 //@members.25 //@members.58 //@members.77" parents="//@members.31 //@members.69"/>
4 <members children="//@members.27 //@members.29 //@members.30 //@members.31 //@members.42 //@members.44 //@members.64 //@members.76 //@members.79" parents="//@members.30 //@members.79"/>
5 <members parents="//@members.18 //@members.73"/>
6 <members children="//@members.55 //@members.63" parents="//@members.71 //@members.76"/>
7 <members children="//@members.12 //@members.18 //@members.21 //@members.83" parents="//@members.7 //@members.30"/>
8 <members children="//@members.74 //@members.84" parents="//@members.7 //@members.35"/>
9 <members parents="//@members.9 //@members.67"/>
10 <members children="//@members.4 //@members.5 //@members.8 //@members.33 //@members.45 //@members.91 //@members.96" parents="//@members.44 //@members.79"/>
11 <members children="//@members.15 //@members.33 //@members.45 //@members.58 //@members.76 //@members.99" parents="//@members.7 //@members.44"/>
12 <members children="//@members.6" parents="//@members.18 //@members.29"/>
13 <members parents="//@members.22 //@members.49"/>
14 <members parents="//@members.64 //@members.96"/>
15 <members parents="//@members.4 //@members.20"/>
16 <members parents="//@members.0 //@members.74"/>
17 <members parents="//@members.24 //@members.79"/>
18 <members children="//@members.21 //@members.31 //@members.35 //@members.65 //@members.97" parents="//@members.8 //@members.44"/>
19 <members parents="//@members.33 //@members.96"/>
20 <members parents="//@members.0 //@members.58"/>
21 <members children="//@members.2 //@members.9 //@members.46 //@members.81 //@members.94" parents="//@members.4 //@members.84"/>
22 <members children="//@members.26 //@members.53" parents="//@members.67 //@members.92"/>
23 <members children="//@members.12" parents="//@members.0 //@members.94"/>
24 <members children="//@members.52 //@members.54 //@members.60 //@members.90" parents="//@members.4 //@members.15"/>
25 <members children="//@members.10 //@members.56 //@members.61" parents="//@members.37 //@members.79"/>
26 <members parents="//@members.0 //@members.72"/>
27 <members children="//@members.14" parents="//@members.66 //@members.79"/>
28 <members parents="//@members.0 //@members.75"/>
29 <members children="//@members.46" parents="//@members.19 //@members.76"/>
30 <members parents="//@members.1 //@members.52"/>
31 <members parents="//@members.33 //@members.95"/>
32 <members children="//@members.9 //@members.32" parents="//@members.1 //@members.38"/>
33 <members children="//@members.1 //@members.4 //@members.35 //@members.37 //@members.44 //@members.51 //@members.54 //@members.59 //@members.66 //@members.91 //@members.96" parents="//@members.1 //@members.79"/>
34 <members children="//@members.0 //@members.82 //@members.88 //@members.92" parents="//@members.1 //@members.15"/>
35 <members parents="//@members.29 //@members.75"/>
36 <members children="//@members.16 //@members.28 //@members.34 //@members.72" parents="//@members.7 //@members.8"/>
37 <members parents="//@members.33 //@members.54"/>
38 <members children="//@members.5 //@members.69" parents="//@members.15 //@members.30"/>
39 <members children="//@members.60 //@members.80" parents="//@members.44 //@members.69"/>
40 <members children="//@members.22 //@members.53 //@members.92" parents="//@members.30 //@members.54"/>
41 <members children="//@members.29 //@members.67 //@members.83 //@members.85 //@members.89 //@members.97" parents="//@members.51 //@members.64"/>
42 <members parents="//@members.44 //@members.93"/>
43 <members children="//@members.72 //@members.75" parents="//@members.44 //@members.69"/>
44 <members parents="//@members.56 //@members.95"/>
45 <members parents="//@members.1 //@members.87"/>
46 <members parents="//@members.56 //@members.71"/>
47 <members children="//@members.7 //@members.8 //@members.15 //@members.36 //@members.39 //@members.40 //@members.47 //@members.64 //@members.78 //@members.79 //@members.85 //@members.95" parents="//@members.1 //@members.30"/>
48 <members parents="//@members.7 //@members.8"/>
49 <members parents="//@members.18 //@members.26"/>
50 <members parents="//@members.44 //@members.67"/>
51 <members children="//@members.62 //@members.73" parents="//@members.54 //@members.71"/>
52 <members children="//@members.10" parents="//@members.67 //@members.99"/>
53 <members parents="//@members.72 //@members.74"/>
54 <members children="//@members.38 //@members.69 //@members.71 //@members.90" parents="//@members.30 //@members.79"/>
55 <members children="//@members.27 //@members.75" parents="//@members.21 //@members.97"/>
56 <members parents="//@members.19 //@members.37"/>
57 <members children="//@members.34 //@members.37 //@members.48 //@members.81 //@members.93 //@members.99" parents="//@members.21 //@members.30"/>
58 <members parents="//@members.3 //@members.71"/>
59 <members children="//@members.41 //@members.43" parents="//@members.22 //@members.82"/>
60 <members parents="//@members.78 //@members.94"/>
61 <members children="//@members.17 //@members.61 //@members.80 //@members.82 //@members.93" parents="//@members.0 //@members.8"/>
62 <members children="//@members.89 //@members.95" parents="//@members.30 //@members.66"/>
63 <members children="//@members.86 //@members.88" parents="//@members.21 //@members.36"/>
64 <members parents="//@members.22 //@members.58"/>
65 <members parents="//@members.48 //@members.76"/>
66 <members parents="//@members.3 //@members.64"/>
67 <members children="//@members.11 //@members.38 //@members.63 //@members.66 //@members.98" parents="//@members.1 //@members.44"/>
68 <members parents="//@members.15 //@members.93"/>
69 <members children="//@members.24 //@members.59 //@members.67" parents="//@members.30 //@members.64"/>
70 <members children="//@members.6 //@members.19 //@members.47 //@members.49" parents="//@members.38 //@members.66"/>
71 <members parents="//@members.84 //@members.85"/>
72 <members children="//@members.0 //@members.36 //@members.40" parents="//@members.35 //@members.51"/>
73 <members/>
74 <members children="//@members.3 //@members.43 //@members.48 //@members.55" parents="//@members.51 //@members.76"/>
75 <members children="//@members.23 //@members.50" parents="//@members.33 //@members.40"/>
76 <members children="//@members.2" parents="//@members.48 //@members.82"/>
77 <members children="//@members.13 //@members.50" parents="//@members.5 //@members.79"/>
78 <members children="//@members.25 //@members.32" parents="//@members.40 //@members.52"/>
79 <members children="//@members.3 //@members.26 //@members.62 //@members.71 //@members.87" parents="//@members.1 //@members.8"/>
80 <members parents="//@members.0 //@members.84"/>
81 <members children="//@members.57" parents="//@members.44 //@members.91"/>
82 <members children="//@members.1 //@members.7 //@members.14 //@members.22 //@members.24 //@members.30 //@members.51 //@members.74 //@members.87" parents="//@members.1 //@members.44"/>
83 <members parents="//@members.36 //@members.58"/>
84 <members parents="//@members.18 //@members.54"/>
85 <members children="//@members.56 //@members.73" parents="//@members.31 //@members.58"/>
86 <members children="//@members.98" parents="//@members.4 //@members.38"/>
87 <members children="//@members.18 //@members.68 //@members.77" parents="//@members.5 //@members.99"/>
88 <members children="//@members.68" parents="//@members.38 //@members.44"/>
89 <members parents="//@members.60 //@members.91"/>
90 <members children="//@members.42" parents="//@members.76 //@members.79"/>
91 <members parents="//@members.31 //@members.60"/>
92 <members parents="//@members.38 //@members.59"/>
93 <members children="//@members.94" parents="//@members.21 //@members.51"/>
94 <members children="//@members.78 //@members.86" parents="//@members.7 //@members.30"/>
95 <members children="//@members.19" parents="//@members.31 //@members.37"/>
96 <members children="//@members.39 //@members.65" parents="//@members.54 //@members.58"/>
97 <members children="//@members.20 //@members.57" parents="//@members.18 //@members.90"/>
98 <members children="//@members.28 //@members.41" parents="//@members.44 //@members.59"/>
99 <members children="//@members.11 //@members.16" parents="//@members.7 //@members.30"/>
100 <members children="//@members.52" parents="//@members.15 //@members.38"/>
101 <members parents="//@members.64 //@members.83"/>
102 <members children="//@members.49 //@members.84" parents="//@members.8 //@members.54"/>
103</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/1_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/1_1.xmi
new file mode 100644
index 00000000..d4e2a212
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/1_1.xmi
@@ -0,0 +1,103 @@
1<?xml version="1.0" encoding="ASCII"?>
2<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree ../case.study.familyTree.model/model/familytree.ecore">
3 <members children="//@members.49 //@members.62 //@members.64 //@members.72 //@members.94 //@members.95" parents="//@members.37 //@members.50"/>
4 <members parents="//@members.53 //@members.55"/>
5 <members parents="//@members.24 //@members.72"/>
6 <members parents="//@members.24 //@members.35"/>
7 <members parents="//@members.15 //@members.31"/>
8 <members children="//@members.30 //@members.46 //@members.79 //@members.88 //@members.98" parents="//@members.27 //@members.78"/>
9 <members parents="//@members.64 //@members.87"/>
10 <members children="//@members.36" parents="//@members.9 //@members.28"/>
11 <members children="//@members.80 //@members.93" parents="//@members.40 //@members.77"/>
12 <members children="//@members.7 //@members.41" parents="//@members.43 //@members.94"/>
13 <members parents="//@members.13 //@members.80"/>
14 <members children="//@members.29 //@members.39 //@members.60 //@members.68" parents="//@members.28 //@members.58"/>
15 <members parents="//@members.63 //@members.97"/>
16 <members children="//@members.10 //@members.32 //@members.44" parents="//@members.64 //@members.76"/>
17 <members children="//@members.21 //@members.61 //@members.73" parents="//@members.18 //@members.50"/>
18 <members children="//@members.4 //@members.90" parents="//@members.27 //@members.77"/>
19 <members children="//@members.45 //@members.94" parents="//@members.28 //@members.86"/>
20 <members parents="//@members.31 //@members.57"/>
21 <members children="//@members.14 //@members.65" parents="//@members.43 //@members.77"/>
22 <members children="//@members.82" parents="//@members.78 //@members.91"/>
23 <members parents="//@members.27 //@members.89"/>
24 <members parents="//@members.14 //@members.90"/>
25 <members children="//@members.25 //@members.51 //@members.75" parents="//@members.37 //@members.74"/>
26 <members children="//@members.26" parents="//@members.43 //@members.64"/>
27 <members children="//@members.2 //@members.3 //@members.40 //@members.97" parents="//@members.46 //@members.62"/>
28 <members parents="//@members.22 //@members.27"/>
29 <members parents="//@members.23 //@members.82"/>
30 <members children="//@members.5 //@members.15 //@members.20 //@members.25 //@members.33 //@members.50 //@members.74 //@members.81 //@members.97 //@members.98" parents="//@members.37 //@members.89"/>
31 <members children="//@members.7 //@members.11 //@members.16 //@members.57" parents="//@members.34 //@members.77"/>
32 <members parents="//@members.11 //@members.38"/>
33 <members children="//@members.33 //@members.56 //@members.69 //@members.70" parents="//@members.5 //@members.63"/>
34 <members children="//@members.4 //@members.17 //@members.41" parents="//@members.76 //@members.94"/>
35 <members parents="//@members.13 //@members.93"/>
36 <members parents="//@members.27 //@members.30"/>
37 <members children="//@members.28 //@members.66 //@members.77 //@members.89 //@members.99" parents="//@members.43 //@members.77"/>
38 <members children="//@members.3" parents="//@members.48 //@members.78"/>
39 <members parents="//@members.7 //@members.85"/>
40 <members children="//@members.0 //@members.22 //@members.27 //@members.40 //@members.47 //@members.54 //@members.76 //@members.88 //@members.92 //@members.95 //@members.96" parents="//@members.77 //@members.78"/>
41 <members children="//@members.29 //@members.54 //@members.83 //@members.93" parents="//@members.76 //@members.85"/>
42 <members parents="//@members.11 //@members.61"/>
43 <members children="//@members.8" parents="//@members.24 //@members.37"/>
44 <members children="//@members.83" parents="//@members.9 //@members.31"/>
45 <members parents="//@members.43 //@members.75"/>
46 <members children="//@members.9 //@members.18 //@members.23 //@members.34 //@members.42 //@members.48 //@members.53 //@members.63 //@members.65 //@members.77 //@members.80 //@members.84" parents="//@members.77 //@members.78"/>
47 <members children="//@members.52" parents="//@members.13 //@members.74"/>
48 <members parents="//@members.16 //@members.86"/>
49 <members children="//@members.24" parents="//@members.5 //@members.48"/>
50 <members children="//@members.57" parents="//@members.37 //@members.63"/>
51 <members children="//@members.35 //@members.46 //@members.52 //@members.64 //@members.71" parents="//@members.43 //@members.99"/>
52 <members parents="//@members.0 //@members.77"/>
53 <members children="//@members.0 //@members.14 //@members.53 //@members.85" parents="//@members.27 //@members.65"/>
54 <members children="//@members.67" parents="//@members.22 //@members.96"/>
55 <members parents="//@members.44 //@members.48"/>
56 <members children="//@members.1 //@members.75" parents="//@members.43 //@members.50"/>
57 <members parents="//@members.37 //@members.38"/>
58 <members children="//@members.1" parents="//@members.80 //@members.85"/>
59 <members parents="//@members.30 //@members.74"/>
60 <members children="//@members.17" parents="//@members.28 //@members.47"/>
61 <members children="//@members.11 //@members.86 //@members.87" parents="//@members.65 //@members.77"/>
62 <members/>
63 <members children="//@members.66" parents="//@members.11 //@members.74"/>
64 <members children="//@members.39" parents="//@members.14 //@members.92"/>
65 <members children="//@members.24" parents="//@members.0 //@members.69"/>
66 <members children="//@members.12 //@members.30 //@members.47 //@members.82 //@members.91" parents="//@members.43 //@members.85"/>
67 <members children="//@members.6 //@members.13 //@members.23" parents="//@members.0 //@members.48"/>
68 <members children="//@members.50 //@members.58 //@members.69" parents="//@members.18 //@members.43"/>
69 <members children="//@members.79" parents="//@members.34 //@members.60"/>
70 <members parents="//@members.51 //@members.86"/>
71 <members parents="//@members.11 //@members.86"/>
72 <members children="//@members.62" parents="//@members.30 //@members.65"/>
73 <members children="//@members.81 //@members.96" parents="//@members.30 //@members.94"/>
74 <members parents="//@members.48 //@members.78"/>
75 <members children="//@members.2" parents="//@members.0 //@members.85"/>
76 <members children="//@members.91" parents="//@members.14 //@members.86"/>
77 <members children="//@members.22 //@members.44 //@members.56 //@members.60" parents="//@members.27 //@members.77"/>
78 <members children="//@members.42" parents="//@members.22 //@members.53"/>
79 <members children="//@members.13 //@members.31 //@members.38 //@members.90" parents="//@members.37 //@members.85"/>
80 <members children="//@members.8 //@members.15 //@members.18 //@members.28 //@members.34 //@members.37 //@members.43 //@members.49 //@members.58 //@members.74 //@members.78 //@members.89" parents="//@members.34 //@members.43"/>
81 <members children="//@members.5 //@members.19 //@members.35 //@members.37 //@members.43 //@members.71 //@members.92 //@members.99" parents="//@members.77 //@members.89"/>
82 <members parents="//@members.5 //@members.66"/>
83 <members children="//@members.10 //@members.55" parents="//@members.8 //@members.43"/>
84 <members parents="//@members.27 //@members.70"/>
85 <members children="//@members.26" parents="//@members.19 //@members.63"/>
86 <members parents="//@members.38 //@members.41"/>
87 <members parents="//@members.43 //@members.88"/>
88 <members children="//@members.36 //@members.38 //@members.55 //@members.63 //@members.72 //@members.76" parents="//@members.50 //@members.99"/>
89 <members children="//@members.16 //@members.45 //@members.67 //@members.68 //@members.73" parents="//@members.58 //@members.89"/>
90 <members children="//@members.6" parents="//@members.58 //@members.92"/>
91 <members children="//@members.84" parents="//@members.5 //@members.37"/>
92 <members children="//@members.20 //@members.27 //@members.78 //@members.86" parents="//@members.34 //@members.77"/>
93 <members children="//@members.21" parents="//@members.15 //@members.76"/>
94 <members children="//@members.19" parents="//@members.63 //@members.73"/>
95 <members children="//@members.61 //@members.87" parents="//@members.37 //@members.78"/>
96 <members children="//@members.32" parents="//@members.8 //@members.38"/>
97 <members children="//@members.9 //@members.31 //@members.70" parents="//@members.0 //@members.16"/>
98 <members parents="//@members.0 //@members.37"/>
99 <members children="//@members.51" parents="//@members.37 //@members.70"/>
100 <members children="//@members.12" parents="//@members.24 //@members.27"/>
101 <members parents="//@members.5 //@members.27"/>
102 <members children="//@members.48 //@members.85" parents="//@members.34 //@members.78"/>
103</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/2_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/2_1.xmi
new file mode 100644
index 00000000..a2a7156f
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/2_1.xmi
@@ -0,0 +1,103 @@
1<?xml version="1.0" encoding="ASCII"?>
2<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree ../case.study.familyTree.model/model/familytree.ecore">
3 <members children="//@members.28" parents="//@members.71 //@members.88"/>
4 <members parents="//@members.7 //@members.83"/>
5 <members children="//@members.56" parents="//@members.79 //@members.91"/>
6 <members children="//@members.37 //@members.48" parents="//@members.46 //@members.52"/>
7 <members parents="//@members.15 //@members.29"/>
8 <members parents="//@members.6 //@members.14"/>
9 <members children="//@members.5 //@members.25 //@members.30 //@members.32 //@members.39 //@members.75 //@members.81 //@members.83 //@members.92" parents="//@members.70 //@members.74"/>
10 <members children="//@members.1" parents="//@members.44 //@members.74"/>
11 <members children="//@members.59" parents="//@members.51 //@members.86"/>
12 <members/>
13 <members parents="//@members.46 //@members.58"/>
14 <members children="//@members.26 //@members.47" parents="//@members.41 //@members.75"/>
15 <members children="//@members.20 //@members.88" parents="//@members.17 //@members.93"/>
16 <members children="//@members.26 //@members.50" parents="//@members.29 //@members.79"/>
17 <members children="//@members.5 //@members.38" parents="//@members.77 //@members.78"/>
18 <members children="//@members.4 //@members.35 //@members.45" parents="//@members.46 //@members.95"/>
19 <members children="//@members.64 //@members.67 //@members.78" parents="//@members.46 //@members.95"/>
20 <members children="//@members.12 //@members.98" parents="//@members.70 //@members.75"/>
21 <members children="//@members.57" parents="//@members.61 //@members.99"/>
22 <members parents="//@members.46 //@members.63"/>
23 <members parents="//@members.12 //@members.42"/>
24 <members children="//@members.58" parents="//@members.46 //@members.54"/>
25 <members children="//@members.55" parents="//@members.62 //@members.65"/>
26 <members parents="//@members.45 //@members.93"/>
27 <members parents="//@members.54 //@members.89"/>
28 <members children="//@members.34 //@members.69" parents="//@members.6 //@members.71"/>
29 <members children="//@members.89" parents="//@members.11 //@members.13"/>
30 <members parents="//@members.70 //@members.98"/>
31 <members parents="//@members.0 //@members.87"/>
32 <members children="//@members.4 //@members.13 //@members.42 //@members.44 //@members.80" parents="//@members.74 //@members.79"/>
33 <members children="//@members.43 //@members.52 //@members.77" parents="//@members.6 //@members.34"/>
34 <members children="//@members.65" parents="//@members.69 //@members.70"/>
35 <members children="//@members.57" parents="//@members.6 //@members.68"/>
36 <members children="//@members.36 //@members.82" parents="//@members.46 //@members.86"/>
37 <members children="//@members.30 //@members.68 //@members.77" parents="//@members.25 //@members.95"/>
38 <members parents="//@members.15 //@members.46"/>
39 <members parents="//@members.33 //@members.93"/>
40 <members children="//@members.90" parents="//@members.3 //@members.95"/>
41 <members parents="//@members.14 //@members.96"/>
42 <members children="//@members.94" parents="//@members.6 //@members.70"/>
43 <members children="//@members.64" parents="//@members.93 //@members.99"/>
44 <members children="//@members.11 //@members.52 //@members.91" parents="//@members.79 //@members.95"/>
45 <members children="//@members.20 //@members.62" parents="//@members.29 //@members.86"/>
46 <members children="//@members.45 //@members.96" parents="//@members.30 //@members.71"/>
47 <members children="//@members.7 //@members.53 //@members.58" parents="//@members.29 //@members.93"/>
48 <members children="//@members.23" parents="//@members.15 //@members.43"/>
49 <members children="//@members.3 //@members.10 //@members.15 //@members.16 //@members.19 //@members.21 //@members.33 //@members.35 //@members.54 //@members.60" parents="//@members.71 //@members.74"/>
50 <members children="//@members.49" parents="//@members.11 //@members.71"/>
51 <members parents="//@members.3 //@members.79"/>
52 <members children="//@members.98" parents="//@members.47 //@members.99"/>
53 <members parents="//@members.13 //@members.63"/>
54 <members children="//@members.8 //@members.94" parents="//@members.67 //@members.96"/>
55 <members children="//@members.3 //@members.67 //@members.68 //@members.73 //@members.81" parents="//@members.30 //@members.41"/>
56 <members children="//@members.63" parents="//@members.44 //@members.79"/>
57 <members children="//@members.21 //@members.24 //@members.69 //@members.99" parents="//@members.46 //@members.79"/>
58 <members children="//@members.59" parents="//@members.22 //@members.58"/>
59 <members parents="//@members.2 //@members.73"/>
60 <members parents="//@members.18 //@members.32"/>
61 <members children="//@members.10 //@members.55 //@members.76 //@members.82" parents="//@members.21 //@members.44"/>
62 <members parents="//@members.8 //@members.55"/>
63 <members children="//@members.85" parents="//@members.46 //@members.99"/>
64 <members children="//@members.18" parents="//@members.71 //@members.73"/>
65 <members children="//@members.22" parents="//@members.42 //@members.69"/>
66 <members children="//@members.19 //@members.50" parents="//@members.53 //@members.82"/>
67 <members children="//@members.80" parents="//@members.16 //@members.40"/>
68 <members children="//@members.22 //@members.85" parents="//@members.31 //@members.99"/>
69 <members children="//@members.72" parents="//@members.81 //@members.87"/>
70 <members children="//@members.51" parents="//@members.16 //@members.52"/>
71 <members children="//@members.32 //@members.72" parents="//@members.34 //@members.52"/>
72 <members children="//@members.31 //@members.62 //@members.83 //@members.87" parents="//@members.25 //@members.54"/>
73 <members children="//@members.6 //@members.17 //@members.27 //@members.31 //@members.39 //@members.71 //@members.74 //@members.93" parents="//@members.74 //@members.95"/>
74 <members children="//@members.0 //@members.25 //@members.43 //@members.46 //@members.47 //@members.61 //@members.79 //@members.95 //@members.97 //@members.99" parents="//@members.70 //@members.95"/>
75 <members parents="//@members.66 //@members.68"/>
76 <members children="//@members.56 //@members.61" parents="//@members.52 //@members.93"/>
77 <members children="//@members.6 //@members.7 //@members.29 //@members.46 //@members.70 //@members.88 //@members.95" parents="//@members.70 //@members.95"/>
78 <members children="//@members.11 //@members.17 //@members.96" parents="//@members.6 //@members.93"/>
79 <members children="//@members.87" parents="//@members.58 //@members.92"/>
80 <members children="//@members.14" parents="//@members.30 //@members.34"/>
81 <members children="//@members.14" parents="//@members.16 //@members.91"/>
82 <members children="//@members.2 //@members.13 //@members.29 //@members.41 //@members.48 //@members.53 //@members.54 //@members.93" parents="//@members.71 //@members.95"/>
83 <members parents="//@members.29 //@members.64"/>
84 <members children="//@members.66" parents="//@members.6 //@members.52"/>
85 <members children="//@members.63" parents="//@members.33 //@members.58"/>
86 <members children="//@members.1" parents="//@members.6 //@members.69"/>
87 <members parents="//@members.86 //@members.94"/>
88 <members parents="//@members.60 //@members.65"/>
89 <members children="//@members.8 //@members.33 //@members.42 //@members.84 //@members.90" parents="//@members.92 //@members.95"/>
90 <members children="//@members.28 //@members.66" parents="//@members.69 //@members.76"/>
91 <members children="//@members.0" parents="//@members.12 //@members.74"/>
92 <members children="//@members.24" parents="//@members.26 //@members.98"/>
93 <members parents="//@members.37 //@members.86"/>
94 <members children="//@members.2 //@members.78" parents="//@members.41 //@members.93"/>
95 <members children="//@members.76 //@members.86" parents="//@members.6 //@members.95"/>
96 <members children="//@members.12 //@members.23 //@members.36 //@members.40 //@members.44 //@members.73 //@members.75 //@members.91 //@members.97" parents="//@members.70 //@members.79"/>
97 <members children="//@members.84" parents="//@members.39 //@members.51"/>
98 <members children="//@members.15 //@members.16 //@members.34 //@members.37 //@members.41 //@members.70 //@members.71 //@members.74 //@members.79 //@members.86 //@members.92" parents="//@members.71 //@members.74"/>
99 <members children="//@members.38 //@members.51" parents="//@members.43 //@members.75"/>
100 <members parents="//@members.71 //@members.93"/>
101 <members children="//@members.27 //@members.89" parents="//@members.17 //@members.49"/>
102 <members children="//@members.18 //@members.40 //@members.49 //@members.60 //@members.65" parents="//@members.54 //@members.71"/>
103</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/3_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/3_1.xmi
new file mode 100644
index 00000000..d6c73be9
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/3_1.xmi
@@ -0,0 +1,103 @@
1<?xml version="1.0" encoding="ASCII"?>
2<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree ../case.study.familyTree.model/model/familytree.ecore">
3 <members parents="//@members.7 //@members.77"/>
4 <members children="//@members.20" parents="//@members.55 //@members.83"/>
5 <members children="//@members.90" parents="//@members.63 //@members.76"/>
6 <members children="//@members.80" parents="//@members.26 //@members.27"/>
7 <members parents="//@members.21 //@members.85"/>
8 <members children="//@members.7 //@members.29" parents="//@members.48 //@members.61"/>
9 <members children="//@members.70" parents="//@members.35 //@members.76"/>
10 <members children="//@members.0" parents="//@members.5 //@members.67"/>
11 <members children="//@members.42" parents="//@members.12 //@members.69"/>
12 <members children="//@members.29 //@members.98" parents="//@members.11 //@members.25"/>
13 <members children="//@members.30 //@members.36 //@members.59" parents="//@members.40 //@members.55"/>
14 <members children="//@members.9 //@members.77 //@members.84" parents="//@members.19 //@members.67"/>
15 <members children="//@members.8 //@members.73 //@members.97" parents="//@members.61 //@members.76"/>
16 <members children="//@members.32 //@members.61 //@members.78 //@members.96" parents="//@members.40 //@members.56"/>
17 <members children="//@members.43 //@members.72" parents="//@members.32 //@members.62"/>
18 <members parents="//@members.53 //@members.78"/>
19 <members children="//@members.34 //@members.63" parents="//@members.25 //@members.40"/>
20 <members/>
21 <members parents="//@members.26 //@members.35"/>
22 <members children="//@members.11" parents="//@members.48 //@members.67"/>
23 <members children="//@members.28" parents="//@members.1 //@members.92"/>
24 <members children="//@members.4 //@members.35" parents="//@members.56 //@members.81"/>
25 <members parents="//@members.37 //@members.67"/>
26 <members children="//@members.41 //@members.45 //@members.85 //@members.89" parents="//@members.26 //@members.40"/>
27 <members parents="//@members.55 //@members.87"/>
28 <members children="//@members.9 //@members.16 //@members.50 //@members.70" parents="//@members.92 //@members.93"/>
29 <members children="//@members.3 //@members.18 //@members.23 //@members.35 //@members.57 //@members.75" parents="//@members.54 //@members.64"/>
30 <members children="//@members.3 //@members.28 //@members.45 //@members.52" parents="//@members.56 //@members.93"/>
31 <members parents="//@members.20 //@members.27"/>
32 <members parents="//@members.5 //@members.9"/>
33 <members children="//@members.44 //@members.88" parents="//@members.10 //@members.51"/>
34 <members parents="//@members.75 //@members.92"/>
35 <members children="//@members.14" parents="//@members.13 //@members.35"/>
36 <members parents="//@members.35 //@members.46"/>
37 <members parents="//@members.16 //@members.39"/>
38 <members children="//@members.6 //@members.18 //@members.32 //@members.33 //@members.42 //@members.95" parents="//@members.21 //@members.26"/>
39 <members children="//@members.46" parents="//@members.10 //@members.76"/>
40 <members children="//@members.22 //@members.51 //@members.58 //@members.68 //@members.83" parents="//@members.40 //@members.62"/>
41 <members children="//@members.88" parents="//@members.40 //@members.53"/>
42 <members children="//@members.34 //@members.59 //@members.61" parents="//@members.64 //@members.92"/>
43 <members children="//@members.10 //@members.13 //@members.16 //@members.23 //@members.37 //@members.38 //@members.55 //@members.67 //@members.76 //@members.79 //@members.87 //@members.91 //@members.93 //@members.95" parents="//@members.55 //@members.76"/>
44 <members parents="//@members.23 //@members.54"/>
45 <members children="//@members.43 //@members.80" parents="//@members.8 //@members.35"/>
46 <members parents="//@members.14 //@members.42"/>
47 <members children="//@members.53" parents="//@members.30 //@members.94"/>
48 <members parents="//@members.23 //@members.27"/>
49 <members children="//@members.33 //@members.99" parents="//@members.36 //@members.50"/>
50 <members parents="//@members.52 //@members.68"/>
51 <members children="//@members.5 //@members.19 //@members.62 //@members.67 //@members.75 //@members.84 //@members.89 //@members.92" parents="//@members.55 //@members.64"/>
52 <members children="//@members.69" parents="//@members.50 //@members.62"/>
53 <members children="//@members.46 //@members.49" parents="//@members.25 //@members.81"/>
54 <members children="//@members.30" parents="//@members.37 //@members.67"/>
55 <members children="//@members.47 //@members.86" parents="//@members.27 //@members.84"/>
56 <members children="//@members.15 //@members.38 //@members.65" parents="//@members.44 //@members.68"/>
57 <members children="//@members.26 //@members.41 //@members.77" parents="//@members.64 //@members.76"/>
58 <members children="//@members.1 //@members.10 //@members.24 //@members.40 //@members.48 //@members.56 //@members.64 //@members.73 //@members.76 //@members.92 //@members.94" parents="//@members.40 //@members.76"/>
59 <members children="//@members.13 //@members.21 //@members.27 //@members.58" parents="//@members.55 //@members.76"/>
60 <members parents="//@members.26 //@members.71"/>
61 <members parents="//@members.37 //@members.56"/>
62 <members parents="//@members.10 //@members.39"/>
63 <members parents="//@members.75 //@members.94"/>
64 <members children="//@members.5 //@members.12 //@members.97" parents="//@members.13 //@members.39"/>
65 <members children="//@members.14 //@members.37 //@members.49" parents="//@members.48 //@members.64"/>
66 <members children="//@members.2" parents="//@members.16 //@members.81"/>
67 <members children="//@members.26 //@members.39 //@members.48 //@members.54 //@members.62 //@members.82" parents="//@members.55 //@members.76"/>
68 <members children="//@members.66" parents="//@members.53 //@members.91"/>
69 <members children="//@members.72" parents="//@members.65 //@members.97"/>
70 <members children="//@members.7 //@members.11 //@members.19 //@members.22 //@members.51 //@members.74 //@members.96" parents="//@members.40 //@members.48"/>
71 <members children="//@members.47 //@members.53 //@members.87" parents="//@members.37 //@members.93"/>
72 <members children="//@members.8" parents="//@members.49 //@members.93"/>
73 <members parents="//@members.6 //@members.25"/>
74 <members children="//@members.57" parents="//@members.81 //@members.83"/>
75 <members parents="//@members.14 //@members.66"/>
76 <members parents="//@members.12 //@members.55"/>
77 <members parents="//@members.67 //@members.91"/>
78 <members children="//@members.31 //@members.60" parents="//@members.26 //@members.48"/>
79 <members children="//@members.2 //@members.6 //@members.12 //@members.36 //@members.40 //@members.54 //@members.55 //@members.56 //@members.64 //@members.79 //@members.81 //@members.91 //@members.93" parents="//@members.40 //@members.55"/>
80 <members children="//@members.0" parents="//@members.11 //@members.54"/>
81 <members children="//@members.15" parents="//@members.13 //@members.93"/>
82 <members parents="//@members.40 //@members.76"/>
83 <members parents="//@members.3 //@members.42"/>
84 <members children="//@members.21 //@members.50 //@members.63 //@members.71 //@members.94" parents="//@members.76 //@members.93"/>
85 <members parents="//@members.64 //@members.97"/>
86 <members children="//@members.1 //@members.71" parents="//@members.37 //@members.97"/>
87 <members children="//@members.52" parents="//@members.11 //@members.48"/>
88 <members children="//@members.4" parents="//@members.23 //@members.92"/>
89 <members parents="//@members.52 //@members.95"/>
90 <members children="//@members.24 //@members.90" parents="//@members.40 //@members.68"/>
91 <members children="//@members.99" parents="//@members.30 //@members.38"/>
92 <members parents="//@members.23 //@members.48"/>
93 <members parents="//@members.2 //@members.87"/>
94 <members children="//@members.65 //@members.74" parents="//@members.40 //@members.76"/>
95 <members children="//@members.20 //@members.25 //@members.31 //@members.39 //@members.85" parents="//@members.48 //@members.55"/>
96 <members children="//@members.25 //@members.27 //@members.68 //@members.69 //@members.78 //@members.81" parents="//@members.40 //@members.76"/>
97 <members children="//@members.44 //@members.60" parents="//@members.55 //@members.81"/>
98 <members children="//@members.86 //@members.98" parents="//@members.35 //@members.40"/>
99 <members parents="//@members.13 //@members.67"/>
100 <members children="//@members.66 //@members.82 //@members.83" parents="//@members.12 //@members.61"/>
101 <members parents="//@members.9 //@members.95"/>
102 <members parents="//@members.46 //@members.88"/>
103</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/4_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/4_1.xmi
new file mode 100644
index 00000000..c185adfc
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/4_1.xmi
@@ -0,0 +1,103 @@
1<?xml version="1.0" encoding="ASCII"?>
2<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree ../case.study.familyTree.model/model/familytree.ecore">
3 <members children="//@members.7 //@members.8 //@members.13 //@members.14 //@members.31 //@members.63 //@members.64 //@members.78 //@members.83 //@members.87 //@members.88" parents="//@members.13 //@members.64"/>
4 <members children="//@members.79" parents="//@members.68 //@members.88"/>
5 <members children="//@members.23" parents="//@members.14 //@members.47"/>
6 <members parents="//@members.40 //@members.88"/>
7 <members parents="//@members.66 //@members.73"/>
8 <members parents="//@members.34 //@members.41"/>
9 <members parents="//@members.31 //@members.66"/>
10 <members children="//@members.17 //@members.25 //@members.52 //@members.91" parents="//@members.0 //@members.78"/>
11 <members children="//@members.28 //@members.36 //@members.41" parents="//@members.0 //@members.68"/>
12 <members parents="//@members.37 //@members.48"/>
13 <members children="//@members.30 //@members.69" parents="//@members.15 //@members.87"/>
14 <members children="//@members.17" parents="//@members.37 //@members.92"/>
15 <members children="//@members.24 //@members.54 //@members.56 //@members.99" parents="//@members.35 //@members.78"/>
16 <members children="//@members.0 //@members.53 //@members.64 //@members.68 //@members.71 //@members.72 //@members.78" parents="//@members.0 //@members.64"/>
17 <members children="//@members.2 //@members.89" parents="//@members.0 //@members.52"/>
18 <members children="//@members.10 //@members.75 //@members.87" parents="//@members.72 //@members.87"/>
19 <members children="//@members.38 //@members.59" parents="//@members.21 //@members.83"/>
20 <members parents="//@members.7 //@members.11"/>
21 <members children="//@members.31 //@members.90 //@members.92 //@members.94" parents="//@members.78 //@members.88"/>
22 <members children="//@members.50 //@members.75 //@members.82" parents="//@members.68 //@members.80"/>
23 <members children="//@members.26 //@members.48" parents="//@members.37 //@members.64"/>
24 <members children="//@members.16 //@members.59" parents="//@members.63 //@members.86"/>
25 <members parents="//@members.34 //@members.75"/>
26 <members children="//@members.90" parents="//@members.2 //@members.78"/>
27 <members children="//@members.49" parents="//@members.12 //@members.91"/>
28 <members children="//@members.51" parents="//@members.7 //@members.27"/>
29 <members children="//@members.66 //@members.85" parents="//@members.20 //@members.35"/>
30 <members children="//@members.25 //@members.67 //@members.95" parents="//@members.36 //@members.88"/>
31 <members children="//@members.39 //@members.76" parents="//@members.8 //@members.72"/>
32 <members parents="//@members.35 //@members.78"/>
33 <members children="//@members.84" parents="//@members.10 //@members.43"/>
34 <members children="//@members.6 //@members.44 //@members.62" parents="//@members.0 //@members.18"/>
35 <members parents="//@members.82 //@members.94"/>
36 <members parents="//@members.76 //@members.82"/>
37 <members children="//@members.5 //@members.22" parents="//@members.56 //@members.80"/>
38 <members children="//@members.12 //@members.26 //@members.29 //@members.51 //@members.82 //@members.95" parents="//@members.64 //@members.86"/>
39 <members children="//@members.27 //@members.53 //@members.73 //@members.93" parents="//@members.8 //@members.92"/>
40 <members children="//@members.9 //@members.11 //@members.20 //@members.74 //@members.94" parents="//@members.64 //@members.68"/>
41 <members parents="//@members.16 //@members.75"/>
42 <members parents="//@members.28 //@members.43"/>
43 <members children="//@members.3 //@members.92" parents="//@members.60 //@members.63"/>
44 <members children="//@members.5 //@members.48" parents="//@members.8 //@members.43"/>
45 <members parents="//@members.64 //@members.81"/>
46 <members children="//@members.30 //@members.39 //@members.41 //@members.54 //@members.97" parents="//@members.56 //@members.78"/>
47 <members children="//@members.46" parents="//@members.31 //@members.86"/>
48 <members/>
49 <members children="//@members.57" parents="//@members.44 //@members.68"/>
50 <members children="//@members.2 //@members.77" parents="//@members.52 //@members.92"/>
51 <members children="//@members.9 //@members.49 //@members.61 //@members.67 //@members.97" parents="//@members.20 //@members.41"/>
52 <members parents="//@members.24 //@members.48"/>
53 <members parents="//@members.19 //@members.80"/>
54 <members parents="//@members.25 //@members.35"/>
55 <members children="//@members.14 //@members.47 //@members.55 //@members.66" parents="//@members.7 //@members.78"/>
56 <members parents="//@members.13 //@members.36"/>
57 <members children="//@members.65" parents="//@members.12 //@members.43"/>
58 <members children="//@members.74" parents="//@members.52 //@members.81"/>
59 <members children="//@members.34 //@members.43 //@members.65" parents="//@members.12 //@members.64"/>
60 <members children="//@members.62" parents="//@members.46 //@members.77"/>
61 <members parents="//@members.87 //@members.92"/>
62 <members children="//@members.79" parents="//@members.16 //@members.21"/>
63 <members children="//@members.40" parents="//@members.64 //@members.87"/>
64 <members children="//@members.77" parents="//@members.48 //@members.66"/>
65 <members parents="//@members.31 //@members.57"/>
66 <members children="//@members.21 //@members.40 //@members.69 //@members.81" parents="//@members.0 //@members.68"/>
67 <members children="//@members.0 //@members.13 //@members.20 //@members.35 //@members.37 //@members.42 //@members.56 //@members.60 //@members.72 //@members.86 //@members.96" parents="//@members.0 //@members.13"/>
68 <members children="//@members.85" parents="//@members.54 //@members.56"/>
69 <members children="//@members.4 //@members.6 //@members.61 //@members.70 //@members.83" parents="//@members.26 //@members.52"/>
70 <members parents="//@members.27 //@members.48"/>
71 <members children="//@members.1 //@members.8 //@members.19 //@members.37 //@members.46 //@members.63 //@members.80 //@members.91" parents="//@members.13 //@members.87"/>
72 <members parents="//@members.10 //@members.63"/>
73 <members parents="//@members.66 //@members.92"/>
74 <members children="//@members.73" parents="//@members.13 //@members.78"/>
75 <members children="//@members.15 //@members.28 //@members.80 //@members.96" parents="//@members.13 //@members.64"/>
76 <members children="//@members.4" parents="//@members.36 //@members.71"/>
77 <members parents="//@members.37 //@members.55"/>
78 <members children="//@members.22 //@members.38" parents="//@members.15 //@members.19"/>
79 <members children="//@members.33" parents="//@members.28 //@members.82"/>
80 <members children="//@members.57" parents="//@members.47 //@members.61"/>
81 <members children="//@members.7 //@members.12 //@members.18 //@members.23 //@members.29 //@members.43 //@members.52 //@members.71 //@members.88 //@members.98" parents="//@members.0 //@members.13"/>
82 <members parents="//@members.1 //@members.59"/>
83 <members children="//@members.19 //@members.34 //@members.50 //@members.89" parents="//@members.68 //@members.72"/>
84 <members children="//@members.42 //@members.55" parents="//@members.63 //@members.88"/>
85 <members children="//@members.32 //@members.33 //@members.76 //@members.84" parents="//@members.19 //@members.35"/>
86 <members children="//@members.16 //@members.99" parents="//@members.0 //@members.66"/>
87 <members parents="//@members.30 //@members.82"/>
88 <members parents="//@members.26 //@members.65"/>
89 <members children="//@members.21 //@members.35 //@members.44 //@members.93" parents="//@members.64 //@members.87"/>
90 <members children="//@members.10 //@members.15 //@members.58 //@members.60 //@members.68 //@members.86" parents="//@members.0 //@members.15"/>
91 <members children="//@members.1 //@members.3 //@members.18 //@members.27 //@members.81" parents="//@members.0 //@members.78"/>
92 <members parents="//@members.14 //@members.80"/>
93 <members parents="//@members.18 //@members.23"/>
94 <members children="//@members.24" parents="//@members.7 //@members.68"/>
95 <members children="//@members.11 //@members.36 //@members.47 //@members.58 //@members.70" parents="//@members.18 //@members.40"/>
96 <members children="//@members.98" parents="//@members.36 //@members.86"/>
97 <members children="//@members.32" parents="//@members.18 //@members.37"/>
98 <members parents="//@members.27 //@members.35"/>
99 <members parents="//@members.64 //@members.72"/>
100 <members parents="//@members.43 //@members.48"/>
101 <members parents="//@members.78 //@members.93"/>
102 <members parents="//@members.12 //@members.83"/>
103</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/5_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/5_1.xmi
new file mode 100644
index 00000000..0a806b53
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/5_1.xmi
@@ -0,0 +1,103 @@
1<?xml version="1.0" encoding="ASCII"?>
2<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree ../case.study.familyTree.model/model/familytree.ecore">
3 <members parents="//@members.52 //@members.82"/>
4 <members parents="//@members.40 //@members.94"/>
5 <members children="//@members.3 //@members.16 //@members.47" parents="//@members.86 //@members.96"/>
6 <members children="//@members.79" parents="//@members.2 //@members.11"/>
7 <members children="//@members.65" parents="//@members.13 //@members.99"/>
8 <members parents="//@members.86 //@members.97"/>
9 <members children="//@members.50" parents="//@members.34 //@members.41"/>
10 <members children="//@members.12 //@members.25 //@members.34 //@members.36 //@members.39 //@members.46 //@members.51 //@members.53 //@members.75 //@members.78" parents="//@members.13 //@members.60"/>
11 <members children="//@members.35" parents="//@members.13 //@members.27"/>
12 <members children="//@members.55" parents="//@members.23 //@members.41"/>
13 <members parents="//@members.43 //@members.83"/>
14 <members children="//@members.3 //@members.35" parents="//@members.62 //@members.72"/>
15 <members children="//@members.45 //@members.46 //@members.98 //@members.99" parents="//@members.7 //@members.13"/>
16 <members children="//@members.4 //@members.7 //@members.8 //@members.12 //@members.18 //@members.44 //@members.57 //@members.58 //@members.60 //@members.70 //@members.75 //@members.86 //@members.88 //@members.96" parents="//@members.60 //@members.86"/>
17 <members parents="//@members.49 //@members.61"/>
18 <members parents="//@members.39 //@members.90"/>
19 <members parents="//@members.2 //@members.71"/>
20 <members children="//@members.95" parents="//@members.48 //@members.90"/>
21 <members children="//@members.83 //@members.93" parents="//@members.13 //@members.21"/>
22 <members parents="//@members.22 //@members.52"/>
23 <members children="//@members.37 //@members.48 //@members.90" parents="//@members.32 //@members.97"/>
24 <members children="//@members.18 //@members.22 //@members.70 //@members.92" parents="//@members.51 //@members.60"/>
25 <members children="//@members.19 //@members.81 //@members.82" parents="//@members.21 //@members.60"/>
26 <members children="//@members.9 //@members.28 //@members.33 //@members.66" parents="//@members.72 //@members.88"/>
27 <members parents="//@members.49 //@members.79"/>
28 <members children="//@members.27 //@members.52" parents="//@members.7 //@members.34"/>
29 <members parents="//@members.53 //@members.61"/>
30 <members children="//@members.8" parents="//@members.25 //@members.99"/>
31 <members children="//@members.68" parents="//@members.23 //@members.92"/>
32 <members/>
33 <members children="//@members.42 //@members.67" parents="//@members.60 //@members.92"/>
34 <members parents="//@members.37 //@members.39"/>
35 <members children="//@members.20 //@members.34 //@members.39 //@members.49" parents="//@members.86 //@members.96"/>
36 <members children="//@members.98" parents="//@members.23 //@members.78"/>
37 <members children="//@members.6 //@members.25 //@members.38 //@members.49 //@members.63 //@members.69 //@members.78 //@members.87" parents="//@members.7 //@members.32"/>
38 <members parents="//@members.8 //@members.11"/>
39 <members children="//@members.89 //@members.91" parents="//@members.7 //@members.78"/>
40 <members children="//@members.31" parents="//@members.20 //@members.57"/>
41 <members parents="//@members.34 //@members.58"/>
42 <members children="//@members.15 //@members.31 //@members.54 //@members.61 //@members.84" parents="//@members.7 //@members.32"/>
43 <members children="//@members.1" parents="//@members.47 //@members.51"/>
44 <members children="//@members.6 //@members.9 //@members.97 //@members.99" parents="//@members.51 //@members.78"/>
45 <members parents="//@members.30 //@members.88"/>
46 <members children="//@members.10 //@members.85 //@members.94" parents="//@members.55 //@members.89"/>
47 <members children="//@members.59" parents="//@members.13 //@members.67"/>
48 <members parents="//@members.12 //@members.90"/>
49 <members children="//@members.59 //@members.77 //@members.95" parents="//@members.7 //@members.12"/>
50 <members children="//@members.40" parents="//@members.2 //@members.53"/>
51 <members children="//@members.17" parents="//@members.20 //@members.51"/>
52 <members children="//@members.14 //@members.24" parents="//@members.32 //@members.34"/>
53 <members children="//@members.81" parents="//@members.6 //@members.75"/>
54 <members children="//@members.21 //@members.40 //@members.41 //@members.48 //@members.56 //@members.58 //@members.72 //@members.74 //@members.76 //@members.93" parents="//@members.7 //@members.86"/>
55 <members children="//@members.0 //@members.19 //@members.73 //@members.85" parents="//@members.25 //@members.88"/>
56 <members children="//@members.26 //@members.47" parents="//@members.7 //@members.75"/>
57 <members parents="//@members.39 //@members.60"/>
58 <members children="//@members.43 //@members.64" parents="//@members.9 //@members.71"/>
59 <members parents="//@members.51 //@members.74"/>
60 <members children="//@members.37" parents="//@members.13 //@members.89"/>
61 <members children="//@members.38 //@members.63" parents="//@members.13 //@members.51"/>
62 <members parents="//@members.44 //@members.46"/>
63 <members children="//@members.7 //@members.13 //@members.21 //@members.22 //@members.30 //@members.54 //@members.74 //@members.86 //@members.96" parents="//@members.13 //@members.86"/>
64 <members children="//@members.14 //@members.26" parents="//@members.39 //@members.75"/>
65 <members children="//@members.11 //@members.76" parents="//@members.75 //@members.89"/>
66 <members children="//@members.65" parents="//@members.34 //@members.58"/>
67 <members parents="//@members.55 //@members.83"/>
68 <members parents="//@members.4 //@members.63"/>
69 <members parents="//@members.23 //@members.83"/>
70 <members children="//@members.44" parents="//@members.30 //@members.74"/>
71 <members parents="//@members.28 //@members.97"/>
72 <members children="//@members.71 //@members.88" parents="//@members.34 //@members.96"/>
73 <members children="//@members.80 //@members.84 //@members.89" parents="//@members.13 //@members.21"/>
74 <members children="//@members.16 //@members.55 //@members.77" parents="//@members.69 //@members.74"/>
75 <members children="//@members.11 //@members.23" parents="//@members.51 //@members.75"/>
76 <members parents="//@members.52 //@members.93"/>
77 <members children="//@members.56 //@members.67 //@members.71" parents="//@members.51 //@members.60"/>
78 <members children="//@members.50 //@members.53 //@members.61 //@members.62 //@members.72" parents="//@members.7 //@members.13"/>
79 <members parents="//@members.51 //@members.62"/>
80 <members parents="//@members.46 //@members.71"/>
81 <members children="//@members.33 //@members.36 //@members.41 //@members.91 //@members.97" parents="//@members.7 //@members.34"/>
82 <members children="//@members.24" parents="//@members.3 //@members.97"/>
83 <members parents="//@members.70 //@members.91"/>
84 <members parents="//@members.22 //@members.50"/>
85 <members children="//@members.0" parents="//@members.22 //@members.84"/>
86 <members children="//@members.10 //@members.64 //@members.66 //@members.90" parents="//@members.18 //@members.89"/>
87 <members children="//@members.82" parents="//@members.39 //@members.70"/>
88 <members parents="//@members.43 //@members.52"/>
89 <members children="//@members.2 //@members.5 //@members.13 //@members.32 //@members.51 //@members.60" parents="//@members.13 //@members.60"/>
90 <members parents="//@members.34 //@members.99"/>
91 <members children="//@members.23 //@members.42 //@members.52" parents="//@members.13 //@members.69"/>
92 <members children="//@members.43 //@members.57 //@members.62 //@members.83" parents="//@members.36 //@members.70"/>
93 <members children="//@members.15 //@members.17 //@members.45" parents="//@members.20 //@members.83"/>
94 <members children="//@members.80 //@members.92 //@members.94" parents="//@members.36 //@members.78"/>
95 <members children="//@members.28 //@members.30" parents="//@members.21 //@members.91"/>
96 <members children="//@members.73" parents="//@members.18 //@members.51"/>
97 <members children="//@members.1" parents="//@members.43 //@members.91"/>
98 <members parents="//@members.17 //@members.46"/>
99 <members children="//@members.2 //@members.32 //@members.69" parents="//@members.13 //@members.60"/>
100 <members children="//@members.5 //@members.20 //@members.68 //@members.79" parents="//@members.41 //@members.78"/>
101 <members parents="//@members.12 //@members.33"/>
102 <members children="//@members.4 //@members.27 //@members.87" parents="//@members.12 //@members.41"/>
103</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/6_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/6_1.xmi
new file mode 100644
index 00000000..7718a1a4
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/6_1.xmi
@@ -0,0 +1,103 @@
1<?xml version="1.0" encoding="ASCII"?>
2<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree ../case.study.familyTree.model/model/familytree.ecore">
3 <members children="//@members.16 //@members.22 //@members.25 //@members.30 //@members.67 //@members.96" parents="//@members.49 //@members.53"/>
4 <members parents="//@members.2 //@members.68"/>
5 <members children="//@members.1 //@members.8 //@members.22 //@members.37 //@members.74" parents="//@members.36 //@members.41"/>
6 <members children="//@members.43 //@members.87" parents="//@members.9 //@members.49"/>
7 <members children="//@members.45" parents="//@members.10 //@members.27"/>
8 <members children="//@members.43 //@members.47" parents="//@members.44 //@members.73"/>
9 <members children="//@members.48" parents="//@members.41 //@members.72"/>
10 <members parents="//@members.19 //@members.96"/>
11 <members children="//@members.30 //@members.54 //@members.93" parents="//@members.2 //@members.39"/>
12 <members children="//@members.3 //@members.19 //@members.35 //@members.36 //@members.38 //@members.39 //@members.42 //@members.49 //@members.50 //@members.82 //@members.90 //@members.93 //@members.97" parents="//@members.36 //@members.39"/>
13 <members children="//@members.4 //@members.21 //@members.66" parents="//@members.31 //@members.49"/>
14 <members children="//@members.14 //@members.88" parents="//@members.20 //@members.55"/>
15 <members children="//@members.99" parents="//@members.50 //@members.63"/>
16 <members children="//@members.20" parents="//@members.36 //@members.41"/>
17 <members parents="//@members.11 //@members.69"/>
18 <members parents="//@members.38 //@members.56"/>
19 <members children="//@members.23 //@members.48" parents="//@members.0 //@members.36"/>
20 <members children="//@members.27 //@members.56" parents="//@members.42 //@members.86"/>
21 <members parents="//@members.45 //@members.96"/>
22 <members children="//@members.7" parents="//@members.9 //@members.31"/>
23 <members children="//@members.11 //@members.34 //@members.86" parents="//@members.13 //@members.71"/>
24 <members children="//@members.98" parents="//@members.10 //@members.53"/>
25 <members children="//@members.68" parents="//@members.0 //@members.2"/>
26 <members parents="//@members.16 //@members.71"/>
27 <members children="//@members.69 //@members.77 //@members.94 //@members.96" parents="//@members.61 //@members.97"/>
28 <members parents="//@members.0 //@members.38"/>
29 <members parents="//@members.32 //@members.49"/>
30 <members children="//@members.4 //@members.65" parents="//@members.17 //@members.86"/>
31 <members parents="//@members.61 //@members.88"/>
32 <members parents="//@members.70 //@members.95"/>
33 <members children="//@members.80" parents="//@members.0 //@members.8"/>
34 <members children="//@members.10 //@members.19" parents="//@members.55 //@members.59"/>
35 <members children="//@members.26" parents="//@members.82 //@members.84"/>
36 <members parents="//@members.61 //@members.89"/>
37 <members parents="//@members.20 //@members.67"/>
38 <members parents="//@members.9 //@members.44"/>
39 <members children="//@members.2 //@members.9 //@members.13 //@members.16 //@members.41 //@members.42 //@members.53 //@members.59 //@members.62 //@members.82" parents="//@members.9 //@members.39"/>
40 <members children="//@members.63" parents="//@members.2 //@members.86"/>
41 <members children="//@members.15 //@members.25 //@members.47 //@members.70" parents="//@members.9 //@members.62"/>
42 <members children="//@members.8 //@members.9 //@members.36 //@members.41 //@members.45 //@members.53 //@members.61 //@members.64 //@members.84" parents="//@members.9 //@members.53"/>
43 <members children="//@members.89" parents="//@members.67 //@members.73"/>
44 <members children="//@members.2 //@members.6 //@members.13 //@members.71" parents="//@members.36 //@members.39"/>
45 <members children="//@members.17 //@members.49 //@members.60" parents="//@members.9 //@members.36"/>
46 <members children="//@members.99" parents="//@members.3 //@members.5"/>
47 <members children="//@members.5 //@members.35 //@members.59 //@members.67 //@members.76" parents="//@members.53 //@members.82"/>
48 <members children="//@members.18 //@members.46 //@members.52" parents="//@members.4 //@members.39"/>
49 <members parents="//@members.45 //@members.98"/>
50 <members children="//@members.65 //@members.68" parents="//@members.5 //@members.38"/>
51 <members parents="//@members.6 //@members.16"/>
52 <members children="//@members.0 //@members.3 //@members.10 //@members.26 //@members.97" parents="//@members.9 //@members.42"/>
53 <members children="//@members.12 //@members.55 //@members.88" parents="//@members.9 //@members.54"/>
54 <members parents="//@members.59 //@members.62"/>
55 <members parents="//@members.45 //@members.69"/>
56 <members children="//@members.0 //@members.21 //@members.39 //@members.44 //@members.62 //@members.83 //@members.86 //@members.90 //@members.92" parents="//@members.36 //@members.39"/>
57 <members children="//@members.50" parents="//@members.8 //@members.83"/>
58 <members children="//@members.11 //@members.31 //@members.64" parents="//@members.50 //@members.73"/>
59 <members children="//@members.15 //@members.75" parents="//@members.17 //@members.64"/>
60 <members/>
61 <members parents="//@members.91 //@members.98"/>
62 <members children="//@members.31 //@members.51" parents="//@members.36 //@members.44"/>
63 <members children="//@members.94" parents="//@members.42 //@members.95"/>
64 <members children="//@members.24 //@members.28 //@members.33 //@members.66" parents="//@members.39 //@members.84"/>
65 <members children="//@members.38 //@members.51 //@members.69 //@members.70 //@members.73" parents="//@members.36 //@members.53"/>
66 <members children="//@members.12 //@members.81" parents="//@members.37 //@members.82"/>
67 <members children="//@members.56" parents="//@members.39 //@members.55"/>
68 <members parents="//@members.27 //@members.47"/>
69 <members parents="//@members.10 //@members.61"/>
70 <members children="//@members.34 //@members.40 //@members.77" parents="//@members.0 //@members.44"/>
71 <members children="//@members.1" parents="//@members.22 //@members.47"/>
72 <members children="//@members.14 //@members.52" parents="//@members.24 //@members.62"/>
73 <members children="//@members.29 //@members.81 //@members.91" parents="//@members.38 //@members.62"/>
74 <members children="//@members.20 //@members.23 //@members.74 //@members.85 //@members.92" parents="//@members.41 //@members.82"/>
75 <members children="//@members.6" parents="//@members.74 //@members.90"/>
76 <members children="//@members.5 //@members.40 //@members.55 //@members.78 //@members.83" parents="//@members.62 //@members.90"/>
77 <members children="//@members.72 //@members.78 //@members.95" parents="//@members.2 //@members.71"/>
78 <members children="//@members.80" parents="//@members.56 //@members.82"/>
79 <members children="//@members.89" parents="//@members.44 //@members.88"/>
80 <members parents="//@members.24 //@members.67"/>
81 <members parents="//@members.73 //@members.74"/>
82 <members parents="//@members.88 //@members.92"/>
83 <members parents="//@members.30 //@members.75"/>
84 <members parents="//@members.63 //@members.70"/>
85 <members children="//@members.32 //@members.44 //@members.63 //@members.71 //@members.75 //@members.95" parents="//@members.9 //@members.36"/>
86 <members children="//@members.54 //@members.84 //@members.87" parents="//@members.53 //@members.73"/>
87 <members children="//@members.32 //@members.61" parents="//@members.39 //@members.83"/>
88 <members parents="//@members.71 //@members.90"/>
89 <members children="//@members.17 //@members.27 //@members.37" parents="//@members.20 //@members.53"/>
90 <members parents="//@members.3 //@members.83"/>
91 <members children="//@members.28 //@members.76 //@members.79 //@members.91" parents="//@members.11 //@members.50"/>
92 <members children="//@members.33" parents="//@members.40 //@members.76"/>
93 <members children="//@members.72 //@members.73 //@members.85" parents="//@members.9 //@members.53"/>
94 <members children="//@members.58" parents="//@members.70 //@members.88"/>
95 <members children="//@members.79 //@members.98" parents="//@members.53 //@members.71"/>
96 <members parents="//@members.8 //@members.9"/>
97 <members parents="//@members.24 //@members.60"/>
98 <members children="//@members.29 //@members.60" parents="//@members.74 //@members.82"/>
99 <members children="//@members.7 //@members.18" parents="//@members.0 //@members.24"/>
100 <members children="//@members.24" parents="//@members.9 //@members.49"/>
101 <members children="//@members.46 //@members.58" parents="//@members.21 //@members.92"/>
102 <members parents="//@members.12 //@members.43"/>
103</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/7_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/7_1.xmi
new file mode 100644
index 00000000..55a1f039
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/7_1.xmi
@@ -0,0 +1,103 @@
1<?xml version="1.0" encoding="ASCII"?>
2<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree ../case.study.familyTree.model/model/familytree.ecore">
3 <members children="//@members.62" parents="//@members.6 //@members.12"/>
4 <members parents="//@members.73 //@members.97"/>
5 <members parents="//@members.4 //@members.59"/>
6 <members children="//@members.30 //@members.94" parents="//@members.10 //@members.51"/>
7 <members children="//@members.2 //@members.66 //@members.88 //@members.98" parents="//@members.30 //@members.72"/>
8 <members children="//@members.21 //@members.32 //@members.43" parents="//@members.11 //@members.42"/>
9 <members children="//@members.0 //@members.14 //@members.40 //@members.45 //@members.46 //@members.48 //@members.51 //@members.76 //@members.92 //@members.96" parents="//@members.36 //@members.49"/>
10 <members children="//@members.57 //@members.61" parents="//@members.44 //@members.91"/>
11 <members parents="//@members.66 //@members.87"/>
12 <members children="//@members.12 //@members.20" parents="//@members.36 //@members.72"/>
13 <members children="//@members.3 //@members.25 //@members.63 //@members.80" parents="//@members.36 //@members.83"/>
14 <members children="//@members.5 //@members.64 //@members.86 //@members.91 //@members.99" parents="//@members.37 //@members.50"/>
15 <members children="//@members.0" parents="//@members.9 //@members.56"/>
16 <members parents="//@members.47 //@members.70"/>
17 <members children="//@members.39 //@members.84" parents="//@members.6 //@members.63"/>
18 <members children="//@members.26 //@members.82" parents="//@members.36 //@members.38"/>
19 <members children="//@members.23" parents="//@members.44 //@members.99"/>
20 <members children="//@members.28 //@members.41 //@members.76 //@members.83 //@members.87 //@members.88" parents="//@members.41 //@members.83"/>
21 <members parents="//@members.46 //@members.61"/>
22 <members children="//@members.93" parents="//@members.76 //@members.86"/>
23 <members parents="//@members.9 //@members.80"/>
24 <members children="//@members.65 //@members.75 //@members.81" parents="//@members.5 //@members.54"/>
25 <members children="//@members.60" parents="//@members.34 //@members.83"/>
26 <members parents="//@members.16 //@members.72"/>
27 <members parents="//@members.69 //@members.89"/>
28 <members children="//@members.48" parents="//@members.10 //@members.56"/>
29 <members children="//@members.34 //@members.35 //@members.57" parents="//@members.15 //@members.44"/>
30 <members parents="//@members.41 //@members.46"/>
31 <members children="//@members.93" parents="//@members.17 //@members.72"/>
32 <members parents="//@members.50 //@members.66"/>
33 <members children="//@members.4" parents="//@members.3 //@members.78"/>
34 <members children="//@members.39 //@members.54" parents="//@members.70 //@members.79"/>
35 <members children="//@members.53" parents="//@members.5 //@members.39"/>
36 <members children="//@members.56 //@members.82" parents="//@members.78 //@members.79"/>
37 <members children="//@members.22 //@members.40" parents="//@members.26 //@members.41"/>
38 <members children="//@members.91" parents="//@members.26 //@members.36"/>
39 <members children="//@members.6 //@members.9 //@members.10 //@members.15 //@members.35 //@members.45 //@members.49 //@members.50 //@members.70 //@members.80 //@members.87" parents="//@members.41 //@members.83"/>
40 <members children="//@members.11 //@members.69 //@members.78 //@members.79" parents="//@members.70 //@members.83"/>
41 <members children="//@members.15 //@members.73 //@members.84" parents="//@members.42 //@members.72"/>
42 <members children="//@members.32" parents="//@members.14 //@members.31"/>
43 <members parents="//@members.6 //@members.34"/>
44 <members children="//@members.17 //@members.27 //@members.34 //@members.36 //@members.44 //@members.62 //@members.70 //@members.79 //@members.83 //@members.86 //@members.89 //@members.95" parents="//@members.17 //@members.83"/>
45 <members children="//@members.5 //@members.38" parents="//@members.44 //@members.76"/>
46 <members children="//@members.90" parents="//@members.5 //@members.99"/>
47 <members children="//@members.7 //@members.16 //@members.26 //@members.42 //@members.46 //@members.47 //@members.52" parents="//@members.41 //@members.72"/>
48 <members children="//@members.74" parents="//@members.6 //@members.36"/>
49 <members children="//@members.18 //@members.27" parents="//@members.6 //@members.44"/>
50 <members children="//@members.13 //@members.51 //@members.90" parents="//@members.44 //@members.49"/>
51 <members parents="//@members.6 //@members.25"/>
52 <members children="//@members.6 //@members.47" parents="//@members.36 //@members.83"/>
53 <members children="//@members.11 //@members.29 //@members.66 //@members.97" parents="//@members.36 //@members.51"/>
54 <members children="//@members.3 //@members.50 //@members.67 //@members.99" parents="//@members.6 //@members.47"/>
55 <members children="//@members.77" parents="//@members.44 //@members.76"/>
56 <members parents="//@members.32 //@members.62"/>
57 <members children="//@members.21" parents="//@members.31 //@members.76"/>
58 <members parents="//@members.57 //@members.58"/>
59 <members children="//@members.12 //@members.25" parents="//@members.33 //@members.63"/>
60 <members children="//@members.55 //@members.77" parents="//@members.7 //@members.26"/>
61 <members children="//@members.55 //@members.81" parents="//@members.61 //@members.89"/>
62 <members children="//@members.2 //@members.67 //@members.71 //@members.74" parents="//@members.83 //@members.87"/>
63 <members parents="//@members.22 //@members.77"/>
64 <members children="//@members.18 //@members.58" parents="//@members.7 //@members.76"/>
65 <members children="//@members.53 //@members.65" parents="//@members.0 //@members.41"/>
66 <members children="//@members.14 //@members.56 //@members.97" parents="//@members.10 //@members.92"/>
67 <members parents="//@members.11 //@members.69"/>
68 <members parents="//@members.21 //@members.62"/>
69 <members children="//@members.8 //@members.29" parents="//@members.4 //@members.50"/>
70 <members parents="//@members.51 //@members.59"/>
71 <members parents="//@members.70 //@members.87"/>
72 <members children="//@members.24 //@members.64" parents="//@members.37 //@members.86"/>
73 <members children="//@members.13 //@members.31 //@members.37 //@members.68 //@members.72" parents="//@members.36 //@members.41"/>
74 <members parents="//@members.59 //@members.79"/>
75 <members children="//@members.4 //@members.9 //@members.23 //@members.28 //@members.38 //@members.44 //@members.78" parents="//@members.70 //@members.76"/>
76 <members children="//@members.1" parents="//@members.38 //@members.94"/>
77 <members parents="//@members.45 //@members.59"/>
78 <members parents="//@members.21 //@members.96"/>
79 <members children="//@members.19 //@members.42 //@members.52 //@members.54 //@members.61 //@members.72 //@members.89" parents="//@members.6 //@members.17"/>
80 <members children="//@members.60" parents="//@members.52 //@members.57"/>
81 <members children="//@members.30 //@members.33 //@members.94 //@members.95 //@members.98" parents="//@members.37 //@members.72"/>
82 <members children="//@members.31 //@members.33 //@members.71 //@members.92" parents="//@members.37 //@members.41"/>
83 <members children="//@members.20" parents="//@members.10 //@members.36"/>
84 <members parents="//@members.21 //@members.58"/>
85 <members parents="//@members.15 //@members.33"/>
86 <members children="//@members.10 //@members.17 //@members.22 //@members.36 //@members.37 //@members.41 //@members.49 //@members.59" parents="//@members.17 //@members.41"/>
87 <members parents="//@members.14 //@members.38"/>
88 <members/>
89 <members children="//@members.19 //@members.69" parents="//@members.11 //@members.41"/>
90 <members children="//@members.8 //@members.59 //@members.68" parents="//@members.17 //@members.36"/>
91 <members parents="//@members.4 //@members.17"/>
92 <members children="//@members.24 //@members.58" parents="//@members.41 //@members.76"/>
93 <members parents="//@members.43 //@members.47"/>
94 <members children="//@members.7" parents="//@members.11 //@members.35"/>
95 <members children="//@members.63" parents="//@members.6 //@members.79"/>
96 <members parents="//@members.19 //@members.28"/>
97 <members children="//@members.73" parents="//@members.3 //@members.78"/>
98 <members parents="//@members.41 //@members.78"/>
99 <members children="//@members.75" parents="//@members.6 //@members.97"/>
100 <members children="//@members.1 //@members.96" parents="//@members.50 //@members.63"/>
101 <members parents="//@members.4 //@members.78"/>
102 <members children="//@members.16 //@members.43" parents="//@members.11 //@members.51"/>
103</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/8_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/8_1.xmi
new file mode 100644
index 00000000..d0ad5be7
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/8_1.xmi
@@ -0,0 +1,103 @@
1<?xml version="1.0" encoding="ASCII"?>
2<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree ../case.study.familyTree.model/model/familytree.ecore">
3 <members children="//@members.16 //@members.62" parents="//@members.51 //@members.64"/>
4 <members parents="//@members.30 //@members.51"/>
5 <members children="//@members.11 //@members.13 //@members.26 //@members.34 //@members.46 //@members.56 //@members.79" parents="//@members.26 //@members.34"/>
6 <members children="//@members.12 //@members.22" parents="//@members.13 //@members.55"/>
7 <members children="//@members.41 //@members.45" parents="//@members.18 //@members.19"/>
8 <members children="//@members.60" parents="//@members.50 //@members.89"/>
9 <members children="//@members.68" parents="//@members.39 //@members.78"/>
10 <members parents="//@members.31 //@members.48"/>
11 <members children="//@members.85" parents="//@members.94 //@members.99"/>
12 <members parents="//@members.11 //@members.79"/>
13 <members children="//@members.19 //@members.50 //@members.62 //@members.77 //@members.78 //@members.81" parents="//@members.34 //@members.65"/>
14 <members children="//@members.9 //@members.14 //@members.73 //@members.92" parents="//@members.2 //@members.18"/>
15 <members children="//@members.38 //@members.63" parents="//@members.3 //@members.19"/>
16 <members children="//@members.3 //@members.35 //@members.41 //@members.47 //@members.55" parents="//@members.2 //@members.80"/>
17 <members children="//@members.16 //@members.17" parents="//@members.11 //@members.50"/>
18 <members children="//@members.67" parents="//@members.75 //@members.94"/>
19 <members parents="//@members.0 //@members.14"/>
20 <members children="//@members.33" parents="//@members.14 //@members.44"/>
21 <members children="//@members.4 //@members.11 //@members.40 //@members.42 //@members.48 //@members.57 //@members.80 //@members.95 //@members.98" parents="//@members.26 //@members.65"/>
22 <members children="//@members.4 //@members.12 //@members.51 //@members.72" parents="//@members.10 //@members.78"/>
23 <members children="//@members.25 //@members.56 //@members.74 //@members.77 //@members.89" parents="//@members.26 //@members.79"/>
24 <members parents="//@members.41 //@members.78"/>
25 <members parents="//@members.3 //@members.41"/>
26 <members parents="//@members.79 //@members.81"/>
27 <members children="//@members.31 //@members.61 //@members.85" parents="//@members.34 //@members.50"/>
28 <members children="//@members.44 //@members.86" parents="//@members.20 //@members.91"/>
29 <members children="//@members.2 //@members.18 //@members.20 //@members.65 //@members.80 //@members.84" parents="//@members.2 //@members.34"/>
30 <members parents="//@members.36 //@members.50"/>
31 <members children="//@members.29" parents="//@members.32 //@members.35"/>
32 <members parents="//@members.28 //@members.54"/>
33 <members children="//@members.1" parents="//@members.57 //@members.86"/>
34 <members children="//@members.7 //@members.59" parents="//@members.24 //@members.38"/>
35 <members children="//@members.28 //@members.54" parents="//@members.48 //@members.75"/>
36 <members parents="//@members.17 //@members.48"/>
37 <members children="//@members.2 //@members.10 //@members.24 //@members.26 //@members.65 //@members.71 //@members.90" parents="//@members.2 //@members.90"/>
38 <members children="//@members.28 //@members.36 //@members.63 //@members.75 //@members.93" parents="//@members.13 //@members.79"/>
39 <members children="//@members.27" parents="//@members.35 //@members.99"/>
40 <members children="//@members.38 //@members.83 //@members.86 //@members.99" parents="//@members.56 //@members.94"/>
41 <members children="//@members.31 //@members.60" parents="//@members.12 //@members.37"/>
42 <members children="//@members.6 //@members.94" parents="//@members.90 //@members.95"/>
43 <members children="//@members.54 //@members.87" parents="//@members.18 //@members.50"/>
44 <members children="//@members.21 //@members.22" parents="//@members.4 //@members.13"/>
45 <members parents="//@members.18 //@members.89"/>
46 <members/>
47 <members children="//@members.17" parents="//@members.25 //@members.56"/>
48 <members parents="//@members.4 //@members.73"/>
49 <members children="//@members.49 //@members.71 //@members.76" parents="//@members.2 //@members.80"/>
50 <members children="//@members.48 //@members.49 //@members.55 //@members.57 //@members.75 //@members.78 //@members.89" parents="//@members.13 //@members.56"/>
51 <members children="//@members.7 //@members.32 //@members.33 //@members.61" parents="//@members.18 //@members.47"/>
52 <members children="//@members.83 //@members.96" parents="//@members.46 //@members.47"/>
53 <members children="//@members.5 //@members.14 //@members.24 //@members.27 //@members.40 //@members.91" parents="//@members.10 //@members.90"/>
54 <members children="//@members.0 //@members.1" parents="//@members.19 //@members.78"/>
55 <members parents="//@members.73 //@members.86"/>
56 <members children="//@members.67" parents="//@members.87 //@members.90"/>
57 <members children="//@members.29 //@members.98" parents="//@members.32 //@members.40"/>
58 <members children="//@members.3 //@members.58 //@members.64 //@members.70 //@members.72" parents="//@members.13 //@members.47"/>
59 <members children="//@members.37 //@members.44 //@members.47" parents="//@members.2 //@members.20"/>
60 <members children="//@members.30" parents="//@members.18 //@members.47"/>
61 <members children="//@members.96" parents="//@members.55 //@members.94"/>
62 <members parents="//@members.31 //@members.74"/>
63 <members parents="//@members.5 //@members.38"/>
64 <members parents="//@members.24 //@members.48"/>
65 <members parents="//@members.0 //@members.10"/>
66 <members parents="//@members.12 //@members.35"/>
67 <members children="//@members.0 //@members.66 //@members.69 //@members.74" parents="//@members.55 //@members.78"/>
68 <members children="//@members.10 //@members.18 //@members.68 //@members.69 //@members.90 //@members.97" parents="//@members.26 //@members.34"/>
69 <members children="//@members.88" parents="//@members.64 //@members.79"/>
70 <members parents="//@members.15 //@members.53"/>
71 <members parents="//@members.6 //@members.65"/>
72 <members children="//@members.91 //@members.93" parents="//@members.64 //@members.65"/>
73 <members parents="//@members.55 //@members.93"/>
74 <members children="//@members.87" parents="//@members.34 //@members.46"/>
75 <members parents="//@members.19 //@members.55"/>
76 <members children="//@members.45 //@members.52" parents="//@members.11 //@members.79"/>
77 <members children="//@members.59 //@members.84" parents="//@members.20 //@members.64"/>
78 <members children="//@members.15 //@members.32 //@members.76 //@members.82" parents="//@members.35 //@members.47"/>
79 <members parents="//@members.46 //@members.75"/>
80 <members children="//@members.88" parents="//@members.10 //@members.20"/>
81 <members children="//@members.6 //@members.19 //@members.21 //@members.51 //@members.64 //@members.82 //@members.92" parents="//@members.10 //@members.47"/>
82 <members children="//@members.9 //@members.20 //@members.23 //@members.35 //@members.66 //@members.73" parents="//@members.2 //@members.80"/>
83 <members children="//@members.13 //@members.46 //@members.79 //@members.94" parents="//@members.18 //@members.26"/>
84 <members children="//@members.23" parents="//@members.10 //@members.90"/>
85 <members parents="//@members.75 //@members.78"/>
86 <members parents="//@members.37 //@members.49"/>
87 <members parents="//@members.26 //@members.74"/>
88 <members parents="//@members.8 //@members.24"/>
89 <members children="//@members.30 //@members.52" parents="//@members.25 //@members.37"/>
90 <members children="//@members.53" parents="//@members.40 //@members.71"/>
91 <members parents="//@members.66 //@members.77"/>
92 <members children="//@members.5 //@members.42" parents="//@members.20 //@members.47"/>
93 <members children="//@members.34 //@members.39 //@members.50 //@members.53 //@members.81 //@members.95" parents="//@members.34 //@members.65"/>
94 <members children="//@members.25" parents="//@members.50 //@members.69"/>
95 <members parents="//@members.11 //@members.78"/>
96 <members children="//@members.70" parents="//@members.35 //@members.69"/>
97 <members children="//@members.8 //@members.15 //@members.37 //@members.58 //@members.99" parents="//@members.39 //@members.80"/>
98 <members children="//@members.39" parents="//@members.18 //@members.90"/>
99 <members parents="//@members.49 //@members.58"/>
100 <members parents="//@members.65 //@members.98"/>
101 <members children="//@members.97" parents="//@members.18 //@members.54"/>
102 <members children="//@members.8 //@members.36" parents="//@members.37 //@members.94"/>
103</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/9_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/9_1.xmi
new file mode 100644
index 00000000..885e350b
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/FamilyTreeNoNum/9_1.xmi
@@ -0,0 +1,103 @@
1<?xml version="1.0" encoding="ASCII"?>
2<familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree ../case.study.familyTree.model/model/familytree.ecore">
3 <members parents="//@members.22 //@members.95"/>
4 <members parents="//@members.26 //@members.67"/>
5 <members parents="//@members.15 //@members.42"/>
6 <members parents="//@members.4 //@members.28"/>
7 <members children="//@members.3 //@members.7 //@members.17 //@members.30 //@members.42" parents="//@members.24 //@members.45"/>
8 <members parents="//@members.25 //@members.26"/>
9 <members children="//@members.12 //@members.13 //@members.17 //@members.24 //@members.27 //@members.30 //@members.45 //@members.52 //@members.57 //@members.77" parents="//@members.12 //@members.52"/>
10 <members children="//@members.32" parents="//@members.4 //@members.65"/>
11 <members parents="//@members.15 //@members.17"/>
12 <members children="//@members.38 //@members.47 //@members.71" parents="//@members.42 //@members.66"/>
13 <members children="//@members.21 //@members.61 //@members.82" parents="//@members.53 //@members.99"/>
14 <members parents="//@members.78 //@members.92"/>
15 <members children="//@members.6 //@members.18 //@members.27 //@members.45 //@members.50 //@members.61 //@members.77 //@members.78" parents="//@members.6 //@members.77"/>
16 <members children="//@members.37 //@members.63 //@members.99" parents="//@members.6 //@members.27"/>
17 <members children="//@members.16 //@members.85" parents="//@members.49 //@members.53"/>
18 <members children="//@members.2 //@members.8" parents="//@members.19 //@members.99"/>
19 <members parents="//@members.14 //@members.93"/>
20 <members children="//@members.8 //@members.29 //@members.86" parents="//@members.4 //@members.6"/>
21 <members children="//@members.34" parents="//@members.12 //@members.41"/>
22 <members children="//@members.15 //@members.20 //@members.22" parents="//@members.51 //@members.55"/>
23 <members children="//@members.94" parents="//@members.19 //@members.46"/>
24 <members children="//@members.22" parents="//@members.10 //@members.65"/>
25 <members children="//@members.0" parents="//@members.19 //@members.21"/>
26 <members parents="//@members.50 //@members.69"/>
27 <members children="//@members.4 //@members.26 //@members.51 //@members.57 //@members.63 //@members.64" parents="//@members.6 //@members.77"/>
28 <members children="//@members.5" parents="//@members.41 //@members.99"/>
29 <members children="//@members.1 //@members.5" parents="//@members.24 //@members.28"/>
30 <members children="//@members.13 //@members.28 //@members.58 //@members.67 //@members.68 //@members.72 //@members.79 //@members.84 //@members.96" parents="//@members.6 //@members.12"/>
31 <members children="//@members.3 //@members.26" parents="//@members.27 //@members.66"/>
32 <members parents="//@members.17 //@members.73"/>
33 <members parents="//@members.4 //@members.6"/>
34 <members parents="//@members.46 //@members.67"/>
35 <members children="//@members.80 //@members.89" parents="//@members.7 //@members.84"/>
36 <members parents="//@members.73 //@members.79"/>
37 <members parents="//@members.18 //@members.75"/>
38 <members children="//@members.40 //@members.73 //@members.97" parents="//@members.45 //@members.63"/>
39 <members children="//@members.39 //@members.41 //@members.55" parents="//@members.65 //@members.92"/>
40 <members children="//@members.43 //@members.90" parents="//@members.13 //@members.69"/>
41 <members parents="//@members.9 //@members.40"/>
42 <members parents="//@members.36 //@members.57"/>
43 <members children="//@members.38 //@members.54" parents="//@members.35 //@members.58"/>
44 <members children="//@members.18 //@members.25 //@members.48 //@members.96" parents="//@members.36 //@members.53"/>
45 <members children="//@members.2 //@members.9" parents="//@members.4 //@members.58"/>
46 <members children="//@members.72 //@members.98" parents="//@members.37 //@members.49"/>
47 <members parents="//@members.80 //@members.86"/>
48 <members children="//@members.4 //@members.35 //@members.51 //@members.53 //@members.65 //@members.70 //@members.92" parents="//@members.6 //@members.12"/>
49 <members children="//@members.20 //@members.31" parents="//@members.57 //@members.84"/>
50 <members children="//@members.70 //@members.88 //@members.98" parents="//@members.9 //@members.58"/>
51 <members parents="//@members.41 //@members.53"/>
52 <members children="//@members.14 //@members.43" parents="//@members.66 //@members.67"/>
53 <members children="//@members.23 //@members.69 //@members.95" parents="//@members.12 //@members.67"/>
54 <members children="//@members.19 //@members.67 //@members.80" parents="//@members.24 //@members.45"/>
55 <members children="//@members.6 //@members.56 //@members.58 //@members.86 //@members.87" parents="//@members.6 //@members.77"/>
56 <members children="//@members.10 //@members.14 //@members.41 //@members.48 //@members.56 //@members.83 //@members.93" parents="//@members.45 //@members.67"/>
57 <members children="//@members.79" parents="//@members.40 //@members.99"/>
58 <members children="//@members.19 //@members.68" parents="//@members.36 //@members.87"/>
59 <members parents="//@members.52 //@members.53"/>
60 <members children="//@members.39 //@members.46 //@members.59 //@members.66" parents="//@members.6 //@members.24"/>
61 <members children="//@members.40 //@members.42 //@members.47 //@members.75 //@members.81 //@members.87 //@members.92 //@members.99" parents="//@members.27 //@members.52"/>
62 <members children="//@members.85 //@members.88" parents="//@members.57 //@members.87"/>
63 <members parents="//@members.63 //@members.66"/>
64 <members children="//@members.91" parents="//@members.10 //@members.12"/>
65 <members/>
66 <members children="//@members.35 //@members.60 //@members.82" parents="//@members.13 //@members.24"/>
67 <members children="//@members.75" parents="//@members.24 //@members.69"/>
68 <members children="//@members.7 //@members.21 //@members.36 //@members.78" parents="//@members.45 //@members.87"/>
69 <members children="//@members.9 //@members.28 //@members.49 //@members.60" parents="//@members.57 //@members.77"/>
70 <members children="//@members.1 //@members.31 //@members.49 //@members.50 //@members.53 //@members.69" parents="//@members.27 //@members.51"/>
71 <members parents="//@members.27 //@members.55"/>
72 <members children="//@members.23 //@members.37 //@members.64" parents="//@members.50 //@members.67"/>
73 <members parents="//@members.45 //@members.47"/>
74 <members parents="//@members.9 //@members.72"/>
75 <members children="//@members.71" parents="//@members.27 //@members.43"/>
76 <members children="//@members.29 //@members.33 //@members.94 //@members.97" parents="//@members.35 //@members.92"/>
77 <members parents="//@members.85 //@members.98"/>
78 <members children="//@members.34" parents="//@members.58 //@members.64"/>
79 <members parents="//@members.80 //@members.83"/>
80 <members children="//@members.12 //@members.24 //@members.52 //@members.66 //@members.93" parents="//@members.6 //@members.12"/>
81 <members children="//@members.11" parents="//@members.12 //@members.65"/>
82 <members children="//@members.33" parents="//@members.27 //@members.54"/>
83 <members children="//@members.44 //@members.76" parents="//@members.32 //@members.51"/>
84 <members children="//@members.91 //@members.95" parents="//@members.58 //@members.99"/>
85 <members parents="//@members.10 //@members.63"/>
86 <members children="//@members.76" parents="//@members.53 //@members.86"/>
87 <members children="//@members.32 //@members.46" parents="//@members.27 //@members.99"/>
88 <members children="//@members.74" parents="//@members.14 //@members.59"/>
89 <members children="//@members.44 //@members.83" parents="//@members.17 //@members.52"/>
90 <members children="//@members.55 //@members.59 //@members.65" parents="//@members.52 //@members.58"/>
91 <members parents="//@members.47 //@members.59"/>
92 <members parents="//@members.32 //@members.99"/>
93 <members parents="//@members.37 //@members.92"/>
94 <members parents="//@members.61 //@members.81"/>
95 <members children="//@members.11 //@members.36 //@members.73 //@members.90" parents="//@members.45 //@members.58"/>
96 <members children="//@members.16" parents="//@members.53 //@members.77"/>
97 <members parents="//@members.20 //@members.73"/>
98 <members children="//@members.0" parents="//@members.50 //@members.81"/>
99 <members parents="//@members.27 //@members.41"/>
100 <members parents="//@members.35 //@members.73"/>
101 <members children="//@members.74" parents="//@members.43 //@members.47"/>
102 <members children="//@members.10 //@members.15 //@members.25 //@members.54 //@members.81 //@members.84 //@members.89" parents="//@members.13 //@members.58"/>
103</familytree:FamilyTree>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/10_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/10_1.xmi
new file mode 100644
index 00000000..7a8f6972
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/10_1.xmi
@@ -0,0 +1,135 @@
1<?xml version="1.0" encoding="ASCII"?>
2<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite ../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore">
3 <groundStationNetwork>
4 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
5 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
6 </groundStationNetwork>
7 <spacecraft xsi:type="satellite:SmallSat">
8 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
9 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.26/@commSubsystem.0" frequency="300" pathLength="150"/>
10 <payload xsi:type="satellite:InterferometryPayload"/>
11 </spacecraft>
12 <spacecraft xsi:type="satellite:CubeSat3U">
13 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
14 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1" frequency="8000" pathLength="385000"/>
15 <payload xsi:type="satellite:InterferometryPayload"/>
16 </spacecraft>
17 <spacecraft xsi:type="satellite:SmallSat">
18 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.7/@commSubsystem.1" frequency="300" pathLength="150"/>
19 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
20 <payload xsi:type="satellite:InterferometryPayload"/>
21 </spacecraft>
22 <spacecraft xsi:type="satellite:CubeSat6U">
23 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
24 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.6/@commSubsystem.1" frequency="8000" pathLength="150"/>
25 <payload xsi:type="satellite:InterferometryPayload"/>
26 </spacecraft>
27 <spacecraft xsi:type="satellite:CubeSat6U">
28 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1" frequency="8000" pathLength="385000"/>
29 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
30 <payload xsi:type="satellite:InterferometryPayload"/>
31 </spacecraft>
32 <spacecraft xsi:type="satellite:CubeSat6U">
33 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
34 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.8/@commSubsystem.0" frequency="300" pathLength="150"/>
35 </spacecraft>
36 <spacecraft xsi:type="satellite:CubeSat6U">
37 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.10/@commSubsystem.1" frequency="8000" pathLength="150"/>
38 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
39 <payload xsi:type="satellite:InterferometryPayload"/>
40 </spacecraft>
41 <spacecraft xsi:type="satellite:SmallSat">
42 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.1/@commSubsystem.1" frequency="8000" pathLength="150"/>
43 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
44 <payload xsi:type="satellite:InterferometryPayload"/>
45 </spacecraft>
46 <spacecraft xsi:type="satellite:SmallSat">
47 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.21/@commSubsystem.0" frequency="300" pathLength="150"/>
48 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
49 <payload xsi:type="satellite:InterferometryPayload"/>
50 </spacecraft>
51 <spacecraft xsi:type="satellite:CubeSat6U">
52 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.6/@commSubsystem.1" frequency="8000" pathLength="150"/>
53 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
54 <payload xsi:type="satellite:InterferometryPayload"/>
55 </spacecraft>
56 <spacecraft xsi:type="satellite:CubeSat6U">
57 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.7/@commSubsystem.0" frequency="8000" pathLength="150"/>
58 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
59 <payload xsi:type="satellite:InterferometryPayload"/>
60 </spacecraft>
61 <spacecraft xsi:type="satellite:CubeSat3U">
62 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
63 </spacecraft>
64 <spacecraft xsi:type="satellite:CubeSat3U">
65 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
66 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1" frequency="8000" pathLength="385000"/>
67 <payload xsi:type="satellite:InterferometryPayload"/>
68 </spacecraft>
69 <spacecraft xsi:type="satellite:CubeSat6U">
70 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.12/@commSubsystem.0" frequency="8000" pathLength="150"/>
71 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
72 <payload xsi:type="satellite:InterferometryPayload"/>
73 </spacecraft>
74 <spacecraft xsi:type="satellite:CubeSat3U">
75 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.26/@commSubsystem.0" frequency="300" pathLength="150"/>
76 <payload xsi:type="satellite:InterferometryPayload"/>
77 </spacecraft>
78 <spacecraft xsi:type="satellite:CubeSat6U">
79 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
80 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.19/@commSubsystem.0" frequency="8000" pathLength="150"/>
81 <payload xsi:type="satellite:InterferometryPayload"/>
82 </spacecraft>
83 <spacecraft xsi:type="satellite:CubeSat3U">
84 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
85 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
86 <payload xsi:type="satellite:InterferometryPayload"/>
87 </spacecraft>
88 <spacecraft xsi:type="satellite:SmallSat">
89 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
90 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.4/@commSubsystem.1" frequency="300" pathLength="150"/>
91 </spacecraft>
92 <spacecraft xsi:type="satellite:CubeSat6U">
93 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
94 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.19/@commSubsystem.0" frequency="8000" pathLength="150"/>
95 <payload xsi:type="satellite:InterferometryPayload"/>
96 </spacecraft>
97 <spacecraft xsi:type="satellite:CubeSat6U">
98 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.7/@commSubsystem.0" frequency="8000" pathLength="150"/>
99 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
100 <payload xsi:type="satellite:InterferometryPayload"/>
101 </spacecraft>
102 <spacecraft xsi:type="satellite:SmallSat">
103 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.1/@commSubsystem.0" frequency="8000" pathLength="150"/>
104 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
105 <payload xsi:type="satellite:InterferometryPayload"/>
106 </spacecraft>
107 <spacecraft xsi:type="satellite:CubeSat3U">
108 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
109 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.2/@commSubsystem.0" frequency="300" pathLength="150"/>
110 <payload xsi:type="satellite:InterferometryPayload"/>
111 </spacecraft>
112 <spacecraft xsi:type="satellite:SmallSat">
113 <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@spacecraft.17/@commSubsystem.0" frequency="26500" pathLength="150"/>
114 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
115 </spacecraft>
116 <spacecraft xsi:type="satellite:CubeSat3U">
117 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
118 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
119 <payload xsi:type="satellite:InterferometryPayload"/>
120 </spacecraft>
121 <spacecraft xsi:type="satellite:CubeSat6U">
122 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1" frequency="8000" pathLength="385000"/>
123 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
124 <payload xsi:type="satellite:InterferometryPayload"/>
125 </spacecraft>
126 <spacecraft xsi:type="satellite:CubeSat3U">
127 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.26/@commSubsystem.0" frequency="300" pathLength="150"/>
128 <payload xsi:type="satellite:InterferometryPayload"/>
129 </spacecraft>
130 <spacecraft xsi:type="satellite:CubeSat3U">
131 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
132 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.7/@commSubsystem.1" frequency="300" pathLength="150"/>
133 <payload xsi:type="satellite:InterferometryPayload"/>
134 </spacecraft>
135</satellite:InterferometryMission>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/1_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/1_1.xmi
new file mode 100644
index 00000000..2c5fcb8a
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/1_1.xmi
@@ -0,0 +1,131 @@
1<?xml version="1.0" encoding="ASCII"?>
2<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite ../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore">
3 <groundStationNetwork>
4 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
5 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
6 </groundStationNetwork>
7 <spacecraft xsi:type="satellite:CubeSat3U">
8 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
9 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.18/@commSubsystem.1" frequency="300" pathLength="150"/>
10 <payload xsi:type="satellite:InterferometryPayload"/>
11 </spacecraft>
12 <spacecraft xsi:type="satellite:CubeSat6U">
13 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.20/@commSubsystem.0" frequency="300" pathLength="150"/>
14 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
15 <payload xsi:type="satellite:InterferometryPayload"/>
16 </spacecraft>
17 <spacecraft xsi:type="satellite:CubeSat6U">
18 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.20/@commSubsystem.0" frequency="300" pathLength="150"/>
19 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
20 <payload xsi:type="satellite:InterferometryPayload"/>
21 </spacecraft>
22 <spacecraft xsi:type="satellite:CubeSat6U">
23 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
24 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.6/@commSubsystem.0" frequency="8000" pathLength="150"/>
25 <payload xsi:type="satellite:InterferometryPayload"/>
26 </spacecraft>
27 <spacecraft xsi:type="satellite:SmallSat">
28 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.16/@commSubsystem.0" frequency="8000" pathLength="150"/>
29 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
30 <payload xsi:type="satellite:InterferometryPayload"/>
31 </spacecraft>
32 <spacecraft xsi:type="satellite:SmallSat">
33 <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1" frequency="26500" pathLength="385000"/>
34 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
35 <payload xsi:type="satellite:InterferometryPayload"/>
36 </spacecraft>
37 <spacecraft xsi:type="satellite:SmallSat">
38 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
39 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.20/@commSubsystem.1" frequency="8000" pathLength="150"/>
40 <payload xsi:type="satellite:InterferometryPayload"/>
41 </spacecraft>
42 <spacecraft xsi:type="satellite:CubeSat6U">
43 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.16/@commSubsystem.0" frequency="8000" pathLength="150"/>
44 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
45 <payload xsi:type="satellite:InterferometryPayload"/>
46 </spacecraft>
47 <spacecraft xsi:type="satellite:CubeSat3U">
48 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
49 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.2/@commSubsystem.0" frequency="300" pathLength="150"/>
50 <payload xsi:type="satellite:InterferometryPayload"/>
51 </spacecraft>
52 <spacecraft xsi:type="satellite:CubeSat3U">
53 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
54 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.2/@commSubsystem.0" frequency="300" pathLength="150"/>
55 <payload xsi:type="satellite:InterferometryPayload"/>
56 </spacecraft>
57 <spacecraft xsi:type="satellite:CubeSat6U">
58 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.12/@commSubsystem.0" frequency="300" pathLength="150"/>
59 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
60 <payload xsi:type="satellite:InterferometryPayload"/>
61 </spacecraft>
62 <spacecraft xsi:type="satellite:CubeSat6U">
63 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
64 </spacecraft>
65 <spacecraft xsi:type="satellite:CubeSat6U">
66 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.4/@commSubsystem.1" frequency="300" pathLength="150"/>
67 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
68 <payload xsi:type="satellite:InterferometryPayload"/>
69 </spacecraft>
70 <spacecraft xsi:type="satellite:CubeSat6U">
71 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.2/@commSubsystem.0" frequency="300" pathLength="150"/>
72 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
73 <payload xsi:type="satellite:InterferometryPayload"/>
74 </spacecraft>
75 <spacecraft xsi:type="satellite:CubeSat3U">
76 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
77 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
78 <payload xsi:type="satellite:InterferometryPayload"/>
79 </spacecraft>
80 <spacecraft xsi:type="satellite:SmallSat">
81 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.16/@commSubsystem.0" frequency="8000" pathLength="150"/>
82 </spacecraft>
83 <spacecraft xsi:type="satellite:CubeSat3U">
84 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
85 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.13/@commSubsystem.1" frequency="300" pathLength="150"/>
86 <payload xsi:type="satellite:InterferometryPayload"/>
87 </spacecraft>
88 <spacecraft xsi:type="satellite:CubeSat3U">
89 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.13/@commSubsystem.0" frequency="300" pathLength="150"/>
90 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
91 <payload xsi:type="satellite:InterferometryPayload"/>
92 </spacecraft>
93 <spacecraft xsi:type="satellite:CubeSat6U">
94 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.1/@commSubsystem.1" frequency="8000" pathLength="150"/>
95 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
96 <payload xsi:type="satellite:InterferometryPayload"/>
97 </spacecraft>
98 <spacecraft xsi:type="satellite:CubeSat3U">
99 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.12/@commSubsystem.0" frequency="300" pathLength="150"/>
100 </spacecraft>
101 <spacecraft xsi:type="satellite:CubeSat3U">
102 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
103 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
104 <payload xsi:type="satellite:InterferometryPayload"/>
105 </spacecraft>
106 <spacecraft xsi:type="satellite:CubeSat6U">
107 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.20/@commSubsystem.0" frequency="300" pathLength="150"/>
108 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
109 <payload xsi:type="satellite:InterferometryPayload"/>
110 </spacecraft>
111 <spacecraft xsi:type="satellite:SmallSat">
112 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
113 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.6/@commSubsystem.1" frequency="8000" pathLength="150"/>
114 <payload xsi:type="satellite:InterferometryPayload"/>
115 </spacecraft>
116 <spacecraft xsi:type="satellite:SmallSat">
117 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
118 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.1/@commSubsystem.0" frequency="300" pathLength="150"/>
119 <payload xsi:type="satellite:InterferometryPayload"/>
120 </spacecraft>
121 <spacecraft xsi:type="satellite:SmallSat">
122 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.18/@commSubsystem.1" frequency="300" pathLength="150"/>
123 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
124 <payload xsi:type="satellite:InterferometryPayload"/>
125 </spacecraft>
126 <spacecraft xsi:type="satellite:CubeSat6U">
127 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
128 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.4/@commSubsystem.1" frequency="300" pathLength="150"/>
129 <payload xsi:type="satellite:InterferometryPayload"/>
130 </spacecraft>
131</satellite:InterferometryMission>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/2_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/2_1.xmi
new file mode 100644
index 00000000..6be77d9b
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/2_1.xmi
@@ -0,0 +1,129 @@
1<?xml version="1.0" encoding="ASCII"?>
2<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite ../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore">
3 <groundStationNetwork>
4 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
5 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
6 </groundStationNetwork>
7 <spacecraft xsi:type="satellite:CubeSat3U">
8 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.13/@commSubsystem.0" frequency="300" pathLength="150"/>
9 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
10 <payload xsi:type="satellite:InterferometryPayload"/>
11 </spacecraft>
12 <spacecraft xsi:type="satellite:CubeSat3U">
13 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.7/@commSubsystem.0" frequency="300" pathLength="150"/>
14 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
15 <payload xsi:type="satellite:InterferometryPayload"/>
16 </spacecraft>
17 <spacecraft xsi:type="satellite:CubeSat6U">
18 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
19 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.12/@commSubsystem.1" frequency="8000" pathLength="150"/>
20 <payload xsi:type="satellite:InterferometryPayload"/>
21 </spacecraft>
22 <spacecraft xsi:type="satellite:CubeSat3U">
23 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1" frequency="8000" pathLength="385000"/>
24 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
25 <payload xsi:type="satellite:InterferometryPayload"/>
26 </spacecraft>
27 <spacecraft xsi:type="satellite:CubeSat3U">
28 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
29 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1" frequency="8000" pathLength="385000"/>
30 <payload xsi:type="satellite:InterferometryPayload"/>
31 </spacecraft>
32 <spacecraft xsi:type="satellite:SmallSat">
33 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
34 <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@spacecraft.18/@commSubsystem.0" frequency="26500" pathLength="150"/>
35 <payload xsi:type="satellite:InterferometryPayload"/>
36 </spacecraft>
37 <spacecraft xsi:type="satellite:SmallSat">
38 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.19/@commSubsystem.1" frequency="8000" pathLength="150"/>
39 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
40 <payload xsi:type="satellite:InterferometryPayload"/>
41 </spacecraft>
42 <spacecraft xsi:type="satellite:CubeSat3U">
43 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.15/@commSubsystem.0" frequency="300" pathLength="150"/>
44 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
45 </spacecraft>
46 <spacecraft xsi:type="satellite:CubeSat3U">
47 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.3/@commSubsystem.1" frequency="300" pathLength="150"/>
48 <payload xsi:type="satellite:InterferometryPayload"/>
49 </spacecraft>
50 <spacecraft xsi:type="satellite:SmallSat">
51 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
52 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.1/@commSubsystem.1" frequency="300" pathLength="150"/>
53 <payload xsi:type="satellite:InterferometryPayload"/>
54 </spacecraft>
55 <spacecraft xsi:type="satellite:SmallSat">
56 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
57 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.13/@commSubsystem.0" frequency="300" pathLength="150"/>
58 <payload xsi:type="satellite:InterferometryPayload"/>
59 </spacecraft>
60 <spacecraft xsi:type="satellite:SmallSat">
61 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.4/@commSubsystem.1" frequency="8000" pathLength="150"/>
62 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
63 <payload xsi:type="satellite:InterferometryPayload"/>
64 </spacecraft>
65 <spacecraft xsi:type="satellite:CubeSat6U">
66 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
67 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.4/@commSubsystem.0" frequency="8000" pathLength="150"/>
68 <payload xsi:type="satellite:InterferometryPayload"/>
69 </spacecraft>
70 <spacecraft xsi:type="satellite:CubeSat6U">
71 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.3/@commSubsystem.1" frequency="300" pathLength="150"/>
72 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
73 <payload xsi:type="satellite:InterferometryPayload"/>
74 </spacecraft>
75 <spacecraft xsi:type="satellite:CubeSat6U">
76 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
77 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.4/@commSubsystem.0" frequency="8000" pathLength="150"/>
78 <payload xsi:type="satellite:InterferometryPayload"/>
79 </spacecraft>
80 <spacecraft xsi:type="satellite:CubeSat3U">
81 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.3/@commSubsystem.1" frequency="300" pathLength="150"/>
82 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
83 <payload xsi:type="satellite:InterferometryPayload"/>
84 </spacecraft>
85 <spacecraft xsi:type="satellite:CubeSat6U">
86 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
87 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.0/@commSubsystem.1" frequency="300" pathLength="150"/>
88 </spacecraft>
89 <spacecraft xsi:type="satellite:CubeSat6U">
90 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
91 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1" frequency="8000" pathLength="385000"/>
92 <payload xsi:type="satellite:InterferometryPayload"/>
93 </spacecraft>
94 <spacecraft xsi:type="satellite:SmallSat">
95 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
96 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.1/@commSubsystem.0" frequency="300" pathLength="150"/>
97 <payload xsi:type="satellite:InterferometryPayload"/>
98 </spacecraft>
99 <spacecraft xsi:type="satellite:CubeSat3U">
100 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
101 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1" frequency="8000" pathLength="385000"/>
102 <payload xsi:type="satellite:InterferometryPayload"/>
103 </spacecraft>
104 <spacecraft xsi:type="satellite:CubeSat3U">
105 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.14/@commSubsystem.0" frequency="300" pathLength="150"/>
106 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
107 <payload xsi:type="satellite:InterferometryPayload"/>
108 </spacecraft>
109 <spacecraft xsi:type="satellite:SmallSat">
110 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1" frequency="8000" pathLength="385000"/>
111 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
112 <payload xsi:type="satellite:InterferometryPayload"/>
113 </spacecraft>
114 <spacecraft xsi:type="satellite:CubeSat3U">
115 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
116 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1" frequency="8000" pathLength="385000"/>
117 <payload xsi:type="satellite:InterferometryPayload"/>
118 </spacecraft>
119 <spacecraft xsi:type="satellite:CubeSat6U">
120 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
121 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.4/@commSubsystem.1" frequency="8000" pathLength="150"/>
122 <payload xsi:type="satellite:InterferometryPayload"/>
123 </spacecraft>
124 <spacecraft xsi:type="satellite:SmallSat">
125 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.14/@commSubsystem.0" frequency="300" pathLength="150"/>
126 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
127 <payload xsi:type="satellite:InterferometryPayload"/>
128 </spacecraft>
129</satellite:InterferometryMission>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/3_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/3_1.xmi
new file mode 100644
index 00000000..3f21991a
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/3_1.xmi
@@ -0,0 +1,131 @@
1<?xml version="1.0" encoding="ASCII"?>
2<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite ../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore">
3 <groundStationNetwork>
4 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
5 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
6 </groundStationNetwork>
7 <spacecraft xsi:type="satellite:CubeSat3U">
8 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.17/@commSubsystem.1" frequency="300" pathLength="150"/>
9 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
10 <payload xsi:type="satellite:InterferometryPayload"/>
11 </spacecraft>
12 <spacecraft xsi:type="satellite:CubeSat3U">
13 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1" frequency="8000" pathLength="385000"/>
14 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
15 <payload xsi:type="satellite:InterferometryPayload"/>
16 </spacecraft>
17 <spacecraft xsi:type="satellite:SmallSat">
18 <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@spacecraft.24/@commSubsystem.0" frequency="26500" pathLength="150"/>
19 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
20 </spacecraft>
21 <spacecraft xsi:type="satellite:SmallSat">
22 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.1/@commSubsystem.1" frequency="8000" pathLength="150"/>
23 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
24 <payload xsi:type="satellite:InterferometryPayload"/>
25 </spacecraft>
26 <spacecraft xsi:type="satellite:CubeSat3U">
27 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
28 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.14/@commSubsystem.0" frequency="300" pathLength="150"/>
29 <payload xsi:type="satellite:InterferometryPayload"/>
30 </spacecraft>
31 <spacecraft xsi:type="satellite:CubeSat3U">
32 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1" frequency="8000" pathLength="385000"/>
33 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
34 <payload xsi:type="satellite:InterferometryPayload"/>
35 </spacecraft>
36 <spacecraft xsi:type="satellite:CubeSat3U">
37 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
38 </spacecraft>
39 <spacecraft xsi:type="satellite:SmallSat">
40 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
41 <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0" frequency="26500" pathLength="385000"/>
42 <payload xsi:type="satellite:InterferometryPayload"/>
43 </spacecraft>
44 <spacecraft xsi:type="satellite:SmallSat">
45 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
46 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.5/@commSubsystem.1" frequency="8000" pathLength="150"/>
47 <payload xsi:type="satellite:InterferometryPayload"/>
48 </spacecraft>
49 <spacecraft xsi:type="satellite:SmallSat">
50 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.17/@commSubsystem.0" frequency="8000" pathLength="150"/>
51 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
52 <payload xsi:type="satellite:InterferometryPayload"/>
53 </spacecraft>
54 <spacecraft xsi:type="satellite:CubeSat3U">
55 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.17/@commSubsystem.1" frequency="300" pathLength="150"/>
56 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
57 <payload xsi:type="satellite:InterferometryPayload"/>
58 </spacecraft>
59 <spacecraft xsi:type="satellite:CubeSat3U">
60 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.19/@commSubsystem.1" frequency="300" pathLength="150"/>
61 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
62 <payload xsi:type="satellite:InterferometryPayload"/>
63 </spacecraft>
64 <spacecraft xsi:type="satellite:CubeSat3U">
65 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
66 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.25/@commSubsystem.1" frequency="300" pathLength="150"/>
67 <payload xsi:type="satellite:InterferometryPayload"/>
68 </spacecraft>
69 <spacecraft xsi:type="satellite:CubeSat3U">
70 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
71 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.16/@commSubsystem.0" frequency="300" pathLength="150"/>
72 <payload xsi:type="satellite:InterferometryPayload"/>
73 </spacecraft>
74 <spacecraft xsi:type="satellite:CubeSat3U">
75 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.10/@commSubsystem.0" frequency="300" pathLength="150"/>
76 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
77 <payload xsi:type="satellite:InterferometryPayload"/>
78 </spacecraft>
79 <spacecraft xsi:type="satellite:CubeSat6U">
80 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
81 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.17/@commSubsystem.0" frequency="8000" pathLength="150"/>
82 <payload xsi:type="satellite:InterferometryPayload"/>
83 </spacecraft>
84 <spacecraft xsi:type="satellite:CubeSat3U">
85 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.19/@commSubsystem.0" frequency="300" pathLength="150"/>
86 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
87 <payload xsi:type="satellite:InterferometryPayload"/>
88 </spacecraft>
89 <spacecraft xsi:type="satellite:CubeSat3U">
90 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1" frequency="8000" pathLength="385000"/>
91 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
92 <payload xsi:type="satellite:InterferometryPayload"/>
93 </spacecraft>
94 <spacecraft xsi:type="satellite:CubeSat3U">
95 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
96 </spacecraft>
97 <spacecraft xsi:type="satellite:CubeSat6U">
98 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.17/@commSubsystem.1" frequency="300" pathLength="150"/>
99 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
100 <payload xsi:type="satellite:InterferometryPayload"/>
101 </spacecraft>
102 <spacecraft xsi:type="satellite:CubeSat6U">
103 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
104 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1" frequency="8000" pathLength="385000"/>
105 <payload xsi:type="satellite:InterferometryPayload"/>
106 </spacecraft>
107 <spacecraft xsi:type="satellite:CubeSat6U">
108 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.19/@commSubsystem.1" frequency="300" pathLength="150"/>
109 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
110 <payload xsi:type="satellite:InterferometryPayload"/>
111 </spacecraft>
112 <spacecraft xsi:type="satellite:CubeSat6U">
113 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.16/@commSubsystem.0" frequency="300" pathLength="150"/>
114 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
115 <payload xsi:type="satellite:InterferometryPayload"/>
116 </spacecraft>
117 <spacecraft xsi:type="satellite:SmallSat">
118 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1" frequency="8000" pathLength="385000"/>
119 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
120 </spacecraft>
121 <spacecraft xsi:type="satellite:SmallSat">
122 <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0" frequency="26500" pathLength="385000"/>
123 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
124 <payload xsi:type="satellite:InterferometryPayload"/>
125 </spacecraft>
126 <spacecraft xsi:type="satellite:SmallSat">
127 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
128 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.21/@commSubsystem.1" frequency="300" pathLength="150"/>
129 <payload xsi:type="satellite:InterferometryPayload"/>
130 </spacecraft>
131</satellite:InterferometryMission>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/4_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/4_1.xmi
new file mode 100644
index 00000000..497c7d03
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/4_1.xmi
@@ -0,0 +1,131 @@
1<?xml version="1.0" encoding="ASCII"?>
2<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite ../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore">
3 <groundStationNetwork>
4 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
5 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
6 </groundStationNetwork>
7 <spacecraft xsi:type="satellite:SmallSat">
8 <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1" frequency="26500" pathLength="385000"/>
9 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
10 <payload xsi:type="satellite:InterferometryPayload"/>
11 </spacecraft>
12 <spacecraft xsi:type="satellite:CubeSat3U">
13 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.2/@commSubsystem.0" frequency="300" pathLength="150"/>
14 </spacecraft>
15 <spacecraft xsi:type="satellite:CubeSat3U">
16 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
17 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0" frequency="8000" pathLength="385000"/>
18 <payload xsi:type="satellite:InterferometryPayload"/>
19 </spacecraft>
20 <spacecraft xsi:type="satellite:CubeSat3U">
21 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
22 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.20/@commSubsystem.0" frequency="300" pathLength="150"/>
23 <payload xsi:type="satellite:InterferometryPayload"/>
24 </spacecraft>
25 <spacecraft xsi:type="satellite:CubeSat3U">
26 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.8/@commSubsystem.0" frequency="300" pathLength="150"/>
27 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
28 <payload xsi:type="satellite:InterferometryPayload"/>
29 </spacecraft>
30 <spacecraft xsi:type="satellite:CubeSat3U">
31 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
32 <payload xsi:type="satellite:InterferometryPayload"/>
33 </spacecraft>
34 <spacecraft xsi:type="satellite:SmallSat">
35 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
36 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0" frequency="8000" pathLength="385000"/>
37 <payload xsi:type="satellite:InterferometryPayload"/>
38 </spacecraft>
39 <spacecraft xsi:type="satellite:SmallSat">
40 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.15/@commSubsystem.0" frequency="8000" pathLength="150"/>
41 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
42 <payload xsi:type="satellite:InterferometryPayload"/>
43 </spacecraft>
44 <spacecraft xsi:type="satellite:CubeSat6U">
45 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
46 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.13/@commSubsystem.0" frequency="8000" pathLength="150"/>
47 <payload xsi:type="satellite:InterferometryPayload"/>
48 </spacecraft>
49 <spacecraft xsi:type="satellite:SmallSat">
50 <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@spacecraft.0/@commSubsystem.0" frequency="26500" pathLength="150"/>
51 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
52 <payload xsi:type="satellite:InterferometryPayload"/>
53 </spacecraft>
54 <spacecraft xsi:type="satellite:CubeSat6U">
55 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.16/@commSubsystem.1" frequency="8000" pathLength="150"/>
56 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
57 <payload xsi:type="satellite:InterferometryPayload"/>
58 </spacecraft>
59 <spacecraft xsi:type="satellite:CubeSat3U">
60 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
61 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0" frequency="8000" pathLength="385000"/>
62 <payload xsi:type="satellite:InterferometryPayload"/>
63 </spacecraft>
64 <spacecraft xsi:type="satellite:CubeSat6U">
65 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.8/@commSubsystem.0" frequency="300" pathLength="150"/>
66 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
67 <payload xsi:type="satellite:InterferometryPayload"/>
68 </spacecraft>
69 <spacecraft xsi:type="satellite:SmallSat">
70 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.0/@commSubsystem.1" frequency="8000" pathLength="150"/>
71 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
72 <payload xsi:type="satellite:InterferometryPayload"/>
73 </spacecraft>
74 <spacecraft xsi:type="satellite:CubeSat3U">
75 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
76 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0" frequency="8000" pathLength="385000"/>
77 <payload xsi:type="satellite:InterferometryPayload"/>
78 </spacecraft>
79 <spacecraft xsi:type="satellite:SmallSat">
80 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.0/@commSubsystem.1" frequency="8000" pathLength="150"/>
81 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
82 <payload xsi:type="satellite:InterferometryPayload"/>
83 </spacecraft>
84 <spacecraft xsi:type="satellite:CubeSat3U">
85 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0" frequency="8000" pathLength="385000"/>
86 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
87 <payload xsi:type="satellite:InterferometryPayload"/>
88 </spacecraft>
89 <spacecraft xsi:type="satellite:SmallSat">
90 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.8/@commSubsystem.0" frequency="300" pathLength="150"/>
91 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
92 <payload xsi:type="satellite:InterferometryPayload"/>
93 </spacecraft>
94 <spacecraft xsi:type="satellite:CubeSat6U">
95 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.8/@commSubsystem.1" frequency="8000" pathLength="150"/>
96 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
97 <payload xsi:type="satellite:InterferometryPayload"/>
98 </spacecraft>
99 <spacecraft xsi:type="satellite:CubeSat3U">
100 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
101 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.8/@commSubsystem.0" frequency="300" pathLength="150"/>
102 <payload xsi:type="satellite:InterferometryPayload"/>
103 </spacecraft>
104 <spacecraft xsi:type="satellite:CubeSat3U">
105 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
106 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.12/@commSubsystem.0" frequency="300" pathLength="150"/>
107 <payload xsi:type="satellite:InterferometryPayload"/>
108 </spacecraft>
109 <spacecraft xsi:type="satellite:CubeSat6U">
110 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
111 </spacecraft>
112 <spacecraft xsi:type="satellite:CubeSat6U">
113 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
114 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.18/@commSubsystem.1" frequency="300" pathLength="150"/>
115 <payload xsi:type="satellite:InterferometryPayload"/>
116 </spacecraft>
117 <spacecraft xsi:type="satellite:CubeSat6U">
118 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.16/@commSubsystem.1" frequency="8000" pathLength="150"/>
119 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
120 </spacecraft>
121 <spacecraft xsi:type="satellite:CubeSat3U">
122 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
123 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.4/@commSubsystem.0" frequency="300" pathLength="150"/>
124 <payload xsi:type="satellite:InterferometryPayload"/>
125 </spacecraft>
126 <spacecraft xsi:type="satellite:CubeSat3U">
127 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
128 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.20/@commSubsystem.1" frequency="300" pathLength="150"/>
129 <payload xsi:type="satellite:InterferometryPayload"/>
130 </spacecraft>
131</satellite:InterferometryMission>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/5_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/5_1.xmi
new file mode 100644
index 00000000..1194f5d0
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/5_1.xmi
@@ -0,0 +1,129 @@
1<?xml version="1.0" encoding="ASCII"?>
2<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite ../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore">
3 <groundStationNetwork>
4 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
5 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
6 </groundStationNetwork>
7 <spacecraft xsi:type="satellite:CubeSat6U">
8 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.21/@commSubsystem.0" frequency="300" pathLength="150"/>
9 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
10 <payload xsi:type="satellite:InterferometryPayload"/>
11 </spacecraft>
12 <spacecraft xsi:type="satellite:SmallSat">
13 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.10/@commSubsystem.0" frequency="300" pathLength="150"/>
14 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
15 <payload xsi:type="satellite:InterferometryPayload"/>
16 </spacecraft>
17 <spacecraft xsi:type="satellite:CubeSat6U">
18 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
19 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.23/@commSubsystem.1" frequency="300" pathLength="150"/>
20 <payload xsi:type="satellite:InterferometryPayload"/>
21 </spacecraft>
22 <spacecraft xsi:type="satellite:CubeSat6U">
23 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.13/@commSubsystem.0" frequency="8000" pathLength="150"/>
24 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
25 <payload xsi:type="satellite:InterferometryPayload"/>
26 </spacecraft>
27 <spacecraft xsi:type="satellite:CubeSat3U">
28 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.2/@commSubsystem.0" frequency="300" pathLength="150"/>
29 <payload xsi:type="satellite:InterferometryPayload"/>
30 </spacecraft>
31 <spacecraft xsi:type="satellite:CubeSat3U">
32 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
33 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1" frequency="8000" pathLength="385000"/>
34 <payload xsi:type="satellite:InterferometryPayload"/>
35 </spacecraft>
36 <spacecraft xsi:type="satellite:CubeSat3U">
37 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
38 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.23/@commSubsystem.1" frequency="300" pathLength="150"/>
39 <payload xsi:type="satellite:InterferometryPayload"/>
40 </spacecraft>
41 <spacecraft xsi:type="satellite:CubeSat3U">
42 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
43 <payload xsi:type="satellite:InterferometryPayload"/>
44 </spacecraft>
45 <spacecraft xsi:type="satellite:SmallSat">
46 <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@spacecraft.1/@commSubsystem.1" frequency="26500" pathLength="150"/>
47 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
48 <payload xsi:type="satellite:InterferometryPayload"/>
49 </spacecraft>
50 <spacecraft xsi:type="satellite:CubeSat6U">
51 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.13/@commSubsystem.1" frequency="300" pathLength="150"/>
52 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
53 <payload xsi:type="satellite:InterferometryPayload"/>
54 </spacecraft>
55 <spacecraft xsi:type="satellite:CubeSat3U">
56 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.21/@commSubsystem.1" frequency="300" pathLength="150"/>
57 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
58 <payload xsi:type="satellite:InterferometryPayload"/>
59 </spacecraft>
60 <spacecraft xsi:type="satellite:CubeSat6U">
61 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.17/@commSubsystem.1" frequency="8000" pathLength="150"/>
62 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
63 <payload xsi:type="satellite:InterferometryPayload"/>
64 </spacecraft>
65 <spacecraft xsi:type="satellite:CubeSat6U">
66 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.0/@commSubsystem.1" frequency="8000" pathLength="150"/>
67 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
68 <payload xsi:type="satellite:InterferometryPayload"/>
69 </spacecraft>
70 <spacecraft xsi:type="satellite:CubeSat6U">
71 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.5/@commSubsystem.0" frequency="8000" pathLength="150"/>
72 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
73 <payload xsi:type="satellite:InterferometryPayload"/>
74 </spacecraft>
75 <spacecraft xsi:type="satellite:CubeSat6U">
76 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.9/@commSubsystem.1" frequency="300" pathLength="150"/>
77 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
78 <payload xsi:type="satellite:InterferometryPayload"/>
79 </spacecraft>
80 <spacecraft xsi:type="satellite:CubeSat6U">
81 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
82 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.5/@commSubsystem.1" frequency="8000" pathLength="150"/>
83 <payload xsi:type="satellite:InterferometryPayload"/>
84 </spacecraft>
85 <spacecraft xsi:type="satellite:SmallSat">
86 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.0/@commSubsystem.0" frequency="300" pathLength="150"/>
87 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
88 </spacecraft>
89 <spacecraft xsi:type="satellite:SmallSat">
90 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.0/@commSubsystem.1" frequency="8000" pathLength="150"/>
91 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
92 <payload xsi:type="satellite:InterferometryPayload"/>
93 </spacecraft>
94 <spacecraft xsi:type="satellite:CubeSat6U">
95 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
96 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.11/@commSubsystem.0" frequency="8000" pathLength="150"/>
97 <payload xsi:type="satellite:InterferometryPayload"/>
98 </spacecraft>
99 <spacecraft xsi:type="satellite:SmallSat">
100 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.18/@commSubsystem.1" frequency="8000" pathLength="150"/>
101 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
102 <payload xsi:type="satellite:InterferometryPayload"/>
103 </spacecraft>
104 <spacecraft xsi:type="satellite:CubeSat6U">
105 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
106 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.24/@commSubsystem.1" frequency="300" pathLength="150"/>
107 <payload xsi:type="satellite:InterferometryPayload"/>
108 </spacecraft>
109 <spacecraft xsi:type="satellite:SmallSat">
110 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
111 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.22/@commSubsystem.1" frequency="300" pathLength="150"/>
112 <payload xsi:type="satellite:InterferometryPayload"/>
113 </spacecraft>
114 <spacecraft xsi:type="satellite:CubeSat3U">
115 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
116 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.23/@commSubsystem.1" frequency="300" pathLength="150"/>
117 <payload xsi:type="satellite:InterferometryPayload"/>
118 </spacecraft>
119 <spacecraft xsi:type="satellite:CubeSat6U">
120 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
121 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.9/@commSubsystem.0" frequency="300" pathLength="150"/>
122 <payload xsi:type="satellite:InterferometryPayload"/>
123 </spacecraft>
124 <spacecraft xsi:type="satellite:CubeSat3U">
125 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
126 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.9/@commSubsystem.1" frequency="300" pathLength="150"/>
127 <payload xsi:type="satellite:InterferometryPayload"/>
128 </spacecraft>
129</satellite:InterferometryMission>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/6_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/6_1.xmi
new file mode 100644
index 00000000..cf399d44
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/6_1.xmi
@@ -0,0 +1,129 @@
1<?xml version="1.0" encoding="ASCII"?>
2<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite ../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore">
3 <groundStationNetwork>
4 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
5 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
6 </groundStationNetwork>
7 <spacecraft xsi:type="satellite:SmallSat">
8 <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0" frequency="26500" pathLength="385000"/>
9 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
10 <payload xsi:type="satellite:InterferometryPayload"/>
11 </spacecraft>
12 <spacecraft xsi:type="satellite:CubeSat3U">
13 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.2/@commSubsystem.1" frequency="300" pathLength="150"/>
14 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
15 <payload xsi:type="satellite:InterferometryPayload"/>
16 </spacecraft>
17 <spacecraft xsi:type="satellite:CubeSat3U">
18 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
19 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.0/@commSubsystem.1" frequency="300" pathLength="150"/>
20 <payload xsi:type="satellite:InterferometryPayload"/>
21 </spacecraft>
22 <spacecraft xsi:type="satellite:CubeSat6U">
23 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.0/@commSubsystem.1" frequency="300" pathLength="150"/>
24 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
25 <payload xsi:type="satellite:InterferometryPayload"/>
26 </spacecraft>
27 <spacecraft xsi:type="satellite:CubeSat3U">
28 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
29 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.11/@commSubsystem.1" frequency="300" pathLength="150"/>
30 <payload xsi:type="satellite:InterferometryPayload"/>
31 </spacecraft>
32 <spacecraft xsi:type="satellite:SmallSat">
33 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.24/@commSubsystem.0" frequency="8000" pathLength="150"/>
34 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
35 <payload xsi:type="satellite:InterferometryPayload"/>
36 </spacecraft>
37 <spacecraft xsi:type="satellite:SmallSat">
38 <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@spacecraft.0/@commSubsystem.0" frequency="26500" pathLength="150"/>
39 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
40 </spacecraft>
41 <spacecraft xsi:type="satellite:CubeSat3U">
42 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
43 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.15/@commSubsystem.1" frequency="300" pathLength="150"/>
44 <payload xsi:type="satellite:InterferometryPayload"/>
45 </spacecraft>
46 <spacecraft xsi:type="satellite:CubeSat6U">
47 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
48 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.14/@commSubsystem.0" frequency="300" pathLength="150"/>
49 <payload xsi:type="satellite:InterferometryPayload"/>
50 </spacecraft>
51 <spacecraft xsi:type="satellite:CubeSat6U">
52 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
53 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.13/@commSubsystem.1" frequency="300" pathLength="150"/>
54 <payload xsi:type="satellite:InterferometryPayload"/>
55 </spacecraft>
56 <spacecraft xsi:type="satellite:CubeSat3U">
57 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
58 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.1/@commSubsystem.0" frequency="300" pathLength="150"/>
59 <payload xsi:type="satellite:InterferometryPayload"/>
60 </spacecraft>
61 <spacecraft xsi:type="satellite:SmallSat">
62 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.22/@commSubsystem.1" frequency="8000" pathLength="150"/>
63 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
64 <payload xsi:type="satellite:InterferometryPayload"/>
65 </spacecraft>
66 <spacecraft xsi:type="satellite:CubeSat3U">
67 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
68 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
69 <payload xsi:type="satellite:InterferometryPayload"/>
70 </spacecraft>
71 <spacecraft xsi:type="satellite:SmallSat">
72 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.11/@commSubsystem.0" frequency="8000" pathLength="150"/>
73 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
74 <payload xsi:type="satellite:InterferometryPayload"/>
75 </spacecraft>
76 <spacecraft xsi:type="satellite:SmallSat">
77 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.13/@commSubsystem.1" frequency="300" pathLength="150"/>
78 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
79 <payload xsi:type="satellite:InterferometryPayload"/>
80 </spacecraft>
81 <spacecraft xsi:type="satellite:SmallSat">
82 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
83 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.8/@commSubsystem.1" frequency="300" pathLength="150"/>
84 <payload xsi:type="satellite:InterferometryPayload"/>
85 </spacecraft>
86 <spacecraft xsi:type="satellite:CubeSat6U">
87 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
88 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.3/@commSubsystem.0" frequency="300" pathLength="150"/>
89 <payload xsi:type="satellite:InterferometryPayload"/>
90 </spacecraft>
91 <spacecraft xsi:type="satellite:CubeSat6U">
92 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.18/@commSubsystem.1" frequency="8000" pathLength="150"/>
93 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
94 </spacecraft>
95 <spacecraft xsi:type="satellite:CubeSat6U">
96 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
97 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.19/@commSubsystem.0" frequency="8000" pathLength="150"/>
98 <payload xsi:type="satellite:InterferometryPayload"/>
99 </spacecraft>
100 <spacecraft xsi:type="satellite:CubeSat6U">
101 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.4/@commSubsystem.0" frequency="8000" pathLength="150"/>
102 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
103 <payload xsi:type="satellite:InterferometryPayload"/>
104 </spacecraft>
105 <spacecraft xsi:type="satellite:CubeSat3U">
106 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
107 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
108 <payload xsi:type="satellite:InterferometryPayload"/>
109 </spacecraft>
110 <spacecraft xsi:type="satellite:CubeSat3U">
111 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.7/@commSubsystem.1" frequency="300" pathLength="150"/>
112 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
113 </spacecraft>
114 <spacecraft xsi:type="satellite:CubeSat3U">
115 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.0/@commSubsystem.1" frequency="300" pathLength="150"/>
116 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
117 <payload xsi:type="satellite:InterferometryPayload"/>
118 </spacecraft>
119 <spacecraft xsi:type="satellite:CubeSat6U">
120 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
121 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.11/@commSubsystem.0" frequency="8000" pathLength="150"/>
122 <payload xsi:type="satellite:InterferometryPayload"/>
123 </spacecraft>
124 <spacecraft xsi:type="satellite:CubeSat6U">
125 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.22/@commSubsystem.1" frequency="8000" pathLength="150"/>
126 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
127 <payload xsi:type="satellite:InterferometryPayload"/>
128 </spacecraft>
129</satellite:InterferometryMission>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/7_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/7_1.xmi
new file mode 100644
index 00000000..bd1a4072
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/7_1.xmi
@@ -0,0 +1,129 @@
1<?xml version="1.0" encoding="ASCII"?>
2<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite ../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore">
3 <groundStationNetwork>
4 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
5 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
6 </groundStationNetwork>
7 <spacecraft xsi:type="satellite:SmallSat">
8 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
9 <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0" frequency="26500" pathLength="385000"/>
10 <payload xsi:type="satellite:InterferometryPayload"/>
11 </spacecraft>
12 <spacecraft xsi:type="satellite:CubeSat6U">
13 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.15/@commSubsystem.1" frequency="8000" pathLength="150"/>
14 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
15 <payload xsi:type="satellite:InterferometryPayload"/>
16 </spacecraft>
17 <spacecraft xsi:type="satellite:CubeSat6U">
18 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
19 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.4/@commSubsystem.0" frequency="8000" pathLength="150"/>
20 <payload xsi:type="satellite:InterferometryPayload"/>
21 </spacecraft>
22 <spacecraft xsi:type="satellite:SmallSat">
23 <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0" frequency="26500" pathLength="385000"/>
24 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
25 <payload xsi:type="satellite:InterferometryPayload"/>
26 </spacecraft>
27 <spacecraft xsi:type="satellite:CubeSat3U">
28 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
29 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.19/@commSubsystem.0" frequency="300" pathLength="150"/>
30 <payload xsi:type="satellite:InterferometryPayload"/>
31 </spacecraft>
32 <spacecraft xsi:type="satellite:SmallSat">
33 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.22/@commSubsystem.0" frequency="300" pathLength="150"/>
34 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
35 <payload xsi:type="satellite:InterferometryPayload"/>
36 </spacecraft>
37 <spacecraft xsi:type="satellite:CubeSat6U">
38 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
39 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.18/@commSubsystem.0" frequency="300" pathLength="150"/>
40 <payload xsi:type="satellite:InterferometryPayload"/>
41 </spacecraft>
42 <spacecraft xsi:type="satellite:CubeSat6U">
43 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.8/@commSubsystem.1" frequency="8000" pathLength="150"/>
44 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
45 <payload xsi:type="satellite:InterferometryPayload"/>
46 </spacecraft>
47 <spacecraft xsi:type="satellite:CubeSat3U">
48 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
49 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
50 <payload xsi:type="satellite:InterferometryPayload"/>
51 </spacecraft>
52 <spacecraft xsi:type="satellite:CubeSat3U">
53 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
54 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
55 <payload xsi:type="satellite:InterferometryPayload"/>
56 </spacecraft>
57 <spacecraft xsi:type="satellite:SmallSat">
58 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
59 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.18/@commSubsystem.1" frequency="8000" pathLength="150"/>
60 <payload xsi:type="satellite:InterferometryPayload"/>
61 </spacecraft>
62 <spacecraft xsi:type="satellite:CubeSat3U">
63 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
64 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
65 <payload xsi:type="satellite:InterferometryPayload"/>
66 </spacecraft>
67 <spacecraft xsi:type="satellite:SmallSat">
68 <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@spacecraft.3/@commSubsystem.0" frequency="26500" pathLength="150"/>
69 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
70 <payload xsi:type="satellite:InterferometryPayload"/>
71 </spacecraft>
72 <spacecraft xsi:type="satellite:SmallSat">
73 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
74 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.14/@commSubsystem.0" frequency="300" pathLength="150"/>
75 <payload xsi:type="satellite:InterferometryPayload"/>
76 </spacecraft>
77 <spacecraft xsi:type="satellite:CubeSat3U">
78 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.22/@commSubsystem.0" frequency="300" pathLength="150"/>
79 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
80 <payload xsi:type="satellite:InterferometryPayload"/>
81 </spacecraft>
82 <spacecraft xsi:type="satellite:CubeSat6U">
83 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.18/@commSubsystem.1" frequency="8000" pathLength="150"/>
84 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
85 <payload xsi:type="satellite:InterferometryPayload"/>
86 </spacecraft>
87 <spacecraft xsi:type="satellite:CubeSat6U">
88 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.19/@commSubsystem.0" frequency="300" pathLength="150"/>
89 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
90 <payload xsi:type="satellite:InterferometryPayload"/>
91 </spacecraft>
92 <spacecraft xsi:type="satellite:CubeSat3U">
93 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.23/@commSubsystem.1" frequency="300" pathLength="150"/>
94 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
95 <payload xsi:type="satellite:InterferometryPayload"/>
96 </spacecraft>
97 <spacecraft xsi:type="satellite:CubeSat6U">
98 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.16/@commSubsystem.0" frequency="300" pathLength="150"/>
99 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
100 <payload xsi:type="satellite:InterferometryPayload"/>
101 </spacecraft>
102 <spacecraft xsi:type="satellite:CubeSat6U">
103 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
104 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.8/@commSubsystem.0" frequency="8000" pathLength="150"/>
105 <payload xsi:type="satellite:InterferometryPayload"/>
106 </spacecraft>
107 <spacecraft xsi:type="satellite:SmallSat">
108 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
109 <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@spacecraft.3/@commSubsystem.0" frequency="26500" pathLength="150"/>
110 </spacecraft>
111 <spacecraft xsi:type="satellite:SmallSat">
112 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.2/@commSubsystem.0" frequency="300" pathLength="150"/>
113 <payload xsi:type="satellite:InterferometryPayload"/>
114 </spacecraft>
115 <spacecraft xsi:type="satellite:CubeSat6U">
116 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
117 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.16/@commSubsystem.1" frequency="300" pathLength="150"/>
118 <payload xsi:type="satellite:InterferometryPayload"/>
119 </spacecraft>
120 <spacecraft xsi:type="satellite:CubeSat3U">
121 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
122 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.14/@commSubsystem.0" frequency="300" pathLength="150"/>
123 <payload xsi:type="satellite:InterferometryPayload"/>
124 </spacecraft>
125 <spacecraft xsi:type="satellite:CubeSat3U">
126 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
127 <payload xsi:type="satellite:InterferometryPayload"/>
128 </spacecraft>
129</satellite:InterferometryMission>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/8_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/8_1.xmi
new file mode 100644
index 00000000..51289c6a
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/8_1.xmi
@@ -0,0 +1,129 @@
1<?xml version="1.0" encoding="ASCII"?>
2<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite ../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore">
3 <groundStationNetwork>
4 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
5 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
6 </groundStationNetwork>
7 <spacecraft xsi:type="satellite:CubeSat6U">
8 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.10/@commSubsystem.0" frequency="300" pathLength="150"/>
9 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
10 <payload xsi:type="satellite:InterferometryPayload"/>
11 </spacecraft>
12 <spacecraft xsi:type="satellite:CubeSat6U">
13 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
14 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.6/@commSubsystem.0" frequency="300" pathLength="150"/>
15 <payload xsi:type="satellite:InterferometryPayload"/>
16 </spacecraft>
17 <spacecraft xsi:type="satellite:CubeSat3U">
18 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0" frequency="8000" pathLength="385000"/>
19 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
20 <payload xsi:type="satellite:InterferometryPayload"/>
21 </spacecraft>
22 <spacecraft xsi:type="satellite:CubeSat3U">
23 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
24 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.7/@commSubsystem.0" frequency="300" pathLength="150"/>
25 <payload xsi:type="satellite:InterferometryPayload"/>
26 </spacecraft>
27 <spacecraft xsi:type="satellite:CubeSat6U">
28 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
29 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.5/@commSubsystem.1" frequency="300" pathLength="150"/>
30 <payload xsi:type="satellite:InterferometryPayload"/>
31 </spacecraft>
32 <spacecraft xsi:type="satellite:CubeSat3U">
33 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
34 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.10/@commSubsystem.0" frequency="300" pathLength="150"/>
35 <payload xsi:type="satellite:InterferometryPayload"/>
36 </spacecraft>
37 <spacecraft xsi:type="satellite:CubeSat6U">
38 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.3/@commSubsystem.1" frequency="300" pathLength="150"/>
39 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
40 </spacecraft>
41 <spacecraft xsi:type="satellite:CubeSat6U">
42 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.9/@commSubsystem.0" frequency="300" pathLength="150"/>
43 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
44 <payload xsi:type="satellite:InterferometryPayload"/>
45 </spacecraft>
46 <spacecraft xsi:type="satellite:SmallSat">
47 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0" frequency="8000" pathLength="385000"/>
48 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
49 </spacecraft>
50 <spacecraft xsi:type="satellite:CubeSat3U">
51 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.18/@commSubsystem.1" frequency="300" pathLength="150"/>
52 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
53 <payload xsi:type="satellite:InterferometryPayload"/>
54 </spacecraft>
55 <spacecraft xsi:type="satellite:CubeSat3U">
56 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.7/@commSubsystem.0" frequency="300" pathLength="150"/>
57 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
58 <payload xsi:type="satellite:InterferometryPayload"/>
59 </spacecraft>
60 <spacecraft xsi:type="satellite:CubeSat3U">
61 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0" frequency="8000" pathLength="385000"/>
62 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
63 <payload xsi:type="satellite:InterferometryPayload"/>
64 </spacecraft>
65 <spacecraft xsi:type="satellite:CubeSat6U">
66 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.11/@commSubsystem.0" frequency="8000" pathLength="150"/>
67 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
68 <payload xsi:type="satellite:InterferometryPayload"/>
69 </spacecraft>
70 <spacecraft xsi:type="satellite:SmallSat">
71 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
72 <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@spacecraft.20/@commSubsystem.1" frequency="26500" pathLength="150"/>
73 <payload xsi:type="satellite:InterferometryPayload"/>
74 </spacecraft>
75 <spacecraft xsi:type="satellite:SmallSat">
76 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
77 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.1/@commSubsystem.1" frequency="300" pathLength="150"/>
78 </spacecraft>
79 <spacecraft xsi:type="satellite:CubeSat6U">
80 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
81 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.19/@commSubsystem.0" frequency="300" pathLength="150"/>
82 <payload xsi:type="satellite:InterferometryPayload"/>
83 </spacecraft>
84 <spacecraft xsi:type="satellite:SmallSat">
85 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
86 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.7/@commSubsystem.1" frequency="8000" pathLength="150"/>
87 <payload xsi:type="satellite:InterferometryPayload"/>
88 </spacecraft>
89 <spacecraft xsi:type="satellite:SmallSat">
90 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
91 <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@spacecraft.13/@commSubsystem.1" frequency="26500" pathLength="150"/>
92 <payload xsi:type="satellite:InterferometryPayload"/>
93 </spacecraft>
94 <spacecraft xsi:type="satellite:CubeSat6U">
95 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.2/@commSubsystem.1" frequency="8000" pathLength="150"/>
96 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
97 <payload xsi:type="satellite:InterferometryPayload"/>
98 </spacecraft>
99 <spacecraft xsi:type="satellite:SmallSat">
100 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.18/@commSubsystem.1" frequency="300" pathLength="150"/>
101 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
102 <payload xsi:type="satellite:InterferometryPayload"/>
103 </spacecraft>
104 <spacecraft xsi:type="satellite:SmallSat">
105 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.7/@commSubsystem.1" frequency="8000" pathLength="150"/>
106 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
107 <payload xsi:type="satellite:InterferometryPayload"/>
108 </spacecraft>
109 <spacecraft xsi:type="satellite:SmallSat">
110 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.2/@commSubsystem.1" frequency="8000" pathLength="150"/>
111 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
112 <payload xsi:type="satellite:InterferometryPayload"/>
113 </spacecraft>
114 <spacecraft xsi:type="satellite:CubeSat3U">
115 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0" frequency="8000" pathLength="385000"/>
116 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
117 <payload xsi:type="satellite:InterferometryPayload"/>
118 </spacecraft>
119 <spacecraft xsi:type="satellite:CubeSat6U">
120 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
121 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.7/@commSubsystem.0" frequency="300" pathLength="150"/>
122 <payload xsi:type="satellite:InterferometryPayload"/>
123 </spacecraft>
124 <spacecraft xsi:type="satellite:CubeSat3U">
125 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
126 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0" frequency="8000" pathLength="385000"/>
127 <payload xsi:type="satellite:InterferometryPayload"/>
128 </spacecraft>
129</satellite:InterferometryMission>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/9_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/9_1.xmi
new file mode 100644
index 00000000..a9adec32
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Satellite/9_1.xmi
@@ -0,0 +1,132 @@
1<?xml version="1.0" encoding="ASCII"?>
2<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite ../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore">
3 <groundStationNetwork>
4 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
5 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
6 </groundStationNetwork>
7 <spacecraft xsi:type="satellite:SmallSat">
8 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
9 <payload xsi:type="satellite:InterferometryPayload"/>
10 </spacecraft>
11 <spacecraft xsi:type="satellite:CubeSat6U">
12 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
13 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.7/@commSubsystem.1" frequency="300" pathLength="150"/>
14 <payload xsi:type="satellite:InterferometryPayload"/>
15 </spacecraft>
16 <spacecraft xsi:type="satellite:SmallSat">
17 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
18 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.15/@commSubsystem.0" frequency="300" pathLength="150"/>
19 <payload xsi:type="satellite:InterferometryPayload"/>
20 </spacecraft>
21 <spacecraft xsi:type="satellite:CubeSat3U">
22 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
23 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0" frequency="8000" pathLength="385000"/>
24 <payload xsi:type="satellite:InterferometryPayload"/>
25 </spacecraft>
26 <spacecraft xsi:type="satellite:CubeSat3U">
27 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0" frequency="8000" pathLength="385000"/>
28 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
29 <payload xsi:type="satellite:InterferometryPayload"/>
30 </spacecraft>
31 <spacecraft xsi:type="satellite:CubeSat6U">
32 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0" frequency="8000" pathLength="385000"/>
33 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
34 <payload xsi:type="satellite:InterferometryPayload"/>
35 </spacecraft>
36 <spacecraft xsi:type="satellite:CubeSat6U">
37 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.24/@commSubsystem.0" frequency="8000" pathLength="150"/>
38 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
39 <payload xsi:type="satellite:InterferometryPayload"/>
40 </spacecraft>
41 <spacecraft xsi:type="satellite:CubeSat3U">
42 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0" frequency="8000" pathLength="385000"/>
43 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
44 <payload xsi:type="satellite:InterferometryPayload"/>
45 </spacecraft>
46 <spacecraft xsi:type="satellite:CubeSat3U">
47 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
48 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.4/@commSubsystem.1" frequency="300" pathLength="150"/>
49 <payload xsi:type="satellite:InterferometryPayload"/>
50 </spacecraft>
51 <spacecraft xsi:type="satellite:CubeSat3U">
52 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
53 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.2/@commSubsystem.1" frequency="300" pathLength="150"/>
54 <payload xsi:type="satellite:InterferometryPayload"/>
55 </spacecraft>
56 <spacecraft xsi:type="satellite:CubeSat6U">
57 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
58 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.4/@commSubsystem.0" frequency="8000" pathLength="150"/>
59 <payload xsi:type="satellite:InterferometryPayload"/>
60 </spacecraft>
61 <spacecraft xsi:type="satellite:CubeSat6U">
62 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.16/@commSubsystem.1" frequency="8000" pathLength="150"/>
63 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
64 <payload xsi:type="satellite:InterferometryPayload"/>
65 </spacecraft>
66 <spacecraft xsi:type="satellite:CubeSat3U">
67 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
68 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.25/@commSubsystem.1" frequency="300" pathLength="150"/>
69 <payload xsi:type="satellite:InterferometryPayload"/>
70 </spacecraft>
71 <spacecraft xsi:type="satellite:CubeSat3U">
72 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
73 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.17/@commSubsystem.0" frequency="300" pathLength="150"/>
74 <payload xsi:type="satellite:InterferometryPayload"/>
75 </spacecraft>
76 <spacecraft xsi:type="satellite:CubeSat6U">
77 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.20/@commSubsystem.1" frequency="300" pathLength="150"/>
78 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
79 <payload xsi:type="satellite:InterferometryPayload"/>
80 </spacecraft>
81 <spacecraft xsi:type="satellite:CubeSat3U">
82 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.8/@commSubsystem.1" frequency="300" pathLength="150"/>
83 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
84 <payload xsi:type="satellite:InterferometryPayload"/>
85 </spacecraft>
86 <spacecraft xsi:type="satellite:SmallSat">
87 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
88 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.20/@commSubsystem.0" frequency="8000" pathLength="150"/>
89 <payload xsi:type="satellite:InterferometryPayload"/>
90 </spacecraft>
91 <spacecraft xsi:type="satellite:CubeSat6U">
92 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.20/@commSubsystem.1" frequency="300" pathLength="150"/>
93 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
94 <payload xsi:type="satellite:InterferometryPayload"/>
95 </spacecraft>
96 <spacecraft xsi:type="satellite:CubeSat6U">
97 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
98 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.7/@commSubsystem.1" frequency="300" pathLength="150"/>
99 <payload xsi:type="satellite:InterferometryPayload"/>
100 </spacecraft>
101 <spacecraft xsi:type="satellite:CubeSat3U">
102 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.17/@commSubsystem.1" frequency="300" pathLength="150"/>
103 </spacecraft>
104 <spacecraft xsi:type="satellite:SmallSat">
105 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
106 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.8/@commSubsystem.1" frequency="300" pathLength="150"/>
107 <payload xsi:type="satellite:InterferometryPayload"/>
108 </spacecraft>
109 <spacecraft xsi:type="satellite:SmallSat">
110 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.9/@commSubsystem.0" frequency="8000" pathLength="150"/>
111 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
112 </spacecraft>
113 <spacecraft xsi:type="satellite:SmallSat">
114 <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@spacecraft.16/@commSubsystem.0" frequency="26500" pathLength="150"/>
115 <commSubsystem xsi:type="satellite:KaCommSubsystem" frequency="26500"/>
116 <payload xsi:type="satellite:InterferometryPayload"/>
117 </spacecraft>
118 <spacecraft xsi:type="satellite:CubeSat3U">
119 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0" frequency="8000" pathLength="385000"/>
120 <commSubsystem xsi:type="satellite:UHFCommSubsystem" frequency="300"/>
121 </spacecraft>
122 <spacecraft xsi:type="satellite:CubeSat6U">
123 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
124 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.10/@commSubsystem.1" frequency="8000" pathLength="150"/>
125 <payload xsi:type="satellite:InterferometryPayload"/>
126 </spacecraft>
127 <spacecraft xsi:type="satellite:CubeSat3U">
128 <commSubsystem xsi:type="satellite:XCommSubsystem" frequency="8000"/>
129 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.17/@commSubsystem.0" frequency="300" pathLength="150"/>
130 <payload xsi:type="satellite:InterferometryPayload"/>
131 </spacecraft>
132</satellite:InterferometryMission>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/10_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/10_1.xmi
new file mode 100644
index 00000000..77457289
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/10_1.xmi
@@ -0,0 +1,135 @@
1<?xml version="1.0" encoding="ASCII"?>
2<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite ../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore">
3 <groundStationNetwork>
4 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
5 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
6 </groundStationNetwork>
7 <spacecraft xsi:type="satellite:CubeSat6U">
8 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
9 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.25/@commSubsystem.0"/>
10 <payload xsi:type="satellite:InterferometryPayload"/>
11 </spacecraft>
12 <spacecraft xsi:type="satellite:SmallSat">
13 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
14 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.11/@commSubsystem.0"/>
15 <payload xsi:type="satellite:InterferometryPayload"/>
16 </spacecraft>
17 <spacecraft xsi:type="satellite:SmallSat">
18 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
19 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0"/>
20 <payload xsi:type="satellite:InterferometryPayload"/>
21 </spacecraft>
22 <spacecraft xsi:type="satellite:CubeSat3U">
23 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
24 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.17/@commSubsystem.1"/>
25 <payload xsi:type="satellite:InterferometryPayload"/>
26 </spacecraft>
27 <spacecraft xsi:type="satellite:SmallSat">
28 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
29 </spacecraft>
30 <spacecraft xsi:type="satellite:CubeSat3U">
31 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
32 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.11/@commSubsystem.0"/>
33 <payload xsi:type="satellite:InterferometryPayload"/>
34 </spacecraft>
35 <spacecraft xsi:type="satellite:CubeSat6U">
36 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.20/@commSubsystem.0"/>
37 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
38 <payload xsi:type="satellite:InterferometryPayload"/>
39 </spacecraft>
40 <spacecraft xsi:type="satellite:CubeSat6U">
41 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
42 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.11/@commSubsystem.0"/>
43 <payload xsi:type="satellite:InterferometryPayload"/>
44 </spacecraft>
45 <spacecraft xsi:type="satellite:SmallSat">
46 <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@spacecraft.1/@commSubsystem.0"/>
47 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
48 </spacecraft>
49 <spacecraft xsi:type="satellite:SmallSat">
50 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
51 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.19/@commSubsystem.1"/>
52 <payload xsi:type="satellite:InterferometryPayload"/>
53 </spacecraft>
54 <spacecraft xsi:type="satellite:CubeSat3U">
55 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0"/>
56 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
57 <payload xsi:type="satellite:InterferometryPayload"/>
58 </spacecraft>
59 <spacecraft xsi:type="satellite:CubeSat6U">
60 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
61 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.25/@commSubsystem.0"/>
62 <payload xsi:type="satellite:InterferometryPayload"/>
63 </spacecraft>
64 <spacecraft xsi:type="satellite:SmallSat">
65 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
66 </spacecraft>
67 <spacecraft xsi:type="satellite:CubeSat6U">
68 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
69 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.11/@commSubsystem.1"/>
70 <payload xsi:type="satellite:InterferometryPayload"/>
71 </spacecraft>
72 <spacecraft xsi:type="satellite:CubeSat6U">
73 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.18/@commSubsystem.1"/>
74 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
75 <payload xsi:type="satellite:InterferometryPayload"/>
76 </spacecraft>
77 <spacecraft xsi:type="satellite:CubeSat6U">
78 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.17/@commSubsystem.0"/>
79 <payload xsi:type="satellite:InterferometryPayload"/>
80 </spacecraft>
81 <spacecraft xsi:type="satellite:CubeSat3U">
82 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
83 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.25/@commSubsystem.0"/>
84 <payload xsi:type="satellite:InterferometryPayload"/>
85 </spacecraft>
86 <spacecraft xsi:type="satellite:CubeSat6U">
87 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
88 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.25/@commSubsystem.0"/>
89 <payload xsi:type="satellite:InterferometryPayload"/>
90 </spacecraft>
91 <spacecraft xsi:type="satellite:CubeSat6U">
92 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.11/@commSubsystem.1"/>
93 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
94 <payload xsi:type="satellite:InterferometryPayload"/>
95 </spacecraft>
96 <spacecraft xsi:type="satellite:SmallSat">
97 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
98 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0"/>
99 <payload xsi:type="satellite:InterferometryPayload"/>
100 </spacecraft>
101 <spacecraft xsi:type="satellite:CubeSat6U">
102 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
103 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.16/@commSubsystem.0"/>
104 <payload xsi:type="satellite:InterferometryPayload"/>
105 </spacecraft>
106 <spacecraft xsi:type="satellite:SmallSat">
107 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
108 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.9/@commSubsystem.0"/>
109 <payload xsi:type="satellite:InterferometryPayload"/>
110 </spacecraft>
111 <spacecraft xsi:type="satellite:SmallSat">
112 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
113 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
114 </spacecraft>
115 <spacecraft xsi:type="satellite:CubeSat6U">
116 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
117 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.2/@commSubsystem.1"/>
118 <payload xsi:type="satellite:InterferometryPayload"/>
119 </spacecraft>
120 <spacecraft xsi:type="satellite:CubeSat3U">
121 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
122 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0"/>
123 <payload xsi:type="satellite:InterferometryPayload"/>
124 </spacecraft>
125 <spacecraft xsi:type="satellite:SmallSat">
126 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.24/@commSubsystem.0"/>
127 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
128 <payload xsi:type="satellite:InterferometryPayload"/>
129 </spacecraft>
130 <spacecraft xsi:type="satellite:CubeSat6U">
131 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.13/@commSubsystem.0"/>
132 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
133 <payload xsi:type="satellite:InterferometryPayload"/>
134 </spacecraft>
135</satellite:InterferometryMission>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/1_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/1_1.xmi
new file mode 100644
index 00000000..65c314e9
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/1_1.xmi
@@ -0,0 +1,137 @@
1<?xml version="1.0" encoding="ASCII"?>
2<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite ../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore">
3 <groundStationNetwork>
4 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
5 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
6 </groundStationNetwork>
7 <spacecraft xsi:type="satellite:CubeSat6U">
8 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.17/@commSubsystem.1"/>
9 </spacecraft>
10 <spacecraft xsi:type="satellite:SmallSat">
11 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
12 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.24/@commSubsystem.0"/>
13 <payload xsi:type="satellite:InterferometryPayload"/>
14 </spacecraft>
15 <spacecraft xsi:type="satellite:CubeSat6U">
16 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.20/@commSubsystem.1"/>
17 <payload xsi:type="satellite:InterferometryPayload"/>
18 </spacecraft>
19 <spacecraft xsi:type="satellite:CubeSat3U">
20 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
21 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
22 <payload xsi:type="satellite:InterferometryPayload"/>
23 </spacecraft>
24 <spacecraft xsi:type="satellite:CubeSat3U">
25 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
26 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.20/@commSubsystem.1"/>
27 <payload xsi:type="satellite:InterferometryPayload"/>
28 </spacecraft>
29 <spacecraft xsi:type="satellite:CubeSat6U">
30 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.21/@commSubsystem.1"/>
31 <payload xsi:type="satellite:InterferometryPayload"/>
32 </spacecraft>
33 <spacecraft xsi:type="satellite:CubeSat3U">
34 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.20/@commSubsystem.1"/>
35 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
36 <payload xsi:type="satellite:InterferometryPayload"/>
37 </spacecraft>
38 <spacecraft xsi:type="satellite:SmallSat">
39 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.24/@commSubsystem.1"/>
40 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
41 <payload xsi:type="satellite:InterferometryPayload"/>
42 </spacecraft>
43 <spacecraft xsi:type="satellite:SmallSat">
44 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.27/@commSubsystem.1"/>
45 </spacecraft>
46 <spacecraft xsi:type="satellite:CubeSat3U">
47 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.21/@commSubsystem.0"/>
48 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
49 <payload xsi:type="satellite:InterferometryPayload"/>
50 </spacecraft>
51 <spacecraft xsi:type="satellite:SmallSat">
52 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
53 <payload xsi:type="satellite:InterferometryPayload"/>
54 </spacecraft>
55 <spacecraft xsi:type="satellite:CubeSat3U">
56 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.14/@commSubsystem.0"/>
57 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
58 <payload xsi:type="satellite:InterferometryPayload"/>
59 </spacecraft>
60 <spacecraft xsi:type="satellite:CubeSat6U">
61 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.22/@commSubsystem.0"/>
62 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
63 <payload xsi:type="satellite:InterferometryPayload"/>
64 </spacecraft>
65 <spacecraft xsi:type="satellite:CubeSat6U">
66 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.21/@commSubsystem.1"/>
67 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
68 <payload xsi:type="satellite:InterferometryPayload"/>
69 </spacecraft>
70 <spacecraft xsi:type="satellite:CubeSat3U">
71 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
72 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.12/@commSubsystem.1"/>
73 <payload xsi:type="satellite:InterferometryPayload"/>
74 </spacecraft>
75 <spacecraft xsi:type="satellite:CubeSat3U">
76 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.14/@commSubsystem.1"/>
77 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
78 <payload xsi:type="satellite:InterferometryPayload"/>
79 </spacecraft>
80 <spacecraft xsi:type="satellite:CubeSat6U">
81 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.6/@commSubsystem.0"/>
82 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
83 </spacecraft>
84 <spacecraft xsi:type="satellite:CubeSat6U">
85 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.19/@commSubsystem.0"/>
86 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
87 <payload xsi:type="satellite:InterferometryPayload"/>
88 </spacecraft>
89 <spacecraft xsi:type="satellite:SmallSat">
90 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.12/@commSubsystem.1"/>
91 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
92 <payload xsi:type="satellite:InterferometryPayload"/>
93 </spacecraft>
94 <spacecraft xsi:type="satellite:CubeSat3U">
95 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
96 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
97 <payload xsi:type="satellite:InterferometryPayload"/>
98 </spacecraft>
99 <spacecraft xsi:type="satellite:CubeSat3U">
100 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
101 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.14/@commSubsystem.1"/>
102 <payload xsi:type="satellite:InterferometryPayload"/>
103 </spacecraft>
104 <spacecraft xsi:type="satellite:SmallSat">
105 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.14/@commSubsystem.1"/>
106 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
107 <payload xsi:type="satellite:InterferometryPayload"/>
108 </spacecraft>
109 <spacecraft xsi:type="satellite:CubeSat3U">
110 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
111 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
112 <payload xsi:type="satellite:InterferometryPayload"/>
113 </spacecraft>
114 <spacecraft xsi:type="satellite:CubeSat3U">
115 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.16/@commSubsystem.0"/>
116 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
117 <payload xsi:type="satellite:InterferometryPayload"/>
118 </spacecraft>
119 <spacecraft xsi:type="satellite:SmallSat">
120 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.20/@commSubsystem.0"/>
121 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
122 <payload xsi:type="satellite:InterferometryPayload"/>
123 </spacecraft>
124 <spacecraft xsi:type="satellite:CubeSat6U">
125 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.24/@commSubsystem.0"/>
126 </spacecraft>
127 <spacecraft xsi:type="satellite:CubeSat6U">
128 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
129 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.7/@commSubsystem.0"/>
130 <payload xsi:type="satellite:InterferometryPayload"/>
131 </spacecraft>
132 <spacecraft xsi:type="satellite:CubeSat6U">
133 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.24/@commSubsystem.0"/>
134 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
135 <payload xsi:type="satellite:InterferometryPayload"/>
136 </spacecraft>
137</satellite:InterferometryMission>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/2_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/2_1.xmi
new file mode 100644
index 00000000..2b219e7a
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/2_1.xmi
@@ -0,0 +1,131 @@
1<?xml version="1.0" encoding="ASCII"?>
2<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite ../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore">
3 <groundStationNetwork>
4 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
5 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
6 </groundStationNetwork>
7 <spacecraft xsi:type="satellite:SmallSat">
8 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
9 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
10 <payload xsi:type="satellite:InterferometryPayload"/>
11 </spacecraft>
12 <spacecraft xsi:type="satellite:CubeSat6U">
13 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
14 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.19/@commSubsystem.0"/>
15 </spacecraft>
16 <spacecraft xsi:type="satellite:SmallSat">
17 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
18 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.12/@commSubsystem.0"/>
19 <payload xsi:type="satellite:InterferometryPayload"/>
20 </spacecraft>
21 <spacecraft xsi:type="satellite:SmallSat">
22 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
23 <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@spacecraft.13/@commSubsystem.0"/>
24 <payload xsi:type="satellite:InterferometryPayload"/>
25 </spacecraft>
26 <spacecraft xsi:type="satellite:CubeSat3U">
27 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
28 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
29 <payload xsi:type="satellite:InterferometryPayload"/>
30 </spacecraft>
31 <spacecraft xsi:type="satellite:CubeSat6U">
32 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
33 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.13/@commSubsystem.1"/>
34 <payload xsi:type="satellite:InterferometryPayload"/>
35 </spacecraft>
36 <spacecraft xsi:type="satellite:SmallSat">
37 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
38 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.24/@commSubsystem.0"/>
39 <payload xsi:type="satellite:InterferometryPayload"/>
40 </spacecraft>
41 <spacecraft xsi:type="satellite:SmallSat">
42 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
43 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.24/@commSubsystem.0"/>
44 <payload xsi:type="satellite:InterferometryPayload"/>
45 </spacecraft>
46 <spacecraft xsi:type="satellite:CubeSat3U">
47 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.19/@commSubsystem.0"/>
48 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
49 <payload xsi:type="satellite:InterferometryPayload"/>
50 </spacecraft>
51 <spacecraft xsi:type="satellite:CubeSat6U">
52 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.16/@commSubsystem.0"/>
53 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
54 </spacecraft>
55 <spacecraft xsi:type="satellite:CubeSat3U">
56 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.8/@commSubsystem.1"/>
57 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
58 <payload xsi:type="satellite:InterferometryPayload"/>
59 </spacecraft>
60 <spacecraft xsi:type="satellite:CubeSat6U">
61 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.25/@commSubsystem.1"/>
62 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
63 <payload xsi:type="satellite:InterferometryPayload"/>
64 </spacecraft>
65 <spacecraft xsi:type="satellite:CubeSat3U">
66 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
67 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
68 <payload xsi:type="satellite:InterferometryPayload"/>
69 </spacecraft>
70 <spacecraft xsi:type="satellite:SmallSat">
71 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
72 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.20/@commSubsystem.0"/>
73 <payload xsi:type="satellite:InterferometryPayload"/>
74 </spacecraft>
75 <spacecraft xsi:type="satellite:CubeSat6U">
76 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.13/@commSubsystem.1"/>
77 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
78 </spacecraft>
79 <spacecraft xsi:type="satellite:CubeSat3U">
80 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
81 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.19/@commSubsystem.0"/>
82 <payload xsi:type="satellite:InterferometryPayload"/>
83 </spacecraft>
84 <spacecraft xsi:type="satellite:SmallSat">
85 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.19/@commSubsystem.0"/>
86 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
87 <payload xsi:type="satellite:InterferometryPayload"/>
88 </spacecraft>
89 <spacecraft xsi:type="satellite:CubeSat3U">
90 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
91 </spacecraft>
92 <spacecraft xsi:type="satellite:SmallSat">
93 <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0"/>
94 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
95 <payload xsi:type="satellite:InterferometryPayload"/>
96 </spacecraft>
97 <spacecraft xsi:type="satellite:CubeSat6U">
98 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
99 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
100 <payload xsi:type="satellite:InterferometryPayload"/>
101 </spacecraft>
102 <spacecraft xsi:type="satellite:SmallSat">
103 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
104 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
105 <payload xsi:type="satellite:InterferometryPayload"/>
106 </spacecraft>
107 <spacecraft xsi:type="satellite:CubeSat6U">
108 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
109 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.22/@commSubsystem.1"/>
110 <payload xsi:type="satellite:InterferometryPayload"/>
111 </spacecraft>
112 <spacecraft xsi:type="satellite:CubeSat6U">
113 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
114 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.24/@commSubsystem.1"/>
115 <payload xsi:type="satellite:InterferometryPayload"/>
116 </spacecraft>
117 <spacecraft xsi:type="satellite:SmallSat">
118 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
119 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.2/@commSubsystem.0"/>
120 </spacecraft>
121 <spacecraft xsi:type="satellite:CubeSat6U">
122 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
123 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.2/@commSubsystem.1"/>
124 <payload xsi:type="satellite:InterferometryPayload"/>
125 </spacecraft>
126 <spacecraft xsi:type="satellite:SmallSat">
127 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
128 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
129 <payload xsi:type="satellite:InterferometryPayload"/>
130 </spacecraft>
131</satellite:InterferometryMission>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/3_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/3_1.xmi
new file mode 100644
index 00000000..c1ce3de5
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/3_1.xmi
@@ -0,0 +1,134 @@
1<?xml version="1.0" encoding="ASCII"?>
2<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite ../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore">
3 <groundStationNetwork>
4 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
5 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
6 </groundStationNetwork>
7 <spacecraft xsi:type="satellite:CubeSat3U">
8 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
9 </spacecraft>
10 <spacecraft xsi:type="satellite:SmallSat">
11 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
12 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.4/@commSubsystem.1"/>
13 <payload xsi:type="satellite:InterferometryPayload"/>
14 </spacecraft>
15 <spacecraft xsi:type="satellite:CubeSat3U">
16 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
17 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
18 <payload xsi:type="satellite:InterferometryPayload"/>
19 </spacecraft>
20 <spacecraft xsi:type="satellite:CubeSat3U">
21 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
22 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
23 </spacecraft>
24 <spacecraft xsi:type="satellite:CubeSat6U">
25 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.17/@commSubsystem.1"/>
26 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
27 <payload xsi:type="satellite:InterferometryPayload"/>
28 </spacecraft>
29 <spacecraft xsi:type="satellite:CubeSat3U">
30 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
31 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
32 <payload xsi:type="satellite:InterferometryPayload"/>
33 </spacecraft>
34 <spacecraft xsi:type="satellite:SmallSat">
35 <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@spacecraft.18/@commSubsystem.0"/>
36 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
37 <payload xsi:type="satellite:InterferometryPayload"/>
38 </spacecraft>
39 <spacecraft xsi:type="satellite:CubeSat6U">
40 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
41 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.14/@commSubsystem.0"/>
42 <payload xsi:type="satellite:InterferometryPayload"/>
43 </spacecraft>
44 <spacecraft xsi:type="satellite:SmallSat">
45 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
46 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.4/@commSubsystem.0"/>
47 <payload xsi:type="satellite:InterferometryPayload"/>
48 </spacecraft>
49 <spacecraft xsi:type="satellite:CubeSat3U">
50 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.15/@commSubsystem.1"/>
51 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
52 <payload xsi:type="satellite:InterferometryPayload"/>
53 </spacecraft>
54 <spacecraft xsi:type="satellite:CubeSat6U">
55 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.11/@commSubsystem.0"/>
56 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
57 <payload xsi:type="satellite:InterferometryPayload"/>
58 </spacecraft>
59 <spacecraft xsi:type="satellite:SmallSat">
60 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.18/@commSubsystem.1"/>
61 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
62 <payload xsi:type="satellite:InterferometryPayload"/>
63 </spacecraft>
64 <spacecraft xsi:type="satellite:CubeSat3U">
65 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
66 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
67 <payload xsi:type="satellite:InterferometryPayload"/>
68 </spacecraft>
69 <spacecraft xsi:type="satellite:CubeSat6U">
70 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.14/@commSubsystem.1"/>
71 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
72 <payload xsi:type="satellite:InterferometryPayload"/>
73 </spacecraft>
74 <spacecraft xsi:type="satellite:CubeSat3U">
75 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
76 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.20/@commSubsystem.1"/>
77 <payload xsi:type="satellite:InterferometryPayload"/>
78 </spacecraft>
79 <spacecraft xsi:type="satellite:CubeSat3U">
80 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
81 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.25/@commSubsystem.1"/>
82 <payload xsi:type="satellite:InterferometryPayload"/>
83 </spacecraft>
84 <spacecraft xsi:type="satellite:SmallSat">
85 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
86 <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0"/>
87 <payload xsi:type="satellite:InterferometryPayload"/>
88 </spacecraft>
89 <spacecraft xsi:type="satellite:CubeSat6U">
90 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.14/@commSubsystem.0"/>
91 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
92 <payload xsi:type="satellite:InterferometryPayload"/>
93 </spacecraft>
94 <spacecraft xsi:type="satellite:SmallSat">
95 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
96 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.19/@commSubsystem.1"/>
97 <payload xsi:type="satellite:InterferometryPayload"/>
98 </spacecraft>
99 <spacecraft xsi:type="satellite:CubeSat6U">
100 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
101 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
102 <payload xsi:type="satellite:InterferometryPayload"/>
103 </spacecraft>
104 <spacecraft xsi:type="satellite:CubeSat6U">
105 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
106 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
107 <payload xsi:type="satellite:InterferometryPayload"/>
108 </spacecraft>
109 <spacecraft xsi:type="satellite:CubeSat3U">
110 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
111 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
112 <payload xsi:type="satellite:InterferometryPayload"/>
113 </spacecraft>
114 <spacecraft xsi:type="satellite:SmallSat">
115 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.20/@commSubsystem.1"/>
116 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
117 <payload xsi:type="satellite:InterferometryPayload"/>
118 </spacecraft>
119 <spacecraft xsi:type="satellite:SmallSat">
120 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.24/@commSubsystem.0"/>
121 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
122 <payload xsi:type="satellite:InterferometryPayload"/>
123 </spacecraft>
124 <spacecraft xsi:type="satellite:CubeSat3U">
125 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
126 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.8/@commSubsystem.0"/>
127 <payload xsi:type="satellite:InterferometryPayload"/>
128 </spacecraft>
129 <spacecraft xsi:type="satellite:SmallSat">
130 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
131 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.17/@commSubsystem.1"/>
132 <payload xsi:type="satellite:InterferometryPayload"/>
133 </spacecraft>
134</satellite:InterferometryMission>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/4_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/4_1.xmi
new file mode 100644
index 00000000..969d3315
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/4_1.xmi
@@ -0,0 +1,137 @@
1<?xml version="1.0" encoding="ASCII"?>
2<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite ../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore">
3 <groundStationNetwork>
4 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
5 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
6 </groundStationNetwork>
7 <spacecraft xsi:type="satellite:CubeSat3U">
8 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
9 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
10 <payload xsi:type="satellite:InterferometryPayload"/>
11 </spacecraft>
12 <spacecraft xsi:type="satellite:CubeSat3U">
13 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
14 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.13/@commSubsystem.1"/>
15 <payload xsi:type="satellite:InterferometryPayload"/>
16 </spacecraft>
17 <spacecraft xsi:type="satellite:SmallSat">
18 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
19 <payload xsi:type="satellite:InterferometryPayload"/>
20 </spacecraft>
21 <spacecraft xsi:type="satellite:SmallSat">
22 <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@spacecraft.19/@commSubsystem.0"/>
23 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
24 <payload xsi:type="satellite:InterferometryPayload"/>
25 </spacecraft>
26 <spacecraft xsi:type="satellite:CubeSat3U">
27 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.6/@commSubsystem.0"/>
28 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
29 <payload xsi:type="satellite:InterferometryPayload"/>
30 </spacecraft>
31 <spacecraft xsi:type="satellite:CubeSat3U">
32 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
33 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.17/@commSubsystem.0"/>
34 <payload xsi:type="satellite:InterferometryPayload"/>
35 </spacecraft>
36 <spacecraft xsi:type="satellite:CubeSat3U">
37 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.17/@commSubsystem.1"/>
38 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
39 <payload xsi:type="satellite:InterferometryPayload"/>
40 </spacecraft>
41 <spacecraft xsi:type="satellite:SmallSat">
42 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
43 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.17/@commSubsystem.0"/>
44 <payload xsi:type="satellite:InterferometryPayload"/>
45 </spacecraft>
46 <spacecraft xsi:type="satellite:CubeSat6U">
47 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
48 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.20/@commSubsystem.1"/>
49 <payload xsi:type="satellite:InterferometryPayload"/>
50 </spacecraft>
51 <spacecraft xsi:type="satellite:CubeSat6U">
52 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.7/@commSubsystem.1"/>
53 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
54 </spacecraft>
55 <spacecraft xsi:type="satellite:CubeSat3U">
56 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.17/@commSubsystem.1"/>
57 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
58 <payload xsi:type="satellite:InterferometryPayload"/>
59 </spacecraft>
60 <spacecraft xsi:type="satellite:CubeSat3U">
61 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
62 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
63 </spacecraft>
64 <spacecraft xsi:type="satellite:CubeSat3U">
65 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.6/@commSubsystem.0"/>
66 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
67 <payload xsi:type="satellite:InterferometryPayload"/>
68 </spacecraft>
69 <spacecraft xsi:type="satellite:CubeSat3U">
70 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
71 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.12/@commSubsystem.1"/>
72 <payload xsi:type="satellite:InterferometryPayload"/>
73 </spacecraft>
74 <spacecraft xsi:type="satellite:SmallSat">
75 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.0/@commSubsystem.1"/>
76 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
77 <payload xsi:type="satellite:InterferometryPayload"/>
78 </spacecraft>
79 <spacecraft xsi:type="satellite:CubeSat3U">
80 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.8/@commSubsystem.1"/>
81 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
82 <payload xsi:type="satellite:InterferometryPayload"/>
83 </spacecraft>
84 <spacecraft xsi:type="satellite:SmallSat">
85 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
86 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.23/@commSubsystem.1"/>
87 <payload xsi:type="satellite:InterferometryPayload"/>
88 </spacecraft>
89 <spacecraft xsi:type="satellite:SmallSat">
90 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
91 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
92 <payload xsi:type="satellite:InterferometryPayload"/>
93 </spacecraft>
94 <spacecraft xsi:type="satellite:CubeSat6U">
95 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
96 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.17/@commSubsystem.1"/>
97 <payload xsi:type="satellite:InterferometryPayload"/>
98 </spacecraft>
99 <spacecraft xsi:type="satellite:SmallSat">
100 <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0"/>
101 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
102 <payload xsi:type="satellite:InterferometryPayload"/>
103 </spacecraft>
104 <spacecraft xsi:type="satellite:CubeSat3U">
105 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
106 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.6/@commSubsystem.0"/>
107 <payload xsi:type="satellite:InterferometryPayload"/>
108 </spacecraft>
109 <spacecraft xsi:type="satellite:CubeSat6U">
110 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
111 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.0/@commSubsystem.1"/>
112 <payload xsi:type="satellite:InterferometryPayload"/>
113 </spacecraft>
114 <spacecraft xsi:type="satellite:SmallSat">
115 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.12/@commSubsystem.1"/>
116 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
117 <payload xsi:type="satellite:InterferometryPayload"/>
118 </spacecraft>
119 <spacecraft xsi:type="satellite:CubeSat6U">
120 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.4/@commSubsystem.1"/>
121 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
122 <payload xsi:type="satellite:InterferometryPayload"/>
123 </spacecraft>
124 <spacecraft xsi:type="satellite:CubeSat6U">
125 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.5/@commSubsystem.1"/>
126 </spacecraft>
127 <spacecraft xsi:type="satellite:CubeSat6U">
128 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.0/@commSubsystem.0"/>
129 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
130 <payload xsi:type="satellite:InterferometryPayload"/>
131 </spacecraft>
132 <spacecraft xsi:type="satellite:CubeSat3U">
133 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.6/@commSubsystem.1"/>
134 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
135 <payload xsi:type="satellite:InterferometryPayload"/>
136 </spacecraft>
137</satellite:InterferometryMission>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/5_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/5_1.xmi
new file mode 100644
index 00000000..8c017bd5
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/5_1.xmi
@@ -0,0 +1,141 @@
1<?xml version="1.0" encoding="ASCII"?>
2<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite ../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore">
3 <groundStationNetwork>
4 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
5 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
6 </groundStationNetwork>
7 <spacecraft xsi:type="satellite:SmallSat">
8 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
9 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.22/@commSubsystem.1"/>
10 <payload xsi:type="satellite:InterferometryPayload"/>
11 </spacecraft>
12 <spacecraft xsi:type="satellite:CubeSat3U">
13 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0"/>
14 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
15 <payload xsi:type="satellite:InterferometryPayload"/>
16 </spacecraft>
17 <spacecraft xsi:type="satellite:CubeSat6U">
18 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
19 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.22/@commSubsystem.1"/>
20 <payload xsi:type="satellite:InterferometryPayload"/>
21 </spacecraft>
22 <spacecraft xsi:type="satellite:CubeSat3U">
23 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0"/>
24 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
25 <payload xsi:type="satellite:InterferometryPayload"/>
26 </spacecraft>
27 <spacecraft xsi:type="satellite:CubeSat3U">
28 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0"/>
29 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
30 <payload xsi:type="satellite:InterferometryPayload"/>
31 </spacecraft>
32 <spacecraft xsi:type="satellite:CubeSat3U">
33 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
34 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.4/@commSubsystem.1"/>
35 <payload xsi:type="satellite:InterferometryPayload"/>
36 </spacecraft>
37 <spacecraft xsi:type="satellite:SmallSat">
38 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.8/@commSubsystem.1"/>
39 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
40 <payload xsi:type="satellite:InterferometryPayload"/>
41 </spacecraft>
42 <spacecraft xsi:type="satellite:SmallSat">
43 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.4/@commSubsystem.1"/>
44 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
45 <payload xsi:type="satellite:InterferometryPayload"/>
46 </spacecraft>
47 <spacecraft xsi:type="satellite:CubeSat6U">
48 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
49 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.9/@commSubsystem.1"/>
50 <payload xsi:type="satellite:InterferometryPayload"/>
51 </spacecraft>
52 <spacecraft xsi:type="satellite:CubeSat6U">
53 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
54 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0"/>
55 <payload xsi:type="satellite:InterferometryPayload"/>
56 </spacecraft>
57 <spacecraft xsi:type="satellite:SmallSat">
58 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
59 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.11/@commSubsystem.1"/>
60 <payload xsi:type="satellite:InterferometryPayload"/>
61 </spacecraft>
62 <spacecraft xsi:type="satellite:CubeSat3U">
63 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
64 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0"/>
65 <payload xsi:type="satellite:InterferometryPayload"/>
66 </spacecraft>
67 <spacecraft xsi:type="satellite:CubeSat6U">
68 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
69 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.6/@commSubsystem.1"/>
70 <payload xsi:type="satellite:InterferometryPayload"/>
71 </spacecraft>
72 <spacecraft xsi:type="satellite:SmallSat">
73 <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@spacecraft.14/@commSubsystem.0"/>
74 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
75 <payload xsi:type="satellite:InterferometryPayload"/>
76 </spacecraft>
77 <spacecraft xsi:type="satellite:SmallSat">
78 <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
79 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
80 <payload xsi:type="satellite:InterferometryPayload"/>
81 </spacecraft>
82 <spacecraft xsi:type="satellite:CubeSat3U">
83 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.9/@commSubsystem.0"/>
84 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
85 <payload xsi:type="satellite:InterferometryPayload"/>
86 </spacecraft>
87 <spacecraft xsi:type="satellite:CubeSat3U">
88 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.12/@commSubsystem.1"/>
89 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
90 <payload xsi:type="satellite:InterferometryPayload"/>
91 </spacecraft>
92 <spacecraft xsi:type="satellite:SmallSat">
93 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
94 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.21/@commSubsystem.1"/>
95 <payload xsi:type="satellite:InterferometryPayload"/>
96 </spacecraft>
97 <spacecraft xsi:type="satellite:CubeSat3U">
98 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
99 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.2/@commSubsystem.0"/>
100 <payload xsi:type="satellite:InterferometryPayload"/>
101 </spacecraft>
102 <spacecraft xsi:type="satellite:CubeSat3U">
103 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
104 <payload xsi:type="satellite:InterferometryPayload"/>
105 </spacecraft>
106 <spacecraft xsi:type="satellite:SmallSat">
107 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
108 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.11/@commSubsystem.0"/>
109 <payload xsi:type="satellite:InterferometryPayload"/>
110 </spacecraft>
111 <spacecraft xsi:type="satellite:CubeSat3U">
112 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
113 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.16/@commSubsystem.0"/>
114 <payload xsi:type="satellite:InterferometryPayload"/>
115 </spacecraft>
116 <spacecraft xsi:type="satellite:SmallSat">
117 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.23/@commSubsystem.1"/>
118 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
119 <payload xsi:type="satellite:InterferometryPayload"/>
120 </spacecraft>
121 <spacecraft xsi:type="satellite:SmallSat">
122 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.8/@commSubsystem.0"/>
123 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
124 <payload xsi:type="satellite:InterferometryPayload"/>
125 </spacecraft>
126 <spacecraft xsi:type="satellite:CubeSat3U">
127 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.23/@commSubsystem.0"/>
128 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
129 <payload xsi:type="satellite:InterferometryPayload"/>
130 </spacecraft>
131 <spacecraft xsi:type="satellite:CubeSat3U">
132 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
133 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0"/>
134 <payload xsi:type="satellite:InterferometryPayload"/>
135 </spacecraft>
136 <spacecraft xsi:type="satellite:CubeSat6U">
137 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.8/@commSubsystem.0"/>
138 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
139 <payload xsi:type="satellite:InterferometryPayload"/>
140 </spacecraft>
141</satellite:InterferometryMission>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/6_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/6_1.xmi
new file mode 100644
index 00000000..3dd5ffa8
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/6_1.xmi
@@ -0,0 +1,134 @@
1<?xml version="1.0" encoding="ASCII"?>
2<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite ../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore">
3 <groundStationNetwork>
4 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
5 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
6 </groundStationNetwork>
7 <spacecraft xsi:type="satellite:SmallSat">
8 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
9 <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
10 <payload xsi:type="satellite:InterferometryPayload"/>
11 </spacecraft>
12 <spacecraft xsi:type="satellite:CubeSat6U">
13 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
14 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.6/@commSubsystem.1"/>
15 <payload xsi:type="satellite:InterferometryPayload"/>
16 </spacecraft>
17 <spacecraft xsi:type="satellite:SmallSat">
18 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.6/@commSubsystem.0"/>
19 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
20 <payload xsi:type="satellite:InterferometryPayload"/>
21 </spacecraft>
22 <spacecraft xsi:type="satellite:CubeSat6U">
23 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
24 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.24/@commSubsystem.0"/>
25 <payload xsi:type="satellite:InterferometryPayload"/>
26 </spacecraft>
27 <spacecraft xsi:type="satellite:SmallSat">
28 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.8/@commSubsystem.1"/>
29 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
30 <payload xsi:type="satellite:InterferometryPayload"/>
31 </spacecraft>
32 <spacecraft xsi:type="satellite:CubeSat6U">
33 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.12/@commSubsystem.0"/>
34 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
35 <payload xsi:type="satellite:InterferometryPayload"/>
36 </spacecraft>
37 <spacecraft xsi:type="satellite:CubeSat6U">
38 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
39 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.8/@commSubsystem.1"/>
40 <payload xsi:type="satellite:InterferometryPayload"/>
41 </spacecraft>
42 <spacecraft xsi:type="satellite:CubeSat6U">
43 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
44 <payload xsi:type="satellite:InterferometryPayload"/>
45 </spacecraft>
46 <spacecraft xsi:type="satellite:CubeSat3U">
47 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
48 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
49 <payload xsi:type="satellite:InterferometryPayload"/>
50 </spacecraft>
51 <spacecraft xsi:type="satellite:CubeSat6U">
52 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
53 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.14/@commSubsystem.1"/>
54 <payload xsi:type="satellite:InterferometryPayload"/>
55 </spacecraft>
56 <spacecraft xsi:type="satellite:SmallSat">
57 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
58 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.8/@commSubsystem.1"/>
59 <payload xsi:type="satellite:InterferometryPayload"/>
60 </spacecraft>
61 <spacecraft xsi:type="satellite:CubeSat3U">
62 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
63 <payload xsi:type="satellite:InterferometryPayload"/>
64 </spacecraft>
65 <spacecraft xsi:type="satellite:SmallSat">
66 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
67 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.6/@commSubsystem.0"/>
68 <payload xsi:type="satellite:InterferometryPayload"/>
69 </spacecraft>
70 <spacecraft xsi:type="satellite:SmallSat">
71 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
72 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.17/@commSubsystem.1"/>
73 <payload xsi:type="satellite:InterferometryPayload"/>
74 </spacecraft>
75 <spacecraft xsi:type="satellite:SmallSat">
76 <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
77 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
78 <payload xsi:type="satellite:InterferometryPayload"/>
79 </spacecraft>
80 <spacecraft xsi:type="satellite:SmallSat">
81 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
82 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.12/@commSubsystem.1"/>
83 <payload xsi:type="satellite:InterferometryPayload"/>
84 </spacecraft>
85 <spacecraft xsi:type="satellite:CubeSat3U">
86 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.12/@commSubsystem.1"/>
87 <payload xsi:type="satellite:InterferometryPayload"/>
88 </spacecraft>
89 <spacecraft xsi:type="satellite:SmallSat">
90 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
91 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.8/@commSubsystem.1"/>
92 <payload xsi:type="satellite:InterferometryPayload"/>
93 </spacecraft>
94 <spacecraft xsi:type="satellite:SmallSat">
95 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.23/@commSubsystem.0"/>
96 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
97 <payload xsi:type="satellite:InterferometryPayload"/>
98 </spacecraft>
99 <spacecraft xsi:type="satellite:CubeSat3U">
100 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.25/@commSubsystem.1"/>
101 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
102 <payload xsi:type="satellite:InterferometryPayload"/>
103 </spacecraft>
104 <spacecraft xsi:type="satellite:CubeSat6U">
105 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
106 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.5/@commSubsystem.1"/>
107 <payload xsi:type="satellite:InterferometryPayload"/>
108 </spacecraft>
109 <spacecraft xsi:type="satellite:CubeSat6U">
110 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.12/@commSubsystem.0"/>
111 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
112 <payload xsi:type="satellite:InterferometryPayload"/>
113 </spacecraft>
114 <spacecraft xsi:type="satellite:SmallSat">
115 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
116 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.10/@commSubsystem.1"/>
117 <payload xsi:type="satellite:InterferometryPayload"/>
118 </spacecraft>
119 <spacecraft xsi:type="satellite:CubeSat6U">
120 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.5/@commSubsystem.0"/>
121 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
122 <payload xsi:type="satellite:InterferometryPayload"/>
123 </spacecraft>
124 <spacecraft xsi:type="satellite:SmallSat">
125 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
126 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.25/@commSubsystem.0"/>
127 <payload xsi:type="satellite:InterferometryPayload"/>
128 </spacecraft>
129 <spacecraft xsi:type="satellite:CubeSat3U">
130 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
131 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.17/@commSubsystem.0"/>
132 <payload xsi:type="satellite:InterferometryPayload"/>
133 </spacecraft>
134</satellite:InterferometryMission>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/7_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/7_1.xmi
new file mode 100644
index 00000000..635410f2
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/7_1.xmi
@@ -0,0 +1,131 @@
1<?xml version="1.0" encoding="ASCII"?>
2<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite ../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore">
3 <groundStationNetwork>
4 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
5 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
6 </groundStationNetwork>
7 <spacecraft xsi:type="satellite:SmallSat">
8 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
9 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0"/>
10 <payload xsi:type="satellite:InterferometryPayload"/>
11 </spacecraft>
12 <spacecraft xsi:type="satellite:CubeSat6U">
13 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.3/@commSubsystem.0"/>
14 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
15 <payload xsi:type="satellite:InterferometryPayload"/>
16 </spacecraft>
17 <spacecraft xsi:type="satellite:CubeSat3U">
18 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
19 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0"/>
20 <payload xsi:type="satellite:InterferometryPayload"/>
21 </spacecraft>
22 <spacecraft xsi:type="satellite:SmallSat">
23 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
24 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.19/@commSubsystem.1"/>
25 <payload xsi:type="satellite:InterferometryPayload"/>
26 </spacecraft>
27 <spacecraft xsi:type="satellite:CubeSat6U">
28 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.13/@commSubsystem.1"/>
29 </spacecraft>
30 <spacecraft xsi:type="satellite:CubeSat3U">
31 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
32 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
33 <payload xsi:type="satellite:InterferometryPayload"/>
34 </spacecraft>
35 <spacecraft xsi:type="satellite:CubeSat6U">
36 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.19/@commSubsystem.0"/>
37 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
38 <payload xsi:type="satellite:InterferometryPayload"/>
39 </spacecraft>
40 <spacecraft xsi:type="satellite:SmallSat">
41 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
42 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.19/@commSubsystem.0"/>
43 <payload xsi:type="satellite:InterferometryPayload"/>
44 </spacecraft>
45 <spacecraft xsi:type="satellite:CubeSat6U">
46 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
47 </spacecraft>
48 <spacecraft xsi:type="satellite:CubeSat6U">
49 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.5/@commSubsystem.1"/>
50 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
51 <payload xsi:type="satellite:InterferometryPayload"/>
52 </spacecraft>
53 <spacecraft xsi:type="satellite:CubeSat6U">
54 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
55 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
56 <payload xsi:type="satellite:InterferometryPayload"/>
57 </spacecraft>
58 <spacecraft xsi:type="satellite:CubeSat3U">
59 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
60 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.23/@commSubsystem.1"/>
61 </spacecraft>
62 <spacecraft xsi:type="satellite:CubeSat3U">
63 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
64 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
65 <payload xsi:type="satellite:InterferometryPayload"/>
66 </spacecraft>
67 <spacecraft xsi:type="satellite:CubeSat3U">
68 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
69 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.3/@commSubsystem.0"/>
70 <payload xsi:type="satellite:InterferometryPayload"/>
71 </spacecraft>
72 <spacecraft xsi:type="satellite:CubeSat6U">
73 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
74 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.16/@commSubsystem.1"/>
75 <payload xsi:type="satellite:InterferometryPayload"/>
76 </spacecraft>
77 <spacecraft xsi:type="satellite:SmallSat">
78 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
79 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.17/@commSubsystem.1"/>
80 <payload xsi:type="satellite:InterferometryPayload"/>
81 </spacecraft>
82 <spacecraft xsi:type="satellite:CubeSat6U">
83 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.20/@commSubsystem.1"/>
84 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
85 <payload xsi:type="satellite:InterferometryPayload"/>
86 </spacecraft>
87 <spacecraft xsi:type="satellite:SmallSat">
88 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.3/@commSubsystem.1"/>
89 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
90 <payload xsi:type="satellite:InterferometryPayload"/>
91 </spacecraft>
92 <spacecraft xsi:type="satellite:CubeSat3U">
93 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
94 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
95 <payload xsi:type="satellite:InterferometryPayload"/>
96 </spacecraft>
97 <spacecraft xsi:type="satellite:CubeSat3U">
98 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0"/>
99 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
100 <payload xsi:type="satellite:InterferometryPayload"/>
101 </spacecraft>
102 <spacecraft xsi:type="satellite:CubeSat3U">
103 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
104 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.3/@commSubsystem.1"/>
105 <payload xsi:type="satellite:InterferometryPayload"/>
106 </spacecraft>
107 <spacecraft xsi:type="satellite:CubeSat3U">
108 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
109 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
110 <payload xsi:type="satellite:InterferometryPayload"/>
111 </spacecraft>
112 <spacecraft xsi:type="satellite:CubeSat6U">
113 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
114 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.12/@commSubsystem.0"/>
115 </spacecraft>
116 <spacecraft xsi:type="satellite:SmallSat">
117 <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@spacecraft.0/@commSubsystem.0"/>
118 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
119 <payload xsi:type="satellite:InterferometryPayload"/>
120 </spacecraft>
121 <spacecraft xsi:type="satellite:CubeSat6U">
122 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.7/@commSubsystem.1"/>
123 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
124 <payload xsi:type="satellite:InterferometryPayload"/>
125 </spacecraft>
126 <spacecraft xsi:type="satellite:CubeSat3U">
127 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
128 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0"/>
129 <payload xsi:type="satellite:InterferometryPayload"/>
130 </spacecraft>
131</satellite:InterferometryMission>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/8_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/8_1.xmi
new file mode 100644
index 00000000..ec0985dc
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/8_1.xmi
@@ -0,0 +1,134 @@
1<?xml version="1.0" encoding="ASCII"?>
2<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite ../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore">
3 <groundStationNetwork>
4 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
5 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
6 </groundStationNetwork>
7 <spacecraft xsi:type="satellite:CubeSat6U">
8 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.9/@commSubsystem.1"/>
9 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
10 <payload xsi:type="satellite:InterferometryPayload"/>
11 </spacecraft>
12 <spacecraft xsi:type="satellite:SmallSat">
13 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
14 <payload xsi:type="satellite:InterferometryPayload"/>
15 </spacecraft>
16 <spacecraft xsi:type="satellite:CubeSat3U">
17 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.16/@commSubsystem.0"/>
18 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
19 <payload xsi:type="satellite:InterferometryPayload"/>
20 </spacecraft>
21 <spacecraft xsi:type="satellite:CubeSat3U">
22 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
23 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0"/>
24 <payload xsi:type="satellite:InterferometryPayload"/>
25 </spacecraft>
26 <spacecraft xsi:type="satellite:CubeSat3U">
27 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
28 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
29 </spacecraft>
30 <spacecraft xsi:type="satellite:CubeSat3U">
31 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
32 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
33 <payload xsi:type="satellite:InterferometryPayload"/>
34 </spacecraft>
35 <spacecraft xsi:type="satellite:CubeSat6U">
36 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
37 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.25/@commSubsystem.1"/>
38 <payload xsi:type="satellite:InterferometryPayload"/>
39 </spacecraft>
40 <spacecraft xsi:type="satellite:CubeSat6U">
41 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
42 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.8/@commSubsystem.1"/>
43 <payload xsi:type="satellite:InterferometryPayload"/>
44 </spacecraft>
45 <spacecraft xsi:type="satellite:SmallSat">
46 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
47 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.25/@commSubsystem.0"/>
48 <payload xsi:type="satellite:InterferometryPayload"/>
49 </spacecraft>
50 <spacecraft xsi:type="satellite:CubeSat3U">
51 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
52 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
53 <payload xsi:type="satellite:InterferometryPayload"/>
54 </spacecraft>
55 <spacecraft xsi:type="satellite:SmallSat">
56 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
57 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.25/@commSubsystem.0"/>
58 <payload xsi:type="satellite:InterferometryPayload"/>
59 </spacecraft>
60 <spacecraft xsi:type="satellite:CubeSat3U">
61 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.25/@commSubsystem.0"/>
62 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
63 <payload xsi:type="satellite:InterferometryPayload"/>
64 </spacecraft>
65 <spacecraft xsi:type="satellite:CubeSat6U">
66 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.16/@commSubsystem.0"/>
67 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
68 <payload xsi:type="satellite:InterferometryPayload"/>
69 </spacecraft>
70 <spacecraft xsi:type="satellite:SmallSat">
71 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.19/@commSubsystem.1"/>
72 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
73 <payload xsi:type="satellite:InterferometryPayload"/>
74 </spacecraft>
75 <spacecraft xsi:type="satellite:CubeSat3U">
76 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
77 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
78 <payload xsi:type="satellite:InterferometryPayload"/>
79 </spacecraft>
80 <spacecraft xsi:type="satellite:SmallSat">
81 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
82 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.17/@commSubsystem.1"/>
83 <payload xsi:type="satellite:InterferometryPayload"/>
84 </spacecraft>
85 <spacecraft xsi:type="satellite:CubeSat6U">
86 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
87 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.13/@commSubsystem.0"/>
88 <payload xsi:type="satellite:InterferometryPayload"/>
89 </spacecraft>
90 <spacecraft xsi:type="satellite:CubeSat3U">
91 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
92 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.0"/>
93 <payload xsi:type="satellite:InterferometryPayload"/>
94 </spacecraft>
95 <spacecraft xsi:type="satellite:SmallSat">
96 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
97 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.13/@commSubsystem.0"/>
98 <payload xsi:type="satellite:InterferometryPayload"/>
99 </spacecraft>
100 <spacecraft xsi:type="satellite:SmallSat">
101 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
102 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.0/@commSubsystem.0"/>
103 <payload xsi:type="satellite:InterferometryPayload"/>
104 </spacecraft>
105 <spacecraft xsi:type="satellite:CubeSat6U">
106 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
107 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.18/@commSubsystem.1"/>
108 <payload xsi:type="satellite:InterferometryPayload"/>
109 </spacecraft>
110 <spacecraft xsi:type="satellite:CubeSat6U">
111 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.20/@commSubsystem.1"/>
112 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
113 <payload xsi:type="satellite:InterferometryPayload"/>
114 </spacecraft>
115 <spacecraft xsi:type="satellite:SmallSat">
116 <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@spacecraft.23/@commSubsystem.1"/>
117 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
118 <payload xsi:type="satellite:InterferometryPayload"/>
119 </spacecraft>
120 <spacecraft xsi:type="satellite:SmallSat">
121 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.11/@commSubsystem.0"/>
122 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
123 <payload xsi:type="satellite:InterferometryPayload"/>
124 </spacecraft>
125 <spacecraft xsi:type="satellite:SmallSat">
126 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
127 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.25/@commSubsystem.0"/>
128 </spacecraft>
129 <spacecraft xsi:type="satellite:CubeSat3U">
130 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
131 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@groundStationNetwork/@commSubsystem.1"/>
132 <payload xsi:type="satellite:InterferometryPayload"/>
133 </spacecraft>
134</satellite:InterferometryMission>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/9_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/9_1.xmi
new file mode 100644
index 00000000..dc2ccc91
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/SatelliteNoNum/9_1.xmi
@@ -0,0 +1,137 @@
1<?xml version="1.0" encoding="ASCII"?>
2<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite ../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore">
3 <groundStationNetwork>
4 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
5 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
6 </groundStationNetwork>
7 <spacecraft xsi:type="satellite:SmallSat">
8 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.2/@commSubsystem.0"/>
9 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
10 <payload xsi:type="satellite:InterferometryPayload"/>
11 </spacecraft>
12 <spacecraft xsi:type="satellite:SmallSat">
13 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
14 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.17/@commSubsystem.0"/>
15 <payload xsi:type="satellite:InterferometryPayload"/>
16 </spacecraft>
17 <spacecraft xsi:type="satellite:CubeSat3U">
18 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.6/@commSubsystem.1"/>
19 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
20 <payload xsi:type="satellite:InterferometryPayload"/>
21 </spacecraft>
22 <spacecraft xsi:type="satellite:CubeSat3U">
23 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.5/@commSubsystem.0"/>
24 <payload xsi:type="satellite:InterferometryPayload"/>
25 </spacecraft>
26 <spacecraft xsi:type="satellite:CubeSat3U">
27 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
28 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.19/@commSubsystem.0"/>
29 <payload xsi:type="satellite:InterferometryPayload"/>
30 </spacecraft>
31 <spacecraft xsi:type="satellite:CubeSat6U">
32 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
33 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.6/@commSubsystem.1"/>
34 <payload xsi:type="satellite:InterferometryPayload"/>
35 </spacecraft>
36 <spacecraft xsi:type="satellite:CubeSat6U">
37 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.8/@commSubsystem.1"/>
38 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
39 <payload xsi:type="satellite:InterferometryPayload"/>
40 </spacecraft>
41 <spacecraft xsi:type="satellite:CubeSat6U">
42 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.24/@commSubsystem.0"/>
43 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
44 <payload xsi:type="satellite:InterferometryPayload"/>
45 </spacecraft>
46 <spacecraft xsi:type="satellite:SmallSat">
47 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
48 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.20/@commSubsystem.0"/>
49 <payload xsi:type="satellite:InterferometryPayload"/>
50 </spacecraft>
51 <spacecraft xsi:type="satellite:SmallSat">
52 <commSubsystem xsi:type="satellite:KaCommSubsystem" target="//@spacecraft.11/@commSubsystem.0"/>
53 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
54 <payload xsi:type="satellite:InterferometryPayload"/>
55 </spacecraft>
56 <spacecraft xsi:type="satellite:CubeSat6U">
57 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
58 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.14/@commSubsystem.0"/>
59 <payload xsi:type="satellite:InterferometryPayload"/>
60 </spacecraft>
61 <spacecraft xsi:type="satellite:SmallSat">
62 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
63 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.4/@commSubsystem.1"/>
64 <payload xsi:type="satellite:InterferometryPayload"/>
65 </spacecraft>
66 <spacecraft xsi:type="satellite:CubeSat3U">
67 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.16/@commSubsystem.0"/>
68 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
69 <payload xsi:type="satellite:InterferometryPayload"/>
70 </spacecraft>
71 <spacecraft xsi:type="satellite:CubeSat3U">
72 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
73 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.15/@commSubsystem.0"/>
74 <payload xsi:type="satellite:InterferometryPayload"/>
75 </spacecraft>
76 <spacecraft xsi:type="satellite:CubeSat3U">
77 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
78 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.19/@commSubsystem.0"/>
79 <payload xsi:type="satellite:InterferometryPayload"/>
80 </spacecraft>
81 <spacecraft xsi:type="satellite:CubeSat6U">
82 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.4/@commSubsystem.1"/>
83 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
84 <payload xsi:type="satellite:InterferometryPayload"/>
85 </spacecraft>
86 <spacecraft xsi:type="satellite:CubeSat3U">
87 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.2/@commSubsystem.0"/>
88 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
89 <payload xsi:type="satellite:InterferometryPayload"/>
90 </spacecraft>
91 <spacecraft xsi:type="satellite:CubeSat6U">
92 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
93 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.20/@commSubsystem.1"/>
94 </spacecraft>
95 <spacecraft xsi:type="satellite:SmallSat">
96 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.25/@commSubsystem.1"/>
97 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
98 <payload xsi:type="satellite:InterferometryPayload"/>
99 </spacecraft>
100 <spacecraft xsi:type="satellite:CubeSat6U">
101 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.16/@commSubsystem.0"/>
102 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
103 <payload xsi:type="satellite:InterferometryPayload"/>
104 </spacecraft>
105 <spacecraft xsi:type="satellite:CubeSat3U">
106 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
107 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
108 <payload xsi:type="satellite:InterferometryPayload"/>
109 </spacecraft>
110 <spacecraft xsi:type="satellite:SmallSat">
111 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
112 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.20/@commSubsystem.1"/>
113 </spacecraft>
114 <spacecraft xsi:type="satellite:CubeSat6U">
115 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
116 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.12/@commSubsystem.1"/>
117 <payload xsi:type="satellite:InterferometryPayload"/>
118 </spacecraft>
119 <spacecraft xsi:type="satellite:CubeSat3U">
120 <commSubsystem xsi:type="satellite:UHFCommSubsystem"/>
121 </spacecraft>
122 <spacecraft xsi:type="satellite:SmallSat">
123 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.19/@commSubsystem.1"/>
124 <commSubsystem xsi:type="satellite:KaCommSubsystem"/>
125 <payload xsi:type="satellite:InterferometryPayload"/>
126 </spacecraft>
127 <spacecraft xsi:type="satellite:SmallSat">
128 <commSubsystem xsi:type="satellite:XCommSubsystem" target="//@spacecraft.6/@commSubsystem.0"/>
129 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
130 <payload xsi:type="satellite:InterferometryPayload"/>
131 </spacecraft>
132 <spacecraft xsi:type="satellite:CubeSat3U">
133 <commSubsystem xsi:type="satellite:XCommSubsystem"/>
134 <commSubsystem xsi:type="satellite:UHFCommSubsystem" target="//@spacecraft.16/@commSubsystem.0"/>
135 <payload xsi:type="satellite:InterferometryPayload"/>
136 </spacecraft>
137</satellite:InterferometryMission>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/10_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/10_1.xmi
new file mode 100644
index 00000000..1abe751c
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/10_1.xmi
@@ -0,0 +1,118 @@
1<?xml version="1.0" encoding="ASCII"?>
2<TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../case.study.pledge.model/model/TaxationWithRoot.ecore">
3 <contains id1="">
4 <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="DIVORCE" id9="">
5 <individual_A SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
6 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
7 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
8 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
9 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
10 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
11 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
12 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
13 <properties id10=""/>
14 <properties id10=""/>
15 <properties id10=""/>
16 <properties id10=""/>
17 <properties id10=""/>
18 <properties id10=""/>
19 <properties id10=""/>
20 <properties id10=""/>
21 </parents>
22 </contains>
23 <contains id1="">
24 <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" separation_cause="DIVORCE" id9="">
25 <individual_A SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
26 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
27 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
28 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
29 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
30 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
31 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
32 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
33 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
34 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
35 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
36 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
37 <properties id10=""/>
38 <properties id10=""/>
39 <properties id10=""/>
40 <properties id10=""/>
41 <properties id10=""/>
42 <properties id10=""/>
43 <properties id10=""/>
44 <properties id10=""/>
45 <properties id10=""/>
46 <properties id10=""/>
47 <properties id10=""/>
48 <properties id10=""/>
49 </parents>
50 </contains>
51 <contains id1="">
52 <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="SEPARATION_DE_FAIT" id9="">
53 <individual_A SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
54 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
55 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
56 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
57 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
58 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
59 <properties id10=""/>
60 <properties id10=""/>
61 <properties id10=""/>
62 <properties id10=""/>
63 <properties id10=""/>
64 <properties id10=""/>
65 <properties id10=""/>
66 <properties id10=""/>
67 <properties id10=""/>
68 <properties id10=""/>
69 <properties id10=""/>
70 </parents>
71 </contains>
72 <contains id1="">
73 <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" id9="">
74 <individual_A SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
75 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
76 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
77 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
78 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
79 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
80 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
81 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
82 <properties id10=""/>
83 <properties id10=""/>
84 <properties id10=""/>
85 <properties id10=""/>
86 <properties id10=""/>
87 <properties id10=""/>
88 <properties id10=""/>
89 </parents>
90 </contains>
91 <contains id1="">
92 <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" id9="">
93 <individual_A SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
94 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
95 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
96 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
97 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
98 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
99 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
100 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
101 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
102 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
103 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
104 <properties id10=""/>
105 <properties id10=""/>
106 <properties id10=""/>
107 <properties id10=""/>
108 <properties id10=""/>
109 <properties id10=""/>
110 <properties id10=""/>
111 <properties id10=""/>
112 <properties id10=""/>
113 <properties id10=""/>
114 <properties id10=""/>
115 <properties id10=""/>
116 </parents>
117 </contains>
118</TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/1_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/1_1.xmi
new file mode 100644
index 00000000..ea419150
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/1_1.xmi
@@ -0,0 +1,118 @@
1<?xml version="1.0" encoding="ASCII"?>
2<TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../case.study.pledge.model/model/TaxationWithRoot.ecore">
3 <contains id1="">
4 <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" id9="">
5 <individual_A SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
6 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
7 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
8 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
9 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
10 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
11 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
12 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
13 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
14 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
15 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
16 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
17 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
18 <properties id10=""/>
19 <properties id10=""/>
20 <properties id10=""/>
21 <properties id10=""/>
22 <properties id10=""/>
23 <properties id10=""/>
24 <properties id10=""/>
25 </parents>
26 </contains>
27 <contains id1="">
28 <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" separation_cause="SEPARATION_BY_COURT" id9="">
29 <individual_A SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
30 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
31 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
32 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
33 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
34 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
35 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
36 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
37 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
38 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
39 <properties id10=""/>
40 <properties id10=""/>
41 <properties id10=""/>
42 <properties id10=""/>
43 <properties id10=""/>
44 <properties id10=""/>
45 </parents>
46 </contains>
47 <contains id1="">
48 <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" separation_cause="SEPARATION_DE_FAIT" id9="">
49 <individual_A SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
50 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
51 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
52 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
53 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
54 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
55 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
56 <properties id10=""/>
57 <properties id10=""/>
58 <properties id10=""/>
59 <properties id10=""/>
60 <properties id10=""/>
61 <properties id10=""/>
62 <properties id10=""/>
63 <properties id10=""/>
64 <properties id10=""/>
65 <properties id10=""/>
66 <properties id10=""/>
67 </parents>
68 </contains>
69 <contains id1="">
70 <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="DIVORCE" id9="">
71 <individual_A SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
72 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
73 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
74 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
75 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
76 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
77 <properties id10=""/>
78 <properties id10=""/>
79 <properties id10=""/>
80 <properties id10=""/>
81 <properties id10=""/>
82 <properties id10=""/>
83 <properties id10=""/>
84 <properties id10=""/>
85 <properties id10=""/>
86 <properties id10=""/>
87 <properties id10=""/>
88 <properties id10=""/>
89 </parents>
90 </contains>
91 <contains id1="">
92 <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="DIVORCE" id9="">
93 <individual_A SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
94 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
95 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
96 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
97 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
98 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
99 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
100 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
101 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
102 <properties id10=""/>
103 <properties id10=""/>
104 <properties id10=""/>
105 <properties id10=""/>
106 <properties id10=""/>
107 <properties id10=""/>
108 <properties id10=""/>
109 <properties id10=""/>
110 <properties id10=""/>
111 <properties id10=""/>
112 <properties id10=""/>
113 <properties id10=""/>
114 <properties id10=""/>
115 <properties id10=""/>
116 </parents>
117 </contains>
118</TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/2_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/2_1.xmi
new file mode 100644
index 00000000..30352906
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/2_1.xmi
@@ -0,0 +1,119 @@
1<?xml version="1.0" encoding="ASCII"?>
2<TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../case.study.pledge.model/model/TaxationWithRoot.ecore">
3 <contains id1="">
4 <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" separation_cause="SEPARATION_DE_FAIT" id9="">
5 <individual_A SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
6 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
7 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
8 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
9 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
10 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
11 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
12 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
13 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
14 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
15 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
16 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
17 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
18 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
19 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
20 <properties id10=""/>
21 <properties id10=""/>
22 <properties id10=""/>
23 <properties id10=""/>
24 <properties id10=""/>
25 <properties id10=""/>
26 <properties id10=""/>
27 <properties id10=""/>
28 <properties id10=""/>
29 <properties id10=""/>
30 </parents>
31 </contains>
32 <contains id1="">
33 <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" id9="">
34 <individual_A SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
35 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
36 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
37 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
38 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
39 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
40 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
41 <properties id10=""/>
42 <properties id10=""/>
43 </parents>
44 </contains>
45 <contains id1="">
46 <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="DIVORCE" id9="">
47 <individual_A SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
48 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
49 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
50 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
51 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
52 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
53 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
54 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
55 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
56 <properties id10=""/>
57 <properties id10=""/>
58 <properties id10=""/>
59 <properties id10=""/>
60 <properties id10=""/>
61 <properties id10=""/>
62 <properties id10=""/>
63 <properties id10=""/>
64 <properties id10=""/>
65 <properties id10=""/>
66 </parents>
67 </contains>
68 <contains id1="">
69 <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" id9="">
70 <individual_A SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
71 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
72 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
73 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
74 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
75 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
76 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
77 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
78 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
79 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
80 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
81 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
82 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
83 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
84 <properties id10=""/>
85 <properties id10=""/>
86 <properties id10=""/>
87 <properties id10=""/>
88 <properties id10=""/>
89 <properties id10=""/>
90 <properties id10=""/>
91 <properties id10=""/>
92 <properties id10=""/>
93 <properties id10=""/>
94 <properties id10=""/>
95 <properties id10=""/>
96 <properties id10=""/>
97 </parents>
98 </contains>
99 <contains id1="">
100 <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="SEPARATION_DE_FAIT" id9="">
101 <individual_A SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
102 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
103 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
104 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
105 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
106 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
107 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
108 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
109 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
110 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
111 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
112 <properties id10=""/>
113 <properties id10=""/>
114 <properties id10=""/>
115 <properties id10=""/>
116 <properties id10=""/>
117 </parents>
118 </contains>
119</TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/3_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/3_1.xmi
new file mode 100644
index 00000000..deae653a
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/3_1.xmi
@@ -0,0 +1,118 @@
1<?xml version="1.0" encoding="ASCII"?>
2<TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../case.study.pledge.model/model/TaxationWithRoot.ecore">
3 <contains id1="">
4 <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="DIVORCE" id9="">
5 <individual_A SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
6 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
7 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
8 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
9 <properties id10=""/>
10 <properties id10=""/>
11 <properties id10=""/>
12 <properties id10=""/>
13 <properties id10=""/>
14 <properties id10=""/>
15 <properties id10=""/>
16 <properties id10=""/>
17 </parents>
18 </contains>
19 <contains id1="">
20 <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" id9="">
21 <individual_A SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
22 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
23 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
24 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
25 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
26 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
27 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
28 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
29 <properties id10=""/>
30 <properties id10=""/>
31 <properties id10=""/>
32 <properties id10=""/>
33 <properties id10=""/>
34 <properties id10=""/>
35 <properties id10=""/>
36 <properties id10=""/>
37 <properties id10=""/>
38 <properties id10=""/>
39 <properties id10=""/>
40 </parents>
41 </contains>
42 <contains id1="">
43 <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="SEPARATION_BY_COURT" id9="">
44 <individual_A SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
45 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
46 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
47 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
48 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
49 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
50 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
51 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
52 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
53 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
54 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
55 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
56 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
57 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
58 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
59 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
60 <properties id10=""/>
61 <properties id10=""/>
62 <properties id10=""/>
63 <properties id10=""/>
64 <properties id10=""/>
65 <properties id10=""/>
66 <properties id10=""/>
67 </parents>
68 </contains>
69 <contains id1="">
70 <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" id9="">
71 <individual_A SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
72 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
73 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
74 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
75 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
76 <properties id10=""/>
77 <properties id10=""/>
78 <properties id10=""/>
79 <properties id10=""/>
80 <properties id10=""/>
81 <properties id10=""/>
82 <properties id10=""/>
83 </parents>
84 </contains>
85 <contains id1="">
86 <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="SEPARATION_BY_COURT" id9="">
87 <individual_A SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
88 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
89 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
90 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
91 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
92 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
93 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
94 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
95 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
96 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
97 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
98 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
99 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
100 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
101 <properties id10=""/>
102 <properties id10=""/>
103 <properties id10=""/>
104 <properties id10=""/>
105 <properties id10=""/>
106 <properties id10=""/>
107 <properties id10=""/>
108 <properties id10=""/>
109 <properties id10=""/>
110 <properties id10=""/>
111 <properties id10=""/>
112 <properties id10=""/>
113 <properties id10=""/>
114 <properties id10=""/>
115 <properties id10=""/>
116 </parents>
117 </contains>
118</TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/4_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/4_1.xmi
new file mode 100644
index 00000000..ab317053
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/4_1.xmi
@@ -0,0 +1,118 @@
1<?xml version="1.0" encoding="ASCII"?>
2<TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../case.study.pledge.model/model/TaxationWithRoot.ecore">
3 <contains id1="">
4 <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" separation_cause="DIVORCE" id9="">
5 <individual_A SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
6 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
7 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
8 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
9 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
10 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
11 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
12 <properties id10=""/>
13 <properties id10=""/>
14 <properties id10=""/>
15 <properties id10=""/>
16 <properties id10=""/>
17 <properties id10=""/>
18 <properties id10=""/>
19 <properties id10=""/>
20 <properties id10=""/>
21 <properties id10=""/>
22 <properties id10=""/>
23 <properties id10=""/>
24 <properties id10=""/>
25 <properties id10=""/>
26 <properties id10=""/>
27 <properties id10=""/>
28 </parents>
29 </contains>
30 <contains id1="">
31 <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" id9="">
32 <individual_A SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
33 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
34 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
35 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
36 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
37 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
38 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
39 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
40 <properties id10=""/>
41 <properties id10=""/>
42 <properties id10=""/>
43 <properties id10=""/>
44 <properties id10=""/>
45 <properties id10=""/>
46 <properties id10=""/>
47 <properties id10=""/>
48 <properties id10=""/>
49 <properties id10=""/>
50 <properties id10=""/>
51 <properties id10=""/>
52 <properties id10=""/>
53 </parents>
54 </contains>
55 <contains id1="">
56 <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" id9="">
57 <individual_A SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
58 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
59 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
60 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
61 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
62 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
63 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
64 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
65 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
66 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
67 <properties id10=""/>
68 <properties id10=""/>
69 <properties id10=""/>
70 <properties id10=""/>
71 <properties id10=""/>
72 <properties id10=""/>
73 <properties id10=""/>
74 <properties id10=""/>
75 <properties id10=""/>
76 </parents>
77 </contains>
78 <contains id1="">
79 <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="SEPARATION_DE_FAIT" id9="">
80 <individual_A SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
81 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
82 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
83 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
84 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
85 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
86 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
87 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
88 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
89 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
90 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
91 <properties id10=""/>
92 <properties id10=""/>
93 <properties id10=""/>
94 <properties id10=""/>
95 <properties id10=""/>
96 <properties id10=""/>
97 <properties id10=""/>
98 <properties id10=""/>
99 <properties id10=""/>
100 <properties id10=""/>
101 </parents>
102 </contains>
103 <contains id1="">
104 <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="SEPARATION_BY_COURT" id9="">
105 <individual_A SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
106 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
107 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
108 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
109 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
110 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
111 <properties id10=""/>
112 <properties id10=""/>
113 <properties id10=""/>
114 <properties id10=""/>
115 <properties id10=""/>
116 </parents>
117 </contains>
118</TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/5_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/5_1.xmi
new file mode 100644
index 00000000..2163e7cb
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/5_1.xmi
@@ -0,0 +1,118 @@
1<?xml version="1.0" encoding="ASCII"?>
2<TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../case.study.pledge.model/model/TaxationWithRoot.ecore">
3 <contains id1="">
4 <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" separation_cause="DIVORCE" id9="">
5 <individual_A SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
6 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
7 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
8 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
9 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
10 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
11 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
12 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
13 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
14 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
15 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
16 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
17 <properties id10=""/>
18 <properties id10=""/>
19 <properties id10=""/>
20 <properties id10=""/>
21 <properties id10=""/>
22 <properties id10=""/>
23 <properties id10=""/>
24 <properties id10=""/>
25 <properties id10=""/>
26 <properties id10=""/>
27 </parents>
28 </contains>
29 <contains id1="">
30 <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="SEPARATION_BY_COURT" id9="">
31 <individual_A SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
32 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
33 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
34 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
35 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
36 <properties id10=""/>
37 <properties id10=""/>
38 <properties id10=""/>
39 <properties id10=""/>
40 <properties id10=""/>
41 <properties id10=""/>
42 <properties id10=""/>
43 </parents>
44 </contains>
45 <contains id1="">
46 <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" id9="">
47 <individual_A SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
48 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
49 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
50 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
51 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
52 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
53 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
54 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
55 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
56 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
57 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
58 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
59 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
60 <properties id10=""/>
61 <properties id10=""/>
62 <properties id10=""/>
63 <properties id10=""/>
64 <properties id10=""/>
65 <properties id10=""/>
66 <properties id10=""/>
67 <properties id10=""/>
68 <properties id10=""/>
69 <properties id10=""/>
70 </parents>
71 </contains>
72 <contains id1="">
73 <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="SEPARATION_BY_COURT" id9="">
74 <individual_A SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
75 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
76 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
77 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
78 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
79 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
80 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
81 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
82 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
83 <properties id10=""/>
84 <properties id10=""/>
85 <properties id10=""/>
86 <properties id10=""/>
87 <properties id10=""/>
88 <properties id10=""/>
89 <properties id10=""/>
90 <properties id10=""/>
91 <properties id10=""/>
92 <properties id10=""/>
93 <properties id10=""/>
94 <properties id10=""/>
95 </parents>
96 </contains>
97 <contains id1="">
98 <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" separation_cause="SEPARATION_BY_COURT" id9="">
99 <individual_A SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
100 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
101 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
102 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
103 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
104 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
105 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
106 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
107 <properties id10=""/>
108 <properties id10=""/>
109 <properties id10=""/>
110 <properties id10=""/>
111 <properties id10=""/>
112 <properties id10=""/>
113 <properties id10=""/>
114 <properties id10=""/>
115 <properties id10=""/>
116 </parents>
117 </contains>
118</TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/6_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/6_1.xmi
new file mode 100644
index 00000000..7b76f910
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/6_1.xmi
@@ -0,0 +1,124 @@
1<?xml version="1.0" encoding="ASCII"?>
2<TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../case.study.pledge.model/model/TaxationWithRoot.ecore">
3 <contains id1="">
4 <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" id9="">
5 <individual_A SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
6 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
7 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
8 <properties id10=""/>
9 <properties id10=""/>
10 <properties id10=""/>
11 <properties id10=""/>
12 <properties id10=""/>
13 </parents>
14 </contains>
15 <contains id1="">
16 <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" id9="">
17 <individual_A SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1" expenses=""/>
18 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1" expenses=" "/>
19 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1" expenses=""/>
20 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
21 <properties id10=""/>
22 </parents>
23 </contains>
24 <contains id1="">
25 <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" id9="">
26 <individual_A SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
27 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1" expenses=""/>
28 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
29 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1" expenses=" "/>
30 <individual_B xsi:type="TaxCardWithRoot:Resident_Tax_Payer" SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1" expenses="">
31 <from_agent expense=""/>
32 <incomes xsi:type="TaxCardWithRoot:Foreign_Income">
33 <income_type xsi:type="TaxCardWithRoot:Agriculture_and_Forestry_Income" id8=""/>
34 <details id5=""/>
35 <details id5=""/>
36 <details id5=""/>
37 <details id5=""/>
38 <details id5=""/>
39 <details id5=""/>
40 <details id5=""/>
41 <details id5=""/>
42 <details id5=""/>
43 <details id5=""/>
44 <details id5=""/>
45 <details id5=""/>
46 <expenses expense_purpose="DEPENDENCE_CARE" id4="" beneficiary=""/>
47 <expenses xsi:type="TaxCardWithRoot:Special_Expense_DS" expense_purpose="ALIMONY" id4="" beneficiary=""/>
48 <expenses xsi:type="TaxCardWithRoot:Professional_Expense" expense_purpose="DEPENDENCE_CARE" from_agent="//@contains.2/@parents/@individual_B.3/@from_agent" id4="" beneficiary=""/>
49 <expenses xsi:type="TaxCardWithRoot:Miscellaneous_Expense_FO" id4="" beneficiary=""/>
50 <expenses xsi:type="TaxCardWithRoot:Travel_Expense_FD" id4="" beneficiary=""/>
51 <expenses xsi:type="TaxCardWithRoot:Miscellaneous_Expense_FO" expense_purpose="ALIMONY" id4="" beneficiary=""/>
52 <expenses xsi:type="TaxCardWithRoot:Miscellaneous_Expense_FO" expense_purpose="RECURRENT_DEPT" id4="" beneficiary=""/>
53 </incomes>
54 <incomes xsi:type="TaxCardWithRoot:Local_Income">
55 <income_type xsi:type="TaxCardWithRoot:Agriculture_and_Forestry_Income" id8=""/>
56 <details id5=""/>
57 <details id5=""/>
58 <details id5=""/>
59 <details id5=""/>
60 <details id5=""/>
61 <details id5=""/>
62 <details id5=""/>
63 <details id5=""/>
64 <details id5=""/>
65 <details id5=""/>
66 <details id5=""/>
67 <details id5=""/>
68 <expenses xsi:type="TaxCardWithRoot:Professional_Expense" expense_purpose="DEPENDENCE_CARE" id4="" beneficiary=""/>
69 <expenses xsi:type="TaxCardWithRoot:Loss_Carryforward" expense_purpose="RECURRENT_DEPT" id4="" beneficiary=""/>
70 <expenses xsi:type="TaxCardWithRoot:Loss_Carryforward" expense_purpose="HOUSE_CARE" id4="" beneficiary=""/>
71 </incomes>
72 <incomes xsi:type="TaxCardWithRoot:Foreign_Income">
73 <income_type xsi:type="TaxCardWithRoot:Capital_and_Investments_Income" id8=""/>
74 <details id5=""/>
75 <details id5=""/>
76 <details id5=""/>
77 <details id5=""/>
78 <details id5=""/>
79 <details id5=""/>
80 <details id5=""/>
81 <details id5=""/>
82 <details id5=""/>
83 <details id5=""/>
84 <details id5=""/>
85 <details id5=""/>
86 <expenses xsi:type="TaxCardWithRoot:Travel_Expense_FD" expense_purpose="CHILD_CARE" id4="" beneficiary=""/>
87 <expenses xsi:type="TaxCardWithRoot:Special_Expense_DS" expense_purpose="HOUSE_CARE" id4="" beneficiary=""/>
88 <expenses expense_purpose="ALIMONY" id4="" beneficiary=""/>
89 <expenses xsi:type="TaxCardWithRoot:Special_Expense_DS" expense_purpose="CHILD_CARE" id4="" beneficiary=""/>
90 </incomes>
91 <from_law id=""/>
92 </individual_B>
93 <properties id10=""/>
94 <properties id10=""/>
95 <properties id10=""/>
96 <properties id10=""/>
97 <properties id10=""/>
98 </parents>
99 </contains>
100 <contains id1="">
101 <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="SEPARATION_DE_FAIT" id9="">
102 <individual_A SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
103 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1" expenses=" "/>
104 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
105 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
106 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
107 <properties id10=""/>
108 <properties id10=""/>
109 <properties id10=""/>
110 <properties id10=""/>
111 </parents>
112 </contains>
113 <contains id1="">
114 <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="SEPARATION_DE_FAIT" id9="">
115 <individual_A SSNo="" birth_year="1918" birth_month="1" birth_day="1" expenses=""/>
116 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
117 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1" expenses=""/>
118 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1" expenses=" "/>
119 <properties id10=""/>
120 <properties id10=""/>
121 <properties id10=""/>
122 </parents>
123 </contains>
124</TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/7_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/7_1.xmi
new file mode 100644
index 00000000..cb046b8a
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/7_1.xmi
@@ -0,0 +1,119 @@
1<?xml version="1.0" encoding="ASCII"?>
2<TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../case.study.pledge.model/model/TaxationWithRoot.ecore">
3 <contains id1="">
4 <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="SEPARATION_DE_FAIT" id9="">
5 <individual_A SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
6 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
7 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
8 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
9 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
10 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
11 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
12 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
13 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
14 <properties id10=""/>
15 <properties id10=""/>
16 <properties id10=""/>
17 <properties id10=""/>
18 <properties id10=""/>
19 <properties id10=""/>
20 <properties id10=""/>
21 <properties id10=""/>
22 <properties id10=""/>
23 <properties id10=""/>
24 <properties id10=""/>
25 <properties id10=""/>
26 </parents>
27 </contains>
28 <contains id1="">
29 <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" separation_cause="SEPARATION_BY_COURT" id9="">
30 <individual_A SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
31 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
32 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
33 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
34 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
35 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
36 <properties id10=""/>
37 <properties id10=""/>
38 <properties id10=""/>
39 <properties id10=""/>
40 <properties id10=""/>
41 <properties id10=""/>
42 </parents>
43 </contains>
44 <contains id1="">
45 <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" id9="">
46 <individual_A SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
47 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
48 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
49 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
50 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
51 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
52 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
53 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
54 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
55 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
56 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
57 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
58 <properties id10=""/>
59 <properties id10=""/>
60 <properties id10=""/>
61 <properties id10=""/>
62 <properties id10=""/>
63 <properties id10=""/>
64 <properties id10=""/>
65 <properties id10=""/>
66 <properties id10=""/>
67 <properties id10=""/>
68 <properties id10=""/>
69 <properties id10=""/>
70 <properties id10=""/>
71 </parents>
72 </contains>
73 <contains id1="">
74 <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" id9="">
75 <individual_A SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
76 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
77 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
78 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
79 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
80 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
81 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
82 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
83 <properties id10=""/>
84 <properties id10=""/>
85 <properties id10=""/>
86 <properties id10=""/>
87 <properties id10=""/>
88 <properties id10=""/>
89 <properties id10=""/>
90 <properties id10=""/>
91 <properties id10=""/>
92 </parents>
93 </contains>
94 <contains id1="">
95 <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="DIVORCE" id9="">
96 <individual_A SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
97 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
98 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
99 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
100 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
101 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
102 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
103 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
104 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
105 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
106 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
107 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
108 <properties id10=""/>
109 <properties id10=""/>
110 <properties id10=""/>
111 <properties id10=""/>
112 <properties id10=""/>
113 <properties id10=""/>
114 <properties id10=""/>
115 <properties id10=""/>
116 <properties id10=""/>
117 </parents>
118 </contains>
119</TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/8_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/8_1.xmi
new file mode 100644
index 00000000..a27739a2
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/8_1.xmi
@@ -0,0 +1,118 @@
1<?xml version="1.0" encoding="ASCII"?>
2<TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../case.study.pledge.model/model/TaxationWithRoot.ecore">
3 <contains id1="">
4 <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" separation_cause="SEPARATION_DE_FAIT" id9="">
5 <individual_A SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
6 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
7 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
8 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
9 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
10 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
11 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
12 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
13 <properties id10=""/>
14 <properties id10=""/>
15 <properties id10=""/>
16 <properties id10=""/>
17 <properties id10=""/>
18 <properties id10=""/>
19 <properties id10=""/>
20 <properties id10=""/>
21 <properties id10=""/>
22 <properties id10=""/>
23 <properties id10=""/>
24 <properties id10=""/>
25 </parents>
26 </contains>
27 <contains id1="">
28 <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="SEPARATION_BY_COURT" id9="">
29 <individual_A SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
30 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
31 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
32 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
33 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
34 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
35 <properties id10=""/>
36 <properties id10=""/>
37 <properties id10=""/>
38 <properties id10=""/>
39 <properties id10=""/>
40 <properties id10=""/>
41 <properties id10=""/>
42 <properties id10=""/>
43 </parents>
44 </contains>
45 <contains id1="">
46 <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" separation_cause="DIVORCE" id9="">
47 <individual_A SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
48 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
49 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
50 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
51 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
52 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
53 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
54 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
55 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
56 <properties id10=""/>
57 <properties id10=""/>
58 <properties id10=""/>
59 <properties id10=""/>
60 <properties id10=""/>
61 <properties id10=""/>
62 <properties id10=""/>
63 <properties id10=""/>
64 <properties id10=""/>
65 <properties id10=""/>
66 <properties id10=""/>
67 <properties id10=""/>
68 <properties id10=""/>
69 <properties id10=""/>
70 </parents>
71 </contains>
72 <contains id1="">
73 <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" separation_cause="DIVORCE" id9="">
74 <individual_A SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
75 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
76 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
77 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
78 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
79 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
80 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
81 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
82 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
83 <properties id10=""/>
84 <properties id10=""/>
85 <properties id10=""/>
86 <properties id10=""/>
87 </parents>
88 </contains>
89 <contains id1="">
90 <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="DIVORCE" id9="">
91 <individual_A SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
92 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
93 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
94 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
95 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
96 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
97 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
98 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
99 <properties id10=""/>
100 <properties id10=""/>
101 <properties id10=""/>
102 <properties id10=""/>
103 <properties id10=""/>
104 <properties id10=""/>
105 <properties id10=""/>
106 <properties id10=""/>
107 <properties id10=""/>
108 <properties id10=""/>
109 <properties id10=""/>
110 <properties id10=""/>
111 <properties id10=""/>
112 <properties id10=""/>
113 <properties id10=""/>
114 <properties id10=""/>
115 <properties id10=""/>
116 </parents>
117 </contains>
118</TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/9_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/9_1.xmi
new file mode 100644
index 00000000..f1fdd254
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/Taxation/9_1.xmi
@@ -0,0 +1,118 @@
1<?xml version="1.0" encoding="ASCII"?>
2<TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../case.study.pledge.model/model/TaxationWithRoot.ecore">
3 <contains id1="">
4 <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="DIVORCE" id9="">
5 <individual_A SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
6 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
7 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
8 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
9 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
10 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
11 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
12 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
13 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
14 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
15 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
16 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
17 <properties id10=""/>
18 <properties id10=""/>
19 <properties id10=""/>
20 <properties id10=""/>
21 <properties id10=""/>
22 <properties id10=""/>
23 <properties id10=""/>
24 </parents>
25 </contains>
26 <contains id1="">
27 <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" id9="">
28 <individual_A SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
29 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
30 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
31 <individual_B SSNo="" birth_year="1918" birth_month="1" birth_day="1"/>
32 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
33 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
34 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
35 <properties id10=""/>
36 <properties id10=""/>
37 <properties id10=""/>
38 <properties id10=""/>
39 <properties id10=""/>
40 <properties id10=""/>
41 <properties id10=""/>
42 <properties id10=""/>
43 <properties id10=""/>
44 <properties id10=""/>
45 </parents>
46 </contains>
47 <contains id1="">
48 <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="DIVORCE" id9="">
49 <individual_A SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
50 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
51 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
52 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
53 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
54 <properties id10=""/>
55 <properties id10=""/>
56 <properties id10=""/>
57 <properties id10=""/>
58 <properties id10=""/>
59 <properties id10=""/>
60 <properties id10=""/>
61 <properties id10=""/>
62 <properties id10=""/>
63 </parents>
64 </contains>
65 <contains id1="">
66 <parents xsi:type="TaxCardWithRoot:Marriage_Record" start_year="1950" end_year="1951" separation_cause="SEPARATION_BY_COURT" id9="">
67 <individual_A SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
68 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
69 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
70 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
71 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
72 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
73 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
74 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
75 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
76 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
77 <individual_B SSNo="" birth_year="1918" disability_type="A" birth_month="1" birth_day="1"/>
78 <individual_B SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
79 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
80 <properties id10=""/>
81 <properties id10=""/>
82 <properties id10=""/>
83 <properties id10=""/>
84 <properties id10=""/>
85 <properties id10=""/>
86 <properties id10=""/>
87 <properties id10=""/>
88 <properties id10=""/>
89 <properties id10=""/>
90 <properties id10=""/>
91 <properties id10=""/>
92 <properties id10=""/>
93 <properties id10=""/>
94 </parents>
95 </contains>
96 <contains id1="">
97 <parents xsi:type="TaxCardWithRoot:Partnership_Record" start_year="1950" end_year="1951" separation_cause="DIVORCE" id9="">
98 <individual_A SSNo="" birth_year="1918" disability_type="D" birth_month="1" birth_day="1"/>
99 <individual_B SSNo="" birth_year="1918" disability_type="E" birth_month="1" birth_day="1"/>
100 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
101 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
102 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
103 <individual_B SSNo="" birth_year="1918" disability_type="NONE" birth_month="1" birth_day="1"/>
104 <individual_B SSNo="" birth_year="1918" disability_type="OTHER" birth_month="1" birth_day="1"/>
105 <individual_B SSNo="" birth_year="1918" disability_type="B" birth_month="1" birth_day="1"/>
106 <individual_B SSNo="" birth_year="1918" disability_type="C" birth_month="1" birth_day="1"/>
107 <properties id10=""/>
108 <properties id10=""/>
109 <properties id10=""/>
110 <properties id10=""/>
111 <properties id10=""/>
112 <properties id10=""/>
113 <properties id10=""/>
114 <properties id10=""/>
115 <properties id10=""/>
116 </parents>
117 </contains>
118</TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/10_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/10_1.xmi
new file mode 100644
index 00000000..d59f3d80
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/10_1.xmi
@@ -0,0 +1,105 @@
1<?xml version="1.0" encoding="ASCII"?>
2<TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../case.study.pledge.model/model/TaxationWithRoot.ecore">
3 <contains id1="">
4 <parents xsi:type="TaxCardWithRoot:Partnership_Record" id9="">
5 <individual_A SSNo="" disability_type="NONE"/>
6 <individual_B SSNo="" disability_type="E"/>
7 <individual_B SSNo="" disability_type="D"/>
8 <individual_B SSNo="" disability_type="C"/>
9 <individual_B SSNo="" disability_type="OTHER"/>
10 <individual_B SSNo="" disability_type="NONE"/>
11 <individual_B SSNo="" disability_type="B"/>
12 <individual_B SSNo="" disability_type="E"/>
13 <individual_B SSNo="" disability_type="NONE"/>
14 <individual_B SSNo="" disability_type="C"/>
15 <individual_B SSNo="" disability_type="A"/>
16 <individual_B SSNo="" disability_type="A"/>
17 <individual_B SSNo="" disability_type="OTHER"/>
18 <individual_B SSNo="" disability_type="OTHER"/>
19 <individual_B SSNo="" disability_type="B"/>
20 <individual_B SSNo="" disability_type="A"/>
21 <individual_B SSNo=""/>
22 <individual_B SSNo="" disability_type="C"/>
23 <individual_B SSNo="" disability_type="B"/>
24 <individual_B SSNo=""/>
25 <individual_B SSNo="" disability_type="E"/>
26 <individual_B SSNo="" disability_type="NONE"/>
27 <individual_B SSNo="" disability_type="E"/>
28 <individual_B SSNo="" disability_type="NONE"/>
29 <individual_B SSNo="" disability_type="B"/>
30 <individual_B SSNo="" disability_type="C"/>
31 <individual_B SSNo="" disability_type="E"/>
32 <individual_B SSNo="" disability_type="C"/>
33 <individual_B SSNo="" disability_type="A"/>
34 <individual_B SSNo="" disability_type="D"/>
35 <individual_B SSNo="" disability_type="A"/>
36 <individual_B SSNo="" disability_type="C"/>
37 <individual_B SSNo="" disability_type="A"/>
38 <individual_B SSNo="" disability_type="E"/>
39 <individual_B SSNo="" disability_type="A"/>
40 <individual_B SSNo="" disability_type="D"/>
41 <individual_B SSNo="" disability_type="E"/>
42 <individual_B SSNo="" disability_type="A"/>
43 <individual_B SSNo="" disability_type="E"/>
44 <individual_B SSNo="" disability_type="C"/>
45 <individual_B SSNo="" disability_type="E"/>
46 <individual_B SSNo=""/>
47 <individual_B SSNo="" disability_type="OTHER"/>
48 <individual_B SSNo="" disability_type="NONE"/>
49 <individual_B SSNo="" disability_type="D"/>
50 <individual_B SSNo="" disability_type="D"/>
51 <individual_B SSNo=""/>
52 <properties id10=""/>
53 <properties id10=""/>
54 <properties id10=""/>
55 <properties id10=""/>
56 <properties id10=""/>
57 <properties id10=""/>
58 <properties id10=""/>
59 <properties id10=""/>
60 <properties id10=""/>
61 <properties id10=""/>
62 <properties id10=""/>
63 <properties id10=""/>
64 <properties id10=""/>
65 <properties id10=""/>
66 <properties id10=""/>
67 <properties id10=""/>
68 <properties id10=""/>
69 <properties id10=""/>
70 <properties id10=""/>
71 <properties id10=""/>
72 <properties id10=""/>
73 <properties id10=""/>
74 <properties id10=""/>
75 <properties id10=""/>
76 <properties id10=""/>
77 <properties id10=""/>
78 <properties id10=""/>
79 <properties id10=""/>
80 <properties id10=""/>
81 <properties id10=""/>
82 <properties id10=""/>
83 <properties id10=""/>
84 <properties id10=""/>
85 <properties id10=""/>
86 <properties id10=""/>
87 <properties id10=""/>
88 <properties id10=""/>
89 <properties id10=""/>
90 <properties id10=""/>
91 <properties id10=""/>
92 <properties id10=""/>
93 <properties id10=""/>
94 <properties id10=""/>
95 <properties id10=""/>
96 <properties id10=""/>
97 <properties id10=""/>
98 <properties id10=""/>
99 <properties id10=""/>
100 <properties id10=""/>
101 <properties id10=""/>
102 <properties id10=""/>
103 </parents>
104 </contains>
105</TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/1_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/1_1.xmi
new file mode 100644
index 00000000..052c7f8f
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/1_1.xmi
@@ -0,0 +1,105 @@
1<?xml version="1.0" encoding="ASCII"?>
2<TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../case.study.pledge.model/model/TaxationWithRoot.ecore">
3 <contains id1="">
4 <parents xsi:type="TaxCardWithRoot:Partnership_Record" separation_cause="SEPARATION_BY_COURT" id9="">
5 <individual_A SSNo="" disability_type="C"/>
6 <individual_B SSNo="" disability_type="B"/>
7 <individual_B SSNo="" disability_type="E"/>
8 <individual_B SSNo="" disability_type="NONE"/>
9 <individual_B SSNo="" disability_type="E"/>
10 <individual_B SSNo="" disability_type="OTHER"/>
11 <individual_B SSNo="" disability_type="D"/>
12 <individual_B SSNo="" disability_type="B"/>
13 <individual_B SSNo="" disability_type="E"/>
14 <individual_B SSNo="" disability_type="B"/>
15 <individual_B SSNo="" disability_type="D"/>
16 <individual_B SSNo="" disability_type="D"/>
17 <individual_B SSNo=""/>
18 <individual_B SSNo="" disability_type="B"/>
19 <individual_B SSNo="" disability_type="NONE"/>
20 <individual_B SSNo="" disability_type="A"/>
21 <individual_B SSNo="" disability_type="B"/>
22 <individual_B SSNo="" disability_type="OTHER"/>
23 <individual_B SSNo="" disability_type="C"/>
24 <individual_B SSNo=""/>
25 <individual_B SSNo="" disability_type="C"/>
26 <individual_B SSNo="" disability_type="B"/>
27 <individual_B SSNo=""/>
28 <individual_B SSNo="" disability_type="D"/>
29 <individual_B SSNo="" disability_type="B"/>
30 <individual_B SSNo="" disability_type="OTHER"/>
31 <individual_B SSNo="" disability_type="NONE"/>
32 <individual_B SSNo="" disability_type="OTHER"/>
33 <individual_B SSNo="" disability_type="OTHER"/>
34 <individual_B SSNo="" disability_type="NONE"/>
35 <individual_B SSNo="" disability_type="A"/>
36 <individual_B SSNo="" disability_type="E"/>
37 <individual_B SSNo="" disability_type="C"/>
38 <individual_B SSNo="" disability_type="D"/>
39 <individual_B SSNo=""/>
40 <individual_B SSNo="" disability_type="E"/>
41 <individual_B SSNo="" disability_type="C"/>
42 <individual_B SSNo="" disability_type="C"/>
43 <individual_B SSNo="" disability_type="A"/>
44 <individual_B SSNo="" disability_type="E"/>
45 <individual_B SSNo="" disability_type="C"/>
46 <individual_B SSNo="" disability_type="E"/>
47 <individual_B SSNo="" disability_type="OTHER"/>
48 <individual_B SSNo=""/>
49 <individual_B SSNo="" disability_type="B"/>
50 <individual_B SSNo="" disability_type="C"/>
51 <individual_B SSNo="" disability_type="B"/>
52 <individual_B SSNo="" disability_type="OTHER"/>
53 <individual_B SSNo=""/>
54 <individual_B SSNo=""/>
55 <individual_B SSNo="" disability_type="B"/>
56 <individual_B SSNo="" disability_type="NONE"/>
57 <individual_B SSNo="" disability_type="A"/>
58 <properties id10=""/>
59 <properties id10=""/>
60 <properties id10=""/>
61 <properties id10=""/>
62 <properties id10=""/>
63 <properties id10=""/>
64 <properties id10=""/>
65 <properties id10=""/>
66 <properties id10=""/>
67 <properties id10=""/>
68 <properties id10=""/>
69 <properties id10=""/>
70 <properties id10=""/>
71 <properties id10=""/>
72 <properties id10=""/>
73 <properties id10=""/>
74 <properties id10=""/>
75 <properties id10=""/>
76 <properties id10=""/>
77 <properties id10=""/>
78 <properties id10=""/>
79 <properties id10=""/>
80 <properties id10=""/>
81 <properties id10=""/>
82 <properties id10=""/>
83 <properties id10=""/>
84 <properties id10=""/>
85 <properties id10=""/>
86 <properties id10=""/>
87 <properties id10=""/>
88 <properties id10=""/>
89 <properties id10=""/>
90 <properties id10=""/>
91 <properties id10=""/>
92 <properties id10=""/>
93 <properties id10=""/>
94 <properties id10=""/>
95 <properties id10=""/>
96 <properties id10=""/>
97 <properties id10=""/>
98 <properties id10=""/>
99 <properties id10=""/>
100 <properties id10=""/>
101 <properties id10=""/>
102 <properties id10=""/>
103 </parents>
104 </contains>
105</TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/2_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/2_1.xmi
new file mode 100644
index 00000000..f947f108
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/2_1.xmi
@@ -0,0 +1,105 @@
1<?xml version="1.0" encoding="ASCII"?>
2<TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../case.study.pledge.model/model/TaxationWithRoot.ecore">
3 <contains id1="">
4 <parents xsi:type="TaxCardWithRoot:Marriage_Record" separation_cause="DIVORCE" id9="">
5 <individual_A SSNo=""/>
6 <individual_B SSNo="" disability_type="D"/>
7 <individual_B SSNo="" disability_type="OTHER"/>
8 <individual_B SSNo="" disability_type="B"/>
9 <individual_B SSNo="" disability_type="OTHER"/>
10 <individual_B SSNo="" disability_type="OTHER"/>
11 <individual_B SSNo="" disability_type="E"/>
12 <individual_B SSNo="" disability_type="D"/>
13 <individual_B SSNo="" disability_type="OTHER"/>
14 <individual_B SSNo="" disability_type="D"/>
15 <individual_B SSNo="" disability_type="B"/>
16 <individual_B SSNo="" disability_type="E"/>
17 <individual_B SSNo="" disability_type="OTHER"/>
18 <individual_B SSNo="" disability_type="D"/>
19 <individual_B SSNo="" disability_type="E"/>
20 <individual_B SSNo=""/>
21 <individual_B SSNo="" disability_type="E"/>
22 <individual_B SSNo="" disability_type="D"/>
23 <individual_B SSNo="" disability_type="OTHER"/>
24 <individual_B SSNo="" disability_type="A"/>
25 <individual_B SSNo="" disability_type="OTHER"/>
26 <individual_B SSNo="" disability_type="C"/>
27 <individual_B SSNo=""/>
28 <individual_B SSNo="" disability_type="B"/>
29 <individual_B SSNo="" disability_type="E"/>
30 <individual_B SSNo="" disability_type="D"/>
31 <individual_B SSNo=""/>
32 <individual_B SSNo="" disability_type="D"/>
33 <individual_B SSNo="" disability_type="E"/>
34 <individual_B SSNo="" disability_type="OTHER"/>
35 <individual_B SSNo="" disability_type="C"/>
36 <individual_B SSNo="" disability_type="D"/>
37 <individual_B SSNo="" disability_type="B"/>
38 <individual_B SSNo=""/>
39 <individual_B SSNo="" disability_type="NONE"/>
40 <individual_B SSNo="" disability_type="C"/>
41 <individual_B SSNo="" disability_type="D"/>
42 <individual_B SSNo=""/>
43 <individual_B SSNo="" disability_type="NONE"/>
44 <individual_B SSNo="" disability_type="B"/>
45 <individual_B SSNo="" disability_type="NONE"/>
46 <individual_B SSNo="" disability_type="D"/>
47 <individual_B SSNo="" disability_type="E"/>
48 <individual_B SSNo="" disability_type="OTHER"/>
49 <individual_B SSNo="" disability_type="D"/>
50 <individual_B SSNo="" disability_type="B"/>
51 <individual_B SSNo=""/>
52 <individual_B SSNo="" disability_type="A"/>
53 <individual_B SSNo="" disability_type="OTHER"/>
54 <individual_B SSNo="" disability_type="C"/>
55 <properties id10=""/>
56 <properties id10=""/>
57 <properties id10=""/>
58 <properties id10=""/>
59 <properties id10=""/>
60 <properties id10=""/>
61 <properties id10=""/>
62 <properties id10=""/>
63 <properties id10=""/>
64 <properties id10=""/>
65 <properties id10=""/>
66 <properties id10=""/>
67 <properties id10=""/>
68 <properties id10=""/>
69 <properties id10=""/>
70 <properties id10=""/>
71 <properties id10=""/>
72 <properties id10=""/>
73 <properties id10=""/>
74 <properties id10=""/>
75 <properties id10=""/>
76 <properties id10=""/>
77 <properties id10=""/>
78 <properties id10=""/>
79 <properties id10=""/>
80 <properties id10=""/>
81 <properties id10=""/>
82 <properties id10=""/>
83 <properties id10=""/>
84 <properties id10=""/>
85 <properties id10=""/>
86 <properties id10=""/>
87 <properties id10=""/>
88 <properties id10=""/>
89 <properties id10=""/>
90 <properties id10=""/>
91 <properties id10=""/>
92 <properties id10=""/>
93 <properties id10=""/>
94 <properties id10=""/>
95 <properties id10=""/>
96 <properties id10=""/>
97 <properties id10=""/>
98 <properties id10=""/>
99 <properties id10=""/>
100 <properties id10=""/>
101 <properties id10=""/>
102 <properties id10=""/>
103 </parents>
104 </contains>
105</TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/3_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/3_1.xmi
new file mode 100644
index 00000000..30989757
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/3_1.xmi
@@ -0,0 +1,111 @@
1<?xml version="1.0" encoding="ASCII"?>
2<TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../case.study.pledge.model/model/TaxationWithRoot.ecore">
3 <contains id1="">
4 <parents xsi:type="TaxCardWithRoot:Partnership_Record" separation_cause="DIVORCE" id9="">
5 <individual_A SSNo="" disability_type="E" expenses=" "/>
6 <individual_B SSNo="" disability_type="OTHER" expenses=" "/>
7 <individual_B xsi:type="TaxCardWithRoot:Resident_Tax_Payer" SSNo="" expenses=" ">
8 <from_agent expense=""/>
9 <incomes xsi:type="TaxCardWithRoot:Local_Income">
10 <income_type xsi:type="TaxCardWithRoot:Rentals_and_Leases_Income" id8="" is_periodic="false"/>
11 <details id5=""/>
12 <details id5=""/>
13 <details id5=""/>
14 <details id5=""/>
15 <details id5=""/>
16 <details id5=""/>
17 <details id5=""/>
18 <details id5=""/>
19 <details id5=""/>
20 <details id5=""/>
21 <details id5=""/>
22 <details id5=""/>
23 </incomes>
24 <incomes xsi:type="TaxCardWithRoot:Foreign_Income">
25 <income_type xsi:type="TaxCardWithRoot:Agriculture_and_Forestry_Income" id8=""/>
26 <details id5=""/>
27 <details id5=""/>
28 <details id5=""/>
29 <details id5=""/>
30 <details id5=""/>
31 <details id5=""/>
32 <details id5=""/>
33 <details id5=""/>
34 <details id5=""/>
35 <details id5=""/>
36 <details id5=""/>
37 <details id5=""/>
38 <expenses xsi:type="TaxCardWithRoot:Professional_Expense" expense_purpose="CHILD_CARE" from_agent="//@contains.0/@parents/@individual_B.1/@from_agent" id4="" beneficiary=""/>
39 <expenses xsi:type="TaxCardWithRoot:Spousal_Expense_AC" expense_purpose="HOUSE_CARE" id4="" beneficiary=""/>
40 <expenses xsi:type="TaxCardWithRoot:Donation" expense_purpose="HOUSE_CARE" id4="" beneficiary="" beneficiary1=""/>
41 <expenses xsi:type="TaxCardWithRoot:Donation" expense_purpose="DEPENDENCE_CARE" id4="" beneficiary="" beneficiary1=""/>
42 <expenses xsi:type="TaxCardWithRoot:Special_Expense_DS" id4="" beneficiary=""/>
43 <expenses xsi:type="TaxCardWithRoot:Special_Expense_DS" expense_purpose="CHILD_CARE" id4=""/>
44 <expenses xsi:type="TaxCardWithRoot:Special_Expense_DS" expense_purpose="ALIMONY" id4="" beneficiary=""/>
45 <expenses xsi:type="TaxCardWithRoot:Travel_Expense_FD" expense_purpose="CHILD_CARE" id4="" beneficiary=""/>
46 <expenses xsi:type="TaxCardWithRoot:Travel_Expense_FD" expense_purpose="ALIMONY" id4="" beneficiary=""/>
47 <expenses xsi:type="TaxCardWithRoot:Interest_Expense" expense_purpose="HOUSE_CARE" id4="" beneficiary=""/>
48 <expenses xsi:type="TaxCardWithRoot:Interest_Expense" id4="" beneficiary=""/>
49 <expenses xsi:type="TaxCardWithRoot:Professional_Expense" expense_purpose="HOUSE_CARE" id4="" beneficiary=""/>
50 <expenses xsi:type="TaxCardWithRoot:Special_Expense_DS" expense_purpose="CHILD_CARE" id4="" beneficiary=""/>
51 </incomes>
52 <incomes xsi:type="TaxCardWithRoot:Foreign_Income">
53 <income_type xsi:type="TaxCardWithRoot:Agriculture_and_Forestry_Income" id8=""/>
54 <details id5=""/>
55 <details id5=""/>
56 <details id5=""/>
57 <details id5=""/>
58 <details id5=""/>
59 <details id5=""/>
60 <details id5=""/>
61 <details id5=""/>
62 <details id5=""/>
63 <details id5=""/>
64 <details id5=""/>
65 <details id5=""/>
66 <expenses xsi:type="TaxCardWithRoot:Interest_Expense" expense_purpose="HOUSE_CARE" id4="" beneficiary=""/>
67 <expenses xsi:type="TaxCardWithRoot:Interest_Expense" expense_purpose="ALIMONY" id4="" beneficiary=""/>
68 <expenses xsi:type="TaxCardWithRoot:Spousal_Expense_AC" expense_purpose="RECURRENT_DEPT" id4="" beneficiary=""/>
69 <expenses xsi:type="TaxCardWithRoot:Donation" id4="" beneficiary="" beneficiary1=""/>
70 <expenses xsi:type="TaxCardWithRoot:Miscellaneous_Expense_FO" expense_purpose="CHILD_CARE" id4="" beneficiary=""/>
71 <expenses xsi:type="TaxCardWithRoot:Loss_Carryforward" id4="" beneficiary=""/>
72 <expenses xsi:type="TaxCardWithRoot:Travel_Expense_FD" expense_purpose="RECURRENT_DEPT" id4=""/>
73 <expenses xsi:type="TaxCardWithRoot:Travel_Expense_FD" expense_purpose="DEPENDENCE_CARE" id4="" beneficiary=""/>
74 <expenses xsi:type="TaxCardWithRoot:Special_Expense_DS" id4="" beneficiary=""/>
75 </incomes>
76 <incomes xsi:type="TaxCardWithRoot:Foreign_Income">
77 <income_type xsi:type="TaxCardWithRoot:Agriculture_and_Forestry_Income" id8=""/>
78 <details id5=""/>
79 <details id5=""/>
80 <details id5=""/>
81 <details id5=""/>
82 <details id5=""/>
83 <details id5=""/>
84 <details id5=""/>
85 <details id5=""/>
86 <details id5=""/>
87 <details id5=""/>
88 <details id5=""/>
89 <details id5=""/>
90 <expenses expense_purpose="DEPENDENCE_CARE" id4="" beneficiary=""/>
91 <expenses xsi:type="TaxCardWithRoot:Spousal_Expense_AC" expense_purpose="HOUSE_CARE" id4="" beneficiary=""/>
92 <expenses xsi:type="TaxCardWithRoot:Travel_Expense_FD" expense_purpose="CHILD_CARE" id4=""/>
93 </incomes>
94 <from_law id=""/>
95 </individual_B>
96 <individual_B SSNo="" disability_type="A" expenses=" "/>
97 <individual_B SSNo="" expenses=" "/>
98 <individual_B SSNo="" disability_type="C" expenses=" "/>
99 <individual_B SSNo="" expenses=""/>
100 <individual_B SSNo="" disability_type="NONE" expenses=""/>
101 <individual_B SSNo="" disability_type="D"/>
102 <properties id10=""/>
103 <properties id10=""/>
104 <properties id10=""/>
105 <properties id10=""/>
106 <properties id10=""/>
107 <properties id10=""/>
108 <properties id10=""/>
109 </parents>
110 </contains>
111</TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/4_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/4_1.xmi
new file mode 100644
index 00000000..3a75ed9b
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/4_1.xmi
@@ -0,0 +1,105 @@
1<?xml version="1.0" encoding="ASCII"?>
2<TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../case.study.pledge.model/model/TaxationWithRoot.ecore">
3 <contains id1="">
4 <parents xsi:type="TaxCardWithRoot:Partnership_Record" separation_cause="SEPARATION_DE_FAIT" id9="">
5 <individual_A SSNo=""/>
6 <individual_B SSNo=""/>
7 <individual_B SSNo="" disability_type="A"/>
8 <individual_B SSNo="" disability_type="D"/>
9 <individual_B SSNo=""/>
10 <individual_B SSNo="" disability_type="NONE"/>
11 <individual_B SSNo=""/>
12 <individual_B SSNo="" disability_type="E"/>
13 <individual_B SSNo="" disability_type="E"/>
14 <individual_B SSNo="" disability_type="E"/>
15 <individual_B SSNo="" disability_type="E"/>
16 <individual_B SSNo="" disability_type="E"/>
17 <individual_B SSNo="" disability_type="B"/>
18 <individual_B SSNo="" disability_type="B"/>
19 <individual_B SSNo="" disability_type="A"/>
20 <individual_B SSNo=""/>
21 <individual_B SSNo="" disability_type="C"/>
22 <individual_B SSNo="" disability_type="E"/>
23 <individual_B SSNo="" disability_type="D"/>
24 <individual_B SSNo=""/>
25 <individual_B SSNo="" disability_type="E"/>
26 <individual_B SSNo="" disability_type="D"/>
27 <individual_B SSNo="" disability_type="E"/>
28 <individual_B SSNo="" disability_type="C"/>
29 <individual_B SSNo="" disability_type="NONE"/>
30 <individual_B SSNo="" disability_type="A"/>
31 <individual_B SSNo="" disability_type="OTHER"/>
32 <individual_B SSNo="" disability_type="A"/>
33 <individual_B SSNo=""/>
34 <individual_B SSNo="" disability_type="OTHER"/>
35 <individual_B SSNo="" disability_type="OTHER"/>
36 <individual_B SSNo="" disability_type="NONE"/>
37 <individual_B SSNo="" disability_type="D"/>
38 <individual_B SSNo="" disability_type="D"/>
39 <individual_B SSNo="" disability_type="NONE"/>
40 <individual_B SSNo="" disability_type="D"/>
41 <individual_B SSNo="" disability_type="C"/>
42 <individual_B SSNo="" disability_type="C"/>
43 <individual_B SSNo="" disability_type="C"/>
44 <individual_B SSNo=""/>
45 <individual_B SSNo="" disability_type="OTHER"/>
46 <individual_B SSNo="" disability_type="B"/>
47 <individual_B SSNo="" disability_type="E"/>
48 <properties id10=""/>
49 <properties id10=""/>
50 <properties id10=""/>
51 <properties id10=""/>
52 <properties id10=""/>
53 <properties id10=""/>
54 <properties id10=""/>
55 <properties id10=""/>
56 <properties id10=""/>
57 <properties id10=""/>
58 <properties id10=""/>
59 <properties id10=""/>
60 <properties id10=""/>
61 <properties id10=""/>
62 <properties id10=""/>
63 <properties id10=""/>
64 <properties id10=""/>
65 <properties id10=""/>
66 <properties id10=""/>
67 <properties id10=""/>
68 <properties id10=""/>
69 <properties id10=""/>
70 <properties id10=""/>
71 <properties id10=""/>
72 <properties id10=""/>
73 <properties id10=""/>
74 <properties id10=""/>
75 <properties id10=""/>
76 <properties id10=""/>
77 <properties id10=""/>
78 <properties id10=""/>
79 <properties id10=""/>
80 <properties id10=""/>
81 <properties id10=""/>
82 <properties id10=""/>
83 <properties id10=""/>
84 <properties id10=""/>
85 <properties id10=""/>
86 <properties id10=""/>
87 <properties id10=""/>
88 <properties id10=""/>
89 <properties id10=""/>
90 <properties id10=""/>
91 <properties id10=""/>
92 <properties id10=""/>
93 <properties id10=""/>
94 <properties id10=""/>
95 <properties id10=""/>
96 <properties id10=""/>
97 <properties id10=""/>
98 <properties id10=""/>
99 <properties id10=""/>
100 <properties id10=""/>
101 <properties id10=""/>
102 <properties id10=""/>
103 </parents>
104 </contains>
105</TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/5_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/5_1.xmi
new file mode 100644
index 00000000..f6fdaf85
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/5_1.xmi
@@ -0,0 +1,105 @@
1<?xml version="1.0" encoding="ASCII"?>
2<TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../case.study.pledge.model/model/TaxationWithRoot.ecore">
3 <contains id1="">
4 <parents xsi:type="TaxCardWithRoot:Marriage_Record" separation_cause="DIVORCE" id9="">
5 <individual_A SSNo="" disability_type="NONE"/>
6 <individual_B SSNo=""/>
7 <individual_B SSNo="" disability_type="NONE"/>
8 <individual_B SSNo="" disability_type="E"/>
9 <individual_B SSNo="" disability_type="OTHER"/>
10 <individual_B SSNo="" disability_type="NONE"/>
11 <individual_B SSNo="" disability_type="E"/>
12 <individual_B SSNo=""/>
13 <individual_B SSNo="" disability_type="OTHER"/>
14 <individual_B SSNo="" disability_type="OTHER"/>
15 <individual_B SSNo="" disability_type="NONE"/>
16 <individual_B SSNo="" disability_type="C"/>
17 <individual_B SSNo="" disability_type="C"/>
18 <individual_B SSNo="" disability_type="NONE"/>
19 <individual_B SSNo=""/>
20 <individual_B SSNo="" disability_type="C"/>
21 <individual_B SSNo="" disability_type="B"/>
22 <individual_B SSNo="" disability_type="B"/>
23 <individual_B SSNo="" disability_type="E"/>
24 <individual_B SSNo="" disability_type="A"/>
25 <individual_B SSNo="" disability_type="C"/>
26 <individual_B SSNo="" disability_type="A"/>
27 <individual_B SSNo="" disability_type="NONE"/>
28 <individual_B SSNo="" disability_type="B"/>
29 <individual_B SSNo="" disability_type="C"/>
30 <individual_B SSNo="" disability_type="B"/>
31 <individual_B SSNo="" disability_type="OTHER"/>
32 <individual_B SSNo="" disability_type="E"/>
33 <individual_B SSNo="" disability_type="NONE"/>
34 <individual_B SSNo="" disability_type="B"/>
35 <individual_B SSNo="" disability_type="OTHER"/>
36 <individual_B SSNo="" disability_type="A"/>
37 <individual_B SSNo="" disability_type="A"/>
38 <individual_B SSNo="" disability_type="D"/>
39 <individual_B SSNo="" disability_type="C"/>
40 <individual_B SSNo="" disability_type="D"/>
41 <individual_B SSNo="" disability_type="OTHER"/>
42 <individual_B SSNo="" disability_type="A"/>
43 <individual_B SSNo="" disability_type="B"/>
44 <individual_B SSNo="" disability_type="C"/>
45 <individual_B SSNo="" disability_type="A"/>
46 <individual_B SSNo="" disability_type="E"/>
47 <individual_B SSNo="" disability_type="D"/>
48 <individual_B SSNo=""/>
49 <individual_B SSNo="" disability_type="A"/>
50 <individual_B SSNo=""/>
51 <properties id10=""/>
52 <properties id10=""/>
53 <properties id10=""/>
54 <properties id10=""/>
55 <properties id10=""/>
56 <properties id10=""/>
57 <properties id10=""/>
58 <properties id10=""/>
59 <properties id10=""/>
60 <properties id10=""/>
61 <properties id10=""/>
62 <properties id10=""/>
63 <properties id10=""/>
64 <properties id10=""/>
65 <properties id10=""/>
66 <properties id10=""/>
67 <properties id10=""/>
68 <properties id10=""/>
69 <properties id10=""/>
70 <properties id10=""/>
71 <properties id10=""/>
72 <properties id10=""/>
73 <properties id10=""/>
74 <properties id10=""/>
75 <properties id10=""/>
76 <properties id10=""/>
77 <properties id10=""/>
78 <properties id10=""/>
79 <properties id10=""/>
80 <properties id10=""/>
81 <properties id10=""/>
82 <properties id10=""/>
83 <properties id10=""/>
84 <properties id10=""/>
85 <properties id10=""/>
86 <properties id10=""/>
87 <properties id10=""/>
88 <properties id10=""/>
89 <properties id10=""/>
90 <properties id10=""/>
91 <properties id10=""/>
92 <properties id10=""/>
93 <properties id10=""/>
94 <properties id10=""/>
95 <properties id10=""/>
96 <properties id10=""/>
97 <properties id10=""/>
98 <properties id10=""/>
99 <properties id10=""/>
100 <properties id10=""/>
101 <properties id10=""/>
102 <properties id10=""/>
103 </parents>
104 </contains>
105</TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/6_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/6_1.xmi
new file mode 100644
index 00000000..cf7f6a35
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/6_1.xmi
@@ -0,0 +1,105 @@
1<?xml version="1.0" encoding="ASCII"?>
2<TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../case.study.pledge.model/model/TaxationWithRoot.ecore">
3 <contains id1="">
4 <parents xsi:type="TaxCardWithRoot:Partnership_Record" separation_cause="SEPARATION_DE_FAIT" id9="">
5 <individual_A SSNo="" disability_type="C"/>
6 <individual_B SSNo="" disability_type="B"/>
7 <individual_B SSNo="" disability_type="OTHER"/>
8 <individual_B SSNo="" disability_type="C"/>
9 <individual_B SSNo="" disability_type="NONE"/>
10 <individual_B SSNo=""/>
11 <individual_B SSNo="" disability_type="E"/>
12 <individual_B SSNo="" disability_type="OTHER"/>
13 <individual_B SSNo="" disability_type="NONE"/>
14 <individual_B SSNo=""/>
15 <individual_B SSNo=""/>
16 <individual_B SSNo="" disability_type="E"/>
17 <individual_B SSNo="" disability_type="D"/>
18 <individual_B SSNo="" disability_type="E"/>
19 <individual_B SSNo="" disability_type="B"/>
20 <individual_B SSNo="" disability_type="NONE"/>
21 <individual_B SSNo=""/>
22 <individual_B SSNo="" disability_type="B"/>
23 <individual_B SSNo="" disability_type="NONE"/>
24 <individual_B SSNo=""/>
25 <individual_B SSNo="" disability_type="E"/>
26 <individual_B SSNo="" disability_type="B"/>
27 <individual_B SSNo="" disability_type="E"/>
28 <individual_B SSNo=""/>
29 <individual_B SSNo="" disability_type="NONE"/>
30 <individual_B SSNo="" disability_type="C"/>
31 <individual_B SSNo="" disability_type="OTHER"/>
32 <individual_B SSNo="" disability_type="A"/>
33 <individual_B SSNo="" disability_type="NONE"/>
34 <individual_B SSNo=""/>
35 <individual_B SSNo="" disability_type="OTHER"/>
36 <individual_B SSNo=""/>
37 <individual_B SSNo="" disability_type="A"/>
38 <individual_B SSNo="" disability_type="E"/>
39 <individual_B SSNo="" disability_type="C"/>
40 <individual_B SSNo="" disability_type="NONE"/>
41 <individual_B SSNo="" disability_type="A"/>
42 <individual_B SSNo="" disability_type="A"/>
43 <individual_B SSNo=""/>
44 <individual_B SSNo="" disability_type="B"/>
45 <individual_B SSNo="" disability_type="A"/>
46 <individual_B SSNo="" disability_type="NONE"/>
47 <individual_B SSNo="" disability_type="E"/>
48 <individual_B SSNo=""/>
49 <individual_B SSNo="" disability_type="E"/>
50 <individual_B SSNo="" disability_type="OTHER"/>
51 <individual_B SSNo="" disability_type="C"/>
52 <individual_B SSNo="" disability_type="NONE"/>
53 <individual_B SSNo="" disability_type="D"/>
54 <individual_B SSNo=""/>
55 <individual_B SSNo="" disability_type="OTHER"/>
56 <properties id10=""/>
57 <properties id10=""/>
58 <properties id10=""/>
59 <properties id10=""/>
60 <properties id10=""/>
61 <properties id10=""/>
62 <properties id10=""/>
63 <properties id10=""/>
64 <properties id10=""/>
65 <properties id10=""/>
66 <properties id10=""/>
67 <properties id10=""/>
68 <properties id10=""/>
69 <properties id10=""/>
70 <properties id10=""/>
71 <properties id10=""/>
72 <properties id10=""/>
73 <properties id10=""/>
74 <properties id10=""/>
75 <properties id10=""/>
76 <properties id10=""/>
77 <properties id10=""/>
78 <properties id10=""/>
79 <properties id10=""/>
80 <properties id10=""/>
81 <properties id10=""/>
82 <properties id10=""/>
83 <properties id10=""/>
84 <properties id10=""/>
85 <properties id10=""/>
86 <properties id10=""/>
87 <properties id10=""/>
88 <properties id10=""/>
89 <properties id10=""/>
90 <properties id10=""/>
91 <properties id10=""/>
92 <properties id10=""/>
93 <properties id10=""/>
94 <properties id10=""/>
95 <properties id10=""/>
96 <properties id10=""/>
97 <properties id10=""/>
98 <properties id10=""/>
99 <properties id10=""/>
100 <properties id10=""/>
101 <properties id10=""/>
102 <properties id10=""/>
103 </parents>
104 </contains>
105</TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/7_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/7_1.xmi
new file mode 100644
index 00000000..9f9b1389
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/7_1.xmi
@@ -0,0 +1,112 @@
1<?xml version="1.0" encoding="ASCII"?>
2<TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../case.study.pledge.model/model/TaxationWithRoot.ecore">
3 <contains id1="">
4 <parents xsi:type="TaxCardWithRoot:Partnership_Record" separation_cause="SEPARATION_DE_FAIT" id9="">
5 <individual_A SSNo="" disability_type="C" expenses=" "/>
6 <individual_B SSNo="" disability_type="NONE" expenses=" "/>
7 <individual_B xsi:type="TaxCardWithRoot:Non_Resident_Tax_Payer" SSNo="" disability_type="E" expenses="">
8 <from_agent expense=""/>
9 <incomes xsi:type="TaxCardWithRoot:Foreign_Income">
10 <income_type xsi:type="TaxCardWithRoot:Pensions_and_Annuities_Income" id8=""/>
11 <details id5=""/>
12 <details id5=""/>
13 <details id5=""/>
14 <details id5=""/>
15 <details id5=""/>
16 <details id5=""/>
17 <details id5=""/>
18 <details id5=""/>
19 <details id5=""/>
20 <details id5=""/>
21 <details id5=""/>
22 <details id5=""/>
23 <expenses xsi:type="TaxCardWithRoot:Miscellaneous_Expense_FO" expense_purpose="HOUSE_CARE" id4="" beneficiary=""/>
24 <expenses xsi:type="TaxCardWithRoot:Donation" expense_purpose="DEPENDENCE_CARE" dependent="" id4="" beneficiary="" beneficiary1=""/>
25 <expenses xsi:type="TaxCardWithRoot:Special_Expense_DS" expense_purpose="CHILD_CARE" dependent="" id4="" beneficiary=""/>
26 <expenses expense_purpose="HOUSE_CARE" id4="" beneficiary=""/>
27 <expenses xsi:type="TaxCardWithRoot:Travel_Expense_FD" expense_purpose="HOUSE_CARE" dependent="" id4="" beneficiary=""/>
28 <expenses xsi:type="TaxCardWithRoot:Loss_Carryforward" expense_purpose="RECURRENT_DEPT" dependent="" id4="" beneficiary=""/>
29 <expenses xsi:type="TaxCardWithRoot:Miscellaneous_Expense_FO" expense_purpose="DEPENDENCE_CARE" dependent="" id4="" beneficiary=""/>
30 <expenses xsi:type="TaxCardWithRoot:Travel_Expense_FD" expense_purpose="HOUSE_CARE" id4="" beneficiary=""/>
31 <expenses xsi:type="TaxCardWithRoot:Loss_Carryforward" expense_purpose="DEPENDENCE_CARE" id4="" beneficiary=""/>
32 <expenses xsi:type="TaxCardWithRoot:Special_Expense_DS" id4="" beneficiary=""/>
33 <expenses xsi:type="TaxCardWithRoot:Interest_Expense" expense_purpose="CHILD_CARE" id4="" beneficiary=""/>
34 </incomes>
35 <incomes xsi:type="TaxCardWithRoot:Foreign_Income">
36 <income_type xsi:type="TaxCardWithRoot:Employment_Income" id8=""/>
37 <details id5=""/>
38 <details id5=""/>
39 <details id5=""/>
40 <details id5=""/>
41 <details id5=""/>
42 <details id5=""/>
43 <details id5=""/>
44 <details id5=""/>
45 <details id5=""/>
46 <details id5=""/>
47 <details id5=""/>
48 <details id5=""/>
49 <expenses xsi:type="TaxCardWithRoot:Spousal_Expense_AC" expense_purpose="CHILD_CARE" id4="" beneficiary=""/>
50 <expenses xsi:type="TaxCardWithRoot:Donation" expense_purpose="RECURRENT_DEPT" id4="" beneficiary1=""/>
51 <expenses xsi:type="TaxCardWithRoot:Loss_Carryforward" expense_purpose="CHILD_CARE" id4="" beneficiary=""/>
52 <expenses expense_purpose="DEPENDENCE_CARE" dependent="" id4="" beneficiary=""/>
53 <expenses xsi:type="TaxCardWithRoot:Professional_Expense" expense_purpose="HOUSE_CARE" dependent="" id4="" beneficiary=""/>
54 <expenses xsi:type="TaxCardWithRoot:Interest_Expense" expense_purpose="RECURRENT_DEPT" dependent="" id4="" beneficiary=""/>
55 <expenses xsi:type="TaxCardWithRoot:Professional_Expense" expense_purpose="HOUSE_CARE" dependent="" id4="" beneficiary=""/>
56 <expenses xsi:type="TaxCardWithRoot:Professional_Expense" expense_purpose="ALIMONY" dependent="" id4="" beneficiary=""/>
57 <expenses xsi:type="TaxCardWithRoot:Miscellaneous_Expense_FO" expense_purpose="CHILD_CARE" from_agent="//@contains.0/@parents/@individual_B.1/@from_agent" id4="" beneficiary=""/>
58 <expenses xsi:type="TaxCardWithRoot:Loss_Carryforward" expense_purpose="CHILD_CARE" id4="" beneficiary=""/>
59 <expenses xsi:type="TaxCardWithRoot:Loss_Carryforward" expense_purpose="ALIMONY" id4="" beneficiary=""/>
60 <expenses xsi:type="TaxCardWithRoot:Donation" expense_purpose="DEPENDENCE_CARE" id4="" beneficiary="" beneficiary1=""/>
61 </incomes>
62 <incomes xsi:type="TaxCardWithRoot:Foreign_Income">
63 <income_type xsi:type="TaxCardWithRoot:Employment_Income" id8=""/>
64 <details id5=""/>
65 <details id5=""/>
66 <details id5=""/>
67 <details id5=""/>
68 <details id5=""/>
69 <details id5=""/>
70 <details id5=""/>
71 <details id5=""/>
72 <details id5=""/>
73 <details id5=""/>
74 <details id5=""/>
75 <details id5=""/>
76 <expenses xsi:type="TaxCardWithRoot:Professional_Expense" id4="" beneficiary=""/>
77 </incomes>
78 <incomes xsi:type="TaxCardWithRoot:Foreign_Income">
79 <income_type xsi:type="TaxCardWithRoot:Rentals_and_Leases_Income" id8="" is_periodic="false"/>
80 <details id5=""/>
81 <details id5=""/>
82 <details id5=""/>
83 <details id5=""/>
84 <details id5=""/>
85 <details id5=""/>
86 <details id5=""/>
87 <details id5=""/>
88 <details id5=""/>
89 <details id5=""/>
90 <details id5=""/>
91 <details id5=""/>
92 <expenses xsi:type="TaxCardWithRoot:Special_Expense_DS" id4="" beneficiary=""/>
93 </incomes>
94 <from_law id=""/>
95 </individual_B>
96 <individual_B SSNo="" expenses=""/>
97 <individual_B SSNo="" disability_type="D" expenses=" "/>
98 <individual_B SSNo="" disability_type="OTHER" expenses=" "/>
99 <individual_B SSNo="" disability_type="C" expenses=" "/>
100 <individual_B SSNo="" expenses=" "/>
101 <individual_B SSNo="" disability_type="B"/>
102 <individual_B SSNo="" disability_type="B" expenses=" "/>
103 <individual_B SSNo="" disability_type="A" expenses=" "/>
104 <properties id10=""/>
105 <properties id10=""/>
106 <properties id10=""/>
107 <properties id10=""/>
108 <properties id10=""/>
109 </parents>
110 <children SSNo="" disability_type="B" expenses="" dependent_type="NOT_OWN_CHILD" expense=" "/>
111 </contains>
112</TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/8_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/8_1.xmi
new file mode 100644
index 00000000..449a1402
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/8_1.xmi
@@ -0,0 +1,105 @@
1<?xml version="1.0" encoding="ASCII"?>
2<TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../case.study.pledge.model/model/TaxationWithRoot.ecore">
3 <contains id1="">
4 <parents xsi:type="TaxCardWithRoot:Marriage_Record" id9="">
5 <individual_A SSNo="" disability_type="D"/>
6 <individual_B SSNo="" disability_type="E"/>
7 <individual_B SSNo="" disability_type="E"/>
8 <individual_B SSNo="" disability_type="A"/>
9 <individual_B SSNo="" disability_type="B"/>
10 <individual_B SSNo="" disability_type="A"/>
11 <individual_B SSNo="" disability_type="A"/>
12 <individual_B SSNo=""/>
13 <individual_B SSNo="" disability_type="A"/>
14 <individual_B SSNo="" disability_type="A"/>
15 <individual_B SSNo="" disability_type="OTHER"/>
16 <individual_B SSNo="" disability_type="OTHER"/>
17 <individual_B SSNo="" disability_type="NONE"/>
18 <individual_B SSNo="" disability_type="OTHER"/>
19 <individual_B SSNo=""/>
20 <individual_B SSNo="" disability_type="OTHER"/>
21 <individual_B SSNo="" disability_type="NONE"/>
22 <individual_B SSNo="" disability_type="B"/>
23 <individual_B SSNo="" disability_type="E"/>
24 <individual_B SSNo="" disability_type="D"/>
25 <individual_B SSNo="" disability_type="E"/>
26 <individual_B SSNo="" disability_type="E"/>
27 <individual_B SSNo="" disability_type="C"/>
28 <individual_B SSNo="" disability_type="OTHER"/>
29 <individual_B SSNo="" disability_type="B"/>
30 <individual_B SSNo=""/>
31 <individual_B SSNo="" disability_type="NONE"/>
32 <individual_B SSNo=""/>
33 <individual_B SSNo="" disability_type="A"/>
34 <individual_B SSNo="" disability_type="E"/>
35 <individual_B SSNo="" disability_type="D"/>
36 <individual_B SSNo="" disability_type="E"/>
37 <individual_B SSNo="" disability_type="A"/>
38 <individual_B SSNo="" disability_type="A"/>
39 <individual_B SSNo="" disability_type="C"/>
40 <individual_B SSNo="" disability_type="OTHER"/>
41 <individual_B SSNo=""/>
42 <individual_B SSNo="" disability_type="D"/>
43 <individual_B SSNo="" disability_type="E"/>
44 <individual_B SSNo="" disability_type="OTHER"/>
45 <individual_B SSNo="" disability_type="C"/>
46 <individual_B SSNo="" disability_type="OTHER"/>
47 <individual_B SSNo="" disability_type="D"/>
48 <individual_B SSNo="" disability_type="OTHER"/>
49 <individual_B SSNo="" disability_type="OTHER"/>
50 <properties id10=""/>
51 <properties id10=""/>
52 <properties id10=""/>
53 <properties id10=""/>
54 <properties id10=""/>
55 <properties id10=""/>
56 <properties id10=""/>
57 <properties id10=""/>
58 <properties id10=""/>
59 <properties id10=""/>
60 <properties id10=""/>
61 <properties id10=""/>
62 <properties id10=""/>
63 <properties id10=""/>
64 <properties id10=""/>
65 <properties id10=""/>
66 <properties id10=""/>
67 <properties id10=""/>
68 <properties id10=""/>
69 <properties id10=""/>
70 <properties id10=""/>
71 <properties id10=""/>
72 <properties id10=""/>
73 <properties id10=""/>
74 <properties id10=""/>
75 <properties id10=""/>
76 <properties id10=""/>
77 <properties id10=""/>
78 <properties id10=""/>
79 <properties id10=""/>
80 <properties id10=""/>
81 <properties id10=""/>
82 <properties id10=""/>
83 <properties id10=""/>
84 <properties id10=""/>
85 <properties id10=""/>
86 <properties id10=""/>
87 <properties id10=""/>
88 <properties id10=""/>
89 <properties id10=""/>
90 <properties id10=""/>
91 <properties id10=""/>
92 <properties id10=""/>
93 <properties id10=""/>
94 <properties id10=""/>
95 <properties id10=""/>
96 <properties id10=""/>
97 <properties id10=""/>
98 <properties id10=""/>
99 <properties id10=""/>
100 <properties id10=""/>
101 <properties id10=""/>
102 <properties id10=""/>
103 </parents>
104 </contains>
105</TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/9_1.xmi b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/9_1.xmi
new file mode 100644
index 00000000..aabb97a2
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/TaxationNoNum/9_1.xmi
@@ -0,0 +1,105 @@
1<?xml version="1.0" encoding="ASCII"?>
2<TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../case.study.pledge.model/model/TaxationWithRoot.ecore">
3 <contains id1="">
4 <parents xsi:type="TaxCardWithRoot:Partnership_Record" id9="">
5 <individual_A SSNo="" disability_type="A"/>
6 <individual_B SSNo="" disability_type="B"/>
7 <individual_B SSNo=""/>
8 <individual_B SSNo="" disability_type="E"/>
9 <individual_B SSNo="" disability_type="NONE"/>
10 <individual_B SSNo="" disability_type="A"/>
11 <individual_B SSNo="" disability_type="C"/>
12 <individual_B SSNo="" disability_type="B"/>
13 <individual_B SSNo="" disability_type="B"/>
14 <individual_B SSNo="" disability_type="NONE"/>
15 <individual_B SSNo="" disability_type="OTHER"/>
16 <individual_B SSNo="" disability_type="OTHER"/>
17 <individual_B SSNo=""/>
18 <individual_B SSNo="" disability_type="NONE"/>
19 <individual_B SSNo="" disability_type="NONE"/>
20 <individual_B SSNo="" disability_type="A"/>
21 <individual_B SSNo="" disability_type="NONE"/>
22 <individual_B SSNo="" disability_type="NONE"/>
23 <individual_B SSNo="" disability_type="OTHER"/>
24 <individual_B SSNo="" disability_type="D"/>
25 <individual_B SSNo="" disability_type="B"/>
26 <individual_B SSNo="" disability_type="D"/>
27 <individual_B SSNo="" disability_type="NONE"/>
28 <individual_B SSNo="" disability_type="C"/>
29 <individual_B SSNo="" disability_type="B"/>
30 <individual_B SSNo="" disability_type="OTHER"/>
31 <individual_B SSNo="" disability_type="C"/>
32 <individual_B SSNo="" disability_type="OTHER"/>
33 <individual_B SSNo="" disability_type="NONE"/>
34 <individual_B SSNo=""/>
35 <individual_B SSNo="" disability_type="D"/>
36 <individual_B SSNo="" disability_type="NONE"/>
37 <individual_B SSNo="" disability_type="B"/>
38 <individual_B SSNo="" disability_type="C"/>
39 <individual_B SSNo=""/>
40 <individual_B SSNo="" disability_type="OTHER"/>
41 <individual_B SSNo=""/>
42 <individual_B SSNo="" disability_type="NONE"/>
43 <individual_B SSNo="" disability_type="E"/>
44 <individual_B SSNo="" disability_type="NONE"/>
45 <individual_B SSNo="" disability_type="A"/>
46 <individual_B SSNo="" disability_type="E"/>
47 <individual_B SSNo="" disability_type="A"/>
48 <individual_B SSNo="" disability_type="A"/>
49 <individual_B SSNo="" disability_type="C"/>
50 <individual_B SSNo="" disability_type="OTHER"/>
51 <individual_B SSNo="" disability_type="E"/>
52 <individual_B SSNo="" disability_type="OTHER"/>
53 <individual_B SSNo="" disability_type="OTHER"/>
54 <individual_B SSNo="" disability_type="B"/>
55 <individual_B SSNo="" disability_type="A"/>
56 <individual_B SSNo=""/>
57 <individual_B SSNo="" disability_type="A"/>
58 <individual_B SSNo="" disability_type="E"/>
59 <individual_B SSNo="" disability_type="B"/>
60 <individual_B SSNo="" disability_type="D"/>
61 <properties id10=""/>
62 <properties id10=""/>
63 <properties id10=""/>
64 <properties id10=""/>
65 <properties id10=""/>
66 <properties id10=""/>
67 <properties id10=""/>
68 <properties id10=""/>
69 <properties id10=""/>
70 <properties id10=""/>
71 <properties id10=""/>
72 <properties id10=""/>
73 <properties id10=""/>
74 <properties id10=""/>
75 <properties id10=""/>
76 <properties id10=""/>
77 <properties id10=""/>
78 <properties id10=""/>
79 <properties id10=""/>
80 <properties id10=""/>
81 <properties id10=""/>
82 <properties id10=""/>
83 <properties id10=""/>
84 <properties id10=""/>
85 <properties id10=""/>
86 <properties id10=""/>
87 <properties id10=""/>
88 <properties id10=""/>
89 <properties id10=""/>
90 <properties id10=""/>
91 <properties id10=""/>
92 <properties id10=""/>
93 <properties id10=""/>
94 <properties id10=""/>
95 <properties id10=""/>
96 <properties id10=""/>
97 <properties id10=""/>
98 <properties id10=""/>
99 <properties id10=""/>
100 <properties id10=""/>
101 <properties id10=""/>
102 <properties id10=""/>
103 </parents>
104 </contains>
105</TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/diversity.csv b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/diversity.csv
new file mode 100644
index 00000000..a44968ad
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/models20.diversity-calculator/inputs/diversity.csv
@@ -0,0 +1,60 @@
1FamilyTree,inputs/FamilyTree/1_1.xmi,0.992
2FamilyTree,inputs/FamilyTree/2_1.xmi,0.959349593495935
3FamilyTree,inputs/FamilyTree/3_1.xmi,0.9508196721311475
4FamilyTree,inputs/FamilyTree/4_1.xmi,0.952
5FamilyTree,inputs/FamilyTree/5_1.xmi,0.967479674796748
6FamilyTree,inputs/FamilyTree/6_1.xmi,0.9426229508196722
7FamilyTree,inputs/FamilyTree/7_1.xmi,0.9586776859504132
8FamilyTree,inputs/FamilyTree/8_1.xmi,0.959349593495935
9FamilyTree,inputs/FamilyTree/9_1.xmi,0.991869918699187
10FamilyTree,inputs/FamilyTree/10_1.xmi,0.992
11Satellite,inputs/Satellite/1_1.xmi,0.7818181818181819
12Satellite,inputs/Satellite/2_1.xmi,0.8348623853211009
13Satellite,inputs/Satellite/3_1.xmi,0.7727272727272727
14Satellite,inputs/Satellite/4_1.xmi,0.7636363636363637
15Satellite,inputs/Satellite/5_1.xmi,0.8165137614678899
16Satellite,inputs/Satellite/6_1.xmi,0.7064220183486238
17Satellite,inputs/Satellite/7_1.xmi,0.8165137614678899
18Satellite,inputs/Satellite/8_1.xmi,0.7247706422018348
19Satellite,inputs/Satellite/9_1.xmi,0.7927927927927928
20Satellite,inputs/Satellite/10_1.xmi,0.7168141592920354
21Taxation,inputs/Taxation/1_1.xmi,0.6795580110497238
22Taxation,inputs/Taxation/2_1.xmi,0.6978021978021978
23Taxation,inputs/Taxation/3_1.xmi,0.6795580110497238
24Taxation,inputs/Taxation/4_1.xmi,0.6574585635359116
25Taxation,inputs/Taxation/5_1.xmi,0.6629834254143646
26Taxation,inputs/Taxation/6_1.xmi,0.7431693989071039
27Taxation,inputs/Taxation/7_1.xmi,0.6978021978021978
28Taxation,inputs/Taxation/8_1.xmi,0.6574585635359116
29Taxation,inputs/Taxation/9_1.xmi,0.6795580110497238
30Taxation,inputs/Taxation/10_1.xmi,0.6906077348066298
31FamilyTreeNoNum,inputs/FamilyTreeNoNum/1_1.xmi,0.7788461538461539
32FamilyTreeNoNum,inputs/FamilyTreeNoNum/2_1.xmi,0.7980769230769231
33FamilyTreeNoNum,inputs/FamilyTreeNoNum/3_1.xmi,0.8076923076923077
34FamilyTreeNoNum,inputs/FamilyTreeNoNum/4_1.xmi,0.7980769230769231
35FamilyTreeNoNum,inputs/FamilyTreeNoNum/5_1.xmi,0.8173076923076923
36FamilyTreeNoNum,inputs/FamilyTreeNoNum/6_1.xmi,0.8173076923076923
37FamilyTreeNoNum,inputs/FamilyTreeNoNum/7_1.xmi,0.8173076923076923
38FamilyTreeNoNum,inputs/FamilyTreeNoNum/8_1.xmi,0.7788461538461539
39FamilyTreeNoNum,inputs/FamilyTreeNoNum/9_1.xmi,0.7884615384615384
40FamilyTreeNoNum,inputs/FamilyTreeNoNum/10_1.xmi,0.8076923076923077
41SatelliteNoNum,inputs/SatelliteNoNum/1_1.xmi,0.7614678899082569
42SatelliteNoNum,inputs/SatelliteNoNum/2_1.xmi,0.8380952380952381
43SatelliteNoNum,inputs/SatelliteNoNum/3_1.xmi,0.8055555555555556
44SatelliteNoNum,inputs/SatelliteNoNum/4_1.xmi,0.7818181818181819
45SatelliteNoNum,inputs/SatelliteNoNum/5_1.xmi,0.6929824561403509
46SatelliteNoNum,inputs/SatelliteNoNum/6_1.xmi,0.7870370370370371
47SatelliteNoNum,inputs/SatelliteNoNum/7_1.xmi,0.7523809523809524
48SatelliteNoNum,inputs/SatelliteNoNum/8_1.xmi,0.7777777777777778
49SatelliteNoNum,inputs/SatelliteNoNum/9_1.xmi,0.7363636363636363
50SatelliteNoNum,inputs/SatelliteNoNum/10_1.xmi,0.8055555555555556
51TaxationNoNum,inputs/TaxationNoNum/1_1.xmi,0.4883720930232558
52TaxationNoNum,inputs/TaxationNoNum/2_1.xmi,0.4883720930232558
53TaxationNoNum,inputs/TaxationNoNum/3_1.xmi,0.6994219653179191
54TaxationNoNum,inputs/TaxationNoNum/4_1.xmi,0.4883720930232558
55TaxationNoNum,inputs/TaxationNoNum/5_1.xmi,0.4883720930232558
56TaxationNoNum,inputs/TaxationNoNum/6_1.xmi,0.4883720930232558
57TaxationNoNum,inputs/TaxationNoNum/7_1.xmi,0.6954022988505747
58TaxationNoNum,inputs/TaxationNoNum/8_1.xmi,0.4883720930232558
59TaxationNoNum,inputs/TaxationNoNum/9_1.xmi,0.4883720930232558
60TaxationNoNum,inputs/TaxationNoNum/10_1.xmi,0.4883720930232558