diff options
author | ArenBabikian <aren.babikian@mail.mcgill.ca> | 2019-03-06 02:59:19 -0500 |
---|---|---|
committer | ArenBabikian <aren.babikian@mail.mcgill.ca> | 2019-03-06 02:59:19 -0500 |
commit | edfd98b8fca74489ae338077f43521b6c5e6606f (patch) | |
tree | 68f6236435ea01471b37a8a6d55f8b2d49ff8190 /Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper.java | |
parent | Partially improve coding style (leaving for soccer) (diff) | |
download | VIATRA-Generator-edfd98b8fca74489ae338077f43521b6c5e6606f.tar.gz VIATRA-Generator-edfd98b8fca74489ae338077f43521b6c5e6606f.tar.zst VIATRA-Generator-edfd98b8fca74489ae338077f43521b6c5e6606f.zip |
Continue improving code style (need sleep)
Diffstat (limited to 'Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper.java')
-rw-r--r-- | Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper.java | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper.java index 6643576f..dc2cd5ec 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper.java | |||
@@ -50,6 +50,7 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RelationDefinition; | |||
50 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.SymbolicDeclaration; | 50 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.SymbolicDeclaration; |
51 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.SymbolicValue; | 51 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.SymbolicValue; |
52 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Term; | 52 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Term; |
53 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type; | ||
53 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeReference; | 54 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeReference; |
54 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Variable; | 55 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Variable; |
55 | import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem; | 56 | import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem; |
@@ -262,18 +263,18 @@ public class Logic2VampireLanguageMapper { | |||
262 | } | 263 | } |
263 | 264 | ||
264 | protected VLSTerm _transformTerm(final Forall forall, final Logic2VampireLanguageMapperTrace trace, final Map<Variable, VLSVariable> variables) { | 265 | protected VLSTerm _transformTerm(final Forall forall, final Logic2VampireLanguageMapperTrace trace, final Map<Variable, VLSVariable> variables) { |
265 | return this.support.createUniversallyQuantifiedExpression(this, forall, trace, variables); | 266 | return this.support.createQuantifiedExpression(this, forall, trace, variables, true); |
266 | } | 267 | } |
267 | 268 | ||
268 | protected VLSTerm _transformTerm(final Exists exists, final Logic2VampireLanguageMapperTrace trace, final Map<Variable, VLSVariable> variables) { | 269 | protected VLSTerm _transformTerm(final Exists exists, final Logic2VampireLanguageMapperTrace trace, final Map<Variable, VLSVariable> variables) { |
269 | return this.support.createExistentiallyQuantifiedExpression(this, exists, trace, variables); | 270 | return this.support.createQuantifiedExpression(this, exists, trace, variables, false); |
270 | } | 271 | } |
271 | 272 | ||
272 | protected VLSTerm _transformTerm(final InstanceOf instanceOf, final Logic2VampireLanguageMapperTrace trace, final Map<Variable, VLSVariable> variables) { | 273 | protected VLSTerm _transformTerm(final InstanceOf instanceOf, final Logic2VampireLanguageMapperTrace trace, final Map<Variable, VLSVariable> variables) { |
273 | VLSFunction _createVLSFunction = this.factory.createVLSFunction(); | 274 | VLSFunction _createVLSFunction = this.factory.createVLSFunction(); |
274 | final Procedure1<VLSFunction> _function = (VLSFunction it) -> { | 275 | final Procedure1<VLSFunction> _function = (VLSFunction it) -> { |
275 | TypeReference _range = instanceOf.getRange(); | 276 | TypeReference _range = instanceOf.getRange(); |
276 | it.setConstant(this.support.toIDMultiple("t", ((ComplexTypeReference) _range).getReferred().getName())); | 277 | it.setConstant(CollectionsUtil.<Type, VLSFunction>lookup(((ComplexTypeReference) _range).getReferred(), trace.type2Predicate).getConstant()); |
277 | EList<VLSTerm> _terms = it.getTerms(); | 278 | EList<VLSTerm> _terms = it.getTerms(); |
278 | VLSTerm _transformTerm = this.transformTerm(instanceOf.getValue(), trace, variables); | 279 | VLSTerm _transformTerm = this.transformTerm(instanceOf.getValue(), trace, variables); |
279 | _terms.add(_transformTerm); | 280 | _terms.add(_transformTerm); |
@@ -303,12 +304,7 @@ public class Logic2VampireLanguageMapper { | |||
303 | } | 304 | } |
304 | 305 | ||
305 | protected VLSTerm _transformSymbolicReference(final Variable variable, final List<Term> parameterSubstitutions, final Logic2VampireLanguageMapperTrace trace, final Map<Variable, VLSVariable> variables) { | 306 | protected VLSTerm _transformSymbolicReference(final Variable variable, final List<Term> parameterSubstitutions, final Logic2VampireLanguageMapperTrace trace, final Map<Variable, VLSVariable> variables) { |
306 | VLSVariable _createVLSVariable = this.factory.createVLSVariable(); | 307 | return this.support.duplicate(CollectionsUtil.<Variable, VLSVariable>lookup(variable, variables)); |
307 | final Procedure1<VLSVariable> _function = (VLSVariable it) -> { | ||
308 | it.setName(this.support.toID(CollectionsUtil.<Variable, VLSVariable>lookup(variable, variables).getName())); | ||
309 | }; | ||
310 | final VLSVariable res = ObjectExtensions.<VLSVariable>operator_doubleArrow(_createVLSVariable, _function); | ||
311 | return res; | ||
312 | } | 308 | } |
313 | 309 | ||
314 | protected VLSTerm _transformSymbolicReference(final FunctionDeclaration function, final List<Term> parameterSubstitutions, final Logic2VampireLanguageMapperTrace trace, final Map<Variable, VLSVariable> variables) { | 310 | protected VLSTerm _transformSymbolicReference(final FunctionDeclaration function, final List<Term> parameterSubstitutions, final Logic2VampireLanguageMapperTrace trace, final Map<Variable, VLSVariable> variables) { |
@@ -359,7 +355,7 @@ public class Logic2VampireLanguageMapper { | |||
359 | protected VLSTerm _transformSymbolicReference(final Relation relation, final List<Term> parameterSubstitutions, final Logic2VampireLanguageMapperTrace trace, final Map<Variable, VLSVariable> variables) { | 355 | protected VLSTerm _transformSymbolicReference(final Relation relation, final List<Term> parameterSubstitutions, final Logic2VampireLanguageMapperTrace trace, final Map<Variable, VLSVariable> variables) { |
360 | VLSFunction _createVLSFunction = this.factory.createVLSFunction(); | 356 | VLSFunction _createVLSFunction = this.factory.createVLSFunction(); |
361 | final Procedure1<VLSFunction> _function = (VLSFunction it) -> { | 357 | final Procedure1<VLSFunction> _function = (VLSFunction it) -> { |
362 | it.setConstant(this.support.toIDMultiple("rel", relation.getName())); | 358 | it.setConstant(CollectionsUtil.<RelationDeclaration, VLSFunction>lookup(((RelationDeclaration) relation), trace.rel2Predicate).getConstant()); |
363 | EList<VLSTerm> _terms = it.getTerms(); | 359 | EList<VLSTerm> _terms = it.getTerms(); |
364 | final Function1<Term, VLSTerm> _function_1 = (Term p) -> { | 360 | final Function1<Term, VLSTerm> _function_1 = (Term p) -> { |
365 | return this.transformTerm(p, trace, variables); | 361 | return this.transformTerm(p, trace, variables); |