diff options
author | OszkarSemerath <oszka@SEMERATH-LAPTOP> | 2017-08-08 16:12:05 +0200 |
---|---|---|
committer | OszkarSemerath <oszka@SEMERATH-LAPTOP> | 2017-08-08 16:12:05 +0200 |
commit | 7443c0d1e88c1d6191d0074c27f81e2400bbd7fe (patch) | |
tree | 7fcc7ed30525c4fe12c71940e3388a91b432e50b /Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit | |
parent | Support for double and string attributes (diff) | |
parent | Fixed a typo (diff) | |
download | VIATRA-Generator-7443c0d1e88c1d6191d0074c27f81e2400bbd7fe.tar.gz VIATRA-Generator-7443c0d1e88c1d6191d0074c27f81e2400bbd7fe.tar.zst VIATRA-Generator-7443c0d1e88c1d6191d0074c27f81e2400bbd7fe.zip |
Merge branch 'master' of https://github.com/viatra/VIATRA-Generator
Diffstat (limited to 'Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit')
-rw-r--r-- | Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Viatra2Logic.xtend | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Viatra2Logic.xtend b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Viatra2Logic.xtend index a4b6cc6d..86fc8537 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Viatra2Logic.xtend +++ b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Viatra2Logic.xtend | |||
@@ -227,15 +227,15 @@ class Viatra2Logic { | |||
227 | ecore2LogicTrace,viatra2LogicTrace,variable2Variable,config) | 227 | ecore2LogicTrace,viatra2LogicTrace,variable2Variable,config) |
228 | ].filterNull | 228 | ].filterNull |
229 | val allConstraintIsSatisfied = And(translatedConstraints) | 229 | val allConstraintIsSatisfied = And(translatedConstraints) |
230 | val allNetativeVariablesAreSatisfied = if(innerNegativeVariables.empty) { | 230 | val allNegativeVariablesAreSatisfied = if(innerNegativeVariables.empty) { |
231 | allConstraintIsSatisfied | 231 | allConstraintIsSatisfied |
232 | } else { | 232 | } else { |
233 | Forall(innerNegativeVariables,allConstraintIsSatisfied); | 233 | Forall(innerNegativeVariables,allConstraintIsSatisfied); |
234 | } | 234 | } |
235 | val allVariablesAreExisting = if(innerPositiveVariables.empty) { | 235 | val allVariablesAreExisting = if(innerPositiveVariables.empty) { |
236 | allNetativeVariablesAreSatisfied | 236 | allNegativeVariablesAreSatisfied |
237 | } else { | 237 | } else { |
238 | Exists(innerPositiveVariables,allNetativeVariablesAreSatisfied); | 238 | Exists(innerPositiveVariables,allNegativeVariablesAreSatisfied); |
239 | } | 239 | } |
240 | 240 | ||
241 | return allVariablesAreExisting | 241 | return allVariablesAreExisting |