diff options
author | 2019-09-02 16:24:44 +0200 | |
---|---|---|
committer | 2019-09-02 16:24:44 +0200 | |
commit | 4dbf3cdb62f554e4edfe5eed77e35e74b69afcbc (patch) | |
tree | fee77ac1d41a3cc01517625ea19fd9efc01092ed /Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf | |
parent | Merge remote-tracking branch 'origin/master' into kris (diff) | |
parent | Alloy upper multiplicity under-approximation with keyword bug fix (diff) | |
download | VIATRA-Generator-4dbf3cdb62f554e4edfe5eed77e35e74b69afcbc.tar.gz VIATRA-Generator-4dbf3cdb62f554e4edfe5eed77e35e74b69afcbc.tar.zst VIATRA-Generator-4dbf3cdb62f554e4edfe5eed77e35e74b69afcbc.zip |
Merge remote-tracking branch 'origin/master' into kris
Diffstat (limited to 'Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf')
-rw-r--r-- | Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/Logic2AlloyLanguageMapper.xtend | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/Logic2AlloyLanguageMapper.xtend b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/Logic2AlloyLanguageMapper.xtend index 3fc3971d..e1ffe531 100644 --- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/Logic2AlloyLanguageMapper.xtend +++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/Logic2AlloyLanguageMapper.xtend | |||
@@ -194,13 +194,12 @@ class Logic2AlloyLanguageMapper { | |||
194 | val relation = relationMapper.getRelationReference((x as RelationDeclaration),trace) | 194 | val relation = relationMapper.getRelationReference((x as RelationDeclaration),trace) |
195 | val type = relation.type | 195 | val type = relation.type |
196 | 196 | ||
197 | if(type instanceof ALSDirectProduct) { | ||
198 | type.rightMultiplicit = type.rightMultiplicit.addUpper | ||
199 | } else { | ||
200 | relation.multiplicity = relation.multiplicity.addUpper | ||
201 | } | ||
202 | |||
203 | if(assertion.upper === 1) { | 197 | if(assertion.upper === 1) { |
198 | if(type instanceof ALSDirectProduct) { | ||
199 | type.rightMultiplicit = type.rightMultiplicit.addUpper | ||
200 | } else { | ||
201 | relation.multiplicity = relation.multiplicity.addUpper | ||
202 | } | ||
204 | return true | 203 | return true |
205 | } else { | 204 | } else { |
206 | return transformAssertion(assertion.target,trace) | 205 | return transformAssertion(assertion.target,trace) |