Ignore:
Timestamp:
May 7, 2007 1:44:28 PM (13 years ago)
Author:
pbelotti
Message:

moved include files to make them doxygenable. Introduced three-way branching, with fixed intervals for now. Added check for small bound interval within all generateCuts()

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/Couenne/Couenne/src/branch/CouenneObject.hpp

    r531 r534  
    4343  virtual double infeasibility (const OsiBranchingInformation*, int &) const;
    4444
    45   /// fix (one of the) argument of reference auxiliary variable
     45  /// fix (one of the) arguments of reference auxiliary variable
    4646  virtual double feasibleRegion (OsiSolverInterface*, const OsiBranchingInformation*) const;
    4747
    48   /// create CouenneBranchingObject based on this object
     48  /// create CouenneBranchingObject or CouenneThreeWayBranchObj based
     49  /// on this object
    4950  virtual OsiBranchingObject* createBranch (OsiSolverInterface*,
    5051                                            const OsiBranchingInformation*, int) const;
    5152
    5253  /// return reference auxiliary variable
    53   exprAux *Reference () 
     54  exprAux *Reference ()
    5455  {return reference_;}
    5556
Note: See TracChangeset for help on using the changeset viewer.