diff options
Diffstat (limited to 'Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder')
3 files changed, 22 insertions, 8 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 14926280..b617912d 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 | |||
@@ -265,7 +265,11 @@ class Logic2VampireLanguageMapper { | |||
265 | def dispatch protected VLSTerm transformSymbolicReference(DefinedElement referred, | 265 | def dispatch protected VLSTerm transformSymbolicReference(DefinedElement referred, |
266 | List<Term> parameterSubstitutions, Logic2VampireLanguageMapperTrace trace, | 266 | List<Term> parameterSubstitutions, Logic2VampireLanguageMapperTrace trace, |
267 | Map<Variable, VLSVariable> variables) { | 267 | Map<Variable, VLSVariable> variables) { |
268 | typeMapper.transformReference(referred, trace) | 268 | val name = referred.lookup(trace.definedElement2String) |
269 | return createVLSConstant => [ | ||
270 | it.name = name | ||
271 | ] | ||
272 | // typeMapper.transformReference(referred, trace) | ||
269 | } | 273 | } |
270 | 274 | ||
271 | def dispatch protected VLSTerm transformSymbolicReference(ConstantDeclaration constant, | 275 | def dispatch protected VLSTerm transformSymbolicReference(ConstantDeclaration constant, |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapper.xtend b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapper.xtend index d2a01e0e..38c99a89 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapper.xtend +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapper.xtend | |||
@@ -138,9 +138,9 @@ class Logic2VampireLanguageMapper_TypeMapper { | |||
138 | val cstTerm = createVLSFunctionAsTerm => [ | 138 | val cstTerm = createVLSFunctionAsTerm => [ |
139 | it.functor = "eo" + num | 139 | it.functor = "eo" + num |
140 | ] | 140 | ] |
141 | if (isNotEnum) { | 141 | // if (isNotEnum) { |
142 | trace.definedElement2String.put(type.elements.get(index),cstTerm.functor) | 142 | trace.definedElement2String.put(type.elements.get(index),cstTerm.functor) |
143 | } | 143 | // } |
144 | 144 | ||
145 | val cst = support.toConstant(cstTerm) | 145 | val cst = support.toConstant(cstTerm) |
146 | trace.uniqueInstances.add(cst) | 146 | trace.uniqueInstances.add(cst) |
@@ -249,8 +249,13 @@ class Logic2VampireLanguageMapper_TypeMapper { | |||
249 | } | 249 | } |
250 | 250 | ||
251 | def protected transformReference(DefinedElement referred, Logic2VampireLanguageMapperTrace trace) { | 251 | def protected transformReference(DefinedElement referred, Logic2VampireLanguageMapperTrace trace) { |
252 | createVLSDoubleQuote => [ | 252 | |
253 | it.value = "\"a" + referred.name + "\"" | 253 | // createVLSDoubleQuote => [ |
254 | // it.value = "\"a" + referred.name + "\"" | ||
255 | // ] | ||
256 | |||
257 | createVLSConstant => [ | ||
258 | it.name = referred.name | ||
254 | ] | 259 | ] |
255 | } | 260 | } |
256 | 261 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/VampireModelInterpretation.xtend b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/VampireModelInterpretation.xtend index ef77b6ca..9eb47f41 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/VampireModelInterpretation.xtend +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/VampireModelInterpretation.xtend | |||
@@ -246,7 +246,12 @@ class VampireModelInterpretation implements LogicModelInterpretation { | |||
246 | return declaration.lookup(this.type2DefinedElement) | 246 | return declaration.lookup(this.type2DefinedElement) |
247 | } | 247 | } |
248 | 248 | ||
249 | def private dispatch getElementsDispatch(TypeDefinition declaration) { return declaration.elements } | 249 | def private dispatch getElementsDispatch(TypeDefinition declaration) { |
250 | println("~~" + declaration) | ||
251 | println(declaration.elements) | ||
252 | println() | ||
253 | return declaration.elements | ||
254 | } | ||
250 | 255 | ||
251 | override getInterpretation(FunctionDeclaration function, Object[] parameterSubstitution) { | 256 | override getInterpretation(FunctionDeclaration function, Object[] parameterSubstitution) { |
252 | throw new UnsupportedOperationException("TODO: auto-generated method stub") | 257 | throw new UnsupportedOperationException("TODO: auto-generated method stub") |
@@ -260,12 +265,12 @@ class VampireModelInterpretation implements LogicModelInterpretation { | |||
260 | for (real : realRelations) { | 265 | for (real : realRelations) { |
261 | if (real.contains(node1) && real.contains(node2)) { | 266 | if (real.contains(node1) && real.contains(node2)) { |
262 | println(" true") | 267 | println(" true") |
263 | TimeUnit.SECONDS.sleep(1) | 268 | TimeUnit.MILLISECONDS.sleep(10) |
264 | return true | 269 | return true |
265 | } | 270 | } |
266 | } | 271 | } |
267 | println(" false") | 272 | println(" false") |
268 | TimeUnit.SECONDS.sleep(1) | 273 | TimeUnit.MILLISECONDS.sleep(10) |
269 | return false | 274 | return false |
270 | } | 275 | } |
271 | 276 | ||