diff options
author | 2020-05-11 04:19:04 +0200 | |
---|---|---|
committer | 2020-05-11 04:19:04 +0200 | |
commit | 194220061c9e84fe8dd7328374b18b647bf4d886 (patch) | |
tree | fffd4b51fa535af7e2179715350313953bbb5718 /Tests/MODELS2020-CaseStudies/case.study.pledge.run/bin | |
parent | Instead of Bigdecimals doubleValue are used in check (diff) | |
parent | Fix PLEDGE Case Study File (diff) | |
download | VIATRA-Generator-194220061c9e84fe8dd7328374b18b647bf4d886.tar.gz VIATRA-Generator-194220061c9e84fe8dd7328374b18b647bf4d886.tar.zst VIATRA-Generator-194220061c9e84fe8dd7328374b18b647bf4d886.zip |
Merge branch 'master' of https://github.com/viatra/VIATRA-Generator
Diffstat (limited to 'Tests/MODELS2020-CaseStudies/case.study.pledge.run/bin')
3 files changed, 28 insertions, 14 deletions
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/bin/.gitignore b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/bin/.gitignore index 07e30191..3d70f0da 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/bin/.gitignore +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/bin/.gitignore | |||
@@ -1 +1,2 @@ | |||
1 | /queries/ | ||
1 | /run/ | 2 | /run/ |
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/bin/queries/.gitignore b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/bin/queries/.gitignore index 527f3a0e..f679c1a8 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/bin/queries/.gitignore +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/bin/queries/.gitignore | |||
@@ -110,3 +110,11 @@ | |||
110 | /X_inv48_notDis.java | 110 | /X_inv48_notDis.java |
111 | /X_inv49_1.java | 111 | /X_inv49_1.java |
112 | /X_inv49_2.java | 112 | /X_inv49_2.java |
113 | /.FamilyTreeConstraints.java._trace | ||
114 | /.MemberHasParent.java._trace | ||
115 | /.MemberIsItsOwnParent.java._trace | ||
116 | /.NegativeAge.java._trace | ||
117 | /.ParentTooYoung.java._trace | ||
118 | /.TwoMembersHaveNoParent.java._trace | ||
119 | /.Case_study_short.java._trace | ||
120 | /.X_inv48.java._trace | ||
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 f736ec58..01cdf372 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 | |||
@@ -285,29 +285,34 @@ pattern inv47(lur : Legal_Union_Record) { | |||
285 | Legal_Union_Record.start_year(lur, startY); | 285 | Legal_Union_Record.start_year(lur, startY); |
286 | neg find x_inv47(lur); | 286 | neg find x_inv47(lur); |
287 | check(startY >= endY); | 287 | check(startY >= endY); |
288 | } or { | ||
289 | Legal_Union_Record.end_year(lur, endY); | ||
290 | Legal_Union_Record.start_year(lur, startY); | ||
291 | check(endY!= -1); | ||
292 | check(startY >= endY); | ||
288 | } | 293 | } |
289 | pattern x_inv47(lur : Legal_Union_Record) { | 294 | pattern x_inv47(lur : Legal_Union_Record) { |
290 | Legal_Union_Record.separation_cause(lur, ::NONE); | 295 | Legal_Union_Record.separation_cause(lur, ::NONE); |
291 | Legal_Union_Record.end_year(lur, -1); | ||
292 | } | 296 | } |
293 | 297 | ||
294 | //inv48-attributes-handled by multiplicity | 298 | //inv48-attributes-handled by multiplicity |
295 | @Constraint(message = "inv48", severity = "error", key = {p}) | 299 | @Constraint(message = "inv48", severity = "error", key = {p}) |
296 | pattern inv48(p : Physical_Person) { | 300 | pattern inv48(p : Physical_Person) { |
297 | neg find x_inv48_notDis(p); | 301 | Physical_Person.disability_percentage(p, disPer); |
298 | neg find x_inv48_Dis(p); | 302 | check(disPer > 1.0); |
299 | } | 303 | } or { |
300 | pattern x_inv48_notDis(p : Physical_Person) { | 304 | Physical_Person.disability_percentage(p, disPer); |
301 | Physical_Person.disability_type(p, ::NONE); | 305 | check(disPer < 0.0); |
302 | Physical_Person.disability_percentage(p, 0.0); | 306 | } or { |
303 | } | 307 | Physical_Person.disability_type(p, ::NONE); |
304 | pattern x_inv48_Dis(p : Physical_Person) { | 308 | Physical_Person.disability_percentage(p, disPer); |
305 | neg find x_inv48_3(p); | 309 | check(disPer != 0.0); |
306 | Physical_Person.disability_percentage(p, disPer); | 310 | } or { |
307 | check(disPer > 0.0); | 311 | neg find x_inv48(p); |
308 | check(disPer <= 1.0); | 312 | Physical_Person.disability_percentage(p, disPer); |
313 | check(disPer == 0.0); | ||
309 | } | 314 | } |
310 | pattern x_inv48_3(p : Physical_Person) { | 315 | pattern x_inv48(p : Physical_Person) { |
311 | Physical_Person.disability_type(p, ::NONE); | 316 | Physical_Person.disability_type(p, ::NONE); |
312 | } | 317 | } |
313 | 318 | ||