Changeset 943

Timestamp:

Feb 6, 2013 10:11:36 PM (8 years ago)

Author:

pbelotti

Message:

starting to fix #22

Location:

trunk/Couenne/src

Files:

• main/BonCouenne.cpp (modified) (3 diffs)
• problem/CouenneRecordBestSol.cpp (modified) (2 diffs)

trunk/Couenne/src/main/BonCouenne.cpp

@@ -239 +239 @@
         exit(1);
       }
+
+      // round cbcSol's integer coordinates
+
+      // for (int i=0; i<modelNvars; i++)
+      //        if (cp -> Var (i) -> isDefinedInteger ())
+      //          cbcSol [i] = COUENNE_round (cbcSol [i]);
 
       if (cbcObjVal < 1e49 && !infeasible) {
@@ -265 +271 @@
       bool couenneSolIsFeas = false;
 
+      // round couenneSol's integer coordinates
+
+      // for (int i=0; i<modelNvars; i++)
+      //        if (cp -> Var (i) -> isDefinedInteger ())
+      //          couenneSol [i] = COUENNE_round (couenneSol [i]);
+
       if(couenneSol != NULL) {
 #ifdef FM_CHECKNLP2
+        int cMS = rs->getCardModSol();
         couenneSolIsFeas = cp->checkNLP2(couenneSol, 0, false, 
                                          false, true, 
                                          cp->getFeasTol());
-        int cMS = rs->getCardModSol();
         CoinCopyN(rs->getModSol(cMS), cMS, modCouenneSol);
         modCouenneSolVal = rs->getModSolVal();
         modCouenneSolMaxViol = rs->getModSolMaxViol();
 #else /* not FM_CHECKNLP2 */
+        int cMS = cp->nVars();
         couenneSolIsFeas = cp->checkNLP(couenneSol, modCouenneSolVal, true);
-        int cMS = cp->nVars();
         CoinCopyN(couenneSol, cMS, modCouenneSol);
         modCouenneSolMaxViol = cp->getFeasTol();
@@ -283 +295 @@
       }
 
-      retcomp = rs -> compareAndSave (modCbcSol, modCbcSolVal, 
-                                      modCbcSolMaxViol, cbcSolIsFeas,
-                                      modCouenneSol, modCouenneSolVal, 
-                                      modCouenneSolMaxViol, couenneSolIsFeas, 
+      retcomp = rs -> compareAndSave (modCbcSol,     modCbcSolVal,     modCbcSolMaxViol,     cbcSolIsFeas,
+                                      modCouenneSol, modCouenneSolVal, modCouenneSolMaxViol, couenneSolIsFeas, 
                                       modelNvars, cp->getFeasTol());
 

trunk/Couenne/src/problem/CouenneRecordBestSol.cpp

@@ -215 +215 @@
         modSol = newSol;
         cardSol = givenCard;
-
     }
   }
@@ -258 +257 @@
 
 /*****************************************************************************/
-int CouenneRecordBestSol::compareAndSave(const double *solA, const double solAVal,
-                                  const double solAMaxViol, 
-                                  const bool solAIsFeas,
-                                  const double *solB, const double solBVal,
-                                  const double solBMaxViol, 
-                                  const bool solBIsFeas,
-                                  const int cardSol,
-                                  const double precision) {
+int CouenneRecordBestSol::compareAndSave(const double *solA, const double solAVal, const double solAMaxViol, const bool solAIsFeas,
+                                         const double *solB, const double solBVal, const double solBMaxViol, const bool solBIsFeas,
+                                         const int cardSol,
+                                         const double precision) {
   int retval = -2;
   if(solBIsFeas) {