aboutsummaryrefslogtreecommitdiffstats
path: root/Application/hu.bme.mit.inf.dslreasoner.application/src/hu
diff options
context:
space:
mode:
authorLibravatar Aren Babikian <aren.babikian@mail.mcgill.ca>2021-01-14 13:07:08 -0500
committerLibravatar Aren Babikian <aren.babikian@mail.mcgill.ca>2021-01-14 13:07:08 -0500
commit0de1dbfaed208ba70863abe3671f868f168bc9cd (patch)
tree24961120f0d94d4da6fd1ac03e6776e224d493b0 /Application/hu.bme.mit.inf.dslreasoner.application/src/hu
parentAdd aird file for crossingScenario Ecore (diff)
downloadVIATRA-Generator-0de1dbfaed208ba70863abe3671f868f168bc9cd.tar.gz
VIATRA-Generator-0de1dbfaed208ba70863abe3671f868f168bc9cd.tar.zst
VIATRA-Generator-0de1dbfaed208ba70863abe3671f868f168bc9cd.zip
Adjust vsconfig xtext to consider reals as EDouble rather than EBigDecimals
Diffstat (limited to 'Application/hu.bme.mit.inf.dslreasoner.application/src/hu')
-rw-r--r--Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/ApplicationConfiguration.xtext2
-rw-r--r--Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScopeLoader.xtend3
2 files changed, 2 insertions, 3 deletions
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/ApplicationConfiguration.xtext b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/ApplicationConfiguration.xtext
index 537989f7..cba06509 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/ApplicationConfiguration.xtext
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/ApplicationConfiguration.xtext
@@ -14,7 +14,7 @@ Command:
14QualifiedName returns ecore::EString: 14QualifiedName returns ecore::EString:
15 ID ('.' ID)*; 15 ID ('.' ID)*;
16 16
17REALLiteral returns ecore::EBigDecimal: 17REALLiteral returns ecore::EDouble:
18 '-'? INT '.' INT; 18 '-'? INT '.' INT;
19 19
20INTLiteral returns ecore::EInt: 20INTLiteral returns ecore::EInt:
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScopeLoader.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScopeLoader.xtend
index 6d6ad85e..ff775ad5 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScopeLoader.xtend
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScopeLoader.xtend
@@ -148,8 +148,7 @@ class ScopeLoader {
148 def dispatch setSpecification(RealTypeScope scope, TypeScopes aggregated, Map<Type, Set<DefinedElement>> knownElements, Ecore2Logic ecore2Logic, Ecore2Logic_Trace trace, List<String> inconsistencies) { 148 def dispatch setSpecification(RealTypeScope scope, TypeScopes aggregated, Map<Type, Set<DefinedElement>> knownElements, Ecore2Logic ecore2Logic, Ecore2Logic_Trace trace, List<String> inconsistencies) {
149 val number = scope.number 149 val number = scope.number
150 if(number instanceof RealEnumeration) { 150 if(number instanceof RealEnumeration) {
151 val x = number.entry; 151 addToKnownCollection(aggregated.knownReals,number.entry,scope.isSetsNew,inconsistencies)
152 <BigDecimal>addToKnownCollection(aggregated.knownReals,x,scope.isSetsNew,inconsistencies)
153 if(!scope.isSetsNew) { 152 if(!scope.isSetsNew) {
154 aggregated.maxNewReals = 0 153 aggregated.maxNewReals = 0
155 } 154 }