Ignore:
Timestamp:
Nov 27, 2012 2:11:04 PM (7 years ago)
Author:
stefan
Message:

merge r923 and r924 from stable/0.4 and extend to 3 global variables

Location:
trunk/Couenne
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Couenne

  • trunk/Couenne/src/main/BonCouenne.cpp

    r897 r925  
    5252#include "Nauty.h"
    5353
    54 int nOrbBr = 0; // FIXME: horrible global variable. Brrr.
    55 int maxDepthOrbBranch = -1; // FIXME: horrible global variable. Brrr.
    56 int nSGcomputations = 0; // FIXME: horrible global variable. Brrr.
     54// FIXME: horrible global variables. Brrr.
     55#include "CouenneBranchingObject.hpp"
    5756#endif
    5857
     
    196195
    197196#ifdef COIN_HAS_NTY
    198     if (nOrbBr)
    199       printf ("%d orbital nontrivial branchings\n", nOrbBr);
     197    if (CouenneBranchingObject::nOrbBr)
     198      printf ("%d orbital nontrivial branchings\n", CouenneBranchingObject::nOrbBr);
    200199#endif
    201200
     
    447446#ifdef COIN_HAS_NTY
    448447                ,symmGroupSize
    449                 ,nSGcomputations
     448                ,CouenneBranchingObject::nSGcomputations
    450449#endif
    451450);
Note: See TracChangeset for help on using the changeset viewer.