Merge pull request #1199 from NREL/2023.12.17.r2.ssc.292

version update for 2023.12.17.r2.ssc.292
NREL · Aug 6, 2024 · a80f94b · a80f94b
2 parents 9c2f573 + 36ec7ee
commit a80f94b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/lpsolve/lp_params.cpp b/lpsolve/lp_params.cpp
@@ -276,22 +276,22 @@ static struct _values verbose[] =
 static struct _functions functions[] =
 {
   /* solve options */
-  { "ANTI_DEGEN", setintfunction(get_anti_degen, set_anti_degen), setvalues(anti_degen, ~0), WRITE_ACTIVE },
-  { "BASISCRASH", setintfunction(get_basiscrash, set_basiscrash), setvalues(basiscrash, ~0), WRITE_ACTIVE },
-  { "IMPROVE", setintfunction(get_improve, set_improve), setvalues(improve, ~0), WRITE_ACTIVE },
+  { "ANTI_DEGEN", setintfunction(get_anti_degen, set_anti_degen), setvalues(anti_degen, static_cast<unsigned int>(~0)), WRITE_ACTIVE },
+  { "BASISCRASH", setintfunction(get_basiscrash, set_basiscrash), setvalues(basiscrash, static_cast<unsigned int>(~0)), WRITE_ACTIVE },
+  { "IMPROVE", setintfunction(get_improve, set_improve), setvalues(improve, static_cast<unsigned int>(~0)), WRITE_ACTIVE },
   { "MAXPIVOT", setintfunction(get_maxpivot, set_maxpivot), setNULLvalues, WRITE_ACTIVE },
   { "NEGRANGE", setREALfunction(get_negrange, set_negrange), setNULLvalues, WRITE_ACTIVE },
   { "PIVOTING", setintfunction(get_pivoting, set_pivoting), setvalues(pivoting, PRICER_LASTOPTION), WRITE_ACTIVE },
-  { "PRESOLVE", setintfunction(get_presolve, set_presolve1), setvalues(presolving, ~0), WRITE_ACTIVE },
+  { "PRESOLVE", setintfunction(get_presolve, set_presolve1), setvalues(presolving, static_cast<unsigned int>(~0)), WRITE_ACTIVE },
   { "PRESOLVELOOPS", setintfunction(get_presolveloops, set_presolve2), setNULLvalues, WRITE_ACTIVE },
   { "SCALELIMIT", setREALfunction(get_scalelimit, set_scalelimit), setNULLvalues, WRITE_ACTIVE },
   { "SCALING", setintfunction(get_scaling, set_scaling), setvalues(scaling, SCALE_CURTISREID), WRITE_ACTIVE },
-  { "SIMPLEXTYPE", setintfunction(get_simplextype, set_simplextype), setvalues(simplextype, ~0), WRITE_ACTIVE },
+  { "SIMPLEXTYPE", setintfunction(get_simplextype, set_simplextype), setvalues(simplextype, static_cast<unsigned int>(~0)), WRITE_ACTIVE },
   { "OBJ_IN_BASIS", setMYBOOLfunction(is_obj_in_basis, set_obj_in_basis), setNULLvalues, WRITE_COMMENTED },
 
   /* B&B options */
   { "BB_DEPTHLIMIT", setintfunction(get_bb_depthlimit, set_bb_depthlimit), setNULLvalues, WRITE_ACTIVE },
-  { "BB_FLOORFIRST", setintfunction(get_bb_floorfirst, set_bb_floorfirst), setvalues(bb_floorfirst, ~0), WRITE_ACTIVE },
+  { "BB_FLOORFIRST", setintfunction(get_bb_floorfirst, set_bb_floorfirst), setvalues(bb_floorfirst, static_cast<unsigned int>(~0)), WRITE_ACTIVE },
   { "BB_RULE", setintfunction(get_bb_rule, set_bb_rule), setvalues(bb_rule, NODE_STRATEGYMASK), WRITE_ACTIVE },
   { "BREAK_AT_FIRST", setMYBOOLfunction(is_break_at_first, set_break_at_first), setNULLvalues, WRITE_COMMENTED },
   { "BREAK_AT_VALUE", setREALfunction(get_break_at_value, set_break_at_value), setNULLvalues, WRITE_COMMENTED },
@@ -310,10 +310,10 @@ static struct _functions functions[] =
   /* read-only options */
   { "DEBUG", setMYBOOLfunction(is_debug, set_debug), setNULLvalues, WRITE_COMMENTED },
   { "OBJ_BOUND", setREALfunction(get_obj_bound, set_obj_bound), setNULLvalues, WRITE_COMMENTED },
-  { "PRINT_SOL", setintfunction(get_print_sol, set_print_sol), setvalues(print_sol, ~0), WRITE_COMMENTED },
+  { "PRINT_SOL", setintfunction(get_print_sol, set_print_sol), setvalues(print_sol, static_cast<unsigned int>(~0)), WRITE_COMMENTED },
   { "TIMEOUT", setlongfunction(get_timeout, set_timeout), setNULLvalues, WRITE_COMMENTED },
   { "TRACE", setMYBOOLfunction(is_trace, set_trace), setNULLvalues, WRITE_COMMENTED },
-  { "VERBOSE", setintfunction(get_verbose, set_verbose), setvalues(verbose, ~0), WRITE_COMMENTED },
+  { "VERBOSE", setintfunction(get_verbose, set_verbose), setvalues(verbose, static_cast<unsigned int>(~0)), WRITE_COMMENTED },
 };
 
 static void write_params1(lprec *lp, FILE *fp, char *header, int newline)

diff --git a/ssc/sscapi.cpp b/ssc/sscapi.cpp
@@ -51,7 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 SSCEXPORT int ssc_version()
 {
-	return 290;
+	return 292;
 }
 
 SSCEXPORT const char *ssc_build_info()