Changeset 1633 for trunk/test_more


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/test_more
Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • 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.