Changeset 311


Ignore:
Timestamp:
Mar 10, 2010 5:47:49 PM (10 years ago)
Author:
pbelotti
Message:

re-organizing interface and heuristic files and directories

Location:
trunk/Couenne
Files:
4 added
17 edited
1 copied
6 moved

Legend:

Unmodified
Added
Removed
  • trunk/Couenne/Makefile.am

    r308 r311  
    2727          src/branch \
    2828          src/disjunctive \
     29          src/interfaces \
     30          src/heuristics \
    2931          src \
    3032          src/main
  • trunk/Couenne/Makefile.in

    r308 r311  
    9090DIST_SUBDIRS = src/util src/expression src/readnl src/standardize \
    9191        src/problem src/bound_tightening src/convex src/branch \
    92         src/disjunctive src src/main test
     92        src/disjunctive src/interfaces src/heuristics src src/main \
     93        test
    9394DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    9495distdir = $(PACKAGE)-$(VERSION)
     
    298299SUBDIRS = src/util src/expression $(am__append_1) src/standardize \
    299300        src/problem src/bound_tightening src/convex src/branch \
    300         src/disjunctive src src/main $(am__append_2)
     301        src/disjunctive src/interfaces src/heuristics src src/main \
     302        $(am__append_2)
    301303
    302304########################################################################
  • trunk/Couenne/configure

    r288 r311  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.59 for Couenne 0.2.
     3# Generated by GNU Autoconf 2.59 for Couenne 0.3.
    44#
    55# Report bugs to <couenne@list.coin-or.org>.
     
    430430PACKAGE_NAME='Couenne'
    431431PACKAGE_TARNAME='couenne'
    432 PACKAGE_VERSION='0.2'
    433 PACKAGE_STRING='Couenne 0.2'
     432PACKAGE_VERSION='0.3'
     433PACKAGE_STRING='Couenne 0.3'
    434434PACKAGE_BUGREPORT='couenne@list.coin-or.org'
    435435
     
    10021002  # This message is too long to be a string in the A/UX 3.1 sh.
    10031003  cat <<_ACEOF
    1004 \`configure' configures Couenne 0.2 to adapt to many kinds of systems.
     1004\`configure' configures Couenne 0.3 to adapt to many kinds of systems.
    10051005
    10061006Usage: $0 [OPTION]... [VAR=VALUE]...
     
    10681068if test -n "$ac_init_help"; then
    10691069  case $ac_init_help in
    1070      short | recursive ) echo "Configuration of Couenne 0.2:";;
     1070     short | recursive ) echo "Configuration of Couenne 0.3:";;
    10711071   esac
    10721072  cat <<\_ACEOF
     
    12441244if $ac_init_version; then
    12451245  cat <<\_ACEOF
    1246 Couenne configure 0.2
     1246Couenne configure 0.3
    12471247generated by GNU Autoconf 2.59
    12481248
     
    12641264running configure, to aid debugging if configure makes a mistake.
    12651265
    1266 It was created by Couenne $as_me 0.2, which was
     1266It was created by Couenne $as_me 0.3, which was
    12671267generated by GNU Autoconf 2.59.  Invocation command line was
    12681268
     
    55615561# Define the identity of the package.
    55625562 PACKAGE='couenne'
    5563  VERSION='0.2'
     5563 VERSION='0.3'
    55645564
    55655565
     
    2292922929# Here list all the files that configure should create (except for the
    2293022930# configuration header file)
    22931                                                                                                                                                       ac_config_files="$ac_config_files Makefile test/Makefile src/main/Makefile src/bound_tightening/Makefile src/branch/Makefile src/convex/Makefile src/disjunctive/Makefile src/expression/Makefile src/problem/Makefile src/standardize/Makefile src/readnl/Makefile src/util/Makefile src/Makefile test/grandTest.sh couenne_addlibs.txt"
     22931                                                                                                                                                                          ac_config_files="$ac_config_files Makefile test/Makefile src/main/Makefile src/bound_tightening/Makefile src/branch/Makefile src/convex/Makefile src/interfaces/Makefile src/heuristics/Makefile src/disjunctive/Makefile src/expression/Makefile src/problem/Makefile src/standardize/Makefile src/readnl/Makefile src/util/Makefile src/Makefile test/grandTest.sh couenne_addlibs.txt"
    2293222932
    2293322933
     
    2348223482cat >&5 <<_CSEOF
    2348323483
    23484 This file was extended by Couenne $as_me 0.2, which was
     23484This file was extended by Couenne $as_me 0.3, which was
    2348523485generated by GNU Autoconf 2.59.  Invocation command line was
    2348623486
     
    2354523545cat >>$CONFIG_STATUS <<_ACEOF
    2354623546ac_cs_version="\\
    23547 Couenne config.status 0.2
     23547Couenne config.status 0.3
    2354823548configured by $0, generated by GNU Autoconf 2.59,
    2354923549  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
     
    2366123661  "src/branch/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/branch/Makefile" ;;
    2366223662  "src/convex/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/convex/Makefile" ;;
     23663  "src/interfaces/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/interfaces/Makefile" ;;
     23664  "src/heuristics/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/heuristics/Makefile" ;;
    2366323665  "src/disjunctive/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/disjunctive/Makefile" ;;
    2366423666  "src/expression/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/expression/Makefile" ;;
  • trunk/Couenne/configure.ac

    r288 r311  
    1313AC_PREREQ(2.59)
    1414
    15 AC_INIT([Couenne],[0.2],[couenne@list.coin-or.org])
     15AC_INIT([Couenne],[0.3],[couenne@list.coin-or.org])
    1616
    1717AC_COPYRIGHT([
     
    109109                 src/branch/Makefile
    110110                 src/convex/Makefile
     111                 src/interfaces/Makefile
     112                 src/heuristics/Makefile
    111113                 src/disjunctive/Makefile
    112114                 src/expression/Makefile
  • trunk/Couenne/src/Makefile.am

    r288 r311  
    2020
    2121libCouenne_la_LIBADD = \
     22        ./interfaces/libCouenneInterfaces.la \
     23        ./heuristics/libCouenneHeuristics.la \
    2224        ./problem/libCouenneProblem.la \
    2325        ./standardize/libCouenneStandardize.la \
     
    98100AM_CPPFLAGS += \
    99101        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/convex` \
     102        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/interfaces` \
     103        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/heuristics` \
    100104        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/expression` \
    101105        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/expression/operators` \
     
    122126        main/BonCouenneInfo.hpp \
    123127        main/BonCouenneSetup.hpp \
    124         main/BonCouenneInterface.hpp \
    125         main/BonNlpHeuristic.hpp \
    126         main/BonInitHeuristic.hpp \
     128        interfaces/BonCouenneInterface.hpp \
     129        heuristics/BonNlpHeuristic.hpp \
     130        heuristics/BonInitHeuristic.hpp \
    127131        branch/CouenneObject.hpp \
    128132        branch/CouenneVarObject.hpp \
  • trunk/Couenne/src/Makefile.in

    r288 r311  
    288288libCouenne_la_SOURCES =
    289289libCouenne_la_LIBADD = \
     290        ./interfaces/libCouenneInterfaces.la \
     291        ./heuristics/libCouenneHeuristics.la \
    290292        ./problem/libCouenneProblem.la \
    291293        ./standardize/libCouenneStandardize.la \
     
    347349        $(CGLSRCDIR)/src/CglPreProcess` $(am__append_1) \
    348350        $(am__append_2) -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/convex` \
     351        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/interfaces` \
     352        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/heuristics` \
    349353        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/expression` \
    350354        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/expression/operators` \
     
    371375        main/BonCouenneInfo.hpp \
    372376        main/BonCouenneSetup.hpp \
    373         main/BonCouenneInterface.hpp \
    374         main/BonNlpHeuristic.hpp \
    375         main/BonInitHeuristic.hpp \
     377        interfaces/BonCouenneInterface.hpp \
     378        heuristics/BonNlpHeuristic.hpp \
     379        heuristics/BonInitHeuristic.hpp \
    376380        branch/CouenneObject.hpp \
    377381        branch/CouenneVarObject.hpp \
     
    585589
    586590distdir: $(DISTFILES)
    587         $(mkdir_p) $(distdir)/../inc $(distdir)/branch $(distdir)/convex $(distdir)/disjunctive $(distdir)/expression $(distdir)/expression/operators $(distdir)/expression/operators/bounds $(distdir)/main $(distdir)/problem $(distdir)/problem/depGraph $(distdir)/standardize $(distdir)/util
     591        $(mkdir_p) $(distdir)/../inc $(distdir)/branch $(distdir)/convex $(distdir)/disjunctive $(distdir)/expression $(distdir)/expression/operators $(distdir)/expression/operators/bounds $(distdir)/heuristics $(distdir)/interfaces $(distdir)/main $(distdir)/problem $(distdir)/problem/depGraph $(distdir)/standardize $(distdir)/util
    588592        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    589593        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
  • trunk/Couenne/src/bound_tightening/Makefile.am

    r133 r311  
    6060        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/problem` \
    6161        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/convex` \
     62        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/heuristics` \
    6263        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/main` \
    6364        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/branch` \
  • trunk/Couenne/src/bound_tightening/Makefile.in

    r288 r311  
    4646@COIN_HAS_COUENNE_TRUE@ -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/problem` \
    4747@COIN_HAS_COUENNE_TRUE@ -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/convex` \
     48@COIN_HAS_COUENNE_TRUE@ -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/heuristics` \
    4849@COIN_HAS_COUENNE_TRUE@ -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/main` \
    4950@COIN_HAS_COUENNE_TRUE@ -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/branch` \
  • trunk/Couenne/src/branch/CouenneChooseStrong.hpp

    r245 r311  
    1515#include "CouenneJournalist.hpp"
    1616
    17 class Bonmin::HotInfo;
    1817class CouenneProblem;
     18
    1919template <class T> class CouenneSolverInterface;
    2020
  • trunk/Couenne/src/interfaces/BonCouenneInterface.cpp

    r306 r311  
    6868  bool is_feasible = true;
    6969
    70   if (solveNlp) {
     70  if (false && solveNlp) {
    7171
    7272    int nvars = p -> nVars();
     
    272272
    273273  int
    274     numcols     = getNumCols (), // # original               variables
    275     numcolsconv = p -> nVars (); // # original + # auxiliary variables
     274    numcols     = p -> nOrigVars (), // # original               variables
     275    numcolsconv = p -> nVars     (); // # original + # auxiliary variables
    276276
    277277  const double
    278     *lb = getColLower (),
    279     *ub = getColUpper ();
     278    *lb = p -> Lb (), //getColLower (),
     279    *ub = p -> Ub (); //getColUpper ();
    280280
    281281   // add original and auxiliary variables to the new problem
  • trunk/Couenne/src/interfaces/BonCouenneInterface.hpp

    r306 r311  
    4949                              Ipopt::SmartPtr<Ipopt::Journalist> journalist);
    5050#endif
     51
    5152  /** \name Overloaded methods to build outer approximations */
    5253  //@{
  • trunk/Couenne/src/main/BonCouenne.cpp

    r232 r311  
    6767
    6868#if 0
    69     ci = new CouenneInterface;
     69    //ci = new CouenneInterface;
    7070    p = new CouenneProblem;
    7171
  • trunk/Couenne/src/main/BonCouenneSetup.cpp

    r258 r311  
    9292  }
    9393
    94   bool CouenneSetup::InitializeCouenne (char ** argv,
     94  bool CouenneSetup::InitializeCouenne (char ** argv,  
    9595                                        CouenneProblem *couenneProb,
    96           Ipopt::SmartPtr<Bonmin::TMINLP> tminlp,
     96                                        Ipopt::SmartPtr<Bonmin::TMINLP> tminlp,
    9797                                        Bonmin::CouenneInterface *ci) {
    9898    std::string s;
     
    136136#endif
    137137      } else {
    138         assert(couenneProb_ != NULL);
    139         assert(IsValid(tminlp)); //TODO would be great to setup own TMINLP based on CouenneProblem formulation
    140         ci -> initialize(roptions_, options_, journalist_, tminlp);
     138        assert (couenneProb_ != NULL);
     139        assert (IsValid (tminlp)); //TODO would be great to setup own TMINLP based on CouenneProblem formulation
     140        ci -> initialize (roptions_, options_, journalist_, tminlp);
    141141      }
    142142    }
     
    335335        // if this variable is associated with a nonlinear function
    336336        if (var -> isInteger () ||
    337             (var -> Type  () == AUX) &&
    338             (var -> Image () -> Linearity () > LINEAR)) {
     337            ((var -> Type  () == AUX) &&
     338             (var -> Image () -> Linearity () > LINEAR))) {
    339339
    340340          /*if ((var -> Image () -> code () == COU_EXPRMUL) &&
  • trunk/Couenne/src/main/Makefile.am

    r305 r311  
    1818
    1919libBonCouenne_la_SOURCES = \
    20         BonCouenneSetup.cpp \
    21         BonCouenneInterface.cpp \
    22         BonNlpHeuristic.cpp \
    23         BonInitHeuristic.cpp
     20        BonCouenneSetup.cpp
    2421
    2522COINLIBS = \
     
    2926        $(BONMINOBJDIR)/src/CbcBonmin/libbonmin.la \
    3027        $(BONMINOBJDIR)/src/Algorithms/Branching/libbonbranching.la \
    31         $(BONMINOBJDIR)/src/Interfaces/libbonmininterfaces.la \
    32         $(IPOPTOBJDIR)/src/Interfaces/libipopt.la \
    3328        $(IPOPTOBJDIR)/src/LinAlg/liblinalg.la
    3429
     
    5247couenne_LDADD         = libBonCouenne.la
    5348couenne_DEPENDENCIES  = libBonCouenne.la
     49
    5450if COIN_HAS_ASL
    5551couenne_LDADD        += ../readnl/libCouenneReadnl.la
    5652couenne_DEPENDENCIES += ../readnl/libCouenneReadnl.la
     53COINLIBS             += \
     54        $(BONMINOBJDIR)/src/Interfaces/Ampl/libbonamplinterface.la \
     55        $(IPOPTOBJDIR)/src/Apps/AmplSolver/libamplinterface.la
    5756endif
     57
     58
     59COINLIBS += \
     60        $(IPOPTOBJDIR)/src/Interfaces/libipopt.la \
     61        $(BONMINOBJDIR)/src/Interfaces/libbonmininterfaces.la
     62
    5863couenne_LDADD        += ../libCouenne.la
    5964couenne_DEPENDENCIES += ../libCouenne.la
     
    6469couenne2_LDADD         = libBonCouenne.la
    6570couenne2_DEPENDENCIES  = libBonCouenne.la
     71
    6672if COIN_HAS_ASL
    6773couenne2_LDADD        += ../readnl/libCouenneReadnl.la
    6874couenne2_DEPENDENCIES += ../readnl/libCouenneReadnl.la
    6975endif
     76
    7077couenne2_LDADD        += ../libCouenne.la
    7178couenne2_DEPENDENCIES += ../libCouenne.la
     
    155162AM_CPPFLAGS += \
    156163        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src` \
     164        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/interfaces` \
     165        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/heuristics` \
    157166        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/convex` \
    158167        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/expression` \
  • trunk/Couenne/src/main/Makefile.in

    r308 r311  
    4949@COIN_HAS_ASL_TRUE@am__append_3 = ../readnl/libCouenneReadnl.la
    5050@COIN_HAS_ASL_TRUE@am__append_4 = ../readnl/libCouenneReadnl.la
    51 @COIN_HAS_ASL_TRUE@am__append_5 = ../readnl/libCouenneReadnl.la
     51@COIN_HAS_ASL_TRUE@am__append_5 = \
     52@COIN_HAS_ASL_TRUE@     $(BONMINOBJDIR)/src/Interfaces/Ampl/libbonamplinterface.la \
     53@COIN_HAS_ASL_TRUE@     $(IPOPTOBJDIR)/src/Apps/AmplSolver/libamplinterface.la
     54
    5255@COIN_HAS_ASL_TRUE@am__append_6 = ../readnl/libCouenneReadnl.la
    53 @COIN_HAS_CPX_TRUE@am__append_7 = \
     56@COIN_HAS_ASL_TRUE@am__append_7 = ../readnl/libCouenneReadnl.la
     57@COIN_HAS_CPX_TRUE@am__append_8 = \
    5458@COIN_HAS_CPX_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCpx` \
    5559@COIN_HAS_CPX_TRUE@     -I`$(CYGPATH_W) $(CPXINCDIR)`
     
    7579LTLIBRARIES = $(lib_LTLIBRARIES)
    7680libBonCouenne_la_LIBADD =
    77 am_libBonCouenne_la_OBJECTS = BonCouenneSetup.lo \
    78         BonCouenneInterface.lo BonNlpHeuristic.lo BonInitHeuristic.lo
     81am_libBonCouenne_la_OBJECTS = BonCouenneSetup.lo
    7982libBonCouenne_la_OBJECTS = $(am_libBonCouenne_la_OBJECTS)
    8083binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
     
    8790am__DEPENDENCIES_3 =
    8891@COIN_HAS_NTY_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_3)
    89 am__DEPENDENCIES_5 = $(CBCOBJDIR)/src/libCbc.la \
     92@COIN_HAS_ASL_TRUE@am__DEPENDENCIES_5 = $(BONMINOBJDIR)/src/Interfaces/Ampl/libbonamplinterface.la \
     93@COIN_HAS_ASL_TRUE@     $(IPOPTOBJDIR)/src/Apps/AmplSolver/libamplinterface.la
     94am__DEPENDENCIES_6 = $(CBCOBJDIR)/src/libCbc.la \
    9095        $(CGLOBJDIR)/src/libCgl.la \
    9196        $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    9297        $(BONMINOBJDIR)/src/CbcBonmin/libbonmin.la \
    9398        $(BONMINOBJDIR)/src/Algorithms/Branching/libbonbranching.la \
    94         $(BONMINOBJDIR)/src/Interfaces/libbonmininterfaces.la \
    95         $(IPOPTOBJDIR)/src/Interfaces/libipopt.la \
    9699        $(IPOPTOBJDIR)/src/LinAlg/liblinalg.la $(am__DEPENDENCIES_2) \
    97100        $(am__DEPENDENCIES_4) $(OSIOBJDIR)/src/libOsi.la \
    98101        $(CLPOBJDIR)/src/libClp.la \
    99         $(COINUTILSOBJDIR)/src/libCoinUtils.la
     102        $(COINUTILSOBJDIR)/src/libCoinUtils.la $(am__DEPENDENCIES_5) \
     103        $(IPOPTOBJDIR)/src/Interfaces/libipopt.la \
     104        $(BONMINOBJDIR)/src/Interfaces/libbonmininterfaces.la
    100105am_couenne2_OBJECTS = Couenne.$(OBJEXT) CouenneOSInterface.$(OBJEXT)
    101106couenne2_OBJECTS = $(am_couenne2_OBJECTS)
     
    309314lib_LTLIBRARIES = libBonCouenne.la
    310315libBonCouenne_la_SOURCES = \
    311         BonCouenneSetup.cpp \
    312         BonCouenneInterface.cpp \
    313         BonNlpHeuristic.cpp \
    314         BonInitHeuristic.cpp
     316        BonCouenneSetup.cpp
    315317
    316318COINLIBS = $(CBCOBJDIR)/src/libCbc.la $(CGLOBJDIR)/src/libCgl.la \
     
    318320        $(BONMINOBJDIR)/src/CbcBonmin/libbonmin.la \
    319321        $(BONMINOBJDIR)/src/Algorithms/Branching/libbonbranching.la \
    320         $(BONMINOBJDIR)/src/Interfaces/libbonmininterfaces.la \
    321         $(IPOPTOBJDIR)/src/Interfaces/libipopt.la \
    322322        $(IPOPTOBJDIR)/src/LinAlg/liblinalg.la $(am__append_1) \
    323323        $(am__append_2) $(OSIOBJDIR)/src/libOsi.la \
    324324        $(CLPOBJDIR)/src/libClp.la \
    325         $(COINUTILSOBJDIR)/src/libCoinUtils.la
     325        $(COINUTILSOBJDIR)/src/libCoinUtils.la $(am__append_5) \
     326        $(IPOPTOBJDIR)/src/Interfaces/libipopt.la \
     327        $(BONMINOBJDIR)/src/Interfaces/libbonmininterfaces.la
    326328IPOPTLIBS = \
    327329        $(IPOPTOBJDIR)/src/Interfaces/libipopt.la \
     
    339341        BonCouenne.cpp
    340342
    341 couenne2_LDADD = libBonCouenne.la $(am__append_5) ../libCouenne.la \
     343couenne2_LDADD = libBonCouenne.la $(am__append_6) ../libCouenne.la \
    342344        $(LIBCBCCOPY) $(COINLIBS) $(ADDLIBS) $(ASLLIB) `cat \
    343345        $(IPOPTOBJDIR)/src/Interfaces/ipopt_addlibs_cpp.txt` `cat \
    344346        $(COINUTILSOBJDIR)/coinutils_addlibs.txt`
    345 couenne2_DEPENDENCIES = libBonCouenne.la $(am__append_6) \
     347couenne2_DEPENDENCIES = libBonCouenne.la $(am__append_7) \
    346348        ../libCouenne.la
    347349couenne2_SOURCES = \
     
    394396        $(CGLSRCDIR)/src/CglKnapsackCover` -I`$(CYGPATH_W) \
    395397        $(CGLSRCDIR)/src/CglPreProcess` -I`$(CYGPATH_W) \
    396         $(CGLOBJDIR)/inc` $(am__append_7) $(ASL_CPPFLAGS) \
     398        $(CGLOBJDIR)/inc` $(am__append_8) $(ASL_CPPFLAGS) \
    397399        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src` -I`$(CYGPATH_W) \
     400        $(COUENNESRCDIR)/src/interfaces` -I`$(CYGPATH_W) \
     401        $(COUENNESRCDIR)/src/heuristics` -I`$(CYGPATH_W) \
    398402        $(COUENNESRCDIR)/src/convex` -I`$(CYGPATH_W) \
    399403        $(COUENNESRCDIR)/src/expression` -I`$(CYGPATH_W) \
     
    512516
    513517@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BonCouenne.Po@am__quote@
    514 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BonCouenneInterface.Plo@am__quote@
    515518@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BonCouenneSetup.Plo@am__quote@
    516 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BonInitHeuristic.Plo@am__quote@
    517 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BonNlpHeuristic.Plo@am__quote@
    518519@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Couenne.Po@am__quote@
    519520@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CouenneOSInterface.Po@am__quote@
  • trunk/Couenne/src/problem/CouenneSolverInterface.cpp

    r215 r311  
    166166
    167167    if ((nsi -> isProvenOptimal () && isProvenOptimal ()) ||
    168         !(nsi -> isProvenOptimal ()) && !isProvenOptimal ()) {
     168        (!(nsi -> isProvenOptimal ()) && !isProvenOptimal ())) {
    169169
    170170      if (nsi -> isProvenOptimal () &&
     
    184184
    185185    if ((csi -> isProvenOptimal () && isProvenOptimal ()) ||
    186         !(csi -> isProvenOptimal ()) && !isProvenOptimal ()) {
     186        (!(csi -> isProvenOptimal ()) && !isProvenOptimal ())) {
    187187
    188188      if (csi -> isProvenOptimal () &&
  • trunk/Couenne/src/problem/writeAMPL.cpp

    r215 r311  
    3333    f << "var ";
    3434    variables_ [i] -> print (f);
    35     if (Lb (i) > - COUENNE_INFINITY + 1) f << " >= " << Lb (i);
    36     if (Ub (i) < + COUENNE_INFINITY - 1) f << " <= " << Ub (i);
     35    if (Lb (i) > - COUENNE_INFINITY/2) f << " >= " << Lb (i);
     36    if (Ub (i) < + COUENNE_INFINITY/2) f << " <= " << Ub (i);
    3737    if (variables_ [i] -> isInteger ())   f << " integer";
    3838    if (fabs (X (i)) < COUENNE_INFINITY)   
  • trunk/Couenne/src/readnl/Makefile.am

    r235 r311  
    5151        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src` \
    5252        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/main` \
     53        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/interfaces` \
    5354        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/problem` \
    5455        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/branch` \
  • trunk/Couenne/src/readnl/Makefile.in

    r288 r311  
    310310        $(COUENNESRCDIR)/src` -I`$(CYGPATH_W) \
    311311        $(COUENNESRCDIR)/src/main` -I`$(CYGPATH_W) \
     312        $(COUENNESRCDIR)/src/interfaces` -I`$(CYGPATH_W) \
    312313        $(COUENNESRCDIR)/src/problem` -I`$(CYGPATH_W) \
    313314        $(COUENNESRCDIR)/src/branch` -I`$(CYGPATH_W) \
Note: See TracChangeset for help on using the changeset viewer.