Ignore:
Timestamp:
Jul 31, 2011 7:54:55 AM (9 years ago)
Author:
pbelotti
Message:

cosmetic changes in probing. added Bonmin's heuristics though they aren't usable yet -- had to change CouenneSetup? to be derived from BonminSetup? rather than BabSetupBase?

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Couenne/src/main/Makefile.am

    r639 r749  
    2323couenne_SOURCES = BonCouenne.cpp
    2424couenne_LDADD   = libBonCouenne.la ../libCouenne.la ../readnl/libCouenneReadnl.la $(COUENNELIB_LIBS) $(ASL_LIBS)
    25 
    26 #if COIN_HAS_SPX
    27 #couenne_LDADD += \
    28 #       $(SPXLIBDIR)/libsoplex-1.5.0.linux.x86_64.gnu.opt-shared.so
    29 #endif
    30 
    3125couenne_DEPENDENCIES  = libBonCouenne.la ../libCouenne.la ../readnl/libCouenneReadnl.la $(COUENNELIB_DEPENDENCIES) $(ASL_DEPENDENCIES)
    3226
Note: See TracChangeset for help on using the changeset viewer.