From 750b37401bc3eb3e9deb7126d90f871973ba477b Mon Sep 17 00:00:00 2001
From: ArenBabikian
Date: Mon, 11 May 2020 10:06:57 -0400
Subject: Remove derived features from the PLEDGE MM
---
.../case.study.pledge.model/model/Taxation.aird | 438 +++--------
.../case.study.pledge.model/model/Taxation.ecore | 70 +-
.../model/Taxation.genmodel | 32 +-
.../DS_for_Private_Insurance_and_Plan.java | 69 --
.../src/Taxation/Donation.java | 24 -
.../src/Taxation/External_Allowance.java | 23 -
.../case.study.pledge.model/src/Taxation/FD.java | 23 -
.../case.study.pledge.model/src/Taxation/FO.java | 30 -
.../src/Taxation/Income_Type.java | 24 -
.../src/Taxation/Loss_Carryforward.java | 98 ---
.../src/Taxation/Permanent_Expense.java | 24 -
.../src/Taxation/Physical_Person.java | 46 --
.../src/Taxation/Private_Insurance_and_Plan.java | 24 -
.../src/Taxation/Tax_Card.java | 27 -
.../src/Taxation/Tax_Payer.java | 23 -
.../src/Taxation/TaxationPackage.java | 858 ++-------------------
.../DS_for_Private_Insurance_and_PlanImpl.java | 168 ----
.../src/Taxation/impl/DonationImpl.java | 56 --
.../src/Taxation/impl/External_AllowanceImpl.java | 58 +-
.../src/Taxation/impl/FDImpl.java | 56 --
.../src/Taxation/impl/FOImpl.java | 129 ----
.../src/Taxation/impl/Income_TypeImpl.java | 58 +-
.../src/Taxation/impl/Loss_CarryforwardImpl.java | 296 -------
.../src/Taxation/impl/Permanent_ExpenseImpl.java | 56 --
.../src/Taxation/impl/Physical_PersonImpl.java | 114 +--
.../impl/Private_Insurance_and_PlanImpl.java | 56 --
.../src/Taxation/impl/Tax_CardImpl.java | 57 --
.../src/Taxation/impl/Tax_PayerImpl.java | 70 --
.../src/Taxation/impl/TaxationFactoryImpl.java | 48 --
.../src/Taxation/impl/TaxationPackageImpl.java | 377 ++-------
30 files changed, 239 insertions(+), 3193 deletions(-)
(limited to 'Tests/MODELS2020-CaseStudies')
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 @@
Taxation.ecore
-
+
@@ -28,12 +28,6 @@
-
-
- bold
-
-
-
@@ -129,7 +123,7 @@
-
+
@@ -238,7 +232,7 @@
-
+
@@ -279,7 +273,7 @@
-
+
@@ -312,24 +306,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -354,7 +331,7 @@
-
+
@@ -375,7 +352,7 @@
-
+
@@ -396,7 +373,7 @@
-
+
@@ -425,24 +402,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -463,7 +423,7 @@
-
+
@@ -496,7 +456,7 @@
-
+
@@ -525,7 +485,7 @@
-
+
@@ -551,10 +511,6 @@
-
-
-
-
@@ -564,10 +520,6 @@
-
-
-
-
@@ -584,10 +536,6 @@
-
-
-
-
@@ -676,10 +624,6 @@
-
-
-
-
@@ -767,7 +711,7 @@
-
+
@@ -836,10 +780,6 @@
-
-
-
-
@@ -857,10 +797,6 @@
-
-
-
-
@@ -1230,15 +1166,11 @@
-
-
-
-
-
+
@@ -1247,20 +1179,16 @@
-
+
-
-
-
-
-
+
@@ -1273,7 +1201,7 @@
-
+
@@ -1290,7 +1218,7 @@
-
+
@@ -1307,7 +1235,7 @@
-
+
@@ -1316,7 +1244,7 @@
-
+
@@ -1329,7 +1257,7 @@
-
+
@@ -1350,7 +1278,7 @@
-
+
@@ -1359,23 +1287,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -1404,7 +1320,7 @@
-
+
@@ -1413,7 +1329,7 @@
-
+
@@ -1422,7 +1338,7 @@
-
+
@@ -1431,10 +1347,6 @@
-
-
-
-
@@ -1470,10 +1382,6 @@
-
-
-
-
@@ -1504,10 +1412,6 @@
-
-
-
-
@@ -1521,22 +1425,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1615,7 +1503,7 @@
-
+
@@ -2679,6 +2567,9 @@
+ KEEP_LOCATION
+ KEEP_SIZE
+ KEEP_RATIO
@@ -2735,6 +2626,9 @@
+ KEEP_LOCATION
+ KEEP_SIZE
+ KEEP_RATIO
italic
@@ -2944,6 +2838,9 @@
+ KEEP_LOCATION
+ KEEP_SIZE
+ KEEP_RATIO
@@ -3016,6 +2913,9 @@
+ KEEP_LOCATION
+ KEEP_SIZE
+ KEEP_RATIO
@@ -3069,33 +2969,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ KEEP_LOCATION
+ KEEP_SIZE
+ KEEP_RATIO
@@ -3136,6 +3015,9 @@
+ KEEP_LOCATION
+ KEEP_SIZE
+ KEEP_RATIO
@@ -3168,6 +3050,9 @@
+ KEEP_LOCATION
+ KEEP_SIZE
+ KEEP_RATIO
@@ -3200,6 +3085,9 @@
+ KEEP_LOCATION
+ KEEP_SIZE
+ KEEP_RATIO
@@ -3245,33 +3133,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ KEEP_LOCATION
+ KEEP_SIZE
+ KEEP_RATIO
@@ -3304,6 +3171,9 @@
+ KEEP_LOCATION
+ KEEP_SIZE
+ KEEP_RATIO
@@ -3360,6 +3230,9 @@
+ KEEP_LOCATION
+ KEEP_SIZE
+ KEEP_RATIO
@@ -3448,14 +3321,6 @@
-
-
-
-
- bold
-
-
-
@@ -3464,14 +3329,6 @@
-
-
-
-
- bold
-
-
-
@@ -3504,14 +3361,6 @@
-
-
-
-
- bold
-
-
-
@@ -3648,14 +3497,6 @@
-
-
-
-
- bold
-
-
-
@@ -3757,6 +3598,9 @@
+ KEEP_LOCATION
+ KEEP_SIZE
+ KEEP_RATIO
@@ -3895,14 +3739,6 @@
-
-
-
-
- bold
-
-
-
@@ -3927,14 +3763,6 @@
-
-
-
-
- bold
-
-
-
@@ -4451,6 +4279,9 @@
+ KEEP_LOCATION
+ KEEP_SIZE
+ KEEP_RATIO
@@ -4463,18 +4294,13 @@
-
-
-
-
- bold
-
-
-
+ KEEP_LOCATION
+ KEEP_SIZE
+ KEEP_RATIO
@@ -4483,22 +4309,20 @@
+ KEEP_LOCATION
+ KEEP_SIZE
+ KEEP_RATIO
-
-
-
-
- bold
-
-
-
+ KEEP_LOCATION
+ KEEP_SIZE
+ KEEP_RATIO
@@ -4515,6 +4339,9 @@
+ KEEP_LOCATION
+ KEEP_SIZE
+ KEEP_RATIO
@@ -4539,6 +4366,9 @@
+ KEEP_LOCATION
+ KEEP_SIZE
+ KEEP_RATIO
@@ -4563,6 +4393,9 @@
+ KEEP_LOCATION
+ KEEP_SIZE
+ KEEP_RATIO
@@ -4571,6 +4404,9 @@
+ KEEP_LOCATION
+ KEEP_SIZE
+ KEEP_RATIO
@@ -4587,6 +4423,9 @@
+ KEEP_LOCATION
+ KEEP_SIZE
+ KEEP_RATIO
@@ -4619,6 +4458,9 @@
+ KEEP_LOCATION
+ KEEP_SIZE
+ KEEP_RATIO
@@ -4631,34 +4473,13 @@
-
-
-
-
- bold
-
-
-
-
-
-
-
- bold
-
-
-
-
-
-
-
- bold
-
-
-
+ KEEP_LOCATION
+ KEEP_SIZE
+ KEEP_RATIO
@@ -4707,6 +4528,9 @@
+ KEEP_LOCATION
+ KEEP_SIZE
+ KEEP_RATIO
@@ -4715,6 +4539,9 @@
+ KEEP_LOCATION
+ KEEP_SIZE
+ KEEP_RATIO
@@ -4735,14 +4562,6 @@
-
-
-
-
- bold
-
-
-
@@ -4783,14 +4602,6 @@
-
-
-
-
- bold
-
-
-
@@ -4831,14 +4642,6 @@
-
-
-
-
- bold
-
-
-
@@ -4855,38 +4658,6 @@
-
-
-
-
- bold
-
-
-
-
-
-
-
- bold
-
-
-
-
-
-
-
- bold
-
-
-
-
-
-
-
- bold
-
-
-
@@ -4947,6 +4718,9 @@
+ KEEP_LOCATION
+ KEEP_SIZE
+ KEEP_RATIO
@@ -5789,4 +5563,4 @@
-
\ No newline at end of file
+
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 @@
-
-
-
-
@@ -123,10 +119,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -556,15 +521,6 @@
-
-
-
@@ -578,9 +534,6 @@
-
@@ -589,9 +542,6 @@
eType="#//Category_of_Private_Insurance_and_Plan"/>
-
-
-
-
-
-
-
-
+
-
-
-
-
@@ -59,10 +55,6 @@
-
-
-
-
@@ -148,16 +140,13 @@
-
-
-
@@ -190,7 +179,6 @@
-
@@ -238,13 +226,11 @@
-
-
@@ -327,12 +313,9 @@
-
-
-
-
+
@@ -346,22 +329,17 @@
-
-
-
-
-
@@ -369,15 +347,9 @@
-
-
-
-
-
-
-
+
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;
*
*
* - {@link Taxation.DS_for_Private_Insurance_and_Plan#getPrivate_insurance_and_plan_category Private insurance and plan category}
- * - {@link Taxation.DS_for_Private_Insurance_and_Plan#getIncrease_for_life_insurance Increase for life insurance}
- * - {@link Taxation.DS_for_Private_Insurance_and_Plan#getMaximum_deductible_amount_for_private_insurance Maximum deductible amount for private insurance}
- * - {@link Taxation.DS_for_Private_Insurance_and_Plan#getMaximum_deductible_amount_for_old_age_pension_plan Maximum deductible amount for old age pension plan}
*
*
* @see Taxation.TaxationPackage#getDS_for_Private_Insurance_and_Plan()
@@ -48,70 +45,4 @@ public interface DS_for_Private_Insurance_and_Plan extends DS {
*/
void setPrivate_insurance_and_plan_category(Category_of_Private_Insurance_and_Plan value);
- /**
- * Returns the value of the 'Increase for life insurance' attribute.
- *
- *
- * @return the value of the 'Increase for life insurance' attribute.
- * @see #setIncrease_for_life_insurance(double)
- * @see Taxation.TaxationPackage#getDS_for_Private_Insurance_and_Plan_Increase_for_life_insurance()
- * @model required="true" derived="true"
- * @generated
- */
- double getIncrease_for_life_insurance();
-
- /**
- * Sets the value of the '{@link Taxation.DS_for_Private_Insurance_and_Plan#getIncrease_for_life_insurance Increase for life insurance}' attribute.
- *
- *
- * @param value the new value of the 'Increase for life insurance' attribute.
- * @see #getIncrease_for_life_insurance()
- * @generated
- */
- void setIncrease_for_life_insurance(double value);
-
- /**
- * Returns the value of the 'Maximum deductible amount for private insurance' attribute.
- *
- *
- * @return the value of the 'Maximum deductible amount for private insurance' attribute.
- * @see #setMaximum_deductible_amount_for_private_insurance(double)
- * @see Taxation.TaxationPackage#getDS_for_Private_Insurance_and_Plan_Maximum_deductible_amount_for_private_insurance()
- * @model required="true" derived="true"
- * @generated
- */
- double getMaximum_deductible_amount_for_private_insurance();
-
- /**
- * Sets the value of the '{@link Taxation.DS_for_Private_Insurance_and_Plan#getMaximum_deductible_amount_for_private_insurance Maximum deductible amount for private insurance}' attribute.
- *
- *
- * @param value the new value of the 'Maximum deductible amount for private insurance' attribute.
- * @see #getMaximum_deductible_amount_for_private_insurance()
- * @generated
- */
- void setMaximum_deductible_amount_for_private_insurance(double value);
-
- /**
- * Returns the value of the 'Maximum deductible amount for old age pension plan' attribute.
- *
- *
- * @return the value of the 'Maximum deductible amount for old age pension plan' attribute.
- * @see #setMaximum_deductible_amount_for_old_age_pension_plan(double)
- * @see Taxation.TaxationPackage#getDS_for_Private_Insurance_and_Plan_Maximum_deductible_amount_for_old_age_pension_plan()
- * @model required="true" derived="true"
- * @generated
- */
- double getMaximum_deductible_amount_for_old_age_pension_plan();
-
- /**
- * Sets the value of the '{@link Taxation.DS_for_Private_Insurance_and_Plan#getMaximum_deductible_amount_for_old_age_pension_plan Maximum deductible amount for old age pension plan}' attribute.
- *
- *
- * @param value the new value of the 'Maximum deductible amount for old age pension plan' attribute.
- * @see #getMaximum_deductible_amount_for_old_age_pension_plan()
- * @generated
- */
- void setMaximum_deductible_amount_for_old_age_pension_plan(double value);
-
} // 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;
*
*
* - {@link Taxation.Donation#getBeneficiary1 Beneficiary1}
- * - {@link Taxation.Donation#isIs_beneficiary_eligible Is beneficiary eligible}
* - {@link Taxation.Donation#isIs_donation_reported Is donation reported}
*
*
@@ -44,29 +43,6 @@ public interface Donation extends Special_Expense_DS {
*/
void setBeneficiary1(String value);
- /**
- * Returns the value of the 'Is beneficiary eligible' attribute.
- * The default value is "false"
.
- *
- *
- * @return the value of the 'Is beneficiary eligible' attribute.
- * @see #setIs_beneficiary_eligible(boolean)
- * @see Taxation.TaxationPackage#getDonation_Is_beneficiary_eligible()
- * @model default="false" required="true" derived="true"
- * @generated
- */
- boolean isIs_beneficiary_eligible();
-
- /**
- * Sets the value of the '{@link Taxation.Donation#isIs_beneficiary_eligible Is beneficiary eligible}' attribute.
- *
- *
- * @param value the new value of the 'Is beneficiary eligible' attribute.
- * @see #isIs_beneficiary_eligible()
- * @generated
- */
- void setIs_beneficiary_eligible(boolean value);
-
/**
* Returns the value of the 'Is donation reported' attribute.
*
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;
* The following features are supported:
*
*
- * - {@link Taxation.External_Allowance#getAmount Amount}
* - {@link Taxation.External_Allowance#getGrantor Grantor}
* - {@link Taxation.External_Allowance#getStarting_year Starting year}
* - {@link Taxation.External_Allowance#getEnding_year Ending year}
@@ -27,28 +26,6 @@ import org.eclipse.emf.ecore.EObject;
* @generated
*/
public interface External_Allowance extends EObject {
- /**
- * Returns the value of the 'Amount' attribute.
- *
- *
- * @return the value of the 'Amount' attribute.
- * @see #setAmount(double)
- * @see Taxation.TaxationPackage#getExternal_Allowance_Amount()
- * @model required="true"
- * @generated
- */
- double getAmount();
-
- /**
- * Sets the value of the '{@link Taxation.External_Allowance#getAmount Amount}' attribute.
- *
- *
- * @param value the new value of the 'Amount' attribute.
- * @see #getAmount()
- * @generated
- */
- void setAmount(double value);
-
/**
* Returns the value of the 'Grantor' attribute.
* The literals are from the enumeration {@link Taxation.Grantor}.
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;
*
*
* - {@link Taxation.FD#getDistance_declared_in_january Distance declared in january}
- * - {@link Taxation.FD#getCalculated_distance Calculated distance}
*
*
* @see Taxation.TaxationPackage#getFD()
@@ -43,26 +42,4 @@ public interface FD extends Professional_Expenses_Deduction {
*/
void setDistance_declared_in_january(double value);
- /**
- * Returns the value of the 'Calculated distance' attribute.
- *
- *
- * @return the value of the 'Calculated distance' attribute.
- * @see #setCalculated_distance(double)
- * @see Taxation.TaxationPackage#getFD_Calculated_distance()
- * @model required="true" derived="true"
- * @generated
- */
- double getCalculated_distance();
-
- /**
- * Sets the value of the '{@link Taxation.FD#getCalculated_distance Calculated distance}' attribute.
- *
- *
- * @param value the new value of the 'Calculated distance' attribute.
- * @see #getCalculated_distance()
- * @generated
- */
- void setCalculated_distance(double value);
-
} // 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;
* A representation of the model object 'FO'.
*
*
- *
- * The following features are supported:
- *
- *
- * - {@link Taxation.FO#getRate_type_for_FO Rate type for FO}
- *
*
* @see Taxation.TaxationPackage#getFO()
* @model
* @generated
*/
public interface FO extends Professional_Expenses_Deduction {
- /**
- * Returns the value of the 'Rate type for FO' attribute.
- * The literals are from the enumeration {@link Taxation.Type_of_Rate}.
- *
- *
- * @return the value of the 'Rate type for FO' attribute.
- * @see Taxation.Type_of_Rate
- * @see #setRate_type_for_FO(Type_of_Rate)
- * @see Taxation.TaxationPackage#getFO_Rate_type_for_FO()
- * @model required="true" derived="true"
- * @generated
- */
- Type_of_Rate getRate_type_for_FO();
-
- /**
- * Sets the value of the '{@link Taxation.FO#getRate_type_for_FO Rate type for FO}' attribute.
- *
- *
- * @param value the new value of the 'Rate type for FO' attribute.
- * @see Taxation.Type_of_Rate
- * @see #getRate_type_for_FO()
- * @generated
- */
- void setRate_type_for_FO(Type_of_Rate value);
} // 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;
* The following features are supported:
*
*
- * - {@link Taxation.Income_Type#isSubjectToWithholdingTax Subject To Withholding Tax}
* - {@link Taxation.Income_Type#getId8 Id8}
* - {@link Taxation.Income_Type#getIncome Income}
*
@@ -23,29 +22,6 @@ import org.eclipse.emf.ecore.EObject;
* @generated
*/
public interface Income_Type extends EObject {
- /**
- * Returns the value of the 'Subject To Withholding Tax' attribute.
- *
- *
- * @return the value of the 'Subject To Withholding Tax' attribute.
- * @see #setSubjectToWithholdingTax(boolean)
- * @see Taxation.TaxationPackage#getIncome_Type_SubjectToWithholdingTax()
- * @model required="true" derived="true"
- * annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot derivation='\n\t\t\t\tself.income.tax_card->notEmpty()\n\t\t\t\t'"
- * @generated
- */
- boolean isSubjectToWithholdingTax();
-
- /**
- * Sets the value of the '{@link Taxation.Income_Type#isSubjectToWithholdingTax Subject To Withholding Tax}' attribute.
- *
- *
- * @param value the new value of the 'Subject To Withholding Tax' attribute.
- * @see #isSubjectToWithholdingTax()
- * @generated
- */
- void setSubjectToWithholdingTax(boolean value);
-
/**
* Returns the value of the 'Id8' attribute.
*
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;
* A representation of the model object 'Loss Carryforward'.
*
*
- *
- * The following features are supported:
- *
- *
- * - {@link Taxation.Loss_Carryforward#isRegular_accountability Regular accountability}
- * - {@link Taxation.Loss_Carryforward#isCompensation_by_other_means Compensation by other means}
- * - {@link Taxation.Loss_Carryforward#isTax_payer_has_inherited_business_ownership Tax payer has inherited business ownership}
- * - {@link Taxation.Loss_Carryforward#isTax_payer_has_been_partner_in_business Tax payer has been partner in business}
- *
*
* @see Taxation.TaxationPackage#getLoss_Carryforward()
* @model
* @generated
*/
public interface Loss_Carryforward extends Special_Expense_DS {
- /**
- * Returns the value of the 'Regular accountability' attribute.
- *
- *
- * @return the value of the 'Regular accountability' attribute.
- * @see #setRegular_accountability(boolean)
- * @see Taxation.TaxationPackage#getLoss_Carryforward_Regular_accountability()
- * @model required="true" derived="true"
- * @generated
- */
- boolean isRegular_accountability();
-
- /**
- * Sets the value of the '{@link Taxation.Loss_Carryforward#isRegular_accountability Regular accountability}' attribute.
- *
- *
- * @param value the new value of the 'Regular accountability' attribute.
- * @see #isRegular_accountability()
- * @generated
- */
- void setRegular_accountability(boolean value);
-
- /**
- * Returns the value of the 'Compensation by other means' attribute.
- *
- *
- * @return the value of the 'Compensation by other means' attribute.
- * @see #setCompensation_by_other_means(boolean)
- * @see Taxation.TaxationPackage#getLoss_Carryforward_Compensation_by_other_means()
- * @model required="true" derived="true"
- * @generated
- */
- boolean isCompensation_by_other_means();
-
- /**
- * Sets the value of the '{@link Taxation.Loss_Carryforward#isCompensation_by_other_means Compensation by other means}' attribute.
- *
- *
- * @param value the new value of the 'Compensation by other means' attribute.
- * @see #isCompensation_by_other_means()
- * @generated
- */
- void setCompensation_by_other_means(boolean value);
-
- /**
- * Returns the value of the 'Tax payer has inherited business ownership' attribute.
- * The default value is "false"
.
- *
- *
- * @return the value of the 'Tax payer has inherited business ownership' attribute.
- * @see #setTax_payer_has_inherited_business_ownership(boolean)
- * @see Taxation.TaxationPackage#getLoss_Carryforward_Tax_payer_has_inherited_business_ownership()
- * @model default="false" required="true" derived="true"
- * @generated
- */
- boolean isTax_payer_has_inherited_business_ownership();
-
- /**
- * Sets the value of the '{@link Taxation.Loss_Carryforward#isTax_payer_has_inherited_business_ownership Tax payer has inherited business ownership}' attribute.
- *
- *
- * @param value the new value of the 'Tax payer has inherited business ownership' attribute.
- * @see #isTax_payer_has_inherited_business_ownership()
- * @generated
- */
- void setTax_payer_has_inherited_business_ownership(boolean value);
-
- /**
- * Returns the value of the 'Tax payer has been partner in business' attribute.
- * The default value is "true"
.
- *
- *
- * @return the value of the 'Tax payer has been partner in business' attribute.
- * @see #setTax_payer_has_been_partner_in_business(boolean)
- * @see Taxation.TaxationPackage#getLoss_Carryforward_Tax_payer_has_been_partner_in_business()
- * @model default="true" required="true" derived="true"
- * @generated
- */
- boolean isTax_payer_has_been_partner_in_business();
-
- /**
- * Sets the value of the '{@link Taxation.Loss_Carryforward#isTax_payer_has_been_partner_in_business Tax payer has been partner in business}' attribute.
- *
- *
- * @param value the new value of the 'Tax payer has been partner in business' attribute.
- * @see #isTax_payer_has_been_partner_in_business()
- * @generated
- */
- void setTax_payer_has_been_partner_in_business(boolean value);
} // 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;
*
*
* - {@link Taxation.Permanent_Expense#getCategory Category}
- * - {@link Taxation.Permanent_Expense#isIs_eligible_for_deduction Is eligible for deduction}
*
*
* @see Taxation.TaxationPackage#getPermanent_Expense()
@@ -46,27 +45,4 @@ public interface Permanent_Expense extends Special_Expense_DS {
*/
void setCategory(Category_of_Permanent_Expense value);
- /**
- * Returns the value of the 'Is eligible for deduction' attribute.
- * The default value is "false"
.
- *
- *
- * @return the value of the 'Is eligible for deduction' attribute.
- * @see #setIs_eligible_for_deduction(boolean)
- * @see Taxation.TaxationPackage#getPermanent_Expense_Is_eligible_for_deduction()
- * @model default="false" required="true" derived="true"
- * @generated
- */
- boolean isIs_eligible_for_deduction();
-
- /**
- * Sets the value of the '{@link Taxation.Permanent_Expense#isIs_eligible_for_deduction Is eligible for deduction}' attribute.
- *
- *
- * @param value the new value of the 'Is eligible for deduction' attribute.
- * @see #isIs_eligible_for_deduction()
- * @generated
- */
- void setIs_eligible_for_deduction(boolean value);
-
} // 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;
* The following features are supported:
*
*