Ignore:
Timestamp:
Jun 19, 2011 1:23:14 PM (8 years ago)
Author:
stefan
Message:

sync with trunk rev1674

Location:
stable/2.7
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/2.7

    • Property svn:externals
      •  

        old new  
        1 BuildTools  https://projects.coin-or.org/svn/BuildTools/stable/0.7
        2 ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.2
        3 ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.2
        4 ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.3
        5 ThirdParty/Glpk  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.8
        6 Data/Sample  https://projects.coin-or.org/svn/Data/Sample/stable/1.2
        7 CoinUtils  https://projects.coin-or.org/svn/CoinUtils/stable/2.8/CoinUtils
        8 Cgl  https://projects.coin-or.org/svn/Cgl/stable/0.57/Cgl
        9 Clp  https://projects.coin-or.org/svn/Clp/stable/1.14/Clp
        10 Osi  https://projects.coin-or.org/svn/Osi/stable/0.105/Osi
         1BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.7
         2ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.2
         3ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.2
         4ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.3
         5ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.8
         6ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.2
         7ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.4
         8Data/Sample       https://projects.coin-or.org/svn/Data/Sample/stable/1.2
         9Data/miplib3      https://projects.coin-or.org/svn/Data/miplib3/stable/1.2
         10CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.8/CoinUtils
         11Cgl               https://projects.coin-or.org/svn/Cgl/stable/0.57/Cgl
         12Clp               https://projects.coin-or.org/svn/Clp/stable/1.14/Clp
         13Osi               https://projects.coin-or.org/svn/Osi/stable/0.105/Osi
    • Property svn:mergeinfo changed
      /trunk (added)merged: 1578,​1582-1587,​1589-1600,​1603-1614,​1620-1626,​1631-1633,​1635-1636,​1638-1646,​1650-1652,​1654-1658,​1660-1663,​1665-1671,​1673-1674
  • stable/2.7/Cbc

  • stable/2.7/Cbc/src/CbcStrategy.cpp

    r1573 r1675  
    4242#include "CbcHeuristic.hpp"
    4343#include "CbcHeuristicLocal.hpp"
     44#include "CbcHeuristicRINS.hpp"
    4445
    4546// Default Constructor
     
    420421            }
    421422            if (!numberNon && numberClose) {
    422                 printf("Tidying %d multiples of 0.01, %d close\n",
    423                        numberInt, numberClose);
     423                COIN_DETAIL_PRINT(printf("Tidying %d multiples of 0.01, %d close\n",
     424                                         numberInt, numberClose));
    424425                for (iColumn = 0; iColumn < numberColumns; iColumn++) {
    425426                    for (int j = columnStart[iColumn];
     
    925926    if (!found)
    926927        model.addHeuristic(&heuristic1);
     928    if ((model.moreSpecialOptions()&32768)!=0) {
     929      // Allow join solutions
     930      CbcHeuristicLocal heuristic2(model);
     931      heuristic2.setHeuristicName("join solutions");
     932      //sheuristic2.setSearchType(1);
     933      found = false;
     934      for (iHeuristic = 0; iHeuristic < numberHeuristics; iHeuristic++) {
     935        CbcHeuristic * heuristic = model.heuristic(iHeuristic);
     936        CbcHeuristicLocal * cgl = dynamic_cast<CbcHeuristicLocal *>(heuristic);
     937        if (cgl) {
     938          found = true;
     939          break;
     940        }
     941      }
     942      if (!found)
     943        model.addHeuristic(&heuristic2);
     944      // Allow RINS
     945      CbcHeuristicRINS heuristic5(model);
     946      heuristic5.setHeuristicName("RINS");
     947      heuristic5.setFractionSmall(0.5);
     948      heuristic5.setDecayFactor(5.0);
     949      //heuristic5.setSearchType(1);
     950      found = false;
     951      for (iHeuristic = 0; iHeuristic < numberHeuristics; iHeuristic++) {
     952        CbcHeuristic * heuristic = model.heuristic(iHeuristic);
     953        CbcHeuristicLocal * cgl = dynamic_cast<CbcHeuristicLocal *>(heuristic);
     954        if (cgl) {
     955          found = true;
     956          break;
     957        }
     958      }
     959      if (!found)
     960        model.addHeuristic(&heuristic5);
     961    }
    927962}
    928963// Do printing stuff
Note: See TracChangeset for help on using the changeset viewer.