1 files changed, 3 insertions, 2 deletions
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.xtend b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.xtend
index df3cfd82..39862c65 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.xtend
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.xtend
@@ -25,8 +25,7 @@ class Logic2VampireLanguageMapper_ScopeMapper {
        def dispatch public void transformScope(List<Type> types, VampireSolverConfiguration config,
                Logic2VampireLanguageMapperTrace trace) {
-                val ABSOLUTE_MIN = 0
+                
-                val ABSOLUTE_MAX = Integer.MAX_VALUE
 //              TODO HANDLE ERRORS RELATED TO MAX > MIN
 //              TODO HANDLE ERROR RELATED TO SUM(MIN TYPES)+1(for root) > MAX OBJECTS
@@ -40,6 +39,8 @@ class Logic2VampireLanguageMapper_ScopeMapper {
                // Number of defined non-abstract elements that are not enum elements
                // Equals the number of elements in te initial model
                var elemsInIM = trace.definedElement2String.size
+                val ABSOLUTE_MIN = 0
+                val ABSOLUTE_MAX = -1-elemsInIM
 //              var elemsInIM = 0
 //              
 //              for(t : types.filter(TypeDefinition).filter[!isIsAbstract]) {

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.xtend b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.xtend index df3cfd82..39862c65 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.xtend +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.xtend
@@ -25,8 +25,7 @@ class Logic2VampireLanguageMapper_ScopeMapper {
25		25
26	def dispatch public void transformScope(List<Type> types, VampireSolverConfiguration config,	26	def dispatch public void transformScope(List<Type> types, VampireSolverConfiguration config,
27	Logic2VampireLanguageMapperTrace trace) {	27	Logic2VampireLanguageMapperTrace trace) {
28	val ABSOLUTE_MIN = 0	28
29	val ABSOLUTE_MAX = Integer.MAX_VALUE
30		29
31	// TODO HANDLE ERRORS RELATED TO MAX > MIN	30	// TODO HANDLE ERRORS RELATED TO MAX > MIN
32	// TODO HANDLE ERROR RELATED TO SUM(MIN TYPES)+1(for root) > MAX OBJECTS	31	// TODO HANDLE ERROR RELATED TO SUM(MIN TYPES)+1(for root) > MAX OBJECTS
@@ -40,6 +39,8 @@ class Logic2VampireLanguageMapper_ScopeMapper {
40	// Number of defined non-abstract elements that are not enum elements	39	// Number of defined non-abstract elements that are not enum elements
41	// Equals the number of elements in te initial model	40	// Equals the number of elements in te initial model
42	var elemsInIM = trace.definedElement2String.size	41	var elemsInIM = trace.definedElement2String.size
		42	val ABSOLUTE_MIN = 0
		43	val ABSOLUTE_MAX = -1-elemsInIM
43	// var elemsInIM = 0	44	// var elemsInIM = 0
44	//	45	//
45	// for(t : types.filter(TypeDefinition).filter[!isIsAbstract]) {	46	// for(t : types.filter(TypeDefinition).filter[!isIsAbstract]) {