Changeset 932 for trunk

Timestamp:

Dec 24, 2012 2:19:20 PM (7 years ago)

Author:

pbelotti

Message:

fixed additionalSDPcuts

Location:

trunk/Couenne/src/cut/sdpcuts

Files:

• CouenneMatrix.cpp (modified) (1 diff)
• CutGen.cpp (modified) (10 diffs)

trunk/Couenne/src/cut/sdpcuts/CouenneMatrix.cpp

@@ -108 +108 @@
   }
 
-  check_and_insert (rowInd, colInd, row_,                elem);
-  check_and_insert (colInd, rowInd, col_, new exprClone (elem));
+  check_and_insert (rowInd, colInd, row_, elem);
+  if (elem -> code () == COU_EXPRCONST) 
+    elem = new exprClone (elem);
+  check_and_insert (colInd, rowInd, col_, elem);
 }
 

trunk/Couenne/src/cut/sdpcuts/CutGen.cpp

@@ -624 +624 @@
                                             int *card_v_mat, 
                                             int *evdec_num) const {
-
-  if (running_n==1) 
+  if (running_n == 1) 
     return;
 
@@ -634 +633 @@
 
   double
-
     best_val    = 1,
 
@@ -649 +647 @@
     *z          = new double [rnsq];
 
-  //while (running_n > 1)
+  // while (running_n > 1)
 
   for (int k=0; k<running_n; k++) {
@@ -679 +677 @@
     (*evdec_num)++;
 
+    //------------------------------------------------------------------------------------------------------------------------------
     dsyevx_interface (running_n - 1, T, card_ev, w, z, EV_TOL, -COIN_DBL_MAX, 0., 1, (running_n-1 == min_nz) ? (running_n - 1) : 1);
+    //------------------------------------------------------------------------------------------------------------------------------
 
     double val = w [0]; // minimum eigenvalue
@@ -768 +768 @@
   delete [] wbest;
 
-}// myremoveBestOneRowCol()
+}// myremoveBestOneRowCol ()
 
 
@@ -778 +778 @@
   double *matrix = new double [n*n];
 
-  // matrix[0] = 1;
-  // for (int i=0;i<n;i++)
-  //   matrix[n*(i+1)] = sol[i];
-
   for (int i=0; i<n; i++)
     for (int j=i; j<n; j++)
@@ -789 +785 @@
 
   delete [] matrix;
-}// sparsify2()
-
+} // sparsify2 ()
+
+
+// Adds SDP cuts using negative eigenvectors where small (smaller than
+// COUENNE_EPS) components are fixed to zero
 
 /************************************************************************/
@@ -799 +798 @@
                                         const double *A, 
                                         const double *vector,
-                                        int **indA) const{
-
-  int *indices;
-  indices = new int [n];
-  int cnt = 0;
-
-  for(int i=0;i<n;i++)
+                                        int **indA) const {
+  int
+    *indices = new int [n],
+    cnt = 0;
+
+  for (int i=0; i < n; i++)
     indices [i] = ((fabs (vector [i]) > COUENNE_EPS) ? (cnt++) : -1);
 
-  double *subA = new double[cnt*cnt];
-
-  for (register int i=0; i<n; i++) {
+  double *subA = new double [cnt*cnt];
+
+  for (register int i=0, k=0; i<n; i++)
+
     if (indices [i] >= 0) {
-      for (register int j=0; j<n; j++) {
+      
+      for (register int j=0, k2 = 0; j<n; j++)
+
         if (indices [j] >= 0)
-          subA [cnt*indices[j] + indices[i]] = A[n*j+i];
-      }
-    }
-  }
+          subA [cnt * k + k2++] = A [n*i + j];
+
+      ++k;
+    }
 
   double *w = NULL, *z = NULL;
@@ -832 +833 @@
   for (int k=0; k<m; k++) {
 
-    if (onlyNegEV_ && (w [k] > 0))
+    if (onlyNegEV_ && (w [k] >= 0.))
       break;
 
@@ -840 +841 @@
       v [j] = *zbase++;
 
-    for(int j=0;j<n;j++)
-      newv[j] = (indices[j] >= 0) ? v [indices[j]] : newv[j] = 0;
+    for(int j=0; j<n; j++)
+      newv [j] = (indices [j] >= 0) ? v [indices [j]] : 0.;
 
     genSDPcut (si, cs, minor, newv, newv, indA);