From 990c11d652d4a84157b8810d4fef7bf5d27713db Mon Sep 17 00:00:00 2001 From: Gleb Belov Date: Thu, 31 Aug 2023 20:37:24 +1000 Subject: [PATCH] Disable sol check by default #200 --- CHANGES.mp.md | 4 ++-- CMakeLists.txt | 2 +- include/mp/flat/converter.h | 4 ++-- solvers/cbcmp/CHANGES.cbcmp.md | 5 +++++ solvers/copt/CHANGES.copt.md | 5 +++++ solvers/gcgmp/CHANGES.gcgmp.md | 5 +++++ solvers/gurobi/CHANGES.gurobi.md | 5 +++++ solvers/highsmp/CHANGES.highsmp.md | 5 +++++ solvers/mosek/CHANGES.mosek.md | 5 +++++ solvers/scipmp/CHANGES.scipmp.md | 5 +++++ solvers/xpress/CHANGES.xpress.md | 5 +++++ 11 files changed, 45 insertions(+), 5 deletions(-) diff --git a/CHANGES.mp.md b/CHANGES.mp.md index 6f7ad3347..a7af25eeb 100644 --- a/CHANGES.mp.md +++ b/CHANGES.mp.md @@ -1,8 +1,8 @@ Summary of recent updates to the AMPL MP Library ================================================ -## unreleased -- Check solutions, options sol:chk:*. +## 20230831 +- Solution checking, options sol:chk:* (experimental). - Preprocess And/Or constraints. diff --git a/CMakeLists.txt b/CMakeLists.txt index 92532b339..9a3d2ff43 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -214,7 +214,7 @@ endmacro() include_directories(include) set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) -set(MP_DATE 20230817) +set(MP_DATE 20230831) set(MP_SYSINFO "${CMAKE_SYSTEM_NAME} ${CMAKE_SYSTEM_PROCESSOR}") diff --git a/include/mp/flat/converter.h b/include/mp/flat/converter.h index 237afb29d..8ba7ae6a3 100644 --- a/include/mp/flat/converter.h +++ b/include/mp/flat/converter.h @@ -1146,7 +1146,7 @@ class FlatConverter : int relax_ = 0; - int solcheckmode_ = 1+2+16; + int solcheckmode_ = 0; //1+2+16? +512?; bool solcheckfail_ = false; double solfeastol_ = 1e-6; double solinttol_ = 1e-5; @@ -1247,7 +1247,7 @@ class FlatConverter : " applied by the solver when computing " " expression values.\n" "\n" - "Default: 1+2+16.", + "Default: 0.", options_.solcheckmode_, 0, 1024); GetEnv().AddOption("sol:chk:feastol sol:chk:eps sol:eps chk:eps", "Solution checking tolerance for objective values, variable " diff --git a/solvers/cbcmp/CHANGES.cbcmp.md b/solvers/cbcmp/CHANGES.cbcmp.md index 7c4428dca..9b50f48e7 100644 --- a/solvers/cbcmp/CHANGES.cbcmp.md +++ b/solvers/cbcmp/CHANGES.cbcmp.md @@ -1,6 +1,11 @@ Summary of recent updates to CBCMP for AMPL =========================================== +## 20230831 +- Solution checking, options sol:chk:* (experimental). +- Preprocess And/Or constraints. + + ## 20230817 - Fixed a bug causing repeated names for auxiliary variables and constraints. diff --git a/solvers/copt/CHANGES.copt.md b/solvers/copt/CHANGES.copt.md index e3af0d62d..edc8fad18 100644 --- a/solvers/copt/CHANGES.copt.md +++ b/solvers/copt/CHANGES.copt.md @@ -1,6 +1,11 @@ Summary of recent updates to COPT for AMPL ========================================== +## 20230831 +- Solution checking, options sol:chk:* (experimental). +- Preprocess And/Or constraints. + + ## 20230817 - Alternative solutions: solve status equal to that of the final solution. diff --git a/solvers/gcgmp/CHANGES.gcgmp.md b/solvers/gcgmp/CHANGES.gcgmp.md index 3febd7933..96496fc81 100644 --- a/solvers/gcgmp/CHANGES.gcgmp.md +++ b/solvers/gcgmp/CHANGES.gcgmp.md @@ -1,6 +1,11 @@ Summary of recent updates to GCG for AMPL ========================================= +## 20230831 +- Solution checking, options sol:chk:* (experimental). +- Preprocess And/Or constraints. + + ## 20230817 - Alternative solutions: solve status equal to that of the final solution. diff --git a/solvers/gurobi/CHANGES.gurobi.md b/solvers/gurobi/CHANGES.gurobi.md index 74ef75835..ff66173f7 100644 --- a/solvers/gurobi/CHANGES.gurobi.md +++ b/solvers/gurobi/CHANGES.gurobi.md @@ -1,6 +1,11 @@ Summary of recent updates to gurobi for AMPL ============================================ +## 20230831 +- Solution checking, options sol:chk:* (experimental). +- Preprocess And/Or constraints. + + ## 20230817 - Alternative solutions: solve status equal to that of the final solution. diff --git a/solvers/highsmp/CHANGES.highsmp.md b/solvers/highsmp/CHANGES.highsmp.md index e9f954c53..28b809057 100644 --- a/solvers/highsmp/CHANGES.highsmp.md +++ b/solvers/highsmp/CHANGES.highsmp.md @@ -1,6 +1,11 @@ Summary of recent updates to HiGHS for AMPL =========================================== +## 20230831 +- Solution checking, options sol:chk:* (experimental). +- Preprocess And/Or constraints. + + ## 20230817 - Fixed a bug causing repeated names for auxiliary variables and constraints. diff --git a/solvers/mosek/CHANGES.mosek.md b/solvers/mosek/CHANGES.mosek.md index 67d46bd73..1c533d0df 100644 --- a/solvers/mosek/CHANGES.mosek.md +++ b/solvers/mosek/CHANGES.mosek.md @@ -1,6 +1,11 @@ Summary of recent updates to MOSEK for AMPL =========================================== +## 20230831 +- Solution checking, options sol:chk:* (experimental). +- Preprocess And/Or constraints. + + ## 20230817 - Fixed a bug causing repeated names for auxiliary variables and constraints. diff --git a/solvers/scipmp/CHANGES.scipmp.md b/solvers/scipmp/CHANGES.scipmp.md index 96f1a8644..9906a4e5e 100644 --- a/solvers/scipmp/CHANGES.scipmp.md +++ b/solvers/scipmp/CHANGES.scipmp.md @@ -1,6 +1,11 @@ Summary of recent updates to SCIP for AMPL ========================================== +## 20230831 +- Solution checking, options sol:chk:* (experimental). +- Preprocess And/Or constraints. + + ## 20230817 - Alternative solutions: solve status equal to that of the final solution. diff --git a/solvers/xpress/CHANGES.xpress.md b/solvers/xpress/CHANGES.xpress.md index 563c71e4c..4da5d05a4 100644 --- a/solvers/xpress/CHANGES.xpress.md +++ b/solvers/xpress/CHANGES.xpress.md @@ -1,6 +1,11 @@ Summary of recent updates to Xpress for AMPL ============================================ +## 20230831 +- Solution checking, options sol:chk:* (experimental). +- Preprocess And/Or constraints. + + ## 20230817 - Alternative solutions: solve status equal to that of the final solution.