Changeset 2681


Ignore:
Timestamp:
Dec 30, 2012 12:23:09 PM (7 years ago)
Author:
bradbell
Message:
  1. Add an ipopt::solve test to the test_more directory.
  2. Change CppAD_IPOPT_CPPAD to CppAD_IPOPT (no longer just used by cppad_ipopt).

makefile.in: update to agree with corresponding makefile.am.
test_one.sh.in: add #! /bash -e at front.
test_one.sh.in: add #! /bash -e at front.

Location:
branches/ipopt_solve
Files:
1 added
32 edited

Legend:

Unmodified
Added
Removed
  • branches/ipopt_solve/compare_c/makefile.in

    r2601 r2681  
    211211infodir = @infodir@
    212212install_sh = @install_sh@
     213ipopt_prefix = @ipopt_prefix@
    213214libdir = @libdir@
    214215libexecdir = @libexecdir@
  • branches/ipopt_solve/configure

    r2655 r2681  
    608608LTLIBOBJS
    609609LIBOBJS
     610ipopt_prefix
    610611eigen_prefix
    611612adolc_prefix
     
    703704CppAD_BOOST_DIR_TRUE
    704705BOOST_DIR
    705 CppAD_IPOPT_CPPAD_FALSE
    706 CppAD_IPOPT_CPPAD_TRUE
     706CppAD_IPOPT_FALSE
     707CppAD_IPOPT_TRUE
    707708IPOPT_DIR
    708709CppAD_SACADO_FALSE
     
    29982999
    29993000 if test "$IPOPT_DIR" != ""; then
    3000   CppAD_IPOPT_CPPAD_TRUE=
    3001   CppAD_IPOPT_CPPAD_FALSE='#'
    3002 else
    3003   CppAD_IPOPT_CPPAD_TRUE='#'
    3004   CppAD_IPOPT_CPPAD_FALSE=
     3001  CppAD_IPOPT_TRUE=
     3002  CppAD_IPOPT_FALSE='#'
     3003else
     3004  CppAD_IPOPT_TRUE='#'
     3005  CppAD_IPOPT_FALSE=
    30053006fi
    30063007
     
    73837384eigen_prefix=${EIGEN_DIR}
    73847385
     7386ipopt_prefix=${IPOPT_DIR}
     7387
    73857388ac_config_files="$ac_config_files cppad/configure.hpp cppad_ipopt/example/test.sh cppad_ipopt/speed/test.sh cppad_ipopt/test/test.sh example/ipopt_solve/test.sh example/test_one.sh pkgconfig/cppad.pc pkgconfig/cppad-uninstalled.pc test_more/test_one.sh makefile compare_c/makefile cppad_ipopt/src/makefile cppad_ipopt/example/makefile cppad_ipopt/speed/makefile cppad_ipopt/test/makefile example/makefile example/ipopt_solve/makefile introduction/get_started/makefile introduction/exp_apx/makefile multi_thread/makefile multi_thread/test_multi/makefile print_for/makefile speed/adolc/makefile speed/cppad/makefile speed/double/makefile speed/example/makefile speed/fadbad/makefile speed/profile/makefile speed/profile/gprof.sed speed/sacado/makefile speed/src/makefile test_more/makefile"
    73867389
     
    75807583Usually this means the macro was only invoked conditionally." "$LINENO" 5
    75817584fi
    7582 if test -z "${CppAD_IPOPT_CPPAD_TRUE}" && test -z "${CppAD_IPOPT_CPPAD_FALSE}"; then
    7583   as_fn_error $? "conditional \"CppAD_IPOPT_CPPAD\" was never defined.
     7585if test -z "${CppAD_IPOPT_TRUE}" && test -z "${CppAD_IPOPT_FALSE}"; then
     7586  as_fn_error $? "conditional \"CppAD_IPOPT\" was never defined.
    75847587Usually this means the macro was only invoked conditionally." "$LINENO" 5
    75857588fi
  • branches/ipopt_solve/configure.ac

    r2655 r2681  
    278278        [value of the configure prefix directory during Ipopt install]
    279279)
    280 AM_CONDITIONAL(CppAD_IPOPT_CPPAD, test "$IPOPT_DIR" != "")
     280AM_CONDITIONAL(CppAD_IPOPT, test "$IPOPT_DIR" != "")
    281281if test "$IPOPT_DIR" != "" ; then
    282282        AC_MSG_RESULT([$IPOPT_DIR])
     
    698698AC_SUBST(adolc_prefix,      ${ADOLC_DIR} )
    699699AC_SUBST(eigen_prefix,      ${EIGEN_DIR} )
     700AC_SUBST(ipopt_prefix,      ${IPOPT_DIR} )
    700701dnl
    701702dnl -----------------------------------------------------------------------
  • branches/ipopt_solve/cppad_ipopt/example/makefile.in

    r2655 r2681  
    227227infodir = @infodir@
    228228install_sh = @install_sh@
     229ipopt_prefix = @ipopt_prefix@
    229230libdir = @libdir@
    230231libexecdir = @libexecdir@
  • branches/ipopt_solve/cppad_ipopt/speed/makefile.in

    r2601 r2681  
    228228infodir = @infodir@
    229229install_sh = @install_sh@
     230ipopt_prefix = @ipopt_prefix@
    230231libdir = @libdir@
    231232libexecdir = @libexecdir@
  • branches/ipopt_solve/cppad_ipopt/src/makefile.am

    r2506 r2681  
    2626#
    2727# make building the library conditional on having IPOPT_DIR specified
    28 if CppAD_IPOPT_CPPAD
     28if CppAD_IPOPT
    2929lib_LIBRARIES            = libcppad_ipopt.a
    3030libcppad_ipopt_a_SOURCES = \
  • branches/ipopt_solve/cppad_ipopt/src/makefile.in

    r2601 r2681  
    9696        hes_fg_map.hpp jac_g_map.cpp jac_g_map.hpp sparse_map2vec.cpp \
    9797        sparse_map2vec.hpp vec_fun_pattern.cpp vec_fun_pattern.hpp
    98 @CppAD_IPOPT_CPPAD_TRUE@am_libcppad_ipopt_a_OBJECTS =  \
    99 @CppAD_IPOPT_CPPAD_TRUE@        cppad_ipopt_nlp.$(OBJEXT) \
    100 @CppAD_IPOPT_CPPAD_TRUE@        hes_fg_map.$(OBJEXT) \
    101 @CppAD_IPOPT_CPPAD_TRUE@        jac_g_map.$(OBJEXT) \
    102 @CppAD_IPOPT_CPPAD_TRUE@        sparse_map2vec.$(OBJEXT) \
    103 @CppAD_IPOPT_CPPAD_TRUE@        vec_fun_pattern.$(OBJEXT)
     98@CppAD_IPOPT_TRUE@am_libcppad_ipopt_a_OBJECTS =  \
     99@CppAD_IPOPT_TRUE@      cppad_ipopt_nlp.$(OBJEXT) \
     100@CppAD_IPOPT_TRUE@      hes_fg_map.$(OBJEXT) jac_g_map.$(OBJEXT) \
     101@CppAD_IPOPT_TRUE@      sparse_map2vec.$(OBJEXT) \
     102@CppAD_IPOPT_TRUE@      vec_fun_pattern.$(OBJEXT)
    104103libcppad_ipopt_a_OBJECTS = $(am_libcppad_ipopt_a_OBJECTS)
    105104DEFAULT_INCLUDES =
     
    262261infodir = @infodir@
    263262install_sh = @install_sh@
     263ipopt_prefix = @ipopt_prefix@
    264264libdir = @libdir@
    265265libexecdir = @libexecdir@
     
    294294#
    295295# make building the library conditional on having IPOPT_DIR specified
    296 @CppAD_IPOPT_CPPAD_TRUE@lib_LIBRARIES = libcppad_ipopt.a
    297 @CppAD_IPOPT_CPPAD_TRUE@libcppad_ipopt_a_SOURCES = \
    298 @CppAD_IPOPT_CPPAD_TRUE@        cppad_ipopt_nlp.cpp \
    299 @CppAD_IPOPT_CPPAD_TRUE@        cppad_ipopt_nlp.hpp \
    300 @CppAD_IPOPT_CPPAD_TRUE@        fun_record.hpp \
    301 @CppAD_IPOPT_CPPAD_TRUE@        hes_fg_map.cpp \
    302 @CppAD_IPOPT_CPPAD_TRUE@        hes_fg_map.hpp \
    303 @CppAD_IPOPT_CPPAD_TRUE@        jac_g_map.cpp \
    304 @CppAD_IPOPT_CPPAD_TRUE@        jac_g_map.hpp \
    305 @CppAD_IPOPT_CPPAD_TRUE@        sparse_map2vec.cpp \
    306 @CppAD_IPOPT_CPPAD_TRUE@        sparse_map2vec.hpp \
    307 @CppAD_IPOPT_CPPAD_TRUE@        vec_fun_pattern.cpp  \
    308 @CppAD_IPOPT_CPPAD_TRUE@        vec_fun_pattern.hpp
     296@CppAD_IPOPT_TRUE@lib_LIBRARIES = libcppad_ipopt.a
     297@CppAD_IPOPT_TRUE@libcppad_ipopt_a_SOURCES = \
     298@CppAD_IPOPT_TRUE@      cppad_ipopt_nlp.cpp \
     299@CppAD_IPOPT_TRUE@      cppad_ipopt_nlp.hpp \
     300@CppAD_IPOPT_TRUE@      fun_record.hpp \
     301@CppAD_IPOPT_TRUE@      hes_fg_map.cpp \
     302@CppAD_IPOPT_TRUE@      hes_fg_map.hpp \
     303@CppAD_IPOPT_TRUE@      jac_g_map.cpp \
     304@CppAD_IPOPT_TRUE@      jac_g_map.hpp \
     305@CppAD_IPOPT_TRUE@      sparse_map2vec.cpp \
     306@CppAD_IPOPT_TRUE@      sparse_map2vec.hpp \
     307@CppAD_IPOPT_TRUE@      vec_fun_pattern.cpp  \
     308@CppAD_IPOPT_TRUE@      vec_fun_pattern.hpp
    309309
    310310all: all-am
  • branches/ipopt_solve/cppad_ipopt/test/makefile.in

    r2601 r2681  
    223223infodir = @infodir@
    224224install_sh = @install_sh@
     225ipopt_prefix = @ipopt_prefix@
    225226libdir = @libdir@
    226227libexecdir = @libexecdir@
  • branches/ipopt_solve/example/ipopt_solve/CMakeLists.txt

    r2661 r2681  
    1616SET(CMAKE_BUILD_TYPE DEBUG)
    1717
    18 # Local link directories to search (not in external packages)
     18# Local link directories to search, as determined by pkg-config for ipopt
    1919LINK_DIRECTORIES( ${ipopt_LIBRARY_DIRS} )
    2020
     
    3030add_cppad_cxx_flags( example_ipopt_solve )
    3131
    32 # List of libraries to be linked into the specified target
     32# libraries to be linked into the specified target,
     33# as determined by pkg-config for ipopt
    3334TARGET_LINK_LIBRARIES(example_ipopt_solve ${ipopt_LIBRARIES})
    3435
  • branches/ipopt_solve/example/ipopt_solve/makefile.in

    r2656 r2681  
    6161CONFIG_CLEAN_VPATH_FILES =
    6262am_solve_OBJECTS = solve.$(OBJEXT) get_started.$(OBJEXT) \
    63         ode_inverse.$(OBJEXT)
     63        ode_inverse.$(OBJEXT) retape.$(OBJEXT)
    6464solve_OBJECTS = $(am_solve_OBJECTS)
    6565solve_LDADD = $(LDADD)
     
    222222infodir = @infodir@
    223223install_sh = @install_sh@
     224ipopt_prefix = @ipopt_prefix@
    224225libdir = @libdir@
    225226libexecdir = @libexecdir@
     
    261262        solve.cpp \
    262263        get_started.cpp \
    263         ode_inverse.cpp
     264        ode_inverse.cpp \
     265        retape.cpp
    264266
    265267all: all-am
     
    314316@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/get_started.Po@am__quote@
    315317@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ode_inverse.Po@am__quote@
     318@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/retape.Po@am__quote@
    316319@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/solve.Po@am__quote@
    317320
  • branches/ipopt_solve/example/makefile.in

    r2601 r2681  
    320320infodir = @infodir@
    321321install_sh = @install_sh@
     322ipopt_prefix = @ipopt_prefix@
    322323libdir = @libdir@
    323324libexecdir = @libexecdir@
  • branches/ipopt_solve/example/test_one.sh.in

    r2547 r2681  
     1#! /bin/bash -e
    12# $Id$
    23# -----------------------------------------------------------------------------
  • branches/ipopt_solve/introduction/exp_apx/makefile.in

    r2601 r2681  
    227227infodir = @infodir@
    228228install_sh = @install_sh@
     229ipopt_prefix = @ipopt_prefix@
    229230libdir = @libdir@
    230231libexecdir = @libexecdir@
  • branches/ipopt_solve/introduction/get_started/makefile.in

    r2601 r2681  
    218218infodir = @infodir@
    219219install_sh = @install_sh@
     220ipopt_prefix = @ipopt_prefix@
    220221libdir = @libdir@
    221222libexecdir = @libexecdir@
  • branches/ipopt_solve/makefile.am

    r2666 r2681  
    4343#
    4444# Did user specify a value for IPOPT_DIR in configure command line
    45 if CppAD_IPOPT_CPPAD
     45if CppAD_IPOPT
    4646IPOPT_TESTS = \
    4747        example/ipopt_solve \
  • branches/ipopt_solve/makefile.in

    r2655 r2681  
    289289infodir = @infodir@
    290290install_sh = @install_sh@
     291ipopt_prefix = @ipopt_prefix@
    291292libdir = @libdir@
    292293libexecdir = @libexecdir@
     
    337338# Did user specify a value for SACADO_DIR in configure command line
    338339@CppAD_SACADO_TRUE@SPEED_SACADO_TESTS = speed/sacado
    339 @CppAD_IPOPT_CPPAD_FALSE@IPOPT_TESTS =
     340@CppAD_IPOPT_FALSE@IPOPT_TESTS =
    340341#
    341342# Did user specify a value for IPOPT_DIR in configure command line
    342 @CppAD_IPOPT_CPPAD_TRUE@IPOPT_TESTS = \
    343 @CppAD_IPOPT_CPPAD_TRUE@        example/ipopt_solve \
    344 @CppAD_IPOPT_CPPAD_TRUE@        cppad_ipopt/example \
    345 @CppAD_IPOPT_CPPAD_TRUE@        cppad_ipopt/speed \
    346 @CppAD_IPOPT_CPPAD_TRUE@        cppad_ipopt/test
    347 
    348 @CppAD_IPOPT_CPPAD_FALSE@IPOPT_DIRS =
    349 #
    350 @CppAD_IPOPT_CPPAD_TRUE@IPOPT_DIRS = \
    351 @CppAD_IPOPT_CPPAD_TRUE@        cppad_ipopt/src \
    352 @CppAD_IPOPT_CPPAD_TRUE@        $(IPOPT_TESTS)
    353 
    354 @CppAD_IPOPT_CPPAD_FALSE@IPOPT_HEADER =
    355 #
    356 @CppAD_IPOPT_CPPAD_TRUE@IPOPT_HEADER = \
    357 @CppAD_IPOPT_CPPAD_TRUE@        cppad_ipopt/src/cppad_ipopt_nlp.hpp
     343@CppAD_IPOPT_TRUE@IPOPT_TESTS = \
     344@CppAD_IPOPT_TRUE@      example/ipopt_solve \
     345@CppAD_IPOPT_TRUE@      cppad_ipopt/example \
     346@CppAD_IPOPT_TRUE@      cppad_ipopt/speed \
     347@CppAD_IPOPT_TRUE@      cppad_ipopt/test
     348
     349@CppAD_IPOPT_FALSE@IPOPT_DIRS =
     350#
     351@CppAD_IPOPT_TRUE@IPOPT_DIRS = \
     352@CppAD_IPOPT_TRUE@      cppad_ipopt/src \
     353@CppAD_IPOPT_TRUE@      $(IPOPT_TESTS)
     354
     355@CppAD_IPOPT_FALSE@IPOPT_HEADER =
     356#
     357@CppAD_IPOPT_TRUE@IPOPT_HEADER = \
     358@CppAD_IPOPT_TRUE@      cppad_ipopt/src/cppad_ipopt_nlp.hpp
    358359
    359360#
     
    414415        cppad/index_sort.hpp \
    415416        cppad/ipopt/solve.hpp \
    416         cppad/ipopt/solve_nlp.hpp \
     417        cppad/ipopt/solve_callback.hpp \
     418        cppad/ipopt/solve_result.hpp \
    417419        cppad/local/abort_recording.hpp \
    418420        cppad/local/abs.hpp \
  • branches/ipopt_solve/multi_thread/makefile.in

    r2601 r2681  
    249249infodir = @infodir@
    250250install_sh = @install_sh@
     251ipopt_prefix = @ipopt_prefix@
    251252libdir = @libdir@
    252253libexecdir = @libexecdir@
  • branches/ipopt_solve/multi_thread/test_multi/makefile.in

    r2601 r2681  
    217217infodir = @infodir@
    218218install_sh = @install_sh@
     219ipopt_prefix = @ipopt_prefix@
    219220libdir = @libdir@
    220221libexecdir = @libexecdir@
  • branches/ipopt_solve/print_for/makefile.in

    r2601 r2681  
    217217infodir = @infodir@
    218218install_sh = @install_sh@
     219ipopt_prefix = @ipopt_prefix@
    219220libdir = @libdir@
    220221libexecdir = @libexecdir@
  • branches/ipopt_solve/speed/adolc/makefile.in

    r2601 r2681  
    226226infodir = @infodir@
    227227install_sh = @install_sh@
     228ipopt_prefix = @ipopt_prefix@
    228229libdir = @libdir@
    229230libexecdir = @libexecdir@
  • branches/ipopt_solve/speed/cppad/makefile.in

    r2601 r2681  
    226226infodir = @infodir@
    227227install_sh = @install_sh@
     228ipopt_prefix = @ipopt_prefix@
    228229libdir = @libdir@
    229230libexecdir = @libexecdir@
  • branches/ipopt_solve/speed/double/makefile.in

    r2601 r2681  
    222222infodir = @infodir@
    223223install_sh = @install_sh@
     224ipopt_prefix = @ipopt_prefix@
    224225libdir = @libdir@
    225226libexecdir = @libexecdir@
  • branches/ipopt_solve/speed/example/makefile.in

    r2601 r2681  
    223223infodir = @infodir@
    224224install_sh = @install_sh@
     225ipopt_prefix = @ipopt_prefix@
    225226libdir = @libdir@
    226227libexecdir = @libexecdir@
  • branches/ipopt_solve/speed/fadbad/makefile.in

    r2601 r2681  
    222222infodir = @infodir@
    223223install_sh = @install_sh@
     224ipopt_prefix = @ipopt_prefix@
    224225libdir = @libdir@
    225226libexecdir = @libexecdir@
  • branches/ipopt_solve/speed/profile/makefile.in

    r2601 r2681  
    230230infodir = @infodir@
    231231install_sh = @install_sh@
     232ipopt_prefix = @ipopt_prefix@
    232233libdir = @libdir@
    233234libexecdir = @libexecdir@
  • branches/ipopt_solve/speed/sacado/makefile.in

    r2601 r2681  
    222222infodir = @infodir@
    223223install_sh = @install_sh@
     224ipopt_prefix = @ipopt_prefix@
    224225libdir = @libdir@
    225226libexecdir = @libexecdir@
  • branches/ipopt_solve/speed/src/makefile.in

    r2601 r2681  
    224224infodir = @infodir@
    225225install_sh = @install_sh@
     226ipopt_prefix = @ipopt_prefix@
    226227libdir = @libdir@
    227228libexecdir = @libexecdir@
  • branches/ipopt_solve/test_more/CMakeLists.txt

    r2577 r2681  
    3434ENDIF ( adolc_prefix )
    3535
     36# sources that use ipopt
     37IF ( ipopt_prefix )
     38        # Extra source files if we are including ipopt
     39        SET(ipopt_sources ipopt_solve.cpp)
     40        # Adds -D define flags to the compilation of source files.
     41        ADD_DEFINITIONS("-DCPPAD_IPOPT_TEST")
     42        # add ipopt (and libraries it depends on) to list of libraries
     43        SET(test_more_ipopt ${ipopt_LIBRARIES} )
     44ELSE ( ipopt_prefix )
     45        SET(ipopt_sources "")
     46        SET(test_more_ipopt "")
     47ENDIF ( ipopt_prefix )
     48
    3649# sources that use eigen
    3750IF ( eigen_prefix )
     
    6275ADD_EXECUTABLE(test_more EXCLUDE_FROM_ALL test_more.cpp
    6376        ${adolc_sources}
     77        ${ipopt_sources}
    6478        ${eigen_sources}
    6579        abs.cpp
     
    93107        from_base.cpp
    94108        fun_check.cpp
     109        ipopt_solve.cpp
    95110        jacobian.cpp
    96111        log.cpp
     
    142157
    143158# List of libraries to be linked into the specified target
    144 TARGET_LINK_LIBRARIES(test_more ${test_more_adolc} ${test_more_eigen})
     159TARGET_LINK_LIBRARIES(test_more
     160        ${test_more_adolc}
     161        ${test_more_ipopt}
     162        ${test_more_eigen}
     163)
    145164
    146165# Add the check_test_more target
  • branches/ipopt_solve/test_more/makefile.am

    r2556 r2681  
    1515DEFS          =
    1616#
     17# -------------------------------------------------------------------------
    1718if CppAD_OPENMP
    1819OPENMP_SRC_FILES   = alloc_openmp.cpp
     
    2021OPENMP_SRC_FILES   =
    2122endif
     23# -------------------------------------------------------------------------
    2224if CppAD_ADOLC
    2325ADOLC_SRC_FILES   = base_adolc.cpp
     
    3032ADOLC_LIB         =
    3133ADOLC_FLAGS       =
     34endif
     35# -------------------------------------------------------------------------
     36if CppAD_IPOPT
     37IPOPT_SRC_FILES   = ipopt_solve.cpp
     38IPOPT_EXTRA_FILES =
     39IPOPT_LIB         = -lipopt \
     40        $(CPPAD_IPOPT_LIBS) $(FCLIBS) $(PTHREAD_LIB) $(DL_LIB)
     41IPOPT_FLAGS       = -DCPPAD_IPOPT_TEST -I$(IPOPT_DIR)/include
     42else
     43IPOPT_EXTRA_FILES = ipopt_solve.cpp
     44IPOPT_SRC_FILES   =
     45IPOPT_LIB         =
     46IPOPT_FLAGS       =
    3247endif
    3348# -------------------------------------------------------------------------
     
    5267        test_one.sh.in  \
    5368        $(ADOLC_EXTRA_FILES) \
     69        $(IPOPT_EXTRA_FILES) \
    5470        $(EIGEN_EXTRA_FILES)
    5571#
     
    6177        $(EIGEN_INCLUDE) \
    6278        $(ADOLC_FLAGS) \
     79        $(IPOPT_FLAGS) \
    6380        $(OPENMP_FLAGS)
    6481#
    65 AM_CXXFLAGS       = -g $(ADOLC_FLAGS) $(CXX_FLAGS)
     82AM_CXXFLAGS       = -g $(ADOLC_FLAGS) $(IPOPT_FLAGS) $(CXX_FLAGS)
    6683#
    6784AM_LDFLAGS        = $(OPENMP_FLAGS)
    68 LDADD             = $(ADOLC_LIB) $(EIGEN_LIB) $(OPENMP_FLAGS)
     85LDADD             = $(ADOLC_LIB) $(IPOPT_LIB) $(EIGEN_LIB) $(OPENMP_FLAGS)
    6986#
    7087test_more_SOURCES  = \
    7188        $(ADOLC_SRC_FILES) \
     89        $(IPOPT_SRC_FILES) \
    7290        $(OPENMP_SRC_FILES) \
    7391        test_more.cpp \
  • branches/ipopt_solve/test_more/makefile.in

    r2601 r2681  
    7070@CppAD_EIGEN_DIR_TRUE@  libeigen_a-cppad_eigen.$(OBJEXT)
    7171libeigen_a_OBJECTS = $(am_libeigen_a_OBJECTS)
    72 am__test_more_SOURCES_DIST = base_adolc.cpp alloc_openmp.cpp \
    73         test_more.cpp abs.cpp acos.cpp asin.cpp assign.cpp add.cpp \
    74         add_eq.cpp add_zero.cpp atan.cpp atan2.cpp base_alloc.cpp \
    75         check_simple_vector.cpp compare.cpp compare_change.cpp \
    76         cond_exp.cpp cond_exp_ad.cpp copy.cpp cos.cpp cosh.cpp \
    77         dbl_epsilon.cpp div.cpp div_eq.cpp div_zero_one.cpp erf.cpp \
    78         epsilon.cpp exp.cpp for_hess.cpp for_sparse_jac.cpp \
    79         forward.cpp from_base.cpp fun_check.cpp jacobian.cpp log.cpp \
    80         log10.cpp mul.cpp mul_eq.cpp mul_level.cpp mul_zero_one.cpp \
    81         ndebug.cpp near_equal_ext.cpp neg.cpp ode_err_control.cpp \
    82         optimize.cpp parameter.cpp poly.cpp pow.cpp pow_int.cpp \
    83         print_for.cpp romberg_one.cpp rosen_34.cpp runge_45.cpp \
    84         reverse.cpp rev_sparse_hes.cpp rev_sparse_jac.cpp rev_two.cpp \
    85         simple_vector.cpp sin.cpp sin_cos.cpp sinh.cpp \
    86         sparse_hessian.cpp sparse_jacobian.cpp sparse_vec_ad.cpp \
    87         sqrt.cpp std_math.cpp sub.cpp sub_eq.cpp sub_zero.cpp tan.cpp \
    88         test_vector.cpp track_new_del.cpp value.cpp vec_ad.cpp \
    89         vec_ad_par.cpp vec_unary.cpp
     72am__test_more_SOURCES_DIST = base_adolc.cpp ipopt_solve.cpp \
     73        alloc_openmp.cpp test_more.cpp abs.cpp acos.cpp asin.cpp \
     74        assign.cpp add.cpp add_eq.cpp add_zero.cpp atan.cpp atan2.cpp \
     75        base_alloc.cpp check_simple_vector.cpp compare.cpp \
     76        compare_change.cpp cond_exp.cpp cond_exp_ad.cpp copy.cpp \
     77        cos.cpp cosh.cpp dbl_epsilon.cpp div.cpp div_eq.cpp \
     78        div_zero_one.cpp erf.cpp epsilon.cpp exp.cpp for_hess.cpp \
     79        for_sparse_jac.cpp forward.cpp from_base.cpp fun_check.cpp \
     80        jacobian.cpp log.cpp log10.cpp mul.cpp mul_eq.cpp \
     81        mul_level.cpp mul_zero_one.cpp ndebug.cpp near_equal_ext.cpp \
     82        neg.cpp ode_err_control.cpp optimize.cpp parameter.cpp \
     83        poly.cpp pow.cpp pow_int.cpp print_for.cpp romberg_one.cpp \
     84        rosen_34.cpp runge_45.cpp reverse.cpp rev_sparse_hes.cpp \
     85        rev_sparse_jac.cpp rev_two.cpp simple_vector.cpp sin.cpp \
     86        sin_cos.cpp sinh.cpp sparse_hessian.cpp sparse_jacobian.cpp \
     87        sparse_vec_ad.cpp sqrt.cpp std_math.cpp sub.cpp sub_eq.cpp \
     88        sub_zero.cpp tan.cpp test_vector.cpp track_new_del.cpp \
     89        value.cpp vec_ad.cpp vec_ad_par.cpp vec_unary.cpp
    9090@CppAD_ADOLC_TRUE@am__objects_1 = base_adolc.$(OBJEXT)
    91 @CppAD_OPENMP_TRUE@am__objects_2 = alloc_openmp.$(OBJEXT)
     91@CppAD_IPOPT_TRUE@am__objects_2 = ipopt_solve.$(OBJEXT)
     92@CppAD_OPENMP_TRUE@am__objects_3 = alloc_openmp.$(OBJEXT)
    9293am_test_more_OBJECTS = $(am__objects_1) $(am__objects_2) \
    93         test_more.$(OBJEXT) abs.$(OBJEXT) acos.$(OBJEXT) \
    94         asin.$(OBJEXT) assign.$(OBJEXT) add.$(OBJEXT) add_eq.$(OBJEXT) \
    95         add_zero.$(OBJEXT) atan.$(OBJEXT) atan2.$(OBJEXT) \
    96         base_alloc.$(OBJEXT) check_simple_vector.$(OBJEXT) \
    97         compare.$(OBJEXT) compare_change.$(OBJEXT) cond_exp.$(OBJEXT) \
     94        $(am__objects_3) test_more.$(OBJEXT) abs.$(OBJEXT) \
     95        acos.$(OBJEXT) asin.$(OBJEXT) assign.$(OBJEXT) add.$(OBJEXT) \
     96        add_eq.$(OBJEXT) add_zero.$(OBJEXT) atan.$(OBJEXT) \
     97        atan2.$(OBJEXT) base_alloc.$(OBJEXT) \
     98        check_simple_vector.$(OBJEXT) compare.$(OBJEXT) \
     99        compare_change.$(OBJEXT) cond_exp.$(OBJEXT) \
    98100        cond_exp_ad.$(OBJEXT) copy.$(OBJEXT) cos.$(OBJEXT) \
    99101        cosh.$(OBJEXT) dbl_epsilon.$(OBJEXT) div.$(OBJEXT) \
     
    120122test_more_LDADD = $(LDADD)
    121123am__DEPENDENCIES_1 =
    122 test_more_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
    123         $(am__DEPENDENCIES_1)
     124@CppAD_IPOPT_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) \
     125@CppAD_IPOPT_TRUE@      $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
     126@CppAD_IPOPT_TRUE@      $(am__DEPENDENCIES_1)
     127test_more_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
     128        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
    124129DEFAULT_INCLUDES =
    125130depcomp = $(SHELL) $(top_srcdir)/depcomp
     
    278283infodir = @infodir@
    279284install_sh = @install_sh@
     285ipopt_prefix = @ipopt_prefix@
    280286libdir = @libdir@
    281287libexecdir = @libexecdir@
     
    299305@CppAD_OPENMP_FALSE@OPENMP_SRC_FILES =
    300306#
     307# -------------------------------------------------------------------------
    301308@CppAD_OPENMP_TRUE@OPENMP_SRC_FILES = alloc_openmp.cpp
    302309@CppAD_ADOLC_FALSE@ADOLC_SRC_FILES =
     310# -------------------------------------------------------------------------
    303311@CppAD_ADOLC_TRUE@ADOLC_SRC_FILES = base_adolc.cpp
    304312@CppAD_ADOLC_FALSE@ADOLC_EXTRA_FILES = base_adolc.cpp
     
    308316@CppAD_ADOLC_FALSE@ADOLC_FLAGS =
    309317@CppAD_ADOLC_TRUE@ADOLC_FLAGS = -DCPPAD_ADOLC_TEST -I$(ADOLC_DIR)/include
     318@CppAD_IPOPT_FALSE@IPOPT_SRC_FILES =
     319# -------------------------------------------------------------------------
     320@CppAD_IPOPT_TRUE@IPOPT_SRC_FILES = ipopt_solve.cpp
     321@CppAD_IPOPT_FALSE@IPOPT_EXTRA_FILES = ipopt_solve.cpp
     322@CppAD_IPOPT_TRUE@IPOPT_EXTRA_FILES =
     323@CppAD_IPOPT_FALSE@IPOPT_LIB =
     324@CppAD_IPOPT_TRUE@IPOPT_LIB = -lipopt \
     325@CppAD_IPOPT_TRUE@      $(CPPAD_IPOPT_LIBS) $(FCLIBS) $(PTHREAD_LIB) $(DL_LIB)
     326
     327@CppAD_IPOPT_FALSE@IPOPT_FLAGS =
     328@CppAD_IPOPT_TRUE@IPOPT_FLAGS = -DCPPAD_IPOPT_TEST -I$(IPOPT_DIR)/include
    310329@CppAD_EIGEN_DIR_FALSE@EIGEN_EXTRA_FILES = cppad_eigen.cpp
    311330# -------------------------------------------------------------------------
     
    327346        test_one.sh.in  \
    328347        $(ADOLC_EXTRA_FILES) \
     348        $(IPOPT_EXTRA_FILES) \
    329349        $(EIGEN_EXTRA_FILES)
    330350
     
    335355        $(EIGEN_INCLUDE) \
    336356        $(ADOLC_FLAGS) \
     357        $(IPOPT_FLAGS) \
    337358        $(OPENMP_FLAGS)
    338359
    339360#
    340 AM_CXXFLAGS = -g $(ADOLC_FLAGS) $(CXX_FLAGS)
     361AM_CXXFLAGS = -g $(ADOLC_FLAGS) $(IPOPT_FLAGS) $(CXX_FLAGS)
    341362#
    342363AM_LDFLAGS = $(OPENMP_FLAGS)
    343 LDADD = $(ADOLC_LIB) $(EIGEN_LIB) $(OPENMP_FLAGS)
     364LDADD = $(ADOLC_LIB) $(IPOPT_LIB) $(EIGEN_LIB) $(OPENMP_FLAGS)
    344365#
    345366test_more_SOURCES = \
    346367        $(ADOLC_SRC_FILES) \
     368        $(IPOPT_SRC_FILES) \
    347369        $(OPENMP_SRC_FILES) \
    348370        test_more.cpp \
     
    509531@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/from_base.Po@am__quote@
    510532@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fun_check.Po@am__quote@
     533@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipopt_solve.Po@am__quote@
    511534@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jacobian.Po@am__quote@
    512535@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libeigen_a-cppad_eigen.Po@am__quote@
  • branches/ipopt_solve/test_more/test_more.cpp

    r2506 r2681  
    5151extern bool FromBase(void);
    5252extern bool FunCheck(void);
     53extern bool ipopt_solve(void);
    5354extern bool jacobian(void);
    5455extern bool Log(void);
     
    199200        ok &= Run( VecADPar,        "VecADPar"       );
    200201        ok &= Run( VecUnary,        "VecUnary"       );
    201 
    202202# ifdef CPPAD_ADOLC_TEST
    203203        ok &= Run( base_adolc,      "base_adolc"     );
     204# endif
     205# ifdef CPPAD_IPOPT_TEST
     206        ok &= Run( ipopt_solve,     "ipopt_solve"    );
    204207# endif
    205208# ifdef CPPAD_OPENMP_TEST
  • branches/ipopt_solve/test_more/test_one.sh.in

    r2577 r2681  
     1#! /bin/bash -e
    12# $Id$
    23# -----------------------------------------------------------------------------
     
    6667                export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:@adolc_prefix@/$lib"
    6768        fi
     69        if [ -e @ipopt_prefix@/$lib/pkgconfig ]
     70        then
     71                export PKG_CONFIG_PATH="@ipopt_prefix@/$lib/pkgconfig"
     72                cflags=`pkg-config --cflags ipopt |
     73                        sed -e 's|/coin$|/|' -e 's|/coin | |'`
     74                libs=`pkg-config --libs ipopt`
     75                cmd="$cmd $cflags $libs"
     76        fi
    6877done
    6978if [ "$1" == 'ndebug.cpp' ]
Note: See TracChangeset for help on using the changeset viewer.