Changeset 1185


Ignore:
Timestamp:
Jul 7, 2009 6:34:14 PM (10 years ago)
Author:
stefan
Message:

fix compiler warnings

Location:
stable/BSP/Cbc/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/BSP/Cbc/src/CbcModel.cpp

    r1177 r1185  
    10301030    }
    10311031    delete [] coeffMultiplier;
    1032     increment *= scaleFactor;
     1032    increment = (int)(increment * scaleFactor);
    10331033/*
    10341034  If the increment beats the current value for objective change, install it.
  • stable/BSP/Cbc/src/ClpAmplStuff.cpp

    r838 r1185  
    107107CbcAmpl::solve(CbcSolver * controlModel, const char * options)
    108108{
    109   CbcModel * model = controlModel->model();
    110   assert (model);
     109  assert (controlModel->model());
    111110  //OsiClpSolverInterface * clpSolver = dynamic_cast< OsiClpSolverInterface*> (model->solver());
    112111  //ClpSimplex * lpSolver = clpSolver->getModelPtr();
     
    691690{
    692691  CbcAmplInfo * info = (CbcAmplInfo *) amplInfo;
    693   ASL_pfgh* asl = info->asl_;
    694692  assert(n == n_var);
    695693 
     
    11531151  amplInfo_ = amplInfo;
    11541152  CbcAmplInfo * info = (CbcAmplInfo *) amplInfo_;
    1155   ASL_pfgh* asl = info->asl_;
    11561153  assert (rowNumber_<nlc);
    11571154  numberCoefficients_ = info->rowStart_[rowNumber_+1]-info->rowStart_[rowNumber_];
     
    12311228      lastGradient_ = new double[numberColumns];
    12321229    CoinZeroN(lastGradient_,numberColumns);
    1233     bool scaling=(model&&model->rowScale()&&useScaling);
    1234     assert (!scaling);
     1230    assert (!(model&&model->rowScale()&&useScaling));
    12351231    int i;
    12361232    int start = info->rowStart_[rowNumber_];
Note: See TracChangeset for help on using the changeset viewer.