'solution_round' for if-then #200

'option solution_round 6;' rounds solution values to 6 post-comma digits, helping to correctly evaluate if-then
ampl · Apr 28, 2023 · 307075e · 307075e
1 parent 5ecade4
commit 307075e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/solvers/CMakeLists.txt b/solvers/CMakeLists.txt
@@ -90,7 +90,8 @@ function(add_ampl_solver name)
             set_property(TARGET ${module}-library PROPERTY
               IMPORTED_IMPLIB ${l})
         endif()
-       target_include_directories(${module}-library INTERFACE ${${module_upper}_INCLUDE_DIRS})
+       target_include_directories(${module}-library
+         INTERFACE ${${module_upper}_INCLUDE_DIRS})
        endforeach()
       endif()
     endif ()
@@ -103,7 +104,7 @@ function(add_ampl_solver name)
 
   if (TARGET ${module}-library)
     get_target_property(TRG_PROP_IMPRT_LOC ${module}-library IMPORTED_LOCATION)
-    if (NOT libraries)#OR TRG_PROP_IMPRT_LOC)
+    if (NOT libraries)#OR TRG_PROP_IMPRT_LOC) does not work when >1 solver libs
       set(libraries ${module}-library)
     endif()
   endif ()

diff --git a/test/end2end/cases/categorized/fast/cp_global_constraints/modellist.json b/test/end2end/cases/categorized/fast/cp_global_constraints/modellist.json
@@ -57,20 +57,27 @@
     "name" : "x-multmip3 [count, if]",
     "files": ["x-multmip3.mod", "multmip3.dat"],
     "tags" : ["logical"],
+    "options": { "solution_round": "6" },
+    "comment_options": "For solution_round, see #200",
     "objective" : 235625
   },
   {
     "name" : "x-multmip3 [count, if] cmpEps=0.01",
     "files": ["x-multmip3.mod", "multmip3.dat"],
     "tags" : ["logical"],
-    "options": { "ANYSOLVER_options": "cvt:mip:eps=1e-2" },
+    "options": {
+      "solution_round": "6",
+      "ANYSOLVER_options": "cvt:mip:eps=1e-2"
+    },
+    "comment_options": "For solution_round, see #200",
     "objective" : 235625
   },
   {
     "name" : "x-multmip1 [if, >]",
     "files": ["x-multmip1.mod", "multmip1.dat"],
     "tags" : ["logical"],
     "options": { "solution_round": "6" },
+    "comment_options": "For solution_round, see #200",
     "objective" : 218125
   },
   {