Changeset 605


Ignore:
Timestamp:
Jun 6, 2011 8:08:33 AM (9 years ago)
Author:
pbelotti
Message:

moving (yet) unused cut generators to common subdirectory cut/ -- will do the same for other generators later

Location:
trunk/Couenne
Files:
1 added
13 edited
3 moved

Legend:

Unmodified
Added
Removed
  • trunk/Couenne/Makefile.am

    r556 r605  
    2626          src/branch \
    2727          src/disjunctive \
    28           src/sdpcuts \
     28          src/cut/sdpcuts \
     29          src/cut/crossconv \
    2930          src/interfaces \
    3031          src/heuristics \
    31           src/crossconv \
    3232          src/two_implied_bt \
    3333          src \
    3434          src/main
    3535
    36 #         src/ellipcuts
     36#         src/cut/ellipcuts
    3737
    3838# We don't want to compile the test subdirectory, unless the test target is
  • trunk/Couenne/Makefile.in

    r600 r605  
    5555@COIN_HAS_ASL_TRUE@am__append_1 = src/readnl
    5656
    57 #         src/ellipcuts
     57#         src/cut/ellipcuts
    5858
    5959# We don't want to compile the test subdirectory, unless the test target is
     
    101101DIST_SUBDIRS = src/util src/expression src/readnl src/standardize \
    102102        src/problem src/bound_tightening src/convex src/branch \
    103         src/disjunctive src/sdpcuts src/interfaces src/heuristics \
    104         src/crossconv src/two_implied_bt src src/main test
     103        src/disjunctive src/cut/sdpcuts src/cut/crossconv \
     104        src/interfaces src/heuristics src/two_implied_bt src src/main \
     105        test
    105106DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    106107distdir = $(PACKAGE)-$(VERSION)
     
    348349SUBDIRS = src/util src/expression $(am__append_1) src/standardize \
    349350        src/problem src/bound_tightening src/convex src/branch \
    350         src/disjunctive src/sdpcuts src/interfaces src/heuristics \
    351         src/crossconv src/two_implied_bt src src/main $(am__append_2)
     351        src/disjunctive src/cut/sdpcuts src/cut/crossconv \
     352        src/interfaces src/heuristics src/two_implied_bt src src/main \
     353        $(am__append_2)
    352354
    353355########################################################################
  • trunk/Couenne/configure

    r600 r605  
    2736827368# Here list all the files that configure should create (except for the
    2736927369# configuration header file)
    27370                                                                                                                                                                                                                             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/sdpcuts/Makefile src/ellipcuts/Makefile src/expression/Makefile src/problem/Makefile src/standardize/Makefile src/readnl/Makefile src/util/Makefile src/crossconv/Makefile src/two_implied_bt/Makefile src/Makefile test/grandTest.sh couenne.pc couenne-uninstalled.pc"
    27371 
     27370                                                                                                                                                                                                                  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/cut/sdpcuts/Makefile src/cut/crossconv/Makefile src/expression/Makefile src/problem/Makefile src/standardize/Makefile src/readnl/Makefile src/util/Makefile src/two_implied_bt/Makefile src/Makefile test/grandTest.sh couenne.pc couenne-uninstalled.pc"
     27371
     27372
     27373#                 src/cut/ellipcuts/Makefile
    2737227374
    2737327375# Here put the location and name of the configuration header file
     
    2817128173  "src/heuristics/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/heuristics/Makefile" ;;
    2817228174  "src/disjunctive/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/disjunctive/Makefile" ;;
    28173   "src/sdpcuts/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/sdpcuts/Makefile" ;;
    28174   "src/ellipcuts/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/ellipcuts/Makefile" ;;
     28175  "src/cut/sdpcuts/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/cut/sdpcuts/Makefile" ;;
     28176  "src/cut/crossconv/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/cut/crossconv/Makefile" ;;
    2817528177  "src/expression/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/expression/Makefile" ;;
    2817628178  "src/problem/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/problem/Makefile" ;;
     
    2817828180  "src/readnl/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/readnl/Makefile" ;;
    2817928181  "src/util/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/util/Makefile" ;;
    28180   "src/crossconv/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/crossconv/Makefile" ;;
    2818128182  "src/two_implied_bt/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/two_implied_bt/Makefile" ;;
    2818228183  "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
  • trunk/Couenne/configure.ac

    r600 r605  
     1## $Id$
     2#
    13# Copyright (C) 2006 International Business Machines.
    24# All Rights Reserved.
    35# This file is distributed under the Eclipse Public License.
    4 
    5 ## $Id$
    66
    77# Authors:  Andreas Waechter            IBM    2006-12-06
     
    120120                 src/heuristics/Makefile
    121121                 src/disjunctive/Makefile
    122                  src/sdpcuts/Makefile
    123                  src/ellipcuts/Makefile
     122                 src/cut/sdpcuts/Makefile
     123                 src/cut/crossconv/Makefile
    124124                 src/expression/Makefile
    125125                 src/problem/Makefile
     
    127127                 src/readnl/Makefile
    128128                 src/util/Makefile
    129                  src/crossconv/Makefile
    130129                 src/two_implied_bt/Makefile
    131130                 src/Makefile
    132131                 test/grandTest.sh
    133132                 couenne.pc couenne-uninstalled.pc])
     133
     134#                 src/cut/ellipcuts/Makefile
    134135
    135136# Here put the location and name of the configuration header file
  • trunk/Couenne/src/Makefile.am

    r600 r605  
    3131        ./util/libCouenneUtil.la \
    3232        ./disjunctive/libCouenneDisjunctive.la \
    33         ./sdpcuts/libCouenneSdpCuts.la \
    34         ./crossconv/libCouenneCrossConv.la \
     33        ./cut/sdpcuts/libCouenneSdpCuts.la \
     34        ./cut/crossconv/libCouenneCrossConv.la \
    3535        ./two_implied_bt/libCouenneTwoImplied.la
    3636
     
    5959#       -I`$(CYGPATH_W) $(srcdir)/expression/operators` \
    6060#       -I`$(CYGPATH_W) $(srcdir)/disjunctive` \
    61 #       -I`$(CYGPATH_W) $(srcdir)/sdpcuts` \
    6261#       -I`$(CYGPATH_W) $(srcdir)/main` \
    6362#       -I`$(CYGPATH_W) $(srcdir)/problem` \
    6463#       -I`$(CYGPATH_W) $(srcdir)/branch` \
    65 #       -I`$(CYGPATH_W) $(srcdir)/sdpcuts` \
    66 #       -I`$(CYGPATH_W) $(srcdir)/crossconv` \
     64#       -I`$(CYGPATH_W) $(srcdir)/cut/sdpcuts` \
     65#       -I`$(CYGPATH_W) $(srcdir)/cut/crossconv` \
    6766#       -I`$(CYGPATH_W) $(srcdir)/two_implied_bt`
    6867
     
    163162        disjunctive/CouenneDisjCuts.hpp \
    164163        convex/CouenneCutGenerator.hpp \
    165         crossconv/CouenneCrossConv.hpp \
     164        cut/crossconv/CouenneCrossConv.hpp \
    166165        two_implied_bt/CouenneTwoImplied.hpp \
    167         sdpcuts/CouenneSdpCuts.hpp \
    168         sdpcuts/CutGen.hpp \
    169         sdpcuts/disjunctive_cuts.hpp \
    170         sdpcuts/dsyevx_wrapper.hpp \
    171         sdpcuts/Heuristics.hpp \
    172         sdpcuts/linquad_cuts.hpp \
    173         sdpcuts/misc_util.hpp \
    174         sdpcuts/orthocut.hpp \
    175         sdpcuts/OsiXxxSolverInterface.hpp \
    176         sdpcuts/populate.hpp \
    177         sdpcuts/quadratic_cuts_check.hpp \
    178         sdpcuts/rlt_cuts.hpp \
    179         sdpcuts/sdpcuts.hpp \
    180         sdpcuts/tracer.hpp
     166        cut/sdpcuts/CouenneSdpCuts.hpp \
     167        cut/sdpcuts/CutGen.hpp \
     168        cut/sdpcuts/disjunctive_cuts.hpp \
     169        cut/sdpcuts/dsyevx_wrapper.hpp \
     170        cut/sdpcuts/Heuristics.hpp \
     171        cut/sdpcuts/linquad_cuts.hpp \
     172        cut/sdpcuts/misc_util.hpp \
     173        cut/sdpcuts/orthocut.hpp \
     174        cut/sdpcuts/OsiXxxSolverInterface.hpp \
     175        cut/sdpcuts/populate.hpp \
     176        cut/sdpcuts/quadratic_cuts_check.hpp \
     177        cut/sdpcuts/rlt_cuts.hpp \
     178        cut/sdpcuts/sdpcuts.hpp \
     179        cut/sdpcuts/tracer.hpp
    181180
    182181#       ellipcuts/CouenneEllipCuts.hpp
  • trunk/Couenne/src/Makefile.in

    r600 r605  
    5454#       -I`$(CYGPATH_W) $(srcdir)/expression/operators` \
    5555#       -I`$(CYGPATH_W) $(srcdir)/disjunctive` \
    56 #       -I`$(CYGPATH_W) $(srcdir)/sdpcuts` \
    5756#       -I`$(CYGPATH_W) $(srcdir)/main` \
    5857#       -I`$(CYGPATH_W) $(srcdir)/problem` \
    5958#       -I`$(CYGPATH_W) $(srcdir)/branch` \
    60 #       -I`$(CYGPATH_W) $(srcdir)/sdpcuts` \
    61 #       -I`$(CYGPATH_W) $(srcdir)/crossconv` \
     59#       -I`$(CYGPATH_W) $(srcdir)/cut/sdpcuts` \
     60#       -I`$(CYGPATH_W) $(srcdir)/cut/crossconv` \
    6261#       -I`$(CYGPATH_W) $(srcdir)/two_implied_bt`
    6362
     
    159158        problem/CouenneRecordBestSol.hpp expression/CouenneTypes.hpp \
    160159        disjunctive/CouenneDisjCuts.hpp convex/CouenneCutGenerator.hpp \
    161         crossconv/CouenneCrossConv.hpp \
     160        cut/crossconv/CouenneCrossConv.hpp \
    162161        two_implied_bt/CouenneTwoImplied.hpp \
    163         sdpcuts/CouenneSdpCuts.hpp sdpcuts/CutGen.hpp \
    164         sdpcuts/disjunctive_cuts.hpp sdpcuts/dsyevx_wrapper.hpp \
    165         sdpcuts/Heuristics.hpp sdpcuts/linquad_cuts.hpp \
    166         sdpcuts/misc_util.hpp sdpcuts/orthocut.hpp \
    167         sdpcuts/OsiXxxSolverInterface.hpp sdpcuts/populate.hpp \
    168         sdpcuts/quadratic_cuts_check.hpp sdpcuts/rlt_cuts.hpp \
    169         sdpcuts/sdpcuts.hpp sdpcuts/tracer.hpp branch/Nauty.h
     162        cut/sdpcuts/CouenneSdpCuts.hpp cut/sdpcuts/CutGen.hpp \
     163        cut/sdpcuts/disjunctive_cuts.hpp \
     164        cut/sdpcuts/dsyevx_wrapper.hpp cut/sdpcuts/Heuristics.hpp \
     165        cut/sdpcuts/linquad_cuts.hpp cut/sdpcuts/misc_util.hpp \
     166        cut/sdpcuts/orthocut.hpp cut/sdpcuts/OsiXxxSolverInterface.hpp \
     167        cut/sdpcuts/populate.hpp cut/sdpcuts/quadratic_cuts_check.hpp \
     168        cut/sdpcuts/rlt_cuts.hpp cut/sdpcuts/sdpcuts.hpp \
     169        cut/sdpcuts/tracer.hpp branch/Nauty.h
    170170includecoinHEADERS_INSTALL = $(INSTALL_HEADER)
    171171HEADERS = $(includecoin_HEADERS)
     
    421421        ./util/libCouenneUtil.la \
    422422        ./disjunctive/libCouenneDisjunctive.la \
    423         ./sdpcuts/libCouenneSdpCuts.la \
    424         ./crossconv/libCouenneCrossConv.la \
     423        ./cut/sdpcuts/libCouenneSdpCuts.la \
     424        ./cut/crossconv/libCouenneCrossConv.la \
    425425        ./two_implied_bt/libCouenneTwoImplied.la
    426426
     
    512512        problem/CouenneRecordBestSol.hpp expression/CouenneTypes.hpp \
    513513        disjunctive/CouenneDisjCuts.hpp convex/CouenneCutGenerator.hpp \
    514         crossconv/CouenneCrossConv.hpp \
     514        cut/crossconv/CouenneCrossConv.hpp \
    515515        two_implied_bt/CouenneTwoImplied.hpp \
    516         sdpcuts/CouenneSdpCuts.hpp sdpcuts/CutGen.hpp \
    517         sdpcuts/disjunctive_cuts.hpp sdpcuts/dsyevx_wrapper.hpp \
    518         sdpcuts/Heuristics.hpp sdpcuts/linquad_cuts.hpp \
    519         sdpcuts/misc_util.hpp sdpcuts/orthocut.hpp \
    520         sdpcuts/OsiXxxSolverInterface.hpp sdpcuts/populate.hpp \
    521         sdpcuts/quadratic_cuts_check.hpp sdpcuts/rlt_cuts.hpp \
    522         sdpcuts/sdpcuts.hpp sdpcuts/tracer.hpp $(am__append_2)
     516        cut/sdpcuts/CouenneSdpCuts.hpp cut/sdpcuts/CutGen.hpp \
     517        cut/sdpcuts/disjunctive_cuts.hpp \
     518        cut/sdpcuts/dsyevx_wrapper.hpp cut/sdpcuts/Heuristics.hpp \
     519        cut/sdpcuts/linquad_cuts.hpp cut/sdpcuts/misc_util.hpp \
     520        cut/sdpcuts/orthocut.hpp cut/sdpcuts/OsiXxxSolverInterface.hpp \
     521        cut/sdpcuts/populate.hpp cut/sdpcuts/quadratic_cuts_check.hpp \
     522        cut/sdpcuts/rlt_cuts.hpp cut/sdpcuts/sdpcuts.hpp \
     523        cut/sdpcuts/tracer.hpp $(am__append_2)
    523524
    524525#############################################################################
     
    672673
    673674distdir: $(DISTFILES)
    674         $(mkdir_p) $(distdir)/../inc $(distdir)/bound_tightening $(distdir)/branch $(distdir)/convex $(distdir)/crossconv $(distdir)/disjunctive $(distdir)/expression $(distdir)/expression/operators $(distdir)/expression/operators/bounds $(distdir)/expression/partial $(distdir)/heuristics $(distdir)/interfaces $(distdir)/main $(distdir)/problem $(distdir)/problem/depGraph $(distdir)/sdpcuts $(distdir)/standardize $(distdir)/two_implied_bt $(distdir)/util
     675        $(mkdir_p) $(distdir)/../inc $(distdir)/bound_tightening $(distdir)/branch $(distdir)/convex $(distdir)/cut/crossconv $(distdir)/cut/sdpcuts $(distdir)/disjunctive $(distdir)/expression $(distdir)/expression/operators $(distdir)/expression/operators/bounds $(distdir)/expression/partial $(distdir)/heuristics $(distdir)/interfaces $(distdir)/main $(distdir)/problem $(distdir)/problem/depGraph $(distdir)/standardize $(distdir)/two_implied_bt $(distdir)/util
    675676        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    676677        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
  • trunk/Couenne/src/cut/crossconv/CouenneCrossConv.hpp

    r490 r605  
    55 * Purpose: Convexification cuts on redundant relationships between auxiliaries
    66 *
    7  * (C) Pietro Belotti, 2010.
     7 * (C) Pietro Belotti, 2010-11.
    88 * This file is licensed under the Eclipse Public License (EPL)
    99 */
     
    1414#include "BonRegisteredOptions.hpp"
    1515
    16 //#include "BonOaDecBase.hpp"
    1716#include "CglCutGenerator.hpp"
    1817#include "OsiRowCut.hpp"
    19 //#include "OsiSolverInterface.hpp"
    2018#include "CouenneJournalist.hpp"
    2119
     
    5250  /// and generates a cut
    5351  ///
    54   /// x_3 + x_4 in [log l, log u].
     52  /// x_3 + x_4 in [max {0, log l}, max {0, log u}].
    5553  ///
    5654  /// This has to be repeatedly generated, even when l=u (l and/or u
     
    151149
    152150    /// destructor
    153     ~CouenneCrossConv ();
     151    virtual ~CouenneCrossConv ();
    154152
    155153    /// clone method (necessary for the abstract CglCutGenerator class)
    156     CouenneCrossConv *clone () const
     154    virtual CouenneCrossConv *clone () const
    157155    {return new CouenneCrossConv (*this);}
    158156
    159157    /// the main CglCutGenerator
    160     void generateCuts (const OsiSolverInterface &,
     158    virtual void generateCuts (const OsiSolverInterface &,
    161159                       OsiCuts &,
    162160                       const CglTreeInfo = CglTreeInfo ()) const;
     
    166164
    167165    /// Set up data structure to detect redundancies
    168     void setup ();
     166    virtual void setup ();
    169167
    170168  protected:
  • trunk/Couenne/src/cut/crossconv/Makefile.am

    r488 r605  
    2222AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
    2323        -I`$(CYGPATH_W) $(srcdir)/..` \
    24         -I`$(CYGPATH_W) $(srcdir)/../convex` \
    25         -I`$(CYGPATH_W) $(srcdir)/../heuristics` \
    26         -I`$(CYGPATH_W) $(srcdir)/../expression` \
    27         -I`$(CYGPATH_W) $(srcdir)/../expression/operators` \
    28         -I`$(CYGPATH_W) $(srcdir)/../main` \
    29         -I`$(CYGPATH_W) $(srcdir)/../branch`\
    30         -I`$(CYGPATH_W) $(srcdir)/../problem`
     24        -I`$(CYGPATH_W) $(srcdir)/../../convex` \
     25        -I`$(CYGPATH_W) $(srcdir)/../../heuristics` \
     26        -I`$(CYGPATH_W) $(srcdir)/../../expression` \
     27        -I`$(CYGPATH_W) $(srcdir)/../../expression/operators` \
     28        -I`$(CYGPATH_W) $(srcdir)/../../main` \
     29        -I`$(CYGPATH_W) $(srcdir)/../../branch`\
     30        -I`$(CYGPATH_W) $(srcdir)/../../problem`
    3131
    3232# This line is necessary to allow VPATH compilation with MS compilers
  • trunk/Couenne/src/cut/crossconv/Makefile.in

    r600 r605  
    2727pkglibdir = $(libdir)/@PACKAGE@
    2828pkgincludedir = $(includedir)/@PACKAGE@
    29 top_builddir = ../..
     29top_builddir = ../../..
    3030am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
    3131INSTALL = @INSTALL@
     
    4343build_triplet = @build@
    4444host_triplet = @host@
    45 subdir = src/crossconv
     45subdir = src/cut/crossconv
    4646DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
    4747ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    317317AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
    318318        -I`$(CYGPATH_W) $(srcdir)/..` \
    319         -I`$(CYGPATH_W) $(srcdir)/../convex` \
    320         -I`$(CYGPATH_W) $(srcdir)/../heuristics` \
    321         -I`$(CYGPATH_W) $(srcdir)/../expression` \
    322         -I`$(CYGPATH_W) $(srcdir)/../expression/operators` \
    323         -I`$(CYGPATH_W) $(srcdir)/../main` \
    324         -I`$(CYGPATH_W) $(srcdir)/../branch`\
    325         -I`$(CYGPATH_W) $(srcdir)/../problem`
     319        -I`$(CYGPATH_W) $(srcdir)/../../convex` \
     320        -I`$(CYGPATH_W) $(srcdir)/../../heuristics` \
     321        -I`$(CYGPATH_W) $(srcdir)/../../expression` \
     322        -I`$(CYGPATH_W) $(srcdir)/../../expression/operators` \
     323        -I`$(CYGPATH_W) $(srcdir)/../../main` \
     324        -I`$(CYGPATH_W) $(srcdir)/../../branch`\
     325        -I`$(CYGPATH_W) $(srcdir)/../../problem`
    326326
    327327
     
    342342          esac; \
    343343        done; \
    344         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/crossconv/Makefile'; \
     344        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/cut/crossconv/Makefile'; \
    345345        cd $(top_srcdir) && \
    346           $(AUTOMAKE) --foreign  src/crossconv/Makefile
     346          $(AUTOMAKE) --foreign  src/cut/crossconv/Makefile
    347347.PRECIOUS: Makefile
    348348Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  • trunk/Couenne/src/cut/sdpcuts/Makefile.am

    r488 r605  
    3737# "cygpath" stuff is necessary to compile with native compilers on Windows
    3838AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
    39         -I`$(CYGPATH_W) $(srcdir)/..` \
    40         -I`$(CYGPATH_W) $(srcdir)/../convex` \
    41         -I`$(CYGPATH_W) $(srcdir)/../problem`
     39        -I`$(CYGPATH_W) $(srcdir)/../..` \
     40        -I`$(CYGPATH_W) $(srcdir)/../../convex` \
     41        -I`$(CYGPATH_W) $(srcdir)/../../problem`
    4242
    4343if COIN_HAS_CPX
  • trunk/Couenne/src/cut/sdpcuts/Makefile.in

    r600 r605  
    2727pkglibdir = $(libdir)/@PACKAGE@
    2828pkgincludedir = $(includedir)/@PACKAGE@
    29 top_builddir = ../..
     29top_builddir = ../../..
    3030am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
    3131INSTALL = @INSTALL@
     
    4444host_triplet = @host@
    4545@COIN_HAS_CPX_TRUE@am__append_1 = -I`$(CYGPATH_W) $(CPXINCDIR)`
    46 subdir = src/sdpcuts
     46subdir = src/cut/sdpcuts
    4747DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
    4848ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    333333# Here list all include flags, relative to this "srcdir" directory.  This
    334334# "cygpath" stuff is necessary to compile with native compilers on Windows
    335 AM_CPPFLAGS = $(COUENNELIB_CFLAGS) -I`$(CYGPATH_W) $(srcdir)/..` \
    336         -I`$(CYGPATH_W) $(srcdir)/../convex` -I`$(CYGPATH_W) \
    337         $(srcdir)/../problem` $(am__append_1)
     335AM_CPPFLAGS = $(COUENNELIB_CFLAGS) -I`$(CYGPATH_W) $(srcdir)/../..` \
     336        -I`$(CYGPATH_W) $(srcdir)/../../convex` -I`$(CYGPATH_W) \
     337        $(srcdir)/../../problem` $(am__append_1)
    338338
    339339# This line is necessary to allow VPATH compilation with MS compilers
     
    353353          esac; \
    354354        done; \
    355         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/sdpcuts/Makefile'; \
     355        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/cut/sdpcuts/Makefile'; \
    356356        cd $(top_srcdir) && \
    357           $(AUTOMAKE) --foreign  src/sdpcuts/Makefile
     357          $(AUTOMAKE) --foreign  src/cut/sdpcuts/Makefile
    358358.PRECIOUS: Makefile
    359359Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  • trunk/Couenne/src/main/Makefile.am

    r601 r605  
    4747        -I`$(CYGPATH_W) $(srcdir)/../branch`\
    4848        -I`$(CYGPATH_W) $(srcdir)/../problem` \
    49         -I`$(CYGPATH_W) $(srcdir)/../crossconv` \
     49        -I`$(CYGPATH_W) $(srcdir)/../cut/crossconv` \
    5050        -I`$(CYGPATH_W) $(srcdir)/../two_implied_bt` \
    5151        -I`$(CYGPATH_W) $(srcdir)/../bound_tightening` \
  • trunk/Couenne/src/main/Makefile.in

    r601 r605  
    347347        -I`$(CYGPATH_W) $(srcdir)/../branch`\
    348348        -I`$(CYGPATH_W) $(srcdir)/../problem` \
    349         -I`$(CYGPATH_W) $(srcdir)/../crossconv` \
     349        -I`$(CYGPATH_W) $(srcdir)/../cut/crossconv` \
    350350        -I`$(CYGPATH_W) $(srcdir)/../two_implied_bt` \
    351351        -I`$(CYGPATH_W) $(srcdir)/../bound_tightening` \
Note: See TracChangeset for help on using the changeset viewer.