Added support for SHORT type as integer

2 files changed, 8 insertions, 1 deletions

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/AttributeMapper.xtend b/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/AttributeMapper.xtend
index e44e9a1e..95be8433 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/AttributeMapper.xtend
+++ b/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/AttributeMapper.xtend
@@ -107,7 +107,7 @@ class EAttributeMapper_RelationsOverTypes implements EAttributeMapper {
         

         override TypeDescriptor TypeOfRange(Ecore2Logic_Trace trace, EAttribute attribute) {

                 if(attribute.EType instanceof EEnum) return enumMapper.TypeofEEnum(trace,attribute.EType as EEnum)

-                else if(attribute.EType.name.equals("EInt")) return LogicInt

+                else if(attribute.EType.name.equals("EInt") || attribute.EType.name.equals("EShort")) return LogicInt

                 else if(attribute.EType.name.equals("EBoolean")) return LogicBool

                 else if(attribute.EType.name.equals("EDouble") ||

                             attribute.EType.name.equals("EFloat")) return LogicReal

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend
index bd0f4ca4..8aaaacb5 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend
@@ -163,6 +163,9 @@ class InstanceModel2PartialInterpretation {
         private def dispatch shortValue(Integer value, Set<Integer> integers, Set<BigDecimal> reals, Set<String> strings) {

                 integers += value

         }

+        private def dispatch shortValue(Short value, Set<Integer> integers, Set<BigDecimal> reals, Set<String> strings) {

+                integers += Integer.valueOf(value)

+        }

         private def dispatch shortValue(Float value, Set<Integer> integers, Set<BigDecimal> reals, Set<String> strings) {

                 reals += BigDecimal.valueOf(value)

         }

@@ -199,6 +202,10 @@ class InstanceModel2PartialInterpretation {
                 value.lookup(partialInterpretationTrace.primitiveValues.integerMap)

         }

         

+        dispatch protected def translateValue(Short value, Ecore2Logic_Trace ecore2LogicTrace, Problem2PartialInterpretationTrace partialInterpretationTrace) {

+                Integer.valueOf(value).lookup(partialInterpretationTrace.primitiveValues.integerMap)

+        }

+        

         dispatch protected def translateValue(Double value, Ecore2Logic_Trace ecore2LogicTrace, Problem2PartialInterpretationTrace partialInterpretationTrace) {

                 BigDecimal.valueOf(value).lookup(partialInterpretationTrace.primitiveValues.realMap)

         }