2 files changed, 5 insertions, 4 deletions

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