diff options
| author |  OszkarSemerath <oszkar.semerath@gmail.com> | 2018-08-28 18:45:46 +0200 |
|---|---|---|
| committer | OszkarSemerath <oszkar.semerath@gmail.com> | 2018-08-28 18:45:46 +0200 |
| commit | b2174e0df4bfd7954c966ff4f0ae005a61c70d9d (patch) | |
| tree | 3e88919a09961fc1dd290b3fa2350986367f9801 /Solvers | |
| parent | Models are not visualized if the documentation level is above NORMAL (diff) | |
| download | VIATRA-Generator-b2174e0df4bfd7954c966ff4f0ae005a61c70d9d.tar.gz VIATRA-Generator-b2174e0df4bfd7954c966ff4f0ae005a61c70d9d.tar.zst VIATRA-Generator-b2174e0df4bfd7954c966ff4f0ae005a61c70d9d.zip | |
Added support for SHORT type as integer
Diffstat (limited to 'Solvers')
1 files changed, 7 insertions, 0 deletions
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 | } |