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

    r1136 r1271  
     1/* $Id$ */
    12// Copyright (C) 2004, International Business Machines
    23// Corporation and others.  All Rights Reserved.
     
    292293#define TRY_THIS 0
    293294#if TRY_THIS==0
    294     double weight = CoinMax(weight_,0.0);
     295    double weight = CoinMax(weight_,1.0e-9);
    295296    double testX =  x->objectiveValue()+ weight*x->numberUnsatisfied();
    296297    double testY = y->objectiveValue() + weight*y->numberUnsatisfied();
     
    310311    double testX = x->guessedObjectiveValue();
    311312    double testY = y->guessedObjectiveValue();
    312 #elif THY_THIS==3
     313#elif TRY_THIS==3
    313314#define THRESH 0.95
     315    // Use estimates
     316    double testX = x->guessedObjectiveValue();
     317    double testY = y->guessedObjectiveValue();
    314318    if (x->objectiveValue()-bestPossible_>THRESH*(cutoff_-bestPossible_))
    315319      testX *= 2.0; // make worse
Note: See TracChangeset for help on using the changeset viewer.