Ignore:
Timestamp:
Nov 5, 2009 10:57:25 AM (10 years ago)
Author:
forrest
Message:

Creating new stable branch 2.4 from trunk (rev 1270)

Location:
stable/2.4
Files:
1 edited
1 copied

Legend:

Unmodified
Added
Removed
  • stable/2.4

    • Property svn:externals
      •  

        old new  
        77CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.5/CoinUtils
        88Cgl               https://projects.coin-or.org/svn/Cgl/stable/0.54/Cgl
        9 Clp               https://projects.coin-or.org/svn/Clp/stable/1.10/Clp
         9Clp               https://projects.coin-or.org/svn/Clp/stable/1.11/Clp
        1010Osi               https://projects.coin-or.org/svn/Osi/stable/0.100/Osi
        1111Vol               https://projects.coin-or.org/svn/Vol/stable/1.1/Vol
  • stable/2.4/Cbc/src/CbcBranchLotsize.hpp

    r1052 r1271  
     1/* $Id$ */
    12// Copyright (C) 2004, International Business Machines
    23// Corporation and others.  All Rights Reserved.
     
    3435  ~CbcLotsize ();
    3536 
    36   using CbcObject::infeasibility ;
    3737  /// Infeasibility - large is 0.5
    38   virtual double infeasibility(int & preferredWay) const;
     38  virtual double infeasibility(const OsiBranchingInformation * info,
     39                               int &preferredWay) const;
    3940
    4041  using CbcObject::feasibleRegion ;
     
    4849  virtual void feasibleRegion();
    4950
    50   using CbcObject::createBranch ;
    5151  /// Creates a branching object
    52   virtual CbcBranchingObject * createBranch(int way) ;
     52  virtual CbcBranchingObject * createCbcBranch(OsiSolverInterface * solver,const OsiBranchingInformation * info, int way) ;
    5353
    5454  /** \brief Given a valid solution (with reduced costs, etc.),
Note: See TracChangeset for help on using the changeset viewer.