Ignore:
Timestamp:
Sep 29, 2006 4:48:36 PM (13 years ago)
Author:
pbonami
Message:

astyled the devel branch

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Bonmin/src/OaInterface/BonDummyHeuristic.cpp

    r57 r62  
    1313
    1414#include "OsiAuxInfo.hpp"
    15 namespace Bonmin{
     15namespace Bonmin
     16{
    1617/// Default constructor
    17 DummyHeuristic::DummyHeuristic(CbcModel &model,
    18     OsiTMINLPInterface * si)
    19     :
    20     CbcHeuristic(model),
    21     nlp_(si)
    22 {}
     18  DummyHeuristic::DummyHeuristic(CbcModel &model,
     19      OsiTMINLPInterface * si)
     20      :
     21      CbcHeuristic(model),
     22      nlp_(si)
     23  {}
    2324
    24 DummyHeuristic::DummyHeuristic(OsiTMINLPInterface * si)
    25     :
    26     CbcHeuristic(),
    27     nlp_(si)
    28 {}
     25  DummyHeuristic::DummyHeuristic(OsiTMINLPInterface * si)
     26      :
     27      CbcHeuristic(),
     28      nlp_(si)
     29  {}
    2930/// Assign an OsiTMINLPInterface
    30 void
    31 DummyHeuristic::assignInterface(OsiTMINLPInterface * si)
    32 {
    33   nlp_ = si;
    34 }
     31  void
     32  DummyHeuristic::assignInterface(OsiTMINLPInterface * si)
     33  {
     34    nlp_ = si;
     35  }
    3536/// heuristic method
    36 int
    37 DummyHeuristic::solution(double &solutionValue, double *betterSolution)
    38 {
    39   OsiBabSolver * babSolver = dynamic_cast<OsiBabSolver *>
    40       (model_->solver()->getAuxiliaryInfo());
    41   //  double bestKnown = getObjValue();
    42   if(babSolver) {
    43     return babSolver->solution(solutionValue, betterSolution,
    44         model_->getNumCols());
     37  int
     38  DummyHeuristic::solution(double &solutionValue, double *betterSolution)
     39  {
     40    OsiBabSolver * babSolver = dynamic_cast<OsiBabSolver *>
     41        (model_->solver()->getAuxiliaryInfo());
     42    //  double bestKnown = getObjValue();
     43    if (babSolver) {
     44      return babSolver->solution(solutionValue, betterSolution,
     45          model_->getNumCols());
     46    }
     47    return 0;
    4548  }
    46   return 0;
    47 }
    4849
    4950}
Note: See TracChangeset for help on using the changeset viewer.