Changeset 543 for stable/0.2/Couenne


Ignore:
Timestamp:
Mar 18, 2011 2:23:34 PM (9 years ago)
Author:
pbelotti
Message:

adding integer variable priority option

Location:
stable/0.2/Couenne/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/0.2/Couenne/src/branch/CouenneChooseVariable.cpp

    r159 r543  
    218218     1, 2000, "Default value is 2000 (it is 1000 for integers and 10 for SOS).");
    219219
     220  roptions -> AddLowerBoundedIntegerOption
     221    ("int_var_priority",
     222     "Priority of integer variable branching",
     223     1, 1000, "Default value is 1000 (it is 2000 for continuous and 10 for SOS).");
     224
    220225  roptions -> AddStringOption2
    221226    ("red_cost_branching",
  • stable/0.2/Couenne/src/expression/CouennePrecisions.hpp

    r159 r543  
    1 /* $Id: CouennePrecisions.hpp 141 2009-06-03 04:19:19Z pbelotti $ */
    2 /*
     1/* $Id: CouennePrecisions.hpp 141 2009-06-03 04:19:19Z pbelotti $
     2 *
    33 * Name:    CouennePrecisions.hpp
    44 * Author:  Pietro Belotti
    55 * Purpose: constants for evaluation procedures
    66 *
    7  * (C) Carnegie-Mellon University, 2006-08.
     7 * (C) Carnegie-Mellon University, 2006-10.
    88 * This file is licensed under the Common Public License (CPL)
    99 */
     
    2626#define COUENNE_INFINITY      1.e+50
    2727
    28 // for cuts, ensures stability and scaling
     28// for cuts, ensures stability and scaling for Clp
    2929#define COU_MAX_COEFF     1.e+9
    3030
  • stable/0.2/Couenne/src/expression/operators/exprPow.hpp

    r159 r543  
    147147    else retval = (lexponent < 0.) ? 0. : COUENNE_INFINITY;
    148148  }
    149 
    150   retval = (pow (lbase, lexponent));
     149  else
     150    retval = (pow (lbase, lexponent));
    151151
    152152  return (CouNumber) (retval);
Note: See TracChangeset for help on using the changeset viewer.