Changeset 1308


Ignore:
Timestamp:
Jan 29, 2020 12:58:11 PM (2 months ago)
Author:
stefan
Message:

use COUENNE_INFINITY instead of ASL (neg)Infinity

  • ASL DLL does not export (neg)Infinity
Location:
branches/autotools-update/Couenne/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/autotools-update/Couenne/src/main/CouenneBab.cpp

    r1009 r1308  
    4343// Code to enable user interruption
    4444static CbcModel * currentBranchModel = NULL; // pointer to the main b&b
    45 extern Bonmin::OACutGenerator2 *currentOA;   // pointer to the OA generator
    46 extern CbcModel                *OAModel;     // pointer to the submip if using Cbc
     45extern BONMINLIB_EXPORT Bonmin::OACutGenerator2 *currentOA;   // pointer to the OA generator
     46extern BONMINLIB_EXPORT CbcModel                *OAModel;     // pointer to the submip if using Cbc
    4747
    4848extern "C" {
  • branches/autotools-update/Couenne/src/readnl/CouenneAmplInterface.cpp

    r1307 r1308  
    537537
    538538    // set constraint sign
    539     if (lb > negInfinity)
    540       if (ub < Infinity) sign = COUENNE_RNG;
     539    if (lb > -COUENNE_INFINITY /* negInfinity */)
     540      if (ub < COUENNE_INFINITY /* Infinity */) sign = COUENNE_RNG;
    541541      else               sign = COUENNE_GE;
    542542    else                 sign = COUENNE_LE;
  • branches/autotools-update/Couenne/src/readnl/readnl.cpp

    r1269 r1308  
    322322
    323323    // set constraint sign
    324     if (lb > negInfinity)
    325       if (ub < Infinity) sign = COUENNE_RNG;
     324    if (lb > -COUENNE_INFINITY /*negInfinity*/)
     325      if (ub < COUENNE_INFINITY /*Infinity*/) sign = COUENNE_RNG;
    326326      else               sign = COUENNE_GE;
    327327    else                 sign = COUENNE_LE;
     
    381381
    382382    // add them (and set lower-upper bound)
    383     if ((lb < negInfinity) &&
    384         (ub > Infinity)) {
     383    if ((lb < -COUENNE_INFINITY /*negInfinity*/) &&
     384        (ub > COUENNE_INFINITY /*Infinity*/)) {
    385385
    386386      printf ("Free constraint %d ignored\n", i);
Note: See TracChangeset for help on using the changeset viewer.