Ignore:
Timestamp:
Oct 3, 2014 7:58:33 AM (5 years ago)
Author:
forrest
Message:

symmetry and diving

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/CbcNode.cpp

    r2080 r2092  
    19581958    numberPassesLeft = CoinMax(numberPassesLeft, 2);
    19591959#ifdef COIN_HAS_NTY
    1960     // 1 after, 2 strong, 3 subset
     1960    // 1 after, 2 strong, 3 until depth 5
    19611961    int orbitOption = (model->moreSpecialOptions2()&(128|256))>>7;
    19621962#endif
     
    28132813#endif
    28142814#ifdef COIN_HAS_NTY
    2815             if (orbitOption>1) {
     2815            if (orbitOption==2 /* was >1*/) {
    28162816              CbcSymmetry * symmetryInfo = model->symmetryInfo();
    28172817              CbcNodeInfo * infoX = lastNode ? lastNode->nodeInfo() : NULL;
     
    38413841        worthTrying=true;
    38423842      }
     3843      if (orbitOption==3&&depth_>5)
     3844        worthTrying=false;
    38433845      if (symmetryInfo && worthTrying) {
    3844         if (orbitOption==1) {
     3846        if ((orbitOption&1)==1) {
    38453847          symmetryInfo->ChangeBounds(solver->getColLower(),
    38463848                                     solver->getColUpper(),
     
    38543856          if (solver->messageHandler()->logLevel() > 1)
    38553857            printf("Orbital Branching on %d - way %d n %d\n",kColumn,way(),numberUsefulOrbits);
    3856           if (numberUsefulOrbits<1000) {
     3858          if (numberUsefulOrbits<1000||orbitOption==3) {
    38573859            delete branch_;
    38583860            branch_ = new CbcOrbitalBranchingObject(model,kColumn,1,0,NULL);
Note: See TracChangeset for help on using the changeset viewer.