aboutsummaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorLibravatar ArenBabikian <aren.babikian@mail.mcgill.ca>2020-05-11 10:06:57 -0400
committerLibravatar ArenBabikian <aren.babikian@mail.mcgill.ca>2020-05-11 10:06:57 -0400
commit750b37401bc3eb3e9deb7126d90f871973ba477b (patch)
treeabe90e700f79ae1e126586039bf15d2a51dbb60c /Tests
parentAllow real numbers to be in the solution (diff)
downloadVIATRA-Generator-750b37401bc3eb3e9deb7126d90f871973ba477b.tar.gz
VIATRA-Generator-750b37401bc3eb3e9deb7126d90f871973ba477b.tar.zst
VIATRA-Generator-750b37401bc3eb3e9deb7126d90f871973ba477b.zip
Remove derived features from the PLEDGE MM
Diffstat (limited to 'Tests')
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/model/Taxation.aird438
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/model/Taxation.ecore70
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/model/Taxation.genmodel32
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/DS_for_Private_Insurance_and_Plan.java69
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Donation.java24
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/External_Allowance.java23
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/FD.java23
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/FO.java30
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Income_Type.java24
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Loss_Carryforward.java98
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Permanent_Expense.java24
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Physical_Person.java46
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Private_Insurance_and_Plan.java24
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Tax_Card.java27
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Tax_Payer.java23
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/TaxationPackage.java858
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/DS_for_Private_Insurance_and_PlanImpl.java168
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/DonationImpl.java56
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/External_AllowanceImpl.java58
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/FDImpl.java56
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/FOImpl.java129
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Income_TypeImpl.java58
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Loss_CarryforwardImpl.java296
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Permanent_ExpenseImpl.java56
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Physical_PersonImpl.java114
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Private_Insurance_and_PlanImpl.java56
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Tax_CardImpl.java57
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Tax_PayerImpl.java70
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/TaxationFactoryImpl.java48
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/TaxationPackageImpl.java377
30 files changed, 239 insertions, 3193 deletions
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/model/Taxation.aird b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/model/Taxation.aird
index d99775e4..65ca16f3 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/model/Taxation.aird
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/model/Taxation.aird
@@ -4,7 +4,7 @@
4 <semanticResources>Taxation.ecore</semanticResources> 4 <semanticResources>Taxation.ecore</semanticResources>
5 <ownedViews xmi:type="viewpoint:DView" uid="_YbwCAGDAEeq8BovXV4ESzw"> 5 <ownedViews xmi:type="viewpoint:DView" uid="_YbwCAGDAEeq8BovXV4ESzw">
6 <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/> 6 <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/>
7 <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_ZFSuQGDAEeq8BovXV4ESzw" name="Taxation class diagram" repPath="#_ZDuoAGDAEeq8BovXV4ESzw" changeId="ff33d3ca-d0f2-4f53-b58f-288212de0dfe"> 7 <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_ZFSuQGDAEeq8BovXV4ESzw" name="Taxation class diagram" repPath="#_ZDuoAGDAEeq8BovXV4ESzw" changeId="bfeb7879-0359-41c2-94a5-f3c320544ac3">
8 <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/> 8 <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
9 <target xmi:type="ecore:EPackage" href="Taxation.ecore#/"/> 9 <target xmi:type="ecore:EPackage" href="Taxation.ecore#/"/>
10 </ownedRepresentationDescriptors> 10 </ownedRepresentationDescriptors>
@@ -28,12 +28,6 @@
28 <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> 28 <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
29 <color xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> 29 <color xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
30 </computedStyleDescriptions> 30 </computedStyleDescriptions>
31 <computedStyleDescriptions xmi:type="style:BundledImageDescription" xmi:id="_aL9bYGDAEeq8BovXV4ESzw" labelExpression="service:render" labelAlignment="LEFT" tooltipExpression="service:renderTooltip" sizeComputationExpression="1">
32 <borderColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
33 <labelFormat>bold</labelFormat>
34 <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
35 <color xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
36 </computedStyleDescriptions>
37 <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_aYT1UGDAEeq8BovXV4ESzw" routingStyle="manhattan"> 31 <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_aYT1UGDAEeq8BovXV4ESzw" routingStyle="manhattan">
38 <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> 32 <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
39 <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_aYT1UWDAEeq8BovXV4ESzw" showIcon="false" labelExpression="service:render"> 33 <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_aYT1UWDAEeq8BovXV4ESzw" showIcon="false" labelExpression="service:render">
@@ -129,7 +123,7 @@
129 <styles xmi:type="notation:FilteringStyle" xmi:id="_aaBskmDAEeq8BovXV4ESzw"/> 123 <styles xmi:type="notation:FilteringStyle" xmi:id="_aaBskmDAEeq8BovXV4ESzw"/>
130 </children> 124 </children>
131 <styles xmi:type="notation:ShapeStyle" xmi:id="_aZ6-4WDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/> 125 <styles xmi:type="notation:ShapeStyle" xmi:id="_aZ6-4WDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/>
132 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aZ6-4mDAEeq8BovXV4ESzw"/> 126 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aZ6-4mDAEeq8BovXV4ESzw" x="4389" y="204"/>
133 </children> 127 </children>
134 <children xmi:type="notation:Node" xmi:id="_aaCToGDAEeq8BovXV4ESzw" type="2003" element="_aAYdgGDAEeq8BovXV4ESzw"> 128 <children xmi:type="notation:Node" xmi:id="_aaCToGDAEeq8BovXV4ESzw" type="2003" element="_aAYdgGDAEeq8BovXV4ESzw">
135 <children xmi:type="notation:Node" xmi:id="_aaC6sGDAEeq8BovXV4ESzw" type="5007"/> 129 <children xmi:type="notation:Node" xmi:id="_aaC6sGDAEeq8BovXV4ESzw" type="5007"/>
@@ -238,7 +232,7 @@
238 <styles xmi:type="notation:FilteringStyle" xmi:id="_aaC6s2DAEeq8BovXV4ESzw"/> 232 <styles xmi:type="notation:FilteringStyle" xmi:id="_aaC6s2DAEeq8BovXV4ESzw"/>
239 </children> 233 </children>
240 <styles xmi:type="notation:ShapeStyle" xmi:id="_aaCToWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" italic="true"/> 234 <styles xmi:type="notation:ShapeStyle" xmi:id="_aaCToWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" italic="true"/>
241 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aaCTomDAEeq8BovXV4ESzw" x="178"/> 235 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aaCTomDAEeq8BovXV4ESzw" x="4567" y="204"/>
242 </children> 236 </children>
243 <children xmi:type="notation:Node" xmi:id="_aaDhwGDAEeq8BovXV4ESzw" type="2003" element="_aAdWAGDAEeq8BovXV4ESzw"> 237 <children xmi:type="notation:Node" xmi:id="_aaDhwGDAEeq8BovXV4ESzw" type="2003" element="_aAdWAGDAEeq8BovXV4ESzw">
244 <children xmi:type="notation:Node" xmi:id="_aaEI0GDAEeq8BovXV4ESzw" type="5007"/> 238 <children xmi:type="notation:Node" xmi:id="_aaEI0GDAEeq8BovXV4ESzw" type="5007"/>
@@ -279,7 +273,7 @@
279 <styles xmi:type="notation:FilteringStyle" xmi:id="_aaEI02DAEeq8BovXV4ESzw"/> 273 <styles xmi:type="notation:FilteringStyle" xmi:id="_aaEI02DAEeq8BovXV4ESzw"/>
280 </children> 274 </children>
281 <styles xmi:type="notation:ShapeStyle" xmi:id="_aaDhwWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/> 275 <styles xmi:type="notation:ShapeStyle" xmi:id="_aaDhwWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/>
282 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aaDhwmDAEeq8BovXV4ESzw" x="828"/> 276 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aaDhwmDAEeq8BovXV4ESzw" x="5217" y="204"/>
283 </children> 277 </children>
284 <children xmi:type="notation:Node" xmi:id="_aaEI1GDAEeq8BovXV4ESzw" type="2003" element="_aAekIGDAEeq8BovXV4ESzw"> 278 <children xmi:type="notation:Node" xmi:id="_aaEI1GDAEeq8BovXV4ESzw" type="2003" element="_aAekIGDAEeq8BovXV4ESzw">
285 <children xmi:type="notation:Node" xmi:id="_aaEv4GDAEeq8BovXV4ESzw" type="5007"/> 279 <children xmi:type="notation:Node" xmi:id="_aaEv4GDAEeq8BovXV4ESzw" type="5007"/>
@@ -312,24 +306,7 @@
312 <styles xmi:type="notation:FilteringStyle" xmi:id="_aaEv42DAEeq8BovXV4ESzw"/> 306 <styles xmi:type="notation:FilteringStyle" xmi:id="_aaEv42DAEeq8BovXV4ESzw"/>
313 </children> 307 </children>
314 <styles xmi:type="notation:ShapeStyle" xmi:id="_aaEI1WDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/> 308 <styles xmi:type="notation:ShapeStyle" xmi:id="_aaEI1WDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/>
315 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aaEI1mDAEeq8BovXV4ESzw" x="1008"/> 309 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aaEI1mDAEeq8BovXV4ESzw" x="5397" y="204"/>
316 </children>
317 <children xmi:type="notation:Node" xmi:id="_aaFW8GDAEeq8BovXV4ESzw" type="2003" element="_aAfLMWDAEeq8BovXV4ESzw">
318 <children xmi:type="notation:Node" xmi:id="_aaF-AGDAEeq8BovXV4ESzw" type="5007"/>
319 <children xmi:type="notation:Node" xmi:id="_aaF-AWDAEeq8BovXV4ESzw" type="7004">
320 <children xmi:type="notation:Node" xmi:id="_abjWkGDAEeq8BovXV4ESzw" type="3010" element="_aXof4mDAEeq8BovXV4ESzw">
321 <styles xmi:type="notation:FontStyle" xmi:id="_abjWkWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/>
322 <layoutConstraint xmi:type="notation:Location" xmi:id="_abjWkmDAEeq8BovXV4ESzw"/>
323 </children>
324 <children xmi:type="notation:Node" xmi:id="_abjWk2DAEeq8BovXV4ESzw" type="3010" element="_aXpG8WDAEeq8BovXV4ESzw">
325 <styles xmi:type="notation:FontStyle" xmi:id="_abjWlGDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/>
326 <layoutConstraint xmi:type="notation:Location" xmi:id="_abjWlWDAEeq8BovXV4ESzw"/>
327 </children>
328 <styles xmi:type="notation:SortingStyle" xmi:id="_aaF-AmDAEeq8BovXV4ESzw"/>
329 <styles xmi:type="notation:FilteringStyle" xmi:id="_aaF-A2DAEeq8BovXV4ESzw"/>
330 </children>
331 <styles xmi:type="notation:ShapeStyle" xmi:id="_aaFW8WDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/>
332 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aaFW8mDAEeq8BovXV4ESzw" x="1188"/>
333 </children> 310 </children>
334 <children xmi:type="notation:Node" xmi:id="_aaGlEGDAEeq8BovXV4ESzw" type="2003" element="_aAhAYGDAEeq8BovXV4ESzw"> 311 <children xmi:type="notation:Node" xmi:id="_aaGlEGDAEeq8BovXV4ESzw" type="2003" element="_aAhAYGDAEeq8BovXV4ESzw">
335 <children xmi:type="notation:Node" xmi:id="_aaGlE2DAEeq8BovXV4ESzw" type="5007"/> 312 <children xmi:type="notation:Node" xmi:id="_aaGlE2DAEeq8BovXV4ESzw" type="5007"/>
@@ -354,7 +331,7 @@
354 <styles xmi:type="notation:FilteringStyle" xmi:id="_aaHMImDAEeq8BovXV4ESzw"/> 331 <styles xmi:type="notation:FilteringStyle" xmi:id="_aaHMImDAEeq8BovXV4ESzw"/>
355 </children> 332 </children>
356 <styles xmi:type="notation:ShapeStyle" xmi:id="_aaGlEWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/> 333 <styles xmi:type="notation:ShapeStyle" xmi:id="_aaGlEWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/>
357 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aaGlEmDAEeq8BovXV4ESzw" x="1368"/> 334 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aaGlEmDAEeq8BovXV4ESzw" x="5757" y="204"/>
358 </children> 335 </children>
359 <children xmi:type="notation:Node" xmi:id="_aaHMI2DAEeq8BovXV4ESzw" type="2003" element="_aAhncWDAEeq8BovXV4ESzw"> 336 <children xmi:type="notation:Node" xmi:id="_aaHMI2DAEeq8BovXV4ESzw" type="2003" element="_aAhncWDAEeq8BovXV4ESzw">
360 <children xmi:type="notation:Node" xmi:id="_aaHzMGDAEeq8BovXV4ESzw" type="5007"/> 337 <children xmi:type="notation:Node" xmi:id="_aaHzMGDAEeq8BovXV4ESzw" type="5007"/>
@@ -375,7 +352,7 @@
375 <styles xmi:type="notation:FilteringStyle" xmi:id="_aaIaQmDAEeq8BovXV4ESzw"/> 352 <styles xmi:type="notation:FilteringStyle" xmi:id="_aaIaQmDAEeq8BovXV4ESzw"/>
376 </children> 353 </children>
377 <styles xmi:type="notation:ShapeStyle" xmi:id="_aaHMJGDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/> 354 <styles xmi:type="notation:ShapeStyle" xmi:id="_aaHMJGDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/>
378 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aaHMJWDAEeq8BovXV4ESzw" x="1548"/> 355 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aaHMJWDAEeq8BovXV4ESzw" x="5937" y="204"/>
379 </children> 356 </children>
380 <children xmi:type="notation:Node" xmi:id="_aaJBUGDAEeq8BovXV4ESzw" type="2003" element="_aAi1kGDAEeq8BovXV4ESzw"> 357 <children xmi:type="notation:Node" xmi:id="_aaJBUGDAEeq8BovXV4ESzw" type="2003" element="_aAi1kGDAEeq8BovXV4ESzw">
381 <children xmi:type="notation:Node" xmi:id="_aaJoYGDAEeq8BovXV4ESzw" type="5007"/> 358 <children xmi:type="notation:Node" xmi:id="_aaJoYGDAEeq8BovXV4ESzw" type="5007"/>
@@ -396,7 +373,7 @@
396 <styles xmi:type="notation:FilteringStyle" xmi:id="_aaJoY2DAEeq8BovXV4ESzw"/> 373 <styles xmi:type="notation:FilteringStyle" xmi:id="_aaJoY2DAEeq8BovXV4ESzw"/>
397 </children> 374 </children>
398 <styles xmi:type="notation:ShapeStyle" xmi:id="_aaJBUWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/> 375 <styles xmi:type="notation:ShapeStyle" xmi:id="_aaJBUWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/>
399 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aaJBUmDAEeq8BovXV4ESzw" x="1728"/> 376 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aaJBUmDAEeq8BovXV4ESzw" x="6117" y="204"/>
400 </children> 377 </children>
401 <children xmi:type="notation:Node" xmi:id="_aaKPcGDAEeq8BovXV4ESzw" type="2003" element="_aAjcoWDAEeq8BovXV4ESzw"> 378 <children xmi:type="notation:Node" xmi:id="_aaKPcGDAEeq8BovXV4ESzw" type="2003" element="_aAjcoWDAEeq8BovXV4ESzw">
402 <children xmi:type="notation:Node" xmi:id="_aaK2gGDAEeq8BovXV4ESzw" type="5007"/> 379 <children xmi:type="notation:Node" xmi:id="_aaK2gGDAEeq8BovXV4ESzw" type="5007"/>
@@ -425,24 +402,7 @@
425 <styles xmi:type="notation:FilteringStyle" xmi:id="_aaK2g2DAEeq8BovXV4ESzw"/> 402 <styles xmi:type="notation:FilteringStyle" xmi:id="_aaK2g2DAEeq8BovXV4ESzw"/>
426 </children> 403 </children>
427 <styles xmi:type="notation:ShapeStyle" xmi:id="_aaKPcWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/> 404 <styles xmi:type="notation:ShapeStyle" xmi:id="_aaKPcWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/>
428 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aaKPcmDAEeq8BovXV4ESzw" x="1908"/> 405 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aaKPcmDAEeq8BovXV4ESzw" x="6297" y="204"/>
429 </children>
430 <children xmi:type="notation:Node" xmi:id="_aaLdkGDAEeq8BovXV4ESzw" type="2003" element="_aAkDsWDAEeq8BovXV4ESzw">
431 <children xmi:type="notation:Node" xmi:id="_aaLdk2DAEeq8BovXV4ESzw" type="5007"/>
432 <children xmi:type="notation:Node" xmi:id="_aaMEoGDAEeq8BovXV4ESzw" type="7004">
433 <children xmi:type="notation:Node" xmi:id="_aboPEGDAEeq8BovXV4ESzw" type="3010" element="_aXxp0mDAEeq8BovXV4ESzw">
434 <styles xmi:type="notation:FontStyle" xmi:id="_aboPEWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/>
435 <layoutConstraint xmi:type="notation:Location" xmi:id="_aboPEmDAEeq8BovXV4ESzw"/>
436 </children>
437 <children xmi:type="notation:Node" xmi:id="_aboPE2DAEeq8BovXV4ESzw" type="3010" element="_aXyQ4WDAEeq8BovXV4ESzw">
438 <styles xmi:type="notation:FontStyle" xmi:id="_aboPFGDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/>
439 <layoutConstraint xmi:type="notation:Location" xmi:id="_aboPFWDAEeq8BovXV4ESzw"/>
440 </children>
441 <styles xmi:type="notation:SortingStyle" xmi:id="_aaMEoWDAEeq8BovXV4ESzw"/>
442 <styles xmi:type="notation:FilteringStyle" xmi:id="_aaMEomDAEeq8BovXV4ESzw"/>
443 </children>
444 <styles xmi:type="notation:ShapeStyle" xmi:id="_aaLdkWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/>
445 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aaLdkmDAEeq8BovXV4ESzw" x="2088"/>
446 </children> 406 </children>
447 <children xmi:type="notation:Node" xmi:id="_aaMEo2DAEeq8BovXV4ESzw" type="2003" element="_aAlR0GDAEeq8BovXV4ESzw"> 407 <children xmi:type="notation:Node" xmi:id="_aaMEo2DAEeq8BovXV4ESzw" type="2003" element="_aAlR0GDAEeq8BovXV4ESzw">
448 <children xmi:type="notation:Node" xmi:id="_aaMrsGDAEeq8BovXV4ESzw" type="5007"/> 408 <children xmi:type="notation:Node" xmi:id="_aaMrsGDAEeq8BovXV4ESzw" type="5007"/>
@@ -463,7 +423,7 @@
463 <styles xmi:type="notation:FilteringStyle" xmi:id="_aaMrs2DAEeq8BovXV4ESzw"/> 423 <styles xmi:type="notation:FilteringStyle" xmi:id="_aaMrs2DAEeq8BovXV4ESzw"/>
464 </children> 424 </children>
465 <styles xmi:type="notation:ShapeStyle" xmi:id="_aaMEpGDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/> 425 <styles xmi:type="notation:ShapeStyle" xmi:id="_aaMEpGDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/>
466 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aaMEpWDAEeq8BovXV4ESzw" x="2268"/> 426 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aaMEpWDAEeq8BovXV4ESzw" x="4567" y="8"/>
467 </children> 427 </children>
468 <children xmi:type="notation:Node" xmi:id="_aaMrtGDAEeq8BovXV4ESzw" type="2003" element="_aAl44GDAEeq8BovXV4ESzw"> 428 <children xmi:type="notation:Node" xmi:id="_aaMrtGDAEeq8BovXV4ESzw" type="2003" element="_aAl44GDAEeq8BovXV4ESzw">
469 <children xmi:type="notation:Node" xmi:id="_aaNSwGDAEeq8BovXV4ESzw" type="5007"/> 429 <children xmi:type="notation:Node" xmi:id="_aaNSwGDAEeq8BovXV4ESzw" type="5007"/>
@@ -496,7 +456,7 @@
496 <styles xmi:type="notation:FilteringStyle" xmi:id="_aaNSw2DAEeq8BovXV4ESzw"/> 456 <styles xmi:type="notation:FilteringStyle" xmi:id="_aaNSw2DAEeq8BovXV4ESzw"/>
497 </children> 457 </children>
498 <styles xmi:type="notation:ShapeStyle" xmi:id="_aaMrtWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/> 458 <styles xmi:type="notation:ShapeStyle" xmi:id="_aaMrtWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/>
499 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aaMrtmDAEeq8BovXV4ESzw" x="2760"/> 459 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aaMrtmDAEeq8BovXV4ESzw" x="5059" y="8"/>
500 </children> 460 </children>
501 <children xmi:type="notation:Node" xmi:id="_aaNSxGDAEeq8BovXV4ESzw" type="2003" element="_aAnHAGDAEeq8BovXV4ESzw"> 461 <children xmi:type="notation:Node" xmi:id="_aaNSxGDAEeq8BovXV4ESzw" type="2003" element="_aAnHAGDAEeq8BovXV4ESzw">
502 <children xmi:type="notation:Node" xmi:id="_aaN50GDAEeq8BovXV4ESzw" type="5007"/> 462 <children xmi:type="notation:Node" xmi:id="_aaN50GDAEeq8BovXV4ESzw" type="5007"/>
@@ -525,7 +485,7 @@
525 <styles xmi:type="notation:FilteringStyle" xmi:id="_aaN502DAEeq8BovXV4ESzw"/> 485 <styles xmi:type="notation:FilteringStyle" xmi:id="_aaN502DAEeq8BovXV4ESzw"/>
526 </children> 486 </children>
527 <styles xmi:type="notation:ShapeStyle" xmi:id="_aaNSxWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/> 487 <styles xmi:type="notation:ShapeStyle" xmi:id="_aaNSxWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/>
528 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aaNSxmDAEeq8BovXV4ESzw" x="2952"/> 488 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aaNSxmDAEeq8BovXV4ESzw" x="5251" y="8"/>
529 </children> 489 </children>
530 <children xmi:type="notation:Node" xmi:id="_aaN51GDAEeq8BovXV4ESzw" type="2003" element="_aAoVIGDAEeq8BovXV4ESzw"> 490 <children xmi:type="notation:Node" xmi:id="_aaN51GDAEeq8BovXV4ESzw" type="2003" element="_aAoVIGDAEeq8BovXV4ESzw">
531 <children xmi:type="notation:Node" xmi:id="_aaOg4GDAEeq8BovXV4ESzw" type="5007"/> 491 <children xmi:type="notation:Node" xmi:id="_aaOg4GDAEeq8BovXV4ESzw" type="5007"/>
@@ -551,10 +511,6 @@
551 <children xmi:type="notation:Node" xmi:id="_aaOg5GDAEeq8BovXV4ESzw" type="2003" element="_aApjQGDAEeq8BovXV4ESzw"> 511 <children xmi:type="notation:Node" xmi:id="_aaOg5GDAEeq8BovXV4ESzw" type="2003" element="_aApjQGDAEeq8BovXV4ESzw">
552 <children xmi:type="notation:Node" xmi:id="_aaPvAGDAEeq8BovXV4ESzw" type="5007"/> 512 <children xmi:type="notation:Node" xmi:id="_aaPvAGDAEeq8BovXV4ESzw" type="5007"/>
553 <children xmi:type="notation:Node" xmi:id="_aaPvAWDAEeq8BovXV4ESzw" type="7004"> 513 <children xmi:type="notation:Node" xmi:id="_aaPvAWDAEeq8BovXV4ESzw" type="7004">
554 <children xmi:type="notation:Node" xmi:id="_abvj0GDAEeq8BovXV4ESzw" type="3010" element="_aL6_IGDAEeq8BovXV4ESzw">
555 <styles xmi:type="notation:FontStyle" xmi:id="_abvj0WDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/>
556 <layoutConstraint xmi:type="notation:Location" xmi:id="_abvj0mDAEeq8BovXV4ESzw"/>
557 </children>
558 <styles xmi:type="notation:SortingStyle" xmi:id="_aaPvAmDAEeq8BovXV4ESzw"/> 514 <styles xmi:type="notation:SortingStyle" xmi:id="_aaPvAmDAEeq8BovXV4ESzw"/>
559 <styles xmi:type="notation:FilteringStyle" xmi:id="_aaPvA2DAEeq8BovXV4ESzw"/> 515 <styles xmi:type="notation:FilteringStyle" xmi:id="_aaPvA2DAEeq8BovXV4ESzw"/>
560 </children> 516 </children>
@@ -564,10 +520,6 @@
564 <children xmi:type="notation:Node" xmi:id="_aaQWEGDAEeq8BovXV4ESzw" type="2003" element="_aArYcGDAEeq8BovXV4ESzw"> 520 <children xmi:type="notation:Node" xmi:id="_aaQWEGDAEeq8BovXV4ESzw" type="2003" element="_aArYcGDAEeq8BovXV4ESzw">
565 <children xmi:type="notation:Node" xmi:id="_aaRkMGDAEeq8BovXV4ESzw" type="5007"/> 521 <children xmi:type="notation:Node" xmi:id="_aaRkMGDAEeq8BovXV4ESzw" type="5007"/>
566 <children xmi:type="notation:Node" xmi:id="_aaSLQGDAEeq8BovXV4ESzw" type="7004"> 522 <children xmi:type="notation:Node" xmi:id="_aaSLQGDAEeq8BovXV4ESzw" type="7004">
567 <children xmi:type="notation:Node" xmi:id="_abwK4GDAEeq8BovXV4ESzw" type="3010" element="_aL80UGDAEeq8BovXV4ESzw">
568 <styles xmi:type="notation:FontStyle" xmi:id="_abwK4WDAEeq8BovXV4ESzw" fontColor="7490599" fontName="Segoe UI" fontHeight="8" bold="true"/>
569 <layoutConstraint xmi:type="notation:Location" xmi:id="_abwK4mDAEeq8BovXV4ESzw"/>
570 </children>
571 <children xmi:type="notation:Node" xmi:id="_abwK42DAEeq8BovXV4ESzw" type="3010" element="_aL-CcWDAEeq8BovXV4ESzw"> 523 <children xmi:type="notation:Node" xmi:id="_abwK42DAEeq8BovXV4ESzw" type="3010" element="_aL-CcWDAEeq8BovXV4ESzw">
572 <styles xmi:type="notation:FontStyle" xmi:id="_abwK5GDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/> 524 <styles xmi:type="notation:FontStyle" xmi:id="_abwK5GDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/>
573 <layoutConstraint xmi:type="notation:Location" xmi:id="_abwK5WDAEeq8BovXV4ESzw"/> 525 <layoutConstraint xmi:type="notation:Location" xmi:id="_abwK5WDAEeq8BovXV4ESzw"/>
@@ -584,10 +536,6 @@
584 <styles xmi:type="notation:FontStyle" xmi:id="_abxZBGDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/> 536 <styles xmi:type="notation:FontStyle" xmi:id="_abxZBGDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/>
585 <layoutConstraint xmi:type="notation:Location" xmi:id="_abxZBWDAEeq8BovXV4ESzw"/> 537 <layoutConstraint xmi:type="notation:Location" xmi:id="_abxZBWDAEeq8BovXV4ESzw"/>
586 </children> 538 </children>
587 <children xmi:type="notation:Node" xmi:id="_abyAEGDAEeq8BovXV4ESzw" type="3010" element="_aMBs0GDAEeq8BovXV4ESzw">
588 <styles xmi:type="notation:FontStyle" xmi:id="_abyAEWDAEeq8BovXV4ESzw" fontColor="7490599" fontName="Segoe UI" fontHeight="8" bold="true"/>
589 <layoutConstraint xmi:type="notation:Location" xmi:id="_abyAEmDAEeq8BovXV4ESzw"/>
590 </children>
591 <children xmi:type="notation:Node" xmi:id="_abyAE2DAEeq8BovXV4ESzw" type="3010" element="_aMCT4WDAEeq8BovXV4ESzw"> 539 <children xmi:type="notation:Node" xmi:id="_abyAE2DAEeq8BovXV4ESzw" type="3010" element="_aMCT4WDAEeq8BovXV4ESzw">
592 <styles xmi:type="notation:FontStyle" xmi:id="_abyAFGDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/> 540 <styles xmi:type="notation:FontStyle" xmi:id="_abyAFGDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/>
593 <layoutConstraint xmi:type="notation:Location" xmi:id="_abyAFWDAEeq8BovXV4ESzw"/> 541 <layoutConstraint xmi:type="notation:Location" xmi:id="_abyAFWDAEeq8BovXV4ESzw"/>
@@ -676,10 +624,6 @@
676 <children xmi:type="notation:Node" xmi:id="_aaXq0GDAEeq8BovXV4ESzw" type="2003" element="_aAyGIGDAEeq8BovXV4ESzw"> 624 <children xmi:type="notation:Node" xmi:id="_aaXq0GDAEeq8BovXV4ESzw" type="2003" element="_aAyGIGDAEeq8BovXV4ESzw">
677 <children xmi:type="notation:Node" xmi:id="_aaYR4GDAEeq8BovXV4ESzw" type="5007"/> 625 <children xmi:type="notation:Node" xmi:id="_aaYR4GDAEeq8BovXV4ESzw" type="5007"/>
678 <children xmi:type="notation:Node" xmi:id="_aaYR4WDAEeq8BovXV4ESzw" type="7004"> 626 <children xmi:type="notation:Node" xmi:id="_aaYR4WDAEeq8BovXV4ESzw" type="7004">
679 <children xmi:type="notation:Node" xmi:id="_ab4Gs2DAEeq8BovXV4ESzw" type="3010" element="_aMNTAGDAEeq8BovXV4ESzw">
680 <styles xmi:type="notation:FontStyle" xmi:id="_ab4GtGDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/>
681 <layoutConstraint xmi:type="notation:Location" xmi:id="_ab4GtWDAEeq8BovXV4ESzw"/>
682 </children>
683 <children xmi:type="notation:Node" xmi:id="_ab4twGDAEeq8BovXV4ESzw" type="3010" element="_aMOhIGDAEeq8BovXV4ESzw"> 627 <children xmi:type="notation:Node" xmi:id="_ab4twGDAEeq8BovXV4ESzw" type="3010" element="_aMOhIGDAEeq8BovXV4ESzw">
684 <styles xmi:type="notation:FontStyle" xmi:id="_ab4twWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/> 628 <styles xmi:type="notation:FontStyle" xmi:id="_ab4twWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/>
685 <layoutConstraint xmi:type="notation:Location" xmi:id="_ab4twmDAEeq8BovXV4ESzw"/> 629 <layoutConstraint xmi:type="notation:Location" xmi:id="_ab4twmDAEeq8BovXV4ESzw"/>
@@ -767,7 +711,7 @@
767 <styles xmi:type="notation:FilteringStyle" xmi:id="_aabVM2DAEeq8BovXV4ESzw"/> 711 <styles xmi:type="notation:FilteringStyle" xmi:id="_aabVM2DAEeq8BovXV4ESzw"/>
768 </children> 712 </children>
769 <styles xmi:type="notation:ShapeStyle" xmi:id="_aaauIWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/> 713 <styles xmi:type="notation:ShapeStyle" xmi:id="_aaauIWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/>
770 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aaauImDAEeq8BovXV4ESzw" x="3168"/> 714 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aaauImDAEeq8BovXV4ESzw" x="5467" y="8"/>
771 </children> 715 </children>
772 <children xmi:type="notation:Node" xmi:id="_aab8QGDAEeq8BovXV4ESzw" type="2003" element="_aA4MwGDAEeq8BovXV4ESzw"> 716 <children xmi:type="notation:Node" xmi:id="_aab8QGDAEeq8BovXV4ESzw" type="2003" element="_aA4MwGDAEeq8BovXV4ESzw">
773 <children xmi:type="notation:Node" xmi:id="_aacjUGDAEeq8BovXV4ESzw" type="5007"/> 717 <children xmi:type="notation:Node" xmi:id="_aacjUGDAEeq8BovXV4ESzw" type="5007"/>
@@ -836,10 +780,6 @@
836 <children xmi:type="notation:Node" xmi:id="_aagNsGDAEeq8BovXV4ESzw" type="2003" element="_aDFzQGDAEeq8BovXV4ESzw"> 780 <children xmi:type="notation:Node" xmi:id="_aagNsGDAEeq8BovXV4ESzw" type="2003" element="_aDFzQGDAEeq8BovXV4ESzw">
837 <children xmi:type="notation:Node" xmi:id="_aagNs2DAEeq8BovXV4ESzw" type="5007"/> 781 <children xmi:type="notation:Node" xmi:id="_aagNs2DAEeq8BovXV4ESzw" type="5007"/>
838 <children xmi:type="notation:Node" xmi:id="_aag0wGDAEeq8BovXV4ESzw" type="7004"> 782 <children xmi:type="notation:Node" xmi:id="_aag0wGDAEeq8BovXV4ESzw" type="7004">
839 <children xmi:type="notation:Node" xmi:id="_acDF02DAEeq8BovXV4ESzw" type="3010" element="_aPZJ4GDAEeq8BovXV4ESzw">
840 <styles xmi:type="notation:FontStyle" xmi:id="_acDF1GDAEeq8BovXV4ESzw" fontColor="7490599" fontName="Segoe UI" fontHeight="8" bold="true"/>
841 <layoutConstraint xmi:type="notation:Location" xmi:id="_acDF1WDAEeq8BovXV4ESzw"/>
842 </children>
843 <children xmi:type="notation:Node" xmi:id="_acDs4GDAEeq8BovXV4ESzw" type="3010" element="_aRNHwGDAEeq8BovXV4ESzw"> 783 <children xmi:type="notation:Node" xmi:id="_acDs4GDAEeq8BovXV4ESzw" type="3010" element="_aRNHwGDAEeq8BovXV4ESzw">
844 <styles xmi:type="notation:FontStyle" xmi:id="_acDs4WDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/> 784 <styles xmi:type="notation:FontStyle" xmi:id="_acDs4WDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/>
845 <layoutConstraint xmi:type="notation:Location" xmi:id="_acDs4mDAEeq8BovXV4ESzw"/> 785 <layoutConstraint xmi:type="notation:Location" xmi:id="_acDs4mDAEeq8BovXV4ESzw"/>
@@ -857,10 +797,6 @@
857 <styles xmi:type="notation:FontStyle" xmi:id="_acET8WDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/> 797 <styles xmi:type="notation:FontStyle" xmi:id="_acET8WDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/>
858 <layoutConstraint xmi:type="notation:Location" xmi:id="_acET8mDAEeq8BovXV4ESzw"/> 798 <layoutConstraint xmi:type="notation:Location" xmi:id="_acET8mDAEeq8BovXV4ESzw"/>
859 </children> 799 </children>
860 <children xmi:type="notation:Node" xmi:id="_acE7AGDAEeq8BovXV4ESzw" type="3010" element="_aRO88GDAEeq8BovXV4ESzw">
861 <styles xmi:type="notation:FontStyle" xmi:id="_acE7AWDAEeq8BovXV4ESzw" fontColor="7490599" fontName="Segoe UI" fontHeight="8" bold="true"/>
862 <layoutConstraint xmi:type="notation:Location" xmi:id="_acE7AmDAEeq8BovXV4ESzw"/>
863 </children>
864 <children xmi:type="notation:Node" xmi:id="_acE7A2DAEeq8BovXV4ESzw" type="3010" element="_aT_WAWDAEeq8BovXV4ESzw"> 800 <children xmi:type="notation:Node" xmi:id="_acE7A2DAEeq8BovXV4ESzw" type="3010" element="_aT_WAWDAEeq8BovXV4ESzw">
865 <styles xmi:type="notation:FontStyle" xmi:id="_acE7BGDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/> 801 <styles xmi:type="notation:FontStyle" xmi:id="_acE7BGDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/>
866 <layoutConstraint xmi:type="notation:Location" xmi:id="_acE7BWDAEeq8BovXV4ESzw"/> 802 <layoutConstraint xmi:type="notation:Location" xmi:id="_acE7BWDAEeq8BovXV4ESzw"/>
@@ -1230,15 +1166,11 @@
1230 <styles xmi:type="notation:FontStyle" xmi:id="_aca5QWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/> 1166 <styles xmi:type="notation:FontStyle" xmi:id="_aca5QWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/>
1231 <layoutConstraint xmi:type="notation:Location" xmi:id="_aca5QmDAEeq8BovXV4ESzw"/> 1167 <layoutConstraint xmi:type="notation:Location" xmi:id="_aca5QmDAEeq8BovXV4ESzw"/>
1232 </children> 1168 </children>
1233 <children xmi:type="notation:Node" xmi:id="_aca5Q2DAEeq8BovXV4ESzw" type="3010" element="_aW9xgGDAEeq8BovXV4ESzw">
1234 <styles xmi:type="notation:FontStyle" xmi:id="_aca5RGDAEeq8BovXV4ESzw" fontColor="7490599" fontName="Segoe UI" fontHeight="8" bold="true"/>
1235 <layoutConstraint xmi:type="notation:Location" xmi:id="_aca5RWDAEeq8BovXV4ESzw"/>
1236 </children>
1237 <styles xmi:type="notation:SortingStyle" xmi:id="_aa0WwWDAEeq8BovXV4ESzw"/> 1169 <styles xmi:type="notation:SortingStyle" xmi:id="_aa0WwWDAEeq8BovXV4ESzw"/>
1238 <styles xmi:type="notation:FilteringStyle" xmi:id="_aa0WwmDAEeq8BovXV4ESzw"/> 1170 <styles xmi:type="notation:FilteringStyle" xmi:id="_aa0WwmDAEeq8BovXV4ESzw"/>
1239 </children> 1171 </children>
1240 <styles xmi:type="notation:ShapeStyle" xmi:id="_aazIpWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/> 1172 <styles xmi:type="notation:ShapeStyle" xmi:id="_aazIpWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/>
1241 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aazIpmDAEeq8BovXV4ESzw" x="10692" y="156"/> 1173 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aazIpmDAEeq8BovXV4ESzw" x="8808" y="179"/>
1242 </children> 1174 </children>
1243 <children xmi:type="notation:Node" xmi:id="_aa0Ww2DAEeq8BovXV4ESzw" type="2003" element="_aJ8pMGDAEeq8BovXV4ESzw"> 1175 <children xmi:type="notation:Node" xmi:id="_aa0Ww2DAEeq8BovXV4ESzw" type="2003" element="_aJ8pMGDAEeq8BovXV4ESzw">
1244 <children xmi:type="notation:Node" xmi:id="_aa090GDAEeq8BovXV4ESzw" type="5007"/> 1176 <children xmi:type="notation:Node" xmi:id="_aa090GDAEeq8BovXV4ESzw" type="5007"/>
@@ -1247,20 +1179,16 @@
1247 <styles xmi:type="notation:FilteringStyle" xmi:id="_aa1k4mDAEeq8BovXV4ESzw"/> 1179 <styles xmi:type="notation:FilteringStyle" xmi:id="_aa1k4mDAEeq8BovXV4ESzw"/>
1248 </children> 1180 </children>
1249 <styles xmi:type="notation:ShapeStyle" xmi:id="_aa0WxGDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/> 1181 <styles xmi:type="notation:ShapeStyle" xmi:id="_aa0WxGDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/>
1250 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aa0WxWDAEeq8BovXV4ESzw" x="10560"/> 1182 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aa0WxWDAEeq8BovXV4ESzw" x="8676" y="23"/>
1251 </children> 1183 </children>
1252 <children xmi:type="notation:Node" xmi:id="_aa1k42DAEeq8BovXV4ESzw" type="2003" element="_aJ93UGDAEeq8BovXV4ESzw"> 1184 <children xmi:type="notation:Node" xmi:id="_aa1k42DAEeq8BovXV4ESzw" type="2003" element="_aJ93UGDAEeq8BovXV4ESzw">
1253 <children xmi:type="notation:Node" xmi:id="_aa2L8GDAEeq8BovXV4ESzw" type="5007"/> 1185 <children xmi:type="notation:Node" xmi:id="_aa2L8GDAEeq8BovXV4ESzw" type="5007"/>
1254 <children xmi:type="notation:Node" xmi:id="_aa2zAGDAEeq8BovXV4ESzw" type="7004"> 1186 <children xmi:type="notation:Node" xmi:id="_aa2zAGDAEeq8BovXV4ESzw" type="7004">
1255 <children xmi:type="notation:Node" xmi:id="_acbgUGDAEeq8BovXV4ESzw" type="3010" element="_aW-_oGDAEeq8BovXV4ESzw">
1256 <styles xmi:type="notation:FontStyle" xmi:id="_acbgUWDAEeq8BovXV4ESzw" fontColor="7490599" fontName="Segoe UI" fontHeight="8" bold="true"/>
1257 <layoutConstraint xmi:type="notation:Location" xmi:id="_acbgUmDAEeq8BovXV4ESzw"/>
1258 </children>
1259 <styles xmi:type="notation:SortingStyle" xmi:id="_aa2zAWDAEeq8BovXV4ESzw"/> 1187 <styles xmi:type="notation:SortingStyle" xmi:id="_aa2zAWDAEeq8BovXV4ESzw"/>
1260 <styles xmi:type="notation:FilteringStyle" xmi:id="_aa2zAmDAEeq8BovXV4ESzw"/> 1188 <styles xmi:type="notation:FilteringStyle" xmi:id="_aa2zAmDAEeq8BovXV4ESzw"/>
1261 </children> 1189 </children>
1262 <styles xmi:type="notation:ShapeStyle" xmi:id="_aa1k5GDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/> 1190 <styles xmi:type="notation:ShapeStyle" xmi:id="_aa1k5GDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/>
1263 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aa1k5WDAEeq8BovXV4ESzw" x="10332" y="156"/> 1191 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aa1k5WDAEeq8BovXV4ESzw" x="8448" y="179"/>
1264 </children> 1192 </children>
1265 <children xmi:type="notation:Node" xmi:id="_aa2zA2DAEeq8BovXV4ESzw" type="2003" element="_aJ_FcGDAEeq8BovXV4ESzw"> 1193 <children xmi:type="notation:Node" xmi:id="_aa2zA2DAEeq8BovXV4ESzw" type="2003" element="_aJ_FcGDAEeq8BovXV4ESzw">
1266 <children xmi:type="notation:Node" xmi:id="_aa2zBmDAEeq8BovXV4ESzw" type="5007"/> 1194 <children xmi:type="notation:Node" xmi:id="_aa2zBmDAEeq8BovXV4ESzw" type="5007"/>
@@ -1273,7 +1201,7 @@
1273 <styles xmi:type="notation:FilteringStyle" xmi:id="_aa3aEmDAEeq8BovXV4ESzw"/> 1201 <styles xmi:type="notation:FilteringStyle" xmi:id="_aa3aEmDAEeq8BovXV4ESzw"/>
1274 </children> 1202 </children>
1275 <styles xmi:type="notation:ShapeStyle" xmi:id="_aa2zBGDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/> 1203 <styles xmi:type="notation:ShapeStyle" xmi:id="_aa2zBGDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/>
1276 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aa2zBWDAEeq8BovXV4ESzw" x="12960" y="156"/> 1204 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aa2zBWDAEeq8BovXV4ESzw" x="11076" y="179"/>
1277 </children> 1205 </children>
1278 <children xmi:type="notation:Node" xmi:id="_aa3aE2DAEeq8BovXV4ESzw" type="2003" element="_aKATkGDAEeq8BovXV4ESzw"> 1206 <children xmi:type="notation:Node" xmi:id="_aa3aE2DAEeq8BovXV4ESzw" type="2003" element="_aKATkGDAEeq8BovXV4ESzw">
1279 <children xmi:type="notation:Node" xmi:id="_aa3aFmDAEeq8BovXV4ESzw" type="5007"/> 1207 <children xmi:type="notation:Node" xmi:id="_aa3aFmDAEeq8BovXV4ESzw" type="5007"/>
@@ -1290,7 +1218,7 @@
1290 <styles xmi:type="notation:FilteringStyle" xmi:id="_aa4BImDAEeq8BovXV4ESzw"/> 1218 <styles xmi:type="notation:FilteringStyle" xmi:id="_aa4BImDAEeq8BovXV4ESzw"/>
1291 </children> 1219 </children>
1292 <styles xmi:type="notation:ShapeStyle" xmi:id="_aa3aFGDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/> 1220 <styles xmi:type="notation:ShapeStyle" xmi:id="_aa3aFGDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/>
1293 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aa3aFWDAEeq8BovXV4ESzw" x="12168"/> 1221 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aa3aFWDAEeq8BovXV4ESzw" x="10284" y="23"/>
1294 </children> 1222 </children>
1295 <children xmi:type="notation:Node" xmi:id="_aa4BI2DAEeq8BovXV4ESzw" type="2003" element="_aKBhsGDAEeq8BovXV4ESzw"> 1223 <children xmi:type="notation:Node" xmi:id="_aa4BI2DAEeq8BovXV4ESzw" type="2003" element="_aKBhsGDAEeq8BovXV4ESzw">
1296 <children xmi:type="notation:Node" xmi:id="_aa4oMGDAEeq8BovXV4ESzw" type="5007"/> 1224 <children xmi:type="notation:Node" xmi:id="_aa4oMGDAEeq8BovXV4ESzw" type="5007"/>
@@ -1307,7 +1235,7 @@
1307 <styles xmi:type="notation:FilteringStyle" xmi:id="_aa5PQmDAEeq8BovXV4ESzw"/> 1235 <styles xmi:type="notation:FilteringStyle" xmi:id="_aa5PQmDAEeq8BovXV4ESzw"/>
1308 </children> 1236 </children>
1309 <styles xmi:type="notation:ShapeStyle" xmi:id="_aa4BJGDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/> 1237 <styles xmi:type="notation:ShapeStyle" xmi:id="_aa4BJGDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/>
1310 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aa4BJWDAEeq8BovXV4ESzw" x="3384"/> 1238 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aa4BJWDAEeq8BovXV4ESzw" x="5683" y="8"/>
1311 </children> 1239 </children>
1312 <children xmi:type="notation:Node" xmi:id="_aa5PQ2DAEeq8BovXV4ESzw" type="2003" element="_aKCv0GDAEeq8BovXV4ESzw"> 1240 <children xmi:type="notation:Node" xmi:id="_aa5PQ2DAEeq8BovXV4ESzw" type="2003" element="_aKCv0GDAEeq8BovXV4ESzw">
1313 <children xmi:type="notation:Node" xmi:id="_aa52UGDAEeq8BovXV4ESzw" type="5007"/> 1241 <children xmi:type="notation:Node" xmi:id="_aa52UGDAEeq8BovXV4ESzw" type="5007"/>
@@ -1316,7 +1244,7 @@
1316 <styles xmi:type="notation:FilteringStyle" xmi:id="_aa52U2DAEeq8BovXV4ESzw"/> 1244 <styles xmi:type="notation:FilteringStyle" xmi:id="_aa52U2DAEeq8BovXV4ESzw"/>
1317 </children> 1245 </children>
1318 <styles xmi:type="notation:ShapeStyle" xmi:id="_aa5PRGDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/> 1246 <styles xmi:type="notation:ShapeStyle" xmi:id="_aa5PRGDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/>
1319 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aa5PRWDAEeq8BovXV4ESzw" x="12540" y="156"/> 1247 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aa5PRWDAEeq8BovXV4ESzw" x="10656" y="179"/>
1320 </children> 1248 </children>
1321 <children xmi:type="notation:Node" xmi:id="_aa6dYGDAEeq8BovXV4ESzw" type="2003" element="_aKD98GDAEeq8BovXV4ESzw"> 1249 <children xmi:type="notation:Node" xmi:id="_aa6dYGDAEeq8BovXV4ESzw" type="2003" element="_aKD98GDAEeq8BovXV4ESzw">
1322 <children xmi:type="notation:Node" xmi:id="_aa6dY2DAEeq8BovXV4ESzw" type="5007"/> 1250 <children xmi:type="notation:Node" xmi:id="_aa6dY2DAEeq8BovXV4ESzw" type="5007"/>
@@ -1329,7 +1257,7 @@
1329 <styles xmi:type="notation:FilteringStyle" xmi:id="_aa7EcmDAEeq8BovXV4ESzw"/> 1257 <styles xmi:type="notation:FilteringStyle" xmi:id="_aa7EcmDAEeq8BovXV4ESzw"/>
1330 </children> 1258 </children>
1331 <styles xmi:type="notation:ShapeStyle" xmi:id="_aa6dYWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/> 1259 <styles xmi:type="notation:ShapeStyle" xmi:id="_aa6dYWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/>
1332 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aa6dYmDAEeq8BovXV4ESzw" x="11820" y="156"/> 1260 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aa6dYmDAEeq8BovXV4ESzw" x="9936" y="179"/>
1333 </children> 1261 </children>
1334 <children xmi:type="notation:Node" xmi:id="_aa7Ec2DAEeq8BovXV4ESzw" type="2003" element="_aKFMEGDAEeq8BovXV4ESzw"> 1262 <children xmi:type="notation:Node" xmi:id="_aa7Ec2DAEeq8BovXV4ESzw" type="2003" element="_aKFMEGDAEeq8BovXV4ESzw">
1335 <children xmi:type="notation:Node" xmi:id="_aa7rgGDAEeq8BovXV4ESzw" type="5007"/> 1263 <children xmi:type="notation:Node" xmi:id="_aa7rgGDAEeq8BovXV4ESzw" type="5007"/>
@@ -1350,7 +1278,7 @@
1350 <styles xmi:type="notation:FilteringStyle" xmi:id="_aa7rg2DAEeq8BovXV4ESzw"/> 1278 <styles xmi:type="notation:FilteringStyle" xmi:id="_aa7rg2DAEeq8BovXV4ESzw"/>
1351 </children> 1279 </children>
1352 <styles xmi:type="notation:ShapeStyle" xmi:id="_aa7EdGDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/> 1280 <styles xmi:type="notation:ShapeStyle" xmi:id="_aa7EdGDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/>
1353 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aa7EdWDAEeq8BovXV4ESzw" x="3624"/> 1281 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aa7EdWDAEeq8BovXV4ESzw" x="5923" y="8"/>
1354 </children> 1282 </children>
1355 <children xmi:type="notation:Node" xmi:id="_aa7rhGDAEeq8BovXV4ESzw" type="2003" element="_aKFzIWDAEeq8BovXV4ESzw"> 1283 <children xmi:type="notation:Node" xmi:id="_aa7rhGDAEeq8BovXV4ESzw" type="2003" element="_aKFzIWDAEeq8BovXV4ESzw">
1356 <children xmi:type="notation:Node" xmi:id="_aa8SkGDAEeq8BovXV4ESzw" type="5007"/> 1284 <children xmi:type="notation:Node" xmi:id="_aa8SkGDAEeq8BovXV4ESzw" type="5007"/>
@@ -1359,23 +1287,11 @@
1359 <styles xmi:type="notation:FontStyle" xmi:id="_acd8l2DAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/> 1287 <styles xmi:type="notation:FontStyle" xmi:id="_acd8l2DAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/>
1360 <layoutConstraint xmi:type="notation:Location" xmi:id="_acd8mGDAEeq8BovXV4ESzw"/> 1288 <layoutConstraint xmi:type="notation:Location" xmi:id="_acd8mGDAEeq8BovXV4ESzw"/>
1361 </children> 1289 </children>
1362 <children xmi:type="notation:Node" xmi:id="_acejoGDAEeq8BovXV4ESzw" type="3010" element="_aXEfMGDAEeq8BovXV4ESzw">
1363 <styles xmi:type="notation:FontStyle" xmi:id="_acejoWDAEeq8BovXV4ESzw" fontColor="7490599" fontName="Segoe UI" fontHeight="8" bold="true"/>
1364 <layoutConstraint xmi:type="notation:Location" xmi:id="_acejomDAEeq8BovXV4ESzw"/>
1365 </children>
1366 <children xmi:type="notation:Node" xmi:id="_acejo2DAEeq8BovXV4ESzw" type="3010" element="_aXG7cWDAEeq8BovXV4ESzw">
1367 <styles xmi:type="notation:FontStyle" xmi:id="_acejpGDAEeq8BovXV4ESzw" fontColor="7490599" fontName="Segoe UI" fontHeight="8" bold="true"/>
1368 <layoutConstraint xmi:type="notation:Location" xmi:id="_acejpWDAEeq8BovXV4ESzw"/>
1369 </children>
1370 <children xmi:type="notation:Node" xmi:id="_acejpmDAEeq8BovXV4ESzw" type="3010" element="_aXHigWDAEeq8BovXV4ESzw">
1371 <styles xmi:type="notation:FontStyle" xmi:id="_acejp2DAEeq8BovXV4ESzw" fontColor="7490599" fontName="Segoe UI" fontHeight="8" bold="true"/>
1372 <layoutConstraint xmi:type="notation:Location" xmi:id="_acejqGDAEeq8BovXV4ESzw"/>
1373 </children>
1374 <styles xmi:type="notation:SortingStyle" xmi:id="_aa85oWDAEeq8BovXV4ESzw"/> 1290 <styles xmi:type="notation:SortingStyle" xmi:id="_aa85oWDAEeq8BovXV4ESzw"/>
1375 <styles xmi:type="notation:FilteringStyle" xmi:id="_aa85omDAEeq8BovXV4ESzw"/> 1291 <styles xmi:type="notation:FilteringStyle" xmi:id="_aa85omDAEeq8BovXV4ESzw"/>
1376 </children> 1292 </children>
1377 <styles xmi:type="notation:ShapeStyle" xmi:id="_aa7rhWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/> 1293 <styles xmi:type="notation:ShapeStyle" xmi:id="_aa7rhWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/>
1378 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aa7rhmDAEeq8BovXV4ESzw" x="10980" y="156"/> 1294 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aa7rhmDAEeq8BovXV4ESzw" x="9096" y="179"/>
1379 </children> 1295 </children>
1380 <children xmi:type="notation:Node" xmi:id="_aa85o2DAEeq8BovXV4ESzw" type="2003" element="_aKHBQWDAEeq8BovXV4ESzw"> 1296 <children xmi:type="notation:Node" xmi:id="_aa85o2DAEeq8BovXV4ESzw" type="2003" element="_aKHBQWDAEeq8BovXV4ESzw">
1381 <children xmi:type="notation:Node" xmi:id="_aa9gsGDAEeq8BovXV4ESzw" type="5007"/> 1297 <children xmi:type="notation:Node" xmi:id="_aa9gsGDAEeq8BovXV4ESzw" type="5007"/>
@@ -1404,7 +1320,7 @@
1404 <styles xmi:type="notation:FilteringStyle" xmi:id="_aa9gs2DAEeq8BovXV4ESzw"/> 1320 <styles xmi:type="notation:FilteringStyle" xmi:id="_aa9gs2DAEeq8BovXV4ESzw"/>
1405 </children> 1321 </children>
1406 <styles xmi:type="notation:ShapeStyle" xmi:id="_aa85pGDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/> 1322 <styles xmi:type="notation:ShapeStyle" xmi:id="_aa85pGDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/>
1407 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aa85pWDAEeq8BovXV4ESzw" x="3972"/> 1323 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aa85pWDAEeq8BovXV4ESzw" x="6271" y="8"/>
1408 </children> 1324 </children>
1409 <children xmi:type="notation:Node" xmi:id="_aa-HwGDAEeq8BovXV4ESzw" type="2003" element="_aKIPYGDAEeq8BovXV4ESzw"> 1325 <children xmi:type="notation:Node" xmi:id="_aa-HwGDAEeq8BovXV4ESzw" type="2003" element="_aKIPYGDAEeq8BovXV4ESzw">
1410 <children xmi:type="notation:Node" xmi:id="_aa-u0GDAEeq8BovXV4ESzw" type="5007"/> 1326 <children xmi:type="notation:Node" xmi:id="_aa-u0GDAEeq8BovXV4ESzw" type="5007"/>
@@ -1413,7 +1329,7 @@
1413 <styles xmi:type="notation:FilteringStyle" xmi:id="_aa-u02DAEeq8BovXV4ESzw"/> 1329 <styles xmi:type="notation:FilteringStyle" xmi:id="_aa-u02DAEeq8BovXV4ESzw"/>
1414 </children> 1330 </children>
1415 <styles xmi:type="notation:ShapeStyle" xmi:id="_aa-HwWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/> 1331 <styles xmi:type="notation:ShapeStyle" xmi:id="_aa-HwWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/>
1416 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aa-HwmDAEeq8BovXV4ESzw" x="12744" y="156"/> 1332 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aa-HwmDAEeq8BovXV4ESzw" x="10860" y="179"/>
1417 </children> 1333 </children>
1418 <children xmi:type="notation:Node" xmi:id="_aa-u1GDAEeq8BovXV4ESzw" type="2003" element="_aKJdgGDAEeq8BovXV4ESzw"> 1334 <children xmi:type="notation:Node" xmi:id="_aa-u1GDAEeq8BovXV4ESzw" type="2003" element="_aKJdgGDAEeq8BovXV4ESzw">
1419 <children xmi:type="notation:Node" xmi:id="_aa_V4GDAEeq8BovXV4ESzw" type="5007"/> 1335 <children xmi:type="notation:Node" xmi:id="_aa_V4GDAEeq8BovXV4ESzw" type="5007"/>
@@ -1422,7 +1338,7 @@
1422 <styles xmi:type="notation:FilteringStyle" xmi:id="_aa_V42DAEeq8BovXV4ESzw"/> 1338 <styles xmi:type="notation:FilteringStyle" xmi:id="_aa_V42DAEeq8BovXV4ESzw"/>
1423 </children> 1339 </children>
1424 <styles xmi:type="notation:ShapeStyle" xmi:id="_aa-u1WDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/> 1340 <styles xmi:type="notation:ShapeStyle" xmi:id="_aa-u1WDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/>
1425 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aa-u1mDAEeq8BovXV4ESzw" x="11640" y="156"/> 1341 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aa-u1mDAEeq8BovXV4ESzw" x="9756" y="179"/>
1426 </children> 1342 </children>
1427 <children xmi:type="notation:Node" xmi:id="_aa_88GDAEeq8BovXV4ESzw" type="2003" element="_aKKroGDAEeq8BovXV4ESzw"> 1343 <children xmi:type="notation:Node" xmi:id="_aa_88GDAEeq8BovXV4ESzw" type="2003" element="_aKKroGDAEeq8BovXV4ESzw">
1428 <children xmi:type="notation:Node" xmi:id="_aa_882DAEeq8BovXV4ESzw" type="5007"/> 1344 <children xmi:type="notation:Node" xmi:id="_aa_882DAEeq8BovXV4ESzw" type="5007"/>
@@ -1431,10 +1347,6 @@
1431 <styles xmi:type="notation:FontStyle" xmi:id="_acg_4WDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/> 1347 <styles xmi:type="notation:FontStyle" xmi:id="_acg_4WDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/>
1432 <layoutConstraint xmi:type="notation:Location" xmi:id="_acg_4mDAEeq8BovXV4ESzw"/> 1348 <layoutConstraint xmi:type="notation:Location" xmi:id="_acg_4mDAEeq8BovXV4ESzw"/>
1433 </children> 1349 </children>
1434 <children xmi:type="notation:Node" xmi:id="_acg_42DAEeq8BovXV4ESzw" type="3010" element="_aXJ-wWDAEeq8BovXV4ESzw">
1435 <styles xmi:type="notation:FontStyle" xmi:id="_acg_5GDAEeq8BovXV4ESzw" fontColor="7490599" fontName="Segoe UI" fontHeight="8" bold="true"/>
1436 <layoutConstraint xmi:type="notation:Location" xmi:id="_acg_5WDAEeq8BovXV4ESzw"/>
1437 </children>
1438 <styles xmi:type="notation:SortingStyle" xmi:id="_abAkAWDAEeq8BovXV4ESzw"/> 1350 <styles xmi:type="notation:SortingStyle" xmi:id="_abAkAWDAEeq8BovXV4ESzw"/>
1439 <styles xmi:type="notation:FilteringStyle" xmi:id="_abAkAmDAEeq8BovXV4ESzw"/> 1351 <styles xmi:type="notation:FilteringStyle" xmi:id="_abAkAmDAEeq8BovXV4ESzw"/>
1440 </children> 1352 </children>
@@ -1470,10 +1382,6 @@
1470 <styles xmi:type="notation:FontStyle" xmi:id="_aciOAWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/> 1382 <styles xmi:type="notation:FontStyle" xmi:id="_aciOAWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/>
1471 <layoutConstraint xmi:type="notation:Location" xmi:id="_aciOAmDAEeq8BovXV4ESzw"/> 1383 <layoutConstraint xmi:type="notation:Location" xmi:id="_aciOAmDAEeq8BovXV4ESzw"/>
1472 </children> 1384 </children>
1473 <children xmi:type="notation:Node" xmi:id="_aciOA2DAEeq8BovXV4ESzw" type="3010" element="_aXNCEGDAEeq8BovXV4ESzw">
1474 <styles xmi:type="notation:FontStyle" xmi:id="_aciOBGDAEeq8BovXV4ESzw" fontColor="7490599" fontName="Segoe UI" fontHeight="8" bold="true"/>
1475 <layoutConstraint xmi:type="notation:Location" xmi:id="_aciOBWDAEeq8BovXV4ESzw"/>
1476 </children>
1477 <styles xmi:type="notation:SortingStyle" xmi:id="_abDnUmDAEeq8BovXV4ESzw"/> 1385 <styles xmi:type="notation:SortingStyle" xmi:id="_abDnUmDAEeq8BovXV4ESzw"/>
1478 <styles xmi:type="notation:FilteringStyle" xmi:id="_abDnU2DAEeq8BovXV4ESzw"/> 1386 <styles xmi:type="notation:FilteringStyle" xmi:id="_abDnU2DAEeq8BovXV4ESzw"/>
1479 </children> 1387 </children>
@@ -1504,10 +1412,6 @@
1504 <styles xmi:type="notation:FontStyle" xmi:id="_aci1FGDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/> 1412 <styles xmi:type="notation:FontStyle" xmi:id="_aci1FGDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/>
1505 <layoutConstraint xmi:type="notation:Location" xmi:id="_aci1FWDAEeq8BovXV4ESzw"/> 1413 <layoutConstraint xmi:type="notation:Location" xmi:id="_aci1FWDAEeq8BovXV4ESzw"/>
1506 </children> 1414 </children>
1507 <children xmi:type="notation:Node" xmi:id="_aci1FmDAEeq8BovXV4ESzw" type="3010" element="_aXR6kGDAEeq8BovXV4ESzw">
1508 <styles xmi:type="notation:FontStyle" xmi:id="_aci1F2DAEeq8BovXV4ESzw" fontColor="7490599" fontName="Segoe UI" fontHeight="8" bold="true"/>
1509 <layoutConstraint xmi:type="notation:Location" xmi:id="_aci1GGDAEeq8BovXV4ESzw"/>
1510 </children>
1511 <children xmi:type="notation:Node" xmi:id="_acjcIGDAEeq8BovXV4ESzw" type="3010" element="_aXShoWDAEeq8BovXV4ESzw"> 1415 <children xmi:type="notation:Node" xmi:id="_acjcIGDAEeq8BovXV4ESzw" type="3010" element="_aXShoWDAEeq8BovXV4ESzw">
1512 <styles xmi:type="notation:FontStyle" xmi:id="_acjcIWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/> 1416 <styles xmi:type="notation:FontStyle" xmi:id="_acjcIWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/>
1513 <layoutConstraint xmi:type="notation:Location" xmi:id="_acjcImDAEeq8BovXV4ESzw"/> 1417 <layoutConstraint xmi:type="notation:Location" xmi:id="_acjcImDAEeq8BovXV4ESzw"/>
@@ -1521,22 +1425,6 @@
1521 <children xmi:type="notation:Node" xmi:id="_abGDk2DAEeq8BovXV4ESzw" type="2003" element="_aKSAYWDAEeq8BovXV4ESzw"> 1425 <children xmi:type="notation:Node" xmi:id="_abGDk2DAEeq8BovXV4ESzw" type="2003" element="_aKSAYWDAEeq8BovXV4ESzw">
1522 <children xmi:type="notation:Node" xmi:id="_abGqoGDAEeq8BovXV4ESzw" type="5007"/> 1426 <children xmi:type="notation:Node" xmi:id="_abGqoGDAEeq8BovXV4ESzw" type="5007"/>
1523 <children xmi:type="notation:Node" xmi:id="_abGqoWDAEeq8BovXV4ESzw" type="7004"> 1427 <children xmi:type="notation:Node" xmi:id="_abGqoWDAEeq8BovXV4ESzw" type="7004">
1524 <children xmi:type="notation:Node" xmi:id="_acjcI2DAEeq8BovXV4ESzw" type="3010" element="_aXTvwGDAEeq8BovXV4ESzw">
1525 <styles xmi:type="notation:FontStyle" xmi:id="_acjcJGDAEeq8BovXV4ESzw" fontColor="7490599" fontName="Segoe UI" fontHeight="8" bold="true"/>
1526 <layoutConstraint xmi:type="notation:Location" xmi:id="_acjcJWDAEeq8BovXV4ESzw"/>
1527 </children>
1528 <children xmi:type="notation:Node" xmi:id="_ackDMGDAEeq8BovXV4ESzw" type="3010" element="_aXU94GDAEeq8BovXV4ESzw">
1529 <styles xmi:type="notation:FontStyle" xmi:id="_ackDMWDAEeq8BovXV4ESzw" fontColor="7490599" fontName="Segoe UI" fontHeight="8" bold="true"/>
1530 <layoutConstraint xmi:type="notation:Location" xmi:id="_ackDMmDAEeq8BovXV4ESzw"/>
1531 </children>
1532 <children xmi:type="notation:Node" xmi:id="_ackDM2DAEeq8BovXV4ESzw" type="3010" element="_aXVk8GDAEeq8BovXV4ESzw">
1533 <styles xmi:type="notation:FontStyle" xmi:id="_ackDNGDAEeq8BovXV4ESzw" fontColor="7490599" fontName="Segoe UI" fontHeight="8" bold="true"/>
1534 <layoutConstraint xmi:type="notation:Location" xmi:id="_ackDNWDAEeq8BovXV4ESzw"/>
1535 </children>
1536 <children xmi:type="notation:Node" xmi:id="_ackDNmDAEeq8BovXV4ESzw" type="3010" element="_aXWMAGDAEeq8BovXV4ESzw">
1537 <styles xmi:type="notation:FontStyle" xmi:id="_ackDN2DAEeq8BovXV4ESzw" fontColor="7490599" fontName="Segoe UI" fontHeight="8" bold="true"/>
1538 <layoutConstraint xmi:type="notation:Location" xmi:id="_ackDOGDAEeq8BovXV4ESzw"/>
1539 </children>
1540 <styles xmi:type="notation:SortingStyle" xmi:id="_abGqomDAEeq8BovXV4ESzw"/> 1428 <styles xmi:type="notation:SortingStyle" xmi:id="_abGqomDAEeq8BovXV4ESzw"/>
1541 <styles xmi:type="notation:FilteringStyle" xmi:id="_abGqo2DAEeq8BovXV4ESzw"/> 1429 <styles xmi:type="notation:FilteringStyle" xmi:id="_abGqo2DAEeq8BovXV4ESzw"/>
1542 </children> 1430 </children>
@@ -1615,7 +1503,7 @@
1615 <styles xmi:type="notation:FilteringStyle" xmi:id="_abLjI2DAEeq8BovXV4ESzw"/> 1503 <styles xmi:type="notation:FilteringStyle" xmi:id="_abLjI2DAEeq8BovXV4ESzw"/>
1616 </children> 1504 </children>
1617 <styles xmi:type="notation:ShapeStyle" xmi:id="_abK8EWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/> 1505 <styles xmi:type="notation:ShapeStyle" xmi:id="_abK8EWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8"/>
1618 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_abK8EmDAEeq8BovXV4ESzw" x="4284"/> 1506 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_abK8EmDAEeq8BovXV4ESzw" x="6583" y="8"/>
1619 </children> 1507 </children>
1620 <styles xmi:type="notation:DiagramStyle" xmi:id="_ZGeaAGDAEeq8BovXV4ESzw"/> 1508 <styles xmi:type="notation:DiagramStyle" xmi:id="_ZGeaAGDAEeq8BovXV4ESzw"/>
1621 <edges xmi:type="notation:Edge" xmi:id="_ac3lMGDAEeq8BovXV4ESzw" type="4001" element="_aYSAIGDAEeq8BovXV4ESzw" source="_aaN51GDAEeq8BovXV4ESzw" target="_aaOg5GDAEeq8BovXV4ESzw"> 1509 <edges xmi:type="notation:Edge" xmi:id="_ac3lMGDAEeq8BovXV4ESzw" type="4001" element="_aYSAIGDAEeq8BovXV4ESzw" source="_aaN51GDAEeq8BovXV4ESzw" target="_aaOg5GDAEeq8BovXV4ESzw">
@@ -2679,6 +2567,9 @@
2679 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aAS98GDAEeq8BovXV4ESzw" name="Grantor" tooltipText="" width="12" height="10"> 2567 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aAS98GDAEeq8BovXV4ESzw" name="Grantor" tooltipText="" width="12" height="10">
2680 <target xmi:type="ecore:EEnum" href="Taxation.ecore#//Grantor"/> 2568 <target xmi:type="ecore:EEnum" href="Taxation.ecore#//Grantor"/>
2681 <semanticElements xmi:type="ecore:EEnum" href="Taxation.ecore#//Grantor"/> 2569 <semanticElements xmi:type="ecore:EEnum" href="Taxation.ecore#//Grantor"/>
2570 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
2571 <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
2572 <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
2682 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aAWBQGDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202"> 2573 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aAWBQGDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202">
2683 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/> 2574 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/>
2684 </ownedStyle> 2575 </ownedStyle>
@@ -2735,6 +2626,9 @@
2735 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aAYdgGDAEeq8BovXV4ESzw" name="Constants" tooltipText="" width="12" height="10"> 2626 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aAYdgGDAEeq8BovXV4ESzw" name="Constants" tooltipText="" width="12" height="10">
2736 <target xmi:type="ecore:EClass" href="Taxation.ecore#//Constants"/> 2627 <target xmi:type="ecore:EClass" href="Taxation.ecore#//Constants"/>
2737 <semanticElements xmi:type="ecore:EClass" href="Taxation.ecore#//Constants"/> 2628 <semanticElements xmi:type="ecore:EClass" href="Taxation.ecore#//Constants"/>
2629 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
2630 <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
2631 <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
2738 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aAa5wGDAEeq8BovXV4ESzw" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228"> 2632 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aAa5wGDAEeq8BovXV4ESzw" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
2739 <labelFormat>italic</labelFormat> 2633 <labelFormat>italic</labelFormat>
2740 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/> 2634 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
@@ -2944,6 +2838,9 @@
2944 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aAdWAGDAEeq8BovXV4ESzw" name="Disability_Types" tooltipText="" width="12" height="10"> 2838 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aAdWAGDAEeq8BovXV4ESzw" name="Disability_Types" tooltipText="" width="12" height="10">
2945 <target xmi:type="ecore:EEnum" href="Taxation.ecore#//Disability_Types"/> 2839 <target xmi:type="ecore:EEnum" href="Taxation.ecore#//Disability_Types"/>
2946 <semanticElements xmi:type="ecore:EEnum" href="Taxation.ecore#//Disability_Types"/> 2840 <semanticElements xmi:type="ecore:EEnum" href="Taxation.ecore#//Disability_Types"/>
2841 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
2842 <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
2843 <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
2947 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aAdWAWDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202"> 2844 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aAdWAWDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202">
2948 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/> 2845 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/>
2949 </ownedStyle> 2846 </ownedStyle>
@@ -3016,6 +2913,9 @@
3016 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aAekIGDAEeq8BovXV4ESzw" name="Country" tooltipText="" width="12" height="10"> 2913 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aAekIGDAEeq8BovXV4ESzw" name="Country" tooltipText="" width="12" height="10">
3017 <target xmi:type="ecore:EEnum" href="Taxation.ecore#//Country"/> 2914 <target xmi:type="ecore:EEnum" href="Taxation.ecore#//Country"/>
3018 <semanticElements xmi:type="ecore:EEnum" href="Taxation.ecore#//Country"/> 2915 <semanticElements xmi:type="ecore:EEnum" href="Taxation.ecore#//Country"/>
2916 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
2917 <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
2918 <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
3019 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aAekIWDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202"> 2919 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aAekIWDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202">
3020 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/> 2920 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/>
3021 </ownedStyle> 2921 </ownedStyle>
@@ -3069,33 +2969,12 @@
3069 <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/> 2969 <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
3070 </ownedElements> 2970 </ownedElements>
3071 </ownedDiagramElements> 2971 </ownedDiagramElements>
3072 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aAfLMWDAEeq8BovXV4ESzw" name="Tax_Card_Type" tooltipText="" width="12" height="10">
3073 <target xmi:type="ecore:EEnum" href="Taxation.ecore#//Tax_Card_Type"/>
3074 <semanticElements xmi:type="ecore:EEnum" href="Taxation.ecore#//Tax_Card_Type"/>
3075 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aAfyQGDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202">
3076 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/>
3077 </ownedStyle>
3078 <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']"/>
3079 <ownedElements xmi:type="diagram:DNodeListElement" uid="_aXof4mDAEeq8BovXV4ESzw" name="Principal" tooltipText="">
3080 <target xmi:type="ecore:EEnumLiteral" href="Taxation.ecore#//Tax_Card_Type/Principal"/>
3081 <semanticElements xmi:type="ecore:EEnumLiteral" href="Taxation.ecore#//Tax_Card_Type/Principal"/>
3082 <ownedStyle xmi:type="diagram:BundledImage" uid="_aXpG8GDAEeq8BovXV4ESzw" labelAlignment="LEFT">
3083 <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
3084 </ownedStyle>
3085 <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
3086 </ownedElements>
3087 <ownedElements xmi:type="diagram:DNodeListElement" uid="_aXpG8WDAEeq8BovXV4ESzw" name="Additional" tooltipText="">
3088 <target xmi:type="ecore:EEnumLiteral" href="Taxation.ecore#//Tax_Card_Type/Additional"/>
3089 <semanticElements xmi:type="ecore:EEnumLiteral" href="Taxation.ecore#//Tax_Card_Type/Additional"/>
3090 <ownedStyle xmi:type="diagram:BundledImage" uid="_aXpG8mDAEeq8BovXV4ESzw" labelAlignment="LEFT">
3091 <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
3092 </ownedStyle>
3093 <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
3094 </ownedElements>
3095 </ownedDiagramElements>
3096 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aAhAYGDAEeq8BovXV4ESzw" name="Tax_Office" tooltipText="" width="12" height="10"> 2972 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aAhAYGDAEeq8BovXV4ESzw" name="Tax_Office" tooltipText="" width="12" height="10">
3097 <target xmi:type="ecore:EEnum" href="Taxation.ecore#//Tax_Office"/> 2973 <target xmi:type="ecore:EEnum" href="Taxation.ecore#//Tax_Office"/>
3098 <semanticElements xmi:type="ecore:EEnum" href="Taxation.ecore#//Tax_Office"/> 2974 <semanticElements xmi:type="ecore:EEnum" href="Taxation.ecore#//Tax_Office"/>
2975 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
2976 <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
2977 <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
3099 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aAhAYWDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202"> 2978 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aAhAYWDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202">
3100 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/> 2979 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/>
3101 </ownedStyle> 2980 </ownedStyle>
@@ -3136,6 +3015,9 @@
3136 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aAhncWDAEeq8BovXV4ESzw" name="Tax_Class_Category" tooltipText="" width="12" height="10"> 3015 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aAhncWDAEeq8BovXV4ESzw" name="Tax_Class_Category" tooltipText="" width="12" height="10">
3137 <target xmi:type="ecore:EEnum" href="Taxation.ecore#//Tax_Class_Category"/> 3016 <target xmi:type="ecore:EEnum" href="Taxation.ecore#//Tax_Class_Category"/>
3138 <semanticElements xmi:type="ecore:EEnum" href="Taxation.ecore#//Tax_Class_Category"/> 3017 <semanticElements xmi:type="ecore:EEnum" href="Taxation.ecore#//Tax_Class_Category"/>
3018 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
3019 <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
3020 <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
3139 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aAiOgGDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202"> 3021 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aAiOgGDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202">
3140 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/> 3022 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/>
3141 </ownedStyle> 3023 </ownedStyle>
@@ -3168,6 +3050,9 @@
3168 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aAi1kGDAEeq8BovXV4ESzw" name="Job_Activity" tooltipText="" width="12" height="10"> 3050 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aAi1kGDAEeq8BovXV4ESzw" name="Job_Activity" tooltipText="" width="12" height="10">
3169 <target xmi:type="ecore:EEnum" href="Taxation.ecore#//Job_Activity"/> 3051 <target xmi:type="ecore:EEnum" href="Taxation.ecore#//Job_Activity"/>
3170 <semanticElements xmi:type="ecore:EEnum" href="Taxation.ecore#//Job_Activity"/> 3052 <semanticElements xmi:type="ecore:EEnum" href="Taxation.ecore#//Job_Activity"/>
3053 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
3054 <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
3055 <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
3171 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aAi1kWDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202"> 3056 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aAi1kWDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202">
3172 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/> 3057 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/>
3173 </ownedStyle> 3058 </ownedStyle>
@@ -3200,6 +3085,9 @@
3200 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aAjcoWDAEeq8BovXV4ESzw" name="Town" tooltipText="" width="12" height="10"> 3085 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aAjcoWDAEeq8BovXV4ESzw" name="Town" tooltipText="" width="12" height="10">
3201 <target xmi:type="ecore:EEnum" href="Taxation.ecore#//Town"/> 3086 <target xmi:type="ecore:EEnum" href="Taxation.ecore#//Town"/>
3202 <semanticElements xmi:type="ecore:EEnum" href="Taxation.ecore#//Town"/> 3087 <semanticElements xmi:type="ecore:EEnum" href="Taxation.ecore#//Town"/>
3088 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
3089 <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
3090 <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
3203 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aAjcomDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202"> 3091 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aAjcomDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202">
3204 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/> 3092 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/>
3205 </ownedStyle> 3093 </ownedStyle>
@@ -3245,33 +3133,12 @@
3245 <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/> 3133 <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
3246 </ownedElements> 3134 </ownedElements>
3247 </ownedDiagramElements> 3135 </ownedDiagramElements>
3248 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aAkDsWDAEeq8BovXV4ESzw" name="Type_of_Rate" tooltipText="" width="12" height="10">
3249 <target xmi:type="ecore:EEnum" href="Taxation.ecore#//Type_of_Rate"/>
3250 <semanticElements xmi:type="ecore:EEnum" href="Taxation.ecore#//Type_of_Rate"/>
3251 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aAkqwGDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202">
3252 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/>
3253 </ownedStyle>
3254 <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']"/>
3255 <ownedElements xmi:type="diagram:DNodeListElement" uid="_aXxp0mDAEeq8BovXV4ESzw" name="REGULAR" tooltipText="">
3256 <target xmi:type="ecore:EEnumLiteral" href="Taxation.ecore#//Type_of_Rate/REGULAR"/>
3257 <semanticElements xmi:type="ecore:EEnumLiteral" href="Taxation.ecore#//Type_of_Rate/REGULAR"/>
3258 <ownedStyle xmi:type="diagram:BundledImage" uid="_aXyQ4GDAEeq8BovXV4ESzw" labelAlignment="LEFT">
3259 <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
3260 </ownedStyle>
3261 <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
3262 </ownedElements>
3263 <ownedElements xmi:type="diagram:DNodeListElement" uid="_aXyQ4WDAEeq8BovXV4ESzw" name="REAL_COST" tooltipText="">
3264 <target xmi:type="ecore:EEnumLiteral" href="Taxation.ecore#//Type_of_Rate/REAL_COST"/>
3265 <semanticElements xmi:type="ecore:EEnumLiteral" href="Taxation.ecore#//Type_of_Rate/REAL_COST"/>
3266 <ownedStyle xmi:type="diagram:BundledImage" uid="_aXyQ4mDAEeq8BovXV4ESzw" labelAlignment="LEFT">
3267 <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
3268 </ownedStyle>
3269 <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
3270 </ownedElements>
3271 </ownedDiagramElements>
3272 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aAlR0GDAEeq8BovXV4ESzw" name="CE_Type" tooltipText="" width="12" height="10"> 3136 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aAlR0GDAEeq8BovXV4ESzw" name="CE_Type" tooltipText="" width="12" height="10">
3273 <target xmi:type="ecore:EEnum" href="Taxation.ecore#//CE_Type"/> 3137 <target xmi:type="ecore:EEnum" href="Taxation.ecore#//CE_Type"/>
3274 <semanticElements xmi:type="ecore:EEnum" href="Taxation.ecore#//CE_Type"/> 3138 <semanticElements xmi:type="ecore:EEnum" href="Taxation.ecore#//CE_Type"/>
3139 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
3140 <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
3141 <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
3275 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aAlR0WDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202"> 3142 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aAlR0WDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202">
3276 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/> 3143 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/>
3277 </ownedStyle> 3144 </ownedStyle>
@@ -3304,6 +3171,9 @@
3304 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aAl44GDAEeq8BovXV4ESzw" name="Expense_Purpose" tooltipText="" width="12" height="10"> 3171 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aAl44GDAEeq8BovXV4ESzw" name="Expense_Purpose" tooltipText="" width="12" height="10">
3305 <target xmi:type="ecore:EEnum" href="Taxation.ecore#//Expense_Purpose"/> 3172 <target xmi:type="ecore:EEnum" href="Taxation.ecore#//Expense_Purpose"/>
3306 <semanticElements xmi:type="ecore:EEnum" href="Taxation.ecore#//Expense_Purpose"/> 3173 <semanticElements xmi:type="ecore:EEnum" href="Taxation.ecore#//Expense_Purpose"/>
3174 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
3175 <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
3176 <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
3307 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aAl44WDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202"> 3177 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aAl44WDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202">
3308 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/> 3178 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/>
3309 </ownedStyle> 3179 </ownedStyle>
@@ -3360,6 +3230,9 @@
3360 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aAnHAGDAEeq8BovXV4ESzw" name="Dependent_Type" tooltipText="" width="12" height="10"> 3230 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aAnHAGDAEeq8BovXV4ESzw" name="Dependent_Type" tooltipText="" width="12" height="10">
3361 <target xmi:type="ecore:EEnum" href="Taxation.ecore#//Dependent_Type"/> 3231 <target xmi:type="ecore:EEnum" href="Taxation.ecore#//Dependent_Type"/>
3362 <semanticElements xmi:type="ecore:EEnum" href="Taxation.ecore#//Dependent_Type"/> 3232 <semanticElements xmi:type="ecore:EEnum" href="Taxation.ecore#//Dependent_Type"/>
3233 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
3234 <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
3235 <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
3363 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aAnuEGDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202"> 3236 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aAnuEGDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202">
3364 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/> 3237 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/>
3365 </ownedStyle> 3238 </ownedStyle>
@@ -3448,14 +3321,6 @@
3448 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/> 3321 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
3449 </ownedStyle> 3322 </ownedStyle>
3450 <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/> 3323 <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
3451 <ownedElements xmi:type="diagram:DNodeListElement" uid="_aL6_IGDAEeq8BovXV4ESzw" name="taxesDue : EDouble = 0.0" tooltipText="">
3452 <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//Tax_Payer/taxesDue"/>
3453 <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//Tax_Payer/taxesDue"/>
3454 <ownedStyle xmi:type="diagram:BundledImage" uid="_aL7mMGDAEeq8BovXV4ESzw" labelAlignment="LEFT" description="_aLikoGDAEeq8BovXV4ESzw">
3455 <labelFormat>bold</labelFormat>
3456 </ownedStyle>
3457 <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
3458 </ownedElements>
3459 </ownedDiagramElements> 3324 </ownedDiagramElements>
3460 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aArYcGDAEeq8BovXV4ESzw" name="Physical_Person" tooltipText="" outgoingEdges="_aZLYAGDAEeq8BovXV4ESzw _aZVwFGDAEeq8BovXV4ESzw" incomingEdges="_aYdmUGDAEeq8BovXV4ESzw _aYeNZmDAEeq8BovXV4ESzw _aYe0eWDAEeq8BovXV4ESzw _aYnXUGDAEeq8BovXV4ESzw _aYs25mDAEeq8BovXV4ESzw" width="12" height="10"> 3325 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aArYcGDAEeq8BovXV4ESzw" name="Physical_Person" tooltipText="" outgoingEdges="_aZLYAGDAEeq8BovXV4ESzw _aZVwFGDAEeq8BovXV4ESzw" incomingEdges="_aYdmUGDAEeq8BovXV4ESzw _aYeNZmDAEeq8BovXV4ESzw _aYe0eWDAEeq8BovXV4ESzw _aYnXUGDAEeq8BovXV4ESzw _aYs25mDAEeq8BovXV4ESzw" width="12" height="10">
3461 <target xmi:type="ecore:EClass" href="Taxation.ecore#//Physical_Person"/> 3326 <target xmi:type="ecore:EClass" href="Taxation.ecore#//Physical_Person"/>
@@ -3464,14 +3329,6 @@
3464 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/> 3329 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
3465 </ownedStyle> 3330 </ownedStyle>
3466 <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/> 3331 <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
3467 <ownedElements xmi:type="diagram:DNodeListElement" uid="_aL80UGDAEeq8BovXV4ESzw" name="/is_assisting_spouse : EBoolean = false" tooltipText="">
3468 <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//Physical_Person/is_assisting_spouse"/>
3469 <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//Physical_Person/is_assisting_spouse"/>
3470 <ownedStyle xmi:type="diagram:BundledImage" uid="_aL-CcGDAEeq8BovXV4ESzw" labelColor="39,76,114" labelAlignment="LEFT" description="_aL9bYGDAEeq8BovXV4ESzw">
3471 <labelFormat>bold</labelFormat>
3472 </ownedStyle>
3473 <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
3474 </ownedElements>
3475 <ownedElements xmi:type="diagram:DNodeListElement" uid="_aL-CcWDAEeq8BovXV4ESzw" name="SSNo : EString" tooltipText=""> 3332 <ownedElements xmi:type="diagram:DNodeListElement" uid="_aL-CcWDAEeq8BovXV4ESzw" name="SSNo : EString" tooltipText="">
3476 <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//Physical_Person/SSNo"/> 3333 <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//Physical_Person/SSNo"/>
3477 <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//Physical_Person/SSNo"/> 3334 <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//Physical_Person/SSNo"/>
@@ -3504,14 +3361,6 @@
3504 </ownedStyle> 3361 </ownedStyle>
3505 <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/> 3362 <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
3506 </ownedElements> 3363 </ownedElements>
3507 <ownedElements xmi:type="diagram:DNodeListElement" uid="_aMBs0GDAEeq8BovXV4ESzw" name="/is_affiliated_personnaly_to_social_security : EBoolean = false" tooltipText="">
3508 <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//Physical_Person/is_affiliated_personnaly_to_social_security"/>
3509 <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//Physical_Person/is_affiliated_personnaly_to_social_security"/>
3510 <ownedStyle xmi:type="diagram:BundledImage" uid="_aMCT4GDAEeq8BovXV4ESzw" labelColor="39,76,114" labelAlignment="LEFT" description="_aL9bYGDAEeq8BovXV4ESzw">
3511 <labelFormat>bold</labelFormat>
3512 </ownedStyle>
3513 <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
3514 </ownedElements>
3515 <ownedElements xmi:type="diagram:DNodeListElement" uid="_aMCT4WDAEeq8BovXV4ESzw" name="birth_month : EInt" tooltipText=""> 3364 <ownedElements xmi:type="diagram:DNodeListElement" uid="_aMCT4WDAEeq8BovXV4ESzw" name="birth_month : EInt" tooltipText="">
3516 <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//Physical_Person/birth_month"/> 3365 <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//Physical_Person/birth_month"/>
3517 <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//Physical_Person/birth_month"/> 3366 <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//Physical_Person/birth_month"/>
@@ -3648,14 +3497,6 @@
3648 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/> 3497 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
3649 </ownedStyle> 3498 </ownedStyle>
3650 <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/> 3499 <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
3651 <ownedElements xmi:type="diagram:DNodeListElement" uid="_aMNTAGDAEeq8BovXV4ESzw" name="amount : EDouble = 0.0" tooltipText="">
3652 <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//External_Allowance/amount"/>
3653 <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//External_Allowance/amount"/>
3654 <ownedStyle xmi:type="diagram:BundledImage" uid="_aMN6EGDAEeq8BovXV4ESzw" labelAlignment="LEFT" description="_aLikoGDAEeq8BovXV4ESzw">
3655 <labelFormat>bold</labelFormat>
3656 </ownedStyle>
3657 <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
3658 </ownedElements>
3659 <ownedElements xmi:type="diagram:DNodeListElement" uid="_aMOhIGDAEeq8BovXV4ESzw" name="grantor : Grantor = WWW" tooltipText=""> 3500 <ownedElements xmi:type="diagram:DNodeListElement" uid="_aMOhIGDAEeq8BovXV4ESzw" name="grantor : Grantor = WWW" tooltipText="">
3660 <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//External_Allowance/grantor"/> 3501 <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//External_Allowance/grantor"/>
3661 <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//External_Allowance/grantor"/> 3502 <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//External_Allowance/grantor"/>
@@ -3757,6 +3598,9 @@
3757 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aA2XkWDAEeq8BovXV4ESzw" name="Separation_Causes" tooltipText="" width="12" height="10"> 3598 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aA2XkWDAEeq8BovXV4ESzw" name="Separation_Causes" tooltipText="" width="12" height="10">
3758 <target xmi:type="ecore:EEnum" href="Taxation.ecore#//Separation_Causes"/> 3599 <target xmi:type="ecore:EEnum" href="Taxation.ecore#//Separation_Causes"/>
3759 <semanticElements xmi:type="ecore:EEnum" href="Taxation.ecore#//Separation_Causes"/> 3600 <semanticElements xmi:type="ecore:EEnum" href="Taxation.ecore#//Separation_Causes"/>
3601 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
3602 <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
3603 <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
3760 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aA2-oGDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202"> 3604 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aA2-oGDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202">
3761 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/> 3605 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/>
3762 </ownedStyle> 3606 </ownedStyle>
@@ -3895,14 +3739,6 @@
3895 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/> 3739 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
3896 </ownedStyle> 3740 </ownedStyle>
3897 <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/> 3741 <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
3898 <ownedElements xmi:type="diagram:DNodeListElement" uid="_aPZJ4GDAEeq8BovXV4ESzw" name="/subjectToWithholdingTax : EBoolean = false" tooltipText="">
3899 <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//Income_Type/subjectToWithholdingTax"/>
3900 <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//Income_Type/subjectToWithholdingTax"/>
3901 <ownedStyle xmi:type="diagram:BundledImage" uid="_aRMgsGDAEeq8BovXV4ESzw" labelColor="39,76,114" labelAlignment="LEFT" description="_aL9bYGDAEeq8BovXV4ESzw">
3902 <labelFormat>bold</labelFormat>
3903 </ownedStyle>
3904 <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
3905 </ownedElements>
3906 <ownedElements xmi:type="diagram:DNodeListElement" uid="_aRNHwGDAEeq8BovXV4ESzw" name="id8 : EString" tooltipText=""> 3742 <ownedElements xmi:type="diagram:DNodeListElement" uid="_aRNHwGDAEeq8BovXV4ESzw" name="id8 : EString" tooltipText="">
3907 <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//Income_Type/id8"/> 3743 <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//Income_Type/id8"/>
3908 <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//Income_Type/id8"/> 3744 <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//Income_Type/id8"/>
@@ -3927,14 +3763,6 @@
3927 </ownedStyle> 3763 </ownedStyle>
3928 <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/> 3764 <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
3929 </ownedElements> 3765 </ownedElements>
3930 <ownedElements xmi:type="diagram:DNodeListElement" uid="_aRO88GDAEeq8BovXV4ESzw" name="/tax_card_type : Tax_Card_Type = Principal" tooltipText="">
3931 <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//Tax_Card/tax_card_type"/>
3932 <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//Tax_Card/tax_card_type"/>
3933 <ownedStyle xmi:type="diagram:BundledImage" uid="_aT_WAGDAEeq8BovXV4ESzw" labelColor="39,76,114" labelAlignment="LEFT" description="_aL9bYGDAEeq8BovXV4ESzw">
3934 <labelFormat>bold</labelFormat>
3935 </ownedStyle>
3936 <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
3937 </ownedElements>
3938 <ownedElements xmi:type="diagram:DNodeListElement" uid="_aT_WAWDAEeq8BovXV4ESzw" name="tax_office : Tax_Office = RTS_2" tooltipText=""> 3766 <ownedElements xmi:type="diagram:DNodeListElement" uid="_aT_WAWDAEeq8BovXV4ESzw" name="tax_office : Tax_Office = RTS_2" tooltipText="">
3939 <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//Tax_Card/tax_office"/> 3767 <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//Tax_Card/tax_office"/>
3940 <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//Tax_Card/tax_office"/> 3768 <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//Tax_Card/tax_office"/>
@@ -4451,6 +4279,9 @@
4451 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aJ60AGDAEeq8BovXV4ESzw" name="FD" tooltipText="" outgoingEdges="_aY8HcGDAEeq8BovXV4ESzw" width="12" height="10"> 4279 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aJ60AGDAEeq8BovXV4ESzw" name="FD" tooltipText="" outgoingEdges="_aY8HcGDAEeq8BovXV4ESzw" width="12" height="10">
4452 <target xmi:type="ecore:EClass" href="Taxation.ecore#//FD"/> 4280 <target xmi:type="ecore:EClass" href="Taxation.ecore#//FD"/>
4453 <semanticElements xmi:type="ecore:EClass" href="Taxation.ecore#//FD"/> 4281 <semanticElements xmi:type="ecore:EClass" href="Taxation.ecore#//FD"/>
4282 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
4283 <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
4284 <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
4454 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aJ7bEGDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216"> 4285 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aJ7bEGDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
4455 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/> 4286 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
4456 </ownedStyle> 4287 </ownedStyle>
@@ -4463,18 +4294,13 @@
4463 </ownedStyle> 4294 </ownedStyle>
4464 <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/> 4295 <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
4465 </ownedElements> 4296 </ownedElements>
4466 <ownedElements xmi:type="diagram:DNodeListElement" uid="_aW9xgGDAEeq8BovXV4ESzw" name="/calculated_distance : EDouble = 0.0" tooltipText="">
4467 <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//FD/calculated_distance"/>
4468 <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//FD/calculated_distance"/>
4469 <ownedStyle xmi:type="diagram:BundledImage" uid="_aW9xgWDAEeq8BovXV4ESzw" labelColor="39,76,114" labelAlignment="LEFT" description="_aL9bYGDAEeq8BovXV4ESzw">
4470 <labelFormat>bold</labelFormat>
4471 </ownedStyle>
4472 <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
4473 </ownedElements>
4474 </ownedDiagramElements> 4297 </ownedDiagramElements>
4475 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aJ8pMGDAEeq8BovXV4ESzw" name="Professional_Expenses_Deduction" tooltipText="" incomingEdges="_aY8HcGDAEeq8BovXV4ESzw _aY8ugGDAEeq8BovXV4ESzw" width="12" height="10"> 4298 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aJ8pMGDAEeq8BovXV4ESzw" name="Professional_Expenses_Deduction" tooltipText="" incomingEdges="_aY8HcGDAEeq8BovXV4ESzw _aY8ugGDAEeq8BovXV4ESzw" width="12" height="10">
4476 <target xmi:type="ecore:EClass" href="Taxation.ecore#//Professional_Expenses_Deduction"/> 4299 <target xmi:type="ecore:EClass" href="Taxation.ecore#//Professional_Expenses_Deduction"/>
4477 <semanticElements xmi:type="ecore:EClass" href="Taxation.ecore#//Professional_Expenses_Deduction"/> 4300 <semanticElements xmi:type="ecore:EClass" href="Taxation.ecore#//Professional_Expenses_Deduction"/>
4301 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
4302 <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
4303 <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
4478 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aJ8pMWDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216"> 4304 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aJ8pMWDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
4479 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/> 4305 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
4480 </ownedStyle> 4306 </ownedStyle>
@@ -4483,22 +4309,20 @@
4483 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aJ93UGDAEeq8BovXV4ESzw" name="FO" tooltipText="" outgoingEdges="_aY8ugGDAEeq8BovXV4ESzw" width="12" height="10"> 4309 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aJ93UGDAEeq8BovXV4ESzw" name="FO" tooltipText="" outgoingEdges="_aY8ugGDAEeq8BovXV4ESzw" width="12" height="10">
4484 <target xmi:type="ecore:EClass" href="Taxation.ecore#//FO"/> 4310 <target xmi:type="ecore:EClass" href="Taxation.ecore#//FO"/>
4485 <semanticElements xmi:type="ecore:EClass" href="Taxation.ecore#//FO"/> 4311 <semanticElements xmi:type="ecore:EClass" href="Taxation.ecore#//FO"/>
4312 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
4313 <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
4314 <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
4486 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aJ93UWDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216"> 4315 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aJ93UWDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
4487 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/> 4316 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
4488 </ownedStyle> 4317 </ownedStyle>
4489 <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/> 4318 <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
4490 <ownedElements xmi:type="diagram:DNodeListElement" uid="_aW-_oGDAEeq8BovXV4ESzw" name="/rate_type_for_FO : Type_of_Rate = REGULAR" tooltipText="">
4491 <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//FO/rate_type_for_FO"/>
4492 <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//FO/rate_type_for_FO"/>
4493 <ownedStyle xmi:type="diagram:BundledImage" uid="_aW-_oWDAEeq8BovXV4ESzw" labelColor="39,76,114" labelAlignment="LEFT" description="_aL9bYGDAEeq8BovXV4ESzw">
4494 <labelFormat>bold</labelFormat>
4495 </ownedStyle>
4496 <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
4497 </ownedElements>
4498 </ownedDiagramElements> 4319 </ownedDiagramElements>
4499 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aJ_FcGDAEeq8BovXV4ESzw" name="DS_for_Permanent_Expense" tooltipText="" outgoingEdges="_aY8uh2DAEeq8BovXV4ESzw" width="12" height="10"> 4320 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aJ_FcGDAEeq8BovXV4ESzw" name="DS_for_Permanent_Expense" tooltipText="" outgoingEdges="_aY8uh2DAEeq8BovXV4ESzw" width="12" height="10">
4500 <target xmi:type="ecore:EClass" href="Taxation.ecore#//DS_for_Permanent_Expense"/> 4321 <target xmi:type="ecore:EClass" href="Taxation.ecore#//DS_for_Permanent_Expense"/>
4501 <semanticElements xmi:type="ecore:EClass" href="Taxation.ecore#//DS_for_Permanent_Expense"/> 4322 <semanticElements xmi:type="ecore:EClass" href="Taxation.ecore#//DS_for_Permanent_Expense"/>
4323 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
4324 <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
4325 <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
4502 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aJ_sgGDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216"> 4326 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aJ_sgGDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
4503 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/> 4327 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
4504 </ownedStyle> 4328 </ownedStyle>
@@ -4515,6 +4339,9 @@
4515 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aKATkGDAEeq8BovXV4ESzw" name="DS" tooltipText="" incomingEdges="_aY8uh2DAEeq8BovXV4ESzw _aY-jsGDAEeq8BovXV4ESzw _aY_KxmDAEeq8BovXV4ESzw _aZAY42DAEeq8BovXV4ESzw _aZBnAGDAEeq8BovXV4ESzw _aZCOE2DAEeq8BovXV4ESzw" width="12" height="10"> 4339 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aKATkGDAEeq8BovXV4ESzw" name="DS" tooltipText="" incomingEdges="_aY8uh2DAEeq8BovXV4ESzw _aY-jsGDAEeq8BovXV4ESzw _aY_KxmDAEeq8BovXV4ESzw _aZAY42DAEeq8BovXV4ESzw _aZBnAGDAEeq8BovXV4ESzw _aZCOE2DAEeq8BovXV4ESzw" width="12" height="10">
4516 <target xmi:type="ecore:EClass" href="Taxation.ecore#//DS"/> 4340 <target xmi:type="ecore:EClass" href="Taxation.ecore#//DS"/>
4517 <semanticElements xmi:type="ecore:EClass" href="Taxation.ecore#//DS"/> 4341 <semanticElements xmi:type="ecore:EClass" href="Taxation.ecore#//DS"/>
4342 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
4343 <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
4344 <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
4518 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aKA6oGDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216"> 4345 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aKA6oGDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
4519 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/> 4346 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
4520 </ownedStyle> 4347 </ownedStyle>
@@ -4539,6 +4366,9 @@
4539 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aKBhsGDAEeq8BovXV4ESzw" name="Category_of_Permanent_Expense" tooltipText="" width="12" height="10"> 4366 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aKBhsGDAEeq8BovXV4ESzw" name="Category_of_Permanent_Expense" tooltipText="" width="12" height="10">
4540 <target xmi:type="ecore:EEnum" href="Taxation.ecore#//Category_of_Permanent_Expense"/> 4367 <target xmi:type="ecore:EEnum" href="Taxation.ecore#//Category_of_Permanent_Expense"/>
4541 <semanticElements xmi:type="ecore:EEnum" href="Taxation.ecore#//Category_of_Permanent_Expense"/> 4368 <semanticElements xmi:type="ecore:EEnum" href="Taxation.ecore#//Category_of_Permanent_Expense"/>
4369 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
4370 <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
4371 <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
4542 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aKBhsWDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202"> 4372 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aKBhsWDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202">
4543 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/> 4373 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/>
4544 </ownedStyle> 4374 </ownedStyle>
@@ -4563,6 +4393,9 @@
4563 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aKCv0GDAEeq8BovXV4ESzw" name="DS_for_Interest_Expense" tooltipText="" outgoingEdges="_aY-jsGDAEeq8BovXV4ESzw" width="12" height="10"> 4393 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aKCv0GDAEeq8BovXV4ESzw" name="DS_for_Interest_Expense" tooltipText="" outgoingEdges="_aY-jsGDAEeq8BovXV4ESzw" width="12" height="10">
4564 <target xmi:type="ecore:EClass" href="Taxation.ecore#//DS_for_Interest_Expense"/> 4394 <target xmi:type="ecore:EClass" href="Taxation.ecore#//DS_for_Interest_Expense"/>
4565 <semanticElements xmi:type="ecore:EClass" href="Taxation.ecore#//DS_for_Interest_Expense"/> 4395 <semanticElements xmi:type="ecore:EClass" href="Taxation.ecore#//DS_for_Interest_Expense"/>
4396 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
4397 <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
4398 <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
4566 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aKCv0WDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216"> 4399 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aKCv0WDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
4567 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/> 4400 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
4568 </ownedStyle> 4401 </ownedStyle>
@@ -4571,6 +4404,9 @@
4571 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aKD98GDAEeq8BovXV4ESzw" name="DS_for_Health_and_Pension_Insurance" tooltipText="" outgoingEdges="_aY_KxmDAEeq8BovXV4ESzw" width="12" height="10"> 4404 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aKD98GDAEeq8BovXV4ESzw" name="DS_for_Health_and_Pension_Insurance" tooltipText="" outgoingEdges="_aY_KxmDAEeq8BovXV4ESzw" width="12" height="10">
4572 <target xmi:type="ecore:EClass" href="Taxation.ecore#//DS_for_Health_and_Pension_Insurance"/> 4405 <target xmi:type="ecore:EClass" href="Taxation.ecore#//DS_for_Health_and_Pension_Insurance"/>
4573 <semanticElements xmi:type="ecore:EClass" href="Taxation.ecore#//DS_for_Health_and_Pension_Insurance"/> 4406 <semanticElements xmi:type="ecore:EClass" href="Taxation.ecore#//DS_for_Health_and_Pension_Insurance"/>
4407 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
4408 <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
4409 <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
4574 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aKD98WDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216"> 4410 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aKD98WDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
4575 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/> 4411 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
4576 </ownedStyle> 4412 </ownedStyle>
@@ -4587,6 +4423,9 @@
4587 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aKFMEGDAEeq8BovXV4ESzw" name="Category_of_Health_and_Pension_Insurances" tooltipText="" width="12" height="10"> 4423 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aKFMEGDAEeq8BovXV4ESzw" name="Category_of_Health_and_Pension_Insurances" tooltipText="" width="12" height="10">
4588 <target xmi:type="ecore:EEnum" href="Taxation.ecore#//Category_of_Health_and_Pension_Insurances"/> 4424 <target xmi:type="ecore:EEnum" href="Taxation.ecore#//Category_of_Health_and_Pension_Insurances"/>
4589 <semanticElements xmi:type="ecore:EEnum" href="Taxation.ecore#//Category_of_Health_and_Pension_Insurances"/> 4425 <semanticElements xmi:type="ecore:EEnum" href="Taxation.ecore#//Category_of_Health_and_Pension_Insurances"/>
4426 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
4427 <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
4428 <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
4590 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aKFMEWDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202"> 4429 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aKFMEWDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202">
4591 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/> 4430 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/>
4592 </ownedStyle> 4431 </ownedStyle>
@@ -4619,6 +4458,9 @@
4619 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aKFzIWDAEeq8BovXV4ESzw" name="DS_for_Private_Insurance_and_Plan" tooltipText="" outgoingEdges="_aZAY42DAEeq8BovXV4ESzw" width="12" height="10"> 4458 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aKFzIWDAEeq8BovXV4ESzw" name="DS_for_Private_Insurance_and_Plan" tooltipText="" outgoingEdges="_aZAY42DAEeq8BovXV4ESzw" width="12" height="10">
4620 <target xmi:type="ecore:EClass" href="Taxation.ecore#//DS_for_Private_Insurance_and_Plan"/> 4459 <target xmi:type="ecore:EClass" href="Taxation.ecore#//DS_for_Private_Insurance_and_Plan"/>
4621 <semanticElements xmi:type="ecore:EClass" href="Taxation.ecore#//DS_for_Private_Insurance_and_Plan"/> 4460 <semanticElements xmi:type="ecore:EClass" href="Taxation.ecore#//DS_for_Private_Insurance_and_Plan"/>
4461 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
4462 <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
4463 <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
4622 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aKGaMGDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216"> 4464 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aKGaMGDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
4623 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/> 4465 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
4624 </ownedStyle> 4466 </ownedStyle>
@@ -4631,34 +4473,13 @@
4631 </ownedStyle> 4473 </ownedStyle>
4632 <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/> 4474 <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
4633 </ownedElements> 4475 </ownedElements>
4634 <ownedElements xmi:type="diagram:DNodeListElement" uid="_aXEfMGDAEeq8BovXV4ESzw" name="/increase_for_life_insurance : EDouble = 0.0" tooltipText="">
4635 <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//DS_for_Private_Insurance_and_Plan/increase_for_life_insurance"/>
4636 <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//DS_for_Private_Insurance_and_Plan/increase_for_life_insurance"/>
4637 <ownedStyle xmi:type="diagram:BundledImage" uid="_aXG7cGDAEeq8BovXV4ESzw" labelColor="39,76,114" labelAlignment="LEFT" description="_aL9bYGDAEeq8BovXV4ESzw">
4638 <labelFormat>bold</labelFormat>
4639 </ownedStyle>
4640 <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
4641 </ownedElements>
4642 <ownedElements xmi:type="diagram:DNodeListElement" uid="_aXG7cWDAEeq8BovXV4ESzw" name="/maximum_deductible_amount_for_private_insurance : EDouble = 0.0" tooltipText="">
4643 <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//DS_for_Private_Insurance_and_Plan/maximum_deductible_amount_for_private_insurance"/>
4644 <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//DS_for_Private_Insurance_and_Plan/maximum_deductible_amount_for_private_insurance"/>
4645 <ownedStyle xmi:type="diagram:BundledImage" uid="_aXHigGDAEeq8BovXV4ESzw" labelColor="39,76,114" labelAlignment="LEFT" description="_aL9bYGDAEeq8BovXV4ESzw">
4646 <labelFormat>bold</labelFormat>
4647 </ownedStyle>
4648 <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
4649 </ownedElements>
4650 <ownedElements xmi:type="diagram:DNodeListElement" uid="_aXHigWDAEeq8BovXV4ESzw" name="/maximum_deductible_amount_for_old_age_pension_plan : EDouble = 0.0" tooltipText="">
4651 <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//DS_for_Private_Insurance_and_Plan/maximum_deductible_amount_for_old_age_pension_plan"/>
4652 <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//DS_for_Private_Insurance_and_Plan/maximum_deductible_amount_for_old_age_pension_plan"/>
4653 <ownedStyle xmi:type="diagram:BundledImage" uid="_aXIJkGDAEeq8BovXV4ESzw" labelColor="39,76,114" labelAlignment="LEFT" description="_aL9bYGDAEeq8BovXV4ESzw">
4654 <labelFormat>bold</labelFormat>
4655 </ownedStyle>
4656 <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
4657 </ownedElements>
4658 </ownedDiagramElements> 4476 </ownedDiagramElements>
4659 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aKHBQWDAEeq8BovXV4ESzw" name="Category_of_Private_Insurance_and_Plan" tooltipText="" width="12" height="10"> 4477 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aKHBQWDAEeq8BovXV4ESzw" name="Category_of_Private_Insurance_and_Plan" tooltipText="" width="12" height="10">
4660 <target xmi:type="ecore:EEnum" href="Taxation.ecore#//Category_of_Private_Insurance_and_Plan"/> 4478 <target xmi:type="ecore:EEnum" href="Taxation.ecore#//Category_of_Private_Insurance_and_Plan"/>
4661 <semanticElements xmi:type="ecore:EEnum" href="Taxation.ecore#//Category_of_Private_Insurance_and_Plan"/> 4479 <semanticElements xmi:type="ecore:EEnum" href="Taxation.ecore#//Category_of_Private_Insurance_and_Plan"/>
4480 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
4481 <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
4482 <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
4662 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aKHoUGDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202"> 4483 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aKHoUGDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202">
4663 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/> 4484 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/>
4664 </ownedStyle> 4485 </ownedStyle>
@@ -4707,6 +4528,9 @@
4707 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aKIPYGDAEeq8BovXV4ESzw" name="DS_for_Loss_Carryforward" tooltipText="" outgoingEdges="_aZBnAGDAEeq8BovXV4ESzw" width="12" height="10"> 4528 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aKIPYGDAEeq8BovXV4ESzw" name="DS_for_Loss_Carryforward" tooltipText="" outgoingEdges="_aZBnAGDAEeq8BovXV4ESzw" width="12" height="10">
4708 <target xmi:type="ecore:EClass" href="Taxation.ecore#//DS_for_Loss_Carryforward"/> 4529 <target xmi:type="ecore:EClass" href="Taxation.ecore#//DS_for_Loss_Carryforward"/>
4709 <semanticElements xmi:type="ecore:EClass" href="Taxation.ecore#//DS_for_Loss_Carryforward"/> 4530 <semanticElements xmi:type="ecore:EClass" href="Taxation.ecore#//DS_for_Loss_Carryforward"/>
4531 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
4532 <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
4533 <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
4710 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aKI2cGDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216"> 4534 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aKI2cGDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
4711 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/> 4535 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
4712 </ownedStyle> 4536 </ownedStyle>
@@ -4715,6 +4539,9 @@
4715 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aKJdgGDAEeq8BovXV4ESzw" name="DS_for_Donation" tooltipText="" outgoingEdges="_aZCOE2DAEeq8BovXV4ESzw" width="12" height="10"> 4539 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aKJdgGDAEeq8BovXV4ESzw" name="DS_for_Donation" tooltipText="" outgoingEdges="_aZCOE2DAEeq8BovXV4ESzw" width="12" height="10">
4716 <target xmi:type="ecore:EClass" href="Taxation.ecore#//DS_for_Donation"/> 4540 <target xmi:type="ecore:EClass" href="Taxation.ecore#//DS_for_Donation"/>
4717 <semanticElements xmi:type="ecore:EClass" href="Taxation.ecore#//DS_for_Donation"/> 4541 <semanticElements xmi:type="ecore:EClass" href="Taxation.ecore#//DS_for_Donation"/>
4542 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
4543 <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
4544 <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
4718 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aKJdgWDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216"> 4545 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aKJdgWDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
4719 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/> 4546 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
4720 </ownedStyle> 4547 </ownedStyle>
@@ -4735,14 +4562,6 @@
4735 </ownedStyle> 4562 </ownedStyle>
4736 <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/> 4563 <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
4737 </ownedElements> 4564 </ownedElements>
4738 <ownedElements xmi:type="diagram:DNodeListElement" uid="_aXJ-wWDAEeq8BovXV4ESzw" name="/is_eligible_for_deduction : EBoolean = false" tooltipText="">
4739 <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//Permanent_Expense/is_eligible_for_deduction"/>
4740 <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//Permanent_Expense/is_eligible_for_deduction"/>
4741 <ownedStyle xmi:type="diagram:BundledImage" uid="_aXKl0GDAEeq8BovXV4ESzw" labelColor="39,76,114" labelAlignment="LEFT" description="_aL9bYGDAEeq8BovXV4ESzw">
4742 <labelFormat>bold</labelFormat>
4743 </ownedStyle>
4744 <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
4745 </ownedElements>
4746 </ownedDiagramElements> 4565 </ownedDiagramElements>
4747 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aKL5wGDAEeq8BovXV4ESzw" name="Special_Expense_DS" tooltipText="" outgoingEdges="_aZEqUGDAEeq8BovXV4ESzw" incomingEdges="_aZDcM2DAEeq8BovXV4ESzw _aZFRY2DAEeq8BovXV4ESzw _aZF4dmDAEeq8BovXV4ESzw _aZGfhmDAEeq8BovXV4ESzw _aZHGlmDAEeq8BovXV4ESzw _aZHtpmDAEeq8BovXV4ESzw" width="12" height="10"> 4566 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aKL5wGDAEeq8BovXV4ESzw" name="Special_Expense_DS" tooltipText="" outgoingEdges="_aZEqUGDAEeq8BovXV4ESzw" incomingEdges="_aZDcM2DAEeq8BovXV4ESzw _aZFRY2DAEeq8BovXV4ESzw _aZF4dmDAEeq8BovXV4ESzw _aZGfhmDAEeq8BovXV4ESzw _aZHGlmDAEeq8BovXV4ESzw _aZHtpmDAEeq8BovXV4ESzw" width="12" height="10">
4748 <target xmi:type="ecore:EClass" href="Taxation.ecore#//Special_Expense_DS"/> 4567 <target xmi:type="ecore:EClass" href="Taxation.ecore#//Special_Expense_DS"/>
@@ -4783,14 +4602,6 @@
4783 </ownedStyle> 4602 </ownedStyle>
4784 <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/> 4603 <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
4785 </ownedElements> 4604 </ownedElements>
4786 <ownedElements xmi:type="diagram:DNodeListElement" uid="_aXNCEGDAEeq8BovXV4ESzw" name="/is_private_insurance_and_plan_eligible_for_deduction : EBoolean = false" tooltipText="">
4787 <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//Private_Insurance_and_Plan/is_private_insurance_and_plan_eligible_for_deduction"/>
4788 <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//Private_Insurance_and_Plan/is_private_insurance_and_plan_eligible_for_deduction"/>
4789 <ownedStyle xmi:type="diagram:BundledImage" uid="_aXNCEWDAEeq8BovXV4ESzw" labelColor="39,76,114" labelAlignment="LEFT" description="_aL9bYGDAEeq8BovXV4ESzw">
4790 <labelFormat>bold</labelFormat>
4791 </ownedStyle>
4792 <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
4793 </ownedElements>
4794 </ownedDiagramElements> 4605 </ownedDiagramElements>
4795 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aKPkIGDAEeq8BovXV4ESzw" name="Health_and_Pension_Insurance" tooltipText="" outgoingEdges="_aZGfhmDAEeq8BovXV4ESzw" width="12" height="10"> 4606 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aKPkIGDAEeq8BovXV4ESzw" name="Health_and_Pension_Insurance" tooltipText="" outgoingEdges="_aZGfhmDAEeq8BovXV4ESzw" width="12" height="10">
4796 <target xmi:type="ecore:EClass" href="Taxation.ecore#//Health_and_Pension_Insurance"/> 4607 <target xmi:type="ecore:EClass" href="Taxation.ecore#//Health_and_Pension_Insurance"/>
@@ -4831,14 +4642,6 @@
4831 </ownedStyle> 4642 </ownedStyle>
4832 <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/> 4643 <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
4833 </ownedElements> 4644 </ownedElements>
4834 <ownedElements xmi:type="diagram:DNodeListElement" uid="_aXR6kGDAEeq8BovXV4ESzw" name="/is_beneficiary_eligible : EBoolean = false" tooltipText="">
4835 <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//Donation/is_beneficiary_eligible"/>
4836 <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//Donation/is_beneficiary_eligible"/>
4837 <ownedStyle xmi:type="diagram:BundledImage" uid="_aXShoGDAEeq8BovXV4ESzw" labelColor="39,76,114" labelAlignment="LEFT" description="_aL9bYGDAEeq8BovXV4ESzw">
4838 <labelFormat>bold</labelFormat>
4839 </ownedStyle>
4840 <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
4841 </ownedElements>
4842 <ownedElements xmi:type="diagram:DNodeListElement" uid="_aXShoWDAEeq8BovXV4ESzw" name="is_donation_reported : EBoolean = false" tooltipText=""> 4645 <ownedElements xmi:type="diagram:DNodeListElement" uid="_aXShoWDAEeq8BovXV4ESzw" name="is_donation_reported : EBoolean = false" tooltipText="">
4843 <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//Donation/is_donation_reported"/> 4646 <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//Donation/is_donation_reported"/>
4844 <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//Donation/is_donation_reported"/> 4647 <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//Donation/is_donation_reported"/>
@@ -4855,38 +4658,6 @@
4855 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/> 4658 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
4856 </ownedStyle> 4659 </ownedStyle>
4857 <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/> 4660 <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
4858 <ownedElements xmi:type="diagram:DNodeListElement" uid="_aXTvwGDAEeq8BovXV4ESzw" name="/regular_accountability : EBoolean = false" tooltipText="">
4859 <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//Loss_Carryforward/regular_accountability"/>
4860 <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//Loss_Carryforward/regular_accountability"/>
4861 <ownedStyle xmi:type="diagram:BundledImage" uid="_aXUW0GDAEeq8BovXV4ESzw" labelColor="39,76,114" labelAlignment="LEFT" description="_aL9bYGDAEeq8BovXV4ESzw">
4862 <labelFormat>bold</labelFormat>
4863 </ownedStyle>
4864 <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
4865 </ownedElements>
4866 <ownedElements xmi:type="diagram:DNodeListElement" uid="_aXU94GDAEeq8BovXV4ESzw" name="/compensation_by_other_means : EBoolean = false" tooltipText="">
4867 <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//Loss_Carryforward/compensation_by_other_means"/>
4868 <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//Loss_Carryforward/compensation_by_other_means"/>
4869 <ownedStyle xmi:type="diagram:BundledImage" uid="_aXU94WDAEeq8BovXV4ESzw" labelColor="39,76,114" labelAlignment="LEFT" description="_aL9bYGDAEeq8BovXV4ESzw">
4870 <labelFormat>bold</labelFormat>
4871 </ownedStyle>
4872 <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
4873 </ownedElements>
4874 <ownedElements xmi:type="diagram:DNodeListElement" uid="_aXVk8GDAEeq8BovXV4ESzw" name="/tax_payer_has_inherited_business_ownership : EBoolean = false" tooltipText="">
4875 <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//Loss_Carryforward/tax_payer_has_inherited_business_ownership"/>
4876 <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//Loss_Carryforward/tax_payer_has_inherited_business_ownership"/>
4877 <ownedStyle xmi:type="diagram:BundledImage" uid="_aXVk8WDAEeq8BovXV4ESzw" labelColor="39,76,114" labelAlignment="LEFT" description="_aL9bYGDAEeq8BovXV4ESzw">
4878 <labelFormat>bold</labelFormat>
4879 </ownedStyle>
4880 <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
4881 </ownedElements>
4882 <ownedElements xmi:type="diagram:DNodeListElement" uid="_aXWMAGDAEeq8BovXV4ESzw" name="/tax_payer_has_been_partner_in_business : EBoolean = true" tooltipText="">
4883 <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//Loss_Carryforward/tax_payer_has_been_partner_in_business"/>
4884 <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//Loss_Carryforward/tax_payer_has_been_partner_in_business"/>
4885 <ownedStyle xmi:type="diagram:BundledImage" uid="_aXWMAWDAEeq8BovXV4ESzw" labelColor="39,76,114" labelAlignment="LEFT" description="_aL9bYGDAEeq8BovXV4ESzw">
4886 <labelFormat>bold</labelFormat>
4887 </ownedStyle>
4888 <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
4889 </ownedElements>
4890 </ownedDiagramElements> 4661 </ownedDiagramElements>
4891 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aKT1kGDAEeq8BovXV4ESzw" name="Spousal_Expense_AC" tooltipText="" outgoingEdges="_aZIUs2DAEeq8BovXV4ESzw" width="12" height="10"> 4662 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aKT1kGDAEeq8BovXV4ESzw" name="Spousal_Expense_AC" tooltipText="" outgoingEdges="_aZIUs2DAEeq8BovXV4ESzw" width="12" height="10">
4892 <target xmi:type="ecore:EClass" href="Taxation.ecore#//Spousal_Expense_AC"/> 4663 <target xmi:type="ecore:EClass" href="Taxation.ecore#//Spousal_Expense_AC"/>
@@ -4947,6 +4718,9 @@
4947 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aKYuEWDAEeq8BovXV4ESzw" name="Legal_Union_Types" tooltipText="" width="12" height="10"> 4718 <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_aKYuEWDAEeq8BovXV4ESzw" name="Legal_Union_Types" tooltipText="" width="12" height="10">
4948 <target xmi:type="ecore:EEnum" href="Taxation.ecore#//Legal_Union_Types"/> 4719 <target xmi:type="ecore:EEnum" href="Taxation.ecore#//Legal_Union_Types"/>
4949 <semanticElements xmi:type="ecore:EEnum" href="Taxation.ecore#//Legal_Union_Types"/> 4720 <semanticElements xmi:type="ecore:EEnum" href="Taxation.ecore#//Legal_Union_Types"/>
4721 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
4722 <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
4723 <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
4950 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aKYuEmDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202"> 4724 <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_aKYuEmDAEeq8BovXV4ESzw" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202">
4951 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/> 4725 <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/>
4952 </ownedStyle> 4726 </ownedStyle>
@@ -5789,4 +5563,4 @@
5789 <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Archetype']/@ownedRepresentationExtensions[name='Entities%20With%20Archetypes']/@layers[name='Archetypes']"/> 5563 <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Archetype']/@ownedRepresentationExtensions[name='Entities%20With%20Archetypes']/@layers[name='Archetypes']"/>
5790 <target xmi:type="ecore:EPackage" href="Taxation.ecore#/"/> 5564 <target xmi:type="ecore:EPackage" href="Taxation.ecore#/"/>
5791 </diagram:DSemanticDiagram> 5565 </diagram:DSemanticDiagram>
5792</xmi:XMI> \ No newline at end of file 5566</xmi:XMI>
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/model/Taxation.ecore b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/model/Taxation.ecore
index cfed4729..12571827 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/model/Taxation.ecore
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/model/Taxation.ecore
@@ -96,10 +96,6 @@
96 <eLiterals name="NN" value="4" literal="NN"/> 96 <eLiterals name="NN" value="4" literal="NN"/>
97 <eLiterals name="OTHER" value="5" literal="OTHER"/> 97 <eLiterals name="OTHER" value="5" literal="OTHER"/>
98 </eClassifiers> 98 </eClassifiers>
99 <eClassifiers xsi:type="ecore:EEnum" name="Tax_Card_Type">
100 <eLiterals name="Principal" literal="Principal"/>
101 <eLiterals name="Additional" value="1" literal="Additional"/>
102 </eClassifiers>
103 <eClassifiers xsi:type="ecore:EEnum" name="Tax_Office"> 99 <eClassifiers xsi:type="ecore:EEnum" name="Tax_Office">
104 <eLiterals name="RTS_2" literal="RTS_2"/> 100 <eLiterals name="RTS_2" literal="RTS_2"/>
105 <eLiterals name="RTS_3" value="1" literal="RTS_3"/> 101 <eLiterals name="RTS_3" value="1" literal="RTS_3"/>
@@ -123,10 +119,6 @@
123 <eLiterals name="TT" value="3" literal="TT"/> 119 <eLiterals name="TT" value="3" literal="TT"/>
124 <eLiterals name="Other" value="4" literal="Other"/> 120 <eLiterals name="Other" value="4" literal="Other"/>
125 </eClassifiers> 121 </eClassifiers>
126 <eClassifiers xsi:type="ecore:EEnum" name="Type_of_Rate">
127 <eLiterals name="REGULAR" literal="REGULAR"/>
128 <eLiterals name="REAL_COST" value="1" literal="REAL_COST"/>
129 </eClassifiers>
130 <eClassifiers xsi:type="ecore:EEnum" name="CE_Type"> 122 <eClassifiers xsi:type="ecore:EEnum" name="CE_Type">
131 <eLiterals name="INALIDITY_AND_INFIRMITY" literal="INALIDITY_AND_INFIRMITY"/> 123 <eLiterals name="INALIDITY_AND_INFIRMITY" literal="INALIDITY_AND_INFIRMITY"/>
132 <eLiterals name="DEPENDENCE_AND_CARE_EXCLUDING_CHLIDREN_NOT_PART_OF_HOUSEHOLD" 124 <eLiterals name="DEPENDENCE_AND_CARE_EXCLUDING_CHLIDREN_NOT_PART_OF_HOUSEHOLD"
@@ -173,12 +165,8 @@
173 lowerBound="1" upperBound="-1" eType="#//Income" containment="true" eOpposite="#//Income/taxPayer"/> 165 lowerBound="1" upperBound="-1" eType="#//Income" containment="true" eOpposite="#//Income/taxPayer"/>
174 <eStructuralFeatures xsi:type="ecore:EReference" name="from_law" lowerBound="1" 166 <eStructuralFeatures xsi:type="ecore:EReference" name="from_law" lowerBound="1"
175 eType="#//FromLaw" containment="true" eOpposite="#//FromLaw/taxPayer"/> 167 eType="#//FromLaw" containment="true" eOpposite="#//FromLaw/taxPayer"/>
176 <eStructuralFeatures xsi:type="ecore:EAttribute" name="taxesDue" ordered="false"
177 lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
178 </eClassifiers> 168 </eClassifiers>
179 <eClassifiers xsi:type="ecore:EClass" name="Physical_Person"> 169 <eClassifiers xsi:type="ecore:EClass" name="Physical_Person">
180 <eStructuralFeatures xsi:type="ecore:EAttribute" name="is_assisting_spouse" lowerBound="1"
181 eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" derived="true"/>
182 <eStructuralFeatures xsi:type="ecore:EAttribute" name="SSNo" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" 170 <eStructuralFeatures xsi:type="ecore:EAttribute" name="SSNo" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
183 iD="true"/> 171 iD="true"/>
184 <eStructuralFeatures xsi:type="ecore:EReference" name="addresses" ordered="false" 172 <eStructuralFeatures xsi:type="ecore:EReference" name="addresses" ordered="false"
@@ -189,9 +177,6 @@
189 ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/> 177 ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
190 <eStructuralFeatures xsi:type="ecore:EAttribute" name="disability_type" ordered="false" 178 <eStructuralFeatures xsi:type="ecore:EAttribute" name="disability_type" ordered="false"
191 unique="false" lowerBound="1" eType="#//Disability_Types"/> 179 unique="false" lowerBound="1" eType="#//Disability_Types"/>
192 <eStructuralFeatures xsi:type="ecore:EAttribute" name="is_affiliated_personnaly_to_social_security"
193 lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
194 derived="true"/>
195 <eStructuralFeatures xsi:type="ecore:EAttribute" name="birth_month" ordered="false" 180 <eStructuralFeatures xsi:type="ecore:EAttribute" name="birth_month" ordered="false"
196 unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/> 181 unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
197 <eStructuralFeatures xsi:type="ecore:EAttribute" name="birth_day" ordered="false" 182 <eStructuralFeatures xsi:type="ecore:EAttribute" name="birth_day" ordered="false"
@@ -247,8 +232,6 @@
247 upperBound="-1" eType="#//Expense" eOpposite="#//Expense/dependent"/> 232 upperBound="-1" eType="#//Expense" eOpposite="#//Expense/dependent"/>
248 </eClassifiers> 233 </eClassifiers>
249 <eClassifiers xsi:type="ecore:EClass" name="External_Allowance"> 234 <eClassifiers xsi:type="ecore:EClass" name="External_Allowance">
250 <eStructuralFeatures xsi:type="ecore:EAttribute" name="amount" lowerBound="1"
251 eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
252 <eStructuralFeatures xsi:type="ecore:EAttribute" name="grantor" lowerBound="1" 235 <eStructuralFeatures xsi:type="ecore:EAttribute" name="grantor" lowerBound="1"
253 eType="#//Grantor"/> 236 eType="#//Grantor"/>
254 <eStructuralFeatures xsi:type="ecore:EAttribute" name="starting_year" ordered="false" 237 <eStructuralFeatures xsi:type="ecore:EAttribute" name="starting_year" ordered="false"
@@ -349,13 +332,6 @@
349 upperBound="-1" eType="#//Expense" containment="true" eOpposite="#//Expense/income"/> 332 upperBound="-1" eType="#//Expense" containment="true" eOpposite="#//Expense/income"/>
350 </eClassifiers> 333 </eClassifiers>
351 <eClassifiers xsi:type="ecore:EClass" name="Income_Type" abstract="true"> 334 <eClassifiers xsi:type="ecore:EClass" name="Income_Type" abstract="true">
352 <eStructuralFeatures xsi:type="ecore:EAttribute" name="subjectToWithholdingTax"
353 lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
354 derived="true">
355 <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
356 <details key="derivation" value="&#xA;&#x9;&#x9;&#x9;&#x9;self.income.tax_card->notEmpty()&#xA;&#x9;&#x9;&#x9;&#x9;"/>
357 </eAnnotations>
358 </eStructuralFeatures>
359 <eStructuralFeatures xsi:type="ecore:EAttribute" name="id8" ordered="false" lowerBound="1" 335 <eStructuralFeatures xsi:type="ecore:EAttribute" name="id8" ordered="false" lowerBound="1"
360 eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" iD="true"/> 336 eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" iD="true"/>
361 <eStructuralFeatures xsi:type="ecore:EReference" name="income" lowerBound="1" 337 <eStructuralFeatures xsi:type="ecore:EReference" name="income" lowerBound="1"
@@ -364,12 +340,6 @@
364 <eClassifiers xsi:type="ecore:EClass" name="Tax_Card"> 340 <eClassifiers xsi:type="ecore:EClass" name="Tax_Card">
365 <eStructuralFeatures xsi:type="ecore:EAttribute" name="card_identifier" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" 341 <eStructuralFeatures xsi:type="ecore:EAttribute" name="card_identifier" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
366 iD="true"/> 342 iD="true"/>
367 <eStructuralFeatures xsi:type="ecore:EAttribute" name="tax_card_type" lowerBound="1"
368 eType="#//Tax_Card_Type" derived="true">
369 <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
370 <details key="derivation" value="if(self.income.taxPayer.incomes->size()=1) then &#xA;Tax_Card_Type::Principal&#xA;&#x9;else&#xA;&#x9;&#x9;let all_incomes:OrderedSet(Income)=self.income.taxPayer.incomes->select(inc:Income| inc.income_amount= self.income.taxPayer.incomes.income_amount->max())->asOrderedSet() in&#xA;&#x9;&#x9;let bigest_income:Income= all_incomes->first() in&#xA;&#x9;&#x9;&#x9; if(bigest_income=self.income) then&#xA;&#x9;&#x9;&#x9; &#x9; Tax_Card_Type::Principal&#xA;&#x9;&#x9;&#x9; else&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;Tax_Card_Type::Additional&#xA;&#x9;&#x9;&#x9;&#x9;endif&#xA;endif&#xA;&#x9;&#x9;&#x9;&#x9;"/>
371 </eAnnotations>
372 </eStructuralFeatures>
373 <eStructuralFeatures xsi:type="ecore:EAttribute" name="tax_office" lowerBound="1" 343 <eStructuralFeatures xsi:type="ecore:EAttribute" name="tax_office" lowerBound="1"
374 eType="#//Tax_Office"/> 344 eType="#//Tax_Office"/>
375 <eStructuralFeatures xsi:type="ecore:EAttribute" name="percentage_of_witholding" 345 <eStructuralFeatures xsi:type="ecore:EAttribute" name="percentage_of_witholding"
@@ -520,14 +490,9 @@
520 <eClassifiers xsi:type="ecore:EClass" name="FD" eSuperTypes="#//Professional_Expenses_Deduction"> 490 <eClassifiers xsi:type="ecore:EClass" name="FD" eSuperTypes="#//Professional_Expenses_Deduction">
521 <eStructuralFeatures xsi:type="ecore:EAttribute" name="distance_declared_in_january" 491 <eStructuralFeatures xsi:type="ecore:EAttribute" name="distance_declared_in_january"
522 lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/> 492 lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
523 <eStructuralFeatures xsi:type="ecore:EAttribute" name="calculated_distance" lowerBound="1"
524 eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble" derived="true"/>
525 </eClassifiers> 493 </eClassifiers>
526 <eClassifiers xsi:type="ecore:EClass" name="Professional_Expenses_Deduction"/> 494 <eClassifiers xsi:type="ecore:EClass" name="Professional_Expenses_Deduction"/>
527 <eClassifiers xsi:type="ecore:EClass" name="FO" eSuperTypes="#//Professional_Expenses_Deduction"> 495 <eClassifiers xsi:type="ecore:EClass" name="FO" eSuperTypes="#//Professional_Expenses_Deduction"/>
528 <eStructuralFeatures xsi:type="ecore:EAttribute" name="rate_type_for_FO" lowerBound="1"
529 eType="#//Type_of_Rate" derived="true"/>
530 </eClassifiers>
531 <eClassifiers xsi:type="ecore:EClass" name="DS_for_Permanent_Expense" eSuperTypes="#//DS"> 496 <eClassifiers xsi:type="ecore:EClass" name="DS_for_Permanent_Expense" eSuperTypes="#//DS">
532 <eStructuralFeatures xsi:type="ecore:EAttribute" name="permanent_expense_category" 497 <eStructuralFeatures xsi:type="ecore:EAttribute" name="permanent_expense_category"
533 lowerBound="1" eType="#//Category_of_Permanent_Expense"/> 498 lowerBound="1" eType="#//Category_of_Permanent_Expense"/>
@@ -556,15 +521,6 @@
556 <eClassifiers xsi:type="ecore:EClass" name="DS_for_Private_Insurance_and_Plan" eSuperTypes="#//DS"> 521 <eClassifiers xsi:type="ecore:EClass" name="DS_for_Private_Insurance_and_Plan" eSuperTypes="#//DS">
557 <eStructuralFeatures xsi:type="ecore:EAttribute" name="private_insurance_and_plan_category" 522 <eStructuralFeatures xsi:type="ecore:EAttribute" name="private_insurance_and_plan_category"
558 lowerBound="1" eType="#//Category_of_Private_Insurance_and_Plan"/> 523 lowerBound="1" eType="#//Category_of_Private_Insurance_and_Plan"/>
559 <eStructuralFeatures xsi:type="ecore:EAttribute" name="increase_for_life_insurance"
560 lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
561 derived="true"/>
562 <eStructuralFeatures xsi:type="ecore:EAttribute" name="maximum_deductible_amount_for_private_insurance"
563 lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
564 derived="true"/>
565 <eStructuralFeatures xsi:type="ecore:EAttribute" name="maximum_deductible_amount_for_old_age_pension_plan"
566 lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
567 derived="true"/>
568 </eClassifiers> 524 </eClassifiers>
569 <eClassifiers xsi:type="ecore:EEnum" name="Category_of_Private_Insurance_and_Plan"> 525 <eClassifiers xsi:type="ecore:EEnum" name="Category_of_Private_Insurance_and_Plan">
570 <eLiterals name="PRIVATE_INSURANCE" literal="PRIVATE_INSURANCE"/> 526 <eLiterals name="PRIVATE_INSURANCE" literal="PRIVATE_INSURANCE"/>
@@ -578,9 +534,6 @@
578 <eClassifiers xsi:type="ecore:EClass" name="Permanent_Expense" eSuperTypes="#//Special_Expense_DS"> 534 <eClassifiers xsi:type="ecore:EClass" name="Permanent_Expense" eSuperTypes="#//Special_Expense_DS">
579 <eStructuralFeatures xsi:type="ecore:EAttribute" name="category" lowerBound="1" 535 <eStructuralFeatures xsi:type="ecore:EAttribute" name="category" lowerBound="1"
580 eType="#//Category_of_Permanent_Expense"/> 536 eType="#//Category_of_Permanent_Expense"/>
581 <eStructuralFeatures xsi:type="ecore:EAttribute" name="is_eligible_for_deduction"
582 lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
583 defaultValueLiteral="false" derived="true"/>
584 </eClassifiers> 537 </eClassifiers>
585 <eClassifiers xsi:type="ecore:EClass" name="Special_Expense_DS" eSuperTypes="#//Expense"/> 538 <eClassifiers xsi:type="ecore:EClass" name="Special_Expense_DS" eSuperTypes="#//Expense"/>
586 <eClassifiers xsi:type="ecore:EClass" name="Interest_Expense" eSuperTypes="#//Special_Expense_DS"/> 539 <eClassifiers xsi:type="ecore:EClass" name="Interest_Expense" eSuperTypes="#//Special_Expense_DS"/>
@@ -589,9 +542,6 @@
589 eType="#//Category_of_Private_Insurance_and_Plan"/> 542 eType="#//Category_of_Private_Insurance_and_Plan"/>
590 <eStructuralFeatures xsi:type="ecore:EAttribute" name="duration_of_contract" lowerBound="1" 543 <eStructuralFeatures xsi:type="ecore:EAttribute" name="duration_of_contract" lowerBound="1"
591 eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/> 544 eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
592 <eStructuralFeatures xsi:type="ecore:EAttribute" name="is_private_insurance_and_plan_eligible_for_deduction"
593 lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
594 defaultValueLiteral="false" derived="true"/>
595 </eClassifiers> 545 </eClassifiers>
596 <eClassifiers xsi:type="ecore:EClass" name="Health_and_Pension_Insurance" eSuperTypes="#//Special_Expense_DS"> 546 <eClassifiers xsi:type="ecore:EClass" name="Health_and_Pension_Insurance" eSuperTypes="#//Special_Expense_DS">
597 <eStructuralFeatures xsi:type="ecore:EAttribute" name="category" lowerBound="1" 547 <eStructuralFeatures xsi:type="ecore:EAttribute" name="category" lowerBound="1"
@@ -603,26 +553,10 @@
603 <eClassifiers xsi:type="ecore:EClass" name="Donation" eSuperTypes="#//Special_Expense_DS"> 553 <eClassifiers xsi:type="ecore:EClass" name="Donation" eSuperTypes="#//Special_Expense_DS">
604 <eStructuralFeatures xsi:type="ecore:EAttribute" name="beneficiary1" lowerBound="1" 554 <eStructuralFeatures xsi:type="ecore:EAttribute" name="beneficiary1" lowerBound="1"
605 eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> 555 eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
606 <eStructuralFeatures xsi:type="ecore:EAttribute" name="is_beneficiary_eligible"
607 lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
608 defaultValueLiteral="false" derived="true"/>
609 <eStructuralFeatures xsi:type="ecore:EAttribute" name="is_donation_reported" lowerBound="1" 556 <eStructuralFeatures xsi:type="ecore:EAttribute" name="is_donation_reported" lowerBound="1"
610 eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> 557 eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
611 </eClassifiers> 558 </eClassifiers>
612 <eClassifiers xsi:type="ecore:EClass" name="Loss_Carryforward" eSuperTypes="#//Special_Expense_DS"> 559 <eClassifiers xsi:type="ecore:EClass" name="Loss_Carryforward" eSuperTypes="#//Special_Expense_DS"/>
613 <eStructuralFeatures xsi:type="ecore:EAttribute" name="regular_accountability"
614 lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
615 derived="true"/>
616 <eStructuralFeatures xsi:type="ecore:EAttribute" name="compensation_by_other_means"
617 lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
618 derived="true"/>
619 <eStructuralFeatures xsi:type="ecore:EAttribute" name="tax_payer_has_inherited_business_ownership"
620 lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
621 defaultValueLiteral="false" derived="true"/>
622 <eStructuralFeatures xsi:type="ecore:EAttribute" name="tax_payer_has_been_partner_in_business"
623 lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
624 defaultValueLiteral="true" derived="true"/>
625 </eClassifiers>
626 <eClassifiers xsi:type="ecore:EClass" name="Spousal_Expense_AC" eSuperTypes="#//Expense"/> 560 <eClassifiers xsi:type="ecore:EClass" name="Spousal_Expense_AC" eSuperTypes="#//Expense"/>
627 <eClassifiers xsi:type="ecore:EClass" name="Extraordinary_Expense_CE" eSuperTypes="#//Expense"> 561 <eClassifiers xsi:type="ecore:EClass" name="Extraordinary_Expense_CE" eSuperTypes="#//Expense">
628 <eStructuralFeatures xsi:type="ecore:EAttribute" name="thresholded_deduction_percentage" 562 <eStructuralFeatures xsi:type="ecore:EAttribute" name="thresholded_deduction_percentage"
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/model/Taxation.genmodel b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/model/Taxation.genmodel
index 1a18d8b6..6d7ad0d6 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/model/Taxation.genmodel
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/model/Taxation.genmodel
@@ -32,10 +32,6 @@
32 <genEnumLiterals ecoreEnumLiteral="Taxation.ecore#//Country/NN"/> 32 <genEnumLiterals ecoreEnumLiteral="Taxation.ecore#//Country/NN"/>
33 <genEnumLiterals ecoreEnumLiteral="Taxation.ecore#//Country/OTHER"/> 33 <genEnumLiterals ecoreEnumLiteral="Taxation.ecore#//Country/OTHER"/>
34 </genEnums> 34 </genEnums>
35 <genEnums typeSafeEnumCompatible="false" ecoreEnum="Taxation.ecore#//Tax_Card_Type">
36 <genEnumLiterals ecoreEnumLiteral="Taxation.ecore#//Tax_Card_Type/Principal"/>
37 <genEnumLiterals ecoreEnumLiteral="Taxation.ecore#//Tax_Card_Type/Additional"/>
38 </genEnums>
39 <genEnums typeSafeEnumCompatible="false" ecoreEnum="Taxation.ecore#//Tax_Office"> 35 <genEnums typeSafeEnumCompatible="false" ecoreEnum="Taxation.ecore#//Tax_Office">
40 <genEnumLiterals ecoreEnumLiteral="Taxation.ecore#//Tax_Office/RTS_2"/> 36 <genEnumLiterals ecoreEnumLiteral="Taxation.ecore#//Tax_Office/RTS_2"/>
41 <genEnumLiterals ecoreEnumLiteral="Taxation.ecore#//Tax_Office/RTS_3"/> 37 <genEnumLiterals ecoreEnumLiteral="Taxation.ecore#//Tax_Office/RTS_3"/>
@@ -59,10 +55,6 @@
59 <genEnumLiterals ecoreEnumLiteral="Taxation.ecore#//Town/TT"/> 55 <genEnumLiterals ecoreEnumLiteral="Taxation.ecore#//Town/TT"/>
60 <genEnumLiterals ecoreEnumLiteral="Taxation.ecore#//Town/Other"/> 56 <genEnumLiterals ecoreEnumLiteral="Taxation.ecore#//Town/Other"/>
61 </genEnums> 57 </genEnums>
62 <genEnums typeSafeEnumCompatible="false" ecoreEnum="Taxation.ecore#//Type_of_Rate">
63 <genEnumLiterals ecoreEnumLiteral="Taxation.ecore#//Type_of_Rate/REGULAR"/>
64 <genEnumLiterals ecoreEnumLiteral="Taxation.ecore#//Type_of_Rate/REAL_COST"/>
65 </genEnums>
66 <genEnums typeSafeEnumCompatible="false" ecoreEnum="Taxation.ecore#//CE_Type"> 58 <genEnums typeSafeEnumCompatible="false" ecoreEnum="Taxation.ecore#//CE_Type">
67 <genEnumLiterals ecoreEnumLiteral="Taxation.ecore#//CE_Type/INALIDITY_AND_INFIRMITY"/> 59 <genEnumLiterals ecoreEnumLiteral="Taxation.ecore#//CE_Type/INALIDITY_AND_INFIRMITY"/>
68 <genEnumLiterals ecoreEnumLiteral="Taxation.ecore#//CE_Type/DEPENDENCE_AND_CARE_EXCLUDING_CHLIDREN_NOT_PART_OF_HOUSEHOLD"/> 60 <genEnumLiterals ecoreEnumLiteral="Taxation.ecore#//CE_Type/DEPENDENCE_AND_CARE_EXCLUDING_CHLIDREN_NOT_PART_OF_HOUSEHOLD"/>
@@ -148,16 +140,13 @@
148 <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Taxation.ecore#//Tax_Payer/from_agent"/> 140 <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Taxation.ecore#//Tax_Payer/from_agent"/>
149 <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Taxation.ecore#//Tax_Payer/incomes"/> 141 <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Taxation.ecore#//Tax_Payer/incomes"/>
150 <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Taxation.ecore#//Tax_Payer/from_law"/> 142 <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Taxation.ecore#//Tax_Payer/from_law"/>
151 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Tax_Payer/taxesDue"/>
152 </genClasses> 143 </genClasses>
153 <genClasses ecoreClass="Taxation.ecore#//Physical_Person"> 144 <genClasses ecoreClass="Taxation.ecore#//Physical_Person">
154 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Physical_Person/is_assisting_spouse"/>
155 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Physical_Person/SSNo"/> 145 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Physical_Person/SSNo"/>
156 <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Taxation.ecore#//Physical_Person/addresses"/> 146 <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Taxation.ecore#//Physical_Person/addresses"/>
157 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Physical_Person/birth_year"/> 147 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Physical_Person/birth_year"/>
158 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Physical_Person/disability_percentage"/> 148 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Physical_Person/disability_percentage"/>
159 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Physical_Person/disability_type"/> 149 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Physical_Person/disability_type"/>
160 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Physical_Person/is_affiliated_personnaly_to_social_security"/>
161 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Physical_Person/birth_month"/> 150 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Physical_Person/birth_month"/>
162 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Physical_Person/birth_day"/> 151 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Physical_Person/birth_day"/>
163 <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Taxation.ecore#//Physical_Person/expenses"/> 152 <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Taxation.ecore#//Physical_Person/expenses"/>
@@ -190,7 +179,6 @@
190 <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Taxation.ecore#//Dependent/expense"/> 179 <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Taxation.ecore#//Dependent/expense"/>
191 </genClasses> 180 </genClasses>
192 <genClasses ecoreClass="Taxation.ecore#//External_Allowance"> 181 <genClasses ecoreClass="Taxation.ecore#//External_Allowance">
193 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//External_Allowance/amount"/>
194 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//External_Allowance/grantor"/> 182 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//External_Allowance/grantor"/>
195 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//External_Allowance/starting_year"/> 183 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//External_Allowance/starting_year"/>
196 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//External_Allowance/ending_year"/> 184 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//External_Allowance/ending_year"/>
@@ -238,13 +226,11 @@
238 <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Taxation.ecore#//Income/expenses"/> 226 <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Taxation.ecore#//Income/expenses"/>
239 </genClasses> 227 </genClasses>
240 <genClasses image="false" ecoreClass="Taxation.ecore#//Income_Type"> 228 <genClasses image="false" ecoreClass="Taxation.ecore#//Income_Type">
241 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Income_Type/subjectToWithholdingTax"/>
242 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Income_Type/id8"/> 229 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Income_Type/id8"/>
243 <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference Taxation.ecore#//Income_Type/income"/> 230 <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference Taxation.ecore#//Income_Type/income"/>
244 </genClasses> 231 </genClasses>
245 <genClasses ecoreClass="Taxation.ecore#//Tax_Card"> 232 <genClasses ecoreClass="Taxation.ecore#//Tax_Card">
246 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Tax_Card/card_identifier"/> 233 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Tax_Card/card_identifier"/>
247 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Tax_Card/tax_card_type"/>
248 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Tax_Card/tax_office"/> 234 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Tax_Card/tax_office"/>
249 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Tax_Card/percentage_of_witholding"/> 235 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Tax_Card/percentage_of_witholding"/>
250 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Tax_Card/tax_payers_name_surname"/> 236 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Tax_Card/tax_payers_name_surname"/>
@@ -327,12 +313,9 @@
327 <genClasses ecoreClass="Taxation.ecore#//CIS"/> 313 <genClasses ecoreClass="Taxation.ecore#//CIS"/>
328 <genClasses ecoreClass="Taxation.ecore#//FD"> 314 <genClasses ecoreClass="Taxation.ecore#//FD">
329 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//FD/distance_declared_in_january"/> 315 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//FD/distance_declared_in_january"/>
330 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//FD/calculated_distance"/>
331 </genClasses> 316 </genClasses>
332 <genClasses ecoreClass="Taxation.ecore#//Professional_Expenses_Deduction"/> 317 <genClasses ecoreClass="Taxation.ecore#//Professional_Expenses_Deduction"/>
333 <genClasses ecoreClass="Taxation.ecore#//FO"> 318 <genClasses ecoreClass="Taxation.ecore#//FO"/>
334 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//FO/rate_type_for_FO"/>
335 </genClasses>
336 <genClasses ecoreClass="Taxation.ecore#//DS_for_Permanent_Expense"> 319 <genClasses ecoreClass="Taxation.ecore#//DS_for_Permanent_Expense">
337 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//DS_for_Permanent_Expense/permanent_expense_category"/> 320 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//DS_for_Permanent_Expense/permanent_expense_category"/>
338 </genClasses> 321 </genClasses>
@@ -346,22 +329,17 @@
346 </genClasses> 329 </genClasses>
347 <genClasses ecoreClass="Taxation.ecore#//DS_for_Private_Insurance_and_Plan"> 330 <genClasses ecoreClass="Taxation.ecore#//DS_for_Private_Insurance_and_Plan">
348 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//DS_for_Private_Insurance_and_Plan/private_insurance_and_plan_category"/> 331 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//DS_for_Private_Insurance_and_Plan/private_insurance_and_plan_category"/>
349 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//DS_for_Private_Insurance_and_Plan/increase_for_life_insurance"/>
350 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//DS_for_Private_Insurance_and_Plan/maximum_deductible_amount_for_private_insurance"/>
351 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//DS_for_Private_Insurance_and_Plan/maximum_deductible_amount_for_old_age_pension_plan"/>
352 </genClasses> 332 </genClasses>
353 <genClasses ecoreClass="Taxation.ecore#//DS_for_Loss_Carryforward"/> 333 <genClasses ecoreClass="Taxation.ecore#//DS_for_Loss_Carryforward"/>
354 <genClasses ecoreClass="Taxation.ecore#//DS_for_Donation"/> 334 <genClasses ecoreClass="Taxation.ecore#//DS_for_Donation"/>
355 <genClasses ecoreClass="Taxation.ecore#//Permanent_Expense"> 335 <genClasses ecoreClass="Taxation.ecore#//Permanent_Expense">
356 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Permanent_Expense/category"/> 336 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Permanent_Expense/category"/>
357 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Permanent_Expense/is_eligible_for_deduction"/>
358 </genClasses> 337 </genClasses>
359 <genClasses ecoreClass="Taxation.ecore#//Special_Expense_DS"/> 338 <genClasses ecoreClass="Taxation.ecore#//Special_Expense_DS"/>
360 <genClasses ecoreClass="Taxation.ecore#//Interest_Expense"/> 339 <genClasses ecoreClass="Taxation.ecore#//Interest_Expense"/>
361 <genClasses ecoreClass="Taxation.ecore#//Private_Insurance_and_Plan"> 340 <genClasses ecoreClass="Taxation.ecore#//Private_Insurance_and_Plan">
362 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Private_Insurance_and_Plan/category"/> 341 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Private_Insurance_and_Plan/category"/>
363 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Private_Insurance_and_Plan/duration_of_contract"/> 342 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Private_Insurance_and_Plan/duration_of_contract"/>
364 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Private_Insurance_and_Plan/is_private_insurance_and_plan_eligible_for_deduction"/>
365 </genClasses> 343 </genClasses>
366 <genClasses ecoreClass="Taxation.ecore#//Health_and_Pension_Insurance"> 344 <genClasses ecoreClass="Taxation.ecore#//Health_and_Pension_Insurance">
367 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Health_and_Pension_Insurance/category"/> 345 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Health_and_Pension_Insurance/category"/>
@@ -369,15 +347,9 @@
369 </genClasses> 347 </genClasses>
370 <genClasses ecoreClass="Taxation.ecore#//Donation"> 348 <genClasses ecoreClass="Taxation.ecore#//Donation">
371 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Donation/beneficiary1"/> 349 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Donation/beneficiary1"/>
372 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Donation/is_beneficiary_eligible"/>
373 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Donation/is_donation_reported"/> 350 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Donation/is_donation_reported"/>
374 </genClasses> 351 </genClasses>
375 <genClasses ecoreClass="Taxation.ecore#//Loss_Carryforward"> 352 <genClasses ecoreClass="Taxation.ecore#//Loss_Carryforward"/>
376 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Loss_Carryforward/regular_accountability"/>
377 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Loss_Carryforward/compensation_by_other_means"/>
378 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Loss_Carryforward/tax_payer_has_inherited_business_ownership"/>
379 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Loss_Carryforward/tax_payer_has_been_partner_in_business"/>
380 </genClasses>
381 <genClasses ecoreClass="Taxation.ecore#//Spousal_Expense_AC"/> 353 <genClasses ecoreClass="Taxation.ecore#//Spousal_Expense_AC"/>
382 <genClasses ecoreClass="Taxation.ecore#//Extraordinary_Expense_CE"> 354 <genClasses ecoreClass="Taxation.ecore#//Extraordinary_Expense_CE">
383 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Extraordinary_Expense_CE/thresholded_deduction_percentage"/> 355 <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Extraordinary_Expense_CE/thresholded_deduction_percentage"/>
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/DS_for_Private_Insurance_and_Plan.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/DS_for_Private_Insurance_and_Plan.java
index c72def81..19e23ef5 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/DS_for_Private_Insurance_and_Plan.java
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/DS_for_Private_Insurance_and_Plan.java
@@ -13,9 +13,6 @@ package Taxation;
13 * </p> 13 * </p>
14 * <ul> 14 * <ul>
15 * <li>{@link Taxation.DS_for_Private_Insurance_and_Plan#getPrivate_insurance_and_plan_category <em>Private insurance and plan category</em>}</li> 15 * <li>{@link Taxation.DS_for_Private_Insurance_and_Plan#getPrivate_insurance_and_plan_category <em>Private insurance and plan category</em>}</li>
16 * <li>{@link Taxation.DS_for_Private_Insurance_and_Plan#getIncrease_for_life_insurance <em>Increase for life insurance</em>}</li>
17 * <li>{@link Taxation.DS_for_Private_Insurance_and_Plan#getMaximum_deductible_amount_for_private_insurance <em>Maximum deductible amount for private insurance</em>}</li>
18 * <li>{@link Taxation.DS_for_Private_Insurance_and_Plan#getMaximum_deductible_amount_for_old_age_pension_plan <em>Maximum deductible amount for old age pension plan</em>}</li>
19 * </ul> 16 * </ul>
20 * 17 *
21 * @see Taxation.TaxationPackage#getDS_for_Private_Insurance_and_Plan() 18 * @see Taxation.TaxationPackage#getDS_for_Private_Insurance_and_Plan()
@@ -48,70 +45,4 @@ public interface DS_for_Private_Insurance_and_Plan extends DS {
48 */ 45 */
49 void setPrivate_insurance_and_plan_category(Category_of_Private_Insurance_and_Plan value); 46 void setPrivate_insurance_and_plan_category(Category_of_Private_Insurance_and_Plan value);
50 47
51 /**
52 * Returns the value of the '<em><b>Increase for life insurance</b></em>' attribute.
53 * <!-- begin-user-doc -->
54 * <!-- end-user-doc -->
55 * @return the value of the '<em>Increase for life insurance</em>' attribute.
56 * @see #setIncrease_for_life_insurance(double)
57 * @see Taxation.TaxationPackage#getDS_for_Private_Insurance_and_Plan_Increase_for_life_insurance()
58 * @model required="true" derived="true"
59 * @generated
60 */
61 double getIncrease_for_life_insurance();
62
63 /**
64 * Sets the value of the '{@link Taxation.DS_for_Private_Insurance_and_Plan#getIncrease_for_life_insurance <em>Increase for life insurance</em>}' attribute.
65 * <!-- begin-user-doc -->
66 * <!-- end-user-doc -->
67 * @param value the new value of the '<em>Increase for life insurance</em>' attribute.
68 * @see #getIncrease_for_life_insurance()
69 * @generated
70 */
71 void setIncrease_for_life_insurance(double value);
72
73 /**
74 * Returns the value of the '<em><b>Maximum deductible amount for private insurance</b></em>' attribute.
75 * <!-- begin-user-doc -->
76 * <!-- end-user-doc -->
77 * @return the value of the '<em>Maximum deductible amount for private insurance</em>' attribute.
78 * @see #setMaximum_deductible_amount_for_private_insurance(double)
79 * @see Taxation.TaxationPackage#getDS_for_Private_Insurance_and_Plan_Maximum_deductible_amount_for_private_insurance()
80 * @model required="true" derived="true"
81 * @generated
82 */
83 double getMaximum_deductible_amount_for_private_insurance();
84
85 /**
86 * Sets the value of the '{@link Taxation.DS_for_Private_Insurance_and_Plan#getMaximum_deductible_amount_for_private_insurance <em>Maximum deductible amount for private insurance</em>}' attribute.
87 * <!-- begin-user-doc -->
88 * <!-- end-user-doc -->
89 * @param value the new value of the '<em>Maximum deductible amount for private insurance</em>' attribute.
90 * @see #getMaximum_deductible_amount_for_private_insurance()
91 * @generated
92 */
93 void setMaximum_deductible_amount_for_private_insurance(double value);
94
95 /**
96 * Returns the value of the '<em><b>Maximum deductible amount for old age pension plan</b></em>' attribute.
97 * <!-- begin-user-doc -->
98 * <!-- end-user-doc -->
99 * @return the value of the '<em>Maximum deductible amount for old age pension plan</em>' attribute.
100 * @see #setMaximum_deductible_amount_for_old_age_pension_plan(double)
101 * @see Taxation.TaxationPackage#getDS_for_Private_Insurance_and_Plan_Maximum_deductible_amount_for_old_age_pension_plan()
102 * @model required="true" derived="true"
103 * @generated
104 */
105 double getMaximum_deductible_amount_for_old_age_pension_plan();
106
107 /**
108 * Sets the value of the '{@link Taxation.DS_for_Private_Insurance_and_Plan#getMaximum_deductible_amount_for_old_age_pension_plan <em>Maximum deductible amount for old age pension plan</em>}' attribute.
109 * <!-- begin-user-doc -->
110 * <!-- end-user-doc -->
111 * @param value the new value of the '<em>Maximum deductible amount for old age pension plan</em>' attribute.
112 * @see #getMaximum_deductible_amount_for_old_age_pension_plan()
113 * @generated
114 */
115 void setMaximum_deductible_amount_for_old_age_pension_plan(double value);
116
117} // DS_for_Private_Insurance_and_Plan 48} // DS_for_Private_Insurance_and_Plan
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Donation.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Donation.java
index 343238d9..37138826 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Donation.java
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Donation.java
@@ -13,7 +13,6 @@ package Taxation;
13 * </p> 13 * </p>
14 * <ul> 14 * <ul>
15 * <li>{@link Taxation.Donation#getBeneficiary1 <em>Beneficiary1</em>}</li> 15 * <li>{@link Taxation.Donation#getBeneficiary1 <em>Beneficiary1</em>}</li>
16 * <li>{@link Taxation.Donation#isIs_beneficiary_eligible <em>Is beneficiary eligible</em>}</li>
17 * <li>{@link Taxation.Donation#isIs_donation_reported <em>Is donation reported</em>}</li> 16 * <li>{@link Taxation.Donation#isIs_donation_reported <em>Is donation reported</em>}</li>
18 * </ul> 17 * </ul>
19 * 18 *
@@ -45,29 +44,6 @@ public interface Donation extends Special_Expense_DS {
45 void setBeneficiary1(String value); 44 void setBeneficiary1(String value);
46 45
47 /** 46 /**
48 * Returns the value of the '<em><b>Is beneficiary eligible</b></em>' attribute.
49 * The default value is <code>"false"</code>.
50 * <!-- begin-user-doc -->
51 * <!-- end-user-doc -->
52 * @return the value of the '<em>Is beneficiary eligible</em>' attribute.
53 * @see #setIs_beneficiary_eligible(boolean)
54 * @see Taxation.TaxationPackage#getDonation_Is_beneficiary_eligible()
55 * @model default="false" required="true" derived="true"
56 * @generated
57 */
58 boolean isIs_beneficiary_eligible();
59
60 /**
61 * Sets the value of the '{@link Taxation.Donation#isIs_beneficiary_eligible <em>Is beneficiary eligible</em>}' attribute.
62 * <!-- begin-user-doc -->
63 * <!-- end-user-doc -->
64 * @param value the new value of the '<em>Is beneficiary eligible</em>' attribute.
65 * @see #isIs_beneficiary_eligible()
66 * @generated
67 */
68 void setIs_beneficiary_eligible(boolean value);
69
70 /**
71 * Returns the value of the '<em><b>Is donation reported</b></em>' attribute. 47 * Returns the value of the '<em><b>Is donation reported</b></em>' attribute.
72 * <!-- begin-user-doc --> 48 * <!-- begin-user-doc -->
73 * <!-- end-user-doc --> 49 * <!-- end-user-doc -->
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/External_Allowance.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/External_Allowance.java
index 625efe59..f239ac45 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/External_Allowance.java
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/External_Allowance.java
@@ -13,7 +13,6 @@ import org.eclipse.emf.ecore.EObject;
13 * The following features are supported: 13 * The following features are supported:
14 * </p> 14 * </p>
15 * <ul> 15 * <ul>
16 * <li>{@link Taxation.External_Allowance#getAmount <em>Amount</em>}</li>
17 * <li>{@link Taxation.External_Allowance#getGrantor <em>Grantor</em>}</li> 16 * <li>{@link Taxation.External_Allowance#getGrantor <em>Grantor</em>}</li>
18 * <li>{@link Taxation.External_Allowance#getStarting_year <em>Starting year</em>}</li> 17 * <li>{@link Taxation.External_Allowance#getStarting_year <em>Starting year</em>}</li>
19 * <li>{@link Taxation.External_Allowance#getEnding_year <em>Ending year</em>}</li> 18 * <li>{@link Taxation.External_Allowance#getEnding_year <em>Ending year</em>}</li>
@@ -28,28 +27,6 @@ import org.eclipse.emf.ecore.EObject;
28 */ 27 */
29public interface External_Allowance extends EObject { 28public interface External_Allowance extends EObject {
30 /** 29 /**
31 * Returns the value of the '<em><b>Amount</b></em>' attribute.
32 * <!-- begin-user-doc -->
33 * <!-- end-user-doc -->
34 * @return the value of the '<em>Amount</em>' attribute.
35 * @see #setAmount(double)
36 * @see Taxation.TaxationPackage#getExternal_Allowance_Amount()
37 * @model required="true"
38 * @generated
39 */
40 double getAmount();
41
42 /**
43 * Sets the value of the '{@link Taxation.External_Allowance#getAmount <em>Amount</em>}' attribute.
44 * <!-- begin-user-doc -->
45 * <!-- end-user-doc -->
46 * @param value the new value of the '<em>Amount</em>' attribute.
47 * @see #getAmount()
48 * @generated
49 */
50 void setAmount(double value);
51
52 /**
53 * Returns the value of the '<em><b>Grantor</b></em>' attribute. 30 * Returns the value of the '<em><b>Grantor</b></em>' attribute.
54 * The literals are from the enumeration {@link Taxation.Grantor}. 31 * The literals are from the enumeration {@link Taxation.Grantor}.
55 * <!-- begin-user-doc --> 32 * <!-- begin-user-doc -->
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/FD.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/FD.java
index 0c74a256..5555ed95 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/FD.java
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/FD.java
@@ -13,7 +13,6 @@ package Taxation;
13 * </p> 13 * </p>
14 * <ul> 14 * <ul>
15 * <li>{@link Taxation.FD#getDistance_declared_in_january <em>Distance declared in january</em>}</li> 15 * <li>{@link Taxation.FD#getDistance_declared_in_january <em>Distance declared in january</em>}</li>
16 * <li>{@link Taxation.FD#getCalculated_distance <em>Calculated distance</em>}</li>
17 * </ul> 16 * </ul>
18 * 17 *
19 * @see Taxation.TaxationPackage#getFD() 18 * @see Taxation.TaxationPackage#getFD()
@@ -43,26 +42,4 @@ public interface FD extends Professional_Expenses_Deduction {
43 */ 42 */
44 void setDistance_declared_in_january(double value); 43 void setDistance_declared_in_january(double value);
45 44
46 /**
47 * Returns the value of the '<em><b>Calculated distance</b></em>' attribute.
48 * <!-- begin-user-doc -->
49 * <!-- end-user-doc -->
50 * @return the value of the '<em>Calculated distance</em>' attribute.
51 * @see #setCalculated_distance(double)
52 * @see Taxation.TaxationPackage#getFD_Calculated_distance()
53 * @model required="true" derived="true"
54 * @generated
55 */
56 double getCalculated_distance();
57
58 /**
59 * Sets the value of the '{@link Taxation.FD#getCalculated_distance <em>Calculated distance</em>}' attribute.
60 * <!-- begin-user-doc -->
61 * <!-- end-user-doc -->
62 * @param value the new value of the '<em>Calculated distance</em>' attribute.
63 * @see #getCalculated_distance()
64 * @generated
65 */
66 void setCalculated_distance(double value);
67
68} // FD 45} // FD
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/FO.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/FO.java
index e403cfa2..420270b1 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/FO.java
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/FO.java
@@ -8,41 +8,11 @@ package Taxation;
8 * A representation of the model object '<em><b>FO</b></em>'. 8 * A representation of the model object '<em><b>FO</b></em>'.
9 * <!-- end-user-doc --> 9 * <!-- end-user-doc -->
10 * 10 *
11 * <p>
12 * The following features are supported:
13 * </p>
14 * <ul>
15 * <li>{@link Taxation.FO#getRate_type_for_FO <em>Rate type for FO</em>}</li>
16 * </ul>
17 * 11 *
18 * @see Taxation.TaxationPackage#getFO() 12 * @see Taxation.TaxationPackage#getFO()
19 * @model 13 * @model
20 * @generated 14 * @generated
21 */ 15 */
22public interface FO extends Professional_Expenses_Deduction { 16public interface FO extends Professional_Expenses_Deduction {
23 /**
24 * Returns the value of the '<em><b>Rate type for FO</b></em>' attribute.
25 * The literals are from the enumeration {@link Taxation.Type_of_Rate}.
26 * <!-- begin-user-doc -->
27 * <!-- end-user-doc -->
28 * @return the value of the '<em>Rate type for FO</em>' attribute.
29 * @see Taxation.Type_of_Rate
30 * @see #setRate_type_for_FO(Type_of_Rate)
31 * @see Taxation.TaxationPackage#getFO_Rate_type_for_FO()
32 * @model required="true" derived="true"
33 * @generated
34 */
35 Type_of_Rate getRate_type_for_FO();
36
37 /**
38 * Sets the value of the '{@link Taxation.FO#getRate_type_for_FO <em>Rate type for FO</em>}' attribute.
39 * <!-- begin-user-doc -->
40 * <!-- end-user-doc -->
41 * @param value the new value of the '<em>Rate type for FO</em>' attribute.
42 * @see Taxation.Type_of_Rate
43 * @see #getRate_type_for_FO()
44 * @generated
45 */
46 void setRate_type_for_FO(Type_of_Rate value);
47 17
48} // FO 18} // FO
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Income_Type.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Income_Type.java
index 3d7d03b1..63c3a382 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Income_Type.java
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Income_Type.java
@@ -13,7 +13,6 @@ import org.eclipse.emf.ecore.EObject;
13 * The following features are supported: 13 * The following features are supported:
14 * </p> 14 * </p>
15 * <ul> 15 * <ul>
16 * <li>{@link Taxation.Income_Type#isSubjectToWithholdingTax <em>Subject To Withholding Tax</em>}</li>
17 * <li>{@link Taxation.Income_Type#getId8 <em>Id8</em>}</li> 16 * <li>{@link Taxation.Income_Type#getId8 <em>Id8</em>}</li>
18 * <li>{@link Taxation.Income_Type#getIncome <em>Income</em>}</li> 17 * <li>{@link Taxation.Income_Type#getIncome <em>Income</em>}</li>
19 * </ul> 18 * </ul>
@@ -24,29 +23,6 @@ import org.eclipse.emf.ecore.EObject;
24 */ 23 */
25public interface Income_Type extends EObject { 24public interface Income_Type extends EObject {
26 /** 25 /**
27 * Returns the value of the '<em><b>Subject To Withholding Tax</b></em>' attribute.
28 * <!-- begin-user-doc -->
29 * <!-- end-user-doc -->
30 * @return the value of the '<em>Subject To Withholding Tax</em>' attribute.
31 * @see #setSubjectToWithholdingTax(boolean)
32 * @see Taxation.TaxationPackage#getIncome_Type_SubjectToWithholdingTax()
33 * @model required="true" derived="true"
34 * annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot derivation='\n\t\t\t\tself.income.tax_card-&gt;notEmpty()\n\t\t\t\t'"
35 * @generated
36 */
37 boolean isSubjectToWithholdingTax();
38
39 /**
40 * Sets the value of the '{@link Taxation.Income_Type#isSubjectToWithholdingTax <em>Subject To Withholding Tax</em>}' attribute.
41 * <!-- begin-user-doc -->
42 * <!-- end-user-doc -->
43 * @param value the new value of the '<em>Subject To Withholding Tax</em>' attribute.
44 * @see #isSubjectToWithholdingTax()
45 * @generated
46 */
47 void setSubjectToWithholdingTax(boolean value);
48
49 /**
50 * Returns the value of the '<em><b>Id8</b></em>' attribute. 26 * Returns the value of the '<em><b>Id8</b></em>' attribute.
51 * <!-- begin-user-doc --> 27 * <!-- begin-user-doc -->
52 * <!-- end-user-doc --> 28 * <!-- end-user-doc -->
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Loss_Carryforward.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Loss_Carryforward.java
index e2ecfb38..a5acbe85 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Loss_Carryforward.java
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Loss_Carryforward.java
@@ -8,109 +8,11 @@ package Taxation;
8 * A representation of the model object '<em><b>Loss Carryforward</b></em>'. 8 * A representation of the model object '<em><b>Loss Carryforward</b></em>'.
9 * <!-- end-user-doc --> 9 * <!-- end-user-doc -->
10 * 10 *
11 * <p>
12 * The following features are supported:
13 * </p>
14 * <ul>
15 * <li>{@link Taxation.Loss_Carryforward#isRegular_accountability <em>Regular accountability</em>}</li>
16 * <li>{@link Taxation.Loss_Carryforward#isCompensation_by_other_means <em>Compensation by other means</em>}</li>
17 * <li>{@link Taxation.Loss_Carryforward#isTax_payer_has_inherited_business_ownership <em>Tax payer has inherited business ownership</em>}</li>
18 * <li>{@link Taxation.Loss_Carryforward#isTax_payer_has_been_partner_in_business <em>Tax payer has been partner in business</em>}</li>
19 * </ul>
20 * 11 *
21 * @see Taxation.TaxationPackage#getLoss_Carryforward() 12 * @see Taxation.TaxationPackage#getLoss_Carryforward()
22 * @model 13 * @model
23 * @generated 14 * @generated
24 */ 15 */
25public interface Loss_Carryforward extends Special_Expense_DS { 16public interface Loss_Carryforward extends Special_Expense_DS {
26 /**
27 * Returns the value of the '<em><b>Regular accountability</b></em>' attribute.
28 * <!-- begin-user-doc -->
29 * <!-- end-user-doc -->
30 * @return the value of the '<em>Regular accountability</em>' attribute.
31 * @see #setRegular_accountability(boolean)
32 * @see Taxation.TaxationPackage#getLoss_Carryforward_Regular_accountability()
33 * @model required="true" derived="true"
34 * @generated
35 */
36 boolean isRegular_accountability();
37
38 /**
39 * Sets the value of the '{@link Taxation.Loss_Carryforward#isRegular_accountability <em>Regular accountability</em>}' attribute.
40 * <!-- begin-user-doc -->
41 * <!-- end-user-doc -->
42 * @param value the new value of the '<em>Regular accountability</em>' attribute.
43 * @see #isRegular_accountability()
44 * @generated
45 */
46 void setRegular_accountability(boolean value);
47
48 /**
49 * Returns the value of the '<em><b>Compensation by other means</b></em>' attribute.
50 * <!-- begin-user-doc -->
51 * <!-- end-user-doc -->
52 * @return the value of the '<em>Compensation by other means</em>' attribute.
53 * @see #setCompensation_by_other_means(boolean)
54 * @see Taxation.TaxationPackage#getLoss_Carryforward_Compensation_by_other_means()
55 * @model required="true" derived="true"
56 * @generated
57 */
58 boolean isCompensation_by_other_means();
59
60 /**
61 * Sets the value of the '{@link Taxation.Loss_Carryforward#isCompensation_by_other_means <em>Compensation by other means</em>}' attribute.
62 * <!-- begin-user-doc -->
63 * <!-- end-user-doc -->
64 * @param value the new value of the '<em>Compensation by other means</em>' attribute.
65 * @see #isCompensation_by_other_means()
66 * @generated
67 */
68 void setCompensation_by_other_means(boolean value);
69
70 /**
71 * Returns the value of the '<em><b>Tax payer has inherited business ownership</b></em>' attribute.
72 * The default value is <code>"false"</code>.
73 * <!-- begin-user-doc -->
74 * <!-- end-user-doc -->
75 * @return the value of the '<em>Tax payer has inherited business ownership</em>' attribute.
76 * @see #setTax_payer_has_inherited_business_ownership(boolean)
77 * @see Taxation.TaxationPackage#getLoss_Carryforward_Tax_payer_has_inherited_business_ownership()
78 * @model default="false" required="true" derived="true"
79 * @generated
80 */
81 boolean isTax_payer_has_inherited_business_ownership();
82
83 /**
84 * Sets the value of the '{@link Taxation.Loss_Carryforward#isTax_payer_has_inherited_business_ownership <em>Tax payer has inherited business ownership</em>}' attribute.
85 * <!-- begin-user-doc -->
86 * <!-- end-user-doc -->
87 * @param value the new value of the '<em>Tax payer has inherited business ownership</em>' attribute.
88 * @see #isTax_payer_has_inherited_business_ownership()
89 * @generated
90 */
91 void setTax_payer_has_inherited_business_ownership(boolean value);
92
93 /**
94 * Returns the value of the '<em><b>Tax payer has been partner in business</b></em>' attribute.
95 * The default value is <code>"true"</code>.
96 * <!-- begin-user-doc -->
97 * <!-- end-user-doc -->
98 * @return the value of the '<em>Tax payer has been partner in business</em>' attribute.
99 * @see #setTax_payer_has_been_partner_in_business(boolean)
100 * @see Taxation.TaxationPackage#getLoss_Carryforward_Tax_payer_has_been_partner_in_business()
101 * @model default="true" required="true" derived="true"
102 * @generated
103 */
104 boolean isTax_payer_has_been_partner_in_business();
105
106 /**
107 * Sets the value of the '{@link Taxation.Loss_Carryforward#isTax_payer_has_been_partner_in_business <em>Tax payer has been partner in business</em>}' attribute.
108 * <!-- begin-user-doc -->
109 * <!-- end-user-doc -->
110 * @param value the new value of the '<em>Tax payer has been partner in business</em>' attribute.
111 * @see #isTax_payer_has_been_partner_in_business()
112 * @generated
113 */
114 void setTax_payer_has_been_partner_in_business(boolean value);
115 17
116} // Loss_Carryforward 18} // Loss_Carryforward
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Permanent_Expense.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Permanent_Expense.java
index 1e8d885b..fd957a6b 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Permanent_Expense.java
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Permanent_Expense.java
@@ -13,7 +13,6 @@ package Taxation;
13 * </p> 13 * </p>
14 * <ul> 14 * <ul>
15 * <li>{@link Taxation.Permanent_Expense#getCategory <em>Category</em>}</li> 15 * <li>{@link Taxation.Permanent_Expense#getCategory <em>Category</em>}</li>
16 * <li>{@link Taxation.Permanent_Expense#isIs_eligible_for_deduction <em>Is eligible for deduction</em>}</li>
17 * </ul> 16 * </ul>
18 * 17 *
19 * @see Taxation.TaxationPackage#getPermanent_Expense() 18 * @see Taxation.TaxationPackage#getPermanent_Expense()
@@ -46,27 +45,4 @@ public interface Permanent_Expense extends Special_Expense_DS {
46 */ 45 */
47 void setCategory(Category_of_Permanent_Expense value); 46 void setCategory(Category_of_Permanent_Expense value);
48 47
49 /**
50 * Returns the value of the '<em><b>Is eligible for deduction</b></em>' attribute.
51 * The default value is <code>"false"</code>.
52 * <!-- begin-user-doc -->
53 * <!-- end-user-doc -->
54 * @return the value of the '<em>Is eligible for deduction</em>' attribute.
55 * @see #setIs_eligible_for_deduction(boolean)
56 * @see Taxation.TaxationPackage#getPermanent_Expense_Is_eligible_for_deduction()
57 * @model default="false" required="true" derived="true"
58 * @generated
59 */
60 boolean isIs_eligible_for_deduction();
61
62 /**
63 * Sets the value of the '{@link Taxation.Permanent_Expense#isIs_eligible_for_deduction <em>Is eligible for deduction</em>}' attribute.
64 * <!-- begin-user-doc -->
65 * <!-- end-user-doc -->
66 * @param value the new value of the '<em>Is eligible for deduction</em>' attribute.
67 * @see #isIs_eligible_for_deduction()
68 * @generated
69 */
70 void setIs_eligible_for_deduction(boolean value);
71
72} // Permanent_Expense 48} // Permanent_Expense
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Physical_Person.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Physical_Person.java
index b2f40b46..d951f5dc 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Physical_Person.java
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Physical_Person.java
@@ -15,13 +15,11 @@ import org.eclipse.emf.ecore.EObject;
15 * The following features are supported: 15 * The following features are supported:
16 * </p> 16 * </p>
17 * <ul> 17 * <ul>
18 * <li>{@link Taxation.Physical_Person#isIs_assisting_spouse <em>Is assisting spouse</em>}</li>
19 * <li>{@link Taxation.Physical_Person#getSSNo <em>SS No</em>}</li> 18 * <li>{@link Taxation.Physical_Person#getSSNo <em>SS No</em>}</li>
20 * <li>{@link Taxation.Physical_Person#getAddresses <em>Addresses</em>}</li> 19 * <li>{@link Taxation.Physical_Person#getAddresses <em>Addresses</em>}</li>
21 * <li>{@link Taxation.Physical_Person#getBirth_year <em>Birth year</em>}</li> 20 * <li>{@link Taxation.Physical_Person#getBirth_year <em>Birth year</em>}</li>
22 * <li>{@link Taxation.Physical_Person#getDisability_percentage <em>Disability percentage</em>}</li> 21 * <li>{@link Taxation.Physical_Person#getDisability_percentage <em>Disability percentage</em>}</li>
23 * <li>{@link Taxation.Physical_Person#getDisability_type <em>Disability type</em>}</li> 22 * <li>{@link Taxation.Physical_Person#getDisability_type <em>Disability type</em>}</li>
24 * <li>{@link Taxation.Physical_Person#isIs_affiliated_personnaly_to_social_security <em>Is affiliated personnaly to social security</em>}</li>
25 * <li>{@link Taxation.Physical_Person#getBirth_month <em>Birth month</em>}</li> 23 * <li>{@link Taxation.Physical_Person#getBirth_month <em>Birth month</em>}</li>
26 * <li>{@link Taxation.Physical_Person#getBirth_day <em>Birth day</em>}</li> 24 * <li>{@link Taxation.Physical_Person#getBirth_day <em>Birth day</em>}</li>
27 * <li>{@link Taxation.Physical_Person#getExpenses <em>Expenses</em>}</li> 25 * <li>{@link Taxation.Physical_Person#getExpenses <em>Expenses</em>}</li>
@@ -34,28 +32,6 @@ import org.eclipse.emf.ecore.EObject;
34 */ 32 */
35public interface Physical_Person extends EObject { 33public interface Physical_Person extends EObject {
36 /** 34 /**
37 * Returns the value of the '<em><b>Is assisting spouse</b></em>' attribute.
38 * <!-- begin-user-doc -->
39 * <!-- end-user-doc -->
40 * @return the value of the '<em>Is assisting spouse</em>' attribute.
41 * @see #setIs_assisting_spouse(boolean)
42 * @see Taxation.TaxationPackage#getPhysical_Person_Is_assisting_spouse()
43 * @model required="true" derived="true"
44 * @generated
45 */
46 boolean isIs_assisting_spouse();
47
48 /**
49 * Sets the value of the '{@link Taxation.Physical_Person#isIs_assisting_spouse <em>Is assisting spouse</em>}' attribute.
50 * <!-- begin-user-doc -->
51 * <!-- end-user-doc -->
52 * @param value the new value of the '<em>Is assisting spouse</em>' attribute.
53 * @see #isIs_assisting_spouse()
54 * @generated
55 */
56 void setIs_assisting_spouse(boolean value);
57
58 /**
59 * Returns the value of the '<em><b>SS No</b></em>' attribute. 35 * Returns the value of the '<em><b>SS No</b></em>' attribute.
60 * <!-- begin-user-doc --> 36 * <!-- begin-user-doc -->
61 * <!-- end-user-doc --> 37 * <!-- end-user-doc -->
@@ -161,28 +137,6 @@ public interface Physical_Person extends EObject {
161 void setDisability_type(Disability_Types value); 137 void setDisability_type(Disability_Types value);
162 138
163 /** 139 /**
164 * Returns the value of the '<em><b>Is affiliated personnaly to social security</b></em>' attribute.
165 * <!-- begin-user-doc -->
166 * <!-- end-user-doc -->
167 * @return the value of the '<em>Is affiliated personnaly to social security</em>' attribute.
168 * @see #setIs_affiliated_personnaly_to_social_security(boolean)
169 * @see Taxation.TaxationPackage#getPhysical_Person_Is_affiliated_personnaly_to_social_security()
170 * @model required="true" derived="true"
171 * @generated
172 */
173 boolean isIs_affiliated_personnaly_to_social_security();
174
175 /**
176 * Sets the value of the '{@link Taxation.Physical_Person#isIs_affiliated_personnaly_to_social_security <em>Is affiliated personnaly to social security</em>}' attribute.
177 * <!-- begin-user-doc -->
178 * <!-- end-user-doc -->
179 * @param value the new value of the '<em>Is affiliated personnaly to social security</em>' attribute.
180 * @see #isIs_affiliated_personnaly_to_social_security()
181 * @generated
182 */
183 void setIs_affiliated_personnaly_to_social_security(boolean value);
184
185 /**
186 * Returns the value of the '<em><b>Birth month</b></em>' attribute. 140 * Returns the value of the '<em><b>Birth month</b></em>' attribute.
187 * <!-- begin-user-doc --> 141 * <!-- begin-user-doc -->
188 * <!-- end-user-doc --> 142 * <!-- end-user-doc -->
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Private_Insurance_and_Plan.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Private_Insurance_and_Plan.java
index 5cd6e8f0..0a99ebed 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Private_Insurance_and_Plan.java
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Private_Insurance_and_Plan.java
@@ -14,7 +14,6 @@ package Taxation;
14 * <ul> 14 * <ul>
15 * <li>{@link Taxation.Private_Insurance_and_Plan#getCategory <em>Category</em>}</li> 15 * <li>{@link Taxation.Private_Insurance_and_Plan#getCategory <em>Category</em>}</li>
16 * <li>{@link Taxation.Private_Insurance_and_Plan#getDuration_of_contract <em>Duration of contract</em>}</li> 16 * <li>{@link Taxation.Private_Insurance_and_Plan#getDuration_of_contract <em>Duration of contract</em>}</li>
17 * <li>{@link Taxation.Private_Insurance_and_Plan#isIs_private_insurance_and_plan_eligible_for_deduction <em>Is private insurance and plan eligible for deduction</em>}</li>
18 * </ul> 17 * </ul>
19 * 18 *
20 * @see Taxation.TaxationPackage#getPrivate_Insurance_and_Plan() 19 * @see Taxation.TaxationPackage#getPrivate_Insurance_and_Plan()
@@ -69,27 +68,4 @@ public interface Private_Insurance_and_Plan extends Special_Expense_DS {
69 */ 68 */
70 void setDuration_of_contract(int value); 69 void setDuration_of_contract(int value);
71 70
72 /**
73 * Returns the value of the '<em><b>Is private insurance and plan eligible for deduction</b></em>' attribute.
74 * The default value is <code>"false"</code>.
75 * <!-- begin-user-doc -->
76 * <!-- end-user-doc -->
77 * @return the value of the '<em>Is private insurance and plan eligible for deduction</em>' attribute.
78 * @see #setIs_private_insurance_and_plan_eligible_for_deduction(boolean)
79 * @see Taxation.TaxationPackage#getPrivate_Insurance_and_Plan_Is_private_insurance_and_plan_eligible_for_deduction()
80 * @model default="false" required="true" derived="true"
81 * @generated
82 */
83 boolean isIs_private_insurance_and_plan_eligible_for_deduction();
84
85 /**
86 * Sets the value of the '{@link Taxation.Private_Insurance_and_Plan#isIs_private_insurance_and_plan_eligible_for_deduction <em>Is private insurance and plan eligible for deduction</em>}' attribute.
87 * <!-- begin-user-doc -->
88 * <!-- end-user-doc -->
89 * @param value the new value of the '<em>Is private insurance and plan eligible for deduction</em>' attribute.
90 * @see #isIs_private_insurance_and_plan_eligible_for_deduction()
91 * @generated
92 */
93 void setIs_private_insurance_and_plan_eligible_for_deduction(boolean value);
94
95} // Private_Insurance_and_Plan 71} // Private_Insurance_and_Plan
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Tax_Card.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Tax_Card.java
index bcfc0c75..94de4a1b 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Tax_Card.java
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Tax_Card.java
@@ -16,7 +16,6 @@ import org.eclipse.emf.ecore.EObject;
16 * </p> 16 * </p>
17 * <ul> 17 * <ul>
18 * <li>{@link Taxation.Tax_Card#getCard_identifier <em>Card identifier</em>}</li> 18 * <li>{@link Taxation.Tax_Card#getCard_identifier <em>Card identifier</em>}</li>
19 * <li>{@link Taxation.Tax_Card#getTax_card_type <em>Tax card type</em>}</li>
20 * <li>{@link Taxation.Tax_Card#getTax_office <em>Tax office</em>}</li> 19 * <li>{@link Taxation.Tax_Card#getTax_office <em>Tax office</em>}</li>
21 * <li>{@link Taxation.Tax_Card#getPercentage_of_witholding <em>Percentage of witholding</em>}</li> 20 * <li>{@link Taxation.Tax_Card#getPercentage_of_witholding <em>Percentage of witholding</em>}</li>
22 * <li>{@link Taxation.Tax_Card#getTax_payers_name_surname <em>Tax payers name surname</em>}</li> 21 * <li>{@link Taxation.Tax_Card#getTax_payers_name_surname <em>Tax payers name surname</em>}</li>
@@ -80,32 +79,6 @@ public interface Tax_Card extends EObject {
80 void setCard_identifier(String value); 79 void setCard_identifier(String value);
81 80
82 /** 81 /**
83 * Returns the value of the '<em><b>Tax card type</b></em>' attribute.
84 * The literals are from the enumeration {@link Taxation.Tax_Card_Type}.
85 * <!-- begin-user-doc -->
86 * <!-- end-user-doc -->
87 * @return the value of the '<em>Tax card type</em>' attribute.
88 * @see Taxation.Tax_Card_Type
89 * @see #setTax_card_type(Tax_Card_Type)
90 * @see Taxation.TaxationPackage#getTax_Card_Tax_card_type()
91 * @model required="true" derived="true"
92 * annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot derivation='if(self.income.taxPayer.incomes-&gt;size()=1) then \nTax_Card_Type::Principal\n\telse\n\t\tlet all_incomes:OrderedSet(Income)=self.income.taxPayer.incomes-&gt;select(inc:Income| inc.income_amount= self.income.taxPayer.incomes.income_amount-&gt;max())-&gt;asOrderedSet() in\n\t\tlet bigest_income:Income= all_incomes-&gt;first() in\n\t\t\t if(bigest_income=self.income) then\n\t\t\t \t Tax_Card_Type::Principal\n\t\t\t else\n\t\t\t\t\tTax_Card_Type::Additional\n\t\t\t\tendif\nendif\n\t\t\t\t'"
93 * @generated
94 */
95 Tax_Card_Type getTax_card_type();
96
97 /**
98 * Sets the value of the '{@link Taxation.Tax_Card#getTax_card_type <em>Tax card type</em>}' attribute.
99 * <!-- begin-user-doc -->
100 * <!-- end-user-doc -->
101 * @param value the new value of the '<em>Tax card type</em>' attribute.
102 * @see Taxation.Tax_Card_Type
103 * @see #getTax_card_type()
104 * @generated
105 */
106 void setTax_card_type(Tax_Card_Type value);
107
108 /**
109 * Returns the value of the '<em><b>Tax office</b></em>' attribute. 82 * Returns the value of the '<em><b>Tax office</b></em>' attribute.
110 * The literals are from the enumeration {@link Taxation.Tax_Office}. 83 * The literals are from the enumeration {@link Taxation.Tax_Office}.
111 * <!-- begin-user-doc --> 84 * <!-- begin-user-doc -->
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Tax_Payer.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Tax_Payer.java
index 56de04a4..8d5b3989 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Tax_Payer.java
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Tax_Payer.java
@@ -17,7 +17,6 @@ import org.eclipse.emf.common.util.EList;
17 * <li>{@link Taxation.Tax_Payer#getFrom_agent <em>From agent</em>}</li> 17 * <li>{@link Taxation.Tax_Payer#getFrom_agent <em>From agent</em>}</li>
18 * <li>{@link Taxation.Tax_Payer#getIncomes <em>Incomes</em>}</li> 18 * <li>{@link Taxation.Tax_Payer#getIncomes <em>Incomes</em>}</li>
19 * <li>{@link Taxation.Tax_Payer#getFrom_law <em>From law</em>}</li> 19 * <li>{@link Taxation.Tax_Payer#getFrom_law <em>From law</em>}</li>
20 * <li>{@link Taxation.Tax_Payer#getTaxesDue <em>Taxes Due</em>}</li>
21 * </ul> 20 * </ul>
22 * 21 *
23 * @see Taxation.TaxationPackage#getTax_Payer() 22 * @see Taxation.TaxationPackage#getTax_Payer()
@@ -102,26 +101,4 @@ public interface Tax_Payer extends Physical_Person, Tax_Case {
102 */ 101 */
103 void setFrom_law(FromLaw value); 102 void setFrom_law(FromLaw value);
104 103
105 /**
106 * Returns the value of the '<em><b>Taxes Due</b></em>' attribute.
107 * <!-- begin-user-doc -->
108 * <!-- end-user-doc -->
109 * @return the value of the '<em>Taxes Due</em>' attribute.
110 * @see #setTaxesDue(double)
111 * @see Taxation.TaxationPackage#getTax_Payer_TaxesDue()
112 * @model required="true" ordered="false"
113 * @generated
114 */
115 double getTaxesDue();
116
117 /**
118 * Sets the value of the '{@link Taxation.Tax_Payer#getTaxesDue <em>Taxes Due</em>}' attribute.
119 * <!-- begin-user-doc -->
120 * <!-- end-user-doc -->
121 * @param value the new value of the '<em>Taxes Due</em>' attribute.
122 * @see #getTaxesDue()
123 * @generated
124 */
125 void setTaxesDue(double value);
126
127} // Tax_Payer 104} // Tax_Payer
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/TaxationPackage.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/TaxationPackage.java
index 8706121f..3746e63a 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/TaxationPackage.java
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/TaxationPackage.java
@@ -386,22 +386,13 @@ public interface TaxationPackage extends EPackage {
386 int PHYSICAL_PERSON = 3; 386 int PHYSICAL_PERSON = 3;
387 387
388 /** 388 /**
389 * The feature id for the '<em><b>Is assisting spouse</b></em>' attribute.
390 * <!-- begin-user-doc -->
391 * <!-- end-user-doc -->
392 * @generated
393 * @ordered
394 */
395 int PHYSICAL_PERSON__IS_ASSISTING_SPOUSE = 0;
396
397 /**
398 * The feature id for the '<em><b>SS No</b></em>' attribute. 389 * The feature id for the '<em><b>SS No</b></em>' attribute.
399 * <!-- begin-user-doc --> 390 * <!-- begin-user-doc -->
400 * <!-- end-user-doc --> 391 * <!-- end-user-doc -->
401 * @generated 392 * @generated
402 * @ordered 393 * @ordered
403 */ 394 */
404 int PHYSICAL_PERSON__SS_NO = 1; 395 int PHYSICAL_PERSON__SS_NO = 0;
405 396
406 /** 397 /**
407 * The feature id for the '<em><b>Addresses</b></em>' reference list. 398 * The feature id for the '<em><b>Addresses</b></em>' reference list.
@@ -410,7 +401,7 @@ public interface TaxationPackage extends EPackage {
410 * @generated 401 * @generated
411 * @ordered 402 * @ordered
412 */ 403 */
413 int PHYSICAL_PERSON__ADDRESSES = 2; 404 int PHYSICAL_PERSON__ADDRESSES = 1;
414 405
415 /** 406 /**
416 * The feature id for the '<em><b>Birth year</b></em>' attribute. 407 * The feature id for the '<em><b>Birth year</b></em>' attribute.
@@ -419,7 +410,7 @@ public interface TaxationPackage extends EPackage {
419 * @generated 410 * @generated
420 * @ordered 411 * @ordered
421 */ 412 */
422 int PHYSICAL_PERSON__BIRTH_YEAR = 3; 413 int PHYSICAL_PERSON__BIRTH_YEAR = 2;
423 414
424 /** 415 /**
425 * The feature id for the '<em><b>Disability percentage</b></em>' attribute. 416 * The feature id for the '<em><b>Disability percentage</b></em>' attribute.
@@ -428,7 +419,7 @@ public interface TaxationPackage extends EPackage {
428 * @generated 419 * @generated
429 * @ordered 420 * @ordered
430 */ 421 */
431 int PHYSICAL_PERSON__DISABILITY_PERCENTAGE = 4; 422 int PHYSICAL_PERSON__DISABILITY_PERCENTAGE = 3;
432 423
433 /** 424 /**
434 * The feature id for the '<em><b>Disability type</b></em>' attribute. 425 * The feature id for the '<em><b>Disability type</b></em>' attribute.
@@ -437,16 +428,7 @@ public interface TaxationPackage extends EPackage {
437 * @generated 428 * @generated
438 * @ordered 429 * @ordered
439 */ 430 */
440 int PHYSICAL_PERSON__DISABILITY_TYPE = 5; 431 int PHYSICAL_PERSON__DISABILITY_TYPE = 4;
441
442 /**
443 * The feature id for the '<em><b>Is affiliated personnaly to social security</b></em>' attribute.
444 * <!-- begin-user-doc -->
445 * <!-- end-user-doc -->
446 * @generated
447 * @ordered
448 */
449 int PHYSICAL_PERSON__IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY = 6;
450 432
451 /** 433 /**
452 * The feature id for the '<em><b>Birth month</b></em>' attribute. 434 * The feature id for the '<em><b>Birth month</b></em>' attribute.
@@ -455,7 +437,7 @@ public interface TaxationPackage extends EPackage {
455 * @generated 437 * @generated
456 * @ordered 438 * @ordered
457 */ 439 */
458 int PHYSICAL_PERSON__BIRTH_MONTH = 7; 440 int PHYSICAL_PERSON__BIRTH_MONTH = 5;
459 441
460 /** 442 /**
461 * The feature id for the '<em><b>Birth day</b></em>' attribute. 443 * The feature id for the '<em><b>Birth day</b></em>' attribute.
@@ -464,7 +446,7 @@ public interface TaxationPackage extends EPackage {
464 * @generated 446 * @generated
465 * @ordered 447 * @ordered
466 */ 448 */
467 int PHYSICAL_PERSON__BIRTH_DAY = 8; 449 int PHYSICAL_PERSON__BIRTH_DAY = 6;
468 450
469 /** 451 /**
470 * The feature id for the '<em><b>Expenses</b></em>' reference list. 452 * The feature id for the '<em><b>Expenses</b></em>' reference list.
@@ -473,7 +455,7 @@ public interface TaxationPackage extends EPackage {
473 * @generated 455 * @generated
474 * @ordered 456 * @ordered
475 */ 457 */
476 int PHYSICAL_PERSON__EXPENSES = 9; 458 int PHYSICAL_PERSON__EXPENSES = 7;
477 459
478 /** 460 /**
479 * The feature id for the '<em><b>Is widower</b></em>' attribute. 461 * The feature id for the '<em><b>Is widower</b></em>' attribute.
@@ -482,7 +464,7 @@ public interface TaxationPackage extends EPackage {
482 * @generated 464 * @generated
483 * @ordered 465 * @ordered
484 */ 466 */
485 int PHYSICAL_PERSON__IS_WIDOWER = 10; 467 int PHYSICAL_PERSON__IS_WIDOWER = 8;
486 468
487 /** 469 /**
488 * The number of structural features of the '<em>Physical Person</em>' class. 470 * The number of structural features of the '<em>Physical Person</em>' class.
@@ -491,7 +473,7 @@ public interface TaxationPackage extends EPackage {
491 * @generated 473 * @generated
492 * @ordered 474 * @ordered
493 */ 475 */
494 int PHYSICAL_PERSON_FEATURE_COUNT = 11; 476 int PHYSICAL_PERSON_FEATURE_COUNT = 9;
495 477
496 /** 478 /**
497 * The number of operations of the '<em>Physical Person</em>' class. 479 * The number of operations of the '<em>Physical Person</em>' class.
@@ -513,15 +495,6 @@ public interface TaxationPackage extends EPackage {
513 int TAX_PAYER = 2; 495 int TAX_PAYER = 2;
514 496
515 /** 497 /**
516 * The feature id for the '<em><b>Is assisting spouse</b></em>' attribute.
517 * <!-- begin-user-doc -->
518 * <!-- end-user-doc -->
519 * @generated
520 * @ordered
521 */
522 int TAX_PAYER__IS_ASSISTING_SPOUSE = PHYSICAL_PERSON__IS_ASSISTING_SPOUSE;
523
524 /**
525 * The feature id for the '<em><b>SS No</b></em>' attribute. 498 * The feature id for the '<em><b>SS No</b></em>' attribute.
526 * <!-- begin-user-doc --> 499 * <!-- begin-user-doc -->
527 * <!-- end-user-doc --> 500 * <!-- end-user-doc -->
@@ -567,15 +540,6 @@ public interface TaxationPackage extends EPackage {
567 int TAX_PAYER__DISABILITY_TYPE = PHYSICAL_PERSON__DISABILITY_TYPE; 540 int TAX_PAYER__DISABILITY_TYPE = PHYSICAL_PERSON__DISABILITY_TYPE;
568 541
569 /** 542 /**
570 * The feature id for the '<em><b>Is affiliated personnaly to social security</b></em>' attribute.
571 * <!-- begin-user-doc -->
572 * <!-- end-user-doc -->
573 * @generated
574 * @ordered
575 */
576 int TAX_PAYER__IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY = PHYSICAL_PERSON__IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY;
577
578 /**
579 * The feature id for the '<em><b>Birth month</b></em>' attribute. 543 * The feature id for the '<em><b>Birth month</b></em>' attribute.
580 * <!-- begin-user-doc --> 544 * <!-- begin-user-doc -->
581 * <!-- end-user-doc --> 545 * <!-- end-user-doc -->
@@ -648,22 +612,13 @@ public interface TaxationPackage extends EPackage {
648 int TAX_PAYER__FROM_LAW = PHYSICAL_PERSON_FEATURE_COUNT + 3; 612 int TAX_PAYER__FROM_LAW = PHYSICAL_PERSON_FEATURE_COUNT + 3;
649 613
650 /** 614 /**
651 * The feature id for the '<em><b>Taxes Due</b></em>' attribute.
652 * <!-- begin-user-doc -->
653 * <!-- end-user-doc -->
654 * @generated
655 * @ordered
656 */
657 int TAX_PAYER__TAXES_DUE = PHYSICAL_PERSON_FEATURE_COUNT + 4;
658
659 /**
660 * The number of structural features of the '<em>Tax Payer</em>' class. 615 * The number of structural features of the '<em>Tax Payer</em>' class.
661 * <!-- begin-user-doc --> 616 * <!-- begin-user-doc -->
662 * <!-- end-user-doc --> 617 * <!-- end-user-doc -->
663 * @generated 618 * @generated
664 * @ordered 619 * @ordered
665 */ 620 */
666 int TAX_PAYER_FEATURE_COUNT = PHYSICAL_PERSON_FEATURE_COUNT + 5; 621 int TAX_PAYER_FEATURE_COUNT = PHYSICAL_PERSON_FEATURE_COUNT + 4;
667 622
668 /** 623 /**
669 * The number of operations of the '<em>Tax Payer</em>' class. 624 * The number of operations of the '<em>Tax Payer</em>' class.
@@ -858,15 +813,6 @@ public interface TaxationPackage extends EPackage {
858 int DEPENDENT = 6; 813 int DEPENDENT = 6;
859 814
860 /** 815 /**
861 * The feature id for the '<em><b>Is assisting spouse</b></em>' attribute.
862 * <!-- begin-user-doc -->
863 * <!-- end-user-doc -->
864 * @generated
865 * @ordered
866 */
867 int DEPENDENT__IS_ASSISTING_SPOUSE = PHYSICAL_PERSON__IS_ASSISTING_SPOUSE;
868
869 /**
870 * The feature id for the '<em><b>SS No</b></em>' attribute. 816 * The feature id for the '<em><b>SS No</b></em>' attribute.
871 * <!-- begin-user-doc --> 817 * <!-- begin-user-doc -->
872 * <!-- end-user-doc --> 818 * <!-- end-user-doc -->
@@ -912,15 +858,6 @@ public interface TaxationPackage extends EPackage {
912 int DEPENDENT__DISABILITY_TYPE = PHYSICAL_PERSON__DISABILITY_TYPE; 858 int DEPENDENT__DISABILITY_TYPE = PHYSICAL_PERSON__DISABILITY_TYPE;
913 859
914 /** 860 /**
915 * The feature id for the '<em><b>Is affiliated personnaly to social security</b></em>' attribute.
916 * <!-- begin-user-doc -->
917 * <!-- end-user-doc -->
918 * @generated
919 * @ordered
920 */
921 int DEPENDENT__IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY = PHYSICAL_PERSON__IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY;
922
923 /**
924 * The feature id for the '<em><b>Birth month</b></em>' attribute. 861 * The feature id for the '<em><b>Birth month</b></em>' attribute.
925 * <!-- begin-user-doc --> 862 * <!-- begin-user-doc -->
926 * <!-- end-user-doc --> 863 * <!-- end-user-doc -->
@@ -1048,22 +985,13 @@ public interface TaxationPackage extends EPackage {
1048 int EXTERNAL_ALLOWANCE = 7; 985 int EXTERNAL_ALLOWANCE = 7;
1049 986
1050 /** 987 /**
1051 * The feature id for the '<em><b>Amount</b></em>' attribute.
1052 * <!-- begin-user-doc -->
1053 * <!-- end-user-doc -->
1054 * @generated
1055 * @ordered
1056 */
1057 int EXTERNAL_ALLOWANCE__AMOUNT = 0;
1058
1059 /**
1060 * The feature id for the '<em><b>Grantor</b></em>' attribute. 988 * The feature id for the '<em><b>Grantor</b></em>' attribute.
1061 * <!-- begin-user-doc --> 989 * <!-- begin-user-doc -->
1062 * <!-- end-user-doc --> 990 * <!-- end-user-doc -->
1063 * @generated 991 * @generated
1064 * @ordered 992 * @ordered
1065 */ 993 */
1066 int EXTERNAL_ALLOWANCE__GRANTOR = 1; 994 int EXTERNAL_ALLOWANCE__GRANTOR = 0;
1067 995
1068 /** 996 /**
1069 * The feature id for the '<em><b>Starting year</b></em>' attribute. 997 * The feature id for the '<em><b>Starting year</b></em>' attribute.
@@ -1072,7 +1000,7 @@ public interface TaxationPackage extends EPackage {
1072 * @generated 1000 * @generated
1073 * @ordered 1001 * @ordered
1074 */ 1002 */
1075 int EXTERNAL_ALLOWANCE__STARTING_YEAR = 2; 1003 int EXTERNAL_ALLOWANCE__STARTING_YEAR = 1;
1076 1004
1077 /** 1005 /**
1078 * The feature id for the '<em><b>Ending year</b></em>' attribute. 1006 * The feature id for the '<em><b>Ending year</b></em>' attribute.
@@ -1081,7 +1009,7 @@ public interface TaxationPackage extends EPackage {
1081 * @generated 1009 * @generated
1082 * @ordered 1010 * @ordered
1083 */ 1011 */
1084 int EXTERNAL_ALLOWANCE__ENDING_YEAR = 3; 1012 int EXTERNAL_ALLOWANCE__ENDING_YEAR = 2;
1085 1013
1086 /** 1014 /**
1087 * The feature id for the '<em><b>Reciver</b></em>' reference. 1015 * The feature id for the '<em><b>Reciver</b></em>' reference.
@@ -1090,7 +1018,7 @@ public interface TaxationPackage extends EPackage {
1090 * @generated 1018 * @generated
1091 * @ordered 1019 * @ordered
1092 */ 1020 */
1093 int EXTERNAL_ALLOWANCE__RECIVER = 4; 1021 int EXTERNAL_ALLOWANCE__RECIVER = 3;
1094 1022
1095 /** 1023 /**
1096 * The feature id for the '<em><b>Id5</b></em>' attribute. 1024 * The feature id for the '<em><b>Id5</b></em>' attribute.
@@ -1099,7 +1027,7 @@ public interface TaxationPackage extends EPackage {
1099 * @generated 1027 * @generated
1100 * @ordered 1028 * @ordered
1101 */ 1029 */
1102 int EXTERNAL_ALLOWANCE__ID5 = 5; 1030 int EXTERNAL_ALLOWANCE__ID5 = 4;
1103 1031
1104 /** 1032 /**
1105 * The feature id for the '<em><b>Person</b></em>' container reference. 1033 * The feature id for the '<em><b>Person</b></em>' container reference.
@@ -1108,7 +1036,7 @@ public interface TaxationPackage extends EPackage {
1108 * @generated 1036 * @generated
1109 * @ordered 1037 * @ordered
1110 */ 1038 */
1111 int EXTERNAL_ALLOWANCE__PERSON = 6; 1039 int EXTERNAL_ALLOWANCE__PERSON = 5;
1112 1040
1113 /** 1041 /**
1114 * The number of structural features of the '<em>External Allowance</em>' class. 1042 * The number of structural features of the '<em>External Allowance</em>' class.
@@ -1117,7 +1045,7 @@ public interface TaxationPackage extends EPackage {
1117 * @generated 1045 * @generated
1118 * @ordered 1046 * @ordered
1119 */ 1047 */
1120 int EXTERNAL_ALLOWANCE_FEATURE_COUNT = 7; 1048 int EXTERNAL_ALLOWANCE_FEATURE_COUNT = 6;
1121 1049
1122 /** 1050 /**
1123 * The number of operations of the '<em>External Allowance</em>' class. 1051 * The number of operations of the '<em>External Allowance</em>' class.
@@ -1559,22 +1487,13 @@ public interface TaxationPackage extends EPackage {
1559 int INCOME_TYPE = 14; 1487 int INCOME_TYPE = 14;
1560 1488
1561 /** 1489 /**
1562 * The feature id for the '<em><b>Subject To Withholding Tax</b></em>' attribute.
1563 * <!-- begin-user-doc -->
1564 * <!-- end-user-doc -->
1565 * @generated
1566 * @ordered
1567 */
1568 int INCOME_TYPE__SUBJECT_TO_WITHHOLDING_TAX = 0;
1569
1570 /**
1571 * The feature id for the '<em><b>Id8</b></em>' attribute. 1490 * The feature id for the '<em><b>Id8</b></em>' attribute.
1572 * <!-- begin-user-doc --> 1491 * <!-- begin-user-doc -->
1573 * <!-- end-user-doc --> 1492 * <!-- end-user-doc -->
1574 * @generated 1493 * @generated
1575 * @ordered 1494 * @ordered
1576 */ 1495 */
1577 int INCOME_TYPE__ID8 = 1; 1496 int INCOME_TYPE__ID8 = 0;
1578 1497
1579 /** 1498 /**
1580 * The feature id for the '<em><b>Income</b></em>' container reference. 1499 * The feature id for the '<em><b>Income</b></em>' container reference.
@@ -1583,7 +1502,7 @@ public interface TaxationPackage extends EPackage {
1583 * @generated 1502 * @generated
1584 * @ordered 1503 * @ordered
1585 */ 1504 */
1586 int INCOME_TYPE__INCOME = 2; 1505 int INCOME_TYPE__INCOME = 1;
1587 1506
1588 /** 1507 /**
1589 * The number of structural features of the '<em>Income Type</em>' class. 1508 * The number of structural features of the '<em>Income Type</em>' class.
@@ -1592,7 +1511,7 @@ public interface TaxationPackage extends EPackage {
1592 * @generated 1511 * @generated
1593 * @ordered 1512 * @ordered
1594 */ 1513 */
1595 int INCOME_TYPE_FEATURE_COUNT = 3; 1514 int INCOME_TYPE_FEATURE_COUNT = 2;
1596 1515
1597 /** 1516 /**
1598 * The number of operations of the '<em>Income Type</em>' class. 1517 * The number of operations of the '<em>Income Type</em>' class.
@@ -1623,22 +1542,13 @@ public interface TaxationPackage extends EPackage {
1623 int TAX_CARD__CARD_IDENTIFIER = 0; 1542 int TAX_CARD__CARD_IDENTIFIER = 0;
1624 1543
1625 /** 1544 /**
1626 * The feature id for the '<em><b>Tax card type</b></em>' attribute.
1627 * <!-- begin-user-doc -->
1628 * <!-- end-user-doc -->
1629 * @generated
1630 * @ordered
1631 */
1632 int TAX_CARD__TAX_CARD_TYPE = 1;
1633
1634 /**
1635 * The feature id for the '<em><b>Tax office</b></em>' attribute. 1545 * The feature id for the '<em><b>Tax office</b></em>' attribute.
1636 * <!-- begin-user-doc --> 1546 * <!-- begin-user-doc -->
1637 * <!-- end-user-doc --> 1547 * <!-- end-user-doc -->
1638 * @generated 1548 * @generated
1639 * @ordered 1549 * @ordered
1640 */ 1550 */
1641 int TAX_CARD__TAX_OFFICE = 2; 1551 int TAX_CARD__TAX_OFFICE = 1;
1642 1552
1643 /** 1553 /**
1644 * The feature id for the '<em><b>Percentage of witholding</b></em>' attribute. 1554 * The feature id for the '<em><b>Percentage of witholding</b></em>' attribute.
@@ -1647,7 +1557,7 @@ public interface TaxationPackage extends EPackage {
1647 * @generated 1557 * @generated
1648 * @ordered 1558 * @ordered
1649 */ 1559 */
1650 int TAX_CARD__PERCENTAGE_OF_WITHOLDING = 3; 1560 int TAX_CARD__PERCENTAGE_OF_WITHOLDING = 2;
1651 1561
1652 /** 1562 /**
1653 * The feature id for the '<em><b>Tax payers name surname</b></em>' attribute list. 1563 * The feature id for the '<em><b>Tax payers name surname</b></em>' attribute list.
@@ -1656,7 +1566,7 @@ public interface TaxationPackage extends EPackage {
1656 * @generated 1566 * @generated
1657 * @ordered 1567 * @ordered
1658 */ 1568 */
1659 int TAX_CARD__TAX_PAYERS_NAME_SURNAME = 4; 1569 int TAX_CARD__TAX_PAYERS_NAME_SURNAME = 3;
1660 1570
1661 /** 1571 /**
1662 * The feature id for the '<em><b>Tax payers partner name surname</b></em>' attribute list. 1572 * The feature id for the '<em><b>Tax payers partner name surname</b></em>' attribute list.
@@ -1665,7 +1575,7 @@ public interface TaxationPackage extends EPackage {
1665 * @generated 1575 * @generated
1666 * @ordered 1576 * @ordered
1667 */ 1577 */
1668 int TAX_CARD__TAX_PAYERS_PARTNER_NAME_SURNAME = 5; 1578 int TAX_CARD__TAX_PAYERS_PARTNER_NAME_SURNAME = 4;
1669 1579
1670 /** 1580 /**
1671 * The feature id for the '<em><b>Tax payers address</b></em>' reference. 1581 * The feature id for the '<em><b>Tax payers address</b></em>' reference.
@@ -1674,7 +1584,7 @@ public interface TaxationPackage extends EPackage {
1674 * @generated 1584 * @generated
1675 * @ordered 1585 * @ordered
1676 */ 1586 */
1677 int TAX_CARD__TAX_PAYERS_ADDRESS = 6; 1587 int TAX_CARD__TAX_PAYERS_ADDRESS = 5;
1678 1588
1679 /** 1589 /**
1680 * The feature id for the '<em><b>Jobs Employer SS No</b></em>' attribute. 1590 * The feature id for the '<em><b>Jobs Employer SS No</b></em>' attribute.
@@ -1683,7 +1593,7 @@ public interface TaxationPackage extends EPackage {
1683 * @generated 1593 * @generated
1684 * @ordered 1594 * @ordered
1685 */ 1595 */
1686 int TAX_CARD__JOBS_EMPLOYER_SS_NO = 7; 1596 int TAX_CARD__JOBS_EMPLOYER_SS_NO = 6;
1687 1597
1688 /** 1598 /**
1689 * The feature id for the '<em><b>Jobs employers name</b></em>' attribute. 1599 * The feature id for the '<em><b>Jobs employers name</b></em>' attribute.
@@ -1692,7 +1602,7 @@ public interface TaxationPackage extends EPackage {
1692 * @generated 1602 * @generated
1693 * @ordered 1603 * @ordered
1694 */ 1604 */
1695 int TAX_CARD__JOBS_EMPLOYERS_NAME = 8; 1605 int TAX_CARD__JOBS_EMPLOYERS_NAME = 7;
1696 1606
1697 /** 1607 /**
1698 * The feature id for the '<em><b>Jobs activity type</b></em>' attribute. 1608 * The feature id for the '<em><b>Jobs activity type</b></em>' attribute.
@@ -1701,7 +1611,7 @@ public interface TaxationPackage extends EPackage {
1701 * @generated 1611 * @generated
1702 * @ordered 1612 * @ordered
1703 */ 1613 */
1704 int TAX_CARD__JOBS_ACTIVITY_TYPE = 9; 1614 int TAX_CARD__JOBS_ACTIVITY_TYPE = 8;
1705 1615
1706 /** 1616 /**
1707 * The feature id for the '<em><b>Jobs place of work</b></em>' attribute. 1617 * The feature id for the '<em><b>Jobs place of work</b></em>' attribute.
@@ -1710,7 +1620,7 @@ public interface TaxationPackage extends EPackage {
1710 * @generated 1620 * @generated
1711 * @ordered 1621 * @ordered
1712 */ 1622 */
1713 int TAX_CARD__JOBS_PLACE_OF_WORK = 10; 1623 int TAX_CARD__JOBS_PLACE_OF_WORK = 9;
1714 1624
1715 /** 1625 /**
1716 * The feature id for the '<em><b>Deduction FD daily</b></em>' attribute. 1626 * The feature id for the '<em><b>Deduction FD daily</b></em>' attribute.
@@ -1719,7 +1629,7 @@ public interface TaxationPackage extends EPackage {
1719 * @generated 1629 * @generated
1720 * @ordered 1630 * @ordered
1721 */ 1631 */
1722 int TAX_CARD__DEDUCTION_FD_DAILY = 11; 1632 int TAX_CARD__DEDUCTION_FD_DAILY = 10;
1723 1633
1724 /** 1634 /**
1725 * The feature id for the '<em><b>Deduction FD monthly</b></em>' attribute. 1635 * The feature id for the '<em><b>Deduction FD monthly</b></em>' attribute.
@@ -1728,7 +1638,7 @@ public interface TaxationPackage extends EPackage {
1728 * @generated 1638 * @generated
1729 * @ordered 1639 * @ordered
1730 */ 1640 */
1731 int TAX_CARD__DEDUCTION_FD_MONTHLY = 12; 1641 int TAX_CARD__DEDUCTION_FD_MONTHLY = 11;
1732 1642
1733 /** 1643 /**
1734 * The feature id for the '<em><b>Deduction AC daily</b></em>' attribute. 1644 * The feature id for the '<em><b>Deduction AC daily</b></em>' attribute.
@@ -1737,7 +1647,7 @@ public interface TaxationPackage extends EPackage {
1737 * @generated 1647 * @generated
1738 * @ordered 1648 * @ordered
1739 */ 1649 */
1740 int TAX_CARD__DEDUCTION_AC_DAILY = 13; 1650 int TAX_CARD__DEDUCTION_AC_DAILY = 12;
1741 1651
1742 /** 1652 /**
1743 * The feature id for the '<em><b>Deduction AC monthly</b></em>' attribute. 1653 * The feature id for the '<em><b>Deduction AC monthly</b></em>' attribute.
@@ -1746,7 +1656,7 @@ public interface TaxationPackage extends EPackage {
1746 * @generated 1656 * @generated
1747 * @ordered 1657 * @ordered
1748 */ 1658 */
1749 int TAX_CARD__DEDUCTION_AC_MONTHLY = 14; 1659 int TAX_CARD__DEDUCTION_AC_MONTHLY = 13;
1750 1660
1751 /** 1661 /**
1752 * The feature id for the '<em><b>Deduction AC yearly</b></em>' attribute. 1662 * The feature id for the '<em><b>Deduction AC yearly</b></em>' attribute.
@@ -1755,7 +1665,7 @@ public interface TaxationPackage extends EPackage {
1755 * @generated 1665 * @generated
1756 * @ordered 1666 * @ordered
1757 */ 1667 */
1758 int TAX_CARD__DEDUCTION_AC_YEARLY = 15; 1668 int TAX_CARD__DEDUCTION_AC_YEARLY = 14;
1759 1669
1760 /** 1670 /**
1761 * The feature id for the '<em><b>Deduction CE daily</b></em>' attribute. 1671 * The feature id for the '<em><b>Deduction CE daily</b></em>' attribute.
@@ -1764,7 +1674,7 @@ public interface TaxationPackage extends EPackage {
1764 * @generated 1674 * @generated
1765 * @ordered 1675 * @ordered
1766 */ 1676 */
1767 int TAX_CARD__DEDUCTION_CE_DAILY = 16; 1677 int TAX_CARD__DEDUCTION_CE_DAILY = 15;
1768 1678
1769 /** 1679 /**
1770 * The feature id for the '<em><b>Deduction CE monthly</b></em>' attribute. 1680 * The feature id for the '<em><b>Deduction CE monthly</b></em>' attribute.
@@ -1773,7 +1683,7 @@ public interface TaxationPackage extends EPackage {
1773 * @generated 1683 * @generated
1774 * @ordered 1684 * @ordered
1775 */ 1685 */
1776 int TAX_CARD__DEDUCTION_CE_MONTHLY = 17; 1686 int TAX_CARD__DEDUCTION_CE_MONTHLY = 16;
1777 1687
1778 /** 1688 /**
1779 * The feature id for the '<em><b>Deduction CE yearly</b></em>' attribute. 1689 * The feature id for the '<em><b>Deduction CE yearly</b></em>' attribute.
@@ -1782,7 +1692,7 @@ public interface TaxationPackage extends EPackage {
1782 * @generated 1692 * @generated
1783 * @ordered 1693 * @ordered
1784 */ 1694 */
1785 int TAX_CARD__DEDUCTION_CE_YEARLY = 18; 1695 int TAX_CARD__DEDUCTION_CE_YEARLY = 17;
1786 1696
1787 /** 1697 /**
1788 * The feature id for the '<em><b>Deduction DS daily</b></em>' attribute. 1698 * The feature id for the '<em><b>Deduction DS daily</b></em>' attribute.
@@ -1791,7 +1701,7 @@ public interface TaxationPackage extends EPackage {
1791 * @generated 1701 * @generated
1792 * @ordered 1702 * @ordered
1793 */ 1703 */
1794 int TAX_CARD__DEDUCTION_DS_DAILY = 19; 1704 int TAX_CARD__DEDUCTION_DS_DAILY = 18;
1795 1705
1796 /** 1706 /**
1797 * The feature id for the '<em><b>Deduction DS monthly</b></em>' attribute. 1707 * The feature id for the '<em><b>Deduction DS monthly</b></em>' attribute.
@@ -1800,7 +1710,7 @@ public interface TaxationPackage extends EPackage {
1800 * @generated 1710 * @generated
1801 * @ordered 1711 * @ordered
1802 */ 1712 */
1803 int TAX_CARD__DEDUCTION_DS_MONTHLY = 20; 1713 int TAX_CARD__DEDUCTION_DS_MONTHLY = 19;
1804 1714
1805 /** 1715 /**
1806 * The feature id for the '<em><b>Deduction FO daily</b></em>' attribute. 1716 * The feature id for the '<em><b>Deduction FO daily</b></em>' attribute.
@@ -1809,7 +1719,7 @@ public interface TaxationPackage extends EPackage {
1809 * @generated 1719 * @generated
1810 * @ordered 1720 * @ordered
1811 */ 1721 */
1812 int TAX_CARD__DEDUCTION_FO_DAILY = 21; 1722 int TAX_CARD__DEDUCTION_FO_DAILY = 20;
1813 1723
1814 /** 1724 /**
1815 * The feature id for the '<em><b>Deduction FO monthly</b></em>' attribute. 1725 * The feature id for the '<em><b>Deduction FO monthly</b></em>' attribute.
@@ -1818,7 +1728,7 @@ public interface TaxationPackage extends EPackage {
1818 * @generated 1728 * @generated
1819 * @ordered 1729 * @ordered
1820 */ 1730 */
1821 int TAX_CARD__DEDUCTION_FO_MONTHLY = 22; 1731 int TAX_CARD__DEDUCTION_FO_MONTHLY = 21;
1822 1732
1823 /** 1733 /**
1824 * The feature id for the '<em><b>Deduction FO yearly</b></em>' attribute. 1734 * The feature id for the '<em><b>Deduction FO yearly</b></em>' attribute.
@@ -1827,7 +1737,7 @@ public interface TaxationPackage extends EPackage {
1827 * @generated 1737 * @generated
1828 * @ordered 1738 * @ordered
1829 */ 1739 */
1830 int TAX_CARD__DEDUCTION_FO_YEARLY = 23; 1740 int TAX_CARD__DEDUCTION_FO_YEARLY = 22;
1831 1741
1832 /** 1742 /**
1833 * The feature id for the '<em><b>Credit CIS daily</b></em>' attribute. 1743 * The feature id for the '<em><b>Credit CIS daily</b></em>' attribute.
@@ -1836,7 +1746,7 @@ public interface TaxationPackage extends EPackage {
1836 * @generated 1746 * @generated
1837 * @ordered 1747 * @ordered
1838 */ 1748 */
1839 int TAX_CARD__CREDIT_CIS_DAILY = 24; 1749 int TAX_CARD__CREDIT_CIS_DAILY = 23;
1840 1750
1841 /** 1751 /**
1842 * The feature id for the '<em><b>Credit CIS monthly</b></em>' attribute. 1752 * The feature id for the '<em><b>Credit CIS monthly</b></em>' attribute.
@@ -1845,7 +1755,7 @@ public interface TaxationPackage extends EPackage {
1845 * @generated 1755 * @generated
1846 * @ordered 1756 * @ordered
1847 */ 1757 */
1848 int TAX_CARD__CREDIT_CIS_MONTHLY = 25; 1758 int TAX_CARD__CREDIT_CIS_MONTHLY = 24;
1849 1759
1850 /** 1760 /**
1851 * The feature id for the '<em><b>Credit CIM daily</b></em>' attribute. 1761 * The feature id for the '<em><b>Credit CIM daily</b></em>' attribute.
@@ -1854,7 +1764,7 @@ public interface TaxationPackage extends EPackage {
1854 * @generated 1764 * @generated
1855 * @ordered 1765 * @ordered
1856 */ 1766 */
1857 int TAX_CARD__CREDIT_CIM_DAILY = 26; 1767 int TAX_CARD__CREDIT_CIM_DAILY = 25;
1858 1768
1859 /** 1769 /**
1860 * The feature id for the '<em><b>Validity</b></em>' attribute. 1770 * The feature id for the '<em><b>Validity</b></em>' attribute.
@@ -1863,7 +1773,7 @@ public interface TaxationPackage extends EPackage {
1863 * @generated 1773 * @generated
1864 * @ordered 1774 * @ordered
1865 */ 1775 */
1866 int TAX_CARD__VALIDITY = 27; 1776 int TAX_CARD__VALIDITY = 26;
1867 1777
1868 /** 1778 /**
1869 * The feature id for the '<em><b>Income Tax Credit</b></em>' reference list. 1779 * The feature id for the '<em><b>Income Tax Credit</b></em>' reference list.
@@ -1872,7 +1782,7 @@ public interface TaxationPackage extends EPackage {
1872 * @generated 1782 * @generated
1873 * @ordered 1783 * @ordered
1874 */ 1784 */
1875 int TAX_CARD__INCOME_TAX_CREDIT = 28; 1785 int TAX_CARD__INCOME_TAX_CREDIT = 27;
1876 1786
1877 /** 1787 /**
1878 * The feature id for the '<em><b>Previous</b></em>' reference. 1788 * The feature id for the '<em><b>Previous</b></em>' reference.
@@ -1881,7 +1791,7 @@ public interface TaxationPackage extends EPackage {
1881 * @generated 1791 * @generated
1882 * @ordered 1792 * @ordered
1883 */ 1793 */
1884 int TAX_CARD__PREVIOUS = 29; 1794 int TAX_CARD__PREVIOUS = 28;
1885 1795
1886 /** 1796 /**
1887 * The feature id for the '<em><b>Current tax card</b></em>' reference. 1797 * The feature id for the '<em><b>Current tax card</b></em>' reference.
@@ -1890,7 +1800,7 @@ public interface TaxationPackage extends EPackage {
1890 * @generated 1800 * @generated
1891 * @ordered 1801 * @ordered
1892 */ 1802 */
1893 int TAX_CARD__CURRENT_TAX_CARD = 30; 1803 int TAX_CARD__CURRENT_TAX_CARD = 29;
1894 1804
1895 /** 1805 /**
1896 * The feature id for the '<em><b>Credit CIM yearly</b></em>' attribute. 1806 * The feature id for the '<em><b>Credit CIM yearly</b></em>' attribute.
@@ -1899,7 +1809,7 @@ public interface TaxationPackage extends EPackage {
1899 * @generated 1809 * @generated
1900 * @ordered 1810 * @ordered
1901 */ 1811 */
1902 int TAX_CARD__CREDIT_CIM_YEARLY = 31; 1812 int TAX_CARD__CREDIT_CIM_YEARLY = 30;
1903 1813
1904 /** 1814 /**
1905 * The feature id for the '<em><b>Deduction DS Alimony yearly</b></em>' attribute. 1815 * The feature id for the '<em><b>Deduction DS Alimony yearly</b></em>' attribute.
@@ -1908,7 +1818,7 @@ public interface TaxationPackage extends EPackage {
1908 * @generated 1818 * @generated
1909 * @ordered 1819 * @ordered
1910 */ 1820 */
1911 int TAX_CARD__DEDUCTION_DS_ALIMONY_YEARLY = 32; 1821 int TAX_CARD__DEDUCTION_DS_ALIMONY_YEARLY = 31;
1912 1822
1913 /** 1823 /**
1914 * The feature id for the '<em><b>Deduction DS Debt yearly</b></em>' attribute. 1824 * The feature id for the '<em><b>Deduction DS Debt yearly</b></em>' attribute.
@@ -1917,7 +1827,7 @@ public interface TaxationPackage extends EPackage {
1917 * @generated 1827 * @generated
1918 * @ordered 1828 * @ordered
1919 */ 1829 */
1920 int TAX_CARD__DEDUCTION_DS_DEBT_YEARLY = 33; 1830 int TAX_CARD__DEDUCTION_DS_DEBT_YEARLY = 32;
1921 1831
1922 /** 1832 /**
1923 * The feature id for the '<em><b>Income</b></em>' container reference. 1833 * The feature id for the '<em><b>Income</b></em>' container reference.
@@ -1926,7 +1836,7 @@ public interface TaxationPackage extends EPackage {
1926 * @generated 1836 * @generated
1927 * @ordered 1837 * @ordered
1928 */ 1838 */
1929 int TAX_CARD__INCOME = 34; 1839 int TAX_CARD__INCOME = 33;
1930 1840
1931 /** 1841 /**
1932 * The number of structural features of the '<em>Tax Card</em>' class. 1842 * The number of structural features of the '<em>Tax Card</em>' class.
@@ -1935,7 +1845,7 @@ public interface TaxationPackage extends EPackage {
1935 * @generated 1845 * @generated
1936 * @ordered 1846 * @ordered
1937 */ 1847 */
1938 int TAX_CARD_FEATURE_COUNT = 35; 1848 int TAX_CARD_FEATURE_COUNT = 34;
1939 1849
1940 /** 1850 /**
1941 * The number of operations of the '<em>Tax Card</em>' class. 1851 * The number of operations of the '<em>Tax Card</em>' class.
@@ -2467,15 +2377,6 @@ public interface TaxationPackage extends EPackage {
2467 int NON_RESIDENT_TAX_PAYER = 22; 2377 int NON_RESIDENT_TAX_PAYER = 22;
2468 2378
2469 /** 2379 /**
2470 * The feature id for the '<em><b>Is assisting spouse</b></em>' attribute.
2471 * <!-- begin-user-doc -->
2472 * <!-- end-user-doc -->
2473 * @generated
2474 * @ordered
2475 */
2476 int NON_RESIDENT_TAX_PAYER__IS_ASSISTING_SPOUSE = TAX_PAYER__IS_ASSISTING_SPOUSE;
2477
2478 /**
2479 * The feature id for the '<em><b>SS No</b></em>' attribute. 2380 * The feature id for the '<em><b>SS No</b></em>' attribute.
2480 * <!-- begin-user-doc --> 2381 * <!-- begin-user-doc -->
2481 * <!-- end-user-doc --> 2382 * <!-- end-user-doc -->
@@ -2521,15 +2422,6 @@ public interface TaxationPackage extends EPackage {
2521 int NON_RESIDENT_TAX_PAYER__DISABILITY_TYPE = TAX_PAYER__DISABILITY_TYPE; 2422 int NON_RESIDENT_TAX_PAYER__DISABILITY_TYPE = TAX_PAYER__DISABILITY_TYPE;
2522 2423
2523 /** 2424 /**
2524 * The feature id for the '<em><b>Is affiliated personnaly to social security</b></em>' attribute.
2525 * <!-- begin-user-doc -->
2526 * <!-- end-user-doc -->
2527 * @generated
2528 * @ordered
2529 */
2530 int NON_RESIDENT_TAX_PAYER__IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY = TAX_PAYER__IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY;
2531
2532 /**
2533 * The feature id for the '<em><b>Birth month</b></em>' attribute. 2425 * The feature id for the '<em><b>Birth month</b></em>' attribute.
2534 * <!-- begin-user-doc --> 2426 * <!-- begin-user-doc -->
2535 * <!-- end-user-doc --> 2427 * <!-- end-user-doc -->
@@ -2602,15 +2494,6 @@ public interface TaxationPackage extends EPackage {
2602 int NON_RESIDENT_TAX_PAYER__FROM_LAW = TAX_PAYER__FROM_LAW; 2494 int NON_RESIDENT_TAX_PAYER__FROM_LAW = TAX_PAYER__FROM_LAW;
2603 2495
2604 /** 2496 /**
2605 * The feature id for the '<em><b>Taxes Due</b></em>' attribute.
2606 * <!-- begin-user-doc -->
2607 * <!-- end-user-doc -->
2608 * @generated
2609 * @ordered
2610 */
2611 int NON_RESIDENT_TAX_PAYER__TAXES_DUE = TAX_PAYER__TAXES_DUE;
2612
2613 /**
2614 * The feature id for the '<em><b>Is assimilated to resident</b></em>' attribute. 2497 * The feature id for the '<em><b>Is assimilated to resident</b></em>' attribute.
2615 * <!-- begin-user-doc --> 2498 * <!-- begin-user-doc -->
2616 * <!-- end-user-doc --> 2499 * <!-- end-user-doc -->
@@ -2757,15 +2640,6 @@ public interface TaxationPackage extends EPackage {
2757 int RESIDENT_TAX_PAYER = 24; 2640 int RESIDENT_TAX_PAYER = 24;
2758 2641
2759 /** 2642 /**
2760 * The feature id for the '<em><b>Is assisting spouse</b></em>' attribute.
2761 * <!-- begin-user-doc -->
2762 * <!-- end-user-doc -->
2763 * @generated
2764 * @ordered
2765 */
2766 int RESIDENT_TAX_PAYER__IS_ASSISTING_SPOUSE = TAX_PAYER__IS_ASSISTING_SPOUSE;
2767
2768 /**
2769 * The feature id for the '<em><b>SS No</b></em>' attribute. 2643 * The feature id for the '<em><b>SS No</b></em>' attribute.
2770 * <!-- begin-user-doc --> 2644 * <!-- begin-user-doc -->
2771 * <!-- end-user-doc --> 2645 * <!-- end-user-doc -->
@@ -2811,15 +2685,6 @@ public interface TaxationPackage extends EPackage {
2811 int RESIDENT_TAX_PAYER__DISABILITY_TYPE = TAX_PAYER__DISABILITY_TYPE; 2685 int RESIDENT_TAX_PAYER__DISABILITY_TYPE = TAX_PAYER__DISABILITY_TYPE;
2812 2686
2813 /** 2687 /**
2814 * The feature id for the '<em><b>Is affiliated personnaly to social security</b></em>' attribute.
2815 * <!-- begin-user-doc -->
2816 * <!-- end-user-doc -->
2817 * @generated
2818 * @ordered
2819 */
2820 int RESIDENT_TAX_PAYER__IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY = TAX_PAYER__IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY;
2821
2822 /**
2823 * The feature id for the '<em><b>Birth month</b></em>' attribute. 2688 * The feature id for the '<em><b>Birth month</b></em>' attribute.
2824 * <!-- begin-user-doc --> 2689 * <!-- begin-user-doc -->
2825 * <!-- end-user-doc --> 2690 * <!-- end-user-doc -->
@@ -2892,15 +2757,6 @@ public interface TaxationPackage extends EPackage {
2892 int RESIDENT_TAX_PAYER__FROM_LAW = TAX_PAYER__FROM_LAW; 2757 int RESIDENT_TAX_PAYER__FROM_LAW = TAX_PAYER__FROM_LAW;
2893 2758
2894 /** 2759 /**
2895 * The feature id for the '<em><b>Taxes Due</b></em>' attribute.
2896 * <!-- begin-user-doc -->
2897 * <!-- end-user-doc -->
2898 * @generated
2899 * @ordered
2900 */
2901 int RESIDENT_TAX_PAYER__TAXES_DUE = TAX_PAYER__TAXES_DUE;
2902
2903 /**
2904 * The number of structural features of the '<em>Resident Tax Payer</em>' class. 2760 * The number of structural features of the '<em>Resident Tax Payer</em>' class.
2905 * <!-- begin-user-doc --> 2761 * <!-- begin-user-doc -->
2906 * <!-- end-user-doc --> 2762 * <!-- end-user-doc -->
@@ -2929,15 +2785,6 @@ public interface TaxationPackage extends EPackage {
2929 int TRADE_AND_BUSINESS_INCOME = 25; 2785 int TRADE_AND_BUSINESS_INCOME = 25;
2930 2786
2931 /** 2787 /**
2932 * The feature id for the '<em><b>Subject To Withholding Tax</b></em>' attribute.
2933 * <!-- begin-user-doc -->
2934 * <!-- end-user-doc -->
2935 * @generated
2936 * @ordered
2937 */
2938 int TRADE_AND_BUSINESS_INCOME__SUBJECT_TO_WITHHOLDING_TAX = INCOME_TYPE__SUBJECT_TO_WITHHOLDING_TAX;
2939
2940 /**
2941 * The feature id for the '<em><b>Id8</b></em>' attribute. 2788 * The feature id for the '<em><b>Id8</b></em>' attribute.
2942 * <!-- begin-user-doc --> 2789 * <!-- begin-user-doc -->
2943 * <!-- end-user-doc --> 2790 * <!-- end-user-doc -->
@@ -2984,15 +2831,6 @@ public interface TaxationPackage extends EPackage {
2984 int AGRICULTURE_AND_FORESTRY_INCOME = 26; 2831 int AGRICULTURE_AND_FORESTRY_INCOME = 26;
2985 2832
2986 /** 2833 /**
2987 * The feature id for the '<em><b>Subject To Withholding Tax</b></em>' attribute.
2988 * <!-- begin-user-doc -->
2989 * <!-- end-user-doc -->
2990 * @generated
2991 * @ordered
2992 */
2993 int AGRICULTURE_AND_FORESTRY_INCOME__SUBJECT_TO_WITHHOLDING_TAX = INCOME_TYPE__SUBJECT_TO_WITHHOLDING_TAX;
2994
2995 /**
2996 * The feature id for the '<em><b>Id8</b></em>' attribute. 2834 * The feature id for the '<em><b>Id8</b></em>' attribute.
2997 * <!-- begin-user-doc --> 2835 * <!-- begin-user-doc -->
2998 * <!-- end-user-doc --> 2836 * <!-- end-user-doc -->
@@ -3039,15 +2877,6 @@ public interface TaxationPackage extends EPackage {
3039 int PENSIONS_AND_ANNUITIES_INCOME = 27; 2877 int PENSIONS_AND_ANNUITIES_INCOME = 27;
3040 2878
3041 /** 2879 /**
3042 * The feature id for the '<em><b>Subject To Withholding Tax</b></em>' attribute.
3043 * <!-- begin-user-doc -->
3044 * <!-- end-user-doc -->
3045 * @generated
3046 * @ordered
3047 */
3048 int PENSIONS_AND_ANNUITIES_INCOME__SUBJECT_TO_WITHHOLDING_TAX = INCOME_TYPE__SUBJECT_TO_WITHHOLDING_TAX;
3049
3050 /**
3051 * The feature id for the '<em><b>Id8</b></em>' attribute. 2880 * The feature id for the '<em><b>Id8</b></em>' attribute.
3052 * <!-- begin-user-doc --> 2881 * <!-- begin-user-doc -->
3053 * <!-- end-user-doc --> 2882 * <!-- end-user-doc -->
@@ -3103,15 +2932,6 @@ public interface TaxationPackage extends EPackage {
3103 int CAPITAL_AND_INVESTMENTS_INCOME = 28; 2932 int CAPITAL_AND_INVESTMENTS_INCOME = 28;
3104 2933
3105 /** 2934 /**
3106 * The feature id for the '<em><b>Subject To Withholding Tax</b></em>' attribute.
3107 * <!-- begin-user-doc -->
3108 * <!-- end-user-doc -->
3109 * @generated
3110 * @ordered
3111 */
3112 int CAPITAL_AND_INVESTMENTS_INCOME__SUBJECT_TO_WITHHOLDING_TAX = INCOME_TYPE__SUBJECT_TO_WITHHOLDING_TAX;
3113
3114 /**
3115 * The feature id for the '<em><b>Id8</b></em>' attribute. 2935 * The feature id for the '<em><b>Id8</b></em>' attribute.
3116 * <!-- begin-user-doc --> 2936 * <!-- begin-user-doc -->
3117 * <!-- end-user-doc --> 2937 * <!-- end-user-doc -->
@@ -3158,15 +2978,6 @@ public interface TaxationPackage extends EPackage {
3158 int EMPLOYMENT_INCOME = 29; 2978 int EMPLOYMENT_INCOME = 29;
3159 2979
3160 /** 2980 /**
3161 * The feature id for the '<em><b>Subject To Withholding Tax</b></em>' attribute.
3162 * <!-- begin-user-doc -->
3163 * <!-- end-user-doc -->
3164 * @generated
3165 * @ordered
3166 */
3167 int EMPLOYMENT_INCOME__SUBJECT_TO_WITHHOLDING_TAX = INCOME_TYPE__SUBJECT_TO_WITHHOLDING_TAX;
3168
3169 /**
3170 * The feature id for the '<em><b>Id8</b></em>' attribute. 2981 * The feature id for the '<em><b>Id8</b></em>' attribute.
3171 * <!-- begin-user-doc --> 2982 * <!-- begin-user-doc -->
3172 * <!-- end-user-doc --> 2983 * <!-- end-user-doc -->
@@ -3213,15 +3024,6 @@ public interface TaxationPackage extends EPackage {
3213 int RENTALS_AND_LEASES_INCOME = 30; 3024 int RENTALS_AND_LEASES_INCOME = 30;
3214 3025
3215 /** 3026 /**
3216 * The feature id for the '<em><b>Subject To Withholding Tax</b></em>' attribute.
3217 * <!-- begin-user-doc -->
3218 * <!-- end-user-doc -->
3219 * @generated
3220 * @ordered
3221 */
3222 int RENTALS_AND_LEASES_INCOME__SUBJECT_TO_WITHHOLDING_TAX = INCOME_TYPE__SUBJECT_TO_WITHHOLDING_TAX;
3223
3224 /**
3225 * The feature id for the '<em><b>Id8</b></em>' attribute. 3027 * The feature id for the '<em><b>Id8</b></em>' attribute.
3226 * <!-- begin-user-doc --> 3028 * <!-- begin-user-doc -->
3227 * <!-- end-user-doc --> 3029 * <!-- end-user-doc -->
@@ -3814,22 +3616,13 @@ public interface TaxationPackage extends EPackage {
3814 int FD__DISTANCE_DECLARED_IN_JANUARY = PROFESSIONAL_EXPENSES_DEDUCTION_FEATURE_COUNT + 0; 3616 int FD__DISTANCE_DECLARED_IN_JANUARY = PROFESSIONAL_EXPENSES_DEDUCTION_FEATURE_COUNT + 0;
3815 3617
3816 /** 3618 /**
3817 * The feature id for the '<em><b>Calculated distance</b></em>' attribute.
3818 * <!-- begin-user-doc -->
3819 * <!-- end-user-doc -->
3820 * @generated
3821 * @ordered
3822 */
3823 int FD__CALCULATED_DISTANCE = PROFESSIONAL_EXPENSES_DEDUCTION_FEATURE_COUNT + 1;
3824
3825 /**
3826 * The number of structural features of the '<em>FD</em>' class. 3619 * The number of structural features of the '<em>FD</em>' class.
3827 * <!-- begin-user-doc --> 3620 * <!-- begin-user-doc -->
3828 * <!-- end-user-doc --> 3621 * <!-- end-user-doc -->
3829 * @generated 3622 * @generated
3830 * @ordered 3623 * @ordered
3831 */ 3624 */
3832 int FD_FEATURE_COUNT = PROFESSIONAL_EXPENSES_DEDUCTION_FEATURE_COUNT + 2; 3625 int FD_FEATURE_COUNT = PROFESSIONAL_EXPENSES_DEDUCTION_FEATURE_COUNT + 1;
3833 3626
3834 /** 3627 /**
3835 * The number of operations of the '<em>FD</em>' class. 3628 * The number of operations of the '<em>FD</em>' class.
@@ -3851,22 +3644,13 @@ public interface TaxationPackage extends EPackage {
3851 int FO = 38; 3644 int FO = 38;
3852 3645
3853 /** 3646 /**
3854 * The feature id for the '<em><b>Rate type for FO</b></em>' attribute.
3855 * <!-- begin-user-doc -->
3856 * <!-- end-user-doc -->
3857 * @generated
3858 * @ordered
3859 */
3860 int FO__RATE_TYPE_FOR_FO = PROFESSIONAL_EXPENSES_DEDUCTION_FEATURE_COUNT + 0;
3861
3862 /**
3863 * The number of structural features of the '<em>FO</em>' class. 3647 * The number of structural features of the '<em>FO</em>' class.
3864 * <!-- begin-user-doc --> 3648 * <!-- begin-user-doc -->
3865 * <!-- end-user-doc --> 3649 * <!-- end-user-doc -->
3866 * @generated 3650 * @generated
3867 * @ordered 3651 * @ordered
3868 */ 3652 */
3869 int FO_FEATURE_COUNT = PROFESSIONAL_EXPENSES_DEDUCTION_FEATURE_COUNT + 1; 3653 int FO_FEATURE_COUNT = PROFESSIONAL_EXPENSES_DEDUCTION_FEATURE_COUNT + 0;
3870 3654
3871 /** 3655 /**
3872 * The number of operations of the '<em>FO</em>' class. 3656 * The number of operations of the '<em>FO</em>' class.
@@ -4117,40 +3901,13 @@ public interface TaxationPackage extends EPackage {
4117 int DS_FOR_PRIVATE_INSURANCE_AND_PLAN__PRIVATE_INSURANCE_AND_PLAN_CATEGORY = DS_FEATURE_COUNT + 0; 3901 int DS_FOR_PRIVATE_INSURANCE_AND_PLAN__PRIVATE_INSURANCE_AND_PLAN_CATEGORY = DS_FEATURE_COUNT + 0;
4118 3902
4119 /** 3903 /**
4120 * The feature id for the '<em><b>Increase for life insurance</b></em>' attribute.
4121 * <!-- begin-user-doc -->
4122 * <!-- end-user-doc -->
4123 * @generated
4124 * @ordered
4125 */
4126 int DS_FOR_PRIVATE_INSURANCE_AND_PLAN__INCREASE_FOR_LIFE_INSURANCE = DS_FEATURE_COUNT + 1;
4127
4128 /**
4129 * The feature id for the '<em><b>Maximum deductible amount for private insurance</b></em>' attribute.
4130 * <!-- begin-user-doc -->
4131 * <!-- end-user-doc -->
4132 * @generated
4133 * @ordered
4134 */
4135 int DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_PRIVATE_INSURANCE = DS_FEATURE_COUNT + 2;
4136
4137 /**
4138 * The feature id for the '<em><b>Maximum deductible amount for old age pension plan</b></em>' attribute.
4139 * <!-- begin-user-doc -->
4140 * <!-- end-user-doc -->
4141 * @generated
4142 * @ordered
4143 */
4144 int DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_OLD_AGE_PENSION_PLAN = DS_FEATURE_COUNT + 3;
4145
4146 /**
4147 * The number of structural features of the '<em>DS for Private Insurance and Plan</em>' class. 3904 * The number of structural features of the '<em>DS for Private Insurance and Plan</em>' class.
4148 * <!-- begin-user-doc --> 3905 * <!-- begin-user-doc -->
4149 * <!-- end-user-doc --> 3906 * <!-- end-user-doc -->
4150 * @generated 3907 * @generated
4151 * @ordered 3908 * @ordered
4152 */ 3909 */
4153 int DS_FOR_PRIVATE_INSURANCE_AND_PLAN_FEATURE_COUNT = DS_FEATURE_COUNT + 4; 3910 int DS_FOR_PRIVATE_INSURANCE_AND_PLAN_FEATURE_COUNT = DS_FEATURE_COUNT + 1;
4154 3911
4155 /** 3912 /**
4156 * The number of operations of the '<em>DS for Private Insurance and Plan</em>' class. 3913 * The number of operations of the '<em>DS for Private Insurance and Plan</em>' class.
@@ -4427,22 +4184,13 @@ public interface TaxationPackage extends EPackage {
4427 int PERMANENT_EXPENSE__CATEGORY = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 0; 4184 int PERMANENT_EXPENSE__CATEGORY = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 0;
4428 4185
4429 /** 4186 /**
4430 * The feature id for the '<em><b>Is eligible for deduction</b></em>' attribute.
4431 * <!-- begin-user-doc -->
4432 * <!-- end-user-doc -->
4433 * @generated
4434 * @ordered
4435 */
4436 int PERMANENT_EXPENSE__IS_ELIGIBLE_FOR_DEDUCTION = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 1;
4437
4438 /**
4439 * The number of structural features of the '<em>Permanent Expense</em>' class. 4187 * The number of structural features of the '<em>Permanent Expense</em>' class.
4440 * <!-- begin-user-doc --> 4188 * <!-- begin-user-doc -->
4441 * <!-- end-user-doc --> 4189 * <!-- end-user-doc -->
4442 * @generated 4190 * @generated
4443 * @ordered 4191 * @ordered
4444 */ 4192 */
4445 int PERMANENT_EXPENSE_FEATURE_COUNT = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 2; 4193 int PERMANENT_EXPENSE_FEATURE_COUNT = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 1;
4446 4194
4447 /** 4195 /**
4448 * The number of operations of the '<em>Permanent Expense</em>' class. 4196 * The number of operations of the '<em>Permanent Expense</em>' class.
@@ -4636,22 +4384,13 @@ public interface TaxationPackage extends EPackage {
4636 int PRIVATE_INSURANCE_AND_PLAN__DURATION_OF_CONTRACT = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 1; 4384 int PRIVATE_INSURANCE_AND_PLAN__DURATION_OF_CONTRACT = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 1;
4637 4385
4638 /** 4386 /**
4639 * The feature id for the '<em><b>Is private insurance and plan eligible for deduction</b></em>' attribute.
4640 * <!-- begin-user-doc -->
4641 * <!-- end-user-doc -->
4642 * @generated
4643 * @ordered
4644 */
4645 int PRIVATE_INSURANCE_AND_PLAN__IS_PRIVATE_INSURANCE_AND_PLAN_ELIGIBLE_FOR_DEDUCTION = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 2;
4646
4647 /**
4648 * The number of structural features of the '<em>Private Insurance and Plan</em>' class. 4387 * The number of structural features of the '<em>Private Insurance and Plan</em>' class.
4649 * <!-- begin-user-doc --> 4388 * <!-- begin-user-doc -->
4650 * <!-- end-user-doc --> 4389 * <!-- end-user-doc -->
4651 * @generated 4390 * @generated
4652 * @ordered 4391 * @ordered
4653 */ 4392 */
4654 int PRIVATE_INSURANCE_AND_PLAN_FEATURE_COUNT = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 3; 4393 int PRIVATE_INSURANCE_AND_PLAN_FEATURE_COUNT = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 2;
4655 4394
4656 /** 4395 /**
4657 * The number of operations of the '<em>Private Insurance and Plan</em>' class. 4396 * The number of operations of the '<em>Private Insurance and Plan</em>' class.
@@ -4854,22 +4593,13 @@ public interface TaxationPackage extends EPackage {
4854 int DONATION__BENEFICIARY1 = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 0; 4593 int DONATION__BENEFICIARY1 = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 0;
4855 4594
4856 /** 4595 /**
4857 * The feature id for the '<em><b>Is beneficiary eligible</b></em>' attribute.
4858 * <!-- begin-user-doc -->
4859 * <!-- end-user-doc -->
4860 * @generated
4861 * @ordered
4862 */
4863 int DONATION__IS_BENEFICIARY_ELIGIBLE = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 1;
4864
4865 /**
4866 * The feature id for the '<em><b>Is donation reported</b></em>' attribute. 4596 * The feature id for the '<em><b>Is donation reported</b></em>' attribute.
4867 * <!-- begin-user-doc --> 4597 * <!-- begin-user-doc -->
4868 * <!-- end-user-doc --> 4598 * <!-- end-user-doc -->
4869 * @generated 4599 * @generated
4870 * @ordered 4600 * @ordered
4871 */ 4601 */
4872 int DONATION__IS_DONATION_REPORTED = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 2; 4602 int DONATION__IS_DONATION_REPORTED = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 1;
4873 4603
4874 /** 4604 /**
4875 * The number of structural features of the '<em>Donation</em>' class. 4605 * The number of structural features of the '<em>Donation</em>' class.
@@ -4878,7 +4608,7 @@ public interface TaxationPackage extends EPackage {
4878 * @generated 4608 * @generated
4879 * @ordered 4609 * @ordered
4880 */ 4610 */
4881 int DONATION_FEATURE_COUNT = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 3; 4611 int DONATION_FEATURE_COUNT = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 2;
4882 4612
4883 /** 4613 /**
4884 * The number of operations of the '<em>Donation</em>' class. 4614 * The number of operations of the '<em>Donation</em>' class.
@@ -4963,49 +4693,13 @@ public interface TaxationPackage extends EPackage {
4963 int LOSS_CARRYFORWARD__BENEFICIARY = SPECIAL_EXPENSE_DS__BENEFICIARY; 4693 int LOSS_CARRYFORWARD__BENEFICIARY = SPECIAL_EXPENSE_DS__BENEFICIARY;
4964 4694
4965 /** 4695 /**
4966 * The feature id for the '<em><b>Regular accountability</b></em>' attribute.
4967 * <!-- begin-user-doc -->
4968 * <!-- end-user-doc -->
4969 * @generated
4970 * @ordered
4971 */
4972 int LOSS_CARRYFORWARD__REGULAR_ACCOUNTABILITY = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 0;
4973
4974 /**
4975 * The feature id for the '<em><b>Compensation by other means</b></em>' attribute.
4976 * <!-- begin-user-doc -->
4977 * <!-- end-user-doc -->
4978 * @generated
4979 * @ordered
4980 */
4981 int LOSS_CARRYFORWARD__COMPENSATION_BY_OTHER_MEANS = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 1;
4982
4983 /**
4984 * The feature id for the '<em><b>Tax payer has inherited business ownership</b></em>' attribute.
4985 * <!-- begin-user-doc -->
4986 * <!-- end-user-doc -->
4987 * @generated
4988 * @ordered
4989 */
4990 int LOSS_CARRYFORWARD__TAX_PAYER_HAS_INHERITED_BUSINESS_OWNERSHIP = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 2;
4991
4992 /**
4993 * The feature id for the '<em><b>Tax payer has been partner in business</b></em>' attribute.
4994 * <!-- begin-user-doc -->
4995 * <!-- end-user-doc -->
4996 * @generated
4997 * @ordered
4998 */
4999 int LOSS_CARRYFORWARD__TAX_PAYER_HAS_BEEN_PARTNER_IN_BUSINESS = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 3;
5000
5001 /**
5002 * The number of structural features of the '<em>Loss Carryforward</em>' class. 4696 * The number of structural features of the '<em>Loss Carryforward</em>' class.
5003 * <!-- begin-user-doc --> 4697 * <!-- begin-user-doc -->
5004 * <!-- end-user-doc --> 4698 * <!-- end-user-doc -->
5005 * @generated 4699 * @generated
5006 * @ordered 4700 * @ordered
5007 */ 4701 */
5008 int LOSS_CARRYFORWARD_FEATURE_COUNT = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 4; 4702 int LOSS_CARRYFORWARD_FEATURE_COUNT = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 0;
5009 4703
5010 /** 4704 /**
5011 * The number of operations of the '<em>Loss Carryforward</em>' class. 4705 * The number of operations of the '<em>Loss Carryforward</em>' class.
@@ -5520,16 +5214,6 @@ public interface TaxationPackage extends EPackage {
5520 int COUNTRY = 60; 5214 int COUNTRY = 60;
5521 5215
5522 /** 5216 /**
5523 * The meta object id for the '{@link Taxation.Tax_Card_Type <em>Tax Card Type</em>}' enum.
5524 * <!-- begin-user-doc -->
5525 * <!-- end-user-doc -->
5526 * @see Taxation.Tax_Card_Type
5527 * @see Taxation.impl.TaxationPackageImpl#getTax_Card_Type()
5528 * @generated
5529 */
5530 int TAX_CARD_TYPE = 61;
5531
5532 /**
5533 * The meta object id for the '{@link Taxation.Tax_Office <em>Tax Office</em>}' enum. 5217 * The meta object id for the '{@link Taxation.Tax_Office <em>Tax Office</em>}' enum.
5534 * <!-- begin-user-doc --> 5218 * <!-- begin-user-doc -->
5535 * <!-- end-user-doc --> 5219 * <!-- end-user-doc -->
@@ -5537,7 +5221,7 @@ public interface TaxationPackage extends EPackage {
5537 * @see Taxation.impl.TaxationPackageImpl#getTax_Office() 5221 * @see Taxation.impl.TaxationPackageImpl#getTax_Office()
5538 * @generated 5222 * @generated
5539 */ 5223 */
5540 int TAX_OFFICE = 62; 5224 int TAX_OFFICE = 61;
5541 5225
5542 /** 5226 /**
5543 * The meta object id for the '{@link Taxation.Tax_Class_Category <em>Tax Class Category</em>}' enum. 5227 * The meta object id for the '{@link Taxation.Tax_Class_Category <em>Tax Class Category</em>}' enum.
@@ -5547,7 +5231,7 @@ public interface TaxationPackage extends EPackage {
5547 * @see Taxation.impl.TaxationPackageImpl#getTax_Class_Category() 5231 * @see Taxation.impl.TaxationPackageImpl#getTax_Class_Category()
5548 * @generated 5232 * @generated
5549 */ 5233 */
5550 int TAX_CLASS_CATEGORY = 63; 5234 int TAX_CLASS_CATEGORY = 62;
5551 5235
5552 /** 5236 /**
5553 * The meta object id for the '{@link Taxation.Job_Activity <em>Job Activity</em>}' enum. 5237 * The meta object id for the '{@link Taxation.Job_Activity <em>Job Activity</em>}' enum.
@@ -5557,7 +5241,7 @@ public interface TaxationPackage extends EPackage {
5557 * @see Taxation.impl.TaxationPackageImpl#getJob_Activity() 5241 * @see Taxation.impl.TaxationPackageImpl#getJob_Activity()
5558 * @generated 5242 * @generated
5559 */ 5243 */
5560 int JOB_ACTIVITY = 64; 5244 int JOB_ACTIVITY = 63;
5561 5245
5562 /** 5246 /**
5563 * The meta object id for the '{@link Taxation.Town <em>Town</em>}' enum. 5247 * The meta object id for the '{@link Taxation.Town <em>Town</em>}' enum.
@@ -5567,17 +5251,7 @@ public interface TaxationPackage extends EPackage {
5567 * @see Taxation.impl.TaxationPackageImpl#getTown() 5251 * @see Taxation.impl.TaxationPackageImpl#getTown()
5568 * @generated 5252 * @generated
5569 */ 5253 */
5570 int TOWN = 65; 5254 int TOWN = 64;
5571
5572 /**
5573 * The meta object id for the '{@link Taxation.Type_of_Rate <em>Type of Rate</em>}' enum.
5574 * <!-- begin-user-doc -->
5575 * <!-- end-user-doc -->
5576 * @see Taxation.Type_of_Rate
5577 * @see Taxation.impl.TaxationPackageImpl#getType_of_Rate()
5578 * @generated
5579 */
5580 int TYPE_OF_RATE = 66;
5581 5255
5582 /** 5256 /**
5583 * The meta object id for the '{@link Taxation.CE_Type <em>CE Type</em>}' enum. 5257 * The meta object id for the '{@link Taxation.CE_Type <em>CE Type</em>}' enum.
@@ -5587,7 +5261,7 @@ public interface TaxationPackage extends EPackage {
5587 * @see Taxation.impl.TaxationPackageImpl#getCE_Type() 5261 * @see Taxation.impl.TaxationPackageImpl#getCE_Type()
5588 * @generated 5262 * @generated
5589 */ 5263 */
5590 int CE_TYPE = 67; 5264 int CE_TYPE = 65;
5591 5265
5592 /** 5266 /**
5593 * The meta object id for the '{@link Taxation.Expense_Purpose <em>Expense Purpose</em>}' enum. 5267 * The meta object id for the '{@link Taxation.Expense_Purpose <em>Expense Purpose</em>}' enum.
@@ -5597,7 +5271,7 @@ public interface TaxationPackage extends EPackage {
5597 * @see Taxation.impl.TaxationPackageImpl#getExpense_Purpose() 5271 * @see Taxation.impl.TaxationPackageImpl#getExpense_Purpose()
5598 * @generated 5272 * @generated
5599 */ 5273 */
5600 int EXPENSE_PURPOSE = 68; 5274 int EXPENSE_PURPOSE = 66;
5601 5275
5602 /** 5276 /**
5603 * The meta object id for the '{@link Taxation.Dependent_Type <em>Dependent Type</em>}' enum. 5277 * The meta object id for the '{@link Taxation.Dependent_Type <em>Dependent Type</em>}' enum.
@@ -5607,7 +5281,7 @@ public interface TaxationPackage extends EPackage {
5607 * @see Taxation.impl.TaxationPackageImpl#getDependent_Type() 5281 * @see Taxation.impl.TaxationPackageImpl#getDependent_Type()
5608 * @generated 5282 * @generated
5609 */ 5283 */
5610 int DEPENDENT_TYPE = 69; 5284 int DEPENDENT_TYPE = 67;
5611 5285
5612 /** 5286 /**
5613 * The meta object id for the '{@link Taxation.Separation_Causes <em>Separation Causes</em>}' enum. 5287 * The meta object id for the '{@link Taxation.Separation_Causes <em>Separation Causes</em>}' enum.
@@ -5617,7 +5291,7 @@ public interface TaxationPackage extends EPackage {
5617 * @see Taxation.impl.TaxationPackageImpl#getSeparation_Causes() 5291 * @see Taxation.impl.TaxationPackageImpl#getSeparation_Causes()
5618 * @generated 5292 * @generated
5619 */ 5293 */
5620 int SEPARATION_CAUSES = 70; 5294 int SEPARATION_CAUSES = 68;
5621 5295
5622 /** 5296 /**
5623 * The meta object id for the '{@link Taxation.Category_of_Permanent_Expense <em>Category of Permanent Expense</em>}' enum. 5297 * The meta object id for the '{@link Taxation.Category_of_Permanent_Expense <em>Category of Permanent Expense</em>}' enum.
@@ -5627,7 +5301,7 @@ public interface TaxationPackage extends EPackage {
5627 * @see Taxation.impl.TaxationPackageImpl#getCategory_of_Permanent_Expense() 5301 * @see Taxation.impl.TaxationPackageImpl#getCategory_of_Permanent_Expense()
5628 * @generated 5302 * @generated
5629 */ 5303 */
5630 int CATEGORY_OF_PERMANENT_EXPENSE = 71; 5304 int CATEGORY_OF_PERMANENT_EXPENSE = 69;
5631 5305
5632 /** 5306 /**
5633 * The meta object id for the '{@link Taxation.Category_of_Health_and_Pension_Insurances <em>Category of Health and Pension Insurances</em>}' enum. 5307 * The meta object id for the '{@link Taxation.Category_of_Health_and_Pension_Insurances <em>Category of Health and Pension Insurances</em>}' enum.
@@ -5637,7 +5311,7 @@ public interface TaxationPackage extends EPackage {
5637 * @see Taxation.impl.TaxationPackageImpl#getCategory_of_Health_and_Pension_Insurances() 5311 * @see Taxation.impl.TaxationPackageImpl#getCategory_of_Health_and_Pension_Insurances()
5638 * @generated 5312 * @generated
5639 */ 5313 */
5640 int CATEGORY_OF_HEALTH_AND_PENSION_INSURANCES = 72; 5314 int CATEGORY_OF_HEALTH_AND_PENSION_INSURANCES = 70;
5641 5315
5642 /** 5316 /**
5643 * The meta object id for the '{@link Taxation.Category_of_Private_Insurance_and_Plan <em>Category of Private Insurance and Plan</em>}' enum. 5317 * The meta object id for the '{@link Taxation.Category_of_Private_Insurance_and_Plan <em>Category of Private Insurance and Plan</em>}' enum.
@@ -5647,7 +5321,7 @@ public interface TaxationPackage extends EPackage {
5647 * @see Taxation.impl.TaxationPackageImpl#getCategory_of_Private_Insurance_and_Plan() 5321 * @see Taxation.impl.TaxationPackageImpl#getCategory_of_Private_Insurance_and_Plan()
5648 * @generated 5322 * @generated
5649 */ 5323 */
5650 int CATEGORY_OF_PRIVATE_INSURANCE_AND_PLAN = 73; 5324 int CATEGORY_OF_PRIVATE_INSURANCE_AND_PLAN = 71;
5651 5325
5652 /** 5326 /**
5653 * The meta object id for the '{@link Taxation.Legal_Union_Types <em>Legal Union Types</em>}' enum. 5327 * The meta object id for the '{@link Taxation.Legal_Union_Types <em>Legal Union Types</em>}' enum.
@@ -5657,7 +5331,7 @@ public interface TaxationPackage extends EPackage {
5657 * @see Taxation.impl.TaxationPackageImpl#getLegal_Union_Types() 5331 * @see Taxation.impl.TaxationPackageImpl#getLegal_Union_Types()
5658 * @generated 5332 * @generated
5659 */ 5333 */
5660 int LEGAL_UNION_TYPES = 74; 5334 int LEGAL_UNION_TYPES = 72;
5661 5335
5662 5336
5663 /** 5337 /**
@@ -6054,17 +5728,6 @@ public interface TaxationPackage extends EPackage {
6054 EReference getTax_Payer_From_law(); 5728 EReference getTax_Payer_From_law();
6055 5729
6056 /** 5730 /**
6057 * Returns the meta object for the attribute '{@link Taxation.Tax_Payer#getTaxesDue <em>Taxes Due</em>}'.
6058 * <!-- begin-user-doc -->
6059 * <!-- end-user-doc -->
6060 * @return the meta object for the attribute '<em>Taxes Due</em>'.
6061 * @see Taxation.Tax_Payer#getTaxesDue()
6062 * @see #getTax_Payer()
6063 * @generated
6064 */
6065 EAttribute getTax_Payer_TaxesDue();
6066
6067 /**
6068 * Returns the meta object for class '{@link Taxation.Physical_Person <em>Physical Person</em>}'. 5731 * Returns the meta object for class '{@link Taxation.Physical_Person <em>Physical Person</em>}'.
6069 * <!-- begin-user-doc --> 5732 * <!-- begin-user-doc -->
6070 * <!-- end-user-doc --> 5733 * <!-- end-user-doc -->
@@ -6075,17 +5738,6 @@ public interface TaxationPackage extends EPackage {
6075 EClass getPhysical_Person(); 5738 EClass getPhysical_Person();
6076 5739
6077 /** 5740 /**
6078 * Returns the meta object for the attribute '{@link Taxation.Physical_Person#isIs_assisting_spouse <em>Is assisting spouse</em>}'.
6079 * <!-- begin-user-doc -->
6080 * <!-- end-user-doc -->
6081 * @return the meta object for the attribute '<em>Is assisting spouse</em>'.
6082 * @see Taxation.Physical_Person#isIs_assisting_spouse()
6083 * @see #getPhysical_Person()
6084 * @generated
6085 */
6086 EAttribute getPhysical_Person_Is_assisting_spouse();
6087
6088 /**
6089 * Returns the meta object for the attribute '{@link Taxation.Physical_Person#getSSNo <em>SS No</em>}'. 5741 * Returns the meta object for the attribute '{@link Taxation.Physical_Person#getSSNo <em>SS No</em>}'.
6090 * <!-- begin-user-doc --> 5742 * <!-- begin-user-doc -->
6091 * <!-- end-user-doc --> 5743 * <!-- end-user-doc -->
@@ -6141,17 +5793,6 @@ public interface TaxationPackage extends EPackage {
6141 EAttribute getPhysical_Person_Disability_type(); 5793 EAttribute getPhysical_Person_Disability_type();
6142 5794
6143 /** 5795 /**
6144 * Returns the meta object for the attribute '{@link Taxation.Physical_Person#isIs_affiliated_personnaly_to_social_security <em>Is affiliated personnaly to social security</em>}'.
6145 * <!-- begin-user-doc -->
6146 * <!-- end-user-doc -->
6147 * @return the meta object for the attribute '<em>Is affiliated personnaly to social security</em>'.
6148 * @see Taxation.Physical_Person#isIs_affiliated_personnaly_to_social_security()
6149 * @see #getPhysical_Person()
6150 * @generated
6151 */
6152 EAttribute getPhysical_Person_Is_affiliated_personnaly_to_social_security();
6153
6154 /**
6155 * Returns the meta object for the attribute '{@link Taxation.Physical_Person#getBirth_month <em>Birth month</em>}'. 5796 * Returns the meta object for the attribute '{@link Taxation.Physical_Person#getBirth_month <em>Birth month</em>}'.
6156 * <!-- begin-user-doc --> 5797 * <!-- begin-user-doc -->
6157 * <!-- end-user-doc --> 5798 * <!-- end-user-doc -->
@@ -6456,17 +6097,6 @@ public interface TaxationPackage extends EPackage {
6456 EClass getExternal_Allowance(); 6097 EClass getExternal_Allowance();
6457 6098
6458 /** 6099 /**
6459 * Returns the meta object for the attribute '{@link Taxation.External_Allowance#getAmount <em>Amount</em>}'.
6460 * <!-- begin-user-doc -->
6461 * <!-- end-user-doc -->
6462 * @return the meta object for the attribute '<em>Amount</em>'.
6463 * @see Taxation.External_Allowance#getAmount()
6464 * @see #getExternal_Allowance()
6465 * @generated
6466 */
6467 EAttribute getExternal_Allowance_Amount();
6468
6469 /**
6470 * Returns the meta object for the attribute '{@link Taxation.External_Allowance#getGrantor <em>Grantor</em>}'. 6100 * Returns the meta object for the attribute '{@link Taxation.External_Allowance#getGrantor <em>Grantor</em>}'.
6471 * <!-- begin-user-doc --> 6101 * <!-- begin-user-doc -->
6472 * <!-- end-user-doc --> 6102 * <!-- end-user-doc -->
@@ -6911,17 +6541,6 @@ public interface TaxationPackage extends EPackage {
6911 EClass getIncome_Type(); 6541 EClass getIncome_Type();
6912 6542
6913 /** 6543 /**
6914 * Returns the meta object for the attribute '{@link Taxation.Income_Type#isSubjectToWithholdingTax <em>Subject To Withholding Tax</em>}'.
6915 * <!-- begin-user-doc -->
6916 * <!-- end-user-doc -->
6917 * @return the meta object for the attribute '<em>Subject To Withholding Tax</em>'.
6918 * @see Taxation.Income_Type#isSubjectToWithholdingTax()
6919 * @see #getIncome_Type()
6920 * @generated
6921 */
6922 EAttribute getIncome_Type_SubjectToWithholdingTax();
6923
6924 /**
6925 * Returns the meta object for the attribute '{@link Taxation.Income_Type#getId8 <em>Id8</em>}'. 6544 * Returns the meta object for the attribute '{@link Taxation.Income_Type#getId8 <em>Id8</em>}'.
6926 * <!-- begin-user-doc --> 6545 * <!-- begin-user-doc -->
6927 * <!-- end-user-doc --> 6546 * <!-- end-user-doc -->
@@ -6965,17 +6584,6 @@ public interface TaxationPackage extends EPackage {
6965 EAttribute getTax_Card_Card_identifier(); 6584 EAttribute getTax_Card_Card_identifier();
6966 6585
6967 /** 6586 /**
6968 * Returns the meta object for the attribute '{@link Taxation.Tax_Card#getTax_card_type <em>Tax card type</em>}'.
6969 * <!-- begin-user-doc -->
6970 * <!-- end-user-doc -->
6971 * @return the meta object for the attribute '<em>Tax card type</em>'.
6972 * @see Taxation.Tax_Card#getTax_card_type()
6973 * @see #getTax_Card()
6974 * @generated
6975 */
6976 EAttribute getTax_Card_Tax_card_type();
6977
6978 /**
6979 * Returns the meta object for the attribute '{@link Taxation.Tax_Card#getTax_office <em>Tax office</em>}'. 6587 * Returns the meta object for the attribute '{@link Taxation.Tax_Card#getTax_office <em>Tax office</em>}'.
6980 * <!-- begin-user-doc --> 6588 * <!-- begin-user-doc -->
6981 * <!-- end-user-doc --> 6589 * <!-- end-user-doc -->
@@ -7780,17 +7388,6 @@ public interface TaxationPackage extends EPackage {
7780 EAttribute getFD_Distance_declared_in_january(); 7388 EAttribute getFD_Distance_declared_in_january();
7781 7389
7782 /** 7390 /**
7783 * Returns the meta object for the attribute '{@link Taxation.FD#getCalculated_distance <em>Calculated distance</em>}'.
7784 * <!-- begin-user-doc -->
7785 * <!-- end-user-doc -->
7786 * @return the meta object for the attribute '<em>Calculated distance</em>'.
7787 * @see Taxation.FD#getCalculated_distance()
7788 * @see #getFD()
7789 * @generated
7790 */
7791 EAttribute getFD_Calculated_distance();
7792
7793 /**
7794 * Returns the meta object for class '{@link Taxation.Professional_Expenses_Deduction <em>Professional Expenses Deduction</em>}'. 7391 * Returns the meta object for class '{@link Taxation.Professional_Expenses_Deduction <em>Professional Expenses Deduction</em>}'.
7795 * <!-- begin-user-doc --> 7392 * <!-- begin-user-doc -->
7796 * <!-- end-user-doc --> 7393 * <!-- end-user-doc -->
@@ -7811,17 +7408,6 @@ public interface TaxationPackage extends EPackage {
7811 EClass getFO(); 7408 EClass getFO();
7812 7409
7813 /** 7410 /**
7814 * Returns the meta object for the attribute '{@link Taxation.FO#getRate_type_for_FO <em>Rate type for FO</em>}'.
7815 * <!-- begin-user-doc -->
7816 * <!-- end-user-doc -->
7817 * @return the meta object for the attribute '<em>Rate type for FO</em>'.
7818 * @see Taxation.FO#getRate_type_for_FO()
7819 * @see #getFO()
7820 * @generated
7821 */
7822 EAttribute getFO_Rate_type_for_FO();
7823
7824 /**
7825 * Returns the meta object for class '{@link Taxation.DS_for_Permanent_Expense <em>DS for Permanent Expense</em>}'. 7411 * Returns the meta object for class '{@link Taxation.DS_for_Permanent_Expense <em>DS for Permanent Expense</em>}'.
7826 * <!-- begin-user-doc --> 7412 * <!-- begin-user-doc -->
7827 * <!-- end-user-doc --> 7413 * <!-- end-user-doc -->
@@ -7927,39 +7513,6 @@ public interface TaxationPackage extends EPackage {
7927 EAttribute getDS_for_Private_Insurance_and_Plan_Private_insurance_and_plan_category(); 7513 EAttribute getDS_for_Private_Insurance_and_Plan_Private_insurance_and_plan_category();
7928 7514
7929 /** 7515 /**
7930 * Returns the meta object for the attribute '{@link Taxation.DS_for_Private_Insurance_and_Plan#getIncrease_for_life_insurance <em>Increase for life insurance</em>}'.
7931 * <!-- begin-user-doc -->
7932 * <!-- end-user-doc -->
7933 * @return the meta object for the attribute '<em>Increase for life insurance</em>'.
7934 * @see Taxation.DS_for_Private_Insurance_and_Plan#getIncrease_for_life_insurance()
7935 * @see #getDS_for_Private_Insurance_and_Plan()
7936 * @generated
7937 */
7938 EAttribute getDS_for_Private_Insurance_and_Plan_Increase_for_life_insurance();
7939
7940 /**
7941 * Returns the meta object for the attribute '{@link Taxation.DS_for_Private_Insurance_and_Plan#getMaximum_deductible_amount_for_private_insurance <em>Maximum deductible amount for private insurance</em>}'.
7942 * <!-- begin-user-doc -->
7943 * <!-- end-user-doc -->
7944 * @return the meta object for the attribute '<em>Maximum deductible amount for private insurance</em>'.
7945 * @see Taxation.DS_for_Private_Insurance_and_Plan#getMaximum_deductible_amount_for_private_insurance()
7946 * @see #getDS_for_Private_Insurance_and_Plan()
7947 * @generated
7948 */
7949 EAttribute getDS_for_Private_Insurance_and_Plan_Maximum_deductible_amount_for_private_insurance();
7950
7951 /**
7952 * Returns the meta object for the attribute '{@link Taxation.DS_for_Private_Insurance_and_Plan#getMaximum_deductible_amount_for_old_age_pension_plan <em>Maximum deductible amount for old age pension plan</em>}'.
7953 * <!-- begin-user-doc -->
7954 * <!-- end-user-doc -->
7955 * @return the meta object for the attribute '<em>Maximum deductible amount for old age pension plan</em>'.
7956 * @see Taxation.DS_for_Private_Insurance_and_Plan#getMaximum_deductible_amount_for_old_age_pension_plan()
7957 * @see #getDS_for_Private_Insurance_and_Plan()
7958 * @generated
7959 */
7960 EAttribute getDS_for_Private_Insurance_and_Plan_Maximum_deductible_amount_for_old_age_pension_plan();
7961
7962 /**
7963 * Returns the meta object for class '{@link Taxation.DS_for_Loss_Carryforward <em>DS for Loss Carryforward</em>}'. 7516 * Returns the meta object for class '{@link Taxation.DS_for_Loss_Carryforward <em>DS for Loss Carryforward</em>}'.
7964 * <!-- begin-user-doc --> 7517 * <!-- begin-user-doc -->
7965 * <!-- end-user-doc --> 7518 * <!-- end-user-doc -->
@@ -8001,17 +7554,6 @@ public interface TaxationPackage extends EPackage {
8001 EAttribute getPermanent_Expense_Category(); 7554 EAttribute getPermanent_Expense_Category();
8002 7555
8003 /** 7556 /**
8004 * Returns the meta object for the attribute '{@link Taxation.Permanent_Expense#isIs_eligible_for_deduction <em>Is eligible for deduction</em>}'.
8005 * <!-- begin-user-doc -->
8006 * <!-- end-user-doc -->
8007 * @return the meta object for the attribute '<em>Is eligible for deduction</em>'.
8008 * @see Taxation.Permanent_Expense#isIs_eligible_for_deduction()
8009 * @see #getPermanent_Expense()
8010 * @generated
8011 */
8012 EAttribute getPermanent_Expense_Is_eligible_for_deduction();
8013
8014 /**
8015 * Returns the meta object for class '{@link Taxation.Special_Expense_DS <em>Special Expense DS</em>}'. 7557 * Returns the meta object for class '{@link Taxation.Special_Expense_DS <em>Special Expense DS</em>}'.
8016 * <!-- begin-user-doc --> 7558 * <!-- begin-user-doc -->
8017 * <!-- end-user-doc --> 7559 * <!-- end-user-doc -->
@@ -8064,17 +7606,6 @@ public interface TaxationPackage extends EPackage {
8064 EAttribute getPrivate_Insurance_and_Plan_Duration_of_contract(); 7606 EAttribute getPrivate_Insurance_and_Plan_Duration_of_contract();
8065 7607
8066 /** 7608 /**
8067 * Returns the meta object for the attribute '{@link Taxation.Private_Insurance_and_Plan#isIs_private_insurance_and_plan_eligible_for_deduction <em>Is private insurance and plan eligible for deduction</em>}'.
8068 * <!-- begin-user-doc -->
8069 * <!-- end-user-doc -->
8070 * @return the meta object for the attribute '<em>Is private insurance and plan eligible for deduction</em>'.
8071 * @see Taxation.Private_Insurance_and_Plan#isIs_private_insurance_and_plan_eligible_for_deduction()
8072 * @see #getPrivate_Insurance_and_Plan()
8073 * @generated
8074 */
8075 EAttribute getPrivate_Insurance_and_Plan_Is_private_insurance_and_plan_eligible_for_deduction();
8076
8077 /**
8078 * Returns the meta object for class '{@link Taxation.Health_and_Pension_Insurance <em>Health and Pension Insurance</em>}'. 7609 * Returns the meta object for class '{@link Taxation.Health_and_Pension_Insurance <em>Health and Pension Insurance</em>}'.
8079 * <!-- begin-user-doc --> 7610 * <!-- begin-user-doc -->
8080 * <!-- end-user-doc --> 7611 * <!-- end-user-doc -->
@@ -8128,17 +7659,6 @@ public interface TaxationPackage extends EPackage {
8128 EAttribute getDonation_Beneficiary1(); 7659 EAttribute getDonation_Beneficiary1();
8129 7660
8130 /** 7661 /**
8131 * Returns the meta object for the attribute '{@link Taxation.Donation#isIs_beneficiary_eligible <em>Is beneficiary eligible</em>}'.
8132 * <!-- begin-user-doc -->
8133 * <!-- end-user-doc -->
8134 * @return the meta object for the attribute '<em>Is beneficiary eligible</em>'.
8135 * @see Taxation.Donation#isIs_beneficiary_eligible()
8136 * @see #getDonation()
8137 * @generated
8138 */
8139 EAttribute getDonation_Is_beneficiary_eligible();
8140
8141 /**
8142 * Returns the meta object for the attribute '{@link Taxation.Donation#isIs_donation_reported <em>Is donation reported</em>}'. 7662 * Returns the meta object for the attribute '{@link Taxation.Donation#isIs_donation_reported <em>Is donation reported</em>}'.
8143 * <!-- begin-user-doc --> 7663 * <!-- begin-user-doc -->
8144 * <!-- end-user-doc --> 7664 * <!-- end-user-doc -->
@@ -8160,50 +7680,6 @@ public interface TaxationPackage extends EPackage {
8160 EClass getLoss_Carryforward(); 7680 EClass getLoss_Carryforward();
8161 7681
8162 /** 7682 /**
8163 * Returns the meta object for the attribute '{@link Taxation.Loss_Carryforward#isRegular_accountability <em>Regular accountability</em>}'.
8164 * <!-- begin-user-doc -->
8165 * <!-- end-user-doc -->
8166 * @return the meta object for the attribute '<em>Regular accountability</em>'.
8167 * @see Taxation.Loss_Carryforward#isRegular_accountability()
8168 * @see #getLoss_Carryforward()
8169 * @generated
8170 */
8171 EAttribute getLoss_Carryforward_Regular_accountability();
8172
8173 /**
8174 * Returns the meta object for the attribute '{@link Taxation.Loss_Carryforward#isCompensation_by_other_means <em>Compensation by other means</em>}'.
8175 * <!-- begin-user-doc -->
8176 * <!-- end-user-doc -->
8177 * @return the meta object for the attribute '<em>Compensation by other means</em>'.
8178 * @see Taxation.Loss_Carryforward#isCompensation_by_other_means()
8179 * @see #getLoss_Carryforward()
8180 * @generated
8181 */
8182 EAttribute getLoss_Carryforward_Compensation_by_other_means();
8183
8184 /**
8185 * Returns the meta object for the attribute '{@link Taxation.Loss_Carryforward#isTax_payer_has_inherited_business_ownership <em>Tax payer has inherited business ownership</em>}'.
8186 * <!-- begin-user-doc -->
8187 * <!-- end-user-doc -->
8188 * @return the meta object for the attribute '<em>Tax payer has inherited business ownership</em>'.
8189 * @see Taxation.Loss_Carryforward#isTax_payer_has_inherited_business_ownership()
8190 * @see #getLoss_Carryforward()
8191 * @generated
8192 */
8193 EAttribute getLoss_Carryforward_Tax_payer_has_inherited_business_ownership();
8194
8195 /**
8196 * Returns the meta object for the attribute '{@link Taxation.Loss_Carryforward#isTax_payer_has_been_partner_in_business <em>Tax payer has been partner in business</em>}'.
8197 * <!-- begin-user-doc -->
8198 * <!-- end-user-doc -->
8199 * @return the meta object for the attribute '<em>Tax payer has been partner in business</em>'.
8200 * @see Taxation.Loss_Carryforward#isTax_payer_has_been_partner_in_business()
8201 * @see #getLoss_Carryforward()
8202 * @generated
8203 */
8204 EAttribute getLoss_Carryforward_Tax_payer_has_been_partner_in_business();
8205
8206 /**
8207 * Returns the meta object for class '{@link Taxation.Spousal_Expense_AC <em>Spousal Expense AC</em>}'. 7683 * Returns the meta object for class '{@link Taxation.Spousal_Expense_AC <em>Spousal Expense AC</em>}'.
8208 * <!-- begin-user-doc --> 7684 * <!-- begin-user-doc -->
8209 * <!-- end-user-doc --> 7685 * <!-- end-user-doc -->
@@ -8306,16 +7782,6 @@ public interface TaxationPackage extends EPackage {
8306 EEnum getCountry(); 7782 EEnum getCountry();
8307 7783
8308 /** 7784 /**
8309 * Returns the meta object for enum '{@link Taxation.Tax_Card_Type <em>Tax Card Type</em>}'.
8310 * <!-- begin-user-doc -->
8311 * <!-- end-user-doc -->
8312 * @return the meta object for enum '<em>Tax Card Type</em>'.
8313 * @see Taxation.Tax_Card_Type
8314 * @generated
8315 */
8316 EEnum getTax_Card_Type();
8317
8318 /**
8319 * Returns the meta object for enum '{@link Taxation.Tax_Office <em>Tax Office</em>}'. 7785 * Returns the meta object for enum '{@link Taxation.Tax_Office <em>Tax Office</em>}'.
8320 * <!-- begin-user-doc --> 7786 * <!-- begin-user-doc -->
8321 * <!-- end-user-doc --> 7787 * <!-- end-user-doc -->
@@ -8356,16 +7822,6 @@ public interface TaxationPackage extends EPackage {
8356 EEnum getTown(); 7822 EEnum getTown();
8357 7823
8358 /** 7824 /**
8359 * Returns the meta object for enum '{@link Taxation.Type_of_Rate <em>Type of Rate</em>}'.
8360 * <!-- begin-user-doc -->
8361 * <!-- end-user-doc -->
8362 * @return the meta object for enum '<em>Type of Rate</em>'.
8363 * @see Taxation.Type_of_Rate
8364 * @generated
8365 */
8366 EEnum getType_of_Rate();
8367
8368 /**
8369 * Returns the meta object for enum '{@link Taxation.CE_Type <em>CE Type</em>}'. 7825 * Returns the meta object for enum '{@link Taxation.CE_Type <em>CE Type</em>}'.
8370 * <!-- begin-user-doc --> 7826 * <!-- begin-user-doc -->
8371 * <!-- end-user-doc --> 7827 * <!-- end-user-doc -->
@@ -8763,14 +8219,6 @@ public interface TaxationPackage extends EPackage {
8763 EReference TAX_PAYER__FROM_LAW = eINSTANCE.getTax_Payer_From_law(); 8219 EReference TAX_PAYER__FROM_LAW = eINSTANCE.getTax_Payer_From_law();
8764 8220
8765 /** 8221 /**
8766 * The meta object literal for the '<em><b>Taxes Due</b></em>' attribute feature.
8767 * <!-- begin-user-doc -->
8768 * <!-- end-user-doc -->
8769 * @generated
8770 */
8771 EAttribute TAX_PAYER__TAXES_DUE = eINSTANCE.getTax_Payer_TaxesDue();
8772
8773 /**
8774 * The meta object literal for the '{@link Taxation.impl.Physical_PersonImpl <em>Physical Person</em>}' class. 8222 * The meta object literal for the '{@link Taxation.impl.Physical_PersonImpl <em>Physical Person</em>}' class.
8775 * <!-- begin-user-doc --> 8223 * <!-- begin-user-doc -->
8776 * <!-- end-user-doc --> 8224 * <!-- end-user-doc -->
@@ -8781,14 +8229,6 @@ public interface TaxationPackage extends EPackage {
8781 EClass PHYSICAL_PERSON = eINSTANCE.getPhysical_Person(); 8229 EClass PHYSICAL_PERSON = eINSTANCE.getPhysical_Person();
8782 8230
8783 /** 8231 /**
8784 * The meta object literal for the '<em><b>Is assisting spouse</b></em>' attribute feature.
8785 * <!-- begin-user-doc -->
8786 * <!-- end-user-doc -->
8787 * @generated
8788 */
8789 EAttribute PHYSICAL_PERSON__IS_ASSISTING_SPOUSE = eINSTANCE.getPhysical_Person_Is_assisting_spouse();
8790
8791 /**
8792 * The meta object literal for the '<em><b>SS No</b></em>' attribute feature. 8232 * The meta object literal for the '<em><b>SS No</b></em>' attribute feature.
8793 * <!-- begin-user-doc --> 8233 * <!-- begin-user-doc -->
8794 * <!-- end-user-doc --> 8234 * <!-- end-user-doc -->
@@ -8829,14 +8269,6 @@ public interface TaxationPackage extends EPackage {
8829 EAttribute PHYSICAL_PERSON__DISABILITY_TYPE = eINSTANCE.getPhysical_Person_Disability_type(); 8269 EAttribute PHYSICAL_PERSON__DISABILITY_TYPE = eINSTANCE.getPhysical_Person_Disability_type();
8830 8270
8831 /** 8271 /**
8832 * The meta object literal for the '<em><b>Is affiliated personnaly to social security</b></em>' attribute feature.
8833 * <!-- begin-user-doc -->
8834 * <!-- end-user-doc -->
8835 * @generated
8836 */
8837 EAttribute PHYSICAL_PERSON__IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY = eINSTANCE.getPhysical_Person_Is_affiliated_personnaly_to_social_security();
8838
8839 /**
8840 * The meta object literal for the '<em><b>Birth month</b></em>' attribute feature. 8272 * The meta object literal for the '<em><b>Birth month</b></em>' attribute feature.
8841 * <!-- begin-user-doc --> 8273 * <!-- begin-user-doc -->
8842 * <!-- end-user-doc --> 8274 * <!-- end-user-doc -->
@@ -9069,14 +8501,6 @@ public interface TaxationPackage extends EPackage {
9069 EClass EXTERNAL_ALLOWANCE = eINSTANCE.getExternal_Allowance(); 8501 EClass EXTERNAL_ALLOWANCE = eINSTANCE.getExternal_Allowance();
9070 8502
9071 /** 8503 /**
9072 * The meta object literal for the '<em><b>Amount</b></em>' attribute feature.
9073 * <!-- begin-user-doc -->
9074 * <!-- end-user-doc -->
9075 * @generated
9076 */
9077 EAttribute EXTERNAL_ALLOWANCE__AMOUNT = eINSTANCE.getExternal_Allowance_Amount();
9078
9079 /**
9080 * The meta object literal for the '<em><b>Grantor</b></em>' attribute feature. 8504 * The meta object literal for the '<em><b>Grantor</b></em>' attribute feature.
9081 * <!-- begin-user-doc --> 8505 * <!-- begin-user-doc -->
9082 * <!-- end-user-doc --> 8506 * <!-- end-user-doc -->
@@ -9419,14 +8843,6 @@ public interface TaxationPackage extends EPackage {
9419 EClass INCOME_TYPE = eINSTANCE.getIncome_Type(); 8843 EClass INCOME_TYPE = eINSTANCE.getIncome_Type();
9420 8844
9421 /** 8845 /**
9422 * The meta object literal for the '<em><b>Subject To Withholding Tax</b></em>' attribute feature.
9423 * <!-- begin-user-doc -->
9424 * <!-- end-user-doc -->
9425 * @generated
9426 */
9427 EAttribute INCOME_TYPE__SUBJECT_TO_WITHHOLDING_TAX = eINSTANCE.getIncome_Type_SubjectToWithholdingTax();
9428
9429 /**
9430 * The meta object literal for the '<em><b>Id8</b></em>' attribute feature. 8846 * The meta object literal for the '<em><b>Id8</b></em>' attribute feature.
9431 * <!-- begin-user-doc --> 8847 * <!-- begin-user-doc -->
9432 * <!-- end-user-doc --> 8848 * <!-- end-user-doc -->
@@ -9461,14 +8877,6 @@ public interface TaxationPackage extends EPackage {
9461 EAttribute TAX_CARD__CARD_IDENTIFIER = eINSTANCE.getTax_Card_Card_identifier(); 8877 EAttribute TAX_CARD__CARD_IDENTIFIER = eINSTANCE.getTax_Card_Card_identifier();
9462 8878
9463 /** 8879 /**
9464 * The meta object literal for the '<em><b>Tax card type</b></em>' attribute feature.
9465 * <!-- begin-user-doc -->
9466 * <!-- end-user-doc -->
9467 * @generated
9468 */
9469 EAttribute TAX_CARD__TAX_CARD_TYPE = eINSTANCE.getTax_Card_Tax_card_type();
9470
9471 /**
9472 * The meta object literal for the '<em><b>Tax office</b></em>' attribute feature. 8880 * The meta object literal for the '<em><b>Tax office</b></em>' attribute feature.
9473 * <!-- begin-user-doc --> 8881 * <!-- begin-user-doc -->
9474 * <!-- end-user-doc --> 8882 * <!-- end-user-doc -->
@@ -10111,14 +9519,6 @@ public interface TaxationPackage extends EPackage {
10111 EAttribute FD__DISTANCE_DECLARED_IN_JANUARY = eINSTANCE.getFD_Distance_declared_in_january(); 9519 EAttribute FD__DISTANCE_DECLARED_IN_JANUARY = eINSTANCE.getFD_Distance_declared_in_january();
10112 9520
10113 /** 9521 /**
10114 * The meta object literal for the '<em><b>Calculated distance</b></em>' attribute feature.
10115 * <!-- begin-user-doc -->
10116 * <!-- end-user-doc -->
10117 * @generated
10118 */
10119 EAttribute FD__CALCULATED_DISTANCE = eINSTANCE.getFD_Calculated_distance();
10120
10121 /**
10122 * The meta object literal for the '{@link Taxation.impl.Professional_Expenses_DeductionImpl <em>Professional Expenses Deduction</em>}' class. 9522 * The meta object literal for the '{@link Taxation.impl.Professional_Expenses_DeductionImpl <em>Professional Expenses Deduction</em>}' class.
10123 * <!-- begin-user-doc --> 9523 * <!-- begin-user-doc -->
10124 * <!-- end-user-doc --> 9524 * <!-- end-user-doc -->
@@ -10139,14 +9539,6 @@ public interface TaxationPackage extends EPackage {
10139 EClass FO = eINSTANCE.getFO(); 9539 EClass FO = eINSTANCE.getFO();
10140 9540
10141 /** 9541 /**
10142 * The meta object literal for the '<em><b>Rate type for FO</b></em>' attribute feature.
10143 * <!-- begin-user-doc -->
10144 * <!-- end-user-doc -->
10145 * @generated
10146 */
10147 EAttribute FO__RATE_TYPE_FOR_FO = eINSTANCE.getFO_Rate_type_for_FO();
10148
10149 /**
10150 * The meta object literal for the '{@link Taxation.impl.DS_for_Permanent_ExpenseImpl <em>DS for Permanent Expense</em>}' class. 9542 * The meta object literal for the '{@link Taxation.impl.DS_for_Permanent_ExpenseImpl <em>DS for Permanent Expense</em>}' class.
10151 * <!-- begin-user-doc --> 9543 * <!-- begin-user-doc -->
10152 * <!-- end-user-doc --> 9544 * <!-- end-user-doc -->
@@ -10237,30 +9629,6 @@ public interface TaxationPackage extends EPackage {
10237 EAttribute DS_FOR_PRIVATE_INSURANCE_AND_PLAN__PRIVATE_INSURANCE_AND_PLAN_CATEGORY = eINSTANCE.getDS_for_Private_Insurance_and_Plan_Private_insurance_and_plan_category(); 9629 EAttribute DS_FOR_PRIVATE_INSURANCE_AND_PLAN__PRIVATE_INSURANCE_AND_PLAN_CATEGORY = eINSTANCE.getDS_for_Private_Insurance_and_Plan_Private_insurance_and_plan_category();
10238 9630
10239 /** 9631 /**
10240 * The meta object literal for the '<em><b>Increase for life insurance</b></em>' attribute feature.
10241 * <!-- begin-user-doc -->
10242 * <!-- end-user-doc -->
10243 * @generated
10244 */
10245 EAttribute DS_FOR_PRIVATE_INSURANCE_AND_PLAN__INCREASE_FOR_LIFE_INSURANCE = eINSTANCE.getDS_for_Private_Insurance_and_Plan_Increase_for_life_insurance();
10246
10247 /**
10248 * The meta object literal for the '<em><b>Maximum deductible amount for private insurance</b></em>' attribute feature.
10249 * <!-- begin-user-doc -->
10250 * <!-- end-user-doc -->
10251 * @generated
10252 */
10253 EAttribute DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_PRIVATE_INSURANCE = eINSTANCE.getDS_for_Private_Insurance_and_Plan_Maximum_deductible_amount_for_private_insurance();
10254
10255 /**
10256 * The meta object literal for the '<em><b>Maximum deductible amount for old age pension plan</b></em>' attribute feature.
10257 * <!-- begin-user-doc -->
10258 * <!-- end-user-doc -->
10259 * @generated
10260 */
10261 EAttribute DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_OLD_AGE_PENSION_PLAN = eINSTANCE.getDS_for_Private_Insurance_and_Plan_Maximum_deductible_amount_for_old_age_pension_plan();
10262
10263 /**
10264 * The meta object literal for the '{@link Taxation.impl.DS_for_Loss_CarryforwardImpl <em>DS for Loss Carryforward</em>}' class. 9632 * The meta object literal for the '{@link Taxation.impl.DS_for_Loss_CarryforwardImpl <em>DS for Loss Carryforward</em>}' class.
10265 * <!-- begin-user-doc --> 9633 * <!-- begin-user-doc -->
10266 * <!-- end-user-doc --> 9634 * <!-- end-user-doc -->
@@ -10299,14 +9667,6 @@ public interface TaxationPackage extends EPackage {
10299 EAttribute PERMANENT_EXPENSE__CATEGORY = eINSTANCE.getPermanent_Expense_Category(); 9667 EAttribute PERMANENT_EXPENSE__CATEGORY = eINSTANCE.getPermanent_Expense_Category();
10300 9668
10301 /** 9669 /**
10302 * The meta object literal for the '<em><b>Is eligible for deduction</b></em>' attribute feature.
10303 * <!-- begin-user-doc -->
10304 * <!-- end-user-doc -->
10305 * @generated
10306 */
10307 EAttribute PERMANENT_EXPENSE__IS_ELIGIBLE_FOR_DEDUCTION = eINSTANCE.getPermanent_Expense_Is_eligible_for_deduction();
10308
10309 /**
10310 * The meta object literal for the '{@link Taxation.impl.Special_Expense_DSImpl <em>Special Expense DS</em>}' class. 9670 * The meta object literal for the '{@link Taxation.impl.Special_Expense_DSImpl <em>Special Expense DS</em>}' class.
10311 * <!-- begin-user-doc --> 9671 * <!-- begin-user-doc -->
10312 * <!-- end-user-doc --> 9672 * <!-- end-user-doc -->
@@ -10353,14 +9713,6 @@ public interface TaxationPackage extends EPackage {
10353 EAttribute PRIVATE_INSURANCE_AND_PLAN__DURATION_OF_CONTRACT = eINSTANCE.getPrivate_Insurance_and_Plan_Duration_of_contract(); 9713 EAttribute PRIVATE_INSURANCE_AND_PLAN__DURATION_OF_CONTRACT = eINSTANCE.getPrivate_Insurance_and_Plan_Duration_of_contract();
10354 9714
10355 /** 9715 /**
10356 * The meta object literal for the '<em><b>Is private insurance and plan eligible for deduction</b></em>' attribute feature.
10357 * <!-- begin-user-doc -->
10358 * <!-- end-user-doc -->
10359 * @generated
10360 */
10361 EAttribute PRIVATE_INSURANCE_AND_PLAN__IS_PRIVATE_INSURANCE_AND_PLAN_ELIGIBLE_FOR_DEDUCTION = eINSTANCE.getPrivate_Insurance_and_Plan_Is_private_insurance_and_plan_eligible_for_deduction();
10362
10363 /**
10364 * The meta object literal for the '{@link Taxation.impl.Health_and_Pension_InsuranceImpl <em>Health and Pension Insurance</em>}' class. 9716 * The meta object literal for the '{@link Taxation.impl.Health_and_Pension_InsuranceImpl <em>Health and Pension Insurance</em>}' class.
10365 * <!-- begin-user-doc --> 9717 * <!-- begin-user-doc -->
10366 * <!-- end-user-doc --> 9718 * <!-- end-user-doc -->
@@ -10405,14 +9757,6 @@ public interface TaxationPackage extends EPackage {
10405 EAttribute DONATION__BENEFICIARY1 = eINSTANCE.getDonation_Beneficiary1(); 9757 EAttribute DONATION__BENEFICIARY1 = eINSTANCE.getDonation_Beneficiary1();
10406 9758
10407 /** 9759 /**
10408 * The meta object literal for the '<em><b>Is beneficiary eligible</b></em>' attribute feature.
10409 * <!-- begin-user-doc -->
10410 * <!-- end-user-doc -->
10411 * @generated
10412 */
10413 EAttribute DONATION__IS_BENEFICIARY_ELIGIBLE = eINSTANCE.getDonation_Is_beneficiary_eligible();
10414
10415 /**
10416 * The meta object literal for the '<em><b>Is donation reported</b></em>' attribute feature. 9760 * The meta object literal for the '<em><b>Is donation reported</b></em>' attribute feature.
10417 * <!-- begin-user-doc --> 9761 * <!-- begin-user-doc -->
10418 * <!-- end-user-doc --> 9762 * <!-- end-user-doc -->
@@ -10431,38 +9775,6 @@ public interface TaxationPackage extends EPackage {
10431 EClass LOSS_CARRYFORWARD = eINSTANCE.getLoss_Carryforward(); 9775 EClass LOSS_CARRYFORWARD = eINSTANCE.getLoss_Carryforward();
10432 9776
10433 /** 9777 /**
10434 * The meta object literal for the '<em><b>Regular accountability</b></em>' attribute feature.
10435 * <!-- begin-user-doc -->
10436 * <!-- end-user-doc -->
10437 * @generated
10438 */
10439 EAttribute LOSS_CARRYFORWARD__REGULAR_ACCOUNTABILITY = eINSTANCE.getLoss_Carryforward_Regular_accountability();
10440
10441 /**
10442 * The meta object literal for the '<em><b>Compensation by other means</b></em>' attribute feature.
10443 * <!-- begin-user-doc -->
10444 * <!-- end-user-doc -->
10445 * @generated
10446 */
10447 EAttribute LOSS_CARRYFORWARD__COMPENSATION_BY_OTHER_MEANS = eINSTANCE.getLoss_Carryforward_Compensation_by_other_means();
10448
10449 /**
10450 * The meta object literal for the '<em><b>Tax payer has inherited business ownership</b></em>' attribute feature.
10451 * <!-- begin-user-doc -->
10452 * <!-- end-user-doc -->
10453 * @generated
10454 */
10455 EAttribute LOSS_CARRYFORWARD__TAX_PAYER_HAS_INHERITED_BUSINESS_OWNERSHIP = eINSTANCE.getLoss_Carryforward_Tax_payer_has_inherited_business_ownership();
10456
10457 /**
10458 * The meta object literal for the '<em><b>Tax payer has been partner in business</b></em>' attribute feature.
10459 * <!-- begin-user-doc -->
10460 * <!-- end-user-doc -->
10461 * @generated
10462 */
10463 EAttribute LOSS_CARRYFORWARD__TAX_PAYER_HAS_BEEN_PARTNER_IN_BUSINESS = eINSTANCE.getLoss_Carryforward_Tax_payer_has_been_partner_in_business();
10464
10465 /**
10466 * The meta object literal for the '{@link Taxation.impl.Spousal_Expense_ACImpl <em>Spousal Expense AC</em>}' class. 9778 * The meta object literal for the '{@link Taxation.impl.Spousal_Expense_ACImpl <em>Spousal Expense AC</em>}' class.
10467 * <!-- begin-user-doc --> 9779 * <!-- begin-user-doc -->
10468 * <!-- end-user-doc --> 9780 * <!-- end-user-doc -->
@@ -10559,16 +9871,6 @@ public interface TaxationPackage extends EPackage {
10559 EEnum COUNTRY = eINSTANCE.getCountry(); 9871 EEnum COUNTRY = eINSTANCE.getCountry();
10560 9872
10561 /** 9873 /**
10562 * The meta object literal for the '{@link Taxation.Tax_Card_Type <em>Tax Card Type</em>}' enum.
10563 * <!-- begin-user-doc -->
10564 * <!-- end-user-doc -->
10565 * @see Taxation.Tax_Card_Type
10566 * @see Taxation.impl.TaxationPackageImpl#getTax_Card_Type()
10567 * @generated
10568 */
10569 EEnum TAX_CARD_TYPE = eINSTANCE.getTax_Card_Type();
10570
10571 /**
10572 * The meta object literal for the '{@link Taxation.Tax_Office <em>Tax Office</em>}' enum. 9874 * The meta object literal for the '{@link Taxation.Tax_Office <em>Tax Office</em>}' enum.
10573 * <!-- begin-user-doc --> 9875 * <!-- begin-user-doc -->
10574 * <!-- end-user-doc --> 9876 * <!-- end-user-doc -->
@@ -10609,16 +9911,6 @@ public interface TaxationPackage extends EPackage {
10609 EEnum TOWN = eINSTANCE.getTown(); 9911 EEnum TOWN = eINSTANCE.getTown();
10610 9912
10611 /** 9913 /**
10612 * The meta object literal for the '{@link Taxation.Type_of_Rate <em>Type of Rate</em>}' enum.
10613 * <!-- begin-user-doc -->
10614 * <!-- end-user-doc -->
10615 * @see Taxation.Type_of_Rate
10616 * @see Taxation.impl.TaxationPackageImpl#getType_of_Rate()
10617 * @generated
10618 */
10619 EEnum TYPE_OF_RATE = eINSTANCE.getType_of_Rate();
10620
10621 /**
10622 * The meta object literal for the '{@link Taxation.CE_Type <em>CE Type</em>}' enum. 9914 * The meta object literal for the '{@link Taxation.CE_Type <em>CE Type</em>}' enum.
10623 * <!-- begin-user-doc --> 9915 * <!-- begin-user-doc -->
10624 * <!-- end-user-doc --> 9916 * <!-- end-user-doc -->
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/DS_for_Private_Insurance_and_PlanImpl.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/DS_for_Private_Insurance_and_PlanImpl.java
index d33beb48..8ad3e39d 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/DS_for_Private_Insurance_and_PlanImpl.java
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/DS_for_Private_Insurance_and_PlanImpl.java
@@ -21,9 +21,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
21 * </p> 21 * </p>
22 * <ul> 22 * <ul>
23 * <li>{@link Taxation.impl.DS_for_Private_Insurance_and_PlanImpl#getPrivate_insurance_and_plan_category <em>Private insurance and plan category</em>}</li> 23 * <li>{@link Taxation.impl.DS_for_Private_Insurance_and_PlanImpl#getPrivate_insurance_and_plan_category <em>Private insurance and plan category</em>}</li>
24 * <li>{@link Taxation.impl.DS_for_Private_Insurance_and_PlanImpl#getIncrease_for_life_insurance <em>Increase for life insurance</em>}</li>
25 * <li>{@link Taxation.impl.DS_for_Private_Insurance_and_PlanImpl#getMaximum_deductible_amount_for_private_insurance <em>Maximum deductible amount for private insurance</em>}</li>
26 * <li>{@link Taxation.impl.DS_for_Private_Insurance_and_PlanImpl#getMaximum_deductible_amount_for_old_age_pension_plan <em>Maximum deductible amount for old age pension plan</em>}</li>
27 * </ul> 24 * </ul>
28 * 25 *
29 * @generated 26 * @generated
@@ -50,66 +47,6 @@ public class DS_for_Private_Insurance_and_PlanImpl extends DSImpl implements DS_
50 protected Category_of_Private_Insurance_and_Plan private_insurance_and_plan_category = PRIVATE_INSURANCE_AND_PLAN_CATEGORY_EDEFAULT; 47 protected Category_of_Private_Insurance_and_Plan private_insurance_and_plan_category = PRIVATE_INSURANCE_AND_PLAN_CATEGORY_EDEFAULT;
51 48
52 /** 49 /**
53 * The default value of the '{@link #getIncrease_for_life_insurance() <em>Increase for life insurance</em>}' attribute.
54 * <!-- begin-user-doc -->
55 * <!-- end-user-doc -->
56 * @see #getIncrease_for_life_insurance()
57 * @generated
58 * @ordered
59 */
60 protected static final double INCREASE_FOR_LIFE_INSURANCE_EDEFAULT = 0.0;
61
62 /**
63 * The cached value of the '{@link #getIncrease_for_life_insurance() <em>Increase for life insurance</em>}' attribute.
64 * <!-- begin-user-doc -->
65 * <!-- end-user-doc -->
66 * @see #getIncrease_for_life_insurance()
67 * @generated
68 * @ordered
69 */
70 protected double increase_for_life_insurance = INCREASE_FOR_LIFE_INSURANCE_EDEFAULT;
71
72 /**
73 * The default value of the '{@link #getMaximum_deductible_amount_for_private_insurance() <em>Maximum deductible amount for private insurance</em>}' attribute.
74 * <!-- begin-user-doc -->
75 * <!-- end-user-doc -->
76 * @see #getMaximum_deductible_amount_for_private_insurance()
77 * @generated
78 * @ordered
79 */
80 protected static final double MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_PRIVATE_INSURANCE_EDEFAULT = 0.0;
81
82 /**
83 * The cached value of the '{@link #getMaximum_deductible_amount_for_private_insurance() <em>Maximum deductible amount for private insurance</em>}' attribute.
84 * <!-- begin-user-doc -->
85 * <!-- end-user-doc -->
86 * @see #getMaximum_deductible_amount_for_private_insurance()
87 * @generated
88 * @ordered
89 */
90 protected double maximum_deductible_amount_for_private_insurance = MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_PRIVATE_INSURANCE_EDEFAULT;
91
92 /**
93 * The default value of the '{@link #getMaximum_deductible_amount_for_old_age_pension_plan() <em>Maximum deductible amount for old age pension plan</em>}' attribute.
94 * <!-- begin-user-doc -->
95 * <!-- end-user-doc -->
96 * @see #getMaximum_deductible_amount_for_old_age_pension_plan()
97 * @generated
98 * @ordered
99 */
100 protected static final double MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_OLD_AGE_PENSION_PLAN_EDEFAULT = 0.0;
101
102 /**
103 * The cached value of the '{@link #getMaximum_deductible_amount_for_old_age_pension_plan() <em>Maximum deductible amount for old age pension plan</em>}' attribute.
104 * <!-- begin-user-doc -->
105 * <!-- end-user-doc -->
106 * @see #getMaximum_deductible_amount_for_old_age_pension_plan()
107 * @generated
108 * @ordered
109 */
110 protected double maximum_deductible_amount_for_old_age_pension_plan = MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_OLD_AGE_PENSION_PLAN_EDEFAULT;
111
112 /**
113 * <!-- begin-user-doc --> 50 * <!-- begin-user-doc -->
114 * <!-- end-user-doc --> 51 * <!-- end-user-doc -->
115 * @generated 52 * @generated
@@ -157,85 +94,10 @@ public class DS_for_Private_Insurance_and_PlanImpl extends DSImpl implements DS_
157 * @generated 94 * @generated
158 */ 95 */
159 @Override 96 @Override
160 public double getIncrease_for_life_insurance() {
161 return increase_for_life_insurance;
162 }
163
164 /**
165 * <!-- begin-user-doc -->
166 * <!-- end-user-doc -->
167 * @generated
168 */
169 @Override
170 public void setIncrease_for_life_insurance(double newIncrease_for_life_insurance) {
171 double oldIncrease_for_life_insurance = increase_for_life_insurance;
172 increase_for_life_insurance = newIncrease_for_life_insurance;
173 if (eNotificationRequired())
174 eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__INCREASE_FOR_LIFE_INSURANCE, oldIncrease_for_life_insurance, increase_for_life_insurance));
175 }
176
177 /**
178 * <!-- begin-user-doc -->
179 * <!-- end-user-doc -->
180 * @generated
181 */
182 @Override
183 public double getMaximum_deductible_amount_for_private_insurance() {
184 return maximum_deductible_amount_for_private_insurance;
185 }
186
187 /**
188 * <!-- begin-user-doc -->
189 * <!-- end-user-doc -->
190 * @generated
191 */
192 @Override
193 public void setMaximum_deductible_amount_for_private_insurance(double newMaximum_deductible_amount_for_private_insurance) {
194 double oldMaximum_deductible_amount_for_private_insurance = maximum_deductible_amount_for_private_insurance;
195 maximum_deductible_amount_for_private_insurance = newMaximum_deductible_amount_for_private_insurance;
196 if (eNotificationRequired())
197 eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_PRIVATE_INSURANCE, oldMaximum_deductible_amount_for_private_insurance, maximum_deductible_amount_for_private_insurance));
198 }
199
200 /**
201 * <!-- begin-user-doc -->
202 * <!-- end-user-doc -->
203 * @generated
204 */
205 @Override
206 public double getMaximum_deductible_amount_for_old_age_pension_plan() {
207 return maximum_deductible_amount_for_old_age_pension_plan;
208 }
209
210 /**
211 * <!-- begin-user-doc -->
212 * <!-- end-user-doc -->
213 * @generated
214 */
215 @Override
216 public void setMaximum_deductible_amount_for_old_age_pension_plan(double newMaximum_deductible_amount_for_old_age_pension_plan) {
217 double oldMaximum_deductible_amount_for_old_age_pension_plan = maximum_deductible_amount_for_old_age_pension_plan;
218 maximum_deductible_amount_for_old_age_pension_plan = newMaximum_deductible_amount_for_old_age_pension_plan;
219 if (eNotificationRequired())
220 eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_OLD_AGE_PENSION_PLAN, oldMaximum_deductible_amount_for_old_age_pension_plan, maximum_deductible_amount_for_old_age_pension_plan));
221 }
222
223 /**
224 * <!-- begin-user-doc -->
225 * <!-- end-user-doc -->
226 * @generated
227 */
228 @Override
229 public Object eGet(int featureID, boolean resolve, boolean coreType) { 97 public Object eGet(int featureID, boolean resolve, boolean coreType) {
230 switch (featureID) { 98 switch (featureID) {
231 case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__PRIVATE_INSURANCE_AND_PLAN_CATEGORY: 99 case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__PRIVATE_INSURANCE_AND_PLAN_CATEGORY:
232 return getPrivate_insurance_and_plan_category(); 100 return getPrivate_insurance_and_plan_category();
233 case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__INCREASE_FOR_LIFE_INSURANCE:
234 return getIncrease_for_life_insurance();
235 case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_PRIVATE_INSURANCE:
236 return getMaximum_deductible_amount_for_private_insurance();
237 case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_OLD_AGE_PENSION_PLAN:
238 return getMaximum_deductible_amount_for_old_age_pension_plan();
239 } 101 }
240 return super.eGet(featureID, resolve, coreType); 102 return super.eGet(featureID, resolve, coreType);
241 } 103 }
@@ -251,15 +113,6 @@ public class DS_for_Private_Insurance_and_PlanImpl extends DSImpl implements DS_
251 case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__PRIVATE_INSURANCE_AND_PLAN_CATEGORY: 113 case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__PRIVATE_INSURANCE_AND_PLAN_CATEGORY:
252 setPrivate_insurance_and_plan_category((Category_of_Private_Insurance_and_Plan)newValue); 114 setPrivate_insurance_and_plan_category((Category_of_Private_Insurance_and_Plan)newValue);
253 return; 115 return;
254 case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__INCREASE_FOR_LIFE_INSURANCE:
255 setIncrease_for_life_insurance((Double)newValue);
256 return;
257 case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_PRIVATE_INSURANCE:
258 setMaximum_deductible_amount_for_private_insurance((Double)newValue);
259 return;
260 case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_OLD_AGE_PENSION_PLAN:
261 setMaximum_deductible_amount_for_old_age_pension_plan((Double)newValue);
262 return;
263 } 116 }
264 super.eSet(featureID, newValue); 117 super.eSet(featureID, newValue);
265 } 118 }
@@ -275,15 +128,6 @@ public class DS_for_Private_Insurance_and_PlanImpl extends DSImpl implements DS_
275 case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__PRIVATE_INSURANCE_AND_PLAN_CATEGORY: 128 case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__PRIVATE_INSURANCE_AND_PLAN_CATEGORY:
276 setPrivate_insurance_and_plan_category(PRIVATE_INSURANCE_AND_PLAN_CATEGORY_EDEFAULT); 129 setPrivate_insurance_and_plan_category(PRIVATE_INSURANCE_AND_PLAN_CATEGORY_EDEFAULT);
277 return; 130 return;
278 case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__INCREASE_FOR_LIFE_INSURANCE:
279 setIncrease_for_life_insurance(INCREASE_FOR_LIFE_INSURANCE_EDEFAULT);
280 return;
281 case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_PRIVATE_INSURANCE:
282 setMaximum_deductible_amount_for_private_insurance(MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_PRIVATE_INSURANCE_EDEFAULT);
283 return;
284 case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_OLD_AGE_PENSION_PLAN:
285 setMaximum_deductible_amount_for_old_age_pension_plan(MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_OLD_AGE_PENSION_PLAN_EDEFAULT);
286 return;
287 } 131 }
288 super.eUnset(featureID); 132 super.eUnset(featureID);
289 } 133 }
@@ -298,12 +142,6 @@ public class DS_for_Private_Insurance_and_PlanImpl extends DSImpl implements DS_
298 switch (featureID) { 142 switch (featureID) {
299 case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__PRIVATE_INSURANCE_AND_PLAN_CATEGORY: 143 case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__PRIVATE_INSURANCE_AND_PLAN_CATEGORY:
300 return private_insurance_and_plan_category != PRIVATE_INSURANCE_AND_PLAN_CATEGORY_EDEFAULT; 144 return private_insurance_and_plan_category != PRIVATE_INSURANCE_AND_PLAN_CATEGORY_EDEFAULT;
301 case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__INCREASE_FOR_LIFE_INSURANCE:
302 return increase_for_life_insurance != INCREASE_FOR_LIFE_INSURANCE_EDEFAULT;
303 case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_PRIVATE_INSURANCE:
304 return maximum_deductible_amount_for_private_insurance != MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_PRIVATE_INSURANCE_EDEFAULT;
305 case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_OLD_AGE_PENSION_PLAN:
306 return maximum_deductible_amount_for_old_age_pension_plan != MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_OLD_AGE_PENSION_PLAN_EDEFAULT;
307 } 145 }
308 return super.eIsSet(featureID); 146 return super.eIsSet(featureID);
309 } 147 }
@@ -320,12 +158,6 @@ public class DS_for_Private_Insurance_and_PlanImpl extends DSImpl implements DS_
320 StringBuilder result = new StringBuilder(super.toString()); 158 StringBuilder result = new StringBuilder(super.toString());
321 result.append(" (private_insurance_and_plan_category: "); 159 result.append(" (private_insurance_and_plan_category: ");
322 result.append(private_insurance_and_plan_category); 160 result.append(private_insurance_and_plan_category);
323 result.append(", increase_for_life_insurance: ");
324 result.append(increase_for_life_insurance);
325 result.append(", maximum_deductible_amount_for_private_insurance: ");
326 result.append(maximum_deductible_amount_for_private_insurance);
327 result.append(", maximum_deductible_amount_for_old_age_pension_plan: ");
328 result.append(maximum_deductible_amount_for_old_age_pension_plan);
329 result.append(')'); 161 result.append(')');
330 return result.toString(); 162 return result.toString();
331 } 163 }
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/DonationImpl.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/DonationImpl.java
index e631901a..2ea09206 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/DonationImpl.java
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/DonationImpl.java
@@ -20,7 +20,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
20 * </p> 20 * </p>
21 * <ul> 21 * <ul>
22 * <li>{@link Taxation.impl.DonationImpl#getBeneficiary1 <em>Beneficiary1</em>}</li> 22 * <li>{@link Taxation.impl.DonationImpl#getBeneficiary1 <em>Beneficiary1</em>}</li>
23 * <li>{@link Taxation.impl.DonationImpl#isIs_beneficiary_eligible <em>Is beneficiary eligible</em>}</li>
24 * <li>{@link Taxation.impl.DonationImpl#isIs_donation_reported <em>Is donation reported</em>}</li> 23 * <li>{@link Taxation.impl.DonationImpl#isIs_donation_reported <em>Is donation reported</em>}</li>
25 * </ul> 24 * </ul>
26 * 25 *
@@ -48,26 +47,6 @@ public class DonationImpl extends Special_Expense_DSImpl implements Donation {
48 protected String beneficiary1 = BENEFICIARY1_EDEFAULT; 47 protected String beneficiary1 = BENEFICIARY1_EDEFAULT;
49 48
50 /** 49 /**
51 * The default value of the '{@link #isIs_beneficiary_eligible() <em>Is beneficiary eligible</em>}' attribute.
52 * <!-- begin-user-doc -->
53 * <!-- end-user-doc -->
54 * @see #isIs_beneficiary_eligible()
55 * @generated
56 * @ordered
57 */
58 protected static final boolean IS_BENEFICIARY_ELIGIBLE_EDEFAULT = false;
59
60 /**
61 * The cached value of the '{@link #isIs_beneficiary_eligible() <em>Is beneficiary eligible</em>}' attribute.
62 * <!-- begin-user-doc -->
63 * <!-- end-user-doc -->
64 * @see #isIs_beneficiary_eligible()
65 * @generated
66 * @ordered
67 */
68 protected boolean is_beneficiary_eligible = IS_BENEFICIARY_ELIGIBLE_EDEFAULT;
69
70 /**
71 * The default value of the '{@link #isIs_donation_reported() <em>Is donation reported</em>}' attribute. 50 * The default value of the '{@link #isIs_donation_reported() <em>Is donation reported</em>}' attribute.
72 * <!-- begin-user-doc --> 51 * <!-- begin-user-doc -->
73 * <!-- end-user-doc --> 52 * <!-- end-user-doc -->
@@ -135,29 +114,6 @@ public class DonationImpl extends Special_Expense_DSImpl implements Donation {
135 * @generated 114 * @generated
136 */ 115 */
137 @Override 116 @Override
138 public boolean isIs_beneficiary_eligible() {
139 return is_beneficiary_eligible;
140 }
141
142 /**
143 * <!-- begin-user-doc -->
144 * <!-- end-user-doc -->
145 * @generated
146 */
147 @Override
148 public void setIs_beneficiary_eligible(boolean newIs_beneficiary_eligible) {
149 boolean oldIs_beneficiary_eligible = is_beneficiary_eligible;
150 is_beneficiary_eligible = newIs_beneficiary_eligible;
151 if (eNotificationRequired())
152 eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.DONATION__IS_BENEFICIARY_ELIGIBLE, oldIs_beneficiary_eligible, is_beneficiary_eligible));
153 }
154
155 /**
156 * <!-- begin-user-doc -->
157 * <!-- end-user-doc -->
158 * @generated
159 */
160 @Override
161 public boolean isIs_donation_reported() { 117 public boolean isIs_donation_reported() {
162 return is_donation_reported; 118 return is_donation_reported;
163 } 119 }
@@ -185,8 +141,6 @@ public class DonationImpl extends Special_Expense_DSImpl implements Donation {
185 switch (featureID) { 141 switch (featureID) {
186 case TaxationPackage.DONATION__BENEFICIARY1: 142 case TaxationPackage.DONATION__BENEFICIARY1:
187 return getBeneficiary1(); 143 return getBeneficiary1();
188 case TaxationPackage.DONATION__IS_BENEFICIARY_ELIGIBLE:
189 return isIs_beneficiary_eligible();
190 case TaxationPackage.DONATION__IS_DONATION_REPORTED: 144 case TaxationPackage.DONATION__IS_DONATION_REPORTED:
191 return isIs_donation_reported(); 145 return isIs_donation_reported();
192 } 146 }
@@ -204,9 +158,6 @@ public class DonationImpl extends Special_Expense_DSImpl implements Donation {
204 case TaxationPackage.DONATION__BENEFICIARY1: 158 case TaxationPackage.DONATION__BENEFICIARY1:
205 setBeneficiary1((String)newValue); 159 setBeneficiary1((String)newValue);
206 return; 160 return;
207 case TaxationPackage.DONATION__IS_BENEFICIARY_ELIGIBLE:
208 setIs_beneficiary_eligible((Boolean)newValue);
209 return;
210 case TaxationPackage.DONATION__IS_DONATION_REPORTED: 161 case TaxationPackage.DONATION__IS_DONATION_REPORTED:
211 setIs_donation_reported((Boolean)newValue); 162 setIs_donation_reported((Boolean)newValue);
212 return; 163 return;
@@ -225,9 +176,6 @@ public class DonationImpl extends Special_Expense_DSImpl implements Donation {
225 case TaxationPackage.DONATION__BENEFICIARY1: 176 case TaxationPackage.DONATION__BENEFICIARY1:
226 setBeneficiary1(BENEFICIARY1_EDEFAULT); 177 setBeneficiary1(BENEFICIARY1_EDEFAULT);
227 return; 178 return;
228 case TaxationPackage.DONATION__IS_BENEFICIARY_ELIGIBLE:
229 setIs_beneficiary_eligible(IS_BENEFICIARY_ELIGIBLE_EDEFAULT);
230 return;
231 case TaxationPackage.DONATION__IS_DONATION_REPORTED: 179 case TaxationPackage.DONATION__IS_DONATION_REPORTED:
232 setIs_donation_reported(IS_DONATION_REPORTED_EDEFAULT); 180 setIs_donation_reported(IS_DONATION_REPORTED_EDEFAULT);
233 return; 181 return;
@@ -245,8 +193,6 @@ public class DonationImpl extends Special_Expense_DSImpl implements Donation {
245 switch (featureID) { 193 switch (featureID) {
246 case TaxationPackage.DONATION__BENEFICIARY1: 194 case TaxationPackage.DONATION__BENEFICIARY1:
247 return BENEFICIARY1_EDEFAULT == null ? beneficiary1 != null : !BENEFICIARY1_EDEFAULT.equals(beneficiary1); 195 return BENEFICIARY1_EDEFAULT == null ? beneficiary1 != null : !BENEFICIARY1_EDEFAULT.equals(beneficiary1);
248 case TaxationPackage.DONATION__IS_BENEFICIARY_ELIGIBLE:
249 return is_beneficiary_eligible != IS_BENEFICIARY_ELIGIBLE_EDEFAULT;
250 case TaxationPackage.DONATION__IS_DONATION_REPORTED: 196 case TaxationPackage.DONATION__IS_DONATION_REPORTED:
251 return is_donation_reported != IS_DONATION_REPORTED_EDEFAULT; 197 return is_donation_reported != IS_DONATION_REPORTED_EDEFAULT;
252 } 198 }
@@ -265,8 +211,6 @@ public class DonationImpl extends Special_Expense_DSImpl implements Donation {
265 StringBuilder result = new StringBuilder(super.toString()); 211 StringBuilder result = new StringBuilder(super.toString());
266 result.append(" (beneficiary1: "); 212 result.append(" (beneficiary1: ");
267 result.append(beneficiary1); 213 result.append(beneficiary1);
268 result.append(", is_beneficiary_eligible: ");
269 result.append(is_beneficiary_eligible);
270 result.append(", is_donation_reported: "); 214 result.append(", is_donation_reported: ");
271 result.append(is_donation_reported); 215 result.append(is_donation_reported);
272 result.append(')'); 216 result.append(')');
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/External_AllowanceImpl.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/External_AllowanceImpl.java
index d73a0014..5a846b56 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/External_AllowanceImpl.java
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/External_AllowanceImpl.java
@@ -27,7 +27,6 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
27 * The following features are implemented: 27 * The following features are implemented:
28 * </p> 28 * </p>
29 * <ul> 29 * <ul>
30 * <li>{@link Taxation.impl.External_AllowanceImpl#getAmount <em>Amount</em>}</li>
31 * <li>{@link Taxation.impl.External_AllowanceImpl#getGrantor <em>Grantor</em>}</li> 30 * <li>{@link Taxation.impl.External_AllowanceImpl#getGrantor <em>Grantor</em>}</li>
32 * <li>{@link Taxation.impl.External_AllowanceImpl#getStarting_year <em>Starting year</em>}</li> 31 * <li>{@link Taxation.impl.External_AllowanceImpl#getStarting_year <em>Starting year</em>}</li>
33 * <li>{@link Taxation.impl.External_AllowanceImpl#getEnding_year <em>Ending year</em>}</li> 32 * <li>{@link Taxation.impl.External_AllowanceImpl#getEnding_year <em>Ending year</em>}</li>
@@ -40,26 +39,6 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
40 */ 39 */
41public class External_AllowanceImpl extends MinimalEObjectImpl.Container implements External_Allowance { 40public class External_AllowanceImpl extends MinimalEObjectImpl.Container implements External_Allowance {
42 /** 41 /**
43 * The default value of the '{@link #getAmount() <em>Amount</em>}' attribute.
44 * <!-- begin-user-doc -->
45 * <!-- end-user-doc -->
46 * @see #getAmount()
47 * @generated
48 * @ordered
49 */
50 protected static final double AMOUNT_EDEFAULT = 0.0;
51
52 /**
53 * The cached value of the '{@link #getAmount() <em>Amount</em>}' attribute.
54 * <!-- begin-user-doc -->
55 * <!-- end-user-doc -->
56 * @see #getAmount()
57 * @generated
58 * @ordered
59 */
60 protected double amount = AMOUNT_EDEFAULT;
61
62 /**
63 * The default value of the '{@link #getGrantor() <em>Grantor</em>}' attribute. 42 * The default value of the '{@link #getGrantor() <em>Grantor</em>}' attribute.
64 * <!-- begin-user-doc --> 43 * <!-- begin-user-doc -->
65 * <!-- end-user-doc --> 44 * <!-- end-user-doc -->
@@ -174,29 +153,6 @@ public class External_AllowanceImpl extends MinimalEObjectImpl.Container impleme
174 * @generated 153 * @generated
175 */ 154 */
176 @Override 155 @Override
177 public double getAmount() {
178 return amount;
179 }
180
181 /**
182 * <!-- begin-user-doc -->
183 * <!-- end-user-doc -->
184 * @generated
185 */
186 @Override
187 public void setAmount(double newAmount) {
188 double oldAmount = amount;
189 amount = newAmount;
190 if (eNotificationRequired())
191 eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.EXTERNAL_ALLOWANCE__AMOUNT, oldAmount, amount));
192 }
193
194 /**
195 * <!-- begin-user-doc -->
196 * <!-- end-user-doc -->
197 * @generated
198 */
199 @Override
200 public Grantor getGrantor() { 156 public Grantor getGrantor() {
201 return grantor; 157 return grantor;
202 } 158 }
@@ -418,8 +374,6 @@ public class External_AllowanceImpl extends MinimalEObjectImpl.Container impleme
418 @Override 374 @Override
419 public Object eGet(int featureID, boolean resolve, boolean coreType) { 375 public Object eGet(int featureID, boolean resolve, boolean coreType) {
420 switch (featureID) { 376 switch (featureID) {
421 case TaxationPackage.EXTERNAL_ALLOWANCE__AMOUNT:
422 return getAmount();
423 case TaxationPackage.EXTERNAL_ALLOWANCE__GRANTOR: 377 case TaxationPackage.EXTERNAL_ALLOWANCE__GRANTOR:
424 return getGrantor(); 378 return getGrantor();
425 case TaxationPackage.EXTERNAL_ALLOWANCE__STARTING_YEAR: 379 case TaxationPackage.EXTERNAL_ALLOWANCE__STARTING_YEAR:
@@ -445,9 +399,6 @@ public class External_AllowanceImpl extends MinimalEObjectImpl.Container impleme
445 @Override 399 @Override
446 public void eSet(int featureID, Object newValue) { 400 public void eSet(int featureID, Object newValue) {
447 switch (featureID) { 401 switch (featureID) {
448 case TaxationPackage.EXTERNAL_ALLOWANCE__AMOUNT:
449 setAmount((Double)newValue);
450 return;
451 case TaxationPackage.EXTERNAL_ALLOWANCE__GRANTOR: 402 case TaxationPackage.EXTERNAL_ALLOWANCE__GRANTOR:
452 setGrantor((Grantor)newValue); 403 setGrantor((Grantor)newValue);
453 return; 404 return;
@@ -478,9 +429,6 @@ public class External_AllowanceImpl extends MinimalEObjectImpl.Container impleme
478 @Override 429 @Override
479 public void eUnset(int featureID) { 430 public void eUnset(int featureID) {
480 switch (featureID) { 431 switch (featureID) {
481 case TaxationPackage.EXTERNAL_ALLOWANCE__AMOUNT:
482 setAmount(AMOUNT_EDEFAULT);
483 return;
484 case TaxationPackage.EXTERNAL_ALLOWANCE__GRANTOR: 432 case TaxationPackage.EXTERNAL_ALLOWANCE__GRANTOR:
485 setGrantor(GRANTOR_EDEFAULT); 433 setGrantor(GRANTOR_EDEFAULT);
486 return; 434 return;
@@ -511,8 +459,6 @@ public class External_AllowanceImpl extends MinimalEObjectImpl.Container impleme
511 @Override 459 @Override
512 public boolean eIsSet(int featureID) { 460 public boolean eIsSet(int featureID) {
513 switch (featureID) { 461 switch (featureID) {
514 case TaxationPackage.EXTERNAL_ALLOWANCE__AMOUNT:
515 return amount != AMOUNT_EDEFAULT;
516 case TaxationPackage.EXTERNAL_ALLOWANCE__GRANTOR: 462 case TaxationPackage.EXTERNAL_ALLOWANCE__GRANTOR:
517 return grantor != GRANTOR_EDEFAULT; 463 return grantor != GRANTOR_EDEFAULT;
518 case TaxationPackage.EXTERNAL_ALLOWANCE__STARTING_YEAR: 464 case TaxationPackage.EXTERNAL_ALLOWANCE__STARTING_YEAR:
@@ -539,9 +485,7 @@ public class External_AllowanceImpl extends MinimalEObjectImpl.Container impleme
539 if (eIsProxy()) return super.toString(); 485 if (eIsProxy()) return super.toString();
540 486
541 StringBuilder result = new StringBuilder(super.toString()); 487 StringBuilder result = new StringBuilder(super.toString());
542 result.append(" (amount: "); 488 result.append(" (grantor: ");
543 result.append(amount);
544 result.append(", grantor: ");
545 result.append(grantor); 489 result.append(grantor);
546 result.append(", starting_year: "); 490 result.append(", starting_year: ");
547 result.append(starting_year); 491 result.append(starting_year);
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/FDImpl.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/FDImpl.java
index 70b890f3..06e852c4 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/FDImpl.java
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/FDImpl.java
@@ -20,7 +20,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
20 * </p> 20 * </p>
21 * <ul> 21 * <ul>
22 * <li>{@link Taxation.impl.FDImpl#getDistance_declared_in_january <em>Distance declared in january</em>}</li> 22 * <li>{@link Taxation.impl.FDImpl#getDistance_declared_in_january <em>Distance declared in january</em>}</li>
23 * <li>{@link Taxation.impl.FDImpl#getCalculated_distance <em>Calculated distance</em>}</li>
24 * </ul> 23 * </ul>
25 * 24 *
26 * @generated 25 * @generated
@@ -47,26 +46,6 @@ public class FDImpl extends Professional_Expenses_DeductionImpl implements FD {
47 protected double distance_declared_in_january = DISTANCE_DECLARED_IN_JANUARY_EDEFAULT; 46 protected double distance_declared_in_january = DISTANCE_DECLARED_IN_JANUARY_EDEFAULT;
48 47
49 /** 48 /**
50 * The default value of the '{@link #getCalculated_distance() <em>Calculated distance</em>}' attribute.
51 * <!-- begin-user-doc -->
52 * <!-- end-user-doc -->
53 * @see #getCalculated_distance()
54 * @generated
55 * @ordered
56 */
57 protected static final double CALCULATED_DISTANCE_EDEFAULT = 0.0;
58
59 /**
60 * The cached value of the '{@link #getCalculated_distance() <em>Calculated distance</em>}' attribute.
61 * <!-- begin-user-doc -->
62 * <!-- end-user-doc -->
63 * @see #getCalculated_distance()
64 * @generated
65 * @ordered
66 */
67 protected double calculated_distance = CALCULATED_DISTANCE_EDEFAULT;
68
69 /**
70 * <!-- begin-user-doc --> 49 * <!-- begin-user-doc -->
71 * <!-- end-user-doc --> 50 * <!-- end-user-doc -->
72 * @generated 51 * @generated
@@ -114,35 +93,10 @@ public class FDImpl extends Professional_Expenses_DeductionImpl implements FD {
114 * @generated 93 * @generated
115 */ 94 */
116 @Override 95 @Override
117 public double getCalculated_distance() {
118 return calculated_distance;
119 }
120
121 /**
122 * <!-- begin-user-doc -->
123 * <!-- end-user-doc -->
124 * @generated
125 */
126 @Override
127 public void setCalculated_distance(double newCalculated_distance) {
128 double oldCalculated_distance = calculated_distance;
129 calculated_distance = newCalculated_distance;
130 if (eNotificationRequired())
131 eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.FD__CALCULATED_DISTANCE, oldCalculated_distance, calculated_distance));
132 }
133
134 /**
135 * <!-- begin-user-doc -->
136 * <!-- end-user-doc -->
137 * @generated
138 */
139 @Override
140 public Object eGet(int featureID, boolean resolve, boolean coreType) { 96 public Object eGet(int featureID, boolean resolve, boolean coreType) {
141 switch (featureID) { 97 switch (featureID) {
142 case TaxationPackage.FD__DISTANCE_DECLARED_IN_JANUARY: 98 case TaxationPackage.FD__DISTANCE_DECLARED_IN_JANUARY:
143 return getDistance_declared_in_january(); 99 return getDistance_declared_in_january();
144 case TaxationPackage.FD__CALCULATED_DISTANCE:
145 return getCalculated_distance();
146 } 100 }
147 return super.eGet(featureID, resolve, coreType); 101 return super.eGet(featureID, resolve, coreType);
148 } 102 }
@@ -158,9 +112,6 @@ public class FDImpl extends Professional_Expenses_DeductionImpl implements FD {
158 case TaxationPackage.FD__DISTANCE_DECLARED_IN_JANUARY: 112 case TaxationPackage.FD__DISTANCE_DECLARED_IN_JANUARY:
159 setDistance_declared_in_january((Double)newValue); 113 setDistance_declared_in_january((Double)newValue);
160 return; 114 return;
161 case TaxationPackage.FD__CALCULATED_DISTANCE:
162 setCalculated_distance((Double)newValue);
163 return;
164 } 115 }
165 super.eSet(featureID, newValue); 116 super.eSet(featureID, newValue);
166 } 117 }
@@ -176,9 +127,6 @@ public class FDImpl extends Professional_Expenses_DeductionImpl implements FD {
176 case TaxationPackage.FD__DISTANCE_DECLARED_IN_JANUARY: 127 case TaxationPackage.FD__DISTANCE_DECLARED_IN_JANUARY:
177 setDistance_declared_in_january(DISTANCE_DECLARED_IN_JANUARY_EDEFAULT); 128 setDistance_declared_in_january(DISTANCE_DECLARED_IN_JANUARY_EDEFAULT);
178 return; 129 return;
179 case TaxationPackage.FD__CALCULATED_DISTANCE:
180 setCalculated_distance(CALCULATED_DISTANCE_EDEFAULT);
181 return;
182 } 130 }
183 super.eUnset(featureID); 131 super.eUnset(featureID);
184 } 132 }
@@ -193,8 +141,6 @@ public class FDImpl extends Professional_Expenses_DeductionImpl implements FD {
193 switch (featureID) { 141 switch (featureID) {
194 case TaxationPackage.FD__DISTANCE_DECLARED_IN_JANUARY: 142 case TaxationPackage.FD__DISTANCE_DECLARED_IN_JANUARY:
195 return distance_declared_in_january != DISTANCE_DECLARED_IN_JANUARY_EDEFAULT; 143 return distance_declared_in_january != DISTANCE_DECLARED_IN_JANUARY_EDEFAULT;
196 case TaxationPackage.FD__CALCULATED_DISTANCE:
197 return calculated_distance != CALCULATED_DISTANCE_EDEFAULT;
198 } 144 }
199 return super.eIsSet(featureID); 145 return super.eIsSet(featureID);
200 } 146 }
@@ -211,8 +157,6 @@ public class FDImpl extends Professional_Expenses_DeductionImpl implements FD {
211 StringBuilder result = new StringBuilder(super.toString()); 157 StringBuilder result = new StringBuilder(super.toString());
212 result.append(" (distance_declared_in_january: "); 158 result.append(" (distance_declared_in_january: ");
213 result.append(distance_declared_in_january); 159 result.append(distance_declared_in_january);
214 result.append(", calculated_distance: ");
215 result.append(calculated_distance);
216 result.append(')'); 160 result.append(')');
217 return result.toString(); 161 return result.toString();
218 } 162 }
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/FOImpl.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/FOImpl.java
index d03ee8bc..5ffe9463 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/FOImpl.java
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/FOImpl.java
@@ -4,49 +4,17 @@ package Taxation.impl;
4 4
5import Taxation.FO; 5import Taxation.FO;
6import Taxation.TaxationPackage; 6import Taxation.TaxationPackage;
7import Taxation.Type_of_Rate;
8
9import org.eclipse.emf.common.notify.Notification;
10
11import org.eclipse.emf.ecore.EClass; 7import org.eclipse.emf.ecore.EClass;
12 8
13import org.eclipse.emf.ecore.impl.ENotificationImpl;
14
15/** 9/**
16 * <!-- begin-user-doc --> 10 * <!-- begin-user-doc -->
17 * An implementation of the model object '<em><b>FO</b></em>'. 11 * An implementation of the model object '<em><b>FO</b></em>'.
18 * <!-- end-user-doc --> 12 * <!-- end-user-doc -->
19 * <p>
20 * The following features are implemented:
21 * </p>
22 * <ul>
23 * <li>{@link Taxation.impl.FOImpl#getRate_type_for_FO <em>Rate type for FO</em>}</li>
24 * </ul>
25 * 13 *
26 * @generated 14 * @generated
27 */ 15 */
28public class FOImpl extends Professional_Expenses_DeductionImpl implements FO { 16public class FOImpl extends Professional_Expenses_DeductionImpl implements FO {
29 /** 17 /**
30 * The default value of the '{@link #getRate_type_for_FO() <em>Rate type for FO</em>}' attribute.
31 * <!-- begin-user-doc -->
32 * <!-- end-user-doc -->
33 * @see #getRate_type_for_FO()
34 * @generated
35 * @ordered
36 */
37 protected static final Type_of_Rate RATE_TYPE_FOR_FO_EDEFAULT = Type_of_Rate.REGULAR;
38
39 /**
40 * The cached value of the '{@link #getRate_type_for_FO() <em>Rate type for FO</em>}' attribute.
41 * <!-- begin-user-doc -->
42 * <!-- end-user-doc -->
43 * @see #getRate_type_for_FO()
44 * @generated
45 * @ordered
46 */
47 protected Type_of_Rate rate_type_for_FO = RATE_TYPE_FOR_FO_EDEFAULT;
48
49 /**
50 * <!-- begin-user-doc --> 18 * <!-- begin-user-doc -->
51 * <!-- end-user-doc --> 19 * <!-- end-user-doc -->
52 * @generated 20 * @generated
@@ -65,101 +33,4 @@ public class FOImpl extends Professional_Expenses_DeductionImpl implements FO {
65 return TaxationPackage.Literals.FO; 33 return TaxationPackage.Literals.FO;
66 } 34 }
67 35
68 /**
69 * <!-- begin-user-doc -->
70 * <!-- end-user-doc -->
71 * @generated
72 */
73 @Override
74 public Type_of_Rate getRate_type_for_FO() {
75 return rate_type_for_FO;
76 }
77
78 /**
79 * <!-- begin-user-doc -->
80 * <!-- end-user-doc -->
81 * @generated
82 */
83 @Override
84 public void setRate_type_for_FO(Type_of_Rate newRate_type_for_FO) {
85 Type_of_Rate oldRate_type_for_FO = rate_type_for_FO;
86 rate_type_for_FO = newRate_type_for_FO == null ? RATE_TYPE_FOR_FO_EDEFAULT : newRate_type_for_FO;
87 if (eNotificationRequired())
88 eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.FO__RATE_TYPE_FOR_FO, oldRate_type_for_FO, rate_type_for_FO));
89 }
90
91 /**
92 * <!-- begin-user-doc -->
93 * <!-- end-user-doc -->
94 * @generated
95 */
96 @Override
97 public Object eGet(int featureID, boolean resolve, boolean coreType) {
98 switch (featureID) {
99 case TaxationPackage.FO__RATE_TYPE_FOR_FO:
100 return getRate_type_for_FO();
101 }
102 return super.eGet(featureID, resolve, coreType);
103 }
104
105 /**
106 * <!-- begin-user-doc -->
107 * <!-- end-user-doc -->
108 * @generated
109 */
110 @Override
111 public void eSet(int featureID, Object newValue) {
112 switch (featureID) {
113 case TaxationPackage.FO__RATE_TYPE_FOR_FO:
114 setRate_type_for_FO((Type_of_Rate)newValue);
115 return;
116 }
117 super.eSet(featureID, newValue);
118 }
119
120 /**
121 * <!-- begin-user-doc -->
122 * <!-- end-user-doc -->
123 * @generated
124 */
125 @Override
126 public void eUnset(int featureID) {
127 switch (featureID) {
128 case TaxationPackage.FO__RATE_TYPE_FOR_FO:
129 setRate_type_for_FO(RATE_TYPE_FOR_FO_EDEFAULT);
130 return;
131 }
132 super.eUnset(featureID);
133 }
134
135 /**
136 * <!-- begin-user-doc -->
137 * <!-- end-user-doc -->
138 * @generated
139 */
140 @Override
141 public boolean eIsSet(int featureID) {
142 switch (featureID) {
143 case TaxationPackage.FO__RATE_TYPE_FOR_FO:
144 return rate_type_for_FO != RATE_TYPE_FOR_FO_EDEFAULT;
145 }
146 return super.eIsSet(featureID);
147 }
148
149 /**
150 * <!-- begin-user-doc -->
151 * <!-- end-user-doc -->
152 * @generated
153 */
154 @Override
155 public String toString() {
156 if (eIsProxy()) return super.toString();
157
158 StringBuilder result = new StringBuilder(super.toString());
159 result.append(" (rate_type_for_FO: ");
160 result.append(rate_type_for_FO);
161 result.append(')');
162 return result.toString();
163 }
164
165} //FOImpl 36} //FOImpl
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Income_TypeImpl.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Income_TypeImpl.java
index 7b2564b2..4a111a01 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Income_TypeImpl.java
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Income_TypeImpl.java
@@ -25,7 +25,6 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
25 * The following features are implemented: 25 * The following features are implemented:
26 * </p> 26 * </p>
27 * <ul> 27 * <ul>
28 * <li>{@link Taxation.impl.Income_TypeImpl#isSubjectToWithholdingTax <em>Subject To Withholding Tax</em>}</li>
29 * <li>{@link Taxation.impl.Income_TypeImpl#getId8 <em>Id8</em>}</li> 28 * <li>{@link Taxation.impl.Income_TypeImpl#getId8 <em>Id8</em>}</li>
30 * <li>{@link Taxation.impl.Income_TypeImpl#getIncome <em>Income</em>}</li> 29 * <li>{@link Taxation.impl.Income_TypeImpl#getIncome <em>Income</em>}</li>
31 * </ul> 30 * </ul>
@@ -34,26 +33,6 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
34 */ 33 */
35public abstract class Income_TypeImpl extends MinimalEObjectImpl.Container implements Income_Type { 34public abstract class Income_TypeImpl extends MinimalEObjectImpl.Container implements Income_Type {
36 /** 35 /**
37 * The default value of the '{@link #isSubjectToWithholdingTax() <em>Subject To Withholding Tax</em>}' attribute.
38 * <!-- begin-user-doc -->
39 * <!-- end-user-doc -->
40 * @see #isSubjectToWithholdingTax()
41 * @generated
42 * @ordered
43 */
44 protected static final boolean SUBJECT_TO_WITHHOLDING_TAX_EDEFAULT = false;
45
46 /**
47 * The cached value of the '{@link #isSubjectToWithholdingTax() <em>Subject To Withholding Tax</em>}' attribute.
48 * <!-- begin-user-doc -->
49 * <!-- end-user-doc -->
50 * @see #isSubjectToWithholdingTax()
51 * @generated
52 * @ordered
53 */
54 protected boolean subjectToWithholdingTax = SUBJECT_TO_WITHHOLDING_TAX_EDEFAULT;
55
56 /**
57 * The default value of the '{@link #getId8() <em>Id8</em>}' attribute. 36 * The default value of the '{@link #getId8() <em>Id8</em>}' attribute.
58 * <!-- begin-user-doc --> 37 * <!-- begin-user-doc -->
59 * <!-- end-user-doc --> 38 * <!-- end-user-doc -->
@@ -98,29 +77,6 @@ public abstract class Income_TypeImpl extends MinimalEObjectImpl.Container imple
98 * @generated 77 * @generated
99 */ 78 */
100 @Override 79 @Override
101 public boolean isSubjectToWithholdingTax() {
102 return subjectToWithholdingTax;
103 }
104
105 /**
106 * <!-- begin-user-doc -->
107 * <!-- end-user-doc -->
108 * @generated
109 */
110 @Override
111 public void setSubjectToWithholdingTax(boolean newSubjectToWithholdingTax) {
112 boolean oldSubjectToWithholdingTax = subjectToWithholdingTax;
113 subjectToWithholdingTax = newSubjectToWithholdingTax;
114 if (eNotificationRequired())
115 eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.INCOME_TYPE__SUBJECT_TO_WITHHOLDING_TAX, oldSubjectToWithholdingTax, subjectToWithholdingTax));
116 }
117
118 /**
119 * <!-- begin-user-doc -->
120 * <!-- end-user-doc -->
121 * @generated
122 */
123 @Override
124 public String getId8() { 80 public String getId8() {
125 return id8; 81 return id8;
126 } 82 }
@@ -233,8 +189,6 @@ public abstract class Income_TypeImpl extends MinimalEObjectImpl.Container imple
233 @Override 189 @Override
234 public Object eGet(int featureID, boolean resolve, boolean coreType) { 190 public Object eGet(int featureID, boolean resolve, boolean coreType) {
235 switch (featureID) { 191 switch (featureID) {
236 case TaxationPackage.INCOME_TYPE__SUBJECT_TO_WITHHOLDING_TAX:
237 return isSubjectToWithholdingTax();
238 case TaxationPackage.INCOME_TYPE__ID8: 192 case TaxationPackage.INCOME_TYPE__ID8:
239 return getId8(); 193 return getId8();
240 case TaxationPackage.INCOME_TYPE__INCOME: 194 case TaxationPackage.INCOME_TYPE__INCOME:
@@ -251,9 +205,6 @@ public abstract class Income_TypeImpl extends MinimalEObjectImpl.Container imple
251 @Override 205 @Override
252 public void eSet(int featureID, Object newValue) { 206 public void eSet(int featureID, Object newValue) {
253 switch (featureID) { 207 switch (featureID) {
254 case TaxationPackage.INCOME_TYPE__SUBJECT_TO_WITHHOLDING_TAX:
255 setSubjectToWithholdingTax((Boolean)newValue);
256 return;
257 case TaxationPackage.INCOME_TYPE__ID8: 208 case TaxationPackage.INCOME_TYPE__ID8:
258 setId8((String)newValue); 209 setId8((String)newValue);
259 return; 210 return;
@@ -272,9 +223,6 @@ public abstract class Income_TypeImpl extends MinimalEObjectImpl.Container imple
272 @Override 223 @Override
273 public void eUnset(int featureID) { 224 public void eUnset(int featureID) {
274 switch (featureID) { 225 switch (featureID) {
275 case TaxationPackage.INCOME_TYPE__SUBJECT_TO_WITHHOLDING_TAX:
276 setSubjectToWithholdingTax(SUBJECT_TO_WITHHOLDING_TAX_EDEFAULT);
277 return;
278 case TaxationPackage.INCOME_TYPE__ID8: 226 case TaxationPackage.INCOME_TYPE__ID8:
279 setId8(ID8_EDEFAULT); 227 setId8(ID8_EDEFAULT);
280 return; 228 return;
@@ -293,8 +241,6 @@ public abstract class Income_TypeImpl extends MinimalEObjectImpl.Container imple
293 @Override 241 @Override
294 public boolean eIsSet(int featureID) { 242 public boolean eIsSet(int featureID) {
295 switch (featureID) { 243 switch (featureID) {
296 case TaxationPackage.INCOME_TYPE__SUBJECT_TO_WITHHOLDING_TAX:
297 return subjectToWithholdingTax != SUBJECT_TO_WITHHOLDING_TAX_EDEFAULT;
298 case TaxationPackage.INCOME_TYPE__ID8: 244 case TaxationPackage.INCOME_TYPE__ID8:
299 return ID8_EDEFAULT == null ? id8 != null : !ID8_EDEFAULT.equals(id8); 245 return ID8_EDEFAULT == null ? id8 != null : !ID8_EDEFAULT.equals(id8);
300 case TaxationPackage.INCOME_TYPE__INCOME: 246 case TaxationPackage.INCOME_TYPE__INCOME:
@@ -313,9 +259,7 @@ public abstract class Income_TypeImpl extends MinimalEObjectImpl.Container imple
313 if (eIsProxy()) return super.toString(); 259 if (eIsProxy()) return super.toString();
314 260
315 StringBuilder result = new StringBuilder(super.toString()); 261 StringBuilder result = new StringBuilder(super.toString());
316 result.append(" (subjectToWithholdingTax: "); 262 result.append(" (id8: ");
317 result.append(subjectToWithholdingTax);
318 result.append(", id8: ");
319 result.append(id8); 263 result.append(id8);
320 result.append(')'); 264 result.append(')');
321 return result.toString(); 265 return result.toString();
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Loss_CarryforwardImpl.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Loss_CarryforwardImpl.java
index d43422f8..2f578d2c 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Loss_CarryforwardImpl.java
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Loss_CarryforwardImpl.java
@@ -4,111 +4,17 @@ package Taxation.impl;
4 4
5import Taxation.Loss_Carryforward; 5import Taxation.Loss_Carryforward;
6import Taxation.TaxationPackage; 6import Taxation.TaxationPackage;
7
8import org.eclipse.emf.common.notify.Notification;
9
10import org.eclipse.emf.ecore.EClass; 7import org.eclipse.emf.ecore.EClass;
11 8
12import org.eclipse.emf.ecore.impl.ENotificationImpl;
13
14/** 9/**
15 * <!-- begin-user-doc --> 10 * <!-- begin-user-doc -->
16 * An implementation of the model object '<em><b>Loss Carryforward</b></em>'. 11 * An implementation of the model object '<em><b>Loss Carryforward</b></em>'.
17 * <!-- end-user-doc --> 12 * <!-- end-user-doc -->
18 * <p>
19 * The following features are implemented:
20 * </p>
21 * <ul>
22 * <li>{@link Taxation.impl.Loss_CarryforwardImpl#isRegular_accountability <em>Regular accountability</em>}</li>
23 * <li>{@link Taxation.impl.Loss_CarryforwardImpl#isCompensation_by_other_means <em>Compensation by other means</em>}</li>
24 * <li>{@link Taxation.impl.Loss_CarryforwardImpl#isTax_payer_has_inherited_business_ownership <em>Tax payer has inherited business ownership</em>}</li>
25 * <li>{@link Taxation.impl.Loss_CarryforwardImpl#isTax_payer_has_been_partner_in_business <em>Tax payer has been partner in business</em>}</li>
26 * </ul>
27 * 13 *
28 * @generated 14 * @generated
29 */ 15 */
30public class Loss_CarryforwardImpl extends Special_Expense_DSImpl implements Loss_Carryforward { 16public class Loss_CarryforwardImpl extends Special_Expense_DSImpl implements Loss_Carryforward {
31 /** 17 /**
32 * The default value of the '{@link #isRegular_accountability() <em>Regular accountability</em>}' attribute.
33 * <!-- begin-user-doc -->
34 * <!-- end-user-doc -->
35 * @see #isRegular_accountability()
36 * @generated
37 * @ordered
38 */
39 protected static final boolean REGULAR_ACCOUNTABILITY_EDEFAULT = false;
40
41 /**
42 * The cached value of the '{@link #isRegular_accountability() <em>Regular accountability</em>}' attribute.
43 * <!-- begin-user-doc -->
44 * <!-- end-user-doc -->
45 * @see #isRegular_accountability()
46 * @generated
47 * @ordered
48 */
49 protected boolean regular_accountability = REGULAR_ACCOUNTABILITY_EDEFAULT;
50
51 /**
52 * The default value of the '{@link #isCompensation_by_other_means() <em>Compensation by other means</em>}' attribute.
53 * <!-- begin-user-doc -->
54 * <!-- end-user-doc -->
55 * @see #isCompensation_by_other_means()
56 * @generated
57 * @ordered
58 */
59 protected static final boolean COMPENSATION_BY_OTHER_MEANS_EDEFAULT = false;
60
61 /**
62 * The cached value of the '{@link #isCompensation_by_other_means() <em>Compensation by other means</em>}' attribute.
63 * <!-- begin-user-doc -->
64 * <!-- end-user-doc -->
65 * @see #isCompensation_by_other_means()
66 * @generated
67 * @ordered
68 */
69 protected boolean compensation_by_other_means = COMPENSATION_BY_OTHER_MEANS_EDEFAULT;
70
71 /**
72 * The default value of the '{@link #isTax_payer_has_inherited_business_ownership() <em>Tax payer has inherited business ownership</em>}' attribute.
73 * <!-- begin-user-doc -->
74 * <!-- end-user-doc -->
75 * @see #isTax_payer_has_inherited_business_ownership()
76 * @generated
77 * @ordered
78 */
79 protected static final boolean TAX_PAYER_HAS_INHERITED_BUSINESS_OWNERSHIP_EDEFAULT = false;
80
81 /**
82 * The cached value of the '{@link #isTax_payer_has_inherited_business_ownership() <em>Tax payer has inherited business ownership</em>}' attribute.
83 * <!-- begin-user-doc -->
84 * <!-- end-user-doc -->
85 * @see #isTax_payer_has_inherited_business_ownership()
86 * @generated
87 * @ordered
88 */
89 protected boolean tax_payer_has_inherited_business_ownership = TAX_PAYER_HAS_INHERITED_BUSINESS_OWNERSHIP_EDEFAULT;
90
91 /**
92 * The default value of the '{@link #isTax_payer_has_been_partner_in_business() <em>Tax payer has been partner in business</em>}' attribute.
93 * <!-- begin-user-doc -->
94 * <!-- end-user-doc -->
95 * @see #isTax_payer_has_been_partner_in_business()
96 * @generated
97 * @ordered
98 */
99 protected static final boolean TAX_PAYER_HAS_BEEN_PARTNER_IN_BUSINESS_EDEFAULT = true;
100
101 /**
102 * The cached value of the '{@link #isTax_payer_has_been_partner_in_business() <em>Tax payer has been partner in business</em>}' attribute.
103 * <!-- begin-user-doc -->
104 * <!-- end-user-doc -->
105 * @see #isTax_payer_has_been_partner_in_business()
106 * @generated
107 * @ordered
108 */
109 protected boolean tax_payer_has_been_partner_in_business = TAX_PAYER_HAS_BEEN_PARTNER_IN_BUSINESS_EDEFAULT;
110
111 /**
112 * <!-- begin-user-doc --> 18 * <!-- begin-user-doc -->
113 * <!-- end-user-doc --> 19 * <!-- end-user-doc -->
114 * @generated 20 * @generated
@@ -127,206 +33,4 @@ public class Loss_CarryforwardImpl extends Special_Expense_DSImpl implements Los
127 return TaxationPackage.Literals.LOSS_CARRYFORWARD; 33 return TaxationPackage.Literals.LOSS_CARRYFORWARD;
128 } 34 }
129 35
130 /**
131 * <!-- begin-user-doc -->
132 * <!-- end-user-doc -->
133 * @generated
134 */
135 @Override
136 public boolean isRegular_accountability() {
137 return regular_accountability;
138 }
139
140 /**
141 * <!-- begin-user-doc -->
142 * <!-- end-user-doc -->
143 * @generated
144 */
145 @Override
146 public void setRegular_accountability(boolean newRegular_accountability) {
147 boolean oldRegular_accountability = regular_accountability;
148 regular_accountability = newRegular_accountability;
149 if (eNotificationRequired())
150 eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.LOSS_CARRYFORWARD__REGULAR_ACCOUNTABILITY, oldRegular_accountability, regular_accountability));
151 }
152
153 /**
154 * <!-- begin-user-doc -->
155 * <!-- end-user-doc -->
156 * @generated
157 */
158 @Override
159 public boolean isCompensation_by_other_means() {
160 return compensation_by_other_means;
161 }
162
163 /**
164 * <!-- begin-user-doc -->
165 * <!-- end-user-doc -->
166 * @generated
167 */
168 @Override
169 public void setCompensation_by_other_means(boolean newCompensation_by_other_means) {
170 boolean oldCompensation_by_other_means = compensation_by_other_means;
171 compensation_by_other_means = newCompensation_by_other_means;
172 if (eNotificationRequired())
173 eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.LOSS_CARRYFORWARD__COMPENSATION_BY_OTHER_MEANS, oldCompensation_by_other_means, compensation_by_other_means));
174 }
175
176 /**
177 * <!-- begin-user-doc -->
178 * <!-- end-user-doc -->
179 * @generated
180 */
181 @Override
182 public boolean isTax_payer_has_inherited_business_ownership() {
183 return tax_payer_has_inherited_business_ownership;
184 }
185
186 /**
187 * <!-- begin-user-doc -->
188 * <!-- end-user-doc -->
189 * @generated
190 */
191 @Override
192 public void setTax_payer_has_inherited_business_ownership(boolean newTax_payer_has_inherited_business_ownership) {
193 boolean oldTax_payer_has_inherited_business_ownership = tax_payer_has_inherited_business_ownership;
194 tax_payer_has_inherited_business_ownership = newTax_payer_has_inherited_business_ownership;
195 if (eNotificationRequired())
196 eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.LOSS_CARRYFORWARD__TAX_PAYER_HAS_INHERITED_BUSINESS_OWNERSHIP, oldTax_payer_has_inherited_business_ownership, tax_payer_has_inherited_business_ownership));
197 }
198
199 /**
200 * <!-- begin-user-doc -->
201 * <!-- end-user-doc -->
202 * @generated
203 */
204 @Override
205 public boolean isTax_payer_has_been_partner_in_business() {
206 return tax_payer_has_been_partner_in_business;
207 }
208
209 /**
210 * <!-- begin-user-doc -->
211 * <!-- end-user-doc -->
212 * @generated
213 */
214 @Override
215 public void setTax_payer_has_been_partner_in_business(boolean newTax_payer_has_been_partner_in_business) {
216 boolean oldTax_payer_has_been_partner_in_business = tax_payer_has_been_partner_in_business;
217 tax_payer_has_been_partner_in_business = newTax_payer_has_been_partner_in_business;
218 if (eNotificationRequired())
219 eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.LOSS_CARRYFORWARD__TAX_PAYER_HAS_BEEN_PARTNER_IN_BUSINESS, oldTax_payer_has_been_partner_in_business, tax_payer_has_been_partner_in_business));
220 }
221
222 /**
223 * <!-- begin-user-doc -->
224 * <!-- end-user-doc -->
225 * @generated
226 */
227 @Override
228 public Object eGet(int featureID, boolean resolve, boolean coreType) {
229 switch (featureID) {
230 case TaxationPackage.LOSS_CARRYFORWARD__REGULAR_ACCOUNTABILITY:
231 return isRegular_accountability();
232 case TaxationPackage.LOSS_CARRYFORWARD__COMPENSATION_BY_OTHER_MEANS:
233 return isCompensation_by_other_means();
234 case TaxationPackage.LOSS_CARRYFORWARD__TAX_PAYER_HAS_INHERITED_BUSINESS_OWNERSHIP:
235 return isTax_payer_has_inherited_business_ownership();
236 case TaxationPackage.LOSS_CARRYFORWARD__TAX_PAYER_HAS_BEEN_PARTNER_IN_BUSINESS:
237 return isTax_payer_has_been_partner_in_business();
238 }
239 return super.eGet(featureID, resolve, coreType);
240 }
241
242 /**
243 * <!-- begin-user-doc -->
244 * <!-- end-user-doc -->
245 * @generated
246 */
247 @Override
248 public void eSet(int featureID, Object newValue) {
249 switch (featureID) {
250 case TaxationPackage.LOSS_CARRYFORWARD__REGULAR_ACCOUNTABILITY:
251 setRegular_accountability((Boolean)newValue);
252 return;
253 case TaxationPackage.LOSS_CARRYFORWARD__COMPENSATION_BY_OTHER_MEANS:
254 setCompensation_by_other_means((Boolean)newValue);
255 return;
256 case TaxationPackage.LOSS_CARRYFORWARD__TAX_PAYER_HAS_INHERITED_BUSINESS_OWNERSHIP:
257 setTax_payer_has_inherited_business_ownership((Boolean)newValue);
258 return;
259 case TaxationPackage.LOSS_CARRYFORWARD__TAX_PAYER_HAS_BEEN_PARTNER_IN_BUSINESS:
260 setTax_payer_has_been_partner_in_business((Boolean)newValue);
261 return;
262 }
263 super.eSet(featureID, newValue);
264 }
265
266 /**
267 * <!-- begin-user-doc -->
268 * <!-- end-user-doc -->
269 * @generated
270 */
271 @Override
272 public void eUnset(int featureID) {
273 switch (featureID) {
274 case TaxationPackage.LOSS_CARRYFORWARD__REGULAR_ACCOUNTABILITY:
275 setRegular_accountability(REGULAR_ACCOUNTABILITY_EDEFAULT);
276 return;
277 case TaxationPackage.LOSS_CARRYFORWARD__COMPENSATION_BY_OTHER_MEANS:
278 setCompensation_by_other_means(COMPENSATION_BY_OTHER_MEANS_EDEFAULT);
279 return;
280 case TaxationPackage.LOSS_CARRYFORWARD__TAX_PAYER_HAS_INHERITED_BUSINESS_OWNERSHIP:
281 setTax_payer_has_inherited_business_ownership(TAX_PAYER_HAS_INHERITED_BUSINESS_OWNERSHIP_EDEFAULT);
282 return;
283 case TaxationPackage.LOSS_CARRYFORWARD__TAX_PAYER_HAS_BEEN_PARTNER_IN_BUSINESS:
284 setTax_payer_has_been_partner_in_business(TAX_PAYER_HAS_BEEN_PARTNER_IN_BUSINESS_EDEFAULT);
285 return;
286 }
287 super.eUnset(featureID);
288 }
289
290 /**
291 * <!-- begin-user-doc -->
292 * <!-- end-user-doc -->
293 * @generated
294 */
295 @Override
296 public boolean eIsSet(int featureID) {
297 switch (featureID) {
298 case TaxationPackage.LOSS_CARRYFORWARD__REGULAR_ACCOUNTABILITY:
299 return regular_accountability != REGULAR_ACCOUNTABILITY_EDEFAULT;
300 case TaxationPackage.LOSS_CARRYFORWARD__COMPENSATION_BY_OTHER_MEANS:
301 return compensation_by_other_means != COMPENSATION_BY_OTHER_MEANS_EDEFAULT;
302 case TaxationPackage.LOSS_CARRYFORWARD__TAX_PAYER_HAS_INHERITED_BUSINESS_OWNERSHIP:
303 return tax_payer_has_inherited_business_ownership != TAX_PAYER_HAS_INHERITED_BUSINESS_OWNERSHIP_EDEFAULT;
304 case TaxationPackage.LOSS_CARRYFORWARD__TAX_PAYER_HAS_BEEN_PARTNER_IN_BUSINESS:
305 return tax_payer_has_been_partner_in_business != TAX_PAYER_HAS_BEEN_PARTNER_IN_BUSINESS_EDEFAULT;
306 }
307 return super.eIsSet(featureID);
308 }
309
310 /**
311 * <!-- begin-user-doc -->
312 * <!-- end-user-doc -->
313 * @generated
314 */
315 @Override
316 public String toString() {
317 if (eIsProxy()) return super.toString();
318
319 StringBuilder result = new StringBuilder(super.toString());
320 result.append(" (regular_accountability: ");
321 result.append(regular_accountability);
322 result.append(", compensation_by_other_means: ");
323 result.append(compensation_by_other_means);
324 result.append(", tax_payer_has_inherited_business_ownership: ");
325 result.append(tax_payer_has_inherited_business_ownership);
326 result.append(", tax_payer_has_been_partner_in_business: ");
327 result.append(tax_payer_has_been_partner_in_business);
328 result.append(')');
329 return result.toString();
330 }
331
332} //Loss_CarryforwardImpl 36} //Loss_CarryforwardImpl
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Permanent_ExpenseImpl.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Permanent_ExpenseImpl.java
index 9473ae17..9d88c2db 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Permanent_ExpenseImpl.java
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Permanent_ExpenseImpl.java
@@ -21,7 +21,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
21 * </p> 21 * </p>
22 * <ul> 22 * <ul>
23 * <li>{@link Taxation.impl.Permanent_ExpenseImpl#getCategory <em>Category</em>}</li> 23 * <li>{@link Taxation.impl.Permanent_ExpenseImpl#getCategory <em>Category</em>}</li>
24 * <li>{@link Taxation.impl.Permanent_ExpenseImpl#isIs_eligible_for_deduction <em>Is eligible for deduction</em>}</li>
25 * </ul> 24 * </ul>
26 * 25 *
27 * @generated 26 * @generated
@@ -48,26 +47,6 @@ public class Permanent_ExpenseImpl extends Special_Expense_DSImpl implements Per
48 protected Category_of_Permanent_Expense category = CATEGORY_EDEFAULT; 47 protected Category_of_Permanent_Expense category = CATEGORY_EDEFAULT;
49 48
50 /** 49 /**
51 * The default value of the '{@link #isIs_eligible_for_deduction() <em>Is eligible for deduction</em>}' attribute.
52 * <!-- begin-user-doc -->
53 * <!-- end-user-doc -->
54 * @see #isIs_eligible_for_deduction()
55 * @generated
56 * @ordered
57 */
58 protected static final boolean IS_ELIGIBLE_FOR_DEDUCTION_EDEFAULT = false;
59
60 /**
61 * The cached value of the '{@link #isIs_eligible_for_deduction() <em>Is eligible for deduction</em>}' attribute.
62 * <!-- begin-user-doc -->
63 * <!-- end-user-doc -->
64 * @see #isIs_eligible_for_deduction()
65 * @generated
66 * @ordered
67 */
68 protected boolean is_eligible_for_deduction = IS_ELIGIBLE_FOR_DEDUCTION_EDEFAULT;
69
70 /**
71 * <!-- begin-user-doc --> 50 * <!-- begin-user-doc -->
72 * <!-- end-user-doc --> 51 * <!-- end-user-doc -->
73 * @generated 52 * @generated
@@ -115,35 +94,10 @@ public class Permanent_ExpenseImpl extends Special_Expense_DSImpl implements Per
115 * @generated 94 * @generated
116 */ 95 */
117 @Override 96 @Override
118 public boolean isIs_eligible_for_deduction() {
119 return is_eligible_for_deduction;
120 }
121
122 /**
123 * <!-- begin-user-doc -->
124 * <!-- end-user-doc -->
125 * @generated
126 */
127 @Override
128 public void setIs_eligible_for_deduction(boolean newIs_eligible_for_deduction) {
129 boolean oldIs_eligible_for_deduction = is_eligible_for_deduction;
130 is_eligible_for_deduction = newIs_eligible_for_deduction;
131 if (eNotificationRequired())
132 eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.PERMANENT_EXPENSE__IS_ELIGIBLE_FOR_DEDUCTION, oldIs_eligible_for_deduction, is_eligible_for_deduction));
133 }
134
135 /**
136 * <!-- begin-user-doc -->
137 * <!-- end-user-doc -->
138 * @generated
139 */
140 @Override
141 public Object eGet(int featureID, boolean resolve, boolean coreType) { 97 public Object eGet(int featureID, boolean resolve, boolean coreType) {
142 switch (featureID) { 98 switch (featureID) {
143 case TaxationPackage.PERMANENT_EXPENSE__CATEGORY: 99 case TaxationPackage.PERMANENT_EXPENSE__CATEGORY:
144 return getCategory(); 100 return getCategory();
145 case TaxationPackage.PERMANENT_EXPENSE__IS_ELIGIBLE_FOR_DEDUCTION:
146 return isIs_eligible_for_deduction();
147 } 101 }
148 return super.eGet(featureID, resolve, coreType); 102 return super.eGet(featureID, resolve, coreType);
149 } 103 }
@@ -159,9 +113,6 @@ public class Permanent_ExpenseImpl extends Special_Expense_DSImpl implements Per
159 case TaxationPackage.PERMANENT_EXPENSE__CATEGORY: 113 case TaxationPackage.PERMANENT_EXPENSE__CATEGORY:
160 setCategory((Category_of_Permanent_Expense)newValue); 114 setCategory((Category_of_Permanent_Expense)newValue);
161 return; 115 return;
162 case TaxationPackage.PERMANENT_EXPENSE__IS_ELIGIBLE_FOR_DEDUCTION:
163 setIs_eligible_for_deduction((Boolean)newValue);
164 return;
165 } 116 }
166 super.eSet(featureID, newValue); 117 super.eSet(featureID, newValue);
167 } 118 }
@@ -177,9 +128,6 @@ public class Permanent_ExpenseImpl extends Special_Expense_DSImpl implements Per
177 case TaxationPackage.PERMANENT_EXPENSE__CATEGORY: 128 case TaxationPackage.PERMANENT_EXPENSE__CATEGORY:
178 setCategory(CATEGORY_EDEFAULT); 129 setCategory(CATEGORY_EDEFAULT);
179 return; 130 return;
180 case TaxationPackage.PERMANENT_EXPENSE__IS_ELIGIBLE_FOR_DEDUCTION:
181 setIs_eligible_for_deduction(IS_ELIGIBLE_FOR_DEDUCTION_EDEFAULT);
182 return;
183 } 131 }
184 super.eUnset(featureID); 132 super.eUnset(featureID);
185 } 133 }
@@ -194,8 +142,6 @@ public class Permanent_ExpenseImpl extends Special_Expense_DSImpl implements Per
194 switch (featureID) { 142 switch (featureID) {
195 case TaxationPackage.PERMANENT_EXPENSE__CATEGORY: 143 case TaxationPackage.PERMANENT_EXPENSE__CATEGORY:
196 return category != CATEGORY_EDEFAULT; 144 return category != CATEGORY_EDEFAULT;
197 case TaxationPackage.PERMANENT_EXPENSE__IS_ELIGIBLE_FOR_DEDUCTION:
198 return is_eligible_for_deduction != IS_ELIGIBLE_FOR_DEDUCTION_EDEFAULT;
199 } 145 }
200 return super.eIsSet(featureID); 146 return super.eIsSet(featureID);
201 } 147 }
@@ -212,8 +158,6 @@ public class Permanent_ExpenseImpl extends Special_Expense_DSImpl implements Per
212 StringBuilder result = new StringBuilder(super.toString()); 158 StringBuilder result = new StringBuilder(super.toString());
213 result.append(" (category: "); 159 result.append(" (category: ");
214 result.append(category); 160 result.append(category);
215 result.append(", is_eligible_for_deduction: ");
216 result.append(is_eligible_for_deduction);
217 result.append(')'); 161 result.append(')');
218 return result.toString(); 162 return result.toString();
219 } 163 }
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Physical_PersonImpl.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Physical_PersonImpl.java
index 13e12888..ab7793f4 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Physical_PersonImpl.java
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Physical_PersonImpl.java
@@ -32,13 +32,11 @@ import org.eclipse.emf.ecore.util.InternalEList;
32 * The following features are implemented: 32 * The following features are implemented:
33 * </p> 33 * </p>
34 * <ul> 34 * <ul>
35 * <li>{@link Taxation.impl.Physical_PersonImpl#isIs_assisting_spouse <em>Is assisting spouse</em>}</li>
36 * <li>{@link Taxation.impl.Physical_PersonImpl#getSSNo <em>SS No</em>}</li> 35 * <li>{@link Taxation.impl.Physical_PersonImpl#getSSNo <em>SS No</em>}</li>
37 * <li>{@link Taxation.impl.Physical_PersonImpl#getAddresses <em>Addresses</em>}</li> 36 * <li>{@link Taxation.impl.Physical_PersonImpl#getAddresses <em>Addresses</em>}</li>
38 * <li>{@link Taxation.impl.Physical_PersonImpl#getBirth_year <em>Birth year</em>}</li> 37 * <li>{@link Taxation.impl.Physical_PersonImpl#getBirth_year <em>Birth year</em>}</li>
39 * <li>{@link Taxation.impl.Physical_PersonImpl#getDisability_percentage <em>Disability percentage</em>}</li> 38 * <li>{@link Taxation.impl.Physical_PersonImpl#getDisability_percentage <em>Disability percentage</em>}</li>
40 * <li>{@link Taxation.impl.Physical_PersonImpl#getDisability_type <em>Disability type</em>}</li> 39 * <li>{@link Taxation.impl.Physical_PersonImpl#getDisability_type <em>Disability type</em>}</li>
41 * <li>{@link Taxation.impl.Physical_PersonImpl#isIs_affiliated_personnaly_to_social_security <em>Is affiliated personnaly to social security</em>}</li>
42 * <li>{@link Taxation.impl.Physical_PersonImpl#getBirth_month <em>Birth month</em>}</li> 40 * <li>{@link Taxation.impl.Physical_PersonImpl#getBirth_month <em>Birth month</em>}</li>
43 * <li>{@link Taxation.impl.Physical_PersonImpl#getBirth_day <em>Birth day</em>}</li> 41 * <li>{@link Taxation.impl.Physical_PersonImpl#getBirth_day <em>Birth day</em>}</li>
44 * <li>{@link Taxation.impl.Physical_PersonImpl#getExpenses <em>Expenses</em>}</li> 42 * <li>{@link Taxation.impl.Physical_PersonImpl#getExpenses <em>Expenses</em>}</li>
@@ -49,26 +47,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
49 */ 47 */
50public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements Physical_Person { 48public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements Physical_Person {
51 /** 49 /**
52 * The default value of the '{@link #isIs_assisting_spouse() <em>Is assisting spouse</em>}' attribute.
53 * <!-- begin-user-doc -->
54 * <!-- end-user-doc -->
55 * @see #isIs_assisting_spouse()
56 * @generated
57 * @ordered
58 */
59 protected static final boolean IS_ASSISTING_SPOUSE_EDEFAULT = false;
60
61 /**
62 * The cached value of the '{@link #isIs_assisting_spouse() <em>Is assisting spouse</em>}' attribute.
63 * <!-- begin-user-doc -->
64 * <!-- end-user-doc -->
65 * @see #isIs_assisting_spouse()
66 * @generated
67 * @ordered
68 */
69 protected boolean is_assisting_spouse = IS_ASSISTING_SPOUSE_EDEFAULT;
70
71 /**
72 * The default value of the '{@link #getSSNo() <em>SS No</em>}' attribute. 50 * The default value of the '{@link #getSSNo() <em>SS No</em>}' attribute.
73 * <!-- begin-user-doc --> 51 * <!-- begin-user-doc -->
74 * <!-- end-user-doc --> 52 * <!-- end-user-doc -->
@@ -159,26 +137,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements
159 protected Disability_Types disability_type = DISABILITY_TYPE_EDEFAULT; 137 protected Disability_Types disability_type = DISABILITY_TYPE_EDEFAULT;
160 138
161 /** 139 /**
162 * The default value of the '{@link #isIs_affiliated_personnaly_to_social_security() <em>Is affiliated personnaly to social security</em>}' attribute.
163 * <!-- begin-user-doc -->
164 * <!-- end-user-doc -->
165 * @see #isIs_affiliated_personnaly_to_social_security()
166 * @generated
167 * @ordered
168 */
169 protected static final boolean IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY_EDEFAULT = false;
170
171 /**
172 * The cached value of the '{@link #isIs_affiliated_personnaly_to_social_security() <em>Is affiliated personnaly to social security</em>}' attribute.
173 * <!-- begin-user-doc -->
174 * <!-- end-user-doc -->
175 * @see #isIs_affiliated_personnaly_to_social_security()
176 * @generated
177 * @ordered
178 */
179 protected boolean is_affiliated_personnaly_to_social_security = IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY_EDEFAULT;
180
181 /**
182 * The default value of the '{@link #getBirth_month() <em>Birth month</em>}' attribute. 140 * The default value of the '{@link #getBirth_month() <em>Birth month</em>}' attribute.
183 * <!-- begin-user-doc --> 141 * <!-- begin-user-doc -->
184 * <!-- end-user-doc --> 142 * <!-- end-user-doc -->
@@ -273,29 +231,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements
273 * @generated 231 * @generated
274 */ 232 */
275 @Override 233 @Override
276 public boolean isIs_assisting_spouse() {
277 return is_assisting_spouse;
278 }
279
280 /**
281 * <!-- begin-user-doc -->
282 * <!-- end-user-doc -->
283 * @generated
284 */
285 @Override
286 public void setIs_assisting_spouse(boolean newIs_assisting_spouse) {
287 boolean oldIs_assisting_spouse = is_assisting_spouse;
288 is_assisting_spouse = newIs_assisting_spouse;
289 if (eNotificationRequired())
290 eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.PHYSICAL_PERSON__IS_ASSISTING_SPOUSE, oldIs_assisting_spouse, is_assisting_spouse));
291 }
292
293 /**
294 * <!-- begin-user-doc -->
295 * <!-- end-user-doc -->
296 * @generated
297 */
298 @Override
299 public String getSSNo() { 234 public String getSSNo() {
300 return ssNo; 235 return ssNo;
301 } 236 }
@@ -401,29 +336,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements
401 * @generated 336 * @generated
402 */ 337 */
403 @Override 338 @Override
404 public boolean isIs_affiliated_personnaly_to_social_security() {
405 return is_affiliated_personnaly_to_social_security;
406 }
407
408 /**
409 * <!-- begin-user-doc -->
410 * <!-- end-user-doc -->
411 * @generated
412 */
413 @Override
414 public void setIs_affiliated_personnaly_to_social_security(boolean newIs_affiliated_personnaly_to_social_security) {
415 boolean oldIs_affiliated_personnaly_to_social_security = is_affiliated_personnaly_to_social_security;
416 is_affiliated_personnaly_to_social_security = newIs_affiliated_personnaly_to_social_security;
417 if (eNotificationRequired())
418 eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.PHYSICAL_PERSON__IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY, oldIs_affiliated_personnaly_to_social_security, is_affiliated_personnaly_to_social_security));
419 }
420
421 /**
422 * <!-- begin-user-doc -->
423 * <!-- end-user-doc -->
424 * @generated
425 */
426 @Override
427 public int getBirth_month() { 339 public int getBirth_month() {
428 return birth_month; 340 return birth_month;
429 } 341 }
@@ -541,8 +453,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements
541 @Override 453 @Override
542 public Object eGet(int featureID, boolean resolve, boolean coreType) { 454 public Object eGet(int featureID, boolean resolve, boolean coreType) {
543 switch (featureID) { 455 switch (featureID) {
544 case TaxationPackage.PHYSICAL_PERSON__IS_ASSISTING_SPOUSE:
545 return isIs_assisting_spouse();
546 case TaxationPackage.PHYSICAL_PERSON__SS_NO: 456 case TaxationPackage.PHYSICAL_PERSON__SS_NO:
547 return getSSNo(); 457 return getSSNo();
548 case TaxationPackage.PHYSICAL_PERSON__ADDRESSES: 458 case TaxationPackage.PHYSICAL_PERSON__ADDRESSES:
@@ -553,8 +463,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements
553 return getDisability_percentage(); 463 return getDisability_percentage();
554 case TaxationPackage.PHYSICAL_PERSON__DISABILITY_TYPE: 464 case TaxationPackage.PHYSICAL_PERSON__DISABILITY_TYPE:
555 return getDisability_type(); 465 return getDisability_type();
556 case TaxationPackage.PHYSICAL_PERSON__IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY:
557 return isIs_affiliated_personnaly_to_social_security();
558 case TaxationPackage.PHYSICAL_PERSON__BIRTH_MONTH: 466 case TaxationPackage.PHYSICAL_PERSON__BIRTH_MONTH:
559 return getBirth_month(); 467 return getBirth_month();
560 case TaxationPackage.PHYSICAL_PERSON__BIRTH_DAY: 468 case TaxationPackage.PHYSICAL_PERSON__BIRTH_DAY:
@@ -576,9 +484,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements
576 @Override 484 @Override
577 public void eSet(int featureID, Object newValue) { 485 public void eSet(int featureID, Object newValue) {
578 switch (featureID) { 486 switch (featureID) {
579 case TaxationPackage.PHYSICAL_PERSON__IS_ASSISTING_SPOUSE:
580 setIs_assisting_spouse((Boolean)newValue);
581 return;
582 case TaxationPackage.PHYSICAL_PERSON__SS_NO: 487 case TaxationPackage.PHYSICAL_PERSON__SS_NO:
583 setSSNo((String)newValue); 488 setSSNo((String)newValue);
584 return; 489 return;
@@ -595,9 +500,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements
595 case TaxationPackage.PHYSICAL_PERSON__DISABILITY_TYPE: 500 case TaxationPackage.PHYSICAL_PERSON__DISABILITY_TYPE:
596 setDisability_type((Disability_Types)newValue); 501 setDisability_type((Disability_Types)newValue);
597 return; 502 return;
598 case TaxationPackage.PHYSICAL_PERSON__IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY:
599 setIs_affiliated_personnaly_to_social_security((Boolean)newValue);
600 return;
601 case TaxationPackage.PHYSICAL_PERSON__BIRTH_MONTH: 503 case TaxationPackage.PHYSICAL_PERSON__BIRTH_MONTH:
602 setBirth_month((Integer)newValue); 504 setBirth_month((Integer)newValue);
603 return; 505 return;
@@ -623,9 +525,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements
623 @Override 525 @Override
624 public void eUnset(int featureID) { 526 public void eUnset(int featureID) {
625 switch (featureID) { 527 switch (featureID) {
626 case TaxationPackage.PHYSICAL_PERSON__IS_ASSISTING_SPOUSE:
627 setIs_assisting_spouse(IS_ASSISTING_SPOUSE_EDEFAULT);
628 return;
629 case TaxationPackage.PHYSICAL_PERSON__SS_NO: 528 case TaxationPackage.PHYSICAL_PERSON__SS_NO:
630 setSSNo(SS_NO_EDEFAULT); 529 setSSNo(SS_NO_EDEFAULT);
631 return; 530 return;
@@ -641,9 +540,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements
641 case TaxationPackage.PHYSICAL_PERSON__DISABILITY_TYPE: 540 case TaxationPackage.PHYSICAL_PERSON__DISABILITY_TYPE:
642 setDisability_type(DISABILITY_TYPE_EDEFAULT); 541 setDisability_type(DISABILITY_TYPE_EDEFAULT);
643 return; 542 return;
644 case TaxationPackage.PHYSICAL_PERSON__IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY:
645 setIs_affiliated_personnaly_to_social_security(IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY_EDEFAULT);
646 return;
647 case TaxationPackage.PHYSICAL_PERSON__BIRTH_MONTH: 543 case TaxationPackage.PHYSICAL_PERSON__BIRTH_MONTH:
648 setBirth_month(BIRTH_MONTH_EDEFAULT); 544 setBirth_month(BIRTH_MONTH_EDEFAULT);
649 return; 545 return;
@@ -668,8 +564,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements
668 @Override 564 @Override
669 public boolean eIsSet(int featureID) { 565 public boolean eIsSet(int featureID) {
670 switch (featureID) { 566 switch (featureID) {
671 case TaxationPackage.PHYSICAL_PERSON__IS_ASSISTING_SPOUSE:
672 return is_assisting_spouse != IS_ASSISTING_SPOUSE_EDEFAULT;
673 case TaxationPackage.PHYSICAL_PERSON__SS_NO: 567 case TaxationPackage.PHYSICAL_PERSON__SS_NO:
674 return SS_NO_EDEFAULT == null ? ssNo != null : !SS_NO_EDEFAULT.equals(ssNo); 568 return SS_NO_EDEFAULT == null ? ssNo != null : !SS_NO_EDEFAULT.equals(ssNo);
675 case TaxationPackage.PHYSICAL_PERSON__ADDRESSES: 569 case TaxationPackage.PHYSICAL_PERSON__ADDRESSES:
@@ -680,8 +574,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements
680 return disability_percentage != DISABILITY_PERCENTAGE_EDEFAULT; 574 return disability_percentage != DISABILITY_PERCENTAGE_EDEFAULT;
681 case TaxationPackage.PHYSICAL_PERSON__DISABILITY_TYPE: 575 case TaxationPackage.PHYSICAL_PERSON__DISABILITY_TYPE:
682 return disability_type != DISABILITY_TYPE_EDEFAULT; 576 return disability_type != DISABILITY_TYPE_EDEFAULT;
683 case TaxationPackage.PHYSICAL_PERSON__IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY:
684 return is_affiliated_personnaly_to_social_security != IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY_EDEFAULT;
685 case TaxationPackage.PHYSICAL_PERSON__BIRTH_MONTH: 577 case TaxationPackage.PHYSICAL_PERSON__BIRTH_MONTH:
686 return birth_month != BIRTH_MONTH_EDEFAULT; 578 return birth_month != BIRTH_MONTH_EDEFAULT;
687 case TaxationPackage.PHYSICAL_PERSON__BIRTH_DAY: 579 case TaxationPackage.PHYSICAL_PERSON__BIRTH_DAY:
@@ -704,9 +596,7 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements
704 if (eIsProxy()) return super.toString(); 596 if (eIsProxy()) return super.toString();
705 597
706 StringBuilder result = new StringBuilder(super.toString()); 598 StringBuilder result = new StringBuilder(super.toString());
707 result.append(" (is_assisting_spouse: "); 599 result.append(" (SSNo: ");
708 result.append(is_assisting_spouse);
709 result.append(", SSNo: ");
710 result.append(ssNo); 600 result.append(ssNo);
711 result.append(", birth_year: "); 601 result.append(", birth_year: ");
712 result.append(birth_year); 602 result.append(birth_year);
@@ -714,8 +604,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements
714 result.append(disability_percentage); 604 result.append(disability_percentage);
715 result.append(", disability_type: "); 605 result.append(", disability_type: ");
716 result.append(disability_type); 606 result.append(disability_type);
717 result.append(", is_affiliated_personnaly_to_social_security: ");
718 result.append(is_affiliated_personnaly_to_social_security);
719 result.append(", birth_month: "); 607 result.append(", birth_month: ");
720 result.append(birth_month); 608 result.append(birth_month);
721 result.append(", birth_day: "); 609 result.append(", birth_day: ");
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Private_Insurance_and_PlanImpl.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Private_Insurance_and_PlanImpl.java
index 2b1cd545..0ee24a42 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Private_Insurance_and_PlanImpl.java
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Private_Insurance_and_PlanImpl.java
@@ -22,7 +22,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
22 * <ul> 22 * <ul>
23 * <li>{@link Taxation.impl.Private_Insurance_and_PlanImpl#getCategory <em>Category</em>}</li> 23 * <li>{@link Taxation.impl.Private_Insurance_and_PlanImpl#getCategory <em>Category</em>}</li>
24 * <li>{@link Taxation.impl.Private_Insurance_and_PlanImpl#getDuration_of_contract <em>Duration of contract</em>}</li> 24 * <li>{@link Taxation.impl.Private_Insurance_and_PlanImpl#getDuration_of_contract <em>Duration of contract</em>}</li>
25 * <li>{@link Taxation.impl.Private_Insurance_and_PlanImpl#isIs_private_insurance_and_plan_eligible_for_deduction <em>Is private insurance and plan eligible for deduction</em>}</li>
26 * </ul> 25 * </ul>
27 * 26 *
28 * @generated 27 * @generated
@@ -69,26 +68,6 @@ public class Private_Insurance_and_PlanImpl extends Special_Expense_DSImpl imple
69 protected int duration_of_contract = DURATION_OF_CONTRACT_EDEFAULT; 68 protected int duration_of_contract = DURATION_OF_CONTRACT_EDEFAULT;
70 69
71 /** 70 /**
72 * The default value of the '{@link #isIs_private_insurance_and_plan_eligible_for_deduction() <em>Is private insurance and plan eligible for deduction</em>}' attribute.
73 * <!-- begin-user-doc -->
74 * <!-- end-user-doc -->
75 * @see #isIs_private_insurance_and_plan_eligible_for_deduction()
76 * @generated
77 * @ordered
78 */
79 protected static final boolean IS_PRIVATE_INSURANCE_AND_PLAN_ELIGIBLE_FOR_DEDUCTION_EDEFAULT = false;
80
81 /**
82 * The cached value of the '{@link #isIs_private_insurance_and_plan_eligible_for_deduction() <em>Is private insurance and plan eligible for deduction</em>}' attribute.
83 * <!-- begin-user-doc -->
84 * <!-- end-user-doc -->
85 * @see #isIs_private_insurance_and_plan_eligible_for_deduction()
86 * @generated
87 * @ordered
88 */
89 protected boolean is_private_insurance_and_plan_eligible_for_deduction = IS_PRIVATE_INSURANCE_AND_PLAN_ELIGIBLE_FOR_DEDUCTION_EDEFAULT;
90
91 /**
92 * <!-- begin-user-doc --> 71 * <!-- begin-user-doc -->
93 * <!-- end-user-doc --> 72 * <!-- end-user-doc -->
94 * @generated 73 * @generated
@@ -159,37 +138,12 @@ public class Private_Insurance_and_PlanImpl extends Special_Expense_DSImpl imple
159 * @generated 138 * @generated
160 */ 139 */
161 @Override 140 @Override
162 public boolean isIs_private_insurance_and_plan_eligible_for_deduction() {
163 return is_private_insurance_and_plan_eligible_for_deduction;
164 }
165
166 /**
167 * <!-- begin-user-doc -->
168 * <!-- end-user-doc -->
169 * @generated
170 */
171 @Override
172 public void setIs_private_insurance_and_plan_eligible_for_deduction(boolean newIs_private_insurance_and_plan_eligible_for_deduction) {
173 boolean oldIs_private_insurance_and_plan_eligible_for_deduction = is_private_insurance_and_plan_eligible_for_deduction;
174 is_private_insurance_and_plan_eligible_for_deduction = newIs_private_insurance_and_plan_eligible_for_deduction;
175 if (eNotificationRequired())
176 eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.PRIVATE_INSURANCE_AND_PLAN__IS_PRIVATE_INSURANCE_AND_PLAN_ELIGIBLE_FOR_DEDUCTION, oldIs_private_insurance_and_plan_eligible_for_deduction, is_private_insurance_and_plan_eligible_for_deduction));
177 }
178
179 /**
180 * <!-- begin-user-doc -->
181 * <!-- end-user-doc -->
182 * @generated
183 */
184 @Override
185 public Object eGet(int featureID, boolean resolve, boolean coreType) { 141 public Object eGet(int featureID, boolean resolve, boolean coreType) {
186 switch (featureID) { 142 switch (featureID) {
187 case TaxationPackage.PRIVATE_INSURANCE_AND_PLAN__CATEGORY: 143 case TaxationPackage.PRIVATE_INSURANCE_AND_PLAN__CATEGORY:
188 return getCategory(); 144 return getCategory();
189 case TaxationPackage.PRIVATE_INSURANCE_AND_PLAN__DURATION_OF_CONTRACT: 145 case TaxationPackage.PRIVATE_INSURANCE_AND_PLAN__DURATION_OF_CONTRACT:
190 return getDuration_of_contract(); 146 return getDuration_of_contract();
191 case TaxationPackage.PRIVATE_INSURANCE_AND_PLAN__IS_PRIVATE_INSURANCE_AND_PLAN_ELIGIBLE_FOR_DEDUCTION:
192 return isIs_private_insurance_and_plan_eligible_for_deduction();
193 } 147 }
194 return super.eGet(featureID, resolve, coreType); 148 return super.eGet(featureID, resolve, coreType);
195 } 149 }
@@ -208,9 +162,6 @@ public class Private_Insurance_and_PlanImpl extends Special_Expense_DSImpl imple
208 case TaxationPackage.PRIVATE_INSURANCE_AND_PLAN__DURATION_OF_CONTRACT: 162 case TaxationPackage.PRIVATE_INSURANCE_AND_PLAN__DURATION_OF_CONTRACT:
209 setDuration_of_contract((Integer)newValue); 163 setDuration_of_contract((Integer)newValue);
210 return; 164 return;
211 case TaxationPackage.PRIVATE_INSURANCE_AND_PLAN__IS_PRIVATE_INSURANCE_AND_PLAN_ELIGIBLE_FOR_DEDUCTION:
212 setIs_private_insurance_and_plan_eligible_for_deduction((Boolean)newValue);
213 return;
214 } 165 }
215 super.eSet(featureID, newValue); 166 super.eSet(featureID, newValue);
216 } 167 }
@@ -229,9 +180,6 @@ public class Private_Insurance_and_PlanImpl extends Special_Expense_DSImpl imple
229 case TaxationPackage.PRIVATE_INSURANCE_AND_PLAN__DURATION_OF_CONTRACT: 180 case TaxationPackage.PRIVATE_INSURANCE_AND_PLAN__DURATION_OF_CONTRACT:
230 setDuration_of_contract(DURATION_OF_CONTRACT_EDEFAULT); 181 setDuration_of_contract(DURATION_OF_CONTRACT_EDEFAULT);
231 return; 182 return;
232 case TaxationPackage.PRIVATE_INSURANCE_AND_PLAN__IS_PRIVATE_INSURANCE_AND_PLAN_ELIGIBLE_FOR_DEDUCTION:
233 setIs_private_insurance_and_plan_eligible_for_deduction(IS_PRIVATE_INSURANCE_AND_PLAN_ELIGIBLE_FOR_DEDUCTION_EDEFAULT);
234 return;
235 } 183 }
236 super.eUnset(featureID); 184 super.eUnset(featureID);
237 } 185 }
@@ -248,8 +196,6 @@ public class Private_Insurance_and_PlanImpl extends Special_Expense_DSImpl imple
248 return category != CATEGORY_EDEFAULT; 196 return category != CATEGORY_EDEFAULT;
249 case TaxationPackage.PRIVATE_INSURANCE_AND_PLAN__DURATION_OF_CONTRACT: 197 case TaxationPackage.PRIVATE_INSURANCE_AND_PLAN__DURATION_OF_CONTRACT:
250 return duration_of_contract != DURATION_OF_CONTRACT_EDEFAULT; 198 return duration_of_contract != DURATION_OF_CONTRACT_EDEFAULT;
251 case TaxationPackage.PRIVATE_INSURANCE_AND_PLAN__IS_PRIVATE_INSURANCE_AND_PLAN_ELIGIBLE_FOR_DEDUCTION:
252 return is_private_insurance_and_plan_eligible_for_deduction != IS_PRIVATE_INSURANCE_AND_PLAN_ELIGIBLE_FOR_DEDUCTION_EDEFAULT;
253 } 199 }
254 return super.eIsSet(featureID); 200 return super.eIsSet(featureID);
255 } 201 }
@@ -268,8 +214,6 @@ public class Private_Insurance_and_PlanImpl extends Special_Expense_DSImpl imple
268 result.append(category); 214 result.append(category);
269 result.append(", duration_of_contract: "); 215 result.append(", duration_of_contract: ");
270 result.append(duration_of_contract); 216 result.append(duration_of_contract);
271 result.append(", is_private_insurance_and_plan_eligible_for_deduction: ");
272 result.append(is_private_insurance_and_plan_eligible_for_deduction);
273 result.append(')'); 217 result.append(')');
274 return result.toString(); 218 return result.toString();
275 } 219 }
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Tax_CardImpl.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Tax_CardImpl.java
index ebff8555..0bb2e737 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Tax_CardImpl.java
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Tax_CardImpl.java
@@ -7,7 +7,6 @@ import Taxation.Income;
7import Taxation.Income_Tax_Credit; 7import Taxation.Income_Tax_Credit;
8import Taxation.Job_Activity; 8import Taxation.Job_Activity;
9import Taxation.Tax_Card; 9import Taxation.Tax_Card;
10import Taxation.Tax_Card_Type;
11import Taxation.Tax_Office; 10import Taxation.Tax_Office;
12import Taxation.TaxationPackage; 11import Taxation.TaxationPackage;
13import Taxation.Town; 12import Taxation.Town;
@@ -39,7 +38,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
39 * </p> 38 * </p>
40 * <ul> 39 * <ul>
41 * <li>{@link Taxation.impl.Tax_CardImpl#getCard_identifier <em>Card identifier</em>}</li> 40 * <li>{@link Taxation.impl.Tax_CardImpl#getCard_identifier <em>Card identifier</em>}</li>
42 * <li>{@link Taxation.impl.Tax_CardImpl#getTax_card_type <em>Tax card type</em>}</li>
43 * <li>{@link Taxation.impl.Tax_CardImpl#getTax_office <em>Tax office</em>}</li> 41 * <li>{@link Taxation.impl.Tax_CardImpl#getTax_office <em>Tax office</em>}</li>
44 * <li>{@link Taxation.impl.Tax_CardImpl#getPercentage_of_witholding <em>Percentage of witholding</em>}</li> 42 * <li>{@link Taxation.impl.Tax_CardImpl#getPercentage_of_witholding <em>Percentage of witholding</em>}</li>
45 * <li>{@link Taxation.impl.Tax_CardImpl#getTax_payers_name_surname <em>Tax payers name surname</em>}</li> 43 * <li>{@link Taxation.impl.Tax_CardImpl#getTax_payers_name_surname <em>Tax payers name surname</em>}</li>
@@ -99,26 +97,6 @@ public class Tax_CardImpl extends MinimalEObjectImpl.Container implements Tax_Ca
99 protected String card_identifier = CARD_IDENTIFIER_EDEFAULT; 97 protected String card_identifier = CARD_IDENTIFIER_EDEFAULT;
100 98
101 /** 99 /**
102 * The default value of the '{@link #getTax_card_type() <em>Tax card type</em>}' attribute.
103 * <!-- begin-user-doc -->
104 * <!-- end-user-doc -->
105 * @see #getTax_card_type()
106 * @generated
107 * @ordered
108 */
109 protected static final Tax_Card_Type TAX_CARD_TYPE_EDEFAULT = Tax_Card_Type.PRINCIPAL;
110
111 /**
112 * The cached value of the '{@link #getTax_card_type() <em>Tax card type</em>}' attribute.
113 * <!-- begin-user-doc -->
114 * <!-- end-user-doc -->
115 * @see #getTax_card_type()
116 * @generated
117 * @ordered
118 */
119 protected Tax_Card_Type tax_card_type = TAX_CARD_TYPE_EDEFAULT;
120
121 /**
122 * The default value of the '{@link #getTax_office() <em>Tax office</em>}' attribute. 100 * The default value of the '{@link #getTax_office() <em>Tax office</em>}' attribute.
123 * <!-- begin-user-doc --> 101 * <!-- begin-user-doc -->
124 * <!-- end-user-doc --> 102 * <!-- end-user-doc -->
@@ -746,29 +724,6 @@ public class Tax_CardImpl extends MinimalEObjectImpl.Container implements Tax_Ca
746 * @generated 724 * @generated
747 */ 725 */
748 @Override 726 @Override
749 public Tax_Card_Type getTax_card_type() {
750 return tax_card_type;
751 }
752
753 /**
754 * <!-- begin-user-doc -->
755 * <!-- end-user-doc -->
756 * @generated
757 */
758 @Override
759 public void setTax_card_type(Tax_Card_Type newTax_card_type) {
760 Tax_Card_Type oldTax_card_type = tax_card_type;
761 tax_card_type = newTax_card_type == null ? TAX_CARD_TYPE_EDEFAULT : newTax_card_type;
762 if (eNotificationRequired())
763 eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.TAX_CARD__TAX_CARD_TYPE, oldTax_card_type, tax_card_type));
764 }
765
766 /**
767 * <!-- begin-user-doc -->
768 * <!-- end-user-doc -->
769 * @generated
770 */
771 @Override
772 public Tax_Office getTax_office() { 727 public Tax_Office getTax_office() {
773 return tax_office; 728 return tax_office;
774 } 729 }
@@ -1678,8 +1633,6 @@ public class Tax_CardImpl extends MinimalEObjectImpl.Container implements Tax_Ca
1678 switch (featureID) { 1633 switch (featureID) {
1679 case TaxationPackage.TAX_CARD__CARD_IDENTIFIER: 1634 case TaxationPackage.TAX_CARD__CARD_IDENTIFIER:
1680 return getCard_identifier(); 1635 return getCard_identifier();
1681 case TaxationPackage.TAX_CARD__TAX_CARD_TYPE:
1682 return getTax_card_type();
1683 case TaxationPackage.TAX_CARD__TAX_OFFICE: 1636 case TaxationPackage.TAX_CARD__TAX_OFFICE:
1684 return getTax_office(); 1637 return getTax_office();
1685 case TaxationPackage.TAX_CARD__PERCENTAGE_OF_WITHOLDING: 1638 case TaxationPackage.TAX_CARD__PERCENTAGE_OF_WITHOLDING:
@@ -1765,9 +1718,6 @@ public class Tax_CardImpl extends MinimalEObjectImpl.Container implements Tax_Ca
1765 case TaxationPackage.TAX_CARD__CARD_IDENTIFIER: 1718 case TaxationPackage.TAX_CARD__CARD_IDENTIFIER:
1766 setCard_identifier((String)newValue); 1719 setCard_identifier((String)newValue);
1767 return; 1720 return;
1768 case TaxationPackage.TAX_CARD__TAX_CARD_TYPE:
1769 setTax_card_type((Tax_Card_Type)newValue);
1770 return;
1771 case TaxationPackage.TAX_CARD__TAX_OFFICE: 1721 case TaxationPackage.TAX_CARD__TAX_OFFICE:
1772 setTax_office((Tax_Office)newValue); 1722 setTax_office((Tax_Office)newValue);
1773 return; 1723 return;
@@ -1885,9 +1835,6 @@ public class Tax_CardImpl extends MinimalEObjectImpl.Container implements Tax_Ca
1885 case TaxationPackage.TAX_CARD__CARD_IDENTIFIER: 1835 case TaxationPackage.TAX_CARD__CARD_IDENTIFIER:
1886 setCard_identifier(CARD_IDENTIFIER_EDEFAULT); 1836 setCard_identifier(CARD_IDENTIFIER_EDEFAULT);
1887 return; 1837 return;
1888 case TaxationPackage.TAX_CARD__TAX_CARD_TYPE:
1889 setTax_card_type(TAX_CARD_TYPE_EDEFAULT);
1890 return;
1891 case TaxationPackage.TAX_CARD__TAX_OFFICE: 1838 case TaxationPackage.TAX_CARD__TAX_OFFICE:
1892 setTax_office(TAX_OFFICE_EDEFAULT); 1839 setTax_office(TAX_OFFICE_EDEFAULT);
1893 return; 1840 return;
@@ -2001,8 +1948,6 @@ public class Tax_CardImpl extends MinimalEObjectImpl.Container implements Tax_Ca
2001 switch (featureID) { 1948 switch (featureID) {
2002 case TaxationPackage.TAX_CARD__CARD_IDENTIFIER: 1949 case TaxationPackage.TAX_CARD__CARD_IDENTIFIER:
2003 return CARD_IDENTIFIER_EDEFAULT == null ? card_identifier != null : !CARD_IDENTIFIER_EDEFAULT.equals(card_identifier); 1950 return CARD_IDENTIFIER_EDEFAULT == null ? card_identifier != null : !CARD_IDENTIFIER_EDEFAULT.equals(card_identifier);
2004 case TaxationPackage.TAX_CARD__TAX_CARD_TYPE:
2005 return tax_card_type != TAX_CARD_TYPE_EDEFAULT;
2006 case TaxationPackage.TAX_CARD__TAX_OFFICE: 1951 case TaxationPackage.TAX_CARD__TAX_OFFICE:
2007 return tax_office != TAX_OFFICE_EDEFAULT; 1952 return tax_office != TAX_OFFICE_EDEFAULT;
2008 case TaxationPackage.TAX_CARD__PERCENTAGE_OF_WITHOLDING: 1953 case TaxationPackage.TAX_CARD__PERCENTAGE_OF_WITHOLDING:
@@ -2085,8 +2030,6 @@ public class Tax_CardImpl extends MinimalEObjectImpl.Container implements Tax_Ca
2085 StringBuilder result = new StringBuilder(super.toString()); 2030 StringBuilder result = new StringBuilder(super.toString());
2086 result.append(" (card_identifier: "); 2031 result.append(" (card_identifier: ");
2087 result.append(card_identifier); 2032 result.append(card_identifier);
2088 result.append(", tax_card_type: ");
2089 result.append(tax_card_type);
2090 result.append(", tax_office: "); 2033 result.append(", tax_office: ");
2091 result.append(tax_office); 2034 result.append(tax_office);
2092 result.append(", percentage_of_witholding: "); 2035 result.append(", percentage_of_witholding: ");
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Tax_PayerImpl.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Tax_PayerImpl.java
index 7e382d7f..2a4f4422 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Tax_PayerImpl.java
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Tax_PayerImpl.java
@@ -36,7 +36,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
36 * <li>{@link Taxation.impl.Tax_PayerImpl#getFrom_agent <em>From agent</em>}</li> 36 * <li>{@link Taxation.impl.Tax_PayerImpl#getFrom_agent <em>From agent</em>}</li>
37 * <li>{@link Taxation.impl.Tax_PayerImpl#getIncomes <em>Incomes</em>}</li> 37 * <li>{@link Taxation.impl.Tax_PayerImpl#getIncomes <em>Incomes</em>}</li>
38 * <li>{@link Taxation.impl.Tax_PayerImpl#getFrom_law <em>From law</em>}</li> 38 * <li>{@link Taxation.impl.Tax_PayerImpl#getFrom_law <em>From law</em>}</li>
39 * <li>{@link Taxation.impl.Tax_PayerImpl#getTaxesDue <em>Taxes Due</em>}</li>
40 * </ul> 39 * </ul>
41 * 40 *
42 * @generated 41 * @generated
@@ -83,26 +82,6 @@ public abstract class Tax_PayerImpl extends Physical_PersonImpl implements Tax_P
83 protected FromLaw from_law; 82 protected FromLaw from_law;
84 83
85 /** 84 /**
86 * The default value of the '{@link #getTaxesDue() <em>Taxes Due</em>}' attribute.
87 * <!-- begin-user-doc -->
88 * <!-- end-user-doc -->
89 * @see #getTaxesDue()
90 * @generated
91 * @ordered
92 */
93 protected static final double TAXES_DUE_EDEFAULT = 0.0;
94
95 /**
96 * The cached value of the '{@link #getTaxesDue() <em>Taxes Due</em>}' attribute.
97 * <!-- begin-user-doc -->
98 * <!-- end-user-doc -->
99 * @see #getTaxesDue()
100 * @generated
101 * @ordered
102 */
103 protected double taxesDue = TAXES_DUE_EDEFAULT;
104
105 /**
106 * <!-- begin-user-doc --> 85 * <!-- begin-user-doc -->
107 * <!-- end-user-doc --> 86 * <!-- end-user-doc -->
108 * @generated 87 * @generated
@@ -242,29 +221,6 @@ public abstract class Tax_PayerImpl extends Physical_PersonImpl implements Tax_P
242 * <!-- end-user-doc --> 221 * <!-- end-user-doc -->
243 * @generated 222 * @generated
244 */ 223 */
245 @Override
246 public double getTaxesDue() {
247 return taxesDue;
248 }
249
250 /**
251 * <!-- begin-user-doc -->
252 * <!-- end-user-doc -->
253 * @generated
254 */
255 @Override
256 public void setTaxesDue(double newTaxesDue) {
257 double oldTaxesDue = taxesDue;
258 taxesDue = newTaxesDue;
259 if (eNotificationRequired())
260 eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.TAX_PAYER__TAXES_DUE, oldTaxesDue, taxesDue));
261 }
262
263 /**
264 * <!-- begin-user-doc -->
265 * <!-- end-user-doc -->
266 * @generated
267 */
268 @SuppressWarnings("unchecked") 224 @SuppressWarnings("unchecked")
269 @Override 225 @Override
270 public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { 226 public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
@@ -321,8 +277,6 @@ public abstract class Tax_PayerImpl extends Physical_PersonImpl implements Tax_P
321 return getIncomes(); 277 return getIncomes();
322 case TaxationPackage.TAX_PAYER__FROM_LAW: 278 case TaxationPackage.TAX_PAYER__FROM_LAW:
323 return getFrom_law(); 279 return getFrom_law();
324 case TaxationPackage.TAX_PAYER__TAXES_DUE:
325 return getTaxesDue();
326 } 280 }
327 return super.eGet(featureID, resolve, coreType); 281 return super.eGet(featureID, resolve, coreType);
328 } 282 }
@@ -350,9 +304,6 @@ public abstract class Tax_PayerImpl extends Physical_PersonImpl implements Tax_P
350 case TaxationPackage.TAX_PAYER__FROM_LAW: 304 case TaxationPackage.TAX_PAYER__FROM_LAW:
351 setFrom_law((FromLaw)newValue); 305 setFrom_law((FromLaw)newValue);
352 return; 306 return;
353 case TaxationPackage.TAX_PAYER__TAXES_DUE:
354 setTaxesDue((Double)newValue);
355 return;
356 } 307 }
357 super.eSet(featureID, newValue); 308 super.eSet(featureID, newValue);
358 } 309 }
@@ -377,9 +328,6 @@ public abstract class Tax_PayerImpl extends Physical_PersonImpl implements Tax_P
377 case TaxationPackage.TAX_PAYER__FROM_LAW: 328 case TaxationPackage.TAX_PAYER__FROM_LAW:
378 setFrom_law((FromLaw)null); 329 setFrom_law((FromLaw)null);
379 return; 330 return;
380 case TaxationPackage.TAX_PAYER__TAXES_DUE:
381 setTaxesDue(TAXES_DUE_EDEFAULT);
382 return;
383 } 331 }
384 super.eUnset(featureID); 332 super.eUnset(featureID);
385 } 333 }
@@ -400,26 +348,8 @@ public abstract class Tax_PayerImpl extends Physical_PersonImpl implements Tax_P
400 return incomes != null && !incomes.isEmpty(); 348 return incomes != null && !incomes.isEmpty();
401 case TaxationPackage.TAX_PAYER__FROM_LAW: 349 case TaxationPackage.TAX_PAYER__FROM_LAW:
402 return from_law != null; 350 return from_law != null;
403 case TaxationPackage.TAX_PAYER__TAXES_DUE:
404 return taxesDue != TAXES_DUE_EDEFAULT;
405 } 351 }
406 return super.eIsSet(featureID); 352 return super.eIsSet(featureID);
407 } 353 }
408 354
409 /**
410 * <!-- begin-user-doc -->
411 * <!-- end-user-doc -->
412 * @generated
413 */
414 @Override
415 public String toString() {
416 if (eIsProxy()) return super.toString();
417
418 StringBuilder result = new StringBuilder(super.toString());
419 result.append(" (taxesDue: ");
420 result.append(taxesDue);
421 result.append(')');
422 return result.toString();
423 }
424
425} //Tax_PayerImpl 355} //Tax_PayerImpl
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/TaxationFactoryImpl.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/TaxationFactoryImpl.java
index 36f4493c..7f29a224 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/TaxationFactoryImpl.java
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/TaxationFactoryImpl.java
@@ -128,8 +128,6 @@ public class TaxationFactoryImpl extends EFactoryImpl implements TaxationFactory
128 return createDisability_TypesFromString(eDataType, initialValue); 128 return createDisability_TypesFromString(eDataType, initialValue);
129 case TaxationPackage.COUNTRY: 129 case TaxationPackage.COUNTRY:
130 return createCountryFromString(eDataType, initialValue); 130 return createCountryFromString(eDataType, initialValue);
131 case TaxationPackage.TAX_CARD_TYPE:
132 return createTax_Card_TypeFromString(eDataType, initialValue);
133 case TaxationPackage.TAX_OFFICE: 131 case TaxationPackage.TAX_OFFICE:
134 return createTax_OfficeFromString(eDataType, initialValue); 132 return createTax_OfficeFromString(eDataType, initialValue);
135 case TaxationPackage.TAX_CLASS_CATEGORY: 133 case TaxationPackage.TAX_CLASS_CATEGORY:
@@ -138,8 +136,6 @@ public class TaxationFactoryImpl extends EFactoryImpl implements TaxationFactory
138 return createJob_ActivityFromString(eDataType, initialValue); 136 return createJob_ActivityFromString(eDataType, initialValue);
139 case TaxationPackage.TOWN: 137 case TaxationPackage.TOWN:
140 return createTownFromString(eDataType, initialValue); 138 return createTownFromString(eDataType, initialValue);
141 case TaxationPackage.TYPE_OF_RATE:
142 return createType_of_RateFromString(eDataType, initialValue);
143 case TaxationPackage.CE_TYPE: 139 case TaxationPackage.CE_TYPE:
144 return createCE_TypeFromString(eDataType, initialValue); 140 return createCE_TypeFromString(eDataType, initialValue);
145 case TaxationPackage.EXPENSE_PURPOSE: 141 case TaxationPackage.EXPENSE_PURPOSE:
@@ -175,8 +171,6 @@ public class TaxationFactoryImpl extends EFactoryImpl implements TaxationFactory
175 return convertDisability_TypesToString(eDataType, instanceValue); 171 return convertDisability_TypesToString(eDataType, instanceValue);
176 case TaxationPackage.COUNTRY: 172 case TaxationPackage.COUNTRY:
177 return convertCountryToString(eDataType, instanceValue); 173 return convertCountryToString(eDataType, instanceValue);
178 case TaxationPackage.TAX_CARD_TYPE:
179 return convertTax_Card_TypeToString(eDataType, instanceValue);
180 case TaxationPackage.TAX_OFFICE: 174 case TaxationPackage.TAX_OFFICE:
181 return convertTax_OfficeToString(eDataType, instanceValue); 175 return convertTax_OfficeToString(eDataType, instanceValue);
182 case TaxationPackage.TAX_CLASS_CATEGORY: 176 case TaxationPackage.TAX_CLASS_CATEGORY:
@@ -185,8 +179,6 @@ public class TaxationFactoryImpl extends EFactoryImpl implements TaxationFactory
185 return convertJob_ActivityToString(eDataType, instanceValue); 179 return convertJob_ActivityToString(eDataType, instanceValue);
186 case TaxationPackage.TOWN: 180 case TaxationPackage.TOWN:
187 return convertTownToString(eDataType, instanceValue); 181 return convertTownToString(eDataType, instanceValue);
188 case TaxationPackage.TYPE_OF_RATE:
189 return convertType_of_RateToString(eDataType, instanceValue);
190 case TaxationPackage.CE_TYPE: 182 case TaxationPackage.CE_TYPE:
191 return convertCE_TypeToString(eDataType, instanceValue); 183 return convertCE_TypeToString(eDataType, instanceValue);
192 case TaxationPackage.EXPENSE_PURPOSE: 184 case TaxationPackage.EXPENSE_PURPOSE:
@@ -845,26 +837,6 @@ public class TaxationFactoryImpl extends EFactoryImpl implements TaxationFactory
845 * <!-- end-user-doc --> 837 * <!-- end-user-doc -->
846 * @generated 838 * @generated
847 */ 839 */
848 public Tax_Card_Type createTax_Card_TypeFromString(EDataType eDataType, String initialValue) {
849 Tax_Card_Type result = Tax_Card_Type.get(initialValue);
850 if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
851 return result;
852 }
853
854 /**
855 * <!-- begin-user-doc -->
856 * <!-- end-user-doc -->
857 * @generated
858 */
859 public String convertTax_Card_TypeToString(EDataType eDataType, Object instanceValue) {
860 return instanceValue == null ? null : instanceValue.toString();
861 }
862
863 /**
864 * <!-- begin-user-doc -->
865 * <!-- end-user-doc -->
866 * @generated
867 */
868 public Tax_Office createTax_OfficeFromString(EDataType eDataType, String initialValue) { 840 public Tax_Office createTax_OfficeFromString(EDataType eDataType, String initialValue) {
869 Tax_Office result = Tax_Office.get(initialValue); 841 Tax_Office result = Tax_Office.get(initialValue);
870 if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); 842 if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
@@ -945,26 +917,6 @@ public class TaxationFactoryImpl extends EFactoryImpl implements TaxationFactory
945 * <!-- end-user-doc --> 917 * <!-- end-user-doc -->
946 * @generated 918 * @generated
947 */ 919 */
948 public Type_of_Rate createType_of_RateFromString(EDataType eDataType, String initialValue) {
949 Type_of_Rate result = Type_of_Rate.get(initialValue);
950 if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
951 return result;
952 }
953
954 /**
955 * <!-- begin-user-doc -->
956 * <!-- end-user-doc -->
957 * @generated
958 */
959 public String convertType_of_RateToString(EDataType eDataType, Object instanceValue) {
960 return instanceValue == null ? null : instanceValue.toString();
961 }
962
963 /**
964 * <!-- begin-user-doc -->
965 * <!-- end-user-doc -->
966 * @generated
967 */
968 public CE_Type createCE_TypeFromString(EDataType eDataType, String initialValue) { 920 public CE_Type createCE_TypeFromString(EDataType eDataType, String initialValue) {
969 CE_Type result = CE_Type.get(initialValue); 921 CE_Type result = CE_Type.get(initialValue);
970 if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); 922 if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/TaxationPackageImpl.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/TaxationPackageImpl.java
index a174a065..56d3b3de 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/TaxationPackageImpl.java
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/TaxationPackageImpl.java
@@ -61,7 +61,6 @@ import Taxation.Separation_Causes;
61import Taxation.Special_Expense_DS; 61import Taxation.Special_Expense_DS;
62import Taxation.Spousal_Expense_AC; 62import Taxation.Spousal_Expense_AC;
63import Taxation.Tax_Card; 63import Taxation.Tax_Card;
64import Taxation.Tax_Card_Type;
65import Taxation.Tax_Case; 64import Taxation.Tax_Case;
66import Taxation.Tax_Class_Category; 65import Taxation.Tax_Class_Category;
67import Taxation.Tax_Office; 66import Taxation.Tax_Office;
@@ -72,8 +71,6 @@ import Taxation.TaxationPackage;
72import Taxation.Town; 71import Taxation.Town;
73import Taxation.Trade_and_Business_Income; 72import Taxation.Trade_and_Business_Income;
74import Taxation.Travel_Expense_FD; 73import Taxation.Travel_Expense_FD;
75import Taxation.Type_of_Rate;
76
77import org.eclipse.emf.ecore.EAttribute; 74import org.eclipse.emf.ecore.EAttribute;
78import org.eclipse.emf.ecore.EClass; 75import org.eclipse.emf.ecore.EClass;
79import org.eclipse.emf.ecore.EEnum; 76import org.eclipse.emf.ecore.EEnum;
@@ -521,13 +518,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
521 * <!-- end-user-doc --> 518 * <!-- end-user-doc -->
522 * @generated 519 * @generated
523 */ 520 */
524 private EEnum tax_Card_TypeEEnum = null;
525
526 /**
527 * <!-- begin-user-doc -->
528 * <!-- end-user-doc -->
529 * @generated
530 */
531 private EEnum tax_OfficeEEnum = null; 521 private EEnum tax_OfficeEEnum = null;
532 522
533 /** 523 /**
@@ -556,13 +546,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
556 * <!-- end-user-doc --> 546 * <!-- end-user-doc -->
557 * @generated 547 * @generated
558 */ 548 */
559 private EEnum type_of_RateEEnum = null;
560
561 /**
562 * <!-- begin-user-doc -->
563 * <!-- end-user-doc -->
564 * @generated
565 */
566 private EEnum cE_TypeEEnum = null; 549 private EEnum cE_TypeEEnum = null;
567 550
568 /** 551 /**
@@ -1041,16 +1024,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1041 * @generated 1024 * @generated
1042 */ 1025 */
1043 @Override 1026 @Override
1044 public EAttribute getTax_Payer_TaxesDue() {
1045 return (EAttribute)tax_PayerEClass.getEStructuralFeatures().get(4);
1046 }
1047
1048 /**
1049 * <!-- begin-user-doc -->
1050 * <!-- end-user-doc -->
1051 * @generated
1052 */
1053 @Override
1054 public EClass getPhysical_Person() { 1027 public EClass getPhysical_Person() {
1055 return physical_PersonEClass; 1028 return physical_PersonEClass;
1056 } 1029 }
@@ -1061,18 +1034,8 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1061 * @generated 1034 * @generated
1062 */ 1035 */
1063 @Override 1036 @Override
1064 public EAttribute getPhysical_Person_Is_assisting_spouse() {
1065 return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(0);
1066 }
1067
1068 /**
1069 * <!-- begin-user-doc -->
1070 * <!-- end-user-doc -->
1071 * @generated
1072 */
1073 @Override
1074 public EAttribute getPhysical_Person_SSNo() { 1037 public EAttribute getPhysical_Person_SSNo() {
1075 return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(1); 1038 return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(0);
1076 } 1039 }
1077 1040
1078 /** 1041 /**
@@ -1082,7 +1045,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1082 */ 1045 */
1083 @Override 1046 @Override
1084 public EReference getPhysical_Person_Addresses() { 1047 public EReference getPhysical_Person_Addresses() {
1085 return (EReference)physical_PersonEClass.getEStructuralFeatures().get(2); 1048 return (EReference)physical_PersonEClass.getEStructuralFeatures().get(1);
1086 } 1049 }
1087 1050
1088 /** 1051 /**
@@ -1092,7 +1055,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1092 */ 1055 */
1093 @Override 1056 @Override
1094 public EAttribute getPhysical_Person_Birth_year() { 1057 public EAttribute getPhysical_Person_Birth_year() {
1095 return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(3); 1058 return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(2);
1096 } 1059 }
1097 1060
1098 /** 1061 /**
@@ -1102,7 +1065,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1102 */ 1065 */
1103 @Override 1066 @Override
1104 public EAttribute getPhysical_Person_Disability_percentage() { 1067 public EAttribute getPhysical_Person_Disability_percentage() {
1105 return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(4); 1068 return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(3);
1106 } 1069 }
1107 1070
1108 /** 1071 /**
@@ -1112,17 +1075,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1112 */ 1075 */
1113 @Override 1076 @Override
1114 public EAttribute getPhysical_Person_Disability_type() { 1077 public EAttribute getPhysical_Person_Disability_type() {
1115 return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(5); 1078 return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(4);
1116 }
1117
1118 /**
1119 * <!-- begin-user-doc -->
1120 * <!-- end-user-doc -->
1121 * @generated
1122 */
1123 @Override
1124 public EAttribute getPhysical_Person_Is_affiliated_personnaly_to_social_security() {
1125 return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(6);
1126 } 1079 }
1127 1080
1128 /** 1081 /**
@@ -1132,7 +1085,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1132 */ 1085 */
1133 @Override 1086 @Override
1134 public EAttribute getPhysical_Person_Birth_month() { 1087 public EAttribute getPhysical_Person_Birth_month() {
1135 return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(7); 1088 return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(5);
1136 } 1089 }
1137 1090
1138 /** 1091 /**
@@ -1142,7 +1095,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1142 */ 1095 */
1143 @Override 1096 @Override
1144 public EAttribute getPhysical_Person_Birth_day() { 1097 public EAttribute getPhysical_Person_Birth_day() {
1145 return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(8); 1098 return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(6);
1146 } 1099 }
1147 1100
1148 /** 1101 /**
@@ -1152,7 +1105,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1152 */ 1105 */
1153 @Override 1106 @Override
1154 public EReference getPhysical_Person_Expenses() { 1107 public EReference getPhysical_Person_Expenses() {
1155 return (EReference)physical_PersonEClass.getEStructuralFeatures().get(9); 1108 return (EReference)physical_PersonEClass.getEStructuralFeatures().get(7);
1156 } 1109 }
1157 1110
1158 /** 1111 /**
@@ -1162,7 +1115,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1162 */ 1115 */
1163 @Override 1116 @Override
1164 public EAttribute getPhysical_Person_Is_widower() { 1117 public EAttribute getPhysical_Person_Is_widower() {
1165 return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(10); 1118 return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(8);
1166 } 1119 }
1167 1120
1168 /** 1121 /**
@@ -1411,18 +1364,8 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1411 * @generated 1364 * @generated
1412 */ 1365 */
1413 @Override 1366 @Override
1414 public EAttribute getExternal_Allowance_Amount() {
1415 return (EAttribute)external_AllowanceEClass.getEStructuralFeatures().get(0);
1416 }
1417
1418 /**
1419 * <!-- begin-user-doc -->
1420 * <!-- end-user-doc -->
1421 * @generated
1422 */
1423 @Override
1424 public EAttribute getExternal_Allowance_Grantor() { 1367 public EAttribute getExternal_Allowance_Grantor() {
1425 return (EAttribute)external_AllowanceEClass.getEStructuralFeatures().get(1); 1368 return (EAttribute)external_AllowanceEClass.getEStructuralFeatures().get(0);
1426 } 1369 }
1427 1370
1428 /** 1371 /**
@@ -1432,7 +1375,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1432 */ 1375 */
1433 @Override 1376 @Override
1434 public EAttribute getExternal_Allowance_Starting_year() { 1377 public EAttribute getExternal_Allowance_Starting_year() {
1435 return (EAttribute)external_AllowanceEClass.getEStructuralFeatures().get(2); 1378 return (EAttribute)external_AllowanceEClass.getEStructuralFeatures().get(1);
1436 } 1379 }
1437 1380
1438 /** 1381 /**
@@ -1442,7 +1385,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1442 */ 1385 */
1443 @Override 1386 @Override
1444 public EAttribute getExternal_Allowance_Ending_year() { 1387 public EAttribute getExternal_Allowance_Ending_year() {
1445 return (EAttribute)external_AllowanceEClass.getEStructuralFeatures().get(3); 1388 return (EAttribute)external_AllowanceEClass.getEStructuralFeatures().get(2);
1446 } 1389 }
1447 1390
1448 /** 1391 /**
@@ -1452,7 +1395,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1452 */ 1395 */
1453 @Override 1396 @Override
1454 public EReference getExternal_Allowance_Reciver() { 1397 public EReference getExternal_Allowance_Reciver() {
1455 return (EReference)external_AllowanceEClass.getEStructuralFeatures().get(4); 1398 return (EReference)external_AllowanceEClass.getEStructuralFeatures().get(3);
1456 } 1399 }
1457 1400
1458 /** 1401 /**
@@ -1462,7 +1405,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1462 */ 1405 */
1463 @Override 1406 @Override
1464 public EAttribute getExternal_Allowance_Id5() { 1407 public EAttribute getExternal_Allowance_Id5() {
1465 return (EAttribute)external_AllowanceEClass.getEStructuralFeatures().get(5); 1408 return (EAttribute)external_AllowanceEClass.getEStructuralFeatures().get(4);
1466 } 1409 }
1467 1410
1468 /** 1411 /**
@@ -1472,7 +1415,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1472 */ 1415 */
1473 @Override 1416 @Override
1474 public EReference getExternal_Allowance_Person() { 1417 public EReference getExternal_Allowance_Person() {
1475 return (EReference)external_AllowanceEClass.getEStructuralFeatures().get(6); 1418 return (EReference)external_AllowanceEClass.getEStructuralFeatures().get(5);
1476 } 1419 }
1477 1420
1478 /** 1421 /**
@@ -1831,18 +1774,8 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1831 * @generated 1774 * @generated
1832 */ 1775 */
1833 @Override 1776 @Override
1834 public EAttribute getIncome_Type_SubjectToWithholdingTax() {
1835 return (EAttribute)income_TypeEClass.getEStructuralFeatures().get(0);
1836 }
1837
1838 /**
1839 * <!-- begin-user-doc -->
1840 * <!-- end-user-doc -->
1841 * @generated
1842 */
1843 @Override
1844 public EAttribute getIncome_Type_Id8() { 1777 public EAttribute getIncome_Type_Id8() {
1845 return (EAttribute)income_TypeEClass.getEStructuralFeatures().get(1); 1778 return (EAttribute)income_TypeEClass.getEStructuralFeatures().get(0);
1846 } 1779 }
1847 1780
1848 /** 1781 /**
@@ -1852,7 +1785,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1852 */ 1785 */
1853 @Override 1786 @Override
1854 public EReference getIncome_Type_Income() { 1787 public EReference getIncome_Type_Income() {
1855 return (EReference)income_TypeEClass.getEStructuralFeatures().get(2); 1788 return (EReference)income_TypeEClass.getEStructuralFeatures().get(1);
1856 } 1789 }
1857 1790
1858 /** 1791 /**
@@ -1881,18 +1814,8 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1881 * @generated 1814 * @generated
1882 */ 1815 */
1883 @Override 1816 @Override
1884 public EAttribute getTax_Card_Tax_card_type() {
1885 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(1);
1886 }
1887
1888 /**
1889 * <!-- begin-user-doc -->
1890 * <!-- end-user-doc -->
1891 * @generated
1892 */
1893 @Override
1894 public EAttribute getTax_Card_Tax_office() { 1817 public EAttribute getTax_Card_Tax_office() {
1895 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(2); 1818 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(1);
1896 } 1819 }
1897 1820
1898 /** 1821 /**
@@ -1902,7 +1825,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1902 */ 1825 */
1903 @Override 1826 @Override
1904 public EAttribute getTax_Card_Percentage_of_witholding() { 1827 public EAttribute getTax_Card_Percentage_of_witholding() {
1905 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(3); 1828 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(2);
1906 } 1829 }
1907 1830
1908 /** 1831 /**
@@ -1912,7 +1835,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1912 */ 1835 */
1913 @Override 1836 @Override
1914 public EAttribute getTax_Card_Tax_payers_name_surname() { 1837 public EAttribute getTax_Card_Tax_payers_name_surname() {
1915 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(4); 1838 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(3);
1916 } 1839 }
1917 1840
1918 /** 1841 /**
@@ -1922,7 +1845,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1922 */ 1845 */
1923 @Override 1846 @Override
1924 public EAttribute getTax_Card_Tax_payers_partner_name_surname() { 1847 public EAttribute getTax_Card_Tax_payers_partner_name_surname() {
1925 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(5); 1848 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(4);
1926 } 1849 }
1927 1850
1928 /** 1851 /**
@@ -1932,7 +1855,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1932 */ 1855 */
1933 @Override 1856 @Override
1934 public EReference getTax_Card_Tax_payers_address() { 1857 public EReference getTax_Card_Tax_payers_address() {
1935 return (EReference)tax_CardEClass.getEStructuralFeatures().get(6); 1858 return (EReference)tax_CardEClass.getEStructuralFeatures().get(5);
1936 } 1859 }
1937 1860
1938 /** 1861 /**
@@ -1942,7 +1865,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1942 */ 1865 */
1943 @Override 1866 @Override
1944 public EAttribute getTax_Card_Jobs_Employer_SSNo() { 1867 public EAttribute getTax_Card_Jobs_Employer_SSNo() {
1945 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(7); 1868 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(6);
1946 } 1869 }
1947 1870
1948 /** 1871 /**
@@ -1952,7 +1875,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1952 */ 1875 */
1953 @Override 1876 @Override
1954 public EAttribute getTax_Card_Jobs_employers_name() { 1877 public EAttribute getTax_Card_Jobs_employers_name() {
1955 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(8); 1878 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(7);
1956 } 1879 }
1957 1880
1958 /** 1881 /**
@@ -1962,7 +1885,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1962 */ 1885 */
1963 @Override 1886 @Override
1964 public EAttribute getTax_Card_Jobs_activity_type() { 1887 public EAttribute getTax_Card_Jobs_activity_type() {
1965 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(9); 1888 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(8);
1966 } 1889 }
1967 1890
1968 /** 1891 /**
@@ -1972,7 +1895,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1972 */ 1895 */
1973 @Override 1896 @Override
1974 public EAttribute getTax_Card_Jobs_place_of_work() { 1897 public EAttribute getTax_Card_Jobs_place_of_work() {
1975 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(10); 1898 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(9);
1976 } 1899 }
1977 1900
1978 /** 1901 /**
@@ -1982,7 +1905,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1982 */ 1905 */
1983 @Override 1906 @Override
1984 public EAttribute getTax_Card_Deduction_FD_daily() { 1907 public EAttribute getTax_Card_Deduction_FD_daily() {
1985 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(11); 1908 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(10);
1986 } 1909 }
1987 1910
1988 /** 1911 /**
@@ -1992,7 +1915,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1992 */ 1915 */
1993 @Override 1916 @Override
1994 public EAttribute getTax_Card_Deduction_FD_monthly() { 1917 public EAttribute getTax_Card_Deduction_FD_monthly() {
1995 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(12); 1918 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(11);
1996 } 1919 }
1997 1920
1998 /** 1921 /**
@@ -2002,7 +1925,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2002 */ 1925 */
2003 @Override 1926 @Override
2004 public EAttribute getTax_Card_Deduction_AC_daily() { 1927 public EAttribute getTax_Card_Deduction_AC_daily() {
2005 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(13); 1928 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(12);
2006 } 1929 }
2007 1930
2008 /** 1931 /**
@@ -2012,7 +1935,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2012 */ 1935 */
2013 @Override 1936 @Override
2014 public EAttribute getTax_Card_Deduction_AC_monthly() { 1937 public EAttribute getTax_Card_Deduction_AC_monthly() {
2015 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(14); 1938 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(13);
2016 } 1939 }
2017 1940
2018 /** 1941 /**
@@ -2022,7 +1945,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2022 */ 1945 */
2023 @Override 1946 @Override
2024 public EAttribute getTax_Card_Deduction_AC_yearly() { 1947 public EAttribute getTax_Card_Deduction_AC_yearly() {
2025 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(15); 1948 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(14);
2026 } 1949 }
2027 1950
2028 /** 1951 /**
@@ -2032,7 +1955,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2032 */ 1955 */
2033 @Override 1956 @Override
2034 public EAttribute getTax_Card_Deduction_CE_daily() { 1957 public EAttribute getTax_Card_Deduction_CE_daily() {
2035 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(16); 1958 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(15);
2036 } 1959 }
2037 1960
2038 /** 1961 /**
@@ -2042,7 +1965,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2042 */ 1965 */
2043 @Override 1966 @Override
2044 public EAttribute getTax_Card_Deduction_CE_monthly() { 1967 public EAttribute getTax_Card_Deduction_CE_monthly() {
2045 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(17); 1968 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(16);
2046 } 1969 }
2047 1970
2048 /** 1971 /**
@@ -2052,7 +1975,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2052 */ 1975 */
2053 @Override 1976 @Override
2054 public EAttribute getTax_Card_Deduction_CE_yearly() { 1977 public EAttribute getTax_Card_Deduction_CE_yearly() {
2055 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(18); 1978 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(17);
2056 } 1979 }
2057 1980
2058 /** 1981 /**
@@ -2062,7 +1985,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2062 */ 1985 */
2063 @Override 1986 @Override
2064 public EAttribute getTax_Card_Deduction_DS_daily() { 1987 public EAttribute getTax_Card_Deduction_DS_daily() {
2065 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(19); 1988 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(18);
2066 } 1989 }
2067 1990
2068 /** 1991 /**
@@ -2072,7 +1995,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2072 */ 1995 */
2073 @Override 1996 @Override
2074 public EAttribute getTax_Card_Deduction_DS_monthly() { 1997 public EAttribute getTax_Card_Deduction_DS_monthly() {
2075 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(20); 1998 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(19);
2076 } 1999 }
2077 2000
2078 /** 2001 /**
@@ -2082,7 +2005,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2082 */ 2005 */
2083 @Override 2006 @Override
2084 public EAttribute getTax_Card_Deduction_FO_daily() { 2007 public EAttribute getTax_Card_Deduction_FO_daily() {
2085 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(21); 2008 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(20);
2086 } 2009 }
2087 2010
2088 /** 2011 /**
@@ -2092,7 +2015,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2092 */ 2015 */
2093 @Override 2016 @Override
2094 public EAttribute getTax_Card_Deduction_FO_monthly() { 2017 public EAttribute getTax_Card_Deduction_FO_monthly() {
2095 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(22); 2018 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(21);
2096 } 2019 }
2097 2020
2098 /** 2021 /**
@@ -2102,7 +2025,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2102 */ 2025 */
2103 @Override 2026 @Override
2104 public EAttribute getTax_Card_Deduction_FO_yearly() { 2027 public EAttribute getTax_Card_Deduction_FO_yearly() {
2105 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(23); 2028 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(22);
2106 } 2029 }
2107 2030
2108 /** 2031 /**
@@ -2112,7 +2035,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2112 */ 2035 */
2113 @Override 2036 @Override
2114 public EAttribute getTax_Card_Credit_CIS_daily() { 2037 public EAttribute getTax_Card_Credit_CIS_daily() {
2115 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(24); 2038 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(23);
2116 } 2039 }
2117 2040
2118 /** 2041 /**
@@ -2122,7 +2045,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2122 */ 2045 */
2123 @Override 2046 @Override
2124 public EAttribute getTax_Card_Credit_CIS_monthly() { 2047 public EAttribute getTax_Card_Credit_CIS_monthly() {
2125 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(25); 2048 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(24);
2126 } 2049 }
2127 2050
2128 /** 2051 /**
@@ -2132,7 +2055,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2132 */ 2055 */
2133 @Override 2056 @Override
2134 public EAttribute getTax_Card_Credit_CIM_daily() { 2057 public EAttribute getTax_Card_Credit_CIM_daily() {
2135 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(26); 2058 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(25);
2136 } 2059 }
2137 2060
2138 /** 2061 /**
@@ -2142,7 +2065,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2142 */ 2065 */
2143 @Override 2066 @Override
2144 public EAttribute getTax_Card_Validity() { 2067 public EAttribute getTax_Card_Validity() {
2145 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(27); 2068 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(26);
2146 } 2069 }
2147 2070
2148 /** 2071 /**
@@ -2152,7 +2075,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2152 */ 2075 */
2153 @Override 2076 @Override
2154 public EReference getTax_Card_Income_Tax_Credit() { 2077 public EReference getTax_Card_Income_Tax_Credit() {
2155 return (EReference)tax_CardEClass.getEStructuralFeatures().get(28); 2078 return (EReference)tax_CardEClass.getEStructuralFeatures().get(27);
2156 } 2079 }
2157 2080
2158 /** 2081 /**
@@ -2162,7 +2085,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2162 */ 2085 */
2163 @Override 2086 @Override
2164 public EReference getTax_Card_Previous() { 2087 public EReference getTax_Card_Previous() {
2165 return (EReference)tax_CardEClass.getEStructuralFeatures().get(29); 2088 return (EReference)tax_CardEClass.getEStructuralFeatures().get(28);
2166 } 2089 }
2167 2090
2168 /** 2091 /**
@@ -2172,7 +2095,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2172 */ 2095 */
2173 @Override 2096 @Override
2174 public EReference getTax_Card_Current_tax_card() { 2097 public EReference getTax_Card_Current_tax_card() {
2175 return (EReference)tax_CardEClass.getEStructuralFeatures().get(30); 2098 return (EReference)tax_CardEClass.getEStructuralFeatures().get(29);
2176 } 2099 }
2177 2100
2178 /** 2101 /**
@@ -2182,7 +2105,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2182 */ 2105 */
2183 @Override 2106 @Override
2184 public EAttribute getTax_Card_Credit_CIM_yearly() { 2107 public EAttribute getTax_Card_Credit_CIM_yearly() {
2185 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(31); 2108 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(30);
2186 } 2109 }
2187 2110
2188 /** 2111 /**
@@ -2192,7 +2115,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2192 */ 2115 */
2193 @Override 2116 @Override
2194 public EAttribute getTax_Card_Deduction_DS_Alimony_yearly() { 2117 public EAttribute getTax_Card_Deduction_DS_Alimony_yearly() {
2195 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(32); 2118 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(31);
2196 } 2119 }
2197 2120
2198 /** 2121 /**
@@ -2202,7 +2125,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2202 */ 2125 */
2203 @Override 2126 @Override
2204 public EAttribute getTax_Card_Deduction_DS_Debt_yearly() { 2127 public EAttribute getTax_Card_Deduction_DS_Debt_yearly() {
2205 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(33); 2128 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(32);
2206 } 2129 }
2207 2130
2208 /** 2131 /**
@@ -2212,7 +2135,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2212 */ 2135 */
2213 @Override 2136 @Override
2214 public EReference getTax_Card_Income() { 2137 public EReference getTax_Card_Income() {
2215 return (EReference)tax_CardEClass.getEStructuralFeatures().get(34); 2138 return (EReference)tax_CardEClass.getEStructuralFeatures().get(33);
2216 } 2139 }
2217 2140
2218 /** 2141 /**
@@ -2641,16 +2564,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2641 * @generated 2564 * @generated
2642 */ 2565 */
2643 @Override 2566 @Override
2644 public EAttribute getFD_Calculated_distance() {
2645 return (EAttribute)fdEClass.getEStructuralFeatures().get(1);
2646 }
2647
2648 /**
2649 * <!-- begin-user-doc -->
2650 * <!-- end-user-doc -->
2651 * @generated
2652 */
2653 @Override
2654 public EClass getProfessional_Expenses_Deduction() { 2567 public EClass getProfessional_Expenses_Deduction() {
2655 return professional_Expenses_DeductionEClass; 2568 return professional_Expenses_DeductionEClass;
2656 } 2569 }
@@ -2671,16 +2584,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2671 * @generated 2584 * @generated
2672 */ 2585 */
2673 @Override 2586 @Override
2674 public EAttribute getFO_Rate_type_for_FO() {
2675 return (EAttribute)foEClass.getEStructuralFeatures().get(0);
2676 }
2677
2678 /**
2679 * <!-- begin-user-doc -->
2680 * <!-- end-user-doc -->
2681 * @generated
2682 */
2683 @Override
2684 public EClass getDS_for_Permanent_Expense() { 2587 public EClass getDS_for_Permanent_Expense() {
2685 return dS_for_Permanent_ExpenseEClass; 2588 return dS_for_Permanent_ExpenseEClass;
2686 } 2589 }
@@ -2781,36 +2684,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2781 * @generated 2684 * @generated
2782 */ 2685 */
2783 @Override 2686 @Override
2784 public EAttribute getDS_for_Private_Insurance_and_Plan_Increase_for_life_insurance() {
2785 return (EAttribute)dS_for_Private_Insurance_and_PlanEClass.getEStructuralFeatures().get(1);
2786 }
2787
2788 /**
2789 * <!-- begin-user-doc -->
2790 * <!-- end-user-doc -->
2791 * @generated
2792 */
2793 @Override
2794 public EAttribute getDS_for_Private_Insurance_and_Plan_Maximum_deductible_amount_for_private_insurance() {
2795 return (EAttribute)dS_for_Private_Insurance_and_PlanEClass.getEStructuralFeatures().get(2);
2796 }
2797
2798 /**
2799 * <!-- begin-user-doc -->
2800 * <!-- end-user-doc -->
2801 * @generated
2802 */
2803 @Override
2804 public EAttribute getDS_for_Private_Insurance_and_Plan_Maximum_deductible_amount_for_old_age_pension_plan() {
2805 return (EAttribute)dS_for_Private_Insurance_and_PlanEClass.getEStructuralFeatures().get(3);
2806 }
2807
2808 /**
2809 * <!-- begin-user-doc -->
2810 * <!-- end-user-doc -->
2811 * @generated
2812 */
2813 @Override
2814 public EClass getDS_for_Loss_Carryforward() { 2687 public EClass getDS_for_Loss_Carryforward() {
2815 return dS_for_Loss_CarryforwardEClass; 2688 return dS_for_Loss_CarryforwardEClass;
2816 } 2689 }
@@ -2851,16 +2724,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2851 * @generated 2724 * @generated
2852 */ 2725 */
2853 @Override 2726 @Override
2854 public EAttribute getPermanent_Expense_Is_eligible_for_deduction() {
2855 return (EAttribute)permanent_ExpenseEClass.getEStructuralFeatures().get(1);
2856 }
2857
2858 /**
2859 * <!-- begin-user-doc -->
2860 * <!-- end-user-doc -->
2861 * @generated
2862 */
2863 @Override
2864 public EClass getSpecial_Expense_DS() { 2727 public EClass getSpecial_Expense_DS() {
2865 return special_Expense_DSEClass; 2728 return special_Expense_DSEClass;
2866 } 2729 }
@@ -2911,16 +2774,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2911 * @generated 2774 * @generated
2912 */ 2775 */
2913 @Override 2776 @Override
2914 public EAttribute getPrivate_Insurance_and_Plan_Is_private_insurance_and_plan_eligible_for_deduction() {
2915 return (EAttribute)private_Insurance_and_PlanEClass.getEStructuralFeatures().get(2);
2916 }
2917
2918 /**
2919 * <!-- begin-user-doc -->
2920 * <!-- end-user-doc -->
2921 * @generated
2922 */
2923 @Override
2924 public EClass getHealth_and_Pension_Insurance() { 2777 public EClass getHealth_and_Pension_Insurance() {
2925 return health_and_Pension_InsuranceEClass; 2778 return health_and_Pension_InsuranceEClass;
2926 } 2779 }
@@ -2971,18 +2824,8 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2971 * @generated 2824 * @generated
2972 */ 2825 */
2973 @Override 2826 @Override
2974 public EAttribute getDonation_Is_beneficiary_eligible() {
2975 return (EAttribute)donationEClass.getEStructuralFeatures().get(1);
2976 }
2977
2978 /**
2979 * <!-- begin-user-doc -->
2980 * <!-- end-user-doc -->
2981 * @generated
2982 */
2983 @Override
2984 public EAttribute getDonation_Is_donation_reported() { 2827 public EAttribute getDonation_Is_donation_reported() {
2985 return (EAttribute)donationEClass.getEStructuralFeatures().get(2); 2828 return (EAttribute)donationEClass.getEStructuralFeatures().get(1);
2986 } 2829 }
2987 2830
2988 /** 2831 /**
@@ -3001,46 +2844,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
3001 * @generated 2844 * @generated
3002 */ 2845 */
3003 @Override 2846 @Override
3004 public EAttribute getLoss_Carryforward_Regular_accountability() {
3005 return (EAttribute)loss_CarryforwardEClass.getEStructuralFeatures().get(0);
3006 }
3007
3008 /**
3009 * <!-- begin-user-doc -->
3010 * <!-- end-user-doc -->
3011 * @generated
3012 */
3013 @Override
3014 public EAttribute getLoss_Carryforward_Compensation_by_other_means() {
3015 return (EAttribute)loss_CarryforwardEClass.getEStructuralFeatures().get(1);
3016 }
3017
3018 /**
3019 * <!-- begin-user-doc -->
3020 * <!-- end-user-doc -->
3021 * @generated
3022 */
3023 @Override
3024 public EAttribute getLoss_Carryforward_Tax_payer_has_inherited_business_ownership() {
3025 return (EAttribute)loss_CarryforwardEClass.getEStructuralFeatures().get(2);
3026 }
3027
3028 /**
3029 * <!-- begin-user-doc -->
3030 * <!-- end-user-doc -->
3031 * @generated
3032 */
3033 @Override
3034 public EAttribute getLoss_Carryforward_Tax_payer_has_been_partner_in_business() {
3035 return (EAttribute)loss_CarryforwardEClass.getEStructuralFeatures().get(3);
3036 }
3037
3038 /**
3039 * <!-- begin-user-doc -->
3040 * <!-- end-user-doc -->
3041 * @generated
3042 */
3043 @Override
3044 public EClass getSpousal_Expense_AC() { 2847 public EClass getSpousal_Expense_AC() {
3045 return spousal_Expense_ACEClass; 2848 return spousal_Expense_ACEClass;
3046 } 2849 }
@@ -3141,16 +2944,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
3141 * @generated 2944 * @generated
3142 */ 2945 */
3143 @Override 2946 @Override
3144 public EEnum getTax_Card_Type() {
3145 return tax_Card_TypeEEnum;
3146 }
3147
3148 /**
3149 * <!-- begin-user-doc -->
3150 * <!-- end-user-doc -->
3151 * @generated
3152 */
3153 @Override
3154 public EEnum getTax_Office() { 2947 public EEnum getTax_Office() {
3155 return tax_OfficeEEnum; 2948 return tax_OfficeEEnum;
3156 } 2949 }
@@ -3191,16 +2984,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
3191 * @generated 2984 * @generated
3192 */ 2985 */
3193 @Override 2986 @Override
3194 public EEnum getType_of_Rate() {
3195 return type_of_RateEEnum;
3196 }
3197
3198 /**
3199 * <!-- begin-user-doc -->
3200 * <!-- end-user-doc -->
3201 * @generated
3202 */
3203 @Override
3204 public EEnum getCE_Type() { 2987 public EEnum getCE_Type() {
3205 return cE_TypeEEnum; 2988 return cE_TypeEEnum;
3206 } 2989 }
@@ -3342,16 +3125,13 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
3342 createEReference(tax_PayerEClass, TAX_PAYER__FROM_AGENT); 3125 createEReference(tax_PayerEClass, TAX_PAYER__FROM_AGENT);
3343 createEReference(tax_PayerEClass, TAX_PAYER__INCOMES); 3126 createEReference(tax_PayerEClass, TAX_PAYER__INCOMES);
3344 createEReference(tax_PayerEClass, TAX_PAYER__FROM_LAW); 3127 createEReference(tax_PayerEClass, TAX_PAYER__FROM_LAW);
3345 createEAttribute(tax_PayerEClass, TAX_PAYER__TAXES_DUE);
3346 3128
3347 physical_PersonEClass = createEClass(PHYSICAL_PERSON); 3129 physical_PersonEClass = createEClass(PHYSICAL_PERSON);
3348 createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__IS_ASSISTING_SPOUSE);
3349 createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__SS_NO); 3130 createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__SS_NO);
3350 createEReference(physical_PersonEClass, PHYSICAL_PERSON__ADDRESSES); 3131 createEReference(physical_PersonEClass, PHYSICAL_PERSON__ADDRESSES);
3351 createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__BIRTH_YEAR); 3132 createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__BIRTH_YEAR);
3352 createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__DISABILITY_PERCENTAGE); 3133 createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__DISABILITY_PERCENTAGE);
3353 createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__DISABILITY_TYPE); 3134 createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__DISABILITY_TYPE);
3354 createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY);
3355 createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__BIRTH_MONTH); 3135 createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__BIRTH_MONTH);
3356 createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__BIRTH_DAY); 3136 createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__BIRTH_DAY);
3357 createEReference(physical_PersonEClass, PHYSICAL_PERSON__EXPENSES); 3137 createEReference(physical_PersonEClass, PHYSICAL_PERSON__EXPENSES);
@@ -3384,7 +3164,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
3384 createEReference(dependentEClass, DEPENDENT__EXPENSE); 3164 createEReference(dependentEClass, DEPENDENT__EXPENSE);
3385 3165
3386 external_AllowanceEClass = createEClass(EXTERNAL_ALLOWANCE); 3166 external_AllowanceEClass = createEClass(EXTERNAL_ALLOWANCE);
3387 createEAttribute(external_AllowanceEClass, EXTERNAL_ALLOWANCE__AMOUNT);
3388 createEAttribute(external_AllowanceEClass, EXTERNAL_ALLOWANCE__GRANTOR); 3167 createEAttribute(external_AllowanceEClass, EXTERNAL_ALLOWANCE__GRANTOR);
3389 createEAttribute(external_AllowanceEClass, EXTERNAL_ALLOWANCE__STARTING_YEAR); 3168 createEAttribute(external_AllowanceEClass, EXTERNAL_ALLOWANCE__STARTING_YEAR);
3390 createEAttribute(external_AllowanceEClass, EXTERNAL_ALLOWANCE__ENDING_YEAR); 3169 createEAttribute(external_AllowanceEClass, EXTERNAL_ALLOWANCE__ENDING_YEAR);
@@ -3433,13 +3212,11 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
3433 createEReference(incomeEClass, INCOME__EXPENSES); 3212 createEReference(incomeEClass, INCOME__EXPENSES);
3434 3213
3435 income_TypeEClass = createEClass(INCOME_TYPE); 3214 income_TypeEClass = createEClass(INCOME_TYPE);
3436 createEAttribute(income_TypeEClass, INCOME_TYPE__SUBJECT_TO_WITHHOLDING_TAX);
3437 createEAttribute(income_TypeEClass, INCOME_TYPE__ID8); 3215 createEAttribute(income_TypeEClass, INCOME_TYPE__ID8);
3438 createEReference(income_TypeEClass, INCOME_TYPE__INCOME); 3216 createEReference(income_TypeEClass, INCOME_TYPE__INCOME);
3439 3217
3440 tax_CardEClass = createEClass(TAX_CARD); 3218 tax_CardEClass = createEClass(TAX_CARD);
3441 createEAttribute(tax_CardEClass, TAX_CARD__CARD_IDENTIFIER); 3219 createEAttribute(tax_CardEClass, TAX_CARD__CARD_IDENTIFIER);
3442 createEAttribute(tax_CardEClass, TAX_CARD__TAX_CARD_TYPE);
3443 createEAttribute(tax_CardEClass, TAX_CARD__TAX_OFFICE); 3220 createEAttribute(tax_CardEClass, TAX_CARD__TAX_OFFICE);
3444 createEAttribute(tax_CardEClass, TAX_CARD__PERCENTAGE_OF_WITHOLDING); 3221 createEAttribute(tax_CardEClass, TAX_CARD__PERCENTAGE_OF_WITHOLDING);
3445 createEAttribute(tax_CardEClass, TAX_CARD__TAX_PAYERS_NAME_SURNAME); 3222 createEAttribute(tax_CardEClass, TAX_CARD__TAX_PAYERS_NAME_SURNAME);
@@ -3536,12 +3313,10 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
3536 3313
3537 fdEClass = createEClass(FD); 3314 fdEClass = createEClass(FD);
3538 createEAttribute(fdEClass, FD__DISTANCE_DECLARED_IN_JANUARY); 3315 createEAttribute(fdEClass, FD__DISTANCE_DECLARED_IN_JANUARY);
3539 createEAttribute(fdEClass, FD__CALCULATED_DISTANCE);
3540 3316
3541 professional_Expenses_DeductionEClass = createEClass(PROFESSIONAL_EXPENSES_DEDUCTION); 3317 professional_Expenses_DeductionEClass = createEClass(PROFESSIONAL_EXPENSES_DEDUCTION);
3542 3318
3543 foEClass = createEClass(FO); 3319 foEClass = createEClass(FO);
3544 createEAttribute(foEClass, FO__RATE_TYPE_FOR_FO);
3545 3320
3546 dS_for_Permanent_ExpenseEClass = createEClass(DS_FOR_PERMANENT_EXPENSE); 3321 dS_for_Permanent_ExpenseEClass = createEClass(DS_FOR_PERMANENT_EXPENSE);
3547 createEAttribute(dS_for_Permanent_ExpenseEClass, DS_FOR_PERMANENT_EXPENSE__PERMANENT_EXPENSE_CATEGORY); 3322 createEAttribute(dS_for_Permanent_ExpenseEClass, DS_FOR_PERMANENT_EXPENSE__PERMANENT_EXPENSE_CATEGORY);
@@ -3557,9 +3332,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
3557 3332
3558 dS_for_Private_Insurance_and_PlanEClass = createEClass(DS_FOR_PRIVATE_INSURANCE_AND_PLAN); 3333 dS_for_Private_Insurance_and_PlanEClass = createEClass(DS_FOR_PRIVATE_INSURANCE_AND_PLAN);
3559 createEAttribute(dS_for_Private_Insurance_and_PlanEClass, DS_FOR_PRIVATE_INSURANCE_AND_PLAN__PRIVATE_INSURANCE_AND_PLAN_CATEGORY); 3334 createEAttribute(dS_for_Private_Insurance_and_PlanEClass, DS_FOR_PRIVATE_INSURANCE_AND_PLAN__PRIVATE_INSURANCE_AND_PLAN_CATEGORY);
3560 createEAttribute(dS_for_Private_Insurance_and_PlanEClass, DS_FOR_PRIVATE_INSURANCE_AND_PLAN__INCREASE_FOR_LIFE_INSURANCE);
3561 createEAttribute(dS_for_Private_Insurance_and_PlanEClass, DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_PRIVATE_INSURANCE);
3562 createEAttribute(dS_for_Private_Insurance_and_PlanEClass, DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_OLD_AGE_PENSION_PLAN);
3563 3335
3564 dS_for_Loss_CarryforwardEClass = createEClass(DS_FOR_LOSS_CARRYFORWARD); 3336 dS_for_Loss_CarryforwardEClass = createEClass(DS_FOR_LOSS_CARRYFORWARD);
3565 3337
@@ -3567,7 +3339,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
3567 3339
3568 permanent_ExpenseEClass = createEClass(PERMANENT_EXPENSE); 3340 permanent_ExpenseEClass = createEClass(PERMANENT_EXPENSE);
3569 createEAttribute(permanent_ExpenseEClass, PERMANENT_EXPENSE__CATEGORY); 3341 createEAttribute(permanent_ExpenseEClass, PERMANENT_EXPENSE__CATEGORY);
3570 createEAttribute(permanent_ExpenseEClass, PERMANENT_EXPENSE__IS_ELIGIBLE_FOR_DEDUCTION);
3571 3342
3572 special_Expense_DSEClass = createEClass(SPECIAL_EXPENSE_DS); 3343 special_Expense_DSEClass = createEClass(SPECIAL_EXPENSE_DS);
3573 3344
@@ -3576,7 +3347,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
3576 private_Insurance_and_PlanEClass = createEClass(PRIVATE_INSURANCE_AND_PLAN); 3347 private_Insurance_and_PlanEClass = createEClass(PRIVATE_INSURANCE_AND_PLAN);
3577 createEAttribute(private_Insurance_and_PlanEClass, PRIVATE_INSURANCE_AND_PLAN__CATEGORY); 3348 createEAttribute(private_Insurance_and_PlanEClass, PRIVATE_INSURANCE_AND_PLAN__CATEGORY);
3578 createEAttribute(private_Insurance_and_PlanEClass, PRIVATE_INSURANCE_AND_PLAN__DURATION_OF_CONTRACT); 3349 createEAttribute(private_Insurance_and_PlanEClass, PRIVATE_INSURANCE_AND_PLAN__DURATION_OF_CONTRACT);
3579 createEAttribute(private_Insurance_and_PlanEClass, PRIVATE_INSURANCE_AND_PLAN__IS_PRIVATE_INSURANCE_AND_PLAN_ELIGIBLE_FOR_DEDUCTION);
3580 3350
3581 health_and_Pension_InsuranceEClass = createEClass(HEALTH_AND_PENSION_INSURANCE); 3351 health_and_Pension_InsuranceEClass = createEClass(HEALTH_AND_PENSION_INSURANCE);
3582 createEAttribute(health_and_Pension_InsuranceEClass, HEALTH_AND_PENSION_INSURANCE__CATEGORY); 3352 createEAttribute(health_and_Pension_InsuranceEClass, HEALTH_AND_PENSION_INSURANCE__CATEGORY);
@@ -3584,14 +3354,9 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
3584 3354
3585 donationEClass = createEClass(DONATION); 3355 donationEClass = createEClass(DONATION);
3586 createEAttribute(donationEClass, DONATION__BENEFICIARY1); 3356 createEAttribute(donationEClass, DONATION__BENEFICIARY1);
3587 createEAttribute(donationEClass, DONATION__IS_BENEFICIARY_ELIGIBLE);
3588 createEAttribute(donationEClass, DONATION__IS_DONATION_REPORTED); 3357 createEAttribute(donationEClass, DONATION__IS_DONATION_REPORTED);
3589 3358
3590 loss_CarryforwardEClass = createEClass(LOSS_CARRYFORWARD); 3359 loss_CarryforwardEClass = createEClass(LOSS_CARRYFORWARD);
3591 createEAttribute(loss_CarryforwardEClass, LOSS_CARRYFORWARD__REGULAR_ACCOUNTABILITY);
3592 createEAttribute(loss_CarryforwardEClass, LOSS_CARRYFORWARD__COMPENSATION_BY_OTHER_MEANS);
3593 createEAttribute(loss_CarryforwardEClass, LOSS_CARRYFORWARD__TAX_PAYER_HAS_INHERITED_BUSINESS_OWNERSHIP);
3594 createEAttribute(loss_CarryforwardEClass, LOSS_CARRYFORWARD__TAX_PAYER_HAS_BEEN_PARTNER_IN_BUSINESS);
3595 3360
3596 spousal_Expense_ACEClass = createEClass(SPOUSAL_EXPENSE_AC); 3361 spousal_Expense_ACEClass = createEClass(SPOUSAL_EXPENSE_AC);
3597 3362
@@ -3609,12 +3374,10 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
3609 grantorEEnum = createEEnum(GRANTOR); 3374 grantorEEnum = createEEnum(GRANTOR);
3610 disability_TypesEEnum = createEEnum(DISABILITY_TYPES); 3375 disability_TypesEEnum = createEEnum(DISABILITY_TYPES);
3611 countryEEnum = createEEnum(COUNTRY); 3376 countryEEnum = createEEnum(COUNTRY);
3612 tax_Card_TypeEEnum = createEEnum(TAX_CARD_TYPE);
3613 tax_OfficeEEnum = createEEnum(TAX_OFFICE); 3377 tax_OfficeEEnum = createEEnum(TAX_OFFICE);
3614 tax_Class_CategoryEEnum = createEEnum(TAX_CLASS_CATEGORY); 3378 tax_Class_CategoryEEnum = createEEnum(TAX_CLASS_CATEGORY);
3615 job_ActivityEEnum = createEEnum(JOB_ACTIVITY); 3379 job_ActivityEEnum = createEEnum(JOB_ACTIVITY);
3616 townEEnum = createEEnum(TOWN); 3380 townEEnum = createEEnum(TOWN);
3617 type_of_RateEEnum = createEEnum(TYPE_OF_RATE);
3618 cE_TypeEEnum = createEEnum(CE_TYPE); 3381 cE_TypeEEnum = createEEnum(CE_TYPE);
3619 expense_PurposeEEnum = createEEnum(EXPENSE_PURPOSE); 3382 expense_PurposeEEnum = createEEnum(EXPENSE_PURPOSE);
3620 dependent_TypeEEnum = createEEnum(DEPENDENT_TYPE); 3383 dependent_TypeEEnum = createEEnum(DEPENDENT_TYPE);
@@ -3734,16 +3497,13 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
3734 initEReference(getTax_Payer_From_agent(), this.getFromAgent(), this.getFromAgent_TaxPayer(), "from_agent", null, 1, 1, Tax_Payer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 3497 initEReference(getTax_Payer_From_agent(), this.getFromAgent(), this.getFromAgent_TaxPayer(), "from_agent", null, 1, 1, Tax_Payer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
3735 initEReference(getTax_Payer_Incomes(), this.getIncome(), this.getIncome_TaxPayer(), "incomes", null, 1, -1, Tax_Payer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); 3498 initEReference(getTax_Payer_Incomes(), this.getIncome(), this.getIncome_TaxPayer(), "incomes", null, 1, -1, Tax_Payer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
3736 initEReference(getTax_Payer_From_law(), this.getFromLaw(), this.getFromLaw_TaxPayer(), "from_law", null, 1, 1, Tax_Payer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 3499 initEReference(getTax_Payer_From_law(), this.getFromLaw(), this.getFromLaw_TaxPayer(), "from_law", null, 1, 1, Tax_Payer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
3737 initEAttribute(getTax_Payer_TaxesDue(), ecorePackage.getEDouble(), "taxesDue", null, 1, 1, Tax_Payer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
3738 3500
3739 initEClass(physical_PersonEClass, Physical_Person.class, "Physical_Person", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 3501 initEClass(physical_PersonEClass, Physical_Person.class, "Physical_Person", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
3740 initEAttribute(getPhysical_Person_Is_assisting_spouse(), ecorePackage.getEBoolean(), "is_assisting_spouse", null, 1, 1, Physical_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
3741 initEAttribute(getPhysical_Person_SSNo(), ecorePackage.getEString(), "SSNo", null, 1, 1, Physical_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 3502 initEAttribute(getPhysical_Person_SSNo(), ecorePackage.getEString(), "SSNo", null, 1, 1, Physical_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
3742 initEReference(getPhysical_Person_Addresses(), this.getAddress(), this.getAddress_TaxPayer(), "addresses", null, 0, -1, Physical_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); 3503 initEReference(getPhysical_Person_Addresses(), this.getAddress(), this.getAddress_TaxPayer(), "addresses", null, 0, -1, Physical_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
3743 initEAttribute(getPhysical_Person_Birth_year(), ecorePackage.getEInt(), "birth_year", null, 1, 1, Physical_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); 3504 initEAttribute(getPhysical_Person_Birth_year(), ecorePackage.getEInt(), "birth_year", null, 1, 1, Physical_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
3744 initEAttribute(getPhysical_Person_Disability_percentage(), ecorePackage.getEDouble(), "disability_percentage", null, 1, 1, Physical_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); 3505 initEAttribute(getPhysical_Person_Disability_percentage(), ecorePackage.getEDouble(), "disability_percentage", null, 1, 1, Physical_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
3745 initEAttribute(getPhysical_Person_Disability_type(), this.getDisability_Types(), "disability_type", null, 1, 1, Physical_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); 3506 initEAttribute(getPhysical_Person_Disability_type(), this.getDisability_Types(), "disability_type", null, 1, 1, Physical_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
3746 initEAttribute(getPhysical_Person_Is_affiliated_personnaly_to_social_security(), ecorePackage.getEBoolean(), "is_affiliated_personnaly_to_social_security", null, 1, 1, Physical_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
3747 initEAttribute(getPhysical_Person_Birth_month(), ecorePackage.getEInt(), "birth_month", null, 1, 1, Physical_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); 3507 initEAttribute(getPhysical_Person_Birth_month(), ecorePackage.getEInt(), "birth_month", null, 1, 1, Physical_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
3748 initEAttribute(getPhysical_Person_Birth_day(), ecorePackage.getEInt(), "birth_day", null, 1, 1, Physical_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); 3508 initEAttribute(getPhysical_Person_Birth_day(), ecorePackage.getEInt(), "birth_day", null, 1, 1, Physical_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
3749 initEReference(getPhysical_Person_Expenses(), this.getExpense(), this.getExpense_Beneficiary(), "expenses", null, 0, -1, Physical_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); 3509 initEReference(getPhysical_Person_Expenses(), this.getExpense(), this.getExpense_Beneficiary(), "expenses", null, 0, -1, Physical_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
@@ -3776,7 +3536,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
3776 initEReference(getDependent_Expense(), this.getExpense(), this.getExpense_Dependent(), "expense", null, 0, -1, Dependent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); 3536 initEReference(getDependent_Expense(), this.getExpense(), this.getExpense_Dependent(), "expense", null, 0, -1, Dependent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
3777 3537
3778 initEClass(external_AllowanceEClass, External_Allowance.class, "External_Allowance", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 3538 initEClass(external_AllowanceEClass, External_Allowance.class, "External_Allowance", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
3779 initEAttribute(getExternal_Allowance_Amount(), ecorePackage.getEDouble(), "amount", null, 1, 1, External_Allowance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
3780 initEAttribute(getExternal_Allowance_Grantor(), this.getGrantor(), "grantor", null, 1, 1, External_Allowance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 3539 initEAttribute(getExternal_Allowance_Grantor(), this.getGrantor(), "grantor", null, 1, 1, External_Allowance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
3781 initEAttribute(getExternal_Allowance_Starting_year(), ecorePackage.getEInt(), "starting_year", null, 1, 1, External_Allowance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); 3540 initEAttribute(getExternal_Allowance_Starting_year(), ecorePackage.getEInt(), "starting_year", null, 1, 1, External_Allowance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
3782 initEAttribute(getExternal_Allowance_Ending_year(), ecorePackage.getEInt(), "ending_year", null, 1, 1, External_Allowance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); 3541 initEAttribute(getExternal_Allowance_Ending_year(), ecorePackage.getEInt(), "ending_year", null, 1, 1, External_Allowance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
@@ -3825,13 +3584,11 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
3825 initEReference(getIncome_Expenses(), this.getExpense(), this.getExpense_Income(), "expenses", null, 0, -1, Income.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); 3584 initEReference(getIncome_Expenses(), this.getExpense(), this.getExpense_Income(), "expenses", null, 0, -1, Income.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
3826 3585
3827 initEClass(income_TypeEClass, Income_Type.class, "Income_Type", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 3586 initEClass(income_TypeEClass, Income_Type.class, "Income_Type", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
3828 initEAttribute(getIncome_Type_SubjectToWithholdingTax(), ecorePackage.getEBoolean(), "subjectToWithholdingTax", null, 1, 1, Income_Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
3829 initEAttribute(getIncome_Type_Id8(), ecorePackage.getEString(), "id8", null, 1, 1, Income_Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); 3587 initEAttribute(getIncome_Type_Id8(), ecorePackage.getEString(), "id8", null, 1, 1, Income_Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
3830 initEReference(getIncome_Type_Income(), this.getIncome(), this.getIncome_Income_type(), "income", null, 1, 1, Income_Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 3588 initEReference(getIncome_Type_Income(), this.getIncome(), this.getIncome_Income_type(), "income", null, 1, 1, Income_Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
3831 3589
3832 initEClass(tax_CardEClass, Tax_Card.class, "Tax_Card", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 3590 initEClass(tax_CardEClass, Tax_Card.class, "Tax_Card", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
3833 initEAttribute(getTax_Card_Card_identifier(), ecorePackage.getEString(), "card_identifier", null, 0, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 3591 initEAttribute(getTax_Card_Card_identifier(), ecorePackage.getEString(), "card_identifier", null, 0, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
3834 initEAttribute(getTax_Card_Tax_card_type(), this.getTax_Card_Type(), "tax_card_type", null, 1, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
3835 initEAttribute(getTax_Card_Tax_office(), this.getTax_Office(), "tax_office", null, 1, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 3592 initEAttribute(getTax_Card_Tax_office(), this.getTax_Office(), "tax_office", null, 1, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
3836 initEAttribute(getTax_Card_Percentage_of_witholding(), ecorePackage.getEDouble(), "percentage_of_witholding", null, 1, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 3593 initEAttribute(getTax_Card_Percentage_of_witholding(), ecorePackage.getEDouble(), "percentage_of_witholding", null, 1, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
3837 initEAttribute(getTax_Card_Tax_payers_name_surname(), ecorePackage.getEString(), "tax_payers_name_surname", null, 0, -1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); 3594 initEAttribute(getTax_Card_Tax_payers_name_surname(), ecorePackage.getEString(), "tax_payers_name_surname", null, 0, -1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
@@ -3928,12 +3685,10 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
3928 3685
3929 initEClass(fdEClass, Taxation.FD.class, "FD", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 3686 initEClass(fdEClass, Taxation.FD.class, "FD", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
3930 initEAttribute(getFD_Distance_declared_in_january(), ecorePackage.getEDouble(), "distance_declared_in_january", null, 1, 1, Taxation.FD.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 3687 initEAttribute(getFD_Distance_declared_in_january(), ecorePackage.getEDouble(), "distance_declared_in_january", null, 1, 1, Taxation.FD.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
3931 initEAttribute(getFD_Calculated_distance(), ecorePackage.getEDouble(), "calculated_distance", null, 1, 1, Taxation.FD.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
3932 3688
3933 initEClass(professional_Expenses_DeductionEClass, Professional_Expenses_Deduction.class, "Professional_Expenses_Deduction", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 3689 initEClass(professional_Expenses_DeductionEClass, Professional_Expenses_Deduction.class, "Professional_Expenses_Deduction", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
3934 3690
3935 initEClass(foEClass, Taxation.FO.class, "FO", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 3691 initEClass(foEClass, Taxation.FO.class, "FO", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
3936 initEAttribute(getFO_Rate_type_for_FO(), this.getType_of_Rate(), "rate_type_for_FO", null, 1, 1, Taxation.FO.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
3937 3692
3938 initEClass(dS_for_Permanent_ExpenseEClass, DS_for_Permanent_Expense.class, "DS_for_Permanent_Expense", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 3693 initEClass(dS_for_Permanent_ExpenseEClass, DS_for_Permanent_Expense.class, "DS_for_Permanent_Expense", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
3939 initEAttribute(getDS_for_Permanent_Expense_Permanent_expense_category(), this.getCategory_of_Permanent_Expense(), "permanent_expense_category", null, 1, 1, DS_for_Permanent_Expense.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 3694 initEAttribute(getDS_for_Permanent_Expense_Permanent_expense_category(), this.getCategory_of_Permanent_Expense(), "permanent_expense_category", null, 1, 1, DS_for_Permanent_Expense.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -3949,9 +3704,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
3949 3704
3950 initEClass(dS_for_Private_Insurance_and_PlanEClass, DS_for_Private_Insurance_and_Plan.class, "DS_for_Private_Insurance_and_Plan", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 3705 initEClass(dS_for_Private_Insurance_and_PlanEClass, DS_for_Private_Insurance_and_Plan.class, "DS_for_Private_Insurance_and_Plan", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
3951 initEAttribute(getDS_for_Private_Insurance_and_Plan_Private_insurance_and_plan_category(), this.getCategory_of_Private_Insurance_and_Plan(), "private_insurance_and_plan_category", null, 1, 1, DS_for_Private_Insurance_and_Plan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 3706 initEAttribute(getDS_for_Private_Insurance_and_Plan_Private_insurance_and_plan_category(), this.getCategory_of_Private_Insurance_and_Plan(), "private_insurance_and_plan_category", null, 1, 1, DS_for_Private_Insurance_and_Plan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
3952 initEAttribute(getDS_for_Private_Insurance_and_Plan_Increase_for_life_insurance(), ecorePackage.getEDouble(), "increase_for_life_insurance", null, 1, 1, DS_for_Private_Insurance_and_Plan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
3953 initEAttribute(getDS_for_Private_Insurance_and_Plan_Maximum_deductible_amount_for_private_insurance(), ecorePackage.getEDouble(), "maximum_deductible_amount_for_private_insurance", null, 1, 1, DS_for_Private_Insurance_and_Plan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
3954 initEAttribute(getDS_for_Private_Insurance_and_Plan_Maximum_deductible_amount_for_old_age_pension_plan(), ecorePackage.getEDouble(), "maximum_deductible_amount_for_old_age_pension_plan", null, 1, 1, DS_for_Private_Insurance_and_Plan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
3955 3707
3956 initEClass(dS_for_Loss_CarryforwardEClass, DS_for_Loss_Carryforward.class, "DS_for_Loss_Carryforward", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 3708 initEClass(dS_for_Loss_CarryforwardEClass, DS_for_Loss_Carryforward.class, "DS_for_Loss_Carryforward", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
3957 3709
@@ -3959,7 +3711,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
3959 3711
3960 initEClass(permanent_ExpenseEClass, Permanent_Expense.class, "Permanent_Expense", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 3712 initEClass(permanent_ExpenseEClass, Permanent_Expense.class, "Permanent_Expense", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
3961 initEAttribute(getPermanent_Expense_Category(), this.getCategory_of_Permanent_Expense(), "category", null, 1, 1, Permanent_Expense.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 3713 initEAttribute(getPermanent_Expense_Category(), this.getCategory_of_Permanent_Expense(), "category", null, 1, 1, Permanent_Expense.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
3962 initEAttribute(getPermanent_Expense_Is_eligible_for_deduction(), ecorePackage.getEBoolean(), "is_eligible_for_deduction", "false", 1, 1, Permanent_Expense.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
3963 3714
3964 initEClass(special_Expense_DSEClass, Special_Expense_DS.class, "Special_Expense_DS", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 3715 initEClass(special_Expense_DSEClass, Special_Expense_DS.class, "Special_Expense_DS", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
3965 3716
@@ -3968,7 +3719,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
3968 initEClass(private_Insurance_and_PlanEClass, Private_Insurance_and_Plan.class, "Private_Insurance_and_Plan", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 3719 initEClass(private_Insurance_and_PlanEClass, Private_Insurance_and_Plan.class, "Private_Insurance_and_Plan", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
3969 initEAttribute(getPrivate_Insurance_and_Plan_Category(), this.getCategory_of_Private_Insurance_and_Plan(), "category", null, 1, 1, Private_Insurance_and_Plan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 3720 initEAttribute(getPrivate_Insurance_and_Plan_Category(), this.getCategory_of_Private_Insurance_and_Plan(), "category", null, 1, 1, Private_Insurance_and_Plan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
3970 initEAttribute(getPrivate_Insurance_and_Plan_Duration_of_contract(), ecorePackage.getEInt(), "duration_of_contract", null, 1, 1, Private_Insurance_and_Plan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 3721 initEAttribute(getPrivate_Insurance_and_Plan_Duration_of_contract(), ecorePackage.getEInt(), "duration_of_contract", null, 1, 1, Private_Insurance_and_Plan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
3971 initEAttribute(getPrivate_Insurance_and_Plan_Is_private_insurance_and_plan_eligible_for_deduction(), ecorePackage.getEBoolean(), "is_private_insurance_and_plan_eligible_for_deduction", "false", 1, 1, Private_Insurance_and_Plan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
3972 3722
3973 initEClass(health_and_Pension_InsuranceEClass, Health_and_Pension_Insurance.class, "Health_and_Pension_Insurance", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 3723 initEClass(health_and_Pension_InsuranceEClass, Health_and_Pension_Insurance.class, "Health_and_Pension_Insurance", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
3974 initEAttribute(getHealth_and_Pension_Insurance_Category(), this.getCategory_of_Health_and_Pension_Insurances(), "category", null, 1, 1, Health_and_Pension_Insurance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 3724 initEAttribute(getHealth_and_Pension_Insurance_Category(), this.getCategory_of_Health_and_Pension_Insurances(), "category", null, 1, 1, Health_and_Pension_Insurance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -3976,14 +3726,9 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
3976 3726
3977 initEClass(donationEClass, Donation.class, "Donation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 3727 initEClass(donationEClass, Donation.class, "Donation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
3978 initEAttribute(getDonation_Beneficiary1(), ecorePackage.getEString(), "beneficiary1", null, 1, 1, Donation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 3728 initEAttribute(getDonation_Beneficiary1(), ecorePackage.getEString(), "beneficiary1", null, 1, 1, Donation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
3979 initEAttribute(getDonation_Is_beneficiary_eligible(), ecorePackage.getEBoolean(), "is_beneficiary_eligible", "false", 1, 1, Donation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
3980 initEAttribute(getDonation_Is_donation_reported(), ecorePackage.getEBoolean(), "is_donation_reported", null, 1, 1, Donation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 3729 initEAttribute(getDonation_Is_donation_reported(), ecorePackage.getEBoolean(), "is_donation_reported", null, 1, 1, Donation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
3981 3730
3982 initEClass(loss_CarryforwardEClass, Loss_Carryforward.class, "Loss_Carryforward", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 3731 initEClass(loss_CarryforwardEClass, Loss_Carryforward.class, "Loss_Carryforward", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
3983 initEAttribute(getLoss_Carryforward_Regular_accountability(), ecorePackage.getEBoolean(), "regular_accountability", null, 1, 1, Loss_Carryforward.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
3984 initEAttribute(getLoss_Carryforward_Compensation_by_other_means(), ecorePackage.getEBoolean(), "compensation_by_other_means", null, 1, 1, Loss_Carryforward.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
3985 initEAttribute(getLoss_Carryforward_Tax_payer_has_inherited_business_ownership(), ecorePackage.getEBoolean(), "tax_payer_has_inherited_business_ownership", "false", 1, 1, Loss_Carryforward.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
3986 initEAttribute(getLoss_Carryforward_Tax_payer_has_been_partner_in_business(), ecorePackage.getEBoolean(), "tax_payer_has_been_partner_in_business", "true", 1, 1, Loss_Carryforward.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
3987 3732
3988 initEClass(spousal_Expense_ACEClass, Spousal_Expense_AC.class, "Spousal_Expense_AC", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 3733 initEClass(spousal_Expense_ACEClass, Spousal_Expense_AC.class, "Spousal_Expense_AC", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
3989 3734
@@ -4024,10 +3769,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
4024 addEEnumLiteral(countryEEnum, Country.NN); 3769 addEEnumLiteral(countryEEnum, Country.NN);
4025 addEEnumLiteral(countryEEnum, Country.OTHER); 3770 addEEnumLiteral(countryEEnum, Country.OTHER);
4026 3771
4027 initEEnum(tax_Card_TypeEEnum, Tax_Card_Type.class, "Tax_Card_Type");
4028 addEEnumLiteral(tax_Card_TypeEEnum, Tax_Card_Type.PRINCIPAL);
4029 addEEnumLiteral(tax_Card_TypeEEnum, Tax_Card_Type.ADDITIONAL);
4030
4031 initEEnum(tax_OfficeEEnum, Tax_Office.class, "Tax_Office"); 3772 initEEnum(tax_OfficeEEnum, Tax_Office.class, "Tax_Office");
4032 addEEnumLiteral(tax_OfficeEEnum, Tax_Office.RTS_2); 3773 addEEnumLiteral(tax_OfficeEEnum, Tax_Office.RTS_2);
4033 addEEnumLiteral(tax_OfficeEEnum, Tax_Office.RTS_3); 3774 addEEnumLiteral(tax_OfficeEEnum, Tax_Office.RTS_3);
@@ -4051,10 +3792,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
4051 addEEnumLiteral(townEEnum, Town.TT); 3792 addEEnumLiteral(townEEnum, Town.TT);
4052 addEEnumLiteral(townEEnum, Town.OTHER); 3793 addEEnumLiteral(townEEnum, Town.OTHER);
4053 3794
4054 initEEnum(type_of_RateEEnum, Type_of_Rate.class, "Type_of_Rate");
4055 addEEnumLiteral(type_of_RateEEnum, Type_of_Rate.REGULAR);
4056 addEEnumLiteral(type_of_RateEEnum, Type_of_Rate.REAL_COST);
4057
4058 initEEnum(cE_TypeEEnum, CE_Type.class, "CE_Type"); 3795 initEEnum(cE_TypeEEnum, CE_Type.class, "CE_Type");
4059 addEEnumLiteral(cE_TypeEEnum, CE_Type.INALIDITY_AND_INFIRMITY); 3796 addEEnumLiteral(cE_TypeEEnum, CE_Type.INALIDITY_AND_INFIRMITY);
4060 addEEnumLiteral(cE_TypeEEnum, CE_Type.DEPENDENCE_AND_CARE_EXCLUDING_CHLIDREN_NOT_PART_OF_HOUSEHOLD); 3797 addEEnumLiteral(cE_TypeEEnum, CE_Type.DEPENDENCE_AND_CARE_EXCLUDING_CHLIDREN_NOT_PART_OF_HOUSEHOLD);
@@ -4183,18 +3920,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
4183 new String[] { 3920 new String[] {
4184 "derivation", "let non_null_amounts:OrderedSet(Income_Detail)=self.details->select(det:Income_Detail|det.amount>0)->asOrderedSet() in\nnon_null_amounts->collect(amount)->min()" 3921 "derivation", "let non_null_amounts:OrderedSet(Income_Detail)=self.details->select(det:Income_Detail|det.amount>0)->asOrderedSet() in\nnon_null_amounts->collect(amount)->min()"
4185 }); 3922 });
4186 addAnnotation
4187 (getIncome_Type_SubjectToWithholdingTax(),
4188 source,
4189 new String[] {
4190 "derivation", "\n\t\t\t\tself.income.tax_card->notEmpty()\n\t\t\t\t"
4191 });
4192 addAnnotation
4193 (getTax_Card_Tax_card_type(),
4194 source,
4195 new String[] {
4196 "derivation", "if(self.income.taxPayer.incomes->size()=1) then \nTax_Card_Type::Principal\n\telse\n\t\tlet all_incomes:OrderedSet(Income)=self.income.taxPayer.incomes->select(inc:Income| inc.income_amount= self.income.taxPayer.incomes.income_amount->max())->asOrderedSet() in\n\t\tlet bigest_income:Income= all_incomes->first() in\n\t\t\t if(bigest_income=self.income) then\n\t\t\t \t Tax_Card_Type::Principal\n\t\t\t else\n\t\t\t\t\tTax_Card_Type::Additional\n\t\t\t\tendif\nendif\n\t\t\t\t"
4197 });
4198 } 3923 }
4199 3924
4200} //TaxationPackageImpl 3925} //TaxationPackageImpl
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-03 13:41:16 +0000