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

    r1132 r1271  
     1/* $Id$ */
    12// Copyright (C) 2002, International Business Machines
    23// Corporation and others.  All Rights Reserved.
     
    3738  virtual ~CbcClique ();
    3839 
    39   using CbcObject::infeasibility ;
    4040  /// Infeasibility - large is 0.5
    41   virtual double infeasibility(int & preferredWay) const;
     41  virtual double infeasibility(const OsiBranchingInformation * info,
     42                               int &preferredWay) const;
    4243
    4344  using CbcObject::feasibleRegion ;
     
    4546  virtual void feasibleRegion();
    4647
    47   using CbcObject::createBranch ;
    4848  /// Creates a branching object
    49   virtual CbcBranchingObject * createBranch(int way) ;
     49  virtual CbcBranchingObject * createCbcBranch(OsiSolverInterface * solver,const OsiBranchingInformation * info, int way) ;
    5050  /// Number of members
    5151  inline int numberMembers() const
     
    126126  virtual ~CbcSOS ();
    127127 
    128   using CbcObject::infeasibility ;
    129128  /// Infeasibility - large is 0.5
    130   virtual double infeasibility(int & preferredWay) const;
    131   /// Infeasibility - large is 0.5
    132   virtual double infeasibility(const OsiBranchingInformation * info,
    133                                int & preferredWay) const;
     129  virtual double infeasibility(const OsiBranchingInformation * info,
     130                               int &preferredWay) const;
    134131
    135132  using CbcObject::feasibleRegion ;
     
    137134  virtual void feasibleRegion();
    138135
    139   using CbcObject::createBranch ;
    140136  /// Creates a branching object
    141   virtual CbcBranchingObject * createBranch(int way) ;
     137  virtual CbcBranchingObject * createCbcBranch(OsiSolverInterface * solver,const OsiBranchingInformation * info, int way) ;
    142138
    143139
     
    259255  /// Construct an OsiSimpleInteger object
    260256  OsiSimpleInteger * osiObject() const;
    261   using CbcObject::infeasibility ;
    262257  /// Infeasibility - large is 0.5
    263   virtual double infeasibility(const OsiSolverInterface * solver,
    264                                const OsiBranchingInformation * info, int & preferredWay) const;
     258  virtual double infeasibility(const OsiBranchingInformation * info,
     259                               int &preferredWay) const;
    265260
    266261  using CbcObject::feasibleRegion ;
     
    272267  virtual double feasibleRegion(OsiSolverInterface * solver, const OsiBranchingInformation * info) const;
    273268
    274   using CbcObject::createBranch ;
    275269  /** Create a branching object and indicate which way to branch first.
    276270     
     
    278272      variables, etc.)
    279273  */
    280   virtual CbcBranchingObject * createBranch(OsiSolverInterface * solver,
    281                                             const OsiBranchingInformation * info, int way) ;
     274  virtual CbcBranchingObject * createCbcBranch(OsiSolverInterface * solver,const OsiBranchingInformation * info, int way) ;
    282275  /// Fills in a created branching object
    283276  void fillCreateBranch(CbcIntegerBranchingObject * branching, const OsiBranchingInformation * info, int way) ;
     
    289282  */
    290283  virtual OsiSolverBranch * solverBranch(OsiSolverInterface * solver, const OsiBranchingInformation * info) const;
    291   /// Infeasibility - large is 0.5
    292   virtual double infeasibility(int & preferredWay) const;
    293284
    294285  /** Set bounds to fix the variable at the current (integer) value.
     
    300291  virtual void feasibleRegion();
    301292
    302   /** Creates a branching object
    303 
    304     The preferred direction is set by \p way, -1 for down, +1 for up.
    305   */
    306   virtual CbcBranchingObject * createBranch(int way) ;
    307293  /** Column number if single column object -1 otherwise,
    308294      so returns >= 0
     
    389375  void applyConsequence(int iSequence, int state) const;
    390376 
    391   using CbcObject::infeasibility ;
    392377  /// Infeasibility - large is 0.5 (and 0.5 will give this)
    393   virtual double infeasibility(int & preferredWay) const;
     378  virtual double infeasibility(const OsiBranchingInformation * info,
     379                               int &preferredWay) const;
    394380
    395381  using CbcObject::feasibleRegion ;
     
    397383  virtual void feasibleRegion();
    398384
    399   using CbcObject::createBranch ;
    400385  /// Creates a branching object
    401   virtual CbcBranchingObject * createBranch(int way) ;
     386  virtual CbcBranchingObject * createCbcBranch(OsiSolverInterface * solver,const OsiBranchingInformation * info, int way) ;
    402387
    403388  /// Number of members
     
    593578  virtual ~CbcSimpleIntegerPseudoCost ();
    594579 
    595   using CbcObject::infeasibility ;
    596580  /// Infeasibility - large is 0.5
    597   virtual double infeasibility(int & preferredWay) const;
    598 
    599   using CbcObject::createBranch ;
     581  virtual double infeasibility(const OsiBranchingInformation * info,
     582                               int &preferredWay) const;
     583
    600584  /// Creates a branching object
    601   virtual CbcBranchingObject * createBranch(int way) ;
     585  virtual CbcBranchingObject * createCbcBranch(OsiSolverInterface * solver,const OsiBranchingInformation * info, int way) ;
    602586
    603587  /// Down pseudo cost
     
    11971181  ~CbcFollowOn ();
    11981182 
    1199   using CbcObject::infeasibility ;
    12001183  /// Infeasibility - large is 0.5
    1201   virtual double infeasibility(int & preferredWay) const;
     1184  virtual double infeasibility(const OsiBranchingInformation * info,
     1185                               int &preferredWay) const;
    12021186
    12031187  using CbcObject::feasibleRegion ;
     
    12051189  virtual void feasibleRegion();
    12061190
    1207   using CbcObject::createBranch ;
    12081191  /// Creates a branching object
    1209   virtual CbcBranchingObject * createBranch(int way) ;
     1192  virtual CbcBranchingObject * createCbcBranch(OsiSolverInterface * solver,const OsiBranchingInformation * info, int way) ;
    12101193  /// As some computation is needed in more than one place - returns row
    12111194  virtual int gutsOfFollowOn(int & otherRow, int & preferredWay) const;
     
    14491432  ~CbcGeneral ();
    14501433 
    1451   using CbcObject::infeasibility ;
    14521434  /// Infeasibility - large is 0.5
    1453   virtual double infeasibility(int & preferredWay) const=0;
     1435  virtual double infeasibility(const OsiBranchingInformation * info,
     1436                               int &preferredWay) const;
    14541437
    14551438  using CbcObject::feasibleRegion ;
     
    14571440  virtual void feasibleRegion()=0;
    14581441
    1459   using CbcObject::createBranch ;
    14601442  /// Creates a branching object
    1461   virtual CbcBranchingObject * createBranch(int way)=0 ;
     1443  virtual CbcBranchingObject * createCbcBranch(OsiSolverInterface * solver,const OsiBranchingInformation * info, int way) ;
    14621444
    14631445  /// Redoes data when sequence numbers change
     
    15021484  ~CbcGeneralDepth ();
    15031485 
    1504   using CbcObject::infeasibility ;
    15051486  /// Infeasibility - large is 0.5
    1506   virtual double infeasibility(int & preferredWay) const;
     1487  virtual double infeasibility(const OsiBranchingInformation * info,
     1488                               int &preferredWay) const;
    15071489
    15081490  using CbcObject::feasibleRegion ;
     
    15101492  virtual void feasibleRegion();
    15111493
    1512   using CbcObject::createBranch ;
    15131494  /// Creates a branching object
    1514   virtual CbcBranchingObject * createBranch(int way) ;
     1495  virtual CbcBranchingObject * createCbcBranch(OsiSolverInterface * solver,const OsiBranchingInformation * info, int way) ;
    15151496  /// Return maximum number of nodes
    15161497  inline int maximumNodes() const
Note: See TracChangeset for help on using the changeset viewer.