Changeset 1633


Ignore:
Timestamp:
Jan 23, 2010 9:48:12 AM (10 years ago)
Author:
bradbell
Message:

/home/bradbell/cppad/trunk:

configure: automatic changes corresponding to configure.ac
test_more/makefile.*: remove cppad_ipopt.cpp.
test_more/test_more.cpp: remove cppad_ipopt.cpp.
cppad_ipopt.cpp: split up and move into cppad_ipopt/test.
cppad_ipopt/test/*: split and moved version of cppad_ipopt.cpp.
cppad_ipopt_nlp.*: replace compute_index_jac_fg by call to sparse_map2vec.
example/makefile.in: update id for corresponding makefile.am.
configure.ac: add cppad_ipopt/test/makefile to output list.
build.sh: add cppad_ipopt speed, test to list of tests. Improve messaging.
makefile.*: add cppad_ipopt/test subdirectory.
check_svn_dist.sh: run cppad_ipopt/test/test.

Location:
trunk
Files:
7 added
1 deleted
13 edited

Legend:

Unmodified
Added
Removed
  • trunk/build.sh

    r1628 r1633  
    206206                if [ ! -e $name ]
    207207                then
    208                         echo "$name is not in subversion repository"
     208                        echo "$name"
     209                        echo "is not in subversion repository."
     210                        echo "Check it in after making this change."
     211                        echo "This error won't occur when you re-run build.sh"
     212                        touch $name
    209213                        exit 1
    210214                fi
     
    666670                list="
    667671                        cppad_ipopt/example/example
     672                        cppad_ipopt/speed/speed
     673                        cppad_ipopt/test/test
    668674                        $list
    669675                "
  • trunk/check_svn_dist.sh

    r1632 r1633  
    3333# ----------------------------------------------------------------------------
    3434dir=`pwd`
    35 for name in example test_more cppad_ipopt/example cppad_ipopt/speed
     35list="
     36        example
     37        test_more
     38        cppad_ipopt/example
     39        cppad_ipopt/speed
     40        cppad_ipopt/test
     41"
     42for name in $list
    3643do
    3744        echo "cd $dir/$name"
  • trunk/configure

    r1628 r1633  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.63 for CppAD 20100120.
     3# Generated by GNU Autoconf 2.63 for CppAD 20100123.
    44#
    55# Report bugs to <cppad@list.coin-or.org>.
     
    597597PACKAGE_NAME='CppAD'
    598598PACKAGE_TARNAME='cppad'
    599 PACKAGE_VERSION='20100120'
    600 PACKAGE_STRING='CppAD 20100120'
     599PACKAGE_VERSION='20100123'
     600PACKAGE_STRING='CppAD 20100123'
    601601PACKAGE_BUGREPORT='cppad@list.coin-or.org'
    602602
     
    13211321  # This message is too long to be a string in the A/UX 3.1 sh.
    13221322  cat <<_ACEOF
    1323 \`configure' configures CppAD 20100120 to adapt to many kinds of systems.
     1323\`configure' configures CppAD 20100123 to adapt to many kinds of systems.
    13241324
    13251325Usage: $0 [OPTION]... [VAR=VALUE]...
     
    13871387if test -n "$ac_init_help"; then
    13881388  case $ac_init_help in
    1389      short | recursive ) echo "Configuration of CppAD 20100120:";;
     1389     short | recursive ) echo "Configuration of CppAD 20100123:";;
    13901390   esac
    13911391  cat <<\_ACEOF
     
    15001500if $ac_init_version; then
    15011501  cat <<\_ACEOF
    1502 CppAD configure 20100120
     1502CppAD configure 20100123
    15031503generated by GNU Autoconf 2.63
    15041504
     
    15141514running configure, to aid debugging if configure makes a mistake.
    15151515
    1516 It was created by CppAD $as_me 20100120, which was
     1516It was created by CppAD $as_me 20100123, which was
    15171517generated by GNU Autoconf 2.63.  Invocation command line was
    15181518
     
    38523852# Define the identity of the package.
    38533853 PACKAGE='cppad'
    3854  VERSION='20100120'
     3854 VERSION='20100123'
    38553855
    38563856
     
    56885688
    56895689
    5690 ac_config_files="$ac_config_files cppad/configure.hpp doxyfile doc.omh example/test_one.sh omh/install_unix.omh omh/install_windows.omh test_more/test_one.sh makefile example/makefile cppad_ipopt/example/makefile cppad_ipopt/speed/makefile introduction/get_started/makefile introduction/exp_apx/makefile print_for/makefile speed/adolc/makefile speed/cppad/makefile speed/double/makefile speed/example/makefile speed/fadbad/makefile speed/profile/makefile speed/sacado/makefile test_more/makefile"
     5690ac_config_files="$ac_config_files cppad/configure.hpp doxyfile doc.omh example/test_one.sh omh/install_unix.omh omh/install_windows.omh test_more/test_one.sh makefile example/makefile cppad_ipopt/example/makefile cppad_ipopt/speed/makefile cppad_ipopt/test/makefile introduction/get_started/makefile introduction/exp_apx/makefile print_for/makefile speed/adolc/makefile speed/cppad/makefile speed/double/makefile speed/example/makefile speed/fadbad/makefile speed/profile/makefile speed/sacado/makefile test_more/makefile"
    56915691
    56925692ac_config_commands="$ac_config_commands default-1"
     
    62426242# values after options handling.
    62436243ac_log="
    6244 This file was extended by CppAD $as_me 20100120, which was
     6244This file was extended by CppAD $as_me 20100123, which was
    62456245generated by GNU Autoconf 2.63.  Invocation command line was
    62466246
     
    63056305cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
    63066306ac_cs_version="\\
    6307 CppAD config.status 20100120
     6307CppAD config.status 20100123
    63086308configured by $0, generated by GNU Autoconf 2.63,
    63096309  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
     
    64436443    "cppad_ipopt/example/makefile") CONFIG_FILES="$CONFIG_FILES cppad_ipopt/example/makefile" ;;
    64446444    "cppad_ipopt/speed/makefile") CONFIG_FILES="$CONFIG_FILES cppad_ipopt/speed/makefile" ;;
     6445    "cppad_ipopt/test/makefile") CONFIG_FILES="$CONFIG_FILES cppad_ipopt/test/makefile" ;;
    64456446    "introduction/get_started/makefile") CONFIG_FILES="$CONFIG_FILES introduction/get_started/makefile" ;;
    64466447    "introduction/exp_apx/makefile") CONFIG_FILES="$CONFIG_FILES introduction/exp_apx/makefile" ;;
  • trunk/configure.ac

    r1628 r1633  
    1313dnl Process this file with autoconf to produce a configure script.
    1414dnl   package   version              bug-report
    15 AC_INIT(CppAD, 20100120, cppad@list.coin-or.org)
     15AC_INIT(CppAD, 20100123, cppad@list.coin-or.org)
    1616
    1717dnl By defalut disable maintainer mode when running configure;
     
    315315        cppad_ipopt/example/makefile
    316316        cppad_ipopt/speed/makefile
     317        cppad_ipopt/test/makefile
    317318        introduction/get_started/makefile
    318319        introduction/exp_apx/makefile
  • trunk/cppad_ipopt/example/makefile.in

    r1632 r1633  
    9090CYGPATH_W = @CYGPATH_W@
    9191
    92 # $Id: makefile.am 1628 2010-01-20 15:04:49Z bradbell $
     92# $Id: makefile.am 1632 2010-01-23 12:19:08Z bradbell $
    9393# -----------------------------------------------------------------------------
    9494# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-10 Bradley M. Bell
  • trunk/cppad_ipopt/speed/makefile.in

    r1632 r1633  
    8989CYGPATH_W = @CYGPATH_W@
    9090
    91 # $Id: makefile.am 1628 2010-01-20 15:04:49Z bradbell $
     91# $Id: makefile.am 1632 2010-01-23 12:19:08Z bradbell $
    9292# -----------------------------------------------------------------------------
    9393# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-10 Bradley M. Bell
  • trunk/cppad_ipopt/src/cppad_ipopt_nlp.cpp

    r1632 r1633  
    116116                                pattern_jac_fg[i * n + j] = true;
    117117                }
    118                 compute_index_jac_fg(m, n, pattern_jac_fg, index_jac_fg_);
     118                compute_index_jac_g(m, n, pattern_jac_fg, index_jac_g_);
    119119                //
    120120                BoolVector pattern_h_lag(n * n);
     
    126126        }
    127127        else
    128         {       // compute index map for Jacobian of fg
    129                 compute_index_jac_fg(
     128        {       // compute index map for Jacobian of g
     129                compute_index_jac_g(
    130130                fg_info_, I_, J_, K_, L_, m_, n_, p_, q_, r_fun_,   // inputs
    131                 pattern_jac_r_, index_jac_fg_                       // outputs
     131                pattern_jac_r_, index_jac_g_                        // outputs
    132132                );
    133133
     
    140140
    141141        // Compute Ipopt sparsity structure for Jacobian of g
    142         compute_structure_jac_g(
    143                 index_jac_fg_, m, n,                  // inputs
     142        sparse_map2vec(
     143                index_jac_g_,                         // inputs
    144144                nnz_jac_g_, iRow_jac_g_, jCol_jac_g_  // outputs
    145145        );
     
    198198
    199199// static member function that computes CppAD sparsity pattern for
    200 // Jacobian of fg
    201 void cppad_ipopt_nlp::compute_index_jac_fg(
     200// Jacobian of g
     201void cppad_ipopt_nlp::compute_index_jac_g(
    202202        cppad_ipopt_fg_info*  fg_info        ,
    203203        SizeVector&           I              ,
     
    211211        ADFunVector&          r_fun          ,
    212212        BoolVectorVector&     pattern_jac_r  ,
    213         IndexMap&             index_jac_fg   )
     213        IndexMap&             index_jac_g    )
    214214/*
    215215fg_info: input
     
    256256On output it is the CppAD sparsity pattern for the Jacobian of r_k (u).
    257257
    258 index_jac_fg:
    259 On input, this is empty; i.e., index_jac_fg.size() == 0.
    260 On output, it is the index mapping from (i, j) in the Jacobian of fg
     258index_jac_g:
     259On input, this is empty; i.e., index_jac_g.size() == 0.
     260On output, it is the index mapping from (i, j) in the Jacobian of g
    261261to the corresponding values array index in Ipopt.
    262 Furthermore, if index_jac_fg[i].find(j) == index_jac_fg[i].end(),
    263 then either i = 0 or the (i, j) entry in the Jacobian of fg is always zero.
     262Furthermore, if index_jac_g[i].find(j) == index_jac_g[i].end(),
     263then the (i, j) entry in the Jacobian of g is always zero.
    264264*/
    265265{
     
    311311                }
    312312        }
    313         compute_index_jac_fg(m, n, pattern_jac_fg, index_jac_fg);
     313        compute_index_jac_g(m, n, pattern_jac_fg, index_jac_g);
    314314}
    315315
    316316// static member function that computes index map from array indices
    317 // for Jacobian of fg
    318 void cppad_ipopt_nlp::compute_index_jac_fg(
     317// for Jacobian of g
     318void cppad_ipopt_nlp::compute_index_jac_g(
    319319        size_t                m              ,
    320320        size_t                n              ,
    321321        const BoolVector&     pattern_jac_fg ,
    322         IndexMap&             index_jac_fg
     322        IndexMap&             index_jac_g
    323323)
    324324/*
     
    330330
    331331pattern_jac_fg:
    332 The CppAD sparsity pattern for the Jacobian of fg(x).
    333 
    334 index_jac_fg:
    335 On input, this is empty; i.e., index_jac_fg.size() == 0.
    336 On output, it is the index mapping from (i, j) in the Jacobian of fg
     332The CppAD sparsity pattern for the Jacobian of g(x).
     333
     334index_jac_g:
     335On input, this is empty; i.e., index_jac_g.size() == 0.
     336On output, it is the index mapping from (i, j) in the Jacobian of g
    337337to the corresponding values array index in Ipopt.
    338 Furthermore, if index_jac_fg[i].find(j) == index_jac_fg[i].end(),
    339 then either i = 0 or the (i, j) entry in the Jacobian of fg is always zero.
     338Furthermore, if index_jac_g[i].find(j) == index_jac_g[i].end(),
     339then the (i, j) entry in the Jacobian of g is always zero.
    340340*/
    341 {       CPPAD_ASSERT_UNKNOWN( index_jac_fg.size() == 0 );
    342         index_jac_fg.resize(m+1);
     341{       CPPAD_ASSERT_UNKNOWN( index_jac_g.size() == 0 );
     342        index_jac_g.resize(m);
    343343        size_t i, j, l = 0;
    344344        for(i = 1; i <= m; i++)
    345345        {       for(j = 0; j < n; j++)
    346346                {       if( pattern_jac_fg[ i * n + j ] )
    347                                 index_jac_fg[i][j] = l++;
     347                                index_jac_g[i-1][j] = l++;
    348348                }
    349349        }
     
    498498}
    499499
    500 // static member function that computes the Ipopt sparsity structure for
    501 // Jacobian of g
    502 void cppad_ipopt_nlp::compute_structure_jac_g(
    503         IndexMap&         index_jac_fg   , // const does not work
    504         size_t            m              ,
    505         size_t            n              ,
    506         size_t&           nnz_jac_g      ,
    507         SizeVector&       iRow_jac_g     ,
    508         SizeVector&       jCol_jac_g     )
    509 /*
    510 index_jac_fg:
    511 is the index mapping from (i, j) in the Jacobian of fg
    512 to the corresponding values array index in Ipopt.
    513 If index_jac_fg[i].find(j) == index_jac_fg[i].end(),
    514 then either i = 0 or the (i, j) entry in the Jacobian of fg is always zero.
    515 
    516 m: input
    517 The number of components in the constraint function g.
    518 
    519 n: input
    520 Number of indpendent variables.
    521 
    522 nnz_jac_g: output
    523 The number of possibly non-zero entries in the Jacobian of g.
    524 
    525 iRow_jac_g: output
    526 The input size of this vector does not matter.
    527 On output it has size nnz_jac_g.
    528 It specifies the C row index (i.e. base one)
    529 corresponding to each non-zero entry in the Jacobian of g.
    530 
    531 jCol_jac_g: output
    532 The input size of this vector does not matter.
    533 On output it has size nnz_jac_g.
    534 It specifies the C column index (i.e. base one)
    535 corresponding to each non-zero entry in the Jacobian of g.
    536 */
    537 {       size_t i, j, l;
    538         std::map<size_t,size_t>::iterator index_ij;
    539 
    540         nnz_jac_g = 0;
    541         for(i = 1; i <= m; i++)
    542         {       for(j = 0; j < n; j++)
    543                 {       index_ij = index_jac_fg[i].find(j);
    544                         if( index_ij != index_jac_fg[i].end() )
    545                                 ++nnz_jac_g;
    546                 }
    547         }
    548         iRow_jac_g.resize( nnz_jac_g );
    549         jCol_jac_g.resize( nnz_jac_g );
    550         l = 0;
    551         for(i = 1; i <= m; i++)
    552         {       for(j = 0; j < n; j++)
    553                 {       index_ij = index_jac_fg[i].find(j);
    554                         if( index_ij != index_jac_fg[i].end() )
    555                         {       iRow_jac_g[l] = i - 1;
    556                                 jCol_jac_g[l] = j;
    557                                 l++;
    558                         }
    559                 }
    560         }
    561 }
    562 
    563500cppad_ipopt_nlp::~cppad_ipopt_nlp()
    564501{}
     
    818755                {       CPPAD_ASSERT_UNKNOWN( I_[i] <= m_ );
    819756                        for(j = 0; j < q_[k]; j++)
    820                         {       index_ij = index_jac_fg_[I_[i]].find(J_[j]);
    821                                 if( index_ij != index_jac_fg_[I_[i]].end() )
     757                        {       index_ij = index_jac_g_[I_[i]-1].find(J_[j]);
     758                                if( index_ij != index_jac_g_[I_[i]-1].end() )
    822759                                {       l          = index_ij->second;
    823760                                        values[l] += jac_r[i * q_[k] + j];
  • trunk/cppad_ipopt/src/cppad_ipopt_nlp.hpp

    r1632 r1633  
    832832        SizeVector                       jCol_jac_g_;
    833833        // mapping from array indices to Ipopt sparsity structure
    834         IndexMap                         index_jac_fg_;
     834        IndexMap                         index_jac_g_;
    835835        IndexMap                         index_h_lag_;
    836836        // Ipopt sparsity structure for Hessian of Lagragian
     
    856856                ADFunVector&          r_fun
    857857        );
    858         static void compute_index_jac_fg(
     858        static void compute_index_jac_g(
    859859                cppad_ipopt_fg_info  *fg_info        ,
    860860                SizeVector&           I              ,
     
    868868                ADFunVector&          r_fun          ,
    869869                BoolVectorVector&     pattern_jac_r  ,
    870                 IndexMap&             index_jac_fg
     870                IndexMap&             index_jac_g
    871871        );
    872872        static void compute_index_h_lag(
     
    884884                IndexMap&             index_h_hag
    885885        );
    886         static void compute_structure_jac_g(
    887                 IndexMap&             index_jac_fg   , // const does not work
    888                 size_t                m              ,
    889                 size_t                n              ,
    890                 size_t&               nnz_jac_g      ,
    891                 SizeVector&           iRow_jac_g     ,
    892                 SizeVector&           jCol_jac_g
    893         );
    894         static void compute_index_jac_fg(
     886        static void compute_index_jac_g(
    895887                size_t                m              ,
    896888                size_t                n              ,
    897889                const BoolVector&     pattern_jac_fg ,
    898                 IndexMap&             index_jac_fg
     890                IndexMap&             index_jac_g
    899891        );
    900892        static void compute_index_h_lag(
  • trunk/makefile.am

    r1628 r1633  
    259259# Did user specify a value for IPOPT_DIR in configure command line
    260260if CppAD_IPOPT_CPPAD
    261 IPOPT_CPPAD = cppad_ipopt/example cppad_ipopt/speed
     261IPOPT_CPPAD = cppad_ipopt/example cppad_ipopt/speed cppad_ipopt/test
    262262else
    263263IPOPT_CPPAD =
  • trunk/makefile.in

    r1630 r1633  
    9292ETAGS = etags
    9393CTAGS = ctags
    94 DIST_SUBDIRS = cppad_ipopt/example cppad_ipopt/speed example \
    95         introduction/get_started introduction/exp_apx print_for \
    96         speed/cppad speed/double speed/example speed/profile \
     94DIST_SUBDIRS = cppad_ipopt/example cppad_ipopt/speed cppad_ipopt/test \
     95        example introduction/get_started introduction/exp_apx \
     96        print_for speed/cppad speed/double speed/example speed/profile \
    9797        speed/adolc speed/fadbad speed/sacado test_more
    9898DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
     
    473473# ---------------------------------------------------------------
    474474# Did user specify a value for IPOPT_DIR in configure command line
    475 @CppAD_IPOPT_CPPAD_TRUE@IPOPT_CPPAD = cppad_ipopt/example cppad_ipopt/speed
     475@CppAD_IPOPT_CPPAD_TRUE@IPOPT_CPPAD = cppad_ipopt/example cppad_ipopt/speed cppad_ipopt/test
    476476#
    477477SUBDIRS = \
  • trunk/test_more/makefile.am

    r1632 r1633  
    2828ADOLC_FLAGS   =
    2929endif
    30 if CppAD_IPOPT_CPPAD
    31 IPOPT_SRC_FILES   = \
    32         ../cppad_ipopt/src/cppad_ipopt_nlp.cpp \
    33         ../cppad_ipopt/src/sparse_map2vec.cpp \
    34         cppad_ipopt.cpp
    35 IPOPT_EXTRA_FILES =
    36 IPOPT_INCLUDE     = -I$(IPOPT_DIR)/include
    37 IPOPT_LIB         = -lipopt $(FCLIBS) $(PTHREAD_LIB) $(DL_LIB)
    38 IPOPT_LIB_DIR     = -L$(IPOPT_DIR)/lib
    39 IPOPT_FLAGS       = -DCPPAD_IPOPT_CPPAD_TEST
    40 else
    41 IPOPT_SRC_FILES   =
    42 IPOPT_EXTRA_FILES = cppad_ipopt.cpp
    43 IPOPT_INCLUDE     =
    44 IPOPT_LIB         =
    45 endif
    4630if CppAD_BOOSTVECTOR
    4731BOOST_INCLUDE = -I$(BOOST_DIR)
     
    5135#
    5236# Microsoft project files
    53 EXTRA_DIST        = test_more.sln test_more.vcproj test_one.sh.in \
    54         $(IPOPT_EXTRA_FILES)
     37EXTRA_DIST        = test_more.sln test_more.vcproj test_one.sh.in
    5538#
    5639noinst_PROGRAMS   = test_more
     
    5942        -I$(top_srcdir) \
    6043        $(BOOST_INCLUDE) \
    61         $(ADOLC_INCLUDE) \
    62         $(IPOPT_INCLUDE)
     44        $(ADOLC_INCLUDE)
    6345#
    64 AM_CXXFLAGS       = -g $(ADOLC_FLAGS) $(IPOPT_FLAGS) $(CXX_FLAGS)
     46AM_CXXFLAGS       = -g $(ADOLC_FLAGS) $(CXX_FLAGS)
    6547#
    66 LDADD             = $(ADOLC_LIB) $(IPOPT_LIB)
    67 AM_LDFLAGS        = $(ADOLC_LIB_DIR) $(IPOPT_LIB_DIR)
     48LDADD             = $(ADOLC_LIB)
     49AM_LDFLAGS        = $(ADOLC_LIB_DIR)
    6850#
    6951test_more_SOURCES  = \
    7052        $(ADOLC_SRC_FILES) \
    71         $(IPOPT_SRC_FILES) \
    7253        test_more.cpp \
    7354        abs.cpp \
  • trunk/test_more/makefile.in

    r1632 r1633  
    4646CONFIG_CLEAN_VPATH_FILES =
    4747PROGRAMS = $(noinst_PROGRAMS)
    48 am__test_more_SOURCES_DIST = base_adolc.cpp \
    49         ../cppad_ipopt/src/cppad_ipopt_nlp.cpp \
    50         ../cppad_ipopt/src/sparse_map2vec.cpp cppad_ipopt.cpp \
    51         test_more.cpp abs.cpp acos.cpp asin.cpp add.cpp add_eq.cpp \
    52         add_zero.cpp atan.cpp atan_2.cpp check_simple_vector.cpp \
    53         compare.cpp compare_change.cpp cond_exp.cpp cond_exp_ad.cpp \
    54         copy.cpp cos.cpp cosh.cpp dbl_epsilon.cpp div.cpp div_eq.cpp \
     48am__test_more_SOURCES_DIST = base_adolc.cpp test_more.cpp abs.cpp \
     49        acos.cpp asin.cpp add.cpp add_eq.cpp add_zero.cpp atan.cpp \
     50        atan_2.cpp check_simple_vector.cpp compare.cpp \
     51        compare_change.cpp cond_exp.cpp cond_exp_ad.cpp copy.cpp \
     52        cos.cpp cosh.cpp dbl_epsilon.cpp div.cpp div_eq.cpp \
    5553        div_zero_one.cpp erf.cpp exp.cpp for_hess.cpp \
    5654        for_sparse_jac.cpp forward.cpp from_base.cpp fun_check.cpp \
     
    6563        value.cpp vec_ad.cpp vec_ad_par.cpp vec_unary.cpp
    6664@CppAD_ADOLC_TRUE@am__objects_1 = base_adolc.$(OBJEXT)
    67 @CppAD_IPOPT_CPPAD_TRUE@am__objects_2 = cppad_ipopt_nlp.$(OBJEXT) \
    68 @CppAD_IPOPT_CPPAD_TRUE@        sparse_map2vec.$(OBJEXT) \
    69 @CppAD_IPOPT_CPPAD_TRUE@        cppad_ipopt.$(OBJEXT)
    70 am_test_more_OBJECTS = $(am__objects_1) $(am__objects_2) \
    71         test_more.$(OBJEXT) abs.$(OBJEXT) acos.$(OBJEXT) \
    72         asin.$(OBJEXT) add.$(OBJEXT) add_eq.$(OBJEXT) \
    73         add_zero.$(OBJEXT) atan.$(OBJEXT) atan_2.$(OBJEXT) \
    74         check_simple_vector.$(OBJEXT) compare.$(OBJEXT) \
    75         compare_change.$(OBJEXT) cond_exp.$(OBJEXT) \
     65am_test_more_OBJECTS = $(am__objects_1) test_more.$(OBJEXT) \
     66        abs.$(OBJEXT) acos.$(OBJEXT) asin.$(OBJEXT) add.$(OBJEXT) \
     67        add_eq.$(OBJEXT) add_zero.$(OBJEXT) atan.$(OBJEXT) \
     68        atan_2.$(OBJEXT) check_simple_vector.$(OBJEXT) \
     69        compare.$(OBJEXT) compare_change.$(OBJEXT) cond_exp.$(OBJEXT) \
    7670        cond_exp_ad.$(OBJEXT) copy.$(OBJEXT) cos.$(OBJEXT) \
    7771        cosh.$(OBJEXT) dbl_epsilon.$(OBJEXT) div.$(OBJEXT) \
     
    9589test_more_LDADD = $(LDADD)
    9690am__DEPENDENCIES_1 =
    97 @CppAD_IPOPT_CPPAD_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) \
    98 @CppAD_IPOPT_CPPAD_TRUE@        $(am__DEPENDENCIES_1) \
    99 @CppAD_IPOPT_CPPAD_TRUE@        $(am__DEPENDENCIES_1)
    100 test_more_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
     91test_more_DEPENDENCIES = $(am__DEPENDENCIES_1)
    10192DEFAULT_INCLUDES =
    10293depcomp = $(SHELL) $(top_srcdir)/depcomp
     
    132123CYGPATH_W = @CYGPATH_W@
    133124
    134 # $Id: makefile.am 1628 2010-01-20 15:04:49Z bradbell $
     125# $Id: makefile.am 1632 2010-01-23 12:19:08Z bradbell $
    135126# -----------------------------------------------------------------------------
    136127# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-10 Bradley M. Bell
     
    241232@CppAD_ADOLC_FALSE@ADOLC_FLAGS =
    242233@CppAD_ADOLC_TRUE@ADOLC_FLAGS = -DCPPAD_ADOLC_TEST
    243 @CppAD_IPOPT_CPPAD_FALSE@IPOPT_SRC_FILES =
    244 @CppAD_IPOPT_CPPAD_TRUE@IPOPT_SRC_FILES = \
    245 @CppAD_IPOPT_CPPAD_TRUE@        ../cppad_ipopt/src/cppad_ipopt_nlp.cpp \
    246 @CppAD_IPOPT_CPPAD_TRUE@        ../cppad_ipopt/src/sparse_map2vec.cpp \
    247 @CppAD_IPOPT_CPPAD_TRUE@        cppad_ipopt.cpp
    248 
    249 @CppAD_IPOPT_CPPAD_FALSE@IPOPT_EXTRA_FILES = cppad_ipopt.cpp
    250 @CppAD_IPOPT_CPPAD_TRUE@IPOPT_EXTRA_FILES =
    251 @CppAD_IPOPT_CPPAD_FALSE@IPOPT_INCLUDE =
    252 @CppAD_IPOPT_CPPAD_TRUE@IPOPT_INCLUDE = -I$(IPOPT_DIR)/include
    253 @CppAD_IPOPT_CPPAD_FALSE@IPOPT_LIB =
    254 @CppAD_IPOPT_CPPAD_TRUE@IPOPT_LIB = -lipopt $(FCLIBS) $(PTHREAD_LIB) $(DL_LIB)
    255 @CppAD_IPOPT_CPPAD_TRUE@IPOPT_LIB_DIR = -L$(IPOPT_DIR)/lib
    256 @CppAD_IPOPT_CPPAD_TRUE@IPOPT_FLAGS = -DCPPAD_IPOPT_CPPAD_TEST
    257234@CppAD_BOOSTVECTOR_FALSE@BOOST_INCLUDE =
    258235@CppAD_BOOSTVECTOR_TRUE@BOOST_INCLUDE = -I$(BOOST_DIR)
    259236#
    260237# Microsoft project files
    261 EXTRA_DIST = test_more.sln test_more.vcproj test_one.sh.in \
    262         $(IPOPT_EXTRA_FILES)
    263 
     238EXTRA_DIST = test_more.sln test_more.vcproj test_one.sh.in
    264239#
    265240AM_CPPFLAGS = -I. \
    266241        -I$(top_srcdir) \
    267242        $(BOOST_INCLUDE) \
    268         $(ADOLC_INCLUDE) \
    269         $(IPOPT_INCLUDE)
    270 
    271 #
    272 AM_CXXFLAGS = -g $(ADOLC_FLAGS) $(IPOPT_FLAGS) $(CXX_FLAGS)
    273 #
    274 LDADD = $(ADOLC_LIB) $(IPOPT_LIB)
    275 AM_LDFLAGS = $(ADOLC_LIB_DIR) $(IPOPT_LIB_DIR)
     243        $(ADOLC_INCLUDE)
     244
     245#
     246AM_CXXFLAGS = -g $(ADOLC_FLAGS) $(CXX_FLAGS)
     247#
     248LDADD = $(ADOLC_LIB)
     249AM_LDFLAGS = $(ADOLC_LIB_DIR)
    276250#
    277251test_more_SOURCES = \
    278252        $(ADOLC_SRC_FILES) \
    279         $(IPOPT_SRC_FILES) \
    280253        test_more.cpp \
    281254        abs.cpp \
     
    410383@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cos.Po@am__quote@
    411384@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cosh.Po@am__quote@
    412 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cppad_ipopt.Po@am__quote@
    413 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cppad_ipopt_nlp.Po@am__quote@
    414385@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbl_epsilon.Po@am__quote@
    415386@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/div.Po@am__quote@
     
    450421@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sparse_hessian.Po@am__quote@
    451422@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sparse_jacobian.Po@am__quote@
    452 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sparse_map2vec.Po@am__quote@
    453423@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sparse_vec_ad.Po@am__quote@
    454424@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sqrt.Po@am__quote@
     
    476446@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    477447@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    478 
    479 cppad_ipopt_nlp.o: ../cppad_ipopt/src/cppad_ipopt_nlp.cpp
    480 @am__fastdepCXX_TRUE@   $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cppad_ipopt_nlp.o -MD -MP -MF $(DEPDIR)/cppad_ipopt_nlp.Tpo -c -o cppad_ipopt_nlp.o `test -f '../cppad_ipopt/src/cppad_ipopt_nlp.cpp' || echo '$(srcdir)/'`../cppad_ipopt/src/cppad_ipopt_nlp.cpp
    481 @am__fastdepCXX_TRUE@   $(am__mv) $(DEPDIR)/cppad_ipopt_nlp.Tpo $(DEPDIR)/cppad_ipopt_nlp.Po
    482 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='../cppad_ipopt/src/cppad_ipopt_nlp.cpp' object='cppad_ipopt_nlp.o' libtool=no @AMDEPBACKSLASH@
    483 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    484 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cppad_ipopt_nlp.o `test -f '../cppad_ipopt/src/cppad_ipopt_nlp.cpp' || echo '$(srcdir)/'`../cppad_ipopt/src/cppad_ipopt_nlp.cpp
    485 
    486 cppad_ipopt_nlp.obj: ../cppad_ipopt/src/cppad_ipopt_nlp.cpp
    487 @am__fastdepCXX_TRUE@   $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cppad_ipopt_nlp.obj -MD -MP -MF $(DEPDIR)/cppad_ipopt_nlp.Tpo -c -o cppad_ipopt_nlp.obj `if test -f '../cppad_ipopt/src/cppad_ipopt_nlp.cpp'; then $(CYGPATH_W) '../cppad_ipopt/src/cppad_ipopt_nlp.cpp'; else $(CYGPATH_W) '$(srcdir)/../cppad_ipopt/src/cppad_ipopt_nlp.cpp'; fi`
    488 @am__fastdepCXX_TRUE@   $(am__mv) $(DEPDIR)/cppad_ipopt_nlp.Tpo $(DEPDIR)/cppad_ipopt_nlp.Po
    489 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='../cppad_ipopt/src/cppad_ipopt_nlp.cpp' object='cppad_ipopt_nlp.obj' libtool=no @AMDEPBACKSLASH@
    490 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    491 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cppad_ipopt_nlp.obj `if test -f '../cppad_ipopt/src/cppad_ipopt_nlp.cpp'; then $(CYGPATH_W) '../cppad_ipopt/src/cppad_ipopt_nlp.cpp'; else $(CYGPATH_W) '$(srcdir)/../cppad_ipopt/src/cppad_ipopt_nlp.cpp'; fi`
    492 
    493 sparse_map2vec.o: ../cppad_ipopt/src/sparse_map2vec.cpp
    494 @am__fastdepCXX_TRUE@   $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sparse_map2vec.o -MD -MP -MF $(DEPDIR)/sparse_map2vec.Tpo -c -o sparse_map2vec.o `test -f '../cppad_ipopt/src/sparse_map2vec.cpp' || echo '$(srcdir)/'`../cppad_ipopt/src/sparse_map2vec.cpp
    495 @am__fastdepCXX_TRUE@   $(am__mv) $(DEPDIR)/sparse_map2vec.Tpo $(DEPDIR)/sparse_map2vec.Po
    496 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='../cppad_ipopt/src/sparse_map2vec.cpp' object='sparse_map2vec.o' libtool=no @AMDEPBACKSLASH@
    497 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    498 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sparse_map2vec.o `test -f '../cppad_ipopt/src/sparse_map2vec.cpp' || echo '$(srcdir)/'`../cppad_ipopt/src/sparse_map2vec.cpp
    499 
    500 sparse_map2vec.obj: ../cppad_ipopt/src/sparse_map2vec.cpp
    501 @am__fastdepCXX_TRUE@   $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sparse_map2vec.obj -MD -MP -MF $(DEPDIR)/sparse_map2vec.Tpo -c -o sparse_map2vec.obj `if test -f '../cppad_ipopt/src/sparse_map2vec.cpp'; then $(CYGPATH_W) '../cppad_ipopt/src/sparse_map2vec.cpp'; else $(CYGPATH_W) '$(srcdir)/../cppad_ipopt/src/sparse_map2vec.cpp'; fi`
    502 @am__fastdepCXX_TRUE@   $(am__mv) $(DEPDIR)/sparse_map2vec.Tpo $(DEPDIR)/sparse_map2vec.Po
    503 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='../cppad_ipopt/src/sparse_map2vec.cpp' object='sparse_map2vec.obj' libtool=no @AMDEPBACKSLASH@
    504 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    505 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sparse_map2vec.obj `if test -f '../cppad_ipopt/src/sparse_map2vec.cpp'; then $(CYGPATH_W) '../cppad_ipopt/src/sparse_map2vec.cpp'; else $(CYGPATH_W) '$(srcdir)/../cppad_ipopt/src/sparse_map2vec.cpp'; fi`
    506448
    507449ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  • trunk/test_more/test_more.cpp

    r1628 r1633  
    11/* $Id$ */
    22/* --------------------------------------------------------------------------
    3 CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-09 Bradley M. Bell
     3CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-10 Bradley M. Bell
    44
    55CppAD is distributed under multiple licenses. This distribution is under
     
    2323extern bool AddEq(void);
    2424extern bool AddZero(void);
    25 extern bool cppad_ipopt(void);
    2625extern bool Asin(void);
    2726extern bool Atan(void);
     
    185184        ok &= Run( base_adolc,      "base_adolc"     );
    186185# endif
    187 # ifdef CPPAD_IPOPT_CPPAD_TEST
    188         ok &= Run( cppad_ipopt,     "cppad_ipopt"    );
    189 # endif
    190186
    191187        // check for errors
Note: See TracChangeset for help on using the changeset viewer.