Ignore:
Timestamp:
Dec 12, 2013 10:40:41 AM (6 years ago)
Author:
forrest
Message:

changes for parallel and idiot

File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/1.15/Clp/src/AbcSimplex.cpp

    r1989 r2006  
    139139  lowerBasic_=lowerSaved_+numberTotal;
    140140  upperBasic_=upperSaved_+numberTotal;
    141   costBasic_=costSaved_+numberTotal;
     141  costBasic_=costSaved_+2*numberTotal;
    142142  solutionBasic_=solutionSaved_+numberTotal;
    143143  djBasic_=djSaved_+numberTotal;
     
    55995599      elAddress[i]=usefulArray_[i].denseVector();
    56005600  } else {
     5601    if(elAddress[0]!=usefulArray_[0].denseVector()) {
     5602      printf("elAddress not zero and does not match??\n");
     5603      for (int i=0;i<ABC_NUMBER_USEFUL_NORMAL;i++)
     5604        elAddress[i]=usefulArray_[i].denseVector();
     5605    }
    56015606    for (int i=0;i<ABC_NUMBER_USEFUL_NORMAL;i++)
    56025607      assert(elAddress[i]==usefulArray_[i].denseVector());
     
    58975902  return -1;
    58985903#endif
    5899   double objective = model->rawObjectiveValue();
    5900   if (model->algorithm() < 0)
    5901     objective -= model->bestPossibleImprovement();
     5904  double objective;
     5905  if (model_->algorithm() < 0) {
     5906    objective = model_->rawObjectiveValue();
     5907    objective -= model_->bestPossibleImprovement();
     5908  } else {
     5909    objective = model->abcNonLinearCost()->feasibleReportCost();
     5910  }
    59025911  double infeasibility;
    59035912  double realInfeasibility = 0.0;
    59045913  int numberInfeasibilities;
    59055914  int iterationNumber = model->numberIterations();
    5906   numberTimesFlagged_ = 0;
     5915  //numberTimesFlagged_ = 0;
    59075916  if (model->algorithm() < 0) {
    59085917    // dual
Note: See TracChangeset for help on using the changeset viewer.