From be2fd000db012b3738211ebee8db36001235c918 Mon Sep 17 00:00:00 2001 From: Aren Babikian Date: Thu, 14 Jan 2021 13:11:21 -0500 Subject: complete change of real representation BigDecimal->Double --- .../InstanceModel2PartialInterpretation.xtend | 27 +++++++++++----------- .../PartialInterpretationInitialiser.xtend | 4 ++-- 2 files changed, 15 insertions(+), 16 deletions(-) (limited to 'Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu') 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 cb5b587f..94959025 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 @@ -13,7 +13,6 @@ import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.Par import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.Problem2PartialInterpretationTrace import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialRelationInterpretation import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationFactory -import java.math.BigDecimal import java.util.HashMap import java.util.HashSet import java.util.List @@ -148,7 +147,7 @@ class InstanceModel2PartialInterpretation { private def createTypeScopesFromKnownAttributeValues(List objects, Set attributesUsed) { val Set integers = new HashSet - val Set reals = new HashSet + val Set reals = new HashSet val Set strings = new HashSet for(object: objects) { for(attribute : object.eClass.EAllAttributes.filter[attributesUsed.contains(it)]) { @@ -170,28 +169,28 @@ class InstanceModel2PartialInterpretation { it.knownStrings += strings ] } - private def dispatch shortValue(Boolean value, Set integers, Set reals, Set strings) { + private def dispatch shortValue(Boolean value, Set integers, Set reals, Set strings) { // Do nothing } - private def dispatch shortValue(Integer value, Set integers, Set reals, Set strings) { + private def dispatch shortValue(Integer value, Set integers, Set reals, Set strings) { integers += value } - private def dispatch shortValue(Short value, Set integers, Set reals, Set strings) { + private def dispatch shortValue(Short value, Set integers, Set reals, Set strings) { integers += Integer.valueOf(value) } - private def dispatch shortValue(Float value, Set integers, Set reals, Set strings) { - reals += BigDecimal.valueOf(value) + private def dispatch shortValue(Float value, Set integers, Set reals, Set strings) { + reals += Double.valueOf(value) } - private def dispatch shortValue(Double value, Set integers, Set reals, Set strings) { - reals += BigDecimal.valueOf(value) + private def dispatch shortValue(Double value, Set integers, Set reals, Set strings) { + reals += value } - private def dispatch shortValue(String value, Set integers, Set reals, Set strings) { + private def dispatch shortValue(String value, Set integers, Set reals, Set strings) { strings += value } - private def dispatch shortValue(Void value, Set integers, Set reals, Set strings) { + private def dispatch shortValue(Void value, Set integers, Set reals, Set strings) { // Do nothing } - private def dispatch shortValue(Object value, Set integers, Set reals, Set strings) { + private def dispatch shortValue(Object value, Set integers, Set reals, Set strings) { // Do nothing } @@ -220,11 +219,11 @@ class InstanceModel2PartialInterpretation { } dispatch protected def translateValue(Double value, Ecore2Logic_Trace ecore2LogicTrace, Problem2PartialInterpretationTrace partialInterpretationTrace) { - BigDecimal.valueOf(value).lookup(partialInterpretationTrace.primitiveValues.realMap) + value.lookup(partialInterpretationTrace.primitiveValues.realMap) } dispatch protected def translateValue(Float value, Ecore2Logic_Trace ecore2LogicTrace, Problem2PartialInterpretationTrace partialInterpretationTrace) { - BigDecimal.valueOf(value).lookup(partialInterpretationTrace.primitiveValues.realMap) + Double.valueOf(value).lookup(partialInterpretationTrace.primitiveValues.realMap) } dispatch protected def translateValue(String value, Ecore2Logic_Trace ecore2LogicTrace, Problem2PartialInterpretationTrace partialInterpretationTrace) { diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/PartialInterpretationInitialiser.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/PartialInterpretationInitialiser.xtend index 20ff58f2..92db5c18 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/PartialInterpretationInitialiser.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/PartialInterpretationInitialiser.xtend @@ -52,7 +52,7 @@ import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.* PartialIntegerInterpretation integerInterpretation Map integerMap PartialRealInterpretation realInterpretation - Map realMap + Map realMap PartialStringInterpretation stringInterpretation Map stringMap } @@ -146,7 +146,7 @@ class PartialInterpretationInitialiser { return integerInterpretation } - def protected initReals(PartialInterpretation partialInterpretation, SortedSet knownReals, int minNewReals, int maxNewReals) { + def protected initReals(PartialInterpretation partialInterpretation, SortedSet knownReals, int minNewReals, int maxNewReals) { val realInterpretation = createPartialRealInterpretation partialInterpretation.partialtypeinterpratation += realInterpretation -- cgit v1.2.3-70-g09d2