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/CbcBranchCut.hpp

    r912 r1271  
     1/* $Id$ */
    12// Copyright (C) 2004, International Business Machines
    23// Corporation and others.  All Rights Reserved.
     
    3435  ~CbcBranchCut ();
    3536 
    36   using CbcObject::infeasibility ;
    3737  /// Infeasibility
    38   virtual double infeasibility(int & preferredWay) const;
     38  virtual double infeasibility(const OsiBranchingInformation * info,
     39                               int &preferredWay) const;
    3940
    4041  using CbcObject::feasibleRegion ;
     
    5455  virtual bool boundBranch() const ;
    5556
    56   using CbcObject::createBranch ;
    5757  /// Creates a branching object
    58   virtual CbcBranchingObject * createBranch(int way) ;
     58  virtual CbcBranchingObject * createCbcBranch(OsiSolverInterface * solver,const OsiBranchingInformation * info, int way) ;
    5959
    6060  /** \brief Given a valid solution (with reduced costs, etc.),
     
    232232  int shallWe() const;
    233233
    234   using CbcObject::infeasibility ;
    235234  /// Infeasibility - large is 0.5
    236   virtual double infeasibility(int & preferredWay) const;
    237 
    238   using CbcObject::createBranch ;
     235  virtual double infeasibility(const OsiBranchingInformation * info,
     236                               int &preferredWay) const;
     237  /** \brief Return true if object can take part in normal heuristics
     238  */
     239  virtual bool canDoHeuristics() const
     240  {return true;}
     241
    239242  /// Creates a branching object
    240   virtual CbcBranchingObject * createBranch(int way);
     243  virtual CbcBranchingObject * createCbcBranch(OsiSolverInterface * solver,const OsiBranchingInformation * info, int way) ;
     244  /// Redoes data when sequence numbers change
     245  virtual void redoSequenceEtc(CbcModel * model, int numberColumns, const int * originalColumns);
    241246
    242247
     
    289294  ~CbcBranchAllDifferent ();
    290295
    291   using CbcObject::infeasibility ;
    292296  /// Infeasibility - large is 0.5
    293   virtual double infeasibility(int & preferredWay) const;
    294 
    295   using CbcObject::createBranch ;
     297  virtual double infeasibility(const OsiBranchingInformation * info,
     298                               int &preferredWay) const;
     299
    296300  /// Creates a branching object
    297   virtual CbcBranchingObject * createBranch(int way);
     301  virtual CbcBranchingObject * createCbcBranch(OsiSolverInterface * solver,const OsiBranchingInformation * info, int way) ;
    298302
    299303
Note: See TracChangeset for help on using the changeset viewer.