COIN-OR::LEMON - Graph Library

Changes in / [513:2a136de8e3f2:512:9b9ffe7d9b75] in lemon-1.2


Ignore:
Location:
lemon
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • lemon/graph_to_eps.h

    r509 r440  
    3030#include<ctime>
    3131#else
    32 #ifndef WIN32_LEAN_AND_MEAN
    3332#define WIN32_LEAN_AND_MEAN
    34 #endif
    35 #ifndef NOMINMAX
    3633#define NOMINMAX
    37 #endif
    3834#include<windows.h>
    3935#endif
     
    693689#else
    694690      SYSTEMTIME time;
     691      char buf1[11], buf2[9], buf3[5];
     692
    695693      GetSystemTime(&time);
    696 #if defined(_MSC_VER) && (_MSC_VER < 1500)
    697       LPWSTR buf1, buf2, buf3;
    698694      if (GetDateFormat(LOCALE_USER_DEFAULT, 0, &time,
    699                         L"ddd MMM dd", buf1, 11) &&
     695                        "ddd MMM dd", buf1, 11) &&
    700696          GetTimeFormat(LOCALE_USER_DEFAULT, 0, &time,
    701                         L"HH':'mm':'ss", buf2, 9) &&
     697                        "HH':'mm':'ss", buf2, 9) &&
    702698          GetDateFormat(LOCALE_USER_DEFAULT, 0, &time,
    703                         L"yyyy", buf3, 5)) {
     699                                "yyyy", buf3, 5)) {
    704700        os << "%%CreationDate: " << buf1 << ' '
    705701           << buf2 << ' ' << buf3 << std::endl;
    706702      }
    707 #else
    708         char buf1[11], buf2[9], buf3[5];
    709         if (GetDateFormat(LOCALE_USER_DEFAULT, 0, &time,
    710                           "ddd MMM dd", buf1, 11) &&
    711             GetTimeFormat(LOCALE_USER_DEFAULT, 0, &time,
    712                           "HH':'mm':'ss", buf2, 9) &&
    713             GetDateFormat(LOCALE_USER_DEFAULT, 0, &time,
    714                           "yyyy", buf3, 5)) {
    715           os << "%%CreationDate: " << buf1 << ' '
    716              << buf2 << ' ' << buf3 << std::endl;
    717         }
    718 #endif
    719703#endif
    720704    }
  • lemon/lp_base.cc

    r510 r459  
    2323namespace lemon {
    2424
    25   const LpBase::Value LpBase::INF =
    26     std::numeric_limits<LpBase::Value>::infinity();
    27   const LpBase::Value LpBase::NaN =
    28     std::numeric_limits<LpBase::Value>::quiet_NaN();
     25  const LpBase::Value LpBase::INF = std::numeric_limits<Value>::infinity();
     26  const LpBase::Value LpBase::NaN = std::numeric_limits<Value>::quiet_NaN();
    2927
    3028} //namespace lemon
  • lemon/lp_base.h

    r511 r471  
    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

    r511 r470  
    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;
  • lemon/time_measure.h

    r509 r440  
    2525
    2626#ifdef WIN32
    27 #ifndef WIN32_LEAN_AND_MEAN
    2827#define WIN32_LEAN_AND_MEAN
    29 #endif
    30 #ifndef NOMINMAX
    3128#define NOMINMAX
    32 #endif
    3329#include <windows.h>
    3430#include <cmath>
    3531#else
    36 #include <unistd.h>
    3732#include <sys/times.h>
    3833#include <sys/time.h>
Note: See TracChangeset for help on using the changeset viewer.