diff options
author | 20001LastOrder <boqi.chen@mail.mcgill.ca> | 2020-11-04 01:16:22 -0500 |
---|---|---|
committer | 20001LastOrder <boqi.chen@mail.mcgill.ca> | 2020-11-04 01:16:22 -0500 |
commit | 93243cb3faf1ccd733081fcf380559ac03c9ad35 (patch) | |
tree | 421f9f174eb77c387b5acaa05f01e64a62cab3a7 /Tests/MODELS2020-CaseStudies/case.study.familyTree.run | |
parent | add realistic solver (diff) | |
parent | Optimizing generator with linear objective functions (diff) | |
download | VIATRA-Generator-93243cb3faf1ccd733081fcf380559ac03c9ad35.tar.gz VIATRA-Generator-93243cb3faf1ccd733081fcf380559ac03c9ad35.tar.zst VIATRA-Generator-93243cb3faf1ccd733081fcf380559ac03c9ad35.zip |
merge with current master, comment numerical solver related logging
Diffstat (limited to 'Tests/MODELS2020-CaseStudies/case.study.familyTree.run')
3 files changed, 8 insertions, 1 deletions
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/.gitignore b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/.gitignore index 3d70f0da..7050a7e3 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/.gitignore +++ b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/.gitignore | |||
@@ -1,2 +1 @@ | |||
1 | /queries/ | /queries/ | |
2 | /run/ | ||
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.gitignore b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.gitignore index 3b9ccef7..19bc3cc8 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.gitignore +++ b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.gitignore | |||
@@ -7,3 +7,7 @@ | |||
7 | /.MemberHasParent.java._trace | 7 | /.MemberHasParent.java._trace |
8 | /.TwoMembersHaveNoParent.java._trace | 8 | /.TwoMembersHaveNoParent.java._trace |
9 | /.NegativeAge.java._trace | 9 | /.NegativeAge.java._trace |
10 | /MemberHasParent.java | ||
11 | /NegativeAge.java | ||
12 | /ParentTooYoung.java | ||
13 | /TwoMembersHaveNoParent.java | ||
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/.gitignore b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/.gitignore index 3b9ccef7..19bc3cc8 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/.gitignore +++ b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/.gitignore | |||
@@ -7,3 +7,7 @@ | |||
7 | /.MemberHasParent.java._trace | 7 | /.MemberHasParent.java._trace |
8 | /.TwoMembersHaveNoParent.java._trace | 8 | /.TwoMembersHaveNoParent.java._trace |
9 | /.NegativeAge.java._trace | 9 | /.NegativeAge.java._trace |
10 | /MemberHasParent.java | ||
11 | /NegativeAge.java | ||
12 | /ParentTooYoung.java | ||
13 | /TwoMembersHaveNoParent.java | ||