Changeset 595


Ignore:
Timestamp:
Jun 14, 2007 12:20:04 PM (13 years ago)
Author:
pbelotti
Message:

added sdp cuts. added more .f from Lapack to get eigenvalues/vectors for quad cuts

Location:
branches/Couenne/Couenne
Files:
7 added
1 deleted
9 edited

Legend:

Unmodified
Added
Removed
  • branches/Couenne/Couenne/Makefile.in

    r377 r595  
    149149COIN_HAS_OSI_FALSE = @COIN_HAS_OSI_FALSE@
    150150COIN_HAS_OSI_TRUE = @COIN_HAS_OSI_TRUE@
     151COIN_HAS_THIRDPARTY_FALSE = @COIN_HAS_THIRDPARTY_FALSE@
     152COIN_HAS_THIRDPARTY_TRUE = @COIN_HAS_THIRDPARTY_TRUE@
    151153COUENNEOBJDIR = @COUENNEOBJDIR@
    152154COUENNESRCDIR = @COUENNESRCDIR@
     
    212214SHELL = @SHELL@
    213215STRIP = @STRIP@
     216THIRDPARTYOBJDIR = @THIRDPARTYOBJDIR@
     217THIRDPARTYSRCDIR = @THIRDPARTYSRCDIR@
    214218VERSION = @VERSION@
    215219VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
  • branches/Couenne/Couenne/configure

    r588 r595  
    473473#endif"
    474474
    475 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os ADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX MPICXX EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS COINUTILSSRCDIR COINUTILSOBJDIR COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE CLPSRCDIR CLPOBJDIR COIN_HAS_CLP_TRUE COIN_HAS_CLP_FALSE BONMINSRCDIR BONMINOBJDIR COIN_HAS_BONMIN_TRUE COIN_HAS_BONMIN_FALSE IPOPTSRCDIR IPOPTOBJDIR COIN_HAS_IPOPT_TRUE COIN_HAS_IPOPT_FALSE CBCSRCDIR CBCOBJDIR COIN_HAS_CBC_TRUE COIN_HAS_CBC_FALSE OSISRCDIR OSIOBJDIR COIN_HAS_OSI_TRUE COIN_HAS_OSI_FALSE CGLSRCDIR CGLOBJDIR COIN_HAS_CGL_TRUE COIN_HAS_CGL_FALSE COUENNESRCDIR COUENNEOBJDIR COIN_HAS_COUENNE_TRUE COIN_HAS_COUENNE_FALSE ASLLIB ASL_CPPFLAGS COIN_HAS_ASL_TRUE COIN_HAS_ASL_FALSE LIBEXT VPATH_DISTCLEANFILES LIBOBJS LTLIBOBJS'
     475ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os ADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX MPICXX EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS THIRDPARTYSRCDIR THIRDPARTYOBJDIR COIN_HAS_THIRDPARTY_TRUE COIN_HAS_THIRDPARTY_FALSE COINUTILSSRCDIR COINUTILSOBJDIR COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE CLPSRCDIR CLPOBJDIR COIN_HAS_CLP_TRUE COIN_HAS_CLP_FALSE BONMINSRCDIR BONMINOBJDIR COIN_HAS_BONMIN_TRUE COIN_HAS_BONMIN_FALSE IPOPTSRCDIR IPOPTOBJDIR COIN_HAS_IPOPT_TRUE COIN_HAS_IPOPT_FALSE CBCSRCDIR CBCOBJDIR COIN_HAS_CBC_TRUE COIN_HAS_CBC_FALSE OSISRCDIR OSIOBJDIR COIN_HAS_OSI_TRUE COIN_HAS_OSI_FALSE CGLSRCDIR CGLOBJDIR COIN_HAS_CGL_TRUE COIN_HAS_CGL_FALSE COUENNESRCDIR COUENNEOBJDIR COIN_HAS_COUENNE_TRUE COIN_HAS_COUENNE_FALSE ASLLIB ASL_CPPFLAGS COIN_HAS_ASL_TRUE COIN_HAS_ASL_FALSE LIBEXT VPATH_DISTCLEANFILES LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    2117121171#############################################################################
    2117221172
     21173echo "$as_me:$LINENO: checking for COIN project ThirdParty" >&5
     21174echo $ECHO_N "checking for COIN project ThirdParty... $ECHO_C" >&6
     21175
     21176# First check, if the sub-project is actually available (ToDo: allow
     21177# other locations)
     21178
     21179coin_has_thirdparty=unavailable
     21180if test x"$COIN_SKIP_PROJECTS" != x; then
     21181  for dir in $COIN_SKIP_PROJECTS; do
     21182    if test $dir = ThirdParty; then
     21183      coin_has_thirdparty=skipping
     21184    fi
     21185  done
     21186fi
     21187
     21188if test $coin_has_thirdparty != skipping; then
     21189  if test $PACKAGE_TARNAME = thirdparty; then
     21190    coin_has_thirdparty=.
     21191  else
     21192    if test -d $srcdir/../ThirdParty; then
     21193      coin_has_thirdparty=../ThirdParty
     21194    fi
     21195  fi
     21196fi
     21197
     21198if test $coin_has_thirdparty != unavailable &&
     21199   test $coin_has_thirdparty != skipping; then
     21200  # Set the #define if the component is available
     21201
     21202cat >>confdefs.h <<\_ACEOF
     21203#define COIN_HAS_THIRDPARTY 1
     21204_ACEOF
     21205
     21206
     21207  # Set the variables for source and object code location
     21208
     21209  THIRDPARTYSRCDIR=`cd $srcdir/$coin_has_thirdparty; pwd`
     21210
     21211  THIRDPARTYOBJDIR=`pwd`/$coin_has_thirdparty
     21212fi
     21213
     21214  # Define the Makefile conditional
     21215
     21216
     21217if test $coin_has_thirdparty != unavailable &&
     21218                test $coin_has_thirdparty != skipping; then
     21219  COIN_HAS_THIRDPARTY_TRUE=
     21220  COIN_HAS_THIRDPARTY_FALSE='#'
     21221else
     21222  COIN_HAS_THIRDPARTY_TRUE='#'
     21223  COIN_HAS_THIRDPARTY_FALSE=
     21224fi
     21225
     21226echo "$as_me:$LINENO: result: $coin_has_thirdparty" >&5
     21227echo "${ECHO_T}$coin_has_thirdparty" >&6
     21228
    2117321229echo "$as_me:$LINENO: checking for COIN project CoinUtils" >&5
    2117421230echo $ECHO_N "checking for COIN project CoinUtils... $ECHO_C" >&6
     
    2203422090Usually this means the macro was only invoked conditionally." >&5
    2203522091echo "$as_me: error: conditional \"HAVE_EXTERNALS\" was never defined.
     22092Usually this means the macro was only invoked conditionally." >&2;}
     22093   { (exit 1); exit 1; }; }
     22094fi
     22095if test -z "${COIN_HAS_THIRDPARTY_TRUE}" && test -z "${COIN_HAS_THIRDPARTY_FALSE}"; then
     22096  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_THIRDPARTY\" was never defined.
     22097Usually this means the macro was only invoked conditionally." >&5
     22098echo "$as_me: error: conditional \"COIN_HAS_THIRDPARTY\" was never defined.
    2203622099Usually this means the macro was only invoked conditionally." >&2;}
    2203722100   { (exit 1); exit 1; }; }
     
    2273322796s,@RPATH_FLAGS@,$RPATH_FLAGS,;t t
    2273422797s,@LT_LDFLAGS@,$LT_LDFLAGS,;t t
     22798s,@THIRDPARTYSRCDIR@,$THIRDPARTYSRCDIR,;t t
     22799s,@THIRDPARTYOBJDIR@,$THIRDPARTYOBJDIR,;t t
     22800s,@COIN_HAS_THIRDPARTY_TRUE@,$COIN_HAS_THIRDPARTY_TRUE,;t t
     22801s,@COIN_HAS_THIRDPARTY_FALSE@,$COIN_HAS_THIRDPARTY_FALSE,;t t
    2273522802s,@COINUTILSSRCDIR@,$COINUTILSSRCDIR,;t t
    2273622803s,@COINUTILSOBJDIR@,$COINUTILSOBJDIR,;t t
  • branches/Couenne/Couenne/configure.ac

    r377 r595  
    5757#############################################################################
    5858
     59AC_COIN_HAS_PROJECT(ThirdParty)
    5960AC_COIN_HAS_PROJECT(CoinUtils)
    6061AC_COIN_HAS_PROJECT(Clp)
  • branches/Couenne/Couenne/inc/config_couenne.h.in

    r422 r595  
    2727/* Define to 1 if the Osi package is used */
    2828#undef COIN_HAS_OSI
     29
     30/* Define to 1 if the ThirdParty package is used */
     31#undef COIN_HAS_THIRDPARTY
    2932
    3033/* Define to 1 if you have the <dlfcn.h> header file. */
  • branches/Couenne/Couenne/src/Makefile.am

    r545 r595  
    121121        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/util` \
    122122        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/convex` \
     123        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/convex/sdpcuts` \
    123124        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/problem` \
    124125        -I`$(CYGPATH_W) $(OSISRCDIR)/src` \
  • branches/Couenne/Couenne/src/Makefile.in

    r545 r595  
    231231COIN_HAS_OSI_FALSE = @COIN_HAS_OSI_FALSE@
    232232COIN_HAS_OSI_TRUE = @COIN_HAS_OSI_TRUE@
     233COIN_HAS_THIRDPARTY_FALSE = @COIN_HAS_THIRDPARTY_FALSE@
     234COIN_HAS_THIRDPARTY_TRUE = @COIN_HAS_THIRDPARTY_TRUE@
    233235COUENNEOBJDIR = @COUENNEOBJDIR@
    234236COUENNESRCDIR = @COUENNESRCDIR@
     
    294296SHELL = @SHELL@
    295297STRIP = @STRIP@
     298THIRDPARTYOBJDIR = @THIRDPARTYOBJDIR@
     299THIRDPARTYSRCDIR = @THIRDPARTYSRCDIR@
    296300VERSION = @VERSION@
    297301VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
     
    438442        $(COUENNESRCDIR)/src/util` -I`$(CYGPATH_W) \
    439443        $(COUENNESRCDIR)/src/convex` -I`$(CYGPATH_W) \
     444        $(COUENNESRCDIR)/src/convex/sdpcuts` -I`$(CYGPATH_W) \
    440445        $(COUENNESRCDIR)/src/problem` -I`$(CYGPATH_W) \
    441446        $(OSISRCDIR)/src` -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiClp` \
  • branches/Couenne/Couenne/src/convex/obbt.cpp

    r593 r595  
    1515#define MAX_OBBT_LP_ITERATION 100
    1616
    17 //#define DEBUG_OBBT
     17#define DEBUG_OBBT
    1818
    1919/// reoptimize and change bound of a variable if needed
     
    3232
    3333    double opt = csi -> getObjValue ();
    34     //    printf ("found optimum: %g\n", opt);
    3534
    3635    if (sense > 0) {if (opt > bound + OBBT_EPS)    {bound = (isint ? ceil (opt) : opt); return true;}}
     
    102101
    103102#ifdef DEBUG_OBBT
    104       printf ("m%simizing x%d [%g,%g] currently %c= %g\n",
     103      printf ("m%simizing x%d [%g,%g] %c= %g",
    105104              (sense==1) ? "in" : "ax", i, p -> Lb (i), p -> Ub (i),
    106105              (sense==1) ? '>'  : '<',  bound); fflush (stdout);
     
    113112      csi -> setWarmStart (warmstart);
    114113
    115 
    116114      if (updateBound (csi, sense, bound, isInt)) {
     115
     116#ifdef DEBUG_OBBT
     117        printf ("                  ----> %g", bound); fflush (stdout);
     118#endif
    117119
    118120        /*if (fabs (csi -> getColSolution () [i] - bound) > COUENNE_EPS)
    119121          printf ("!!!%d %g != %g", i, csi -> getColSolution () [i], bound);*/
    120122
     123#ifdef DEBUG_OBBT
     124        if (sense==1) {printf(" !!");csi->setColLower (i,bound); chg_bds[i].lower |= CHANGED | EXACT;}
     125        else          {printf(" !!");csi->setColUpper (i,bound); chg_bds[i].upper |= CHANGED | EXACT;}
     126        fflush (stdout);
     127#else
    121128        if (sense==1) {csi -> setColLower (i, bound); chg_bds [i].lower |= CHANGED | EXACT;}
    122129        else          {csi -> setColUpper (i, bound); chg_bds [i].upper |= CHANGED | EXACT;}
    123 
     130#endif
    124131        // check value and bounds of other variables
    125132
     
    165172        nImprov++;
    166173      }
     174
     175#ifdef DEBUG_OBBT
     176        printf ("\n");
     177#endif
    167178
    168179      // if we solved the problem on the objective function's
  • branches/Couenne/Couenne/test/Makefile.am

    r586 r595  
    1010
    1111########################################################################
    12 #                        testfun for Feline                            #
     12#                        testfun for Couenne                           #
    1313########################################################################
    1414
    1515#noinst_PROGRAMS = testconv testeval testclp
    1616
    17 noinst_PROGRAMS = testclp
     17noinst_PROGRAMS = sdpcuts
    1818
    1919#testconv_SOURCES = fun/testconv.cpp
    2020#testeval_SOURCES = fun/testeval.cpp
    21 testclp_SOURCES  = fun/clp-try.cpp
     21#testclp_SOURCES  = fun/clp-try.cpp
    2222
    23 # List libraries of COIN projects
    24 testconv_LDADD = \
     23sdpcuts_SOURCES  = fun/sdpcuts.cpp fun/populate.cpp fun/createCut.cpp fun/SdpCutGen.cpp
     24
     25# if 0
     26# # List libraries of COIN projects
     27# testconv_LDADD = \
     28#         ../src/libCouenne.la \
     29#       $(ASLLIB) \
     30#       $(COINLIBS) \
     31#       $(ADDLIBS)
     32# # List libraries of COIN projects
     33# testeval_LDADD = \
     34#         ../src/libCouenne.la \
     35#       $(ASLLIB) \
     36#       $(COINLIBS) \
     37#       $(ADDLIBS)
     38# # List libraries of COIN projects
     39# testclp_LDADD = \
     40#         ../src/libCouenne.la \
     41#       $(ASLLIB) \
     42#       $(COINLIBS) \
     43#       $(ADDLIBS)
     44# endif
     45
     46sdpcuts_LDADD = \
    2547        ../src/libCouenne.la \
    26         $(ASLLIB) \
    27         $(COINLIBS) \
    28         $(ADDLIBS)
    29 
    30 # List libraries of COIN projects
    31 testeval_LDADD = \
    32         ../src/libCouenne.la \
    33         $(ASLLIB) \
    34         $(COINLIBS) \
    35         $(ADDLIBS)
    36 
    37 # List libraries of COIN projects
    38 testclp_LDADD = \
    39         ../src/libCouenne.la \
     48        fun/nmtr/src/blas/libblas.a \
     49        fun/nmtr/src/lapack/liblapack.a \
     50        fun/nmtr/src/nmtr/libdgqt.a \
    4051        $(ASLLIB) \
    4152        $(COINLIBS) \
     
    4859        $(OSIOBJDIR)/src/libOsi.la \
    4960        $(CLPOBJDIR)/src/libClp.la \
    50         $(COINUTILSOBJDIR)/src/libCoinUtils.la
     61        $(COINUTILSOBJDIR)/src/libCoinUtils.la \
     62        $(COINUTILSOBJDIR)/../ThirdParty/Lapack/libcoinlapack.la
    5163
    5264# Here list all include flags, relative to this "srcdir" directory.  This
    5365# "cygpath" stuff is necessary to compile with native compilers on Cygwin
    5466AM_CPPFLAGS = \
    55         -I`$(CYGPATH_W) $(srcdir)/../src/include` \
    56         -I`$(CYGPATH_W) $(srcdir)/../src/include/operators` \
    5767        -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
    5868        -I`$(CYGPATH_W) $(COINUTILSOBJDIR)/inc` \
    5969        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiClp` \
     70        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCpx` \
    6071        -I`$(CYGPATH_W) $(OSISRCDIR)/src` \
    6172        -I`$(CYGPATH_W) $(OSIOBJDIR)/inc` \
     
    6475        -I`$(CYGPATH_W) $(CGLSRCDIR)/src` \
    6576        -I`$(CYGPATH_W) $(CGLOBJDIR)/inc` \
     77        -I`$(CYGPATH_W) $(COUENNESRCDIR)/test/fun` \
    6678        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/expression` \
    6779        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/expression/operators` \
     
    6981        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/util` \
    7082        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/convex` \
     83        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/convex/sdpcuts` \
    7184        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/problem` \
    7285        -I`$(CYGPATH_W) $(OSISRCDIR)/src` \
     
    103116DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
    104117
    105 test: testconv$(EXEEXT) testeval$(EXEEXT)
     118#test: testconv$(EXEEXT) testeval$(EXEEXT) sdpcuts
     119test: sdpcuts$(EXEEXT)
    106120#       ./testfun$(EXEEXT)
    107121
  • branches/Couenne/Couenne/test/Makefile.in

    r586 r595  
    4343build_triplet = @build@
    4444host_triplet = @host@
    45 noinst_PROGRAMS = testclp$(EXEEXT)
     45noinst_PROGRAMS = sdpcuts$(EXEEXT)
    4646
    4747# If we have the Ampl solver library, we need to add additional things
     
    5858CONFIG_CLEAN_FILES =
    5959PROGRAMS = $(noinst_PROGRAMS)
    60 am_testclp_OBJECTS = clp-try.$(OBJEXT)
    61 testclp_OBJECTS = $(am_testclp_OBJECTS)
     60am_sdpcuts_OBJECTS = sdpcuts.$(OBJEXT) populate.$(OBJEXT) \
     61        createCut.$(OBJEXT) SdpCutGen.$(OBJEXT)
     62sdpcuts_OBJECTS = $(am_sdpcuts_OBJECTS)
    6263am__DEPENDENCIES_1 =
    6364am__DEPENDENCIES_2 = $(CGLOBJDIR)/src/libCgl.la \
     
    6566        $(CBCOBJDIR)/src/libCbc.la $(OSIOBJDIR)/src/libOsi.la \
    6667        $(CLPOBJDIR)/src/libClp.la \
    67         $(COINUTILSOBJDIR)/src/libCoinUtils.la
    68 testclp_DEPENDENCIES = ../src/libCouenne.la $(am__DEPENDENCIES_1) \
     68        $(COINUTILSOBJDIR)/src/libCoinUtils.la \
     69        $(COINUTILSOBJDIR)/../ThirdParty/Lapack/libcoinlapack.la
     70sdpcuts_DEPENDENCIES = ../src/libCouenne.la \
     71        fun/nmtr/src/blas/libblas.a fun/nmtr/src/lapack/liblapack.a \
     72        fun/nmtr/src/nmtr/libdgqt.a $(am__DEPENDENCIES_1) \
    6973        $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
    7074depcomp = $(SHELL) $(top_srcdir)/../depcomp
     
    7882CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
    7983        $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
    80 SOURCES = $(testclp_SOURCES)
    81 DIST_SOURCES = $(testclp_SOURCES)
     84SOURCES = $(sdpcuts_SOURCES)
     85DIST_SOURCES = $(sdpcuts_SOURCES)
    8286ETAGS = etags
    8387CTAGS = ctags
     
    133137COIN_HAS_OSI_FALSE = @COIN_HAS_OSI_FALSE@
    134138COIN_HAS_OSI_TRUE = @COIN_HAS_OSI_TRUE@
     139COIN_HAS_THIRDPARTY_FALSE = @COIN_HAS_THIRDPARTY_FALSE@
     140COIN_HAS_THIRDPARTY_TRUE = @COIN_HAS_THIRDPARTY_TRUE@
    135141COUENNEOBJDIR = @COUENNEOBJDIR@
    136142COUENNESRCDIR = @COUENNESRCDIR@
     
    196202SHELL = @SHELL@
    197203STRIP = @STRIP@
     204THIRDPARTYOBJDIR = @THIRDPARTYOBJDIR@
     205THIRDPARTYSRCDIR = @THIRDPARTYSRCDIR@
    198206VERSION = @VERSION@
    199207VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
     
    254262#testconv_SOURCES = fun/testconv.cpp
    255263#testeval_SOURCES = fun/testeval.cpp
    256 testclp_SOURCES = fun/clp-try.cpp
    257 
    258 # List libraries of COIN projects
    259 testconv_LDADD = \
     264#testclp_SOURCES  = fun/clp-try.cpp
     265sdpcuts_SOURCES = fun/sdpcuts.cpp fun/populate.cpp fun/createCut.cpp fun/SdpCutGen.cpp
     266
     267# if 0
     268# # List libraries of COIN projects
     269# testconv_LDADD = \
     270#         ../src/libCouenne.la \
     271#       $(ASLLIB) \
     272#       $(COINLIBS) \
     273#       $(ADDLIBS)
     274# # List libraries of COIN projects
     275# testeval_LDADD = \
     276#         ../src/libCouenne.la \
     277#       $(ASLLIB) \
     278#       $(COINLIBS) \
     279#       $(ADDLIBS)
     280# # List libraries of COIN projects
     281# testclp_LDADD = \
     282#         ../src/libCouenne.la \
     283#       $(ASLLIB) \
     284#       $(COINLIBS) \
     285#       $(ADDLIBS)
     286# endif
     287sdpcuts_LDADD = \
    260288        ../src/libCouenne.la \
    261         $(ASLLIB) \
    262         $(COINLIBS) \
    263         $(ADDLIBS)
    264 
    265 
    266 # List libraries of COIN projects
    267 testeval_LDADD = \
    268         ../src/libCouenne.la \
    269         $(ASLLIB) \
    270         $(COINLIBS) \
    271         $(ADDLIBS)
    272 
    273 
    274 # List libraries of COIN projects
    275 testclp_LDADD = \
    276         ../src/libCouenne.la \
     289        fun/nmtr/src/blas/libblas.a \
     290        fun/nmtr/src/lapack/liblapack.a \
     291        fun/nmtr/src/nmtr/libdgqt.a \
    277292        $(ASLLIB) \
    278293        $(COINLIBS) \
     
    285300        $(OSIOBJDIR)/src/libOsi.la \
    286301        $(CLPOBJDIR)/src/libClp.la \
    287         $(COINUTILSOBJDIR)/src/libCoinUtils.la
     302        $(COINUTILSOBJDIR)/src/libCoinUtils.la \
     303        $(COINUTILSOBJDIR)/../ThirdParty/Lapack/libcoinlapack.la
    288304
    289305
    290306# Here list all include flags, relative to this "srcdir" directory.  This
    291307# "cygpath" stuff is necessary to compile with native compilers on Cygwin
    292 AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/../src/include` \
    293         -I`$(CYGPATH_W) $(srcdir)/../src/include/operators` \
    294         -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` -I`$(CYGPATH_W) \
     308AM_CPPFLAGS = -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` -I`$(CYGPATH_W) \
    295309        $(COINUTILSOBJDIR)/inc` -I`$(CYGPATH_W) \
    296         $(OSISRCDIR)/src/OsiClp` -I`$(CYGPATH_W) $(OSISRCDIR)/src` \
     310        $(OSISRCDIR)/src/OsiClp` -I`$(CYGPATH_W) \
     311        $(OSISRCDIR)/src/OsiCpx` -I`$(CYGPATH_W) $(OSISRCDIR)/src` \
    297312        -I`$(CYGPATH_W) $(OSIOBJDIR)/inc` -I`$(CYGPATH_W) \
    298313        $(CLPSRCDIR)/src` -I`$(CYGPATH_W) $(CLPOBJDIR)/inc` \
    299314        -I`$(CYGPATH_W) $(CGLSRCDIR)/src` -I`$(CYGPATH_W) \
    300         $(CGLOBJDIR)/inc` -I`$(CYGPATH_W) \
    301         $(COUENNESRCDIR)/src/expression` -I`$(CYGPATH_W) \
    302         $(COUENNESRCDIR)/src/expression/operators` -I`$(CYGPATH_W) \
    303         $(COUENNESRCDIR)/src/branch` -I`$(CYGPATH_W) \
     315        $(CGLOBJDIR)/inc` -I`$(CYGPATH_W) $(COUENNESRCDIR)/test/fun` \
     316        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/expression` \
     317        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/expression/operators` \
     318        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/branch` -I`$(CYGPATH_W) \
    304319        $(COUENNESRCDIR)/src/util` -I`$(CYGPATH_W) \
    305320        $(COUENNESRCDIR)/src/convex` -I`$(CYGPATH_W) \
     321        $(COUENNESRCDIR)/src/convex/sdpcuts` -I`$(CYGPATH_W) \
    306322        $(COUENNESRCDIR)/src/problem` -I`$(CYGPATH_W) \
    307323        $(OSISRCDIR)/src` -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiClp` \
     
    375391          rm -f $$p $$f ; \
    376392        done
    377 testclp$(EXEEXT): $(testclp_OBJECTS) $(testclp_DEPENDENCIES)
    378         @rm -f testclp$(EXEEXT)
    379         $(CXXLINK) $(testclp_LDFLAGS) $(testclp_OBJECTS) $(testclp_LDADD) $(LIBS)
     393sdpcuts$(EXEEXT): $(sdpcuts_OBJECTS) $(sdpcuts_DEPENDENCIES)
     394        @rm -f sdpcuts$(EXEEXT)
     395        $(CXXLINK) $(sdpcuts_LDFLAGS) $(sdpcuts_OBJECTS) $(sdpcuts_LDADD) $(LIBS)
    380396
    381397mostlyclean-compile:
     
    385401        -rm -f *.tab.c
    386402
    387 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clp-try.Po@am__quote@
     403@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SdpCutGen.Po@am__quote@
     404@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/createCut.Po@am__quote@
     405@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/populate.Po@am__quote@
     406@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sdpcuts.Po@am__quote@
    388407
    389408.cpp.o:
     
    408427@am__fastdepCXX_FALSE@  $(LTCXXCOMPILE) -c -o $@ $<
    409428
    410 clp-try.o: fun/clp-try.cpp
    411 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT clp-try.o -MD -MP -MF "$(DEPDIR)/clp-try.Tpo" -c -o clp-try.o `test -f 'fun/clp-try.cpp' || echo '$(srcdir)/'`fun/clp-try.cpp; \
    412 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/clp-try.Tpo" "$(DEPDIR)/clp-try.Po"; else rm -f "$(DEPDIR)/clp-try.Tpo"; exit 1; fi
    413 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='fun/clp-try.cpp' object='clp-try.o' libtool=no @AMDEPBACKSLASH@
    414 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    415 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o clp-try.o `test -f 'fun/clp-try.cpp' || echo '$(srcdir)/'`fun/clp-try.cpp
    416 
    417 clp-try.obj: fun/clp-try.cpp
    418 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT clp-try.obj -MD -MP -MF "$(DEPDIR)/clp-try.Tpo" -c -o clp-try.obj `if test -f 'fun/clp-try.cpp'; then $(CYGPATH_W) 'fun/clp-try.cpp'; else $(CYGPATH_W) '$(srcdir)/fun/clp-try.cpp'; fi`; \
    419 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/clp-try.Tpo" "$(DEPDIR)/clp-try.Po"; else rm -f "$(DEPDIR)/clp-try.Tpo"; exit 1; fi
    420 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='fun/clp-try.cpp' object='clp-try.obj' libtool=no @AMDEPBACKSLASH@
    421 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    422 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o clp-try.obj `if test -f 'fun/clp-try.cpp'; then $(CYGPATH_W) 'fun/clp-try.cpp'; else $(CYGPATH_W) '$(srcdir)/fun/clp-try.cpp'; fi`
     429sdpcuts.o: fun/sdpcuts.cpp
     430@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sdpcuts.o -MD -MP -MF "$(DEPDIR)/sdpcuts.Tpo" -c -o sdpcuts.o `test -f 'fun/sdpcuts.cpp' || echo '$(srcdir)/'`fun/sdpcuts.cpp; \
     431@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/sdpcuts.Tpo" "$(DEPDIR)/sdpcuts.Po"; else rm -f "$(DEPDIR)/sdpcuts.Tpo"; exit 1; fi
     432@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='fun/sdpcuts.cpp' object='sdpcuts.o' libtool=no @AMDEPBACKSLASH@
     433@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     434@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sdpcuts.o `test -f 'fun/sdpcuts.cpp' || echo '$(srcdir)/'`fun/sdpcuts.cpp
     435
     436sdpcuts.obj: fun/sdpcuts.cpp
     437@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sdpcuts.obj -MD -MP -MF "$(DEPDIR)/sdpcuts.Tpo" -c -o sdpcuts.obj `if test -f 'fun/sdpcuts.cpp'; then $(CYGPATH_W) 'fun/sdpcuts.cpp'; else $(CYGPATH_W) '$(srcdir)/fun/sdpcuts.cpp'; fi`; \
     438@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/sdpcuts.Tpo" "$(DEPDIR)/sdpcuts.Po"; else rm -f "$(DEPDIR)/sdpcuts.Tpo"; exit 1; fi
     439@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='fun/sdpcuts.cpp' object='sdpcuts.obj' libtool=no @AMDEPBACKSLASH@
     440@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     441@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sdpcuts.obj `if test -f 'fun/sdpcuts.cpp'; then $(CYGPATH_W) 'fun/sdpcuts.cpp'; else $(CYGPATH_W) '$(srcdir)/fun/sdpcuts.cpp'; fi`
     442
     443populate.o: fun/populate.cpp
     444@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT populate.o -MD -MP -MF "$(DEPDIR)/populate.Tpo" -c -o populate.o `test -f 'fun/populate.cpp' || echo '$(srcdir)/'`fun/populate.cpp; \
     445@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/populate.Tpo" "$(DEPDIR)/populate.Po"; else rm -f "$(DEPDIR)/populate.Tpo"; exit 1; fi
     446@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='fun/populate.cpp' object='populate.o' libtool=no @AMDEPBACKSLASH@
     447@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     448@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o populate.o `test -f 'fun/populate.cpp' || echo '$(srcdir)/'`fun/populate.cpp
     449
     450populate.obj: fun/populate.cpp
     451@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT populate.obj -MD -MP -MF "$(DEPDIR)/populate.Tpo" -c -o populate.obj `if test -f 'fun/populate.cpp'; then $(CYGPATH_W) 'fun/populate.cpp'; else $(CYGPATH_W) '$(srcdir)/fun/populate.cpp'; fi`; \
     452@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/populate.Tpo" "$(DEPDIR)/populate.Po"; else rm -f "$(DEPDIR)/populate.Tpo"; exit 1; fi
     453@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='fun/populate.cpp' object='populate.obj' libtool=no @AMDEPBACKSLASH@
     454@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     455@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o populate.obj `if test -f 'fun/populate.cpp'; then $(CYGPATH_W) 'fun/populate.cpp'; else $(CYGPATH_W) '$(srcdir)/fun/populate.cpp'; fi`
     456
     457createCut.o: fun/createCut.cpp
     458@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT createCut.o -MD -MP -MF "$(DEPDIR)/createCut.Tpo" -c -o createCut.o `test -f 'fun/createCut.cpp' || echo '$(srcdir)/'`fun/createCut.cpp; \
     459@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/createCut.Tpo" "$(DEPDIR)/createCut.Po"; else rm -f "$(DEPDIR)/createCut.Tpo"; exit 1; fi
     460@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='fun/createCut.cpp' object='createCut.o' libtool=no @AMDEPBACKSLASH@
     461@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     462@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o createCut.o `test -f 'fun/createCut.cpp' || echo '$(srcdir)/'`fun/createCut.cpp
     463
     464createCut.obj: fun/createCut.cpp
     465@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT createCut.obj -MD -MP -MF "$(DEPDIR)/createCut.Tpo" -c -o createCut.obj `if test -f 'fun/createCut.cpp'; then $(CYGPATH_W) 'fun/createCut.cpp'; else $(CYGPATH_W) '$(srcdir)/fun/createCut.cpp'; fi`; \
     466@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/createCut.Tpo" "$(DEPDIR)/createCut.Po"; else rm -f "$(DEPDIR)/createCut.Tpo"; exit 1; fi
     467@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='fun/createCut.cpp' object='createCut.obj' libtool=no @AMDEPBACKSLASH@
     468@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     469@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o createCut.obj `if test -f 'fun/createCut.cpp'; then $(CYGPATH_W) 'fun/createCut.cpp'; else $(CYGPATH_W) '$(srcdir)/fun/createCut.cpp'; fi`
     470
     471SdpCutGen.o: fun/SdpCutGen.cpp
     472@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SdpCutGen.o -MD -MP -MF "$(DEPDIR)/SdpCutGen.Tpo" -c -o SdpCutGen.o `test -f 'fun/SdpCutGen.cpp' || echo '$(srcdir)/'`fun/SdpCutGen.cpp; \
     473@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/SdpCutGen.Tpo" "$(DEPDIR)/SdpCutGen.Po"; else rm -f "$(DEPDIR)/SdpCutGen.Tpo"; exit 1; fi
     474@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='fun/SdpCutGen.cpp' object='SdpCutGen.o' libtool=no @AMDEPBACKSLASH@
     475@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     476@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SdpCutGen.o `test -f 'fun/SdpCutGen.cpp' || echo '$(srcdir)/'`fun/SdpCutGen.cpp
     477
     478SdpCutGen.obj: fun/SdpCutGen.cpp
     479@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SdpCutGen.obj -MD -MP -MF "$(DEPDIR)/SdpCutGen.Tpo" -c -o SdpCutGen.obj `if test -f 'fun/SdpCutGen.cpp'; then $(CYGPATH_W) 'fun/SdpCutGen.cpp'; else $(CYGPATH_W) '$(srcdir)/fun/SdpCutGen.cpp'; fi`; \
     480@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/SdpCutGen.Tpo" "$(DEPDIR)/SdpCutGen.Po"; else rm -f "$(DEPDIR)/SdpCutGen.Tpo"; exit 1; fi
     481@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='fun/SdpCutGen.cpp' object='SdpCutGen.obj' libtool=no @AMDEPBACKSLASH@
     482@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     483@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SdpCutGen.obj `if test -f 'fun/SdpCutGen.cpp'; then $(CYGPATH_W) 'fun/SdpCutGen.cpp'; else $(CYGPATH_W) '$(srcdir)/fun/SdpCutGen.cpp'; fi`
    423484
    424485mostlyclean-libtool:
     
    600661
    601662
    602 test: testconv$(EXEEXT) testeval$(EXEEXT)
     663#test: testconv$(EXEEXT) testeval$(EXEEXT) sdpcuts
     664test: sdpcuts$(EXEEXT)
    603665#       ./testfun$(EXEEXT)
    604666
Note: See TracChangeset for help on using the changeset viewer.