LEMON/LEMON-official Changeset - r560:2a136de8e3f2

Repositories » LEMON » LEMON-official

Summary
Changelog
Files
Switch To
- loading...
Options
- Lightweight changelog
- Search
Pull Requests

Changeset - r560:2a136de8e3f2

« 558:06787d
« 559:9b9ffe

561:2eb5c8 »

r560:2a136de8e3f2

Fri, 13 Feb 2009 17:05:21

[Not Reviewed]

0 comments (0 inline)

alpar (Alpar Juttner)
alpar@cs.elte.hu

Merge

0 5 0

merge default

0 files changed with 37 insertions and 14 deletions:

lemon/graph_to_eps.h

lemon/lp_base.cc

lemon/lp_base.h

lemon/math.h

lemon/time_measure.h

↑ Collapse diff ↑

lemon/graph_to_eps.h

Show inline comments

@@ -29,8 +29,12 @@
 		#include<sys/time.h>
 		#include<ctime>
 		#else
 		#ifndef WIN32_LEAN_AND_MEAN
 		#define WIN32_LEAN_AND_MEAN
 		#endif
 		#ifndef NOMINMAX
 		#define NOMINMAX
 		#endif
 		#include<windows.h>
 		#endif
@@ -688,18 +692,30 @@
 		      os << "%%CreationDate: " << cbuf;
 		#else
 		      SYSTEMTIME time;
 		      char buf1[11], buf2[9], buf3[5];
 		      GetSystemTime(&time);
 		#if defined(_MSC_VER) && (_MSC_VER < 1500)
 		      LPWSTR buf1, buf2, buf3;
 		      if (GetDateFormat(LOCALE_USER_DEFAULT, 0, &time,
 		                        "ddd MMM dd", buf1, 11) &&
+		                        L"ddd MMM dd", buf1, 11) &&
 		          GetTimeFormat(LOCALE_USER_DEFAULT, 0, &time,
 		                        "HH':'mm':'ss", buf2, 9) &&
+		                        L"HH':'mm':'ss", buf2, 9) &&
 		          GetDateFormat(LOCALE_USER_DEFAULT, 0, &time,
-		                                "yyyy", buf3, 5)) {
+		                        L"yyyy", buf3, 5)) {
 		        os << "%%CreationDate: " << buf1 << ' '
 		           << buf2 << ' ' << buf3 << std::endl;
+		      }
 		#else
 		        char buf1[11], buf2[9], buf3[5];
 		        if (GetDateFormat(LOCALE_USER_DEFAULT, 0, &time,
 		                          "ddd MMM dd", buf1, 11) &&
 		            GetTimeFormat(LOCALE_USER_DEFAULT, 0, &time,
 		                          "HH':'mm':'ss", buf2, 9) &&
 		            GetDateFormat(LOCALE_USER_DEFAULT, 0, &time,
 		                          "yyyy", buf3, 5)) {
 		          os << "%%CreationDate: " << buf1 << ' '
 		             << buf2 << ' ' << buf3 << std::endl;
+		        }
 		#endif
 		#endif
+		    }

lemon/lp_base.cc

Show inline comments

@@ -22,7 +22,9 @@
 		#include <lemon/lp_base.h>
 		namespace lemon {
 		  const LpBase::Value LpBase::INF = std::numeric_limits<Value>::infinity();
 		  const LpBase::Value LpBase::NaN = std::numeric_limits<Value>::quiet_NaN();
 		  const LpBase::Value LpBase::INF =
 		    std::numeric_limits<LpBase::Value>::infinity();
 		  const LpBase::Value LpBase::NaN =
 		    std::numeric_limits<LpBase::Value>::quiet_NaN();
 		} //namespace lemon

lemon/lp_base.h

Show inline comments

@@ -597,11 +597,11 @@
 		      const Value &upperBound() const { return _ub; }
 		      ///Is the constraint lower bounded?
 		      bool lowerBounded() const {
-		        return _lb != -INF && !isnan(_lb);
+		        return _lb != -INF && !isNaN(_lb);
+		      }
 		      ///Is the constraint upper bounded?
 		      bool upperBounded() const {
-		        return _ub != INF && !isnan(_ub);
+		        return _ub != INF && !isNaN(_ub);
+		      }
 		    };
@@ -1666,7 +1666,7 @@
 		  inline LpBase::Constr operator<=(const LpBase::Value &n,
 		                                   const LpBase::Constr &c) {
 		    LpBase::Constr tmp(c);
-		    LEMON_ASSERT(isnan(tmp.lowerBound()), "Wrong LP constraint");
+		    LEMON_ASSERT(isNaN(tmp.lowerBound()), "Wrong LP constraint");
 		    tmp.lowerBound()=n;
 		    return tmp;
+		  }
@@ -1678,7 +1678,7 @@
 		                                   const LpBase::Value &n)
+		  {
 		    LpBase::Constr tmp(c);
-		    LEMON_ASSERT(isnan(tmp.upperBound()), "Wrong LP constraint");
+		    LEMON_ASSERT(isNaN(tmp.upperBound()), "Wrong LP constraint");
 		    tmp.upperBound()=n;
 		    return tmp;
+		  }
@@ -1690,7 +1690,7 @@
 		  inline LpBase::Constr operator>=(const LpBase::Value &n,
 		                                   const LpBase::Constr &c) {
 		    LpBase::Constr tmp(c);
-		    LEMON_ASSERT(isnan(tmp.upperBound()), "Wrong LP constraint");
+		    LEMON_ASSERT(isNaN(tmp.upperBound()), "Wrong LP constraint");
 		    tmp.upperBound()=n;
 		    return tmp;
+		  }
@@ -1702,7 +1702,7 @@
 		                                   const LpBase::Value &n)
+		  {
 		    LpBase::Constr tmp(c);
-		    LEMON_ASSERT(isnan(tmp.lowerBound()), "Wrong LP constraint");
+		    LEMON_ASSERT(isNaN(tmp.lowerBound()), "Wrong LP constraint");
 		    tmp.lowerBound()=n;
 		    return tmp;
+		  }

lemon/math.h

Show inline comments

@@ -60,7 +60,7 @@
  ///This function checks whether the parameter is NaN or not.
  ///Is should be equivalent with std::isnan(), but it is not
  ///provided by all compilers.
  inline bool isnan(double v)
  inline bool isNaN(double v)
    {
      return v!=v;
    }

lemon/time_measure.h

Show inline comments

@@ -24,11 +24,16 @@
 		///\brief Tools for measuring cpu usage
 		#ifdef WIN32
 		#ifndef WIN32_LEAN_AND_MEAN
 		#define WIN32_LEAN_AND_MEAN
 		#endif
 		#ifndef NOMINMAX
 		#define NOMINMAX
 		#endif
 		#include <windows.h>
 		#include <cmath>
 		#else
 		#include <unistd.h>
 		#include <sys/times.h>
 		#include <sys/time.h>
 		#endif

0 comments (0 inline)

RhodeCode

Login to your account

...	...	@@ -60,7 +60,7 @@
60	60	///This function checks whether the parameter is NaN or not.
61	61	///Is should be equivalent with std::isnan(), but it is not
62	62	///provided by all compilers.
63		inline bool ~~isnan~~(double v)
	63	inline bool isNaN(double v)
64	64	{
65	65	return v!=v;
66	66	}