From 5a565f185949b4a43045492b539ce59682a8190d Mon Sep 17 00:00:00 2001 From: Oszkar Semerath Date: Mon, 2 Sep 2019 16:24:14 +0200 Subject: Alloy upper multiplicity under-approximation with keyword bug fix candidate 1 --- .../alloy/reasoner/builder/Logic2AlloyLanguageMapper.xtend | 11 +++++------ 1 file 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 { val relation = relationMapper.getRelationReference((x as RelationDeclaration),trace) val type = relation.type - if(type instanceof ALSDirectProduct) { - type.rightMultiplicit = type.rightMultiplicit.addUpper - } else { - relation.multiplicity = relation.multiplicity.addUpper - } - if(assertion.upper === 1) { + if(type instanceof ALSDirectProduct) { + type.rightMultiplicit = type.rightMultiplicit.addUpper + } else { + relation.multiplicity = relation.multiplicity.addUpper + } return true } else { return transformAssertion(assertion.target,trace) -- cgit v1.2.3-54-g00ecf