Changeset 595


Ignore:
Timestamp:
Mar 31, 2007 10:57:25 AM (12 years ago)
Author:
forrest
Message:

problem with ampl

Location:
branches/devel/Cbc/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Cbc/src/Cbc_ampl.cpp

    r594 r595  
    13451345    // Fix memory leak one day
    13461346    CbcAmplInfo * info = new CbcAmplInfo;
    1347     amplGamsData_ = info;
     1347    //amplGamsData_ = info;
    13481348    info->asl_=NULL; // as wrong form asl;
    13491349    info->nz_h_full_=-1; // number of nonzeros in hessian
     
    14241424    // Fix memory leak one day
    14251425    CbcAmplInfo * info = new CbcAmplInfo;
    1426     amplGamsData_ = info;
     1426    //amplGamsData_ = info;
    14271427    info->asl_=asl;
    14281428    // This is not easy to get from ampl so save
  • branches/devel/Cbc/src/Makefile.am

    r592 r595  
    108108#cbc_SOURCES += Cbc_ampl.cpp Cbc_ampl.h
    109109cbc_LDADD += $(ASLLIB)
    110 AM_CPPFLAGS += $(ASL_CPPFLAGS)
     110AM_CPPFLAGS += $(ASL_CPPFLAGS) -DCOIN_HAS_ASL
    111111endif
    112112
  • branches/devel/Cbc/src/Makefile.in

    r592 r595  
    6565#cbc_SOURCES += Cbc_ampl.cpp Cbc_ampl.h
    6666@COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@am__append_4 = $(ASLLIB)
    67 @COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@am__append_5 = $(ASL_CPPFLAGS)
     67@COIN_HAS_ASL_TRUE@@COIN_HAS_CLP_TRUE@am__append_5 = $(ASL_CPPFLAGS) -DCOIN_HAS_ASL
    6868
    6969########################################################################
     
    134134@CBC_BUILD_CBC_GENERIC_TRUE@@COIN_HAS_XPR_TRUE@am__append_32 = $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
    135135subdir = src
    136 DIST_COMMON = README $(include_HEADERS) $(srcdir)/Makefile.am \
     136DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
    137137        $(srcdir)/Makefile.in
    138138ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
Note: See TracChangeset for help on using the changeset viewer.