LEMON/LEMON-official Changeset - r558:06787db0ef5f

Repositories » LEMON » LEMON-official

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

Changeset - r558:06787db0ef5f

« 557:bc0a13

560:2a136d »

r558:06787db0ef5f

Fri, 13 Feb 2009 16:01:09

[Not Reviewed]

0 comments (0 inline)

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

Change LEMON's isnan() to isNaN() for the sake of AIX/xlC Certain xlC versions implement isnan() as a #define.

0 2 0

default

2 files changed with 7 insertions and 7 deletions:

lemon/lp_base.h

lemon/math.h

↑ Collapse diff ↑

lemon/lp_base.h

Show inline comments

@@ -596,13 +596,13 @@
 		      ///The const version of \ref upperBound()
 		      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);
+		      }
 		    };
@@ -1665,9 +1665,9 @@
 		  ///
 		  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;
+		  }
 		  ///Create constraint
@@ -1677,9 +1677,9 @@
 		  inline LpBase::Constr operator<=(const LpBase::Constr &c,
 		                                   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;
+		  }
@@ -1689,9 +1689,9 @@
 		  ///
 		  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;
+		  }
 		  ///Create constraint
@@ -1701,9 +1701,9 @@
 		  inline LpBase::Constr operator>=(const LpBase::Constr &c,
 		                                   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

@@ -59,9 +59,9 @@
  
  ///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;
    }


0 comments (0 inline)

RhodeCode

Login to your account

...	...	@@ -59,9 +59,9 @@
59	59
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	}
67	67