diff options
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 { | |||
107 | 107 | ||
108 | override TypeDescriptor TypeOfRange(Ecore2Logic_Trace trace, EAttribute attribute) { | 108 | override TypeDescriptor TypeOfRange(Ecore2Logic_Trace trace, EAttribute attribute) { |
109 | if(attribute.EType instanceof EEnum) return enumMapper.TypeofEEnum(trace,attribute.EType as EEnum) | 109 | if(attribute.EType instanceof EEnum) return enumMapper.TypeofEEnum(trace,attribute.EType as EEnum) |
110 | else if(attribute.EType.name.equals("EInt")) return LogicInt | 110 | else if(attribute.EType.name.equals("EInt") || attribute.EType.name.equals("EShort")) return LogicInt |
111 | else if(attribute.EType.name.equals("EBoolean")) return LogicBool | 111 | else if(attribute.EType.name.equals("EBoolean")) return LogicBool |
112 | else if(attribute.EType.name.equals("EDouble") || | 112 | else if(attribute.EType.name.equals("EDouble") || |
113 | attribute.EType.name.equals("EFloat")) return LogicReal | 113 | 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 { | |||
163 | private def dispatch shortValue(Integer value, Set<Integer> integers, Set<BigDecimal> reals, Set<String> strings) { | 163 | private def dispatch shortValue(Integer value, Set<Integer> integers, Set<BigDecimal> reals, Set<String> strings) { |
164 | integers += value | 164 | integers += value |
165 | } | 165 | } |
166 | private def dispatch shortValue(Short value, Set<Integer> integers, Set<BigDecimal> reals, Set<String> strings) { | ||
167 | integers += Integer.valueOf(value) | ||
168 | } | ||
166 | private def dispatch shortValue(Float value, Set<Integer> integers, Set<BigDecimal> reals, Set<String> strings) { | 169 | private def dispatch shortValue(Float value, Set<Integer> integers, Set<BigDecimal> reals, Set<String> strings) { |
167 | reals += BigDecimal.valueOf(value) | 170 | reals += BigDecimal.valueOf(value) |
168 | } | 171 | } |
@@ -199,6 +202,10 @@ class InstanceModel2PartialInterpretation { | |||
199 | value.lookup(partialInterpretationTrace.primitiveValues.integerMap) | 202 | value.lookup(partialInterpretationTrace.primitiveValues.integerMap) |
200 | } | 203 | } |
201 | 204 | ||
205 | dispatch protected def translateValue(Short value, Ecore2Logic_Trace ecore2LogicTrace, Problem2PartialInterpretationTrace partialInterpretationTrace) { | ||
206 | Integer.valueOf(value).lookup(partialInterpretationTrace.primitiveValues.integerMap) | ||
207 | } | ||
208 | |||
202 | dispatch protected def translateValue(Double value, Ecore2Logic_Trace ecore2LogicTrace, Problem2PartialInterpretationTrace partialInterpretationTrace) { | 209 | dispatch protected def translateValue(Double value, Ecore2Logic_Trace ecore2LogicTrace, Problem2PartialInterpretationTrace partialInterpretationTrace) { |
203 | BigDecimal.valueOf(value).lookup(partialInterpretationTrace.primitiveValues.realMap) | 210 | BigDecimal.valueOf(value).lookup(partialInterpretationTrace.primitiveValues.realMap) |
204 | } | 211 | } |