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.cpp

    r912 r1271  
     1/* $Id$ */
    12// Copyright (C) 2002, International Business Machines
    23// Corporation and others.  All Rights Reserved.
     
    3031// Just for debug (CBC_PRINT defined in CbcBranchLotsize.cpp)
    3132void
     33#if CBC_PRINT
    3234CbcLotsize::printLotsize(double value,bool condition,int type) const
     35#else
     36CbcLotsize::printLotsize(double ,bool ,int ) const
     37#endif
    3338{
    3439#if CBC_PRINT
     
    398403void
    399404CbcLotsize::floorCeiling(double & floorLotsize, double & ceilingLotsize, double value,
    400                          double tolerance) const
     405                         double /*tolerance*/) const
    401406{
    402407  bool feasible=findRange(value);
     
    416421  }
    417422}
    418 
    419 // Infeasibility - large is 0.5
    420423double
    421 CbcLotsize::infeasibility(int & preferredWay) const
     424CbcLotsize::infeasibility(const OsiBranchingInformation * /*info*/,
     425                               int &preferredWay) const
    422426{
    423427  OsiSolverInterface * solver = model_->solver();
     
    520524#endif
    521525}
    522 
    523 // Creates a branching object
    524526CbcBranchingObject *
    525 CbcLotsize::createBranch(int way)
    526 {
    527   OsiSolverInterface * solver = model_->solver();
     527CbcLotsize::createCbcBranch(OsiSolverInterface * solver,const OsiBranchingInformation * /*info*/, int way)
     528{
     529  //OsiSolverInterface * solver = model_->solver();
    528530  const double * solution = model_->testSolution();
    529531  const double * lower = solver->getColLower();
     
    643645 */
    644646void
    645 CbcLotsize::resetBounds(const OsiSolverInterface * solver)
     647CbcLotsize::resetBounds(const OsiSolverInterface * /*solver*/)
    646648{
    647649}
Note: See TracChangeset for help on using the changeset viewer.