Changeset 1626 for trunk/test_more


Ignore:
Timestamp:
Jan 18, 2010 2:27:35 PM (10 years ago)
Author:
bradbell
Message:

trunk: Split the ipopt_cppad directory into sub-directories.

check_*.sh: change where referencing ipopt_cppad files.
configure: changes automatically generated by automake and autoconf.
ipopt_cppad_nlp.hpp: move to src/ipopt_cppad.hpp
ipopt_cppad_nlp.cpp: move to src/ipopt_cppad.cpp
ipopt_ode_run.hpp: move to example/ode_run.hpp
*/makefile.in: new makefile.in automatically generated from */makefile.am
ipopt_ode_check.cpp: move to example/ode_check.cpp
ipopt_cppad.sln: move to example/example.sln
ipopt_get_started.cpp: move to example/get_started.cpp
ipopt_ode_simple.cpp: move to example/ode_simple.cpp
makefile.am split into example/makefile.am and speed/makefile.am
ipopt_cppad_windows.bat: move to example/example_windows.bat.
ipopt_ode_fast.cpp: move to example/ode_fast.cpp
ipopt_cppad_ode1.omh: move to example/ode1.omh
ipopt_cppad_ode2.omh: move to example/ode2.omh
ipopt_cppad.cpp: move to example/example.cpp
ipopt_cppad.vcproj move to example/example.vcproj
ipopt_ode_problem.hpp: move to example/ode_problem.hpp
ipopt_ode_speed.cpp: move to example/ode_speed.cpp
configure.ac: replace ipopt_cppad/makefile by two new makefiles.
build.sh: change references to ipopt_cppad.
whats_new_10.omh: user's view of the changes.
example_list.omh: change location for the ipopt_cppad example.
test_more/ipopt_cppad.cpp: reference ipopt_cppad_nlp.hpp from new location.

Location:
trunk/test_more
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/test_more/ipopt_cppad.cpp

    r1401 r1626  
    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
     
    1111-------------------------------------------------------------------------- */
    1212
    13 # include "../ipopt_cppad/ipopt_cppad_nlp.hpp"
     13# include "../ipopt_cppad/src/ipopt_cppad_nlp.hpp"
    1414
    1515namespace { // Begin empty namespace
  • trunk/test_more/makefile.am

    r1611 r1626  
    11# $Id$
    22# -----------------------------------------------------------------------------
    3 # CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-09 Bradley M. Bell
     3# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-10 Bradley M. Bell
    44#
    55# CppAD is distributed under multiple licenses. This distribution is under
     
    2929endif
    3030if CppAD_IPOPT_CPPAD
    31 IPOPT_SRC_FILES   = ../ipopt_cppad/ipopt_cppad_nlp.cpp ipopt_cppad.cpp
     31IPOPT_SRC_FILES   = ../ipopt_cppad/src/ipopt_cppad_nlp.cpp ipopt_cppad.cpp
    3232IPOPT_EXTRA_FILES =
    3333IPOPT_INCLUDE     = -I$(IPOPT_DIR)/include
  • trunk/test_more/makefile.in

    r1613 r1626  
    4747PROGRAMS = $(noinst_PROGRAMS)
    4848am__test_more_SOURCES_DIST = base_adolc.cpp \
    49         ../ipopt_cppad/ipopt_cppad_nlp.cpp ipopt_cppad.cpp \
     49        ../ipopt_cppad/src/ipopt_cppad_nlp.cpp ipopt_cppad.cpp \
    5050        test_more.cpp abs.cpp acos.cpp asin.cpp add.cpp add_eq.cpp \
    5151        add_zero.cpp atan.cpp atan_2.cpp check_simple_vector.cpp \
     
    240240@CppAD_ADOLC_TRUE@ADOLC_FLAGS = -DCPPAD_ADOLC_TEST
    241241@CppAD_IPOPT_CPPAD_FALSE@IPOPT_SRC_FILES =
    242 @CppAD_IPOPT_CPPAD_TRUE@IPOPT_SRC_FILES = ../ipopt_cppad/ipopt_cppad_nlp.cpp ipopt_cppad.cpp
     242@CppAD_IPOPT_CPPAD_TRUE@IPOPT_SRC_FILES = ../ipopt_cppad/src/ipopt_cppad_nlp.cpp ipopt_cppad.cpp
    243243@CppAD_IPOPT_CPPAD_FALSE@IPOPT_EXTRA_FILES = ipopt_cppad.cpp
    244244@CppAD_IPOPT_CPPAD_TRUE@IPOPT_EXTRA_FILES =
     
    470470@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    471471
    472 ipopt_cppad_nlp.o: ../ipopt_cppad/ipopt_cppad_nlp.cpp
    473 @am__fastdepCXX_TRUE@   $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ipopt_cppad_nlp.o -MD -MP -MF $(DEPDIR)/ipopt_cppad_nlp.Tpo -c -o ipopt_cppad_nlp.o `test -f '../ipopt_cppad/ipopt_cppad_nlp.cpp' || echo '$(srcdir)/'`../ipopt_cppad/ipopt_cppad_nlp.cpp
     472ipopt_cppad_nlp.o: ../ipopt_cppad/src/ipopt_cppad_nlp.cpp
     473@am__fastdepCXX_TRUE@   $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ipopt_cppad_nlp.o -MD -MP -MF $(DEPDIR)/ipopt_cppad_nlp.Tpo -c -o ipopt_cppad_nlp.o `test -f '../ipopt_cppad/src/ipopt_cppad_nlp.cpp' || echo '$(srcdir)/'`../ipopt_cppad/src/ipopt_cppad_nlp.cpp
    474474@am__fastdepCXX_TRUE@   $(am__mv) $(DEPDIR)/ipopt_cppad_nlp.Tpo $(DEPDIR)/ipopt_cppad_nlp.Po
    475 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='../ipopt_cppad/ipopt_cppad_nlp.cpp' object='ipopt_cppad_nlp.o' libtool=no @AMDEPBACKSLASH@
     475@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='../ipopt_cppad/src/ipopt_cppad_nlp.cpp' object='ipopt_cppad_nlp.o' libtool=no @AMDEPBACKSLASH@
    476476@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    477 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ipopt_cppad_nlp.o `test -f '../ipopt_cppad/ipopt_cppad_nlp.cpp' || echo '$(srcdir)/'`../ipopt_cppad/ipopt_cppad_nlp.cpp
    478 
    479 ipopt_cppad_nlp.obj: ../ipopt_cppad/ipopt_cppad_nlp.cpp
    480 @am__fastdepCXX_TRUE@   $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ipopt_cppad_nlp.obj -MD -MP -MF $(DEPDIR)/ipopt_cppad_nlp.Tpo -c -o ipopt_cppad_nlp.obj `if test -f '../ipopt_cppad/ipopt_cppad_nlp.cpp'; then $(CYGPATH_W) '../ipopt_cppad/ipopt_cppad_nlp.cpp'; else $(CYGPATH_W) '$(srcdir)/../ipopt_cppad/ipopt_cppad_nlp.cpp'; fi`
     477@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ipopt_cppad_nlp.o `test -f '../ipopt_cppad/src/ipopt_cppad_nlp.cpp' || echo '$(srcdir)/'`../ipopt_cppad/src/ipopt_cppad_nlp.cpp
     478
     479ipopt_cppad_nlp.obj: ../ipopt_cppad/src/ipopt_cppad_nlp.cpp
     480@am__fastdepCXX_TRUE@   $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ipopt_cppad_nlp.obj -MD -MP -MF $(DEPDIR)/ipopt_cppad_nlp.Tpo -c -o ipopt_cppad_nlp.obj `if test -f '../ipopt_cppad/src/ipopt_cppad_nlp.cpp'; then $(CYGPATH_W) '../ipopt_cppad/src/ipopt_cppad_nlp.cpp'; else $(CYGPATH_W) '$(srcdir)/../ipopt_cppad/src/ipopt_cppad_nlp.cpp'; fi`
    481481@am__fastdepCXX_TRUE@   $(am__mv) $(DEPDIR)/ipopt_cppad_nlp.Tpo $(DEPDIR)/ipopt_cppad_nlp.Po
    482 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='../ipopt_cppad/ipopt_cppad_nlp.cpp' object='ipopt_cppad_nlp.obj' libtool=no @AMDEPBACKSLASH@
     482@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='../ipopt_cppad/src/ipopt_cppad_nlp.cpp' object='ipopt_cppad_nlp.obj' libtool=no @AMDEPBACKSLASH@
    483483@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 ipopt_cppad_nlp.obj `if test -f '../ipopt_cppad/ipopt_cppad_nlp.cpp'; then $(CYGPATH_W) '../ipopt_cppad/ipopt_cppad_nlp.cpp'; else $(CYGPATH_W) '$(srcdir)/../ipopt_cppad/ipopt_cppad_nlp.cpp'; fi`
     484@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ipopt_cppad_nlp.obj `if test -f '../ipopt_cppad/src/ipopt_cppad_nlp.cpp'; then $(CYGPATH_W) '../ipopt_cppad/src/ipopt_cppad_nlp.cpp'; else $(CYGPATH_W) '$(srcdir)/../ipopt_cppad/src/ipopt_cppad_nlp.cpp'; fi`
    485485
    486486ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
Note: See TracChangeset for help on using the changeset viewer.