Changeset 1539


Ignore:
Timestamp:
Jan 14, 2010 5:36:43 PM (10 years ago)
Author:
pbonami
Message:

Fix to procedure to decide if 0-1

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

        old new  
        1 BuildTools https://projects.coin-or.org/svn/BuildTools/stable/0.5
         1BuildTools https://projects.coin-or.org/svn/BuildTools/stable/0.6
        22ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
        33ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0
         
        88ThirdParty/Metis https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.0
        99Data/Sample https://projects.coin-or.org/svn/Data/stable/1.0/Sample
        10 CoinUtils https://projects.coin-or.org/svn/CoinUtils/stable/2.5/CoinUtils
        11 Cbc https://projects.coin-or.org/svn/Cbc/stable/2.3/Cbc
        12 Cgl https://projects.coin-or.org/svn/Cgl/stable/0.54/Cgl
        13 Clp https://projects.coin-or.org/svn/Clp/stable/1.10/Clp
        14 Ipopt https://projects.coin-or.org/svn/Ipopt/stable/3.7/Ipopt
        15 Osi https://projects.coin-or.org/svn/Osi/stable/0.100/Osi
         10CoinUtils https://projects.coin-or.org/svn/CoinUtils/stable/2.6/CoinUtils
         11Cbc https://projects.coin-or.org/svn/Cbc/stable/2.4/Cbc
         12Cgl https://projects.coin-or.org/svn/Cgl/stable/0.55/Cgl
         13Clp https://projects.coin-or.org/svn/Clp/stable/1.11/Clp
         14Ipopt https://projects.coin-or.org/svn/Ipopt/stable/3.8/Ipopt
         15Osi https://projects.coin-or.org/svn/Osi/stable/0.101/Osi
  • trunk/Bonmin/src/Interfaces/BonTMINLP.cpp

    r1538 r1539  
    124124   for(unsigned int i = 0 ; i < n ; i++){
    125125      if(v_t[i] == INTEGER &&
    126          (x_lb[i] < - 0.99 || x_lb[i] > 0.99) &&
    127          (x_lb[i] <0.01 || x_ub[i] > 1.99) ){
    128          return false;
     126         (x_lb[i] < - 0.99 || x_lb[i] > 0.99 ||
     127         x_ub[i] <0.01 || x_ub[i] > 1.99) ){
     128          printf("Has general integer %i lb %g ub %g\n",i, x_lb[i], x_ub[i]);
     129         return true;
    129130      }
    130131   }
    131    return true;
     132   return false;
    132133}
    133134
  • trunk/Externals

    r1468 r1539  
    1 BuildTools https://projects.coin-or.org/svn/BuildTools/stable/0.5
     1BuildTools https://projects.coin-or.org/svn/BuildTools/stable/0.6
    22ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
    33ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0
     
    88ThirdParty/Metis https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.0
    99Data/Sample https://projects.coin-or.org/svn/Data/stable/1.0/Sample
    10 CoinUtils https://projects.coin-or.org/svn/CoinUtils/stable/2.5/CoinUtils
    11 Cbc https://projects.coin-or.org/svn/Cbc/stable/2.3/Cbc
    12 Cgl https://projects.coin-or.org/svn/Cgl/stable/0.54/Cgl
    13 Clp https://projects.coin-or.org/svn/Clp/stable/1.10/Clp
    14 Ipopt https://projects.coin-or.org/svn/Ipopt/stable/3.7/Ipopt
    15 Osi https://projects.coin-or.org/svn/Osi/stable/0.100/Osi
     10CoinUtils https://projects.coin-or.org/svn/CoinUtils/stable/2.6/CoinUtils
     11Cbc https://projects.coin-or.org/svn/Cbc/stable/2.4/Cbc
     12Cgl https://projects.coin-or.org/svn/Cgl/stable/0.55/Cgl
     13Clp https://projects.coin-or.org/svn/Clp/stable/1.11/Clp
     14Ipopt https://projects.coin-or.org/svn/Ipopt/stable/3.8/Ipopt
     15Osi https://projects.coin-or.org/svn/Osi/stable/0.101/Osi
Note: See TracChangeset for help on using the changeset viewer.