Changeset 708


Ignore:
Timestamp:
Jul 25, 2007 3:58:09 PM (12 years ago)
Author:
forrest
Message:

out ambiguities

Location:
trunk/Cbc/src
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/CbcBranchActual.hpp

    r706 r708  
    5858  /** Type of each member i.e. which way is strong 0=non SOS, 1 =SOS,
    5959      index is 0 ... numberMembers_-1 */
    60   inline const char type(int index) const
     60  inline char type(int index) const
    6161  {if (type_) return type_[index]; else return 1;}
    6262
  • trunk/Cbc/src/CbcHeuristicLocal.cpp

    r687 r708  
    176176    return 0;
    177177  numberSolutions_=model_->getSolutionCount();
    178   if (model_->getNumCols()>100000&&model_->getNumCols()>
    179       10*model_->getNumRows()||numberSolutions_<=1)
     178  if ((model_->getNumCols()>100000&&model_->getNumCols()>
     179       10*model_->getNumRows())||numberSolutions_<=1)
    180180    return 0; // probably not worth it
    181181  // worth trying
  • trunk/Cbc/src/CbcLinked.cpp

    r702 r708  
    58485848  double movement = xyTrue-xyLambda;
    58495849  double mesh=CoinMax(xMeshSize_,yMeshSize_);
    5850   if (fabs(movement)<xySatisfied_&&(xB[1]-xB[0])<mesh||yB[1]-yB[0]<mesh)
     5850  if (fabs(movement)<xySatisfied_&&(xB[1]-xB[0]<mesh||yB[1]-yB[0]<mesh))
    58515851    return 0.0; // say feasible
    58525852  const double * activity = info->rowActivity_;
  • trunk/Cbc/src/CbcModel.hpp

    r706 r708  
    850850  { return integerVariable_;}
    851851  /// Whether or not integer
    852   inline const char integerType(int i) const
     852  inline char integerType(int i) const
    853853  { return integerInfo_[i];}
    854854  /// Whether or not integer
  • trunk/Cbc/src/CbcNode.cpp

    r702 r708  
    28702870        //numberTest2 = 1000000;
    28712871      }
    2872       if (searchStrategy<0||searchStrategy==1)
     2872      //if (searchStrategy<0||searchStrategy==1)
    28732873        //numberTest2 = 1000000;
    28742874#if 0
  • trunk/Cbc/src/unitTestClp.cpp

    r688 r708  
    549549        int presolveOff=iAlg/100;
    550550        iAlg=iAlg % 100;
    551         if( !barrierAvailable&&iAlg==0)
     551        if( !barrierAvailable&&iAlg==0) {
    552552          if (nRows[m]!=2172)
    553553            iAlg = 5; // try primal
    554554          else
    555555            iAlg=3; // d2q06c
     556        }
    556557        solveOptions=setupForSolve(iAlg,nameAlgorithm,0);
    557558        if (presolveOff)
Note: See TracChangeset for help on using the changeset viewer.