diff options
| author |  anqili426 <mollisterkl@outlook.com> | 2020-05-11 14:12:17 -0400 |
|---|---|---|
| committer | anqili426 <mollisterkl@outlook.com> | 2020-05-11 14:12:17 -0400 |
| commit | d24451ed79bf1080ed8be195eac5047ef91e587f (patch) | |
| tree | 534fabf6a74901e6aeaa00a4ff22acc5076b1ace /Framework | |
| parent | Add Satellite Case Study to testing framework (diff) | |
| download | VIATRA-Generator-d24451ed79bf1080ed8be195eac5047ef91e587f.tar.gz VIATRA-Generator-d24451ed79bf1080ed8be195eac5047ef91e587f.tar.zst VIATRA-Generator-d24451ed79bf1080ed8be195eac5047ef91e587f.zip | |
Fixed bug in setting constant types
Diffstat (limited to 'Framework')
| -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) { |