Changeset 531 for branches/devel


Ignore:
Timestamp:
Feb 8, 2007 12:59:12 PM (13 years ago)
Author:
forrest
Message:

fix ampl ifdef

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Cbc/src/CoinSolve.cpp

    r530 r531  
    461461  }
    462462}
     463#ifdef COIN_HAS_LINK
    463464/*  Returns OsiSolverInterface (User should delete)
    464465    On entry numberKnapsack is maximum number of Total entries
     
    10061007#endif
    10071008}
     1009#endif
    10081010static int outDupRow(OsiSolverInterface * solver)
    10091011{
     
    25882590                preProcess=0;
    25892591                useStrategy=true;
     2592#ifdef COIN_HAS_LINK
    25902593                // empty out any cuts
    25912594                if (storedAmpl.sizeRowCuts()) {
     
    25942597                  storedAmpl=temp;
    25952598                }
     2599#endif
    25962600              }
    25972601              if (preProcess&&type==BAB) {
     
    36853689                  osiclp->getModelPtr()->setSpecialOptions(osiclp->getModelPtr()->specialOptions()|256);
    36863690                }
     3691#ifdef COIN_HAS_LINK
    36873692                if (storedAmpl.sizeRowCuts()) {
    36883693                  if (preProcess) {
     
    37353740                    babModel->addCutGenerator(&storedAmpl,1,"AmplStored");
    37363741                }
     3742#endif
    37373743                babModel->branchAndBound(statistics);
    37383744                checkSOS(babModel, babModel->solver());
     
    37993805              if (type==STRENGTHEN&&strengthenedModel)
    38003806                clpSolver = dynamic_cast< OsiClpSolverInterface*> (strengthenedModel);
     3807#ifdef COIN_HAS_ASL
    38013808              else if (usingAmpl)
    38023809                clpSolver = dynamic_cast< OsiClpSolverInterface*> (babModel->solver());
     3810#endif
    38033811              lpSolver = clpSolver->getModelPtr();
    38043812              if (numberChanged) {
Note: See TracChangeset for help on using the changeset viewer.