From 68a0667e862f0714410aafbb499a95a03f5bee23 Mon Sep 17 00:00:00 2001
From: ArenBabikian <aren.babikian@mail.mcgill.ca>
Date: Tue, 28 Apr 2020 00:29:00 -0400
Subject: Able to run Pledge Case Study

---
 .../case.study.pledge.model/model/Taxation.aird    | 63 +---------------------
 .../case.study.pledge.model/model/Taxation.ecore   | 10 ----
 .../model/Taxation.genmodel                        |  7 +--
 3 files changed, 2 insertions(+), 78 deletions(-)

(limited to 'Tests/MODELS2020-CaseStudies/case.study.pledge.model/model')

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 6e583e0f..09539720 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/model/Taxation.aird
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/model/Taxation.aird
@@ -2,10 +2,9 @@
 <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/style">
   <viewpoint:DAnalysis uid="_XxmRwGDAEeq8BovXV4ESzw" selectedViews="_YbwCAGDAEeq8BovXV4ESzw _YcJDkGDAEeq8BovXV4ESzw _YcK4wGDAEeq8BovXV4ESzw _YdwNIGDAEeq8BovXV4ESzw" version="14.3.0.201909031200">
     <semanticResources>Taxation.ecore</semanticResources>
-    <semanticResources>Taxation.genmodel</semanticResources>
     <ownedViews xmi:type="viewpoint:DView" uid="_YbwCAGDAEeq8BovXV4ESzw">
       <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/>
-      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_ZFSuQGDAEeq8BovXV4ESzw" name="Taxation class diagram" repPath="#_ZDuoAGDAEeq8BovXV4ESzw" changeId="02ad4336-9a13-4a8a-8fbe-8fb518194552">
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_ZFSuQGDAEeq8BovXV4ESzw" name="Taxation class diagram" repPath="#_ZDuoAGDAEeq8BovXV4ESzw" changeId="ff33d3ca-d0f2-4f53-b58f-288212de0dfe">
         <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
         <target xmi:type="ecore:EPackage" href="Taxation.ecore#/"/>
       </ownedRepresentationDescriptors>
@@ -820,18 +819,6 @@
               <styles xmi:type="notation:FontStyle" xmi:id="_acACgWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/>
               <layoutConstraint xmi:type="notation:Location" xmi:id="_acACgmDAEeq8BovXV4ESzw"/>
             </children>
-            <children xmi:type="notation:Node" xmi:id="_acApkGDAEeq8BovXV4ESzw" type="3010" element="_aPURYWDAEeq8BovXV4ESzw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_acApkWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_acApkmDAEeq8BovXV4ESzw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_acBQoGDAEeq8BovXV4ESzw" type="3010" element="_aPVfgGDAEeq8BovXV4ESzw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_acBQoWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_acBQomDAEeq8BovXV4ESzw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_acBQo2DAEeq8BovXV4ESzw" type="3010" element="_aPVfgmDAEeq8BovXV4ESzw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_acBQpGDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_acBQpWDAEeq8BovXV4ESzw"/>
-            </children>
             <children xmi:type="notation:Node" xmi:id="_acB3sGDAEeq8BovXV4ESzw" type="3010" element="_aPWGkWDAEeq8BovXV4ESzw">
               <styles xmi:type="notation:FontStyle" xmi:id="_acB3sWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/>
               <layoutConstraint xmi:type="notation:Location" xmi:id="_acB3smDAEeq8BovXV4ESzw"/>
@@ -878,14 +865,6 @@
               <styles xmi:type="notation:FontStyle" xmi:id="_acE7BGDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/>
               <layoutConstraint xmi:type="notation:Location" xmi:id="_acE7BWDAEeq8BovXV4ESzw"/>
             </children>
-            <children xmi:type="notation:Node" xmi:id="_acFiEGDAEeq8BovXV4ESzw" type="3010" element="_aUAkIGDAEeq8BovXV4ESzw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_acFiEWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_acFiEmDAEeq8BovXV4ESzw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_acFiE2DAEeq8BovXV4ESzw" type="3010" element="_aUBLMGDAEeq8BovXV4ESzw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_acFiFGDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_acFiFWDAEeq8BovXV4ESzw"/>
-            </children>
             <children xmi:type="notation:Node" xmi:id="_acGJIGDAEeq8BovXV4ESzw" type="3010" element="_aUByQGDAEeq8BovXV4ESzw">
               <styles xmi:type="notation:FontStyle" xmi:id="_acGJIWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/>
               <layoutConstraint xmi:type="notation:Location" xmi:id="_acGJImDAEeq8BovXV4ESzw"/>
@@ -3891,30 +3870,6 @@
         </ownedStyle>
         <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']"/>
       </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_aPURYWDAEeq8BovXV4ESzw" name="start_date_within_taxation_year : EDate" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//Income/start_date_within_taxation_year"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//Income/start_date_within_taxation_year"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_aPU4cGDAEeq8BovXV4ESzw" labelAlignment="LEFT" description="_aLikoGDAEeq8BovXV4ESzw">
-          <labelFormat>bold</labelFormat>
-        </ownedStyle>
-        <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']"/>
-      </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_aPVfgGDAEeq8BovXV4ESzw" name="start_date_of_contract : EDate" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//Income/start_date_of_contract"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//Income/start_date_of_contract"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_aPVfgWDAEeq8BovXV4ESzw" labelAlignment="LEFT" description="_aLikoGDAEeq8BovXV4ESzw">
-          <labelFormat>bold</labelFormat>
-        </ownedStyle>
-        <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']"/>
-      </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_aPVfgmDAEeq8BovXV4ESzw" name="end_date_within_taxation_year : EDate" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//Income/end_date_within_taxation_year"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//Income/end_date_within_taxation_year"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_aPWGkGDAEeq8BovXV4ESzw" labelAlignment="LEFT" description="_aLikoGDAEeq8BovXV4ESzw">
-          <labelFormat>bold</labelFormat>
-        </ownedStyle>
-        <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']"/>
-      </ownedElements>
       <ownedElements xmi:type="diagram:DNodeListElement" uid="_aPWGkWDAEeq8BovXV4ESzw" name="tax_liability : EDouble = 0.0" tooltipText="">
         <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//Income/tax_liability"/>
         <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//Income/tax_liability"/>
@@ -3988,22 +3943,6 @@
         </ownedStyle>
         <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']"/>
       </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_aUAkIGDAEeq8BovXV4ESzw" name="valid_from_date : EDate" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//Tax_Card/valid_from_date"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//Tax_Card/valid_from_date"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_aUAkIWDAEeq8BovXV4ESzw" labelAlignment="LEFT" description="_aLikoGDAEeq8BovXV4ESzw">
-          <labelFormat>bold</labelFormat>
-        </ownedStyle>
-        <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']"/>
-      </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_aUBLMGDAEeq8BovXV4ESzw" name="valid_until_date : EDate" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//Tax_Card/valid_until_date"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//Tax_Card/valid_until_date"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_aUBLMWDAEeq8BovXV4ESzw" labelAlignment="LEFT" description="_aLikoGDAEeq8BovXV4ESzw">
-          <labelFormat>bold</labelFormat>
-        </ownedStyle>
-        <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']"/>
-      </ownedElements>
       <ownedElements xmi:type="diagram:DNodeListElement" uid="_aUByQGDAEeq8BovXV4ESzw" name="percentage_of_witholding : EDouble = 0.0" tooltipText="">
         <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//Tax_Card/percentage_of_witholding"/>
         <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//Tax_Card/percentage_of_witholding"/>
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 a1b9acd5..cfed4729 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/model/Taxation.ecore
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/model/Taxation.ecore
@@ -335,12 +335,6 @@
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="income_type" lowerBound="1"
         eType="#//Income_Type" containment="true" eOpposite="#//Income_Type/income"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="start_date_within_taxation_year"
-        ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="start_date_of_contract"
-        ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="end_date_within_taxation_year"
-        ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="tax_card" eType="#//Tax_Card"
         containment="true" eOpposite="#//Tax_Card/income"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="tax_liability" lowerBound="1"
@@ -378,10 +372,6 @@
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="tax_office" lowerBound="1"
         eType="#//Tax_Office"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="valid_from_date" ordered="false"
-        unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="valid_until_date" ordered="false"
-        unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="percentage_of_witholding"
         lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="tax_payers_name_surname"
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 0b8ab072..1a18d8b6 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/model/Taxation.genmodel
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/model/Taxation.genmodel
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/case.study.a.model/src" modelPluginID="case.study.a.model"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/case.study.pledge.model/src" modelPluginID="case.study.pledge.model"
     modelName="Taxation" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"
     operationReflection="true" importOrganizing="true">
@@ -230,9 +230,6 @@
     <genClasses image="false" ecoreClass="Taxation.ecore#//Income">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Income/income_amount"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Taxation.ecore#//Income/income_type"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Income/start_date_within_taxation_year"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Income/start_date_of_contract"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Income/end_date_within_taxation_year"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Taxation.ecore#//Income/tax_card"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Income/tax_liability"/>
       <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference Taxation.ecore#//Income/taxPayer"/>
@@ -249,8 +246,6 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Tax_Card/card_identifier"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Tax_Card/tax_card_type"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Tax_Card/tax_office"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Tax_Card/valid_from_date"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Tax_Card/valid_until_date"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Tax_Card/percentage_of_witholding"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Tax_Card/tax_payers_name_surname"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Tax_Card/tax_payers_partner_name_surname"/>
-- 
cgit v1.2.3-54-g00ecf