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

    r1121 r1271  
     1/* $Id$ */
    12// Copyright (C) 2005, International Business Machines
    23// Corporation and others.  All Rights Reserved.
     
    3233 
    3334  // Useful constructor - passed  model index and pseudo costs
    34   CbcSimpleIntegerDynamicPseudoCost (CbcModel * model, int dummy, int iColumn,
     35  CbcSimpleIntegerDynamicPseudoCost (CbcModel * model,int dummy, int iColumn,
    3536                              double downDynamicPseudoCost, double upDynamicPseudoCost);
    3637 
     
    4748  virtual ~CbcSimpleIntegerDynamicPseudoCost ();
    4849 
    49   using CbcObject::infeasibility ;
    5050  /// Infeasibility - large is 0.5
    51   virtual double infeasibility(int & preferredWay) const;
    52 
    53   using CbcObject::createBranch ;
     51  virtual double infeasibility(const OsiBranchingInformation * info,
     52                               int &preferredWay) const;
     53
    5454  /// Creates a branching object
    55   virtual CbcBranchingObject * createBranch(int way) ;
    56 
    57   /// Infeasibility - large is 0.5
    58   virtual double infeasibility(const OsiSolverInterface * solver,
    59                                const OsiBranchingInformation * info, int & preferredWay) const;
    60 
    61 
    62   /** Create a branching object and indicate which way to branch first.
    63      
    64       The branching object has to know how to create branches (fix
    65       variables, etc.)
    66   */
    67   virtual CbcBranchingObject * createBranch(OsiSolverInterface * solver,
    68                                             const OsiBranchingInformation * info, int way) ;
     55  virtual CbcBranchingObject * createCbcBranch(OsiSolverInterface * solver,const OsiBranchingInformation * info, int way) ;
     56
     57
    6958  /// Fills in a created branching object
    7059  void fillCreateBranch(CbcIntegerBranchingObject * branching, const OsiBranchingInformation * info, int way) ;
     
    10190  /// Set down pseudo cost
    10291  void setDownDynamicPseudoCost(double value) ;
     92  /// Modify down pseudo cost in a slightly different way
     93  void updateDownDynamicPseudoCost(double value);
    10394
    10495  /// Up pseudo cost
     
    10798  /// Set up pseudo cost
    10899  void setUpDynamicPseudoCost(double value);
     100  /// Modify up pseudo cost in a slightly different way
     101  void updateUpDynamicPseudoCost(double value);
     102
     103  /// Down pseudo shadow price cost
     104  inline double downShadowPrice() const
     105  { return downShadowPrice_;}
     106  /// Set down pseudo shadow price cost
     107  inline void setDownShadowPrice(double value)
     108  { downShadowPrice_ = value;}
     109  /// Up pseudo shadow price cost
     110  inline double upShadowPrice() const
     111  { return upShadowPrice_;}
     112  /// Set up pseudo shadow price cost
     113  inline void setUpShadowPrice(double value)
     114  { upShadowPrice_ = value;}
    109115
    110116  /// Up down separator
     
    123129  /// Add to down sum cost and set last and square
    124130  inline void addToSumDownCost(double value)
    125   { sumDownCost_+=value;lastDownCost_=value;sumDownCostSquared_ += value*value;}
     131  { sumDownCost_+=value;lastDownCost_=value;}
    126132
    127133  /// Up sum cost
     
    133139  /// Add to up sum cost and set last and square
    134140  inline void addToSumUpCost(double value)
    135   { sumUpCost_+=value;lastUpCost_=value;sumUpCostSquared_ += value*value;}
     141  { sumUpCost_+=value;lastUpCost_=value;}
    136142
    137143  /// Down sum change
     
    268274  /// Sum of all changes to x when going up
    269275  double sumUpChange_;
    270   /// Sum down cost from strong or actual squared
    271   mutable double sumDownCostSquared_;
    272   /// Sum up cost from strong or actual squared
    273   mutable double sumUpCostSquared_;
     276  /// Current pseudo-shadow price estimate down
     277  mutable double downShadowPrice_;
     278  /// Current pseudo-shadow price estimate up
     279  mutable double upShadowPrice_;
    274280  /// Sum down decrease number infeasibilities from strong or actual
    275281  double sumDownDecrease_;
     
    305311  int numberTimesProbingTotal_;
    306312  /// Number of times infeasible when tested
    307 #define CBC_INSTRUMENT
    308 #ifdef CBC_INSTRUMENT
    309   mutable int numberTimesInfeasible_;
    310 #endif
    311313  /** Method -
    312314      0 - pseudo costs
Note: See TracChangeset for help on using the changeset viewer.