From 81c0668da160994772d2cb576dca8b7f62c08999 Mon Sep 17 00:00:00 2001 From: Oszkar Semerath Date: Tue, 12 May 2020 02:18:59 +0200 Subject: reformulating (potentially inconsistent) inv49 --- .../src/queries/case_study_A.vql | 23 +++++++++++----------- 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'Tests/MODELS2020-CaseStudies/case.study.pledge.run/src/queries/case_study_A.vql') diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/src/queries/case_study_A.vql b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/src/queries/case_study_A.vql index d879fd7c..56528cbb 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/src/queries/case_study_A.vql +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/src/queries/case_study_A.vql @@ -318,19 +318,18 @@ pattern x_inv48(p : Physical_Person) { //inv49-OclKindOf-handled by multiplicity @Constraint(message = "inv49", severity = "error", key = {lur}) -pattern inv49(lur : Legal_Union_Record) { - neg find x_inv49_1(lur); +pattern inv49_A(lur : Legal_Union_Record) { + Legal_Union_Record.individual_A(lur, i); + Legal_Union_Record.individual_B(lur, i); } -pattern x_inv49_1(lur : Legal_Union_Record) { - Legal_Union_Record.individual_A(lur, iA); - Legal_Union_Record.individual_B(lur, iB); - Tax_Payer(iA); - Physical_Person(iB); - neg find x_inv49_2(iB); - iA != iB; -} -pattern x_inv49_2(iB: Dependent) { - Dependent(iB); +//inv49-OclKindOf-handled by multiplicity +@Constraint(message = "inv49", severity = "error", key = {lur}) +pattern inv49_B(lur : Legal_Union_Record) { + Legal_Union_Record.individual_A(lur, i); + Dependent(i); +} or { + Legal_Union_Record.individual_B(lur, i); + Dependent(i); } //inv50-MultiplicityChecked -- cgit v1.2.3-70-g09d2