Changeset 1799 for trunk

Timestamp:

Oct 30, 2012 1:07:45 PM (7 years ago)

Author:

forrest

Message:

more logical comparison and out assert on pi for sos

Location:

trunk/Cbc/src

Files:

• CbcCompareDefault.cpp (modified) (1 diff)
• CbcSOS.cpp (modified) (2 diffs)

trunk/Cbc/src/CbcCompareDefault.cpp

@@ -172 +172 @@
             } else {
                 assert (depthX != depthY) ;
-                return depthX > depthY;
+                return depthX < depthY;
             }
         }

trunk/Cbc/src/CbcSOS.cpp

@@ -298 +298 @@
                 double movement = info->usefulRegion_[iRow];
                 // not this time info->usefulRegion_[iRow]=0.0;
-                if (lower[iRow] < -1.0e20)
-                    assert (pi[iRow] <= 1.0e-3);
-                if (upper[iRow] > 1.0e20)
-                    assert (pi[iRow] >= -1.0e-3);
+#if 0
+                if (lower[iRow] < -1.0e20) {
+                  if (pi[iRow] > 1.0e-3) {
+                    printf("Bad pi on row %d of %g\n",iRow,pi[iRow]);
+                  }
+                }
+                if (upper[iRow] >1.0e20) {
+                  if (pi[iRow] < -1.0e-3) {
+                    printf("Bad pi on row %d of %g\n",iRow,pi[iRow]);
+                  }
+                }
+#endif
                 double valueP = pi[iRow] * direction;
                 // if move makes infeasible then make at least default
@@ -358 +366 @@
                 double movement = info->usefulRegion_[iRow];
                 info->usefulRegion_[iRow] = 0.0;
-                if (lower[iRow] < -1.0e20)
-                    assert (pi[iRow] <= 1.0e-3);
-                if (upper[iRow] > 1.0e20)
-                    assert (pi[iRow] >= -1.0e-3);
+#if 0
+                if (lower[iRow] < -1.0e20) {
+                  if (pi[iRow] > 1.0e-3) {
+                    printf("Bad pi on row %d of %g\n",iRow,pi[iRow]);
+                  }
+                }
+                if (upper[iRow] >1.0e20) {
+                  if (pi[iRow] < -1.0e-3) {
+                    printf("Bad pi on row %d of %g\n",iRow,pi[iRow]);
+                  }
+                }
+#endif
                 double valueP = pi[iRow] * direction;
                 // if move makes infeasible then make at least default