diff options
author | Oszkar Semerath <semerath@mit.bme.hu> | 2020-05-11 22:05:52 +0200 |
---|---|---|
committer | Oszkar Semerath <semerath@mit.bme.hu> | 2020-05-11 22:05:52 +0200 |
commit | 69f2790769ac36f08e391a4c484e8005f7c568e3 (patch) | |
tree | 14b8b459e8a1bc89bafd6bab54d4cd76ac476101 /Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit | |
parent | Bigliteral serialization in xmi transformation fixed (diff) | |
parent | Fixed bug in setting constant types (diff) | |
download | VIATRA-Generator-69f2790769ac36f08e391a4c484e8005f7c568e3.tar.gz VIATRA-Generator-69f2790769ac36f08e391a4c484e8005f7c568e3.tar.zst VIATRA-Generator-69f2790769ac36f08e391a4c484e8005f7c568e3.zip |
Merge branch 'master' of https://github.com/viatra/VIATRA-Generator
Diffstat (limited to 'Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit')
-rw-r--r-- | Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/NumericProblemSolver.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/NumericProblemSolver.java b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/NumericProblemSolver.java index 7240f612..070b71ad 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/NumericProblemSolver.java +++ b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/NumericProblemSolver.java | |||
@@ -204,8 +204,15 @@ public class NumericProblemSolver { | |||
204 | // Constants | 204 | // Constants |
205 | else if (e instanceof XNumberLiteral) { | 205 | else if (e instanceof XNumberLiteral) { |
206 | String value = ((XNumberLiteral) e).getValue(); | 206 | String value = ((XNumberLiteral) e).getValue(); |
207 | try{ int val = Integer.parseInt(value); expr = (ArithExpr) ctx.mkInt(val);} catch(NumberFormatException err){} | 207 | try{ |
208 | try{ long val = Long.parseLong(value); expr = (ArithExpr) ctx.mkReal(val);} catch(NumberFormatException err){} | 208 | int val = Integer.parseInt(value); |
209 | expr = (ArithExpr) ctx.mkInt(val); | ||
210 | } catch(NumberFormatException err){ | ||
211 | try{ | ||
212 | long val = Long.parseLong(value); | ||
213 | expr = (ArithExpr) ctx.mkReal(val); | ||
214 | } catch(NumberFormatException err2){} | ||
215 | } | ||
209 | } | 216 | } |
210 | // Expressions with operators | 217 | // Expressions with operators |
211 | else if (e instanceof XBinaryOperation) { | 218 | else if (e instanceof XBinaryOperation) { |