From 803429243a248aef91bc8696c0da5924278e1cb6 Mon Sep 17 00:00:00 2001
From: Aren Babikian <aren.babikian@mail.mcgill.ca>
Date: Sun, 14 Feb 2021 10:34:21 +0100
Subject: finished first impl that works sometimes (issue w/ SAT in Dreal
 rerun)

---
 .../inf/dslreasoner/viatra2logic/NumericDrealProblemSolver.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/NumericDrealProblemSolver.java')

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 36ea64aa..d7e0b20c 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
@@ -8,6 +8,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
+import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -504,7 +505,9 @@ public class NumericDrealProblemSolver extends NumericProblemSolver{
 						if (obj instanceof IntegerElement) {
 							sol.put(obj, Integer.parseInt(value));
 						} else {
-							sol.put(obj, Double.parseDouble(value));
+							double fullVal = Double.parseDouble(value);
+							double trimmed = Math.round(fullVal * 1000.0) / 1000.0;
+							sol.put(obj, trimmed);
 						}
 					}
 				} else {
@@ -515,6 +518,8 @@ public class NumericDrealProblemSolver extends NumericProblemSolver{
 		}
 		else {
 			System.out.println("Unsatisfiable numerical problem (trying to get solution...)");
+			//null means no soln found
+			return null;
 		}		
 		return sol;
 	}
-- 
cgit v1.2.3-54-g00ecf