Changeset 928 for trunk

Timestamp:

Nov 30, 2012 10:37:18 AM (7 years ago)

Author:

stefan

Message:

use C/C++ syntax

File:

• trunk/Couenne/src/branch/Nauty.cpp (modified) (2 diffs)

trunk/Couenne/src/branch/Nauty.cpp

@@ -110 +110 @@
   // Right now die if bad index.  Can throw exception later
   //printf("addelement %d %d \n", ix, jx);
-  assert(ix < n_ and jx < n_);
+  assert(ix < n_ && jx < n_);
   if(ix != jx){  //No Loops
     set *gv = GRAPHROW(G_, ix, m_);
@@ -183 +183 @@
 {
   // Right now die if bad index.  Can throw exception later
-  assert(ix < n_ and jx < n_);
+  assert(ix < n_ && jx < n_);
   set *gv = GRAPHROW(G_, ix, m_);
   if (ISELEMENT(gv, jx)) {