complete change of real representation BigDecimal->Double

4 files changed, 8 insertions, 8 deletions

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicModelInterpretation.xtend b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicModelInterpretation.xtend
index cdcbb48a..b49eb6aa 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicModelInterpretation.xtend
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicModelInterpretation.xtend
@@ -85,9 +85,9 @@ interface LogicModelInterpretation {
         /**

          * Returns all real numbers relevant to the logic structure. Not all integer is necessarily used.

          */

-        def SortedSet<BigDecimal> getAllRealsInStructure()

+        def SortedSet<Double> getAllRealsInStructure()

 

-        def Map<TermDescription, BigDecimal> getAllRealsWithInterpretation() {

+        def Map<TermDescription, Double> getAllRealsWithInterpretation() {

                 allRealsInStructure.toMap [ real |

                         (LogiclanguageFactory.eINSTANCE.createRealLiteral => [value = real]) as TermDescription

                 ]

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicProblemBuilder.xtend b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicProblemBuilder.xtend
index fa97cbef..c8ff0b28 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicProblemBuilder.xtend
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicProblemBuilder.xtend
@@ -481,9 +481,9 @@ class LogicProblemBuilder{
         def Pow(TermDescription left, TermDescription right) {createPow => [leftOperand = left.toTerm rightOperand = right.toTerm]}

         def asTerm(boolean value) { createBoolLiteral => [x|x.value = value]  }

         def asTerm(int value) { createIntLiteral => [x|x.value = value] }

-        def asTerm(double value) { BigDecimal.valueOf(value).asTerm }

-        def asTerm(float value) { BigDecimal.valueOf(value).asTerm }

-        def asTerm(BigDecimal value) { createRealLiteral => [x|x.value = value] }

+        def asTerm(double value) { createRealLiteral => [x|x.value = value] }

+        def asTerm(float value) { createRealLiteral => [x|x.value = value] }

+//      def asTerm(BigDecimal value) { createRealLiteral => [x|x.value = value] }

         def asTerm(String value) { createStringLiteral => [x|x.value = value]}

         def InstanceOf(TermDescription term, TypeDescriptor type) {

                 createInstanceOf => [

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicSolver.xtend b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicSolver.xtend
index e62a3cb7..51d315b4 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicSolver.xtend
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicSolver.xtend
@@ -96,7 +96,7 @@ public class TypeScopes {
         public var minNewIntegers = 0

         public var maxNewIntegers = Unlimited

         

-        public var SortedSet<BigDecimal> knownReals = new TreeSet

+        public var SortedSet<Double> knownReals = new TreeSet

         /**

          * Sets the number of Reals that has to be used to solve the problem.

          */

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicStructureBuilder.xtend b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicStructureBuilder.xtend
index 7ca67d83..507e4bfd 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicStructureBuilder.xtend
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicStructureBuilder.xtend
@@ -146,7 +146,7 @@ class LogicStructureBuilder{
         }

         

         def protected dispatch Term toTerm(Integer o)  { createIntLiteral=>[value = o] }

-        def protected dispatch Term toTerm(BigDecimal o) { createRealLiteral=>[value = o]}

+        def protected dispatch Term toTerm(Double o) { createRealLiteral=>[value = o]}

         def protected dispatch Term toTerm(Boolean o) { createBoolLiteral=>[value = o]}

         def protected dispatch Term toTerm(SymbolicDeclaration o) { createSymbolicValue=>[symbolicReference = o]}

         def public Term termDescriptiontoTerm(TermDescription term) {

@@ -171,7 +171,7 @@ class LogicStructureBuilder{
         // Atomic resoulutions

         def protected dispatch Object resolve(IntLiteral literal,  LogicModelInterpretation interpretation, Map<Variable,Object> variableBinding) { return literal.value as Integer }

         def protected dispatch Object resolve(BoolLiteral literal, LogicModelInterpretation interpretation, Map<Variable,Object> variableBinding) { return literal.value }

-        def protected dispatch Object resolve(RealLiteral literal, LogicModelInterpretation interpretation, Map<Variable,Object> variableBinding) { return literal.value as BigDecimal }

+        def protected dispatch Object resolve(RealLiteral literal, LogicModelInterpretation interpretation, Map<Variable,Object> variableBinding) { return literal.value as Double }

         def protected dispatch Object resolve(StringLiteral literal, LogicModelInterpretation interpretation, Map<Variable,Object> variableBinding) { return literal.value }

         

         def protected dispatch Object resolve(Not not, LogicModelInterpretation interpretation, Map<Variable,Object> variableBinding) {