Changeset 176


Ignore:
Timestamp:
Oct 5, 2005 1:23:41 PM (16 years ago)
Author:
forrest
Message:

as heuristics have moved

Location:
trunk/Samples
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/Samples/fast0507.cpp

    r124 r176  
    209209  // And Greedy heuristic
    210210
    211   CbcGreedyCover heuristic2(model);
     211  CbcHeuristicGreedyCover heuristic2(model);
    212212  // Use original upper and perturb more
    213213  heuristic2.setAlgorithm(11);
  • trunk/Samples/fast0507b.cpp

    r124 r176  
    222222  // And Greedy heuristic
    223223
    224   CbcGreedyCover heuristic2(model);
     224  CbcHeuristicGreedyCover heuristic2(model);
    225225  // Use original upper and perturb more
    226226  heuristic2.setAlgorithm(0);
  • trunk/Samples/longthin.cpp

    r86 r176  
    8888  // And Greedy heuristic
    8989
    90   CbcGreedyCover heuristic2(model);
     90  CbcHeuristicGreedyCover heuristic2(model);
    9191  // Use original upper and perturb more
    9292  heuristic2.setAlgorithm(11);
  • trunk/Samples/qmip.cpp

    r12 r176  
    1616#include "CbcCompareUser.hpp"
    1717#include "CbcCutGenerator.hpp"
    18 #include "CbcHeuristicUser.hpp"
     18#include "CbcHeuristicLocal.hpp"
    1919#include "ClpQuadInterface.hpp"
    2020
  • trunk/Samples/sample2.cpp

    r168 r176  
    1616#include "CbcCompareUser.hpp"
    1717#include "CbcCutGenerator.hpp"
    18 #include "CbcHeuristicUser.hpp"
     18#include "CbcHeuristicLocal.hpp"
    1919#include "OsiClpSolverInterface.hpp"
    2020
     
    197197  // And local search when new solution found
    198198
    199   CbcLocalSearch heuristic2(model);
     199  CbcHeuristicLocal heuristic2(model);
    200200  model.addHeuristic(&heuristic2);
    201201
  • trunk/Samples/sample3.cpp

    r2 r176  
    1717#include "CbcTreeLocal.hpp"
    1818#include "CbcCutGenerator.hpp"
    19 #include "CbcHeuristicUser.hpp"
     19#include "CbcHeuristicLocal.hpp"
    2020#ifdef COIN_USE_CLP
    2121#include "OsiClpSolverInterface.hpp"
  • trunk/Samples/sample5.cpp

    r61 r176  
    1616#include "CbcCompareUser.hpp"
    1717#include "CbcCutGenerator.hpp"
    18 #include "CbcHeuristicUser.hpp"
     18#include "CbcHeuristicLocal.hpp"
    1919#ifdef COIN_USE_CLP
    2020#include "OsiClpSolverInterface.hpp"
     
    227227  // And local search when new solution found
    228228
    229   CbcLocalSearch heuristic2(model);
     229  CbcHeuristicLocal heuristic2(model);
    230230  model.addHeuristic(&heuristic2);
    231231
Note: See TracChangeset for help on using the changeset viewer.