Changeset 1632 for trunk/test_more


Ignore:
Timestamp:
Jan 23, 2010 7:19:08 AM (10 years ago)
Author:
bradbell
Message:

/home/bradbell/cppad/trunk: Separate and document creation of Ipopt sparsity structure.

svn_status.sh: remove cppad_ipopt example and speed executables from status.
check_doxygen.sh: add sparse_map2vec.* to list to check for warnings.
doxyfile.in: add cppad_ipopt/src to search path.
sparse_map2vec.*: doxygen documented routine that creates ipopt sparsity info.
cppad_ipopt_nlp.*: replace compute_structure_h_lag by sparse_map2vec call.
makefile.*: add sparse_map2cpp.* to source code.
check_svn_dist.sh: make work if parent directory is CppAD or cppad.

Location:
trunk/test_more
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/test_more/makefile.am

    r1628 r1632  
    2929endif
    3030if CppAD_IPOPT_CPPAD
    31 IPOPT_SRC_FILES   = ../cppad_ipopt/src/cppad_ipopt_nlp.cpp cppad_ipopt.cpp
     31IPOPT_SRC_FILES   = \
     32        ../cppad_ipopt/src/cppad_ipopt_nlp.cpp \
     33        ../cppad_ipopt/src/sparse_map2vec.cpp \
     34        cppad_ipopt.cpp
    3235IPOPT_EXTRA_FILES =
    3336IPOPT_INCLUDE     = -I$(IPOPT_DIR)/include
  • trunk/test_more/makefile.in

    r1630 r1632  
    4747PROGRAMS = $(noinst_PROGRAMS)
    4848am__test_more_SOURCES_DIST = base_adolc.cpp \
    49         ../cppad_ipopt/src/cppad_ipopt_nlp.cpp cppad_ipopt.cpp \
     49        ../cppad_ipopt/src/cppad_ipopt_nlp.cpp \
     50        ../cppad_ipopt/src/sparse_map2vec.cpp cppad_ipopt.cpp \
    5051        test_more.cpp abs.cpp acos.cpp asin.cpp add.cpp add_eq.cpp \
    5152        add_zero.cpp atan.cpp atan_2.cpp check_simple_vector.cpp \
     
    6566@CppAD_ADOLC_TRUE@am__objects_1 = base_adolc.$(OBJEXT)
    6667@CppAD_IPOPT_CPPAD_TRUE@am__objects_2 = cppad_ipopt_nlp.$(OBJEXT) \
     68@CppAD_IPOPT_CPPAD_TRUE@        sparse_map2vec.$(OBJEXT) \
    6769@CppAD_IPOPT_CPPAD_TRUE@        cppad_ipopt.$(OBJEXT)
    6870am_test_more_OBJECTS = $(am__objects_1) $(am__objects_2) \
     
    240242@CppAD_ADOLC_TRUE@ADOLC_FLAGS = -DCPPAD_ADOLC_TEST
    241243@CppAD_IPOPT_CPPAD_FALSE@IPOPT_SRC_FILES =
    242 @CppAD_IPOPT_CPPAD_TRUE@IPOPT_SRC_FILES = ../cppad_ipopt/src/cppad_ipopt_nlp.cpp cppad_ipopt.cpp
     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
    243249@CppAD_IPOPT_CPPAD_FALSE@IPOPT_EXTRA_FILES = cppad_ipopt.cpp
    244250@CppAD_IPOPT_CPPAD_TRUE@IPOPT_EXTRA_FILES =
     
    444450@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sparse_hessian.Po@am__quote@
    445451@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@
    446453@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sparse_vec_ad.Po@am__quote@
    447454@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sqrt.Po@am__quote@
     
    483490@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    484491@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
     493sparse_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
     500sparse_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`
    485506
    486507ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
Note: See TracChangeset for help on using the changeset viewer.