Changeset 1887


Ignore:
Timestamp:
Nov 21, 2012 5:01:09 AM (7 years ago)
Author:
stefan
Message:

merge r1886 from stable/1.14

Location:
trunk/Clp
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp

  • trunk/Clp/src

  • trunk/Clp/src/CbcOrClpParam.cpp

    r1883 r1887  
    29232923See branchAndCut for information on options. \
    29242924but strong options do more probing"
     2925     );
     2926     parameters[numberParameters++] =
     2927          CbcOrClpParam("proximity!Search", "Whether to do proximity search heuristic",
     2928                        "off", CBC_PARAM_STR_PROXIMITY);
     2929     parameters[numberParameters-1].append("on");
     2930     parameters[numberParameters-1].append("both");
     2931     parameters[numberParameters-1].append("before");
     2932     parameters[numberParameters-1].append("10");
     2933     parameters[numberParameters-1].append("100");
     2934     parameters[numberParameters-1].append("300");
     2935     parameters[numberParameters-1].setLonghelp
     2936     (
     2937          "This switches on a heuristic which looks for a solution close \
     2938to incumbent solution (Fischetti and Monaci). \
     2939See Rounding for meaning of on,both,before. \
     2940The ones at end have different maxNode settings (and are 'on'(on==30))."
    29252941     );
    29262942     parameters[numberParameters++] =
  • trunk/Clp/src/CbcOrClpParam.hpp

    r1883 r1887  
    182182     CBC_PARAM_STR_GREEDY,
    183183     CBC_PARAM_STR_COMBINE,
     184     CBC_PARAM_STR_PROXIMITY,
    184185     CBC_PARAM_STR_LOCALTREE,
    185186     CBC_PARAM_STR_SOS,
  • trunk/Clp/src/OsiClp

  • trunk/Clp/src/OsiClp/OsiClpSolverInterface.cpp

    r1843 r1887  
    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.