Changeset 948

Timestamp:

Apr 25, 2013 9:15:04 AM (8 years ago)

Author:

stefan

Message:

merge r947 from trunk

Location:

stable/0.4/Couenne

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/bound_tightening (modified) (1 prop)
• src/branch (modified) (1 prop)
• src/expression/CouennePrecisions.hpp (modified) (1 diff)
• src/expression/operators/exprGroup.cpp (modified) (1 prop)
• src/heuristics/BonNlpHeuristic.cpp (modified) (1 prop)

stable/0.4/Couenne/src/expression/CouennePrecisions.hpp

@@ -29 +29 @@
 
 // for bounds
+#ifndef COUENNE_INFINITY
 #define COUENNE_INFINITY      1.e+50
+#endif
 
 // for cuts, ensures stability and scaling in Clp