Changeset 9


Ignore:
Timestamp:
Nov 3, 2008 12:27:52 AM (11 years ago)
Author:
pbelotti
Message:

minor fixes to compile with debug enabled

Location:
trunk/Couenne/src
Files:
6 edited

Legend:

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

    r1 r9  
    137137        util/rootQ.cpp
    138138
    139 COINLIBS = \
    140         $(BONMINOBJDIR)/src/CbcBonmin/libbonminampl.la \
    141         $(OSIOBJDIR)/src/libOsi.la \
    142         $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    143         $(CGLOBJDIR)/src/libCgl.la \
    144         $(CLPOBJDIR)/src/libClp.la \
    145         $(COINUTILSOBJDIR)/src/libCoinUtils.la
    146 
    147139# This is for libtool (on Windows)
    148140libCouenne_la_LDFLAGS = $(LT_LDFLAGS)
  • trunk/Couenne/src/Makefile.in

    r1 r9  
    500500        bound_tightening/operators/impliedBounds-exprPow.cpp \
    501501        util/drawCuts.cpp util/rootQ.cpp $(am__append_1)
    502 COINLIBS = \
    503         $(BONMINOBJDIR)/src/CbcBonmin/libbonminampl.la \
    504         $(OSIOBJDIR)/src/libOsi.la \
    505         $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    506         $(CGLOBJDIR)/src/libCgl.la \
    507         $(CLPOBJDIR)/src/libClp.la \
    508         $(COINUTILSOBJDIR)/src/libCoinUtils.la
    509 
    510502
    511503# This is for libtool (on Windows)
  • trunk/Couenne/src/convex/operators/conv-exprGroup.cpp

    r1 r9  
    1818#include "CouenneCutGenerator.hpp"
    1919
    20 /// Get lower and upper bound of an expression (if any)
     20/// Get expressions of lower and upper bound of an expression (if any)
    2121void exprGroup::getBounds (expression *&lb, expression *&ub) {
    2222
  • trunk/Couenne/src/main/Makefile.am

    r1 r9  
    2020
    2121COINLIBS += \
     22        $(CBCOBJDIR)/src/libCbc.la \
     23        $(CGLOBJDIR)/src/libCgl.la \
     24        $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    2225        $(BONMINOBJDIR)/src/CbcBonmin/libbonmin.la \
    2326        $(BONMINOBJDIR)/src/CbcBonmin/libbonminampl.la \
     27        $(BONMINOBJDIR)/src/Interfaces/libbonmininterfaces.la \
    2428        $(IPOPTOBJDIR)/src/Apps/AmplSolver/libamplinterface.la \
    25         $(CBCOBJDIR)/src/libCbc.la \
    26         $(CGLOBJDIR)/src/libCgl.la \
    27         $(OSIOBJDIR)/src/OsiClp/libOsiClp.la
     29        $(IPOPTOBJDIR)/src/Interfaces/libipopt.la \
     30        $(IPOPTOBJDIR)/src/LinAlg/liblinalg.la
    2831
    2932#if COIN_HAS_CPX
     
    4245
    4346
    44 IPOPTLIBS = \
    45         $(IPOPTOBJDIR)/src/Interfaces/libipopt.la
     47#IPOPTLIBS = \
     48#        $(IPOPTOBJDIR)/src/Interfaces/libipopt.la \
     49#        $(IPOPTOBJDIR)/src/LinAlg/liblinalg.la
    4650
    4751LIBS += `cat $(IPOPTOBJDIR)/src/Interfaces/ipopt_addlibs_cpp.txt`
     
    122126
    123127couenne_LDADD = \
    124         $(IPOPTLIBS) \
    125128        $(LIBCBCCOPY) \
    126129        $(COINLIBS) \
  • trunk/Couenne/src/main/Makefile.in

    r1 r9  
    7676        BonInitHeuristic.$(OBJEXT) BonCouenneInfo.$(OBJEXT)
    7777couenne_OBJECTS = $(am_couenne_OBJECTS)
    78 am__DEPENDENCIES_1 = $(IPOPTOBJDIR)/src/Interfaces/libipopt.la
    79 @COIN_HAS_COUENNE_TRUE@am__DEPENDENCIES_2 =  \
     78@COIN_HAS_COUENNE_TRUE@am__DEPENDENCIES_1 =  \
    8079@COIN_HAS_COUENNE_TRUE@ $(COUENNEOBJDIR)/src/libCouenne.la
    81 am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2) \
     80am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(CBCOBJDIR)/src/libCbc.la \
     81        $(CGLOBJDIR)/src/libCgl.la \
     82        $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    8283        $(BONMINOBJDIR)/src/CbcBonmin/libbonmin.la \
    8384        $(BONMINOBJDIR)/src/CbcBonmin/libbonminampl.la \
     85        $(BONMINOBJDIR)/src/Interfaces/libbonmininterfaces.la \
    8486        $(IPOPTOBJDIR)/src/Apps/AmplSolver/libamplinterface.la \
    85         $(CBCOBJDIR)/src/libCbc.la $(CGLOBJDIR)/src/libCgl.la \
    86         $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
     87        $(IPOPTOBJDIR)/src/Interfaces/libipopt.la \
     88        $(IPOPTOBJDIR)/src/LinAlg/liblinalg.la \
    8789        $(OSIOBJDIR)/src/libOsi.la $(CLPOBJDIR)/src/libClp.la \
    8890        $(COINUTILSOBJDIR)/src/libCoinUtils.la
    89 am__DEPENDENCIES_4 =
    90 couenne_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) \
    91         $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_4)
     91am__DEPENDENCIES_3 =
     92couenne_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
     93        $(am__DEPENDENCIES_3)
    9294DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/inc
    9395depcomp = $(SHELL) $(top_srcdir)/../depcomp
     
    207209LIBEXT = @LIBEXT@
    208210LIBOBJS = @LIBOBJS@
     211
     212#if COIN_HAS_CPX
     213#COINLIBS += \
     214#        $(CPXLIB)
     215#endif
     216
     217#IPOPTLIBS = \
     218#        $(IPOPTOBJDIR)/src/Interfaces/libipopt.la \
     219#        $(IPOPTOBJDIR)/src/LinAlg/liblinalg.la
    209220LIBS = @LIBS@ `cat \
    210221        $(IPOPTOBJDIR)/src/Interfaces/ipopt_addlibs_cpp.txt` `cat \
     
    302313#     COINLIBS += $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la
    303314#endif
    304 COINLIBS = $(am__append_1) $(BONMINOBJDIR)/src/CbcBonmin/libbonmin.la \
     315COINLIBS = $(am__append_1) $(CBCOBJDIR)/src/libCbc.la \
     316        $(CGLOBJDIR)/src/libCgl.la \
     317        $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
     318        $(BONMINOBJDIR)/src/CbcBonmin/libbonmin.la \
    305319        $(BONMINOBJDIR)/src/CbcBonmin/libbonminampl.la \
     320        $(BONMINOBJDIR)/src/Interfaces/libbonmininterfaces.la \
    306321        $(IPOPTOBJDIR)/src/Apps/AmplSolver/libamplinterface.la \
    307         $(CBCOBJDIR)/src/libCbc.la $(CGLOBJDIR)/src/libCgl.la \
    308         $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
     322        $(IPOPTOBJDIR)/src/Interfaces/libipopt.la \
     323        $(IPOPTOBJDIR)/src/LinAlg/liblinalg.la \
    309324        $(OSIOBJDIR)/src/libOsi.la $(CLPOBJDIR)/src/libClp.la \
    310325        $(COINUTILSOBJDIR)/src/libCoinUtils.la
    311 
    312 #if COIN_HAS_CPX
    313 #COINLIBS += \
    314 #        $(CPXLIB)
    315 #endif
    316 IPOPTLIBS = \
    317         $(IPOPTOBJDIR)/src/Interfaces/libipopt.la
    318 
    319326
    320327# Here list all include flags, relative to this "srcdir" directory.  This
     
    367374
    368375couenne_LDADD = \
    369         $(IPOPTLIBS) \
    370376        $(LIBCBCCOPY) \
    371377        $(COINLIBS) \
  • trunk/Couenne/src/problem/problem.cpp

    r1 r9  
    4343    int index;
    4444
    45     if ((variables_ [i] -> Type  () == AUX) &&                // this is an auxiliary
     45    if ((variables_ [i] -> Type () == AUX) &&                // this is an auxiliary
    4646        ((index = variables_ [i] -> Index ()) >= nOrigVars_)) // and not an original, originally...
    4747      //int index = variables_ [i] -> Index ();
     
    7777    if (variables_ [ord] -> Type () == AUX) {
    7878
    79       Jnlst () -> Printf (Ipopt::J_ALL, J_PROBLEM, "w_%04d [%10g,%10g] ", ord, Lb (ord), Ub (ord));
     79      Jnlst () -> Printf (Ipopt::J_MOREMATRIX, J_PROBLEM,
     80                          "w_%04d [%10g,%10g] ", ord, Lb (ord), Ub (ord));
    8081
    8182      CouNumber l, u;
     
    8889      //if ((ub_ [ord] = (*(aux -> Ub ())) ()) >=  COUENNE_INFINITY) ub_ [ord] =  DBL_MAX;
    8990
    90       Jnlst () -> Printf (Ipopt::J_ALL, J_PROBLEM, " --> [%10g,%10g]\n", Lb (ord), Ub (ord));
     91      Jnlst () -> Printf (Ipopt::J_MOREMATRIX, J_PROBLEM,
     92                          " --> [%10g,%10g]\n", Lb (ord), Ub (ord));
    9193
    9294      bool integer = variables_ [ord] -> isInteger ();
Note: See TracChangeset for help on using the changeset viewer.