Changeset 1476


Ignore:
Timestamp:
Apr 9, 2019 11:59:49 PM (9 days ago)
Author:
stefan
Message:

sync with trunk

Location:
stable/0.60
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/0.60

    • Property svn:mergeinfo changed
      /trunkmerged: 1475
  • stable/0.60/Cgl

  • stable/0.60/Cgl/src/CglZeroHalf/Cgl012cut.cpp

    r1324 r1476  
    16861686  for ( e = 0; e < s_cyc->length; e++ ) {
    16871687    i = (s_cyc->edge_list[e])->constr;
    1688     if ( i >= 0 ) {
     1688    if ( i >= 0 && flag_comb[i] != IN) {
    16891689      /* the edge is not associated with a bound constraint */
     1690      assert (ncomb<inp_ilp->mr);
    16901691      comb[ncomb] = i; ncomb++; flag_comb[i] = IN;
    16911692    }
Note: See TracChangeset for help on using the changeset viewer.