Changeset 938


Ignore:
Timestamp:
Jan 5, 2013 8:01:06 PM (7 years ago)
Author:
pbelotti
Message:

less useless output, SDP cuts applied more often; SCIP dependency fixed

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

        old new  
        77ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/releases/1.2.3/
        88ThirdParty/SoPlex  https://projects.coin-or.org/svn/BuildTools/ThirdParty/SoPlex/stable/1.2
        9 ThirdParty/SCIP  https://projects.coin-or.org/svn/BuildTools/ThirdParty/SCIP/stable/1.2
         9ThirdParty/SCIP  https://projects.coin-or.org/svn/BuildTools/ThirdParty/SCIP/releases/1.1.2/
        1010CoinUtils  https://projects.coin-or.org/svn/CoinUtils/releases/2.8.8/CoinUtils
        1111Cbc  https://projects.coin-or.org/svn/Cbc/releases/2.7.8/Cbc
  • trunk/Couenne/src/cut/sdpcuts/CouenneSdpCuts.cpp

    r937 r938  
    148148
    149149            if (rowInd <= *vniIt) {
    150               printf ("missing term: %d, %d\n", rowInd, *vniIt);
     150              //printf ("missing term: %d, %d\n", rowInd, *vniIt);
    151151
    152152              expression *image;
  • trunk/Couenne/src/cut/sdpcuts/CutGen.cpp

    r935 r938  
    4343  // only at root node once
    4444
    45   if ((info . level > 0) ||
    46       (info . pass  > 1)) return;
     45  if ((info . level * info . pass > 4)) return;
    4746
    4847  problem_ -> domain () -> push (&si, &cs);
  • trunk/Dependencies

    r931 r938  
    77ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.2
    88ThirdParty/SoPlex https://projects.coin-or.org/svn/BuildTools/ThirdParty/SoPlex/stable/1.2
    9 ThirdParty/SCIP   https://projects.coin-or.org/svn/BuildTools/ThirdParty/SCIP/stable/1.2
     9ThirdParty/SCIP   https://projects.coin-or.org/svn/BuildTools/ThirdParty/SCIP/stable/1.1
    1010CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.8/CoinUtils
    1111Cbc               https://projects.coin-or.org/svn/Cbc/stable/2.7/Cbc
Note: See TracChangeset for help on using the changeset viewer.