VAMPIRE : initial model handling almost done. only typeScope remains #40

1 files changed, 4 insertions, 4 deletions

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper.xtend b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper.xtend
index 2be6c093..13db3c99 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper.xtend
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper.xtend
@@ -78,10 +78,7 @@ class Logic2VampireLanguageMapper {
                 if (!problem.types.isEmpty) {
                         typeMapper.transformTypes(problem.types, problem.elements, this, trace)
                 }
-
-                // SCOPE MAPPER
-                scopeMapper.transformScope(config, trace)
-
+                
                 // RELATION MAPPER
                 trace.relationDefinitions = problem.collectRelationDefinitions
                 problem.relations.forEach[this.relationMapper.transformRelation(it, trace)]
@@ -89,6 +86,9 @@ class Logic2VampireLanguageMapper {
                 // CONTAINMENT MAPPER
                 containmentMapper.transformContainment(config,problem.containmentHierarchies, trace)
 
+                // SCOPE MAPPER
+                scopeMapper.transformScope(problem.types, config, trace)
+
                 // CONSTANT MAPPER
                 // only transforms definitions
                 trace.constantDefinitions = problem.collectConstantDefinitions