Merge remote-tracking branch 'origin/master' into kris

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 {
                         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)