Changeset 1886 for stable


Ignore:
Timestamp:
Nov 21, 2012 4:34:47 AM (7 years ago)
Author:
forrest
Message:

add proximity search to possibilities

Location:
stable/1.14/Clp/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/1.14/Clp/src/CbcOrClpParam.cpp

    r1864 r1886  
    28712871See branchAndCut for information on options. \
    28722872but strong options do more probing"
     2873     );
     2874     parameters[numberParameters++] =
     2875          CbcOrClpParam("proximity!Search", "Whether to do proximity search heuristic",
     2876                        "off", CBC_PARAM_STR_PROXIMITY);
     2877     parameters[numberParameters-1].append("on");
     2878     parameters[numberParameters-1].append("both");
     2879     parameters[numberParameters-1].append("before");
     2880     parameters[numberParameters-1].append("10");
     2881     parameters[numberParameters-1].append("100");
     2882     parameters[numberParameters-1].append("300");
     2883     parameters[numberParameters-1].setLonghelp
     2884     (
     2885          "This switches on a heuristic which looks for a solution close \
     2886to incumbent solution (Fischetti and Monaci). \
     2887See Rounding for meaning of on,both,before. \
     2888The ones at end have different maxNode settings (and are 'on'(on==30))."
    28732889     );
    28742890     parameters[numberParameters++] =
  • stable/1.14/Clp/src/CbcOrClpParam.hpp

    r1853 r1886  
    180180     CBC_PARAM_STR_GREEDY,
    181181     CBC_PARAM_STR_COMBINE,
     182     CBC_PARAM_STR_PROXIMITY,
    182183     CBC_PARAM_STR_LOCALTREE,
    183184     CBC_PARAM_STR_SOS,
  • stable/1.14/Clp/src/OsiClp/OsiClpSolverInterface.cpp

    r1842 r1886  
    52535253OsiClpSolverInterface::setRowUpper( int elementIndex, double elementValue ) {
    52545254  modelPtr_->whatsChanged_ &= 0xffff;
    5255   // Say can't gurantee optimal basis etc
     5255  // Say can't guarantee optimal basis etc
    52565256  lastAlgorithm_=999;
    52575257#ifndef NDEBUG
Note: See TracChangeset for help on using the changeset viewer.