Adjust Pledge, handling of many households.

1 files changed, 27 insertions, 4 deletions

diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/bin/queries/case_study_A.vql b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/bin/queries/case_study_A.vql
index 56528cbb..05bffd2d 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/bin/queries/case_study_A.vql
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/bin/queries/case_study_A.vql
@@ -182,20 +182,43 @@ pattern x_inv13(tp : Resident_Tax_Payer) {
 

 //inv15-Ordered Sets in assignment if block

 //ERROR if no household object

+//@Constraint(message = "inv15", severity = "error", key = {ea})

+//pattern inv15(ea : External_Allowance) {

+//      neg find x_inv15(ea);

+//}

+//pattern x_inv15(ea : External_Allowance) {

+//    External_Allowance.person(ea, child);

+//    Household.children(h, child);//only one due to multiplicity

+//    Household.parents.individual_A(h, iA);

+//    Tax_Payer(iA);

+//    External_Allowance.reciver(ea, iA);

+//} or {

+//    External_Allowance.person(ea, child);

+//    Household.children(h, child);//only one due to multiplicity

+//    Household.parents.individual_B(h, iB);

+//    Tax_Payer(iB);

+//    External_Allowance.reciver(ea, iB);

+//}

+

 @Constraint(message = "inv15", severity = "error", key = {ea})

 pattern inv15(ea : External_Allowance) {

+        External_Allowance.person(ea, child);

+    Household.children(h, child);//only one due to multiplicity

+    Household.parents.individual_A(h, iA);

+        Household.parents.individual_B(h, iB);

+        

+        Dependant(iA)

+        Dependant(iB)

         neg find x_inv15(ea);

 }

 pattern x_inv15(ea : External_Allowance) {

-    External_Allowance.person(ea, child);

-    Household.children(h, child);//only one due to multiplicity

-    Household.parents.individual_A(h, iA);

+    

     Tax_Payer(iA);

     External_Allowance.reciver(ea, iA);

 } or {

     External_Allowance.person(ea, child);

     Household.children(h, child);//only one due to multiplicity

-    Household.parents.individual_B(h, iB);

+    

     Tax_Payer(iB);

     External_Allowance.reciver(ea, iB);

 }