11 files changed, 33 insertions, 36 deletions

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/RealLiteral.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/RealLiteral.java
index 0ba0a6ca..fd289abb 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/RealLiteral.java
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/RealLiteral.java
@@ -2,8 +2,6 @@
  */

 package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage;

 

-import java.math.BigDecimal;

-

 /**

  * <!-- begin-user-doc -->

  * A representation of the model object '<em><b>Real Literal</b></em>'.

@@ -30,12 +28,12 @@ public interface RealLiteral extends AtomicTerm {
          * </p>

          * <!-- end-user-doc -->

          * @return the value of the '<em>Value</em>' attribute.

-         * @see #setValue(BigDecimal)

+         * @see #setValue(double)

          * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage#getRealLiteral_Value()

          * @model required="true"

          * @generated

          */

-        BigDecimal getValue();

+        double getValue();

 

         /**

          * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RealLiteral#getValue <em>Value</em>}' attribute.

@@ -45,6 +43,6 @@ public interface RealLiteral extends AtomicTerm {
          * @see #getValue()

          * @generated

          */

-        void setValue(BigDecimal value);

+        void setValue(double value);

 

 } // RealLiteral

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LogiclanguagePackageImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LogiclanguagePackageImpl.java
index 03a679e4..48cb3efb 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LogiclanguagePackageImpl.java
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LogiclanguagePackageImpl.java
@@ -2351,7 +2351,7 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu
                 initEAttribute(getBoolLiteral_Value(), ecorePackage.getEBoolean(), "value", null, 1, 1, BoolLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

                 initEClass(realLiteralEClass, RealLiteral.class, "RealLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-                initEAttribute(getRealLiteral_Value(), ecorePackage.getEBigDecimal(), "value", null, 1, 1, RealLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+                initEAttribute(getRealLiteral_Value(), ecorePackage.getEDouble(), "value", null, 1, 1, RealLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

                 initEClass(variableEClass, Variable.class, "Variable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

                 initEReference(getVariable_Range(), this.getTypeReference(), null, "range", null, 1, 1, Variable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/RealLiteralImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/RealLiteralImpl.java
index ffb2b97f..08791e2a 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/RealLiteralImpl.java
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/RealLiteralImpl.java
@@ -4,9 +4,6 @@ package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
 

 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;

 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RealLiteral;

-

-import java.math.BigDecimal;

-

 import org.eclipse.emf.common.notify.Notification;

 

 import org.eclipse.emf.ecore.EClass;

@@ -35,7 +32,7 @@ public class RealLiteralImpl extends AtomicTermImpl implements RealLiteral {
          * @generated

          * @ordered

          */

-        protected static final BigDecimal VALUE_EDEFAULT = null;

+        protected static final double VALUE_EDEFAULT = 0.0;

 

         /**

          * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.

@@ -45,7 +42,7 @@ public class RealLiteralImpl extends AtomicTermImpl implements RealLiteral {
          * @generated

          * @ordered

          */

-        protected BigDecimal value = VALUE_EDEFAULT;

+        protected double value = VALUE_EDEFAULT;

 

         /**

          * <!-- begin-user-doc -->

@@ -72,7 +69,7 @@ public class RealLiteralImpl extends AtomicTermImpl implements RealLiteral {
          * @generated

          */

         @Override

-        public BigDecimal getValue() {

+        public double getValue() {

                 return value;

         }

 

@@ -82,8 +79,8 @@ public class RealLiteralImpl extends AtomicTermImpl implements RealLiteral {
          * @generated

          */

         @Override

-        public void setValue(BigDecimal newValue) {

-                BigDecimal oldValue = value;

+        public void setValue(double newValue) {

+                double oldValue = value;

                 value = newValue;

                 if (eNotificationRequired())

                         eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.REAL_LITERAL__VALUE, oldValue, value));

@@ -112,7 +109,7 @@ public class RealLiteralImpl extends AtomicTermImpl implements RealLiteral {
         public void eSet(int featureID, Object newValue) {

                 switch (featureID) {

                         case LogiclanguagePackage.REAL_LITERAL__VALUE:

-                                setValue((BigDecimal)newValue);

+                                setValue((Double)newValue);

                                 return;

                 }

                 super.eSet(featureID, newValue);

@@ -142,7 +139,7 @@ public class RealLiteralImpl extends AtomicTermImpl implements RealLiteral {
         public boolean eIsSet(int featureID) {

                 switch (featureID) {

                         case LogiclanguagePackage.REAL_LITERAL__VALUE:

-                                return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);

+                                return value != VALUE_EDEFAULT;

                 }

                 return super.eIsSet(featureID);

         }

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.ecore b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.ecore
index a91d4407..4db42c27 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.ecore
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.ecore
@@ -55,7 +55,7 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="RealLiteral" eSuperTypes="#//AtomicTerm">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBigDecimal"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Variable" eSuperTypes="#//SymbolicDeclaration">

     <eStructuralFeatures xsi:type="ecore:EReference" name="range" lowerBound="1" eType="#//TypeReference"

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) {

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic2ecore/src/hu/bme/mit/inf/dslreasoner/logic2ecore/Logic2Ecore.xtend b/Framework/hu.bme.mit.inf.dslreasoner.logic2ecore/src/hu/bme/mit/inf/dslreasoner/logic2ecore/Logic2Ecore.xtend
index 8d6b565a..3a74963f 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic2ecore/src/hu/bme/mit/inf/dslreasoner/logic2ecore/Logic2Ecore.xtend
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic2ecore/src/hu/bme/mit/inf/dslreasoner/logic2ecore/Logic2Ecore.xtend
@@ -109,13 +109,14 @@ class Logic2Ecore {
         }

         

         def translateType(EDataType type, Object value) {

-                if(type == EcorePackage.eINSTANCE.EFloat) {

-                        val bd = value as BigDecimal

-                        return bd.floatValue

-                } else if( type  == EcorePackage.eINSTANCE.EDouble ) {

-                        val bd = value as BigDecimal

-                        return bd.doubleValue

-                } else return value

+//              if(type == EcorePackage.eINSTANCE.EFloat) {

+//                      val bd = value as BigDecimal

+//                      return bd.floatValue

+//              } else if( type  == EcorePackage.eINSTANCE.EDouble ) {

+//                      val bd = value as BigDecimal

+//                      return bd.doubleValue

+//              } else 

+                return value

         }

         

         protected dispatch def Map<? extends TermDescription, ? extends Object> getAllElementsOfDatatype(EEnum type, Ecore2Logic_Trace forwardTrace, LogicModelInterpretation interpretation) {

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/NumericDrealProblemSolver.java b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/NumericDrealProblemSolver.java
index 55d52031..f410cc6d 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/NumericDrealProblemSolver.java
+++ b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/NumericDrealProblemSolver.java
@@ -171,7 +171,8 @@ public class NumericDrealProblemSolver extends NumericProblemSolver{
                                 if (isInt) {

                                         expr = Integer.toString(((IntegerElement) matchedObj).getValue());

                                 } else {

-                                        expr = Double.toString(((RealElement) matchedObj).getValue().doubleValue());

+                                        expr = Double.toString(((RealElement) matchedObj).getValue());

+//                                      expr = Double.toString(((RealElement) matchedObj).getValue().doubleValue());

                                 }

                                 varMap.put(matchedObj, expr);

                         }

@@ -301,7 +302,7 @@ public class NumericDrealProblemSolver extends NumericProblemSolver{
         

         private Map<String, String> parseDrealOutput(List<String> output) {

                 Map<String, String> res = new HashMap<String, String>();

-                String re = "(\\w+) : \\[([0-9\\-.e]+), ([0-9\\-.e]+)\\]";

+                String re = "(\\w+) : \\[([0-9\\-+.e]+), ([0-9\\-+.e]+)\\]";

                 Pattern p = Pattern.compile(re);

                 for (String varVal : output) {

                     Matcher m = p.matcher(varVal);

@@ -350,7 +351,7 @@ public class NumericDrealProblemSolver extends NumericProblemSolver{
                                         } else {

                                                 String varName = varMap.get(obj);

                                                 String value = solMap.get(varName);

-                                                sol.put(obj, Integer.parseInt(value));

+                                                sol.put(obj, Double.parseDouble(value));

                                         }

 

                                 } else {

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/NumericZ3ProblemSolver.java b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/NumericZ3ProblemSolver.java
index ab7f6ddc..db33804e 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/NumericZ3ProblemSolver.java
+++ b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/NumericZ3ProblemSolver.java
@@ -174,7 +174,7 @@ public class NumericZ3ProblemSolver extends NumericProblemSolver{
                                         int value = ((IntegerElement) matchedObj).getValue();

                                         expr = (ArithExpr) ctx.mkInt(value);

                                 } else {

-                                        double value = ((RealElement) matchedObj).getValue().doubleValue();

+                                        double value = ((RealElement) matchedObj).getValue();

                                         expr = (ArithExpr) ctx.mkReal(String.valueOf(value));

                                 }

                                 varMap.put(matchedObj, expr);