Changeset 2531


Ignore:
Timestamp:
Mar 13, 2019 11:45:27 AM (7 months ago)
Author:
stefan
Message:

fix some serious warnings, closes #197

Location:
trunk/Cbc/src
Files:
5 edited

Legend:

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

    r2467 r2531  
    165165int CbcFullNodeInfo::applyBounds(int iColumn, double &lower, double &upper, int force)
    166166{
    167   if ((force && 1) == 0) {
     167  if ((force & 1) == 0) {
    168168    if (lower > lower_[iColumn])
    169169      COIN_DETAIL_PRINT(printf("%d odd lower going from %g to %g\n", iColumn, lower, lower_[iColumn]));
     
    172172    lower_[iColumn] = lower;
    173173  }
    174   if ((force && 2) == 0) {
     174  if ((force & 2) == 0) {
    175175    if (upper < upper_[iColumn])
    176176      COIN_DETAIL_PRINT(printf("%d odd upper going from %g to %g\n", iColumn, upper, upper_[iColumn]));
  • trunk/Cbc/src/CbcLinked.cpp

    r2467 r2531  
    142142    }
    143143    int updated = updateCoefficients(modelPtr_, temp);
    144     if (updated || 1) {
     144    //if (updated || 1) {
    145145      temp->removeGaps(1.0e-14);
    146146      ClpMatrixBase *save = modelPtr_->clpMatrix();
     
    158158      }
    159159      modelPtr_->replaceMatrix(temp, true);
    160     } else {
    161       delete temp;
    162     }
     160    //} else {
     161    //  delete temp;
     162    //}
    163163  }
    164164  if (0) {
     
    542542          }
    543543        }
    544         if (numberContinuous && 0) {
     544#if 0
     545        if (numberContinuous) {
    545546          // iterate to get solution and fathom node
    546547          int numberColumns2 = coinModel_.numberColumns();
     
    644645          //writeMps("zz");
    645646        }
     647#endif
    646648      }
    647649      // ???  - try
  • trunk/Cbc/src/CbcModel.cpp

    r2492 r2531  
    26302630    int otherOptions = (multipleRootTries_ / 10000) % 100;
    26312631    rootModels = new CbcModel *[numberModels];
    2632     unsigned int newSeed = randomSeed_;
     2632    int newSeed = randomSeed_;
    26332633    if (newSeed == 0) {
    26342634      double time = fabs(CoinGetTimeOfDay());
  • trunk/Cbc/src/OsiCbc/OsiCbcSolverInterface.cpp

    r2527 r2531  
    770770}
    771771
    772 std::string OsiCbcSolverInterface::getObjName(unsigned maxLen) const
     772std::string OsiCbcSolverInterface::getObjName(std::string::size_type maxLen) const
    773773{
    774774  return (modelPtr_->solver()->getObjName(maxLen));
    775775}
    776776
    777 std::string OsiCbcSolverInterface::getRowName(int ndx, unsigned maxLen) const
     777std::string OsiCbcSolverInterface::getRowName(int ndx, std::string::size_type maxLen) const
    778778{
    779779  return (modelPtr_->solver()->getRowName(ndx, maxLen));
     
    785785}
    786786
    787 std::string OsiCbcSolverInterface::getColName(int ndx, unsigned maxLen) const
     787std::string OsiCbcSolverInterface::getColName(int ndx, std::string::size_type maxLen) const
    788788{
    789789  return (modelPtr_->solver()->getColName(ndx, maxLen));
  • trunk/Cbc/src/OsiCbc/OsiCbcSolverInterface.hpp

    r2469 r2531  
    300300  /*! \brief Return the name of the objective function */
    301301
    302   virtual std::string getObjName(unsigned maxLen = std::string::npos) const;
     302  virtual std::string getObjName(std::string::size_type maxLen = std::string::npos) const;
    303303
    304304  /*! \brief Set the name of the objective function */
     
    309309
    310310  virtual std::string getRowName(int rowIndex,
    311     unsigned maxLen = std::string::npos) const;
     311    std::string::size_type maxLen = std::string::npos) const;
    312312
    313313  /*! \brief Return a pointer to a vector of row names */
     
    331331
    332332  virtual std::string getColName(int colIndex,
    333     unsigned maxLen = std::string::npos) const;
     333    std::string::size_type maxLen = std::string::npos) const;
    334334
    335335  /*! \brief Return a pointer to a vector of column names */
Note: See TracChangeset for help on using the changeset viewer.