Ignore:
Timestamp:
Mar 24, 2009 2:49:44 PM (11 years ago)
Author:
pbelotti
Message:

name fixing. Trying to fix a crippling cast conversion for function pointer comparison (dangerous...)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Couenne/src/main/BonCouenne.cpp

    r55 r79  
    2121#include "CoinTime.hpp"
    2222#include "CoinError.hpp"
    23 #include "BonminConfig.h"
    2423#include "BonCouenneInterface.hpp"
    25 #include "BonIpoptSolver.hpp"
    2624
    2725#include "BonCouenneSetup.hpp"
     
    8684#endif
    8785
    88     CouenneSetup bonmin;
    89     if (!bonmin.InitializeCouenne (argv, p, ci))
     86    CouenneSetup couenne;
     87    if (!couenne.InitializeCouenne (argv, p, ci))
    9088      throw infeasible;
    9189
     
    9795    /// update time limit (read/preprocessing might have taken some)
    9896    double timeLimit = 0;
    99     bonmin.options () -> GetNumericValue ("time_limit", timeLimit, "bonmin.");
    100     bonmin.setDoubleParameter (BabSetupBase::MaxTime,
     97    couenne.options () -> GetNumericValue ("time_limit", timeLimit, "couenne.");
     98    couenne.setDoubleParameter (BabSetupBase::MaxTime,
    10199                               timeLimit - (time_start = (CoinCpuTime () - time_start)));
    102100
    103101    //////////////////////////////////
    104102
    105     bb (bonmin); // do branch and bound
     103    bb (couenne); // do branch and bound
    106104
    107105    //////////////////////////////////
     
    127125    // retrieve test value to check
    128126    double global_opt;
    129     bonmin.options () -> GetNumericValue ("couenne_check", global_opt, "couenne.");
     127    couenne.options () -> GetNumericValue ("couenne_check", global_opt, "couenne.");
    130128
    131129    if (global_opt < COUENNE_INFINITY) { // some value found in couenne.opt
     
    137135              (fabs (opt - global_opt) /
    138136               (1. + CoinMax (fabs (opt), fabs (global_opt))) < PRINTED_PRECISION) ?
    139               (char *) "OK" : (char *) "FAILED");
     137              (const char *) "OK" : (const char *) "FAILED");
    140138              //opt, global_opt,
    141139              //fabs (opt - global_opt));
     
    143141    } else // good old statistics
    144142
    145     if (bonmin.displayStats ()) { // print statistics
     143    if (couenne.displayStats ()) { // print statistics
    146144
    147145      // CAUTION: assuming first cut generator is our CouenneCutGenerator
Note: See TracChangeset for help on using the changeset viewer.