Changeset 1401 for trunk/test_more


Ignore:
Timestamp:
Jun 24, 2009 1:56:51 PM (11 years ago)
Author:
bradbell
Message:

trunk: Merge in changes from branches/sweep.

Location:
trunk/test_more
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/test_more/ipopt_cppad.cpp

    r1370 r1401  
    11/* $Id$ */
    22/* --------------------------------------------------------------------------
    3 CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-08 Bradley M. Bell
     3CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-09 Bradley M. Bell
    44
    55CppAD is distributed under multiple licenses. This distribution is under
     
    7878
    7979        // turn off any printing
    80         app->Options()->SetIntegerValue("print_level", -2);
     80        app->Options()->SetIntegerValue("print_level", 0);
    8181
    8282        // maximum number of iterations
     
    240240
    241241                // turn off any printing
    242                 app->Options()->SetIntegerValue("print_level", -2);
     242                app->Options()->SetIntegerValue("print_level", 0);
    243243
    244244                // maximum number of iterations
     
    400400
    401401        // turn off any printing
    402         app->Options()->SetIntegerValue("print_level", -2);
     402        app->Options()->SetIntegerValue("print_level", 0);
    403403
    404404        // approximate accuracy in first order necessary conditions;
  • trunk/test_more/makefile.in

    r1374 r1401  
    1 # makefile.in generated by automake 1.10.1 from makefile.am.
     1# makefile.in generated by automake 1.11 from makefile.am.
    22# @configure_input@
    33
    44# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
    5 # 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
     5# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
     6# Inc.
    67# This Makefile.in is free software; the Free Software Foundation
    78# gives unlimited permission to copy and/or distribute it,
     
    1718VPATH = @srcdir@
    1819pkgdatadir = $(datadir)/@PACKAGE@
     20pkgincludedir = $(includedir)/@PACKAGE@
    1921pkglibdir = $(libdir)/@PACKAGE@
    20 pkgincludedir = $(includedir)/@PACKAGE@
     22pkglibexecdir = $(libexecdir)/@PACKAGE@
    2123am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
    2224install_sh_DATA = $(install_sh) -c -m 644
     
    4244CONFIG_HEADER = $(top_builddir)/cppad/config.h
    4345CONFIG_CLEAN_FILES = test_one.sh
     46CONFIG_CLEAN_VPATH_FILES =
    4447PROGRAMS = $(noinst_PROGRAMS)
    4548am__test_more_SOURCES_DIST = base_adolc.cpp \
     
    9497depcomp = $(SHELL) $(top_srcdir)/depcomp
    9598am__depfiles_maybe = depfiles
     99am__mv = mv -f
    96100CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    97101        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
     
    218222sysconfdir = @sysconfdir@
    219223target_alias = @target_alias@
     224top_build_prefix = @top_build_prefix@
    220225top_builddir = @top_builddir@
    221226top_srcdir = @top_srcdir@
     
    334339          case '$(am__configure_deps)' in \
    335340            *$$dep*) \
    336               cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
    337                 && exit 0; \
     341              ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
     342                && { if test -f $@; then exit 0; else break; fi; }; \
    338343              exit 1;; \
    339344          esac; \
    340345        done; \
    341         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  test_more/makefile'; \
    342         cd $(top_srcdir) && \
    343           $(AUTOMAKE) --gnu  test_more/makefile
     346        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test_more/makefile'; \
     347        $(am__cd) $(top_srcdir) && \
     348          $(AUTOMAKE) --gnu test_more/makefile
    344349.PRECIOUS: makefile
    345350makefile: $(srcdir)/makefile.in $(top_builddir)/config.status
     
    359364$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
    360365        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
     366$(am__aclocal_m4_deps):
    361367test_one.sh: $(top_builddir)/config.status $(srcdir)/test_one.sh.in
    362368        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
     
    441447.cpp.o:
    442448@am__fastdepCXX_TRUE@   $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
    443 @am__fastdepCXX_TRUE@   mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
     449@am__fastdepCXX_TRUE@   $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
    444450@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    445451@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     
    448454.cpp.obj:
    449455@am__fastdepCXX_TRUE@   $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
    450 @am__fastdepCXX_TRUE@   mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
     456@am__fastdepCXX_TRUE@   $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
    451457@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    452458@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     
    455461ipopt_cppad_nlp.o: ../ipopt_cppad/ipopt_cppad_nlp.cpp
    456462@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
    457 @am__fastdepCXX_TRUE@   mv -f $(DEPDIR)/ipopt_cppad_nlp.Tpo $(DEPDIR)/ipopt_cppad_nlp.Po
     463@am__fastdepCXX_TRUE@   $(am__mv) $(DEPDIR)/ipopt_cppad_nlp.Tpo $(DEPDIR)/ipopt_cppad_nlp.Po
    458464@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='../ipopt_cppad/ipopt_cppad_nlp.cpp' object='ipopt_cppad_nlp.o' libtool=no @AMDEPBACKSLASH@
    459465@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     
    462468ipopt_cppad_nlp.obj: ../ipopt_cppad/ipopt_cppad_nlp.cpp
    463469@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`
    464 @am__fastdepCXX_TRUE@   mv -f $(DEPDIR)/ipopt_cppad_nlp.Tpo $(DEPDIR)/ipopt_cppad_nlp.Po
     470@am__fastdepCXX_TRUE@   $(am__mv) $(DEPDIR)/ipopt_cppad_nlp.Tpo $(DEPDIR)/ipopt_cppad_nlp.Po
    465471@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='../ipopt_cppad/ipopt_cppad_nlp.cpp' object='ipopt_cppad_nlp.obj' libtool=no @AMDEPBACKSLASH@
    466472@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     
    472478            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
    473479          done | \
    474           $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
     480          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
    475481              END { if (nonempty) { for (i in files) print i; }; }'`; \
    476482        mkid -fID $$unique
     
    479485TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
    480486                $(TAGS_FILES) $(LISP)
    481         tags=; \
     487        set x; \
    482488        here=`pwd`; \
    483489        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
     
    487493          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
    488494              END { if (nonempty) { for (i in files) print i; }; }'`; \
    489         if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
     495        shift; \
     496        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
    490497          test -n "$$unique" || unique=$$empty_fix; \
    491           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
    492             $$tags $$unique; \
     498          if test $$# -gt 0; then \
     499            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     500              "$$@" $$unique; \
     501          else \
     502            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     503              $$unique; \
     504          fi; \
    493505        fi
    494506ctags: CTAGS
    495507CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
    496508                $(TAGS_FILES) $(LISP)
    497         tags=; \
    498509        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
    499510        unique=`for i in $$list; do \
     
    502513          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
    503514              END { if (nonempty) { for (i in files) print i; }; }'`; \
    504         test -z "$(CTAGS_ARGS)$$tags$$unique" \
     515        test -z "$(CTAGS_ARGS)$$unique" \
    505516          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
    506              $$tags $$unique
     517             $$unique
    507518
    508519GTAGS:
    509520        here=`$(am__cd) $(top_builddir) && pwd` \
    510           && cd $(top_srcdir) \
    511           && gtags -i $(GTAGS_ARGS) $$here
     521          && $(am__cd) $(top_srcdir) \
     522          && gtags -i $(GTAGS_ARGS) "$$here"
    512523
    513524distclean-tags:
     
    530541          if test -d $$d/$$file; then \
    531542            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
     543            if test -d "$(distdir)/$$file"; then \
     544              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
     545            fi; \
    532546            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
    533               cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
     547              cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
     548              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
    534549            fi; \
    535             cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
     550            cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
    536551          else \
    537             test -f $(distdir)/$$file \
    538             || cp -p $$d/$$file $(distdir)/$$file \
     552            test -f "$(distdir)/$$file" \
     553            || cp -p $$d/$$file "$(distdir)/$$file" \
    539554            || exit 1; \
    540555          fi; \
     
    564579distclean-generic:
    565580        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
     581        -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
    566582
    567583maintainer-clean-generic:
     
    584600html: html-am
    585601
     602html-am:
     603
    586604info: info-am
    587605
     
    592610install-dvi: install-dvi-am
    593611
     612install-dvi-am:
     613
    594614install-exec-am:
    595615
    596616install-html: install-html-am
    597617
     618install-html-am:
     619
    598620install-info: install-info-am
    599621
     622install-info-am:
     623
    600624install-man:
    601625
    602626install-pdf: install-pdf-am
    603627
     628install-pdf-am:
     629
    604630install-ps: install-ps-am
     631
     632install-ps-am:
    605633
    606634installcheck-am:
     
    640668        uninstall-am
    641669
     670
    642671# Tell versions [3.59,3.63) of GNU make to not export all variables.
    643672# Otherwise a system limit (for SysV at least) may be exceeded.
  • trunk/test_more/test_more.cpp

    r1370 r1401  
    11/* $Id$ */
    22/* --------------------------------------------------------------------------
    3 CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-08 Bradley M. Bell
     3CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-09 Bradley M. Bell
    44
    55CppAD is distributed under multiple licenses. This distribution is under
     
    8585        static size_t Run_ok_count    = 0;
    8686        static size_t Run_error_count = 0;
    87         bool Run(bool TestOk(void), const char *name)
    88         {       bool ok = true;
    89                 using namespace std;
    90        
     87        bool Run(bool TestOk(void), std::string name)
     88        {       bool ok      = true;
     89                size_t width =  20;         
     90                std::cout.width( width );
     91                std::cout.setf( std::ios_base::left );
     92                std::cout << name;
     93                //
     94                ok &= name.size() < width;
    9195                ok &= TestOk();
    92        
    9396                if( ok )
    94                 {       std::cout << "Ok:    " << name << std::endl;
     97                {       std::cout << "OK" << std::endl;
    9598                        Run_ok_count++;
    9699                }
    97100                else
    98                 {       std::cout << "Error: " << name << std::endl;
     101                {       std::cout << "Error" << std::endl;
    99102                        Run_error_count++;
    100103                }
    101        
    102104                return ok;
    103105        }
Note: See TracChangeset for help on using the changeset viewer.