Changeset 175 for trunk


Ignore:
Timestamp:
Oct 5, 2005 1:22:39 PM (15 years ago)
Author:
forrest
Message:

adding

Location:
trunk
Files:
6 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/CbcHeuristic.cpp

    r145 r175  
    110110  // See if to do
    111111  if (!when()||(when()%10==1&&model_->phase()!=1)||
    112       (when()%10==2&&model_->phase()!=2))
     112      (when()%10==2&&(model_->phase()!=2&&model_->phase()!=3)))
    113113    return 0; // switched off
    114114
  • trunk/Makefile.Cbc

    r151 r175  
    1717LIBSRC += CbcMessage.cpp
    1818LIBSRC += CbcHeuristic.cpp
    19 #LIBSRC += CbcHeuristicRounding2.cpp
     19LIBSRC += CbcHeuristicLocal.cpp
     20LIBSRC += CbcHeuristicFPump.cpp
     21LIBSRC += CbcHeuristicGreedy.cpp
    2022LIBSRC += CbcBranchBase.cpp
    2123LIBSRC += CbcBranchActual.cpp
Note: See TracChangeset for help on using the changeset viewer.