|
|
74dc8f8 |
--- Couenne-0.5.7/src/branch/StrongBranchingSetupList.cpp.orig 2012-06-11 21:41:05.000000000 -0600
|
|
|
74dc8f8 |
+++ Couenne-0.5.7/src/branch/StrongBranchingSetupList.cpp 2019-06-22 18:44:58.089475200 -0600
|
|
|
74dc8f8 |
@@ -262,7 +262,7 @@ inline bool compStrongPri (struct objStr
|
|
|
74dc8f8 |
|
|
|
74dc8f8 |
CoinFillN (varObj, n, -1);
|
|
|
74dc8f8 |
|
|
|
74dc8f8 |
- for (unsigned int i = 0; i < numberObjects; i++) {
|
|
|
74dc8f8 |
+ for (int i = 0; i < numberObjects; i++) {
|
|
|
74dc8f8 |
|
|
|
74dc8f8 |
int indVar = objectOrig [i] -> columnNumber ();
|
|
|
74dc8f8 |
|
|
|
74dc8f8 |
@@ -415,9 +415,9 @@ inline bool compStrongPri (struct objStr
|
|
|
74dc8f8 |
|
|
|
74dc8f8 |
while (numberOnList_ == 0) { // FIXME: add iteration limit
|
|
|
74dc8f8 |
|
|
|
74dc8f8 |
- for (unsigned int i = 0; i < numberObjects; i++) {
|
|
|
74dc8f8 |
+ for (int i = 0; i < numberObjects; i++) {
|
|
|
74dc8f8 |
|
|
|
74dc8f8 |
- int indexObj = ((objectInd.size () > 0) && (i < objectInd.size ())) ? objectInd [i] : i;
|
|
|
74dc8f8 |
+ int indexObj = ((objectInd.size () > 0) && ((size_t)i < objectInd.size ())) ? objectInd [i] : i;
|
|
|
74dc8f8 |
|
|
|
74dc8f8 |
int way;
|
|
|
74dc8f8 |
//double value = object [indexObj] -> checkInfeasibility (info);
|
|
|
74dc8f8 |
--- Couenne-0.5.7/src/convex/generateCuts.cpp.orig 2014-03-12 19:35:13.000000000 -0600
|
|
|
74dc8f8 |
+++ Couenne-0.5.7/src/convex/generateCuts.cpp 2019-06-22 18:43:07.720675304 -0600
|
|
|
74dc8f8 |
@@ -477,13 +477,13 @@ void CouenneCutGenerator::generateCuts (
|
|
|
74dc8f8 |
|
|
|
74dc8f8 |
if (jnlst_ -> ProduceOutput (J_VECTOR, J_BOUNDTIGHTENING)) {
|
|
|
74dc8f8 |
printf ("orbit bounds: "); fflush (stdout);
|
|
|
74dc8f8 |
- for(int j = 0; j < orbit.size (); j++) {
|
|
|
74dc8f8 |
+ for(size_t j = 0; j < orbit.size (); j++) {
|
|
|
74dc8f8 |
printf ("x_%d [%g,%g] ", orbit[j], lb [orbit [j]], ub [orbit [j]]);
|
|
|
74dc8f8 |
fflush (stdout);
|
|
|
74dc8f8 |
}
|
|
|
74dc8f8 |
}
|
|
|
74dc8f8 |
|
|
|
74dc8f8 |
- for (int j = 0; j < orbit.size (); j++) {
|
|
|
74dc8f8 |
+ for (size_t j = 0; j < orbit.size (); j++) {
|
|
|
74dc8f8 |
|
|
|
74dc8f8 |
int indOrb = orbit [j];
|
|
|
74dc8f8 |
|
|
|
74dc8f8 |
@@ -497,7 +497,7 @@ void CouenneCutGenerator::generateCuts (
|
|
|
74dc8f8 |
jnlst_ -> Printf (J_VECTOR, J_BOUNDTIGHTENING,
|
|
|
74dc8f8 |
" --> new common bounds: [%g,%g]\n", ll, uu);
|
|
|
74dc8f8 |
|
|
|
74dc8f8 |
- for(int j = 0; j < orbit.size (); j++) {
|
|
|
74dc8f8 |
+ for(size_t j = 0; j < orbit.size (); j++) {
|
|
|
74dc8f8 |
|
|
|
74dc8f8 |
int indOrb = orbit [j];
|
|
|
74dc8f8 |
|