Changeset 300


Ignore:
Timestamp:
Apr 6, 2006 3:46:41 PM (13 years ago)
Author:
lou
Message:

addCuts: separate debug code levels for clarity. FULL_DEBUG -> CBC_CHECK_BASIS

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/CbcNode.cpp

    r293 r300  
    278278      cuts_[numberCuts_++] = thisCut;
    279279#ifdef CBC_DEBUG
     280#if CBC_DEBUG>1
    280281      int n=thisCut->row().getNumElements();
    281 #if CBC_DEBUG>1
    282282      printf("Cut %d has %d entries, rhs %g %g =>",i,n,thisCut->lb(),
    283283             thisCut->ub());
    284 #endif
    285284      int j;
    286 #if CBC_DEBUG>1
    287285      const int * index = thisCut->row().getIndices();
    288 #endif
    289286      const double * element = thisCut->row().getElements();
    290287      for (j=0;j<n;j++) {
    291 #if CBC_DEBUG>1
    292288        printf(" (%d,%g)",index[j],element[j]);
    293 #endif
    294289        assert(fabs(element[j])>1.00e-12);
    295290      }
    296291      printf("\n");
     292#else
     293      int n=thisCut->row().getNumElements();
     294      int j;
     295      const double * element = thisCut->row().getElements();
     296      for (j=0;j<n;j++) {
     297        assert(fabs(element[j])>1.00e-12);
     298      }
     299#endif
    297300#endif
    298301    }
     
    752755    if (expanded)
    753756      expanded->resize(iFull,numberColumns);
    754 #ifdef FULL_DEBUG
     757#ifdef CBC_CHECK_BASIS
    755758    printf("Before expansion: orig %d, old %d, new %d, current %d\n",
    756759           numberRowsAtContinuous,numberOldActiveCuts,numberNewCuts,
     
    786789      }
    787790    }
    788 #ifdef FULL_DEBUG
     791#ifdef CBC_CHECK_BASIS
    789792    printf("Expanded basis\n");
    790793    expanded->print() ;
Note: See TracChangeset for help on using the changeset viewer.