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

.clang-format with proposal for formatting code

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/CbcDummyBranchingObject.hpp

    r1899 r2464  
    1919
    2020public:
     21  /// Default constructor
     22  CbcDummyBranchingObject(CbcModel *model = NULL);
    2123
    22     /// Default constructor
    23     CbcDummyBranchingObject (CbcModel * model = NULL);
     24  /// Copy constructor
     25  CbcDummyBranchingObject(const CbcDummyBranchingObject &);
    2426
    25     /// Copy constructor
    26     CbcDummyBranchingObject ( const CbcDummyBranchingObject &);
     27  /// Assignment operator
     28  CbcDummyBranchingObject &operator=(const CbcDummyBranchingObject &rhs);
    2729
    28     /// Assignment operator
    29     CbcDummyBranchingObject & operator= (const CbcDummyBranchingObject& rhs);
     30  /// Clone
     31  virtual CbcBranchingObject *clone() const;
    3032
    31     /// Clone
    32     virtual CbcBranchingObject * clone() const;
     33  /// Destructor
     34  virtual ~CbcDummyBranchingObject();
    3335
    34     /// Destructor
    35     virtual ~CbcDummyBranchingObject ();
    36 
    37     using CbcBranchingObject::branch ;
    38     /** \brief Dummy branch
     36  using CbcBranchingObject::branch;
     37  /** \brief Dummy branch
    3938    */
    40     virtual double branch();
     39  virtual double branch();
    4140
    4241#ifdef JJF_ZERO
    43     // No need to override. Default works fine.
    44     /** Reset every information so that the branching object appears to point to
     42  // No need to override. Default works fine.
     43  /** Reset every information so that the branching object appears to point to
    4544        the previous child. This method does not need to modify anything in any
    4645        solver. */
    47     virtual void previousBranch();
     46  virtual void previousBranch();
    4847#endif
    4948
    50     using CbcBranchingObject::print ;
    51     /** \brief Print something about branch - only if log level high
     49  using CbcBranchingObject::print;
     50  /** \brief Print something about branch - only if log level high
    5251    */
    53     virtual void print();
     52  virtual void print();
    5453
    55     /** Return the type (an integer identifier) of \c this */
    56     virtual CbcBranchObjType type() const {
    57         return DummyBranchObj;
    58     }
     54  /** Return the type (an integer identifier) of \c this */
     55  virtual CbcBranchObjType type() const
     56  {
     57    return DummyBranchObj;
     58  }
    5959
    60     /** Compare the original object of \c this with the original object of \c
     60  /** Compare the original object of \c this with the original object of \c
    6161        brObj. Assumes that there is an ordering of the original objects.
    6262        This method should be invoked only if \c this and brObj are of the same
     
    6565        smaller/same/larger than the argument.
    6666    */
    67     virtual int compareOriginalObject(const CbcBranchingObject* brObj) const;
     67  virtual int compareOriginalObject(const CbcBranchingObject *brObj) const;
    6868
    69     /** Compare the \c this with \c brObj. \c this and \c brObj must be os the
     69  /** Compare the \c this with \c brObj. \c this and \c brObj must be os the
    7070        same type and must have the same original object, but they may have
    7171        different feasible regions.
     
    7575        whose feasible region is the overlap.
    7676     */
    77     virtual CbcRangeCompare compareBranchingObject
    78     (const CbcBranchingObject* brObj, const bool replaceIfOverlap = false);
    79 
     77  virtual CbcRangeCompare compareBranchingObject(const CbcBranchingObject *brObj, const bool replaceIfOverlap = false);
    8078};
    8179
    8280#endif
    83 
Note: See TracChangeset for help on using the changeset viewer.