Changeset 764 for stable/0.4


Ignore:
Timestamp:
Aug 11, 2011 5:26:40 PM (9 years ago)
Author:
pbelotti
Message:

excluding non-working Bonmin heuristics

File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/0.4/Couenne/src/main/BonCouenneSetup.cpp

    r763 r764  
    4949#include "BonNlpHeuristic.hpp"
    5050
    51 #include "BonFixAndSolveHeuristic.hpp"
    52 #include "BonDummyPump.hpp"
    53 #include "BonPumpForMinlp.hpp"
    54 #include "BonHeuristicRINS.hpp"
    55 #include "BonHeuristicLocalBranching.hpp"
    56 #include "BonHeuristicFPump.hpp"
    57 #include "BonHeuristicDiveFractional.hpp"
    58 #include "BonHeuristicDiveVectorLength.hpp"
    59 #include "BonHeuristicDiveMIPFractional.hpp"
    60 #include "BonHeuristicDiveMIPVectorLength.hpp"
    61 #include "BonMilpRounding.hpp"
     51// #include "BonFixAndSolveHeuristic.hpp"
     52// #include "BonDummyPump.hpp"
     53// #include "BonPumpForMinlp.hpp"
     54// #include "BonHeuristicRINS.hpp"
     55// #include "BonHeuristicLocalBranching.hpp"
     56// #include "BonHeuristicFPump.hpp"
     57// #include "BonHeuristicDiveFractional.hpp"
     58// #include "BonHeuristicDiveVectorLength.hpp"
     59// #include "BonHeuristicDiveMIPFractional.hpp"
     60// #include "BonHeuristicDiveMIPVectorLength.hpp"
     61// #include "BonMilpRounding.hpp"
    6262
    6363#include "BonGuessHeuristic.hpp"
     
    571571  }
    572572
    573 
    574   if (0) { // inactive as of yet -- segfaults
     573#if 0
     574  { // inactive as of yet -- segfaults
    575575
    576576    Ipopt::Index doHeuristicDiveFractional = false;
     
    690690      heuristics_.push_back(h);
    691691    }
    692   }
     692#endif
    693693
    694694  // Add Branching rules ///////////////////////////////////////////////////////
     
    809809  Bonmin::BonCbcFullNodeInfo  ::registerOptions (roptions);
    810810
     811#if 0
    811812  /// Heuristics
    812813  Bonmin::LocalSolverBasedHeuristic    ::registerOptions (roptions);
     
    822823  Bonmin::HeuristicDiveMIPFractional   ::registerOptions (roptions);
    823824  Bonmin::HeuristicDiveMIPVectorLength ::registerOptions (roptions); 
     825#endif
    824826
    825827  roptions -> AddStringOption3 ("milp_solver",
Note: See TracChangeset for help on using the changeset viewer.