Changeset 1104


Ignore:
Timestamp:
Nov 18, 2008 1:19:36 PM (12 years ago)
Author:
forrest
Message:

fix warnings plus stupid max time error

Location:
trunk/Cbc/src
Files:
4 edited

Legend:

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

    r1088 r1104  
    513513    lpSolver->setSpecialOptions(lpSolver->specialOptions()|0x01000000); // say is Cbc (and in branch and bound)
    514514    lpSolver->setSpecialOptions(lpSolver->specialOptions()|
    515                                 16384+4096+512+128);
     515                                (16384+4096+512+128));
    516516  }
    517517#endif
  • trunk/Cbc/src/CbcHeuristicFPump.cpp

    r1100 r1104  
    23712371CbcDisasterHandler::typeOfDisaster()
    23722372{
    2373   if (!cbcModel_->parentModel()&
     2373  if (!cbcModel_->parentModel()&&
    23742374      (cbcModel_->specialOptions()&2048)==0) {
    23752375    return 0;
  • trunk/Cbc/src/CbcModel.cpp

    r1102 r1104  
    80448044        willBeCutsInTree=-1;
    80458045      int whenC=whenCuts_;
    8046       if (whenC==999999|whenC==999998) {
     8046      if (whenC==999999||whenC==999998) {
    80478047        int size = continuousSolver_->getNumRows()+continuousSolver_->getNumCols();
    80488048        bool smallProblem = size<=550;
     
    1052110521                 largestInfeasibility,iInfeas,tolerance);
    1052210522#endif
    10523 #if COIN_DEVELOP<2
    10524         if (largestAway<1.0e-3)
    10525 #endif
    1052610523        if (largestAway>integerTolerance)
    1052710524          handler_->message(CBC_RELAXED1, messages_)
     
    1233012327CbcModel::resolve(OsiSolverInterface * solver)
    1233112328{
     12329#ifdef COIN_HAS_CLP
     12330  OsiClpSolverInterface * clpSolver
     12331    = dynamic_cast<OsiClpSolverInterface *> (solver);
     12332#endif
    1233212333#ifdef CLIQUE_ANALYSIS
    1233312334  if (probingInfo_&&currentDepth_>0) {
    1233412335    int nFix=probingInfo_->fixColumns(*solver);
    12335     if (nFix<0)
     12336    if (nFix<0) {
     12337#ifdef COIN_HAS_CLP
     12338      if (clpSolver)
     12339        clpSolver->getModelPtr()->setProblemStatus(1);
     12340#endif
    1233612341      return 0;
     12342    }
    1233712343  }
    1233812344#endif
    1233912345#ifdef COIN_HAS_CLP
    12340   OsiClpSolverInterface * clpSolver
    12341     = dynamic_cast<OsiClpSolverInterface *> (solver);
    1234212346  if (clpSolver) {
    1234312347    /*bool takeHint;
  • trunk/Cbc/src/CbcSolver.cpp

    r1103 r1104  
    27452745  }
    27462746}
    2747 #if NEW_STYLE_SOLVER
     2747#ifdef COIN_HAS_ASL
     2748#define AFTER_KNAPSACK
     2749#elif NEW_STYLE_SOLVER
     2750#define AFTER_KNAPSACK
     2751#endif
     2752#ifdef AFTER_KNAPSACK
    27482753// Fills in original solution (coinModel length)
    27492754static void
Note: See TracChangeset for help on using the changeset viewer.