diff options
author | 2019-04-04 14:43:17 -0400 | |
---|---|---|
committer | 2020-06-07 19:36:03 -0400 | |
commit | 844c46e8a3620c7fae26f87e148643b32480dced (patch) | |
tree | 9252d89ef05bd9f4e5aafc9575155ebb3ee59211 /Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ContainmentMapper.xtend | |
parent | Add to containment, add notObject case. (diff) | |
download | VIATRA-Generator-844c46e8a3620c7fae26f87e148643b32480dced.tar.gz VIATRA-Generator-844c46e8a3620c7fae26f87e148643b32480dced.tar.zst VIATRA-Generator-844c46e8a3620c7fae26f87e148643b32480dced.zip |
Closes #34, adds code to test cases where minScope>maxScope.
Diffstat (limited to 'Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ContainmentMapper.xtend')
-rw-r--r-- | Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ContainmentMapper.xtend | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ContainmentMapper.xtend b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ContainmentMapper.xtend index 820d0db2..48ee8789 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ContainmentMapper.xtend +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ContainmentMapper.xtend | |||
@@ -27,7 +27,7 @@ class Logic2VampireLanguageMapper_ContainmentMapper { | |||
27 | 27 | ||
28 | def public void transformContainment(List<ContainmentHierarchy> hierarchies, | 28 | def public void transformContainment(List<ContainmentHierarchy> hierarchies, |
29 | Logic2VampireLanguageMapperTrace trace) { | 29 | Logic2VampireLanguageMapperTrace trace) { |
30 | 30 | //TODO throw error is there exists a circular containment that does not involve hierarchy | |
31 | // TODO CONSIDER CASE WHERE MULTIPLE CONTAINMMENT HIERARCHIES EXIST | 31 | // TODO CONSIDER CASE WHERE MULTIPLE CONTAINMMENT HIERARCHIES EXIST |
32 | // TEMP | 32 | // TEMP |
33 | val hierarchy = hierarchies.get(0) | 33 | val hierarchy = hierarchies.get(0) |
@@ -91,6 +91,9 @@ class Logic2VampireLanguageMapper_ContainmentMapper { | |||
91 | for (c : toType.subtypes) { | 91 | for (c : toType.subtypes) { |
92 | addToMap(type2cont, toFunc, rel) | 92 | addToMap(type2cont, toFunc, rel) |
93 | } | 93 | } |
94 | // for (c : support.listSubtypes(toType)) { | ||
95 | // addToMap(type2cont, toFunc, rel) | ||
96 | // } | ||
94 | 97 | ||
95 | // val listForAnd = newArrayList | 98 | // val listForAnd = newArrayList |
96 | //// listForAnd.add(support.duplicate(fromType.lookup(trace.type2Predicate), varB)) | 99 | //// listForAnd.add(support.duplicate(fromType.lookup(trace.type2Predicate), varB)) |