COIN-OR::LEMON - Graph Library

Changeset 511:06787db0ef5f in lemon-1.2


Ignore:
Timestamp:
02/13/09 16:01:09 (11 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Phase:
public
Message:

Change LEMON's isnan() to isNaN() for the sake of AIX/xlC

Certain xlC versions implement isnan() as a #define.

Location:
lemon
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • lemon/lp_base.h

    r471 r511  
    598598      ///Is the constraint lower bounded?
    599599      bool lowerBounded() const {
    600         return _lb != -INF && !isnan(_lb);
     600        return _lb != -INF && !isNaN(_lb);
    601601      }
    602602      ///Is the constraint upper bounded?
    603603      bool upperBounded() const {
    604         return _ub != INF && !isnan(_ub);
     604        return _ub != INF && !isNaN(_ub);
    605605      }
    606606
     
    16671667                                   const LpBase::Constr &c) {
    16681668    LpBase::Constr tmp(c);
    1669     LEMON_ASSERT(isnan(tmp.lowerBound()), "Wrong LP constraint");
     1669    LEMON_ASSERT(isNaN(tmp.lowerBound()), "Wrong LP constraint");
    16701670    tmp.lowerBound()=n;
    16711671    return tmp;
     
    16791679  {
    16801680    LpBase::Constr tmp(c);
    1681     LEMON_ASSERT(isnan(tmp.upperBound()), "Wrong LP constraint");
     1681    LEMON_ASSERT(isNaN(tmp.upperBound()), "Wrong LP constraint");
    16821682    tmp.upperBound()=n;
    16831683    return tmp;
     
    16911691                                   const LpBase::Constr &c) {
    16921692    LpBase::Constr tmp(c);
    1693     LEMON_ASSERT(isnan(tmp.upperBound()), "Wrong LP constraint");
     1693    LEMON_ASSERT(isNaN(tmp.upperBound()), "Wrong LP constraint");
    16941694    tmp.upperBound()=n;
    16951695    return tmp;
     
    17031703  {
    17041704    LpBase::Constr tmp(c);
    1705     LEMON_ASSERT(isnan(tmp.lowerBound()), "Wrong LP constraint");
     1705    LEMON_ASSERT(isNaN(tmp.lowerBound()), "Wrong LP constraint");
    17061706    tmp.lowerBound()=n;
    17071707    return tmp;
  • lemon/math.h

    r470 r511  
    6161  ///Is should be equivalent with std::isnan(), but it is not
    6262  ///provided by all compilers.
    63   inline bool isnan(double v)
     63  inline bool isNaN(double v)
    6464    {
    6565      return v!=v;
Note: See TracChangeset for help on using the changeset viewer.