Changeset 950


Ignore:
Timestamp:
Apr 25, 2013 11:32:59 AM (8 years ago)
Author:
stefan
Message:

merge r928 from trunk

Location:
stable/0.4/Couenne/src/branch
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/0.4/Couenne/src/branch

  • stable/0.4/Couenne/src/branch/Nauty.cpp

    r508 r950  
    110110  // Right now die if bad index.  Can throw exception later
    111111  //printf("addelement %d %d \n", ix, jx);
    112   assert(ix < n_ and jx < n_);
     112  assert(ix < n_ && jx < n_);
    113113  if(ix != jx){  //No Loops
    114114    set *gv = GRAPHROW(G_, ix, m_);
     
    186186{
    187187  // Right now die if bad index.  Can throw exception later
    188   assert(ix < n_ and jx < n_);
     188  assert(ix < n_ && jx < n_);
    189189  set *gv = GRAPHROW(G_, ix, m_);
    190190  if (ISELEMENT(gv, jx)) {
Note: See TracChangeset for help on using the changeset viewer.