Changeset 1055 for trunk

Timestamp:

Jan 31, 2014 1:27:50 PM (6 years ago)

Author:

fmargot

Message:

Fix tiny coefficients in generated cuts creating problem in resolve for Clp

File:

• trunk/Couenne/src/convex/operators/conv-exprTrilinear-gencuts.cpp (modified) (2 diffs)

trunk/Couenne/src/convex/operators/conv-exprTrilinear-gencuts.cpp

@@ -1279 +1279 @@
   for (int i = (int) cutIndices.size (); i--;) {
 
-    int 
-       size = (int) cutIndices [i].size (),
-      *ind  = new int [size];
-
-    double *coe = new double [size];
-
     // Fix right hand sides: all cuts have coefficients of w equal to
     // one, but they might be inequality-type auxiliaries.
@@ -1295 +1289 @@
     }
 
-    if ((cutLb [i] > - COUENNE_INFINITY) ||
-        (cutUb [i] <   COUENNE_INFINITY)) {
-
-      std::copy (cutIndices [i].begin (), cutIndices [i].end (), ind);
-      std::copy (cutCoeff   [i].begin (), cutCoeff   [i].end (), coe);
-
-      OsiRowCut cut (cutLb [i], cutUb [i], 4, 4, ind, coe);
+    if ((cutLb [i] > - COUENNE_INFINITY/10) ||
+        (cutUb [i] <   COUENNE_INFINITY/10)) {
+
+      int 
+        size = (int) cutIndices [i].size (),
+        *ind  = new int [size];
+      
+      double *coe = new double [size];
+
+      int cardCut = 0;
+      for(int fmi=0; fmi<4; fmi++) {
+        if(fabs(cutCoeff[i][fmi]) > 1e-8) {
+          ind[cardCut] = cutIndices[i][fmi];
+          coe[cardCut] = cutCoeff[i][fmi];
+          cardCut++;
+        }
+      }
+
+      OsiRowCut cut (cutLb [i], cutUb [i], 4, cardCut, ind, coe);
       //cut.print ();
-
-      delete [] ind;
-      delete [] coe;
 
       if (cg -> Problem () -> bestSol ()) {