Changeset 144


Ignore:
Timestamp:
Jun 6, 2005 6:33:44 AM (15 years ago)
Author:
forrest
Message:

stuffCVS: ----------------------------------------------------------------------

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/CbcHeuristic.cpp

    r95 r144  
    385385            // feasible - no good
    386386            anyBadUp=-1;
     387            anyBadDown=-1;
    387388            break;
    388389          }
  • trunk/Samples/CbcHeuristicFPump.cpp

    r142 r144  
    9090  if (!atRoot||passNumber!=1)
    9191    return 0;
     92  // probably a good idea
    9293  if (model_->getSolutionCount()) return 0;
    9394  // Clone solver - otherwise annoys root node computations
    9495  OsiSolverInterface * solver = model_->solver()->clone();
     96  solver->resolve();
    9597  const double * lower = solver->getColLower();
    9698  const double * upper = solver->getColUpper();
     
    169171        solver->setObjCoeff(i,saveObjective[i]);
    170172      // solution - but may not be better
    171       double newSolutionValue = direction*solver->getObjValue();
     173      // Compute using dot product
     174      double newSolutionValue = direction*solver->OsiSolverInterface::getObjValue();
    172175      if (newSolutionValue<solutionValue) {
    173176        memcpy(betterSolution,newSolution,numberColumns*sizeof(double));
Note: See TracChangeset for help on using the changeset viewer.