Ignore:
Timestamp:
Jan 3, 2019 2:03:23 PM (20 months ago)
Author:
unxusr
Message:

.clang-format with proposal for formatting code

File:
1 edited

Legend:

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

    r1573 r2464  
    66#if defined(_MSC_VER)
    77// Turn off compiler warning about long names
    8 #  pragma warning(disable:4786)
     8#pragma warning(disable : 4786)
    99#endif
    1010#include <cassert>
     
    2222// Default Constructor
    2323CbcFathom::CbcFathom()
    24         : model_(NULL),
    25         possible_(false)
     24  : model_(NULL)
     25  , possible_(false)
    2626{
    2727}
    2828
    2929// Constructor from model
    30 CbcFathom::CbcFathom(CbcModel & model)
    31         :
    32         model_(&model),
    33         possible_(false)
     30CbcFathom::CbcFathom(CbcModel &model)
     31  : model_(&model)
     32  , possible_(false)
    3433{
    3534}
    3635// Resets stuff if model changes
    37 void
    38 CbcFathom::resetModel(CbcModel * model)
     36void CbcFathom::resetModel(CbcModel *model)
    3937{
    40     model_ = model;
     38  model_ = model;
    4139}
    4240
    4341// Destructor
    44 CbcFathom::~CbcFathom ()
     42CbcFathom::~CbcFathom()
    4543{
    4644}
    4745
    4846// update model
    49 void CbcFathom::setModel(CbcModel * model)
     47void CbcFathom::setModel(CbcModel *model)
    5048{
    51     model_ = model;
     49  model_ = model;
    5250}
    5351#ifdef COIN_HAS_CLP
     
    6058// Default Constructor
    6159//-------------------------------------------------------------------
    62 CbcOsiSolver::CbcOsiSolver ()
    63         : OsiClpSolverInterface()
     60CbcOsiSolver::CbcOsiSolver()
     61  : OsiClpSolverInterface()
    6462{
    65     cbcModel_ = NULL;
     63  cbcModel_ = NULL;
    6664}
    6765//-------------------------------------------------------------------
     
    7169CbcOsiSolver::clone(bool /*copyData*/) const
    7270{
    73     //assert (copyData);
    74     return new CbcOsiSolver(*this);
     71  //assert (copyData);
     72  return new CbcOsiSolver(*this);
    7573}
    76 
    7774
    7875//-------------------------------------------------------------------
    7976// Copy constructor
    8077//-------------------------------------------------------------------
    81 CbcOsiSolver::CbcOsiSolver (
    82     const CbcOsiSolver & rhs)
    83         : OsiSolverInterface(), // Should not be needed but get warning
    84         OsiClpSolverInterface(rhs)
     78CbcOsiSolver::CbcOsiSolver(
     79  const CbcOsiSolver &rhs)
     80  : OsiSolverInterface()
     81  , // Should not be needed but get warning
     82  OsiClpSolverInterface(rhs)
    8583{
    86     cbcModel_ = rhs.cbcModel_;
     84  cbcModel_ = rhs.cbcModel_;
    8785}
    8886
     
    9088// Destructor
    9189//-------------------------------------------------------------------
    92 CbcOsiSolver::~CbcOsiSolver ()
     90CbcOsiSolver::~CbcOsiSolver()
    9391{
    9492}
     
    9896//-------------------------------------------------------------------
    9997CbcOsiSolver &
    100 CbcOsiSolver::operator=(const CbcOsiSolver & rhs)
     98CbcOsiSolver::operator=(const CbcOsiSolver &rhs)
    10199{
    102     if (this != &rhs) {
    103         OsiClpSolverInterface::operator=(rhs);
    104         cbcModel_ = rhs.cbcModel_;
    105     }
    106     return *this;
     100  if (this != &rhs) {
     101    OsiClpSolverInterface::operator=(rhs);
     102    cbcModel_ = rhs.cbcModel_;
     103  }
     104  return *this;
    107105}
    108106#endif
    109 
Note: See TracChangeset for help on using the changeset viewer.