2020-02-21 19:42:47 +00:00
|
|
|
diff -up Clp-releases-1.17.5/Clp/src/ClpSolver.cpp.orig Clp-releases-1.17.5/Clp/src/ClpSolver.cpp
|
|
|
|
--- Clp-releases-1.17.5/Clp/src/ClpSolver.cpp.orig 2020-02-03 06:32:17.000000000 -0700
|
|
|
|
+++ Clp-releases-1.17.5/Clp/src/ClpSolver.cpp 2020-02-20 09:48:11.863261899 -0700
|
|
|
|
@@ -2890,7 +2890,7 @@ clp watson.mps -\nscaling off\nprimalsim
|
Update to latest upstream release (bz 1461031, 1603677).
Also:
- Update project URL.
- Change License from EPL to EPL-1.0.
- Eliminate unnecessary BRs and Rs.
- Build with Cbc, MUMPS, nauty, and suitesparse.
- Build in bootstrap mode.
- Add -bad-cast, -badcolumn, -param, -catch, -sprintf, -overflow,
and -signed patches.
- Eliminate rpath from the library.
- Force libtool to not defeat -Wl,--as-needed.
- Be explicit about library versions as required by latest guidelines.
- Filter out unnecessary Libs values from pkgconfig files.
- Package doxygen tag file to enable cross-linking.
2019-06-28 01:42:00 +00:00
|
|
|
case CLP_PARAM_ACTION_GUESS:
|
|
|
|
if (goodModels[iModel]) {
|
|
|
|
delete[] alternativeEnvironment;
|
|
|
|
- ClpSimplexOther *model2 = static_cast< ClpSimplexOther * >(models + iModel);
|
|
|
|
+ ClpSimplexOther *model2 = reinterpret_cast< ClpSimplexOther * >(models + iModel);
|
|
|
|
alternativeEnvironment = model2->guess(0);
|
|
|
|
if (alternativeEnvironment)
|
|
|
|
CbcOrClpEnvironmentIndex = 0;
|