Changeset 923


Ignore:
Timestamp:
Nov 27, 2012 1:55:39 PM (8 years ago)
Author:
stefan
Message:

move global variable nOrbBr into couenne library, so users don't have to declare it

Location:
stable/0.4/Couenne/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/0.4/Couenne/src/branch/BranchCore.cpp

    r874 r923  
    1313#include "CouenneProblem.hpp"
    1414
    15 extern int nOrbBr;
    16 
    1715using namespace Ipopt;
    1816using namespace Couenne;
     17
     18int CouenneBranchingObject::nOrbBr = 0;
    1919
    2020/** \brief Execute the core of the branch --- need to separate code
  • stable/0.4/Couenne/src/branch/CouenneBranchingObject.hpp

    r560 r923  
    9191  void branchCore (OsiSolverInterface *, int, int, bool, double, t_chg_bounds *&);
    9292
     93  static int nOrbBr;
     94
    9395protected:
    9496
  • stable/0.4/Couenne/src/main/BonCouenne.cpp

    r854 r923  
    5050
    5151#ifdef COIN_HAS_NTY
    52 int nOrbBr = 0; // FIXME: horrible global variable. Brrr.
     52// FIXME: horrible global variable. Brrr.
     53#include "CouenneBranchingObject.hpp"
    5354#endif
    5455
     
    188189#ifdef COIN_HAS_NTY
    189190    if (nOrbBr)
    190       printf ("%d orbital nontrivial branchings\n", nOrbBr);
     191      printf ("%d orbital nontrivial branchings\n", CouenneBranchingObject::nOrbBr);
    191192#endif
    192193
Note: See TracChangeset for help on using the changeset viewer.