Ignore:
Timestamp:
Jun 12, 2012 4:36:11 PM (8 years ago)
Author:
pbelotti
Message:

fixing compile errors and Makefile.am in main/

File:
1 edited

Legend:

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

    r859 r860  
    4848#include "CouenneProblem.hpp"
    4949#include "CouenneJournalist.hpp"
     50
     51#ifdef COIN_HAS_NTY
    5052#include "Nauty.h"
    5153
    52 #ifdef COIN_HAS_NTY
    5354int nOrbBr = 0; // FIXME: horrible global variable. Brrr.
    5455int maxDepthOrbBranch = -1; // FIXME: horrible global variable. Brrr.
     
    187188    //////////////////////////////////
    188189
    189     double symmGroupSize = prob -> getNtyInfo () -> getGroupSize ();
     190#ifdef COIN_HAS_NTY
     191    double symmGroupSize = prob -> orbitalBranching () ? prob -> getNtyInfo () -> getGroupSize () : -1;
     192#endif
    190193
    191194    if (!infeasible)
     
    437440                //bb.bestObj (),
    438441                infeasible ? 0 : bb.numNodes (),
     442#ifdef COIN_HAS_NTY
    439443                symmGroupSize,
    440                 nSGcomputations);
     444                nSGcomputations
     445#else
     446                -1,-1
     447#endif
     448);
    441449                //bb.iterationCount ());
    442450                //status.c_str (), message.c_str ());
Note: See TracChangeset for help on using the changeset viewer.