Changeset 3679


Ignore:
Timestamp:
May 5, 2015 3:10:59 PM (5 years ago)
Author:
bradbell
Message:

merge to branch: trunk
from repository: https://github.com/coin-or/CppAD
start hash code: 5e2f77aac80262cd007effafcc48ecf2d313e467
end hash code: 071875a4beba3363e5fa9752426aec4762cd1caa

commit 071875a4beba3363e5fa9752426aec4762cd1caa
Author: Brad Bell <bradbell@…>
Date: Tue May 5 12:03:54 2015 -0700

Corrections to previous edit of test_one.sh.in.

commit 7c2bedb5c54ecca1727514bfc4ef457dcff83e9d
Author: Brad Bell <bradbell@…>
Date: Tue May 5 11:54:49 2015 -0700

Fix the Auto-tools build as follows:

  1. Include asinh files in auto-tools distribution and build.
  2. Update auto-tools for including cppad_compiler_has_asinh flag (as false).
  3. Convert from automake 1.13.4 to automake 1.14.1.


acos_forward.omh: add theory for acosh.

Location:
trunk
Files:
1 added
34 edited

Legend:

Unmodified
Added
Removed
  • trunk/compare_c/makefile.in

    r3650 r3679  
    1 # makefile.in generated by automake 1.13.4 from makefile.am.
     1# makefile.in generated by automake 1.14.1 from makefile.am.
    22# @configure_input@
    33
     
    265265cppad_SOURCE_DIR = @cppad_SOURCE_DIR@
    266266cppad_boostvector = @cppad_boostvector@
     267cppad_compiler_has_asinh = @cppad_compiler_has_asinh@
    267268cppad_compiler_has_erf = @cppad_compiler_has_erf@
    268269cppad_cppadvector = @cppad_cppadvector@
  • trunk/configure

    r3653 r3679  
    667667GREP
    668668CPP
     669cppad_compiler_has_asinh
    669670cppad_compiler_has_erf
    670671cppad_has_cstdint_8_to_64
     
    26502651
    26512652
    2652 am__api_version='1.13'
     2653am__api_version='1.14'
    26532654
    26542655ac_aux_dir=
     
    31773178
    31783179
     3180# POSIX will say in a future version that running "rm -f" with no argument
     3181# is OK; and we want to be able to make that assumption in our Makefile
     3182# recipes.  So use an aggressive probe to check that the usage we want is
     3183# actually supported "in the wild" to an acceptable degree.
     3184# See automake bug#10828.
     3185# To make any issue more visible, cause the running configure to be aborted
     3186# by default if the 'rm' program in use doesn't match our expectations; the
     3187# user can still override this though.
     3188if rm -f && rm -fr && rm -rf; then : OK; else
     3189  cat >&2 <<'END'
     3190Oops!
     3191
     3192Your 'rm' program seems unable to run without file operands specified
     3193on the command line, even when the '-f' option is present.  This is contrary
     3194to the behaviour of most rm programs out there, and not conforming with
     3195the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
     3196
     3197Please tell bug-automake@gnu.org about your system, including the value
     3198of your $PATH and any error possibly output before this message.  This
     3199can help us improve future automake versions.
     3200
     3201END
     3202  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
     3203    echo 'Configuration will proceed anyway, since you have set the' >&2
     3204    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
     3205    echo >&2
     3206  else
     3207    cat >&2 <<'END'
     3208Aborting the configuration process, to ensure you take notice of the issue.
     3209
     3210You can download and install GNU coreutils to get an 'rm' implementation
     3211that behaves properly: <http://www.gnu.org/software/coreutils/>.
     3212
     3213If you want to complete the configuration process using your problematic
     3214'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
     3215to "yes", and re-run configure.
     3216
     3217END
     3218    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
     3219  fi
     3220fi
    31793221
    31803222{ $as_echo "$as_me:${as_lineno-$LINENO}: *** Check command line arguments that are longer used ****" >&5
     
    47874829ac_compiler_gnu=$ac_cv_c_compiler_gnu
    47884830
     4831ac_ext=c
     4832ac_cpp='$CPP $CPPFLAGS'
     4833ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     4834ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     4835ac_compiler_gnu=$ac_cv_c_compiler_gnu
     4836{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
     4837$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
     4838if ${am_cv_prog_cc_c_o+:} false; then :
     4839  $as_echo_n "(cached) " >&6
     4840else
     4841  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     4842/* end confdefs.h.  */
     4843
     4844int
     4845main ()
     4846{
     4847
     4848  ;
     4849  return 0;
     4850}
     4851_ACEOF
     4852  # Make sure it works both with $CC and with simple cc.
     4853  # Following AC_PROG_CC_C_O, we do the test twice because some
     4854  # compilers refuse to overwrite an existing .o file with -o,
     4855  # though they will create one.
     4856  am_cv_prog_cc_c_o=yes
     4857  for am_i in 1 2; do
     4858    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
     4859   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
     4860   ac_status=$?
     4861   echo "$as_me:$LINENO: \$? = $ac_status" >&5
     4862   (exit $ac_status); } \
     4863         && test -f conftest2.$ac_objext; then
     4864      : OK
     4865    else
     4866      am_cv_prog_cc_c_o=no
     4867      break
     4868    fi
     4869  done
     4870  rm -f core conftest*
     4871  unset am_i
     4872fi
     4873{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
     4874$as_echo "$am_cv_prog_cc_c_o" >&6; }
     4875if test "$am_cv_prog_cc_c_o" != yes; then
     4876   # Losing compiler, so override with the script.
     4877   # FIXME: It is wrong to rewrite CC.
     4878   # But if we don't then we get into trouble of one sort or another.
     4879   # A longer-term fix would be to have automake use am__CC in this case,
     4880   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
     4881   CC="$am_aux_dir/compile $CC"
     4882fi
     4883ac_ext=c
     4884ac_cpp='$CPP $CPPFLAGS'
     4885ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     4886ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     4887ac_compiler_gnu=$ac_cv_c_compiler_gnu
     4888
     4889
    47894890depcc="$CC"   am_compiler_list=
    47904891
     
    52855386  $as_echo_n "(cached) " >&6
    52865387else
    5287   am_cv_ar_interface=ar
     5388  ac_ext=c
     5389ac_cpp='$CPP $CPPFLAGS'
     5390ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     5391ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     5392ac_compiler_gnu=$ac_cv_c_compiler_gnu
     5393
     5394   am_cv_ar_interface=ar
    52885395   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    52895396/* end confdefs.h.  */
     
    53165423fi
    53175424rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     5425   ac_ext=c
     5426ac_cpp='$CPP $CPPFLAGS'
     5427ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     5428ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     5429ac_compiler_gnu=$ac_cv_c_compiler_gnu
    53185430
    53195431fi
     
    53645476
    53655477cppad_compiler_has_erf=0
     5478
     5479cppad_compiler_has_asinh=0
    53665480
    53675481
  • trunk/configure.ac

    r3653 r3679  
    11dnl $Id$
    22dnl ---------------------------------------------------------------------------
    3 dnl CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-14 Bradley M. Bell
     3dnl CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-15 Bradley M. Bell
    44dnl
    55dnl CppAD is distributed under multiple licenses. This distribution is under
     
    493493AC_SUBST(cppad_has_cstdint_8_to_64, 0)
    494494AC_SUBST(cppad_compiler_has_erf, 0)
     495AC_SUBST(cppad_compiler_has_asinh, 0)
    495496
    496497dnl Determine if size_t has same size as unsigned int
  • trunk/cppad_ipopt/example/makefile.in

    r3650 r3679  
    1 # makefile.in generated by automake 1.13.4 from makefile.am.
     1# makefile.in generated by automake 1.14.1 from makefile.am.
    22# @configure_input@
    33
     
    280280cppad_SOURCE_DIR = @cppad_SOURCE_DIR@
    281281cppad_boostvector = @cppad_boostvector@
     282cppad_compiler_has_asinh = @cppad_compiler_has_asinh@
    282283cppad_compiler_has_erf = @cppad_compiler_has_erf@
    283284cppad_cppadvector = @cppad_cppadvector@
  • trunk/cppad_ipopt/speed/makefile.in

    r3650 r3679  
    1 # makefile.in generated by automake 1.13.4 from makefile.am.
     1# makefile.in generated by automake 1.14.1 from makefile.am.
    22# @configure_input@
    33
     
    282282cppad_SOURCE_DIR = @cppad_SOURCE_DIR@
    283283cppad_boostvector = @cppad_boostvector@
     284cppad_compiler_has_asinh = @cppad_compiler_has_asinh@
    284285cppad_compiler_has_erf = @cppad_compiler_has_erf@
    285286cppad_cppadvector = @cppad_cppadvector@
  • trunk/cppad_ipopt/src/makefile.in

    r3650 r3679  
    1 # makefile.in generated by automake 1.13.4 from makefile.am.
     1# makefile.in generated by automake 1.14.1 from makefile.am.
    22# @configure_input@
    33
     
    318318cppad_SOURCE_DIR = @cppad_SOURCE_DIR@
    319319cppad_boostvector = @cppad_boostvector@
     320cppad_compiler_has_asinh = @cppad_compiler_has_asinh@
    320321cppad_compiler_has_erf = @cppad_compiler_has_erf@
    321322cppad_cppadvector = @cppad_cppadvector@
  • trunk/cppad_ipopt/test/makefile.in

    r3650 r3679  
    1 # makefile.in generated by automake 1.13.4 from makefile.am.
     1# makefile.in generated by automake 1.14.1 from makefile.am.
    22# @configure_input@
    33
     
    268268cppad_SOURCE_DIR = @cppad_SOURCE_DIR@
    269269cppad_boostvector = @cppad_boostvector@
     270cppad_compiler_has_asinh = @cppad_compiler_has_asinh@
    270271cppad_compiler_has_erf = @cppad_compiler_has_erf@
    271272cppad_cppadvector = @cppad_cppadvector@
  • trunk/example/atomic/makefile.in

    r3650 r3679  
    1 # makefile.in generated by automake 1.13.4 from makefile.am.
     1# makefile.in generated by automake 1.14.1 from makefile.am.
    22# @configure_input@
    33
     
    279279cppad_SOURCE_DIR = @cppad_SOURCE_DIR@
    280280cppad_boostvector = @cppad_boostvector@
     281cppad_compiler_has_asinh = @cppad_compiler_has_asinh@
    281282cppad_compiler_has_erf = @cppad_compiler_has_erf@
    282283cppad_cppadvector = @cppad_cppadvector@
  • trunk/example/ipopt_solve/makefile.in

    r3650 r3679  
    1 # makefile.in generated by automake 1.13.4 from makefile.am.
     1# makefile.in generated by automake 1.14.1 from makefile.am.
    22# @configure_input@
    33
     
    267267cppad_SOURCE_DIR = @cppad_SOURCE_DIR@
    268268cppad_boostvector = @cppad_boostvector@
     269cppad_compiler_has_asinh = @cppad_compiler_has_asinh@
    269270cppad_compiler_has_erf = @cppad_compiler_has_erf@
    270271cppad_cppadvector = @cppad_cppadvector@
  • trunk/example/makefile.am

    r3651 r3679  
    9292        ad_output.cpp \
    9393        asin.cpp \
     94        asinh.cpp \
    9495        atan.cpp \
    9596        atan2.cpp \
  • trunk/example/makefile.in

    r3652 r3679  
    1 # makefile.in generated by automake 1.13.4 from makefile.am.
     1# makefile.in generated by automake 1.14.1 from makefile.am.
    22# @configure_input@
    33
     
    105105        example.cpp abort_recording.cpp abs.cpp acos.cpp add.cpp \
    106106        add_eq.cpp ad_assign.cpp ad_ctor.cpp ad_fun.cpp ad_in_c.cpp \
    107         ad_input.cpp ad_output.cpp asin.cpp atan.cpp atan2.cpp \
    108         base_alloc.hpp base_require.cpp bender_quad.cpp bool_fun.cpp \
    109         capacity_order.cpp change_const.cpp check_for_nan.cpp \
    110         check_numeric_type.cpp check_simple_vector.cpp compare.cpp \
    111         compare_change.cpp complex_poly.cpp cond_exp.cpp conj_grad.cpp \
    112         cos.cpp cosh.cpp cppad_vector.cpp div.cpp div_eq.cpp \
    113         equal_op_seq.cpp erf.cpp error_handler.cpp exp.cpp for_one.cpp \
    114         for_two.cpp forward.cpp forward_dir.cpp forward_order.cpp \
    115         for_sparse_jac.cpp fun_assign.cpp fun_check.cpp \
    116         hes_lagrangian.cpp hes_lu_det.cpp hes_minor_det.cpp \
    117         hessian.cpp hes_times_dir.cpp independent.cpp index_sort.cpp \
    118         integer.cpp interface2c.cpp interp_onetape.cpp \
    119         interp_retape.cpp jac_lu_det.cpp jac_minor_det.cpp \
    120         jacobian.cpp limits.cpp log.cpp log10.cpp lu_factor.cpp \
    121         lu_invert.cpp lu_ratio.cpp lu_solve.cpp lu_vec_ad.cpp \
    122         lu_vec_ad.hpp lu_vec_ad_ok.cpp mul.cpp mul_eq.cpp \
    123         mul_level.cpp mul_level_ode.cpp nan.cpp near_equal.cpp \
    124         near_equal_ext.cpp number_skip.cpp numeric_type.cpp \
    125         ode_err_control.cpp ode_err_maxabs.cpp ode_gear.cpp \
    126         ode_gear_control.cpp ode_stiff.cpp ode_taylor.cpp \
     107        ad_input.cpp ad_output.cpp asin.cpp asinh.cpp atan.cpp \
     108        atan2.cpp base_alloc.hpp base_require.cpp bender_quad.cpp \
     109        bool_fun.cpp capacity_order.cpp change_const.cpp \
     110        check_for_nan.cpp check_numeric_type.cpp \
     111        check_simple_vector.cpp compare.cpp compare_change.cpp \
     112        complex_poly.cpp cond_exp.cpp conj_grad.cpp cos.cpp cosh.cpp \
     113        cppad_vector.cpp div.cpp div_eq.cpp equal_op_seq.cpp erf.cpp \
     114        error_handler.cpp exp.cpp for_one.cpp for_two.cpp forward.cpp \
     115        forward_dir.cpp forward_order.cpp for_sparse_jac.cpp \
     116        fun_assign.cpp fun_check.cpp hes_lagrangian.cpp hes_lu_det.cpp \
     117        hes_minor_det.cpp hessian.cpp hes_times_dir.cpp \
     118        independent.cpp index_sort.cpp integer.cpp interface2c.cpp \
     119        interp_onetape.cpp interp_retape.cpp jac_lu_det.cpp \
     120        jac_minor_det.cpp jacobian.cpp limits.cpp log.cpp log10.cpp \
     121        lu_factor.cpp lu_invert.cpp lu_ratio.cpp lu_solve.cpp \
     122        lu_vec_ad.cpp lu_vec_ad.hpp lu_vec_ad_ok.cpp mul.cpp \
     123        mul_eq.cpp mul_level.cpp mul_level_ode.cpp nan.cpp \
     124        near_equal.cpp near_equal_ext.cpp number_skip.cpp \
     125        numeric_type.cpp ode_err_control.cpp ode_err_maxabs.cpp \
     126        ode_gear.cpp ode_gear_control.cpp ode_stiff.cpp ode_taylor.cpp \
    127127        omp_alloc.cpp opt_val_hes.cpp optimize.cpp par_var.cpp \
    128128        poly.cpp pow.cpp pow_int.cpp print_for.cpp reverse_any.cpp \
     
    143143        ad_ctor.$(OBJEXT) ad_fun.$(OBJEXT) ad_in_c.$(OBJEXT) \
    144144        ad_input.$(OBJEXT) ad_output.$(OBJEXT) asin.$(OBJEXT) \
    145         atan.$(OBJEXT) atan2.$(OBJEXT) base_require.$(OBJEXT) \
    146         bender_quad.$(OBJEXT) bool_fun.$(OBJEXT) \
    147         capacity_order.$(OBJEXT) change_const.$(OBJEXT) \
    148         check_for_nan.$(OBJEXT) check_numeric_type.$(OBJEXT) \
    149         check_simple_vector.$(OBJEXT) compare.$(OBJEXT) \
    150         compare_change.$(OBJEXT) complex_poly.$(OBJEXT) \
    151         cond_exp.$(OBJEXT) conj_grad.$(OBJEXT) cos.$(OBJEXT) \
    152         cosh.$(OBJEXT) cppad_vector.$(OBJEXT) div.$(OBJEXT) \
    153         div_eq.$(OBJEXT) equal_op_seq.$(OBJEXT) erf.$(OBJEXT) \
    154         error_handler.$(OBJEXT) exp.$(OBJEXT) for_one.$(OBJEXT) \
    155         for_two.$(OBJEXT) forward.$(OBJEXT) forward_dir.$(OBJEXT) \
    156         forward_order.$(OBJEXT) for_sparse_jac.$(OBJEXT) \
    157         fun_assign.$(OBJEXT) fun_check.$(OBJEXT) \
    158         hes_lagrangian.$(OBJEXT) hes_lu_det.$(OBJEXT) \
    159         hes_minor_det.$(OBJEXT) hessian.$(OBJEXT) \
     145        asinh.$(OBJEXT) atan.$(OBJEXT) atan2.$(OBJEXT) \
     146        base_require.$(OBJEXT) bender_quad.$(OBJEXT) \
     147        bool_fun.$(OBJEXT) capacity_order.$(OBJEXT) \
     148        change_const.$(OBJEXT) check_for_nan.$(OBJEXT) \
     149        check_numeric_type.$(OBJEXT) check_simple_vector.$(OBJEXT) \
     150        compare.$(OBJEXT) compare_change.$(OBJEXT) \
     151        complex_poly.$(OBJEXT) cond_exp.$(OBJEXT) conj_grad.$(OBJEXT) \
     152        cos.$(OBJEXT) cosh.$(OBJEXT) cppad_vector.$(OBJEXT) \
     153        div.$(OBJEXT) div_eq.$(OBJEXT) equal_op_seq.$(OBJEXT) \
     154        erf.$(OBJEXT) error_handler.$(OBJEXT) exp.$(OBJEXT) \
     155        for_one.$(OBJEXT) for_two.$(OBJEXT) forward.$(OBJEXT) \
     156        forward_dir.$(OBJEXT) forward_order.$(OBJEXT) \
     157        for_sparse_jac.$(OBJEXT) fun_assign.$(OBJEXT) \
     158        fun_check.$(OBJEXT) hes_lagrangian.$(OBJEXT) \
     159        hes_lu_det.$(OBJEXT) hes_minor_det.$(OBJEXT) hessian.$(OBJEXT) \
    160160        hes_times_dir.$(OBJEXT) independent.$(OBJEXT) \
    161161        index_sort.$(OBJEXT) integer.$(OBJEXT) interface2c.$(OBJEXT) \
     
    381381cppad_SOURCE_DIR = @cppad_SOURCE_DIR@
    382382cppad_boostvector = @cppad_boostvector@
     383cppad_compiler_has_asinh = @cppad_compiler_has_asinh@
    383384cppad_compiler_has_erf = @cppad_compiler_has_erf@
    384385cppad_cppadvector = @cppad_cppadvector@
     
    505506        ad_output.cpp \
    506507        asin.cpp \
     508        asinh.cpp \
    507509        atan.cpp \
    508510        atan2.cpp \
     
    691693@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/add_eq.Po@am__quote@
    692694@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asin.Po@am__quote@
     695@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asinh.Po@am__quote@
    693696@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/atan.Po@am__quote@
    694697@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/atan2.Po@am__quote@
  • trunk/introduction/exp_apx/makefile.in

    r3650 r3679  
    1 # makefile.in generated by automake 1.13.4 from makefile.am.
     1# makefile.in generated by automake 1.14.1 from makefile.am.
    22# @configure_input@
    33
     
    281281cppad_SOURCE_DIR = @cppad_SOURCE_DIR@
    282282cppad_boostvector = @cppad_boostvector@
     283cppad_compiler_has_asinh = @cppad_compiler_has_asinh@
    283284cppad_compiler_has_erf = @cppad_compiler_has_erf@
    284285cppad_cppadvector = @cppad_cppadvector@
  • trunk/introduction/get_started/makefile.in

    r3650 r3679  
    1 # makefile.in generated by automake 1.13.4 from makefile.am.
     1# makefile.in generated by automake 1.14.1 from makefile.am.
    22# @configure_input@
    33
     
    264264cppad_SOURCE_DIR = @cppad_SOURCE_DIR@
    265265cppad_boostvector = @cppad_boostvector@
     266cppad_compiler_has_asinh = @cppad_compiler_has_asinh@
    266267cppad_compiler_has_erf = @cppad_compiler_has_erf@
    267268cppad_cppadvector = @cppad_cppadvector@
  • trunk/makefile.in

    r3650 r3679  
    1 # makefile.in generated by automake 1.13.4 from makefile.am.
     1# makefile.in generated by automake 1.14.1 from makefile.am.
    22# @configure_input@
    33
     
    8888        $(top_srcdir)/pkgconfig/cppad-uninstalled.pc.in \
    8989        $(am__myinclude_HEADERS_DIST) $(nobase_myinclude_HEADERS) \
    90         COPYING ar-lib config.guess config.sub depcomp install-sh \
    91         missing
     90        COPYING ar-lib compile config.guess config.sub depcomp \
     91        install-sh missing
    9292ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    9393am__aclocal_m4_deps = $(top_srcdir)/configure.ac
     
    335335cppad_SOURCE_DIR = @cppad_SOURCE_DIR@
    336336cppad_boostvector = @cppad_boostvector@
     337cppad_compiler_has_asinh = @cppad_compiler_has_asinh@
    337338cppad_compiler_has_erf = @cppad_compiler_has_erf@
    338339cppad_cppadvector = @cppad_cppadvector@
     
    395396# $Id$
    396397# -----------------------------------------------------------------------------
    397 # CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-14 Bradley M. Bell
     398# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-15 Bradley M. Bell
    398399#
    399400# CppAD is distributed under multiple licenses. This distribution is under
    400 # the terms of the 
     401# the terms of the
    401402#                     Eclipse Public License Version 1.0.
    402403#
     
    423424@CppAD_IPOPT_FALSE@IPOPT_TESTS =
    424425#
    425 # Did user specify a value for IPOPT_DIR in configure command line 
     426# Did user specify a value for IPOPT_DIR in configure command line
    426427@CppAD_IPOPT_TRUE@IPOPT_TESTS = \
    427428@CppAD_IPOPT_TRUE@      example/ipopt_solve \
     
    434435@CppAD_IPOPT_TRUE@IPOPT_DIRS = \
    435436@CppAD_IPOPT_TRUE@      cppad_ipopt/src \
    436 @CppAD_IPOPT_TRUE@      $(IPOPT_TESTS) 
     437@CppAD_IPOPT_TRUE@      $(IPOPT_TESTS)
    437438
    438439@CppAD_IPOPT_FALSE@IPOPT_HEADER =
     
    518519        cppad/local/arithmetic.hpp \
    519520        cppad/local/asin_op.hpp \
     521        cppad/local/asinh.hpp \
     522        cppad/local/asinh_op.hpp \
    520523        cppad/local/atan2.hpp \
    521524        cppad/local/atan_op.hpp \
     
    676679        cppad/vector.hpp
    677680
    678 # End nobase_myinclude_HEADERS (check_makefile.sh uses this comment) 
     681# End nobase_myinclude_HEADERS (check_makefile.sh uses this comment)
    679682# ---------------------------------------------------------------
    680683#
     
    692695        multi_thread \
    693696        multi_thread/test_multi \
    694         test_more 
     697        test_more
    695698
    696699#
     
    733736        multi_thread/openmp/CMakeLists.txt \
    734737        multi_thread/pthread/CMakeLists.txt \
    735         print_for/CMakeLists.txt 
     738        print_for/CMakeLists.txt
    736739
    737740test_directory_list = \
     
    746749        multi_thread/test_multi \
    747750        print_for \
    748         test_more 
     751        test_more
    749752
    750753#
     
    10551058
    10561059dist-tarZ: distdir
     1060        @echo WARNING: "Support for shar distribution archives is" \
     1061                       "deprecated." >&2
     1062        @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
    10571063        tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
    10581064        $(am__post_remove_distdir)
    10591065
    10601066dist-shar: distdir
     1067        @echo WARNING: "Support for distribution archives compressed with" \
     1068                       "legacy program 'compress' is deprecated." >&2
     1069        @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
    10611070        shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
    10621071        $(am__post_remove_distdir)
     
    11001109          && am__cwd=`pwd` \
    11011110          && $(am__cd) $(distdir)/_build \
    1102           && ../configure --srcdir=.. --prefix="$$dc_install_base" \
     1111          && ../configure \
    11031112            $(AM_DISTCHECK_CONFIGURE_FLAGS) \
    11041113            $(DISTCHECK_CONFIGURE_FLAGS) \
     1114            --srcdir=.. --prefix="$$dc_install_base" \
    11051115          && $(MAKE) $(AM_MAKEFLAGS) \
    11061116          && $(MAKE) $(AM_MAKEFLAGS) dvi \
     
    12921302
    12931303$(top_srcdir)/cppad/configure.hpp: cppad/configure.hpp
    1294         cp cppad/configure.hpp $(top_srcdir)/cppad/configure.hpp 
     1304        cp cppad/configure.hpp $(top_srcdir)/cppad/configure.hpp
    12951305@CppAD_HAVE_AR_FALSE@   SPEED_DIRS =
    12961306
    1297 test: all 
    1298         rm -f test.log 
     1307test: all
     1308        rm -f test.log
    12991309        touch test.log
    13001310        echo "#! /bin/sh -e"                               >  test.sh
  • trunk/missing

    r3411 r3679  
    22# Common wrapper for a few potentially missing GNU programs.
    33
    4 scriptversion=2012-06-26.16; # UTC
     4scriptversion=2013-10-28.13; # UTC
    55
    66# Copyright (C) 1996-2013 Free Software Foundation, Inc.
     
    161161   autom4te*)
    162162      echo "You might have modified some maintainer files that require"
    163       echo "the 'automa4te' program to be rebuilt."
     163      echo "the 'autom4te' program to be rebuilt."
    164164      program_details 'autom4te'
    165165      ;;
  • trunk/multi_thread/makefile.in

    r3650 r3679  
    1 # makefile.in generated by automake 1.13.4 from makefile.am.
     1# makefile.in generated by automake 1.14.1 from makefile.am.
    22# @configure_input@
    33
     
    305305cppad_SOURCE_DIR = @cppad_SOURCE_DIR@
    306306cppad_boostvector = @cppad_boostvector@
     307cppad_compiler_has_asinh = @cppad_compiler_has_asinh@
    307308cppad_compiler_has_erf = @cppad_compiler_has_erf@
    308309cppad_cppadvector = @cppad_cppadvector@
  • trunk/multi_thread/test_multi/makefile.in

    r3650 r3679  
    1 # makefile.in generated by automake 1.13.4 from makefile.am.
     1# makefile.in generated by automake 1.14.1 from makefile.am.
    22# @configure_input@
    33
     
    263263cppad_SOURCE_DIR = @cppad_SOURCE_DIR@
    264264cppad_boostvector = @cppad_boostvector@
     265cppad_compiler_has_asinh = @cppad_compiler_has_asinh@
    265266cppad_compiler_has_erf = @cppad_compiler_has_erf@
    266267cppad_cppadvector = @cppad_cppadvector@
  • trunk/omh/theory/acos_forward.omh

    r3169 r3679  
    22// BEGIN SHORT COPYRIGHT
    33/* --------------------------------------------------------------------------
    4 CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-14 Bradley M. Bell
     4CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-15 Bradley M. Bell
    55
    66CppAD is distributed under multiple licenses. This distribution is under
    7 the terms of the 
     7the terms of the
    88                    Eclipse Public License Version 1.0.
    99
     
    1313// END SHORT COPYRIGHT
    1414
    15 $begin AcosForward$$
     15$begin acos_forward$$
    1616$spell
    1717        acos
     18        acosh
    1819        Arccosine
    1920        Taylor
    2021$$
    2122
    22 $index acos, forward theory$$
    23 $index theory, acos forward$$
    24 $index forward, acos theory$$
     23$section Arc Cosine and Hyperbolic Cosine Forward Taylor Polynomial Theory$$
     24$mindex acos, acosh$$
    2525
    26 $section Arccosine Function Forward Taylor Polynomial Theory$$
    27 
    28 If $latex F(x)  = \arccos(x) $$ it follows that
     26$head Derivatives$$
    2927$latex \[
    30         \sqrt{ 1 - x * x } * F^{(1)} (x) - 0 * F (u)  = -1
     28\begin{array}{rcl}
     29\R{arccos}^{(1)} (x)  & = & - 1 / \sqrt{ 1 - x * x }
     30\\
     31\R{arccosh}^{(1)} (x) & = & + 1 / \sqrt{ x * x - 1}
     32\end{array}
     33\] $$
     34If $latex F(x)$$ is $latex \R{arccos} (x)$$ or $latex \R{arccosh} (x)$$
     35the corresponding derivative satisfies the equation
     36$latex \[
     37        \sqrt{ \mp ( x * x - 1 ) } * F^{(1)} (x) - 0 * F (u)  = \mp 1
    3138\] $$
    3239and in the
    33 $xref/
    34         ForwardTheory/
    35         Standard Math Functions/
    36         Differential Equation/
    37         standard math function differential equation/
    38         1
     40$cref/standard math function differential equation
     41        /ForwardTheory
     42        /Standard Math Functions
     43        /Differential Equation
    3944/$$,
    4045$latex A(x) = 0$$,
    41 $latex B(x) = \sqrt{1 - x * x }$$,
    42 and $latex D(x) = -1$$.
    43 We use $latex a$$, $latex b$$, $latex d$$ and $latex z$$ to denote the 
     46$latex B(x) = \sqrt{ \mp( x * x - 1 ) }$$,
     47and $latex D(x) = \mp 1$$.
     48We use $latex a$$, $latex b$$, $latex d$$ and $latex z$$ to denote the
    4449Taylor coefficients for
    45 $latex A [ X (t) ] $$, 
    46 $latex B [ X (t) ]$$, 
     50$latex A [ X (t) ] $$,
     51$latex B [ X (t) ]$$,
    4752$latex D [ X (t) ] $$,
    4853and $latex F [ X(t) ] $$ respectively.
     
    5055
    5156$$
    52 We define $latex Q(x) = 1 - x * x$$
    53 and let $latex q$$ be the corresponding Taylor coefficients for 
     57We define $latex Q(x) = \mp ( x * x - 1 )$$
     58and let $latex q$$ be the corresponding Taylor coefficients for
    5459$latex Q[ X(t) ]$$.
    5560It follows that
    5661$latex \[
    5762q^{(j)} = \left\{ \begin{array}{ll}
    58         1 - x^{(0)} * x^{(0)}            & {\rm if} \; j = 0 \\
    59         - \sum_{k=0}^j x^{(k)} x^{(j-k)} & {\rm otherwise}
     63        \mp ( x^{(0)} * x^{(0)} - 1 )      & {\rm if} \; j = 0 \\
     64        \mp \sum_{k=0}^j x^{(k)} x^{(j-k)} & {\rm otherwise}
    6065\end{array} \right.
    6166\] $$
    62 It follows that 
     67It follows that
    6368$latex B[ X(t) ] = \sqrt{ Q[ X(t) ] }$$ and
    6469from the equations for the
     
    7075\\
    7176b^{(j+1)} & = &
    72         \frac{1}{j+1} \frac{1}{ b^{(0)} } 
     77        \frac{1}{j+1} \frac{1}{ b^{(0)} }
    7378        \left(
    7479                \frac{j+1}{2} q^{(j+1) }
    75                 - \sum_{k=1}^j k b^{(k)} b^{(j+1-k)} 
     80                - \sum_{k=1}^j k b^{(k)} b^{(j+1-k)}
    7681        \right)
    7782\end{array}
     
    8893$latex \[
    8994\begin{array}{rcl}
    90 z^{(0)} & = & \arccos ( x^{(0)} )
     95z^{(0)} & = & F ( x^{(0)} )
    9196\\
    92 e^{(j)} 
     97e^{(j)}
    9398& = & d^{(j)} + \sum_{k=0}^{j} a^{(j-k)} * z^{(k)}
    9499\\
    95100& = & \left\{ \begin{array}{ll}
    96         -1 & {\rm if} \; j = 0 \\
     101        \mp 1 & {\rm if} \; j = 0 \\
    97102        0 & {\rm otherwise}
    98103\end{array} \right.
    99104\\
    100 z^{(j+1)} & = & \frac{1}{j+1} \frac{1}{ b^{(0)} } 
     105z^{(j+1)} & = & \frac{1}{j+1} \frac{1}{ b^{(0)} }
    101106\left(
    102         \sum_{k=0}^j e^{(k)} (j+1-k) x^{(j+1-k)} 
    103         - \sum_{k=1}^j b^{(k)} (j+1-k) z^{(j+1-k)} 
     107        \sum_{k=0}^j e^{(k)} (j+1-k) x^{(j+1-k)}
     108        - \sum_{k=1}^j b^{(k)} (j+1-k) z^{(j+1-k)}
    104109\right)
    105110\\
    106 z^{(j+1)} & = & - \frac{1}{j+1} \frac{1}{ b^{(0)} } 
     111z^{(j+1)} & = & - \frac{1}{j+1} \frac{1}{ b^{(0)} }
    107112\left(
    108113        (j+1) x^{(j+1)}
    109         + \sum_{k=1}^j k z^{(k)}  b^{(j+1-k)} 
     114        + \sum_{k=1}^j k z^{(k)}  b^{(j+1-k)}
    110115\right)
    111116\end{array}
    112 \] $$ 
     117\] $$
    113118
    114119
    115 $end 
     120$end
  • trunk/omh/theory/acos_reverse.omh

    r3169 r3679  
    22// BEGIN SHORT COPYRIGHT
    33/* --------------------------------------------------------------------------
    4 CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-14 Bradley M. Bell
     4CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-15 Bradley M. Bell
    55
    66CppAD is distributed under multiple licenses. This distribution is under
    7 the terms of the 
     7the terms of the
    88                    Eclipse Public License Version 1.0.
    99
     
    1313// END SHORT COPYRIGHT
    1414
    15 $begin AcosReverse$$
     15$begin acos_reverse$$
    1616$spell
    1717        acos
     
    3434%$$
    3535definition for the functions $latex H$$ and $latex G$$.
    36 In addition, 
     36In addition,
    3737
    38 we use $latex q$$ and $latex b$$ 
    39 for the $th p$$ order Taylor coefficient 
     38we use $latex q$$ and $latex b$$
     39for the $th p$$ order Taylor coefficient
    4040row vectors corresponding to functions
    4141$latex \[
     
    4444        B(t) & = & \sqrt{ Q(t) }
    4545\end{array}
    46 \] $$ 
     46\] $$
    4747and replace $latex z^{(j)}$$ by
    4848$latex \[
    4949        ( z^{(j)} , b^{(j)} )
    50 \] $$ 
     50\] $$
    5151in the definition for $latex G$$ and $latex H$$.
    5252The forward mode formulas for the
    53 $cref/acos/AcosForward/$$
     53$cref/acos/acos_forward/$$
    5454function are
    5555$latex \[
     
    6565$latex \[
    6666\begin{array}{rcl}
    67 q^{(j)} & = & 
    68         - \sum_{k=0}^j x^{(k)} x^{(j-k)} 
     67q^{(j)} & = &
     68        - \sum_{k=0}^j x^{(k)} x^{(j-k)}
    6969\\
    7070b^{(j)} & = &
    71         \frac{1}{j} \frac{1}{ b^{(0)} } 
     71        \frac{1}{j} \frac{1}{ b^{(0)} }
    7272        \left(
    7373                \frac{j}{2} q^{(j)}
    74                 - \sum_{k=1}^{j-1} k b^{(k)} b^{(j-k)} 
     74                - \sum_{k=1}^{j-1} k b^{(k)} b^{(j-k)}
    7575        \right)
    7676\\
    77 z^{(j)} & = & - \frac{1}{j} \frac{1}{ b^{(0)} } 
     77z^{(j)} & = & - \frac{1}{j} \frac{1}{ b^{(0)} }
    7878\left(
    7979        j x^{(j)}
    80         + \sum_{k=1}^{j-1} k z^{(k)}  b^{(j-k)} 
     80        + \sum_{k=1}^{j-1} k z^{(k)}  b^{(j-k)}
    8181\right)
    8282\end{array}
    83 \] $$ 
     83\] $$
    8484
    8585If $latex j = 0$$, we have the relation
     
    8787$latex \[
    8888\begin{array}{rcl}
    89 \D{H}{ x^{(j)} } & = & 
    90 \D{G}{ x^{(0)} } 
     89\D{H}{ x^{(j)} } & = &
     90\D{G}{ x^{(0)} }
    9191+ \D{G}{ z^{(j)} } \D{ z^{(j)} }{ x^{(0)} }
    9292+ \D{G}{ b^{(j)} } \D{ b^{(j)} }{ q^{(0)} } \D{ q^{(0)} }{ x^{(0)} }
    9393\\
    9494& = &
    95 \D{G}{ x^{(j)} } 
     95\D{G}{ x^{(j)} }
    9696- \D{G}{ z^{(j)} } \frac{1}{ b^{(0)} }
    9797- \D{G}{ b^{(j)} } \frac{ x^{(0)} }{ b^{(0)} }
    9898\end{array}
    99 \] $$ 
     99\] $$
    100100
    101101If $latex j > 0$$, then for $latex k = 1, \ldots , j-1$$
     
    103103$latex \[
    104104\begin{array}{rcl}
    105 \D{H}{ b^{(0)} } & = & 
    106 \D{G}{ b^{(0)} } 
     105\D{H}{ b^{(0)} } & = &
     106\D{G}{ b^{(0)} }
    107107+ \D{G}{ z^{(j)} } \D{ z^{(j)} }{ b^{(0)} }
    108108+ \D{G}{ b^{(j)} } \D{ b^{(j)} }{ b^{(0)} }
    109109\\
    110110& = &
    111 \D{G}{ b^{(0)} } 
    112 - \D{G}{ z^{(j)} } \frac{ z^{(j)} }{ b^{(0)} } 
     111\D{G}{ b^{(0)} }
     112- \D{G}{ z^{(j)} } \frac{ z^{(j)} }{ b^{(0)} }
    113113- \D{G}{ b^{(j)} } \frac{ b^{(j)} }{ b^{(0)} }
    114114\\
    115 \D{H}{ x^{(0)} } & = & 
    116 \D{G}{ x^{(0)} } 
     115\D{H}{ x^{(0)} } & = &
     116\D{G}{ x^{(0)} }
    117117+
    118118\D{G}{ b^{(j)} } \D{ b^{(j)} }{ q^{(j)} } \D{ q^{(j)} }{ x^{(0)} }
    119119\\
    120 & = & 
    121 \D{G}{ x^{(0)} } 
     120& = &
     121\D{G}{ x^{(0)} }
    122122- \D{G}{ b^{(j)} } \frac{ x^{(j)} }{ b^{(0)} }
    123123\\
    124 \D{H}{ x^{(j)} } & = & 
    125 \D{G}{ x^{(j)} } 
     124\D{H}{ x^{(j)} } & = &
     125\D{G}{ x^{(j)} }
    126126+ \D{G}{ z^{(j)} } \D{ z^{(j)} }{ x^{(j)} }
    127127+ \D{G}{ b^{(j)} } \D{ b^{(j)} }{ q^{(j)} } \D{ q^{(j)} }{ x^{(j)} }
    128128\\
    129 & = & 
    130 \D{G}{ x^{(j)} } 
    131 - \D{G}{ z^{(j)} } \frac{1}{ b^{(0)} } 
     129& = &
     130\D{G}{ x^{(j)} }
     131- \D{G}{ z^{(j)} } \frac{1}{ b^{(0)} }
    132132- \D{G}{ b^{(j)} } \frac{ x^{(0)} }{ b^{(0)} }
    133133\\
    134 \D{H}{ b^{(j - k)} } & = & 
    135 \D{G}{ b^{(j - k)} } 
     134\D{H}{ b^{(j - k)} } & = &
     135\D{G}{ b^{(j - k)} }
    136136+ \D{G}{ z^{(j)} } \D{ z^{(j)} }{ b^{(j - k)} }
    137137+ \D{G}{ b^{(j)} } \D{ b^{(j)} }{ b^{(j - k)} }
    138138\\
    139139& = &
    140 \D{G}{ b^{(j - k)} } 
     140\D{G}{ b^{(j - k)} }
    141141- \D{G}{ z^{(j)} } \frac{k z^{(k)} }{j b^{(0)} }
    142142- \D{G}{ b^{(j)} } \frac{ b^{(k)} }{ b^{(0)} }
    143143\\
    144 \D{H}{ x^{(k)} } & = & 
    145 \D{G}{ x^{(k)} } 
     144\D{H}{ x^{(k)} } & = &
     145\D{G}{ x^{(k)} }
    146146+ \D{G}{ z^{(j)} } \D{ z^{(j)} }{ x^{(k)} }
    147147+ \D{G}{ b^{(j)} } \D{ b^{(j)} }{ q^{(j)} } \D{ q^{(j)} }{ x^{(k)} }
    148148\\
    149 & = & 
    150 \D{G}{ x^{(k)} } 
     149& = &
     150\D{G}{ x^{(k)} }
    151151- \D{G}{ b^{(j)} } \frac{ x^{(j-k)} }{ b^{(0)} }
    152152\\
    153 \D{H}{ z^{(k)} } & = & 
    154 \D{G}{ z^{(k)} } 
     153\D{H}{ z^{(k)} } & = &
     154\D{G}{ z^{(k)} }
    155155+ \D{G}{ z^{(j)} } \D{ z^{(j)} }{ z^{(k)} }
    156156+ \D{G}{ b^{(j)} } \D{ b^{(j)} }{ z^{(k)} }
    157157\\
    158158& = &
    159 \D{G}{ z^{(k)} } 
    160 - \D{G}{ z^{(j)} } \frac{k b^{(j-k)} }{ j b^{(0)} } 
     159\D{G}{ z^{(k)} }
     160- \D{G}{ z^{(j)} } \frac{k b^{(j-k)} }{ j b^{(0)} }
    161161\end{array}
    162 \] $$ 
     162\] $$
    163163
    164164$end
  • trunk/omh/theory/asin_forward.omh

    r3675 r3679  
    1515$begin asin_forward$$
    1616$spell
     17        asinh
    1718        asin
    1819        Arcsine
     
    2021$$
    2122
    22 $index asin, forward theory$$
    23 $index theory, asin forward$$
    24 $index forward, asin theory$$
    25 
    2623$section Arc Sine and Hyperbolic Sine Forward Taylor Polynomial Theory$$
     24$mindex asin, asinh$$
    2725
    2826$head Derivatives$$
     
    4038\] $$
    4139and in the
    42 $xref/
    43         ForwardTheory/
    44         Standard Math Functions/
    45         Differential Equation/
    46         standard math function differential equation/
    47         1
     40$cref/standard math function differential equation
     41        /ForwardTheory
     42        /Standard Math Functions
     43        /Differential Equation
    4844/$$,
    4945$latex A(x) = 0$$,
  • trunk/omh/theory/forward_theory.omh

    r3675 r3679  
    212212$rref AtanForward$$
    213213$rref asin_forward$$
    214 $rref AcosForward$$
     214$rref acos_forward$$
    215215$tend
    216216
  • trunk/print_for/makefile.in

    r3650 r3679  
    1 # makefile.in generated by automake 1.13.4 from makefile.am.
     1# makefile.in generated by automake 1.14.1 from makefile.am.
    22# @configure_input@
    33
     
    263263cppad_SOURCE_DIR = @cppad_SOURCE_DIR@
    264264cppad_boostvector = @cppad_boostvector@
     265cppad_compiler_has_asinh = @cppad_compiler_has_asinh@
    265266cppad_compiler_has_erf = @cppad_compiler_has_erf@
    266267cppad_cppadvector = @cppad_cppadvector@
  • trunk/speed/adolc/makefile.in

    r3650 r3679  
    1 # makefile.in generated by automake 1.13.4 from makefile.am.
     1# makefile.in generated by automake 1.14.1 from makefile.am.
    22# @configure_input@
    33
     
    267267cppad_SOURCE_DIR = @cppad_SOURCE_DIR@
    268268cppad_boostvector = @cppad_boostvector@
     269cppad_compiler_has_asinh = @cppad_compiler_has_asinh@
    269270cppad_compiler_has_erf = @cppad_compiler_has_erf@
    270271cppad_cppadvector = @cppad_cppadvector@
  • trunk/speed/cppad/makefile.in

    r3650 r3679  
    1 # makefile.in generated by automake 1.13.4 from makefile.am.
     1# makefile.in generated by automake 1.14.1 from makefile.am.
    22# @configure_input@
    33
     
    254254cppad_SOURCE_DIR = @cppad_SOURCE_DIR@
    255255cppad_boostvector = @cppad_boostvector@
     256cppad_compiler_has_asinh = @cppad_compiler_has_asinh@
    256257cppad_compiler_has_erf = @cppad_compiler_has_erf@
    257258cppad_cppadvector = @cppad_cppadvector@
  • trunk/speed/double/makefile.in

    r3650 r3679  
    1 # makefile.in generated by automake 1.13.4 from makefile.am.
     1# makefile.in generated by automake 1.14.1 from makefile.am.
    22# @configure_input@
    33
     
    254254cppad_SOURCE_DIR = @cppad_SOURCE_DIR@
    255255cppad_boostvector = @cppad_boostvector@
     256cppad_compiler_has_asinh = @cppad_compiler_has_asinh@
    256257cppad_compiler_has_erf = @cppad_compiler_has_erf@
    257258cppad_cppadvector = @cppad_cppadvector@
  • trunk/speed/example/makefile.in

    r3650 r3679  
    1 # makefile.in generated by automake 1.13.4 from makefile.am.
     1# makefile.in generated by automake 1.14.1 from makefile.am.
    22# @configure_input@
    33
     
    270270cppad_SOURCE_DIR = @cppad_SOURCE_DIR@
    271271cppad_boostvector = @cppad_boostvector@
     272cppad_compiler_has_asinh = @cppad_compiler_has_asinh@
    272273cppad_compiler_has_erf = @cppad_compiler_has_erf@
    273274cppad_cppadvector = @cppad_cppadvector@
  • trunk/speed/fadbad/makefile.in

    r3650 r3679  
    1 # makefile.in generated by automake 1.13.4 from makefile.am.
     1# makefile.in generated by automake 1.14.1 from makefile.am.
    22# @configure_input@
    33
     
    255255cppad_SOURCE_DIR = @cppad_SOURCE_DIR@
    256256cppad_boostvector = @cppad_boostvector@
     257cppad_compiler_has_asinh = @cppad_compiler_has_asinh@
    257258cppad_compiler_has_erf = @cppad_compiler_has_erf@
    258259cppad_cppadvector = @cppad_cppadvector@
  • trunk/speed/profile/makefile.in

    r3650 r3679  
    1 # makefile.in generated by automake 1.13.4 from makefile.am.
     1# makefile.in generated by automake 1.14.1 from makefile.am.
    22# @configure_input@
    33
     
    257257cppad_SOURCE_DIR = @cppad_SOURCE_DIR@
    258258cppad_boostvector = @cppad_boostvector@
     259cppad_compiler_has_asinh = @cppad_compiler_has_asinh@
    259260cppad_compiler_has_erf = @cppad_compiler_has_erf@
    260261cppad_cppadvector = @cppad_cppadvector@
  • trunk/speed/sacado/makefile.in

    r3650 r3679  
    1 # makefile.in generated by automake 1.13.4 from makefile.am.
     1# makefile.in generated by automake 1.14.1 from makefile.am.
    22# @configure_input@
    33
     
    255255cppad_SOURCE_DIR = @cppad_SOURCE_DIR@
    256256cppad_boostvector = @cppad_boostvector@
     257cppad_compiler_has_asinh = @cppad_compiler_has_asinh@
    257258cppad_compiler_has_erf = @cppad_compiler_has_erf@
    258259cppad_cppadvector = @cppad_cppadvector@
  • trunk/speed/src/makefile.in

    r3650 r3679  
    1 # makefile.in generated by automake 1.13.4 from makefile.am.
     1# makefile.in generated by automake 1.14.1 from makefile.am.
    22# @configure_input@
    33
     
    273273cppad_SOURCE_DIR = @cppad_SOURCE_DIR@
    274274cppad_boostvector = @cppad_boostvector@
     275cppad_compiler_has_asinh = @cppad_compiler_has_asinh@
    275276cppad_compiler_has_erf = @cppad_compiler_has_erf@
    276277cppad_cppadvector = @cppad_cppadvector@
  • trunk/test_more/erf.cpp

    r3646 r3679  
    104104                return ok;
    105105        }
     106# if CPPAD_COMPILER_HAS_ERF
    106107        bool hessian(void)
    107108        {       bool ok = true;
     
    146147                return ok;
    147148        }
     149# endif
    148150}
    149151bool erf(void)
  • trunk/test_more/makefile.am

    r3666 r3679  
    9494        adfun_copy.cpp \
    9595        asin.cpp \
     96        asinh.cpp \
    9697        assign.cpp \
    9798        add.cpp \
  • trunk/test_more/makefile.in

    r3666 r3679  
    1 # makefile.in generated by automake 1.13.4 from makefile.am.
     1# makefile.in generated by automake 1.14.1 from makefile.am.
    22# @configure_input@
    33
     
    104104am__test_more_SOURCES_DIST = base_adolc.cpp ipopt_solve.cpp \
    105105        alloc_openmp.cpp test_more.cpp abs.cpp acos.cpp adfun_copy.cpp \
    106         asin.cpp assign.cpp add.cpp add_eq.cpp add_zero.cpp atan.cpp \
    107         atan2.cpp base_alloc.cpp check_simple_vector.cpp \
     106        asin.cpp asinh.cpp assign.cpp add.cpp add_eq.cpp add_zero.cpp \
     107        atan.cpp atan2.cpp base_alloc.cpp check_simple_vector.cpp \
    108108        checkpoint.cpp compare.cpp compare_change.cpp cond_exp.cpp \
    109109        cond_exp_ad.cpp cond_exp_rev.cpp copy.cpp cos.cpp cosh.cpp \
     
    128128        $(am__objects_3) test_more.$(OBJEXT) abs.$(OBJEXT) \
    129129        acos.$(OBJEXT) adfun_copy.$(OBJEXT) asin.$(OBJEXT) \
    130         assign.$(OBJEXT) add.$(OBJEXT) add_eq.$(OBJEXT) \
    131         add_zero.$(OBJEXT) atan.$(OBJEXT) atan2.$(OBJEXT) \
    132         base_alloc.$(OBJEXT) check_simple_vector.$(OBJEXT) \
    133         checkpoint.$(OBJEXT) compare.$(OBJEXT) \
    134         compare_change.$(OBJEXT) cond_exp.$(OBJEXT) \
     130        asinh.$(OBJEXT) assign.$(OBJEXT) add.$(OBJEXT) \
     131        add_eq.$(OBJEXT) add_zero.$(OBJEXT) atan.$(OBJEXT) \
     132        atan2.$(OBJEXT) base_alloc.$(OBJEXT) \
     133        check_simple_vector.$(OBJEXT) checkpoint.$(OBJEXT) \
     134        compare.$(OBJEXT) compare_change.$(OBJEXT) cond_exp.$(OBJEXT) \
    135135        cond_exp_ad.$(OBJEXT) cond_exp_rev.$(OBJEXT) copy.$(OBJEXT) \
    136136        cos.$(OBJEXT) cosh.$(OBJEXT) dbl_epsilon.$(OBJEXT) \
     
    267267# $Id$
    268268# -----------------------------------------------------------------------------
    269 # CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-14 Bradley M. Bell
     269# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-15 Bradley M. Bell
    270270#
    271271# CppAD is distributed under multiple licenses. This distribution is under
    272 # the terms of the 
     272# the terms of the
    273273#                     Eclipse Public License Version 1.0.
    274274#
     
    351351cppad_SOURCE_DIR = @cppad_SOURCE_DIR@
    352352cppad_boostvector = @cppad_boostvector@
     353cppad_compiler_has_asinh = @cppad_compiler_has_asinh@
    353354cppad_compiler_has_erf = @cppad_compiler_has_erf@
    354355cppad_cppadvector = @cppad_cppadvector@
     
    411412#
    412413# -------------------------------------------------------------------------
    413 @CppAD_OPENMP_TRUE@OPENMP_SRC_FILES = alloc_openmp.cpp 
     414@CppAD_OPENMP_TRUE@OPENMP_SRC_FILES = alloc_openmp.cpp
    414415@CppAD_ADOLC_FALSE@ADOLC_SRC_FILES =
    415416# -------------------------------------------------------------------------
    416 @CppAD_ADOLC_TRUE@ADOLC_SRC_FILES = base_adolc.cpp 
     417@CppAD_ADOLC_TRUE@ADOLC_SRC_FILES = base_adolc.cpp
    417418@CppAD_ADOLC_FALSE@ADOLC_EXTRA_FILES = base_adolc.cpp
    418419@CppAD_ADOLC_TRUE@ADOLC_EXTRA_FILES =
     
    420421@CppAD_ADOLC_TRUE@ADOLC_LIB = -ladolc -lColPack -L$(ADOLC_DIR)/lib -L$(ADOLC_DIR)/lib64
    421422@CppAD_ADOLC_FALSE@ADOLC_FLAGS =
    422 @CppAD_ADOLC_TRUE@ADOLC_FLAGS = -DCPPAD_ADOLC_TEST -I$(ADOLC_DIR)/include 
     423@CppAD_ADOLC_TRUE@ADOLC_FLAGS = -DCPPAD_ADOLC_TEST -I$(ADOLC_DIR)/include
    423424@CppAD_IPOPT_FALSE@IPOPT_SRC_FILES =
    424425# -------------------------------------------------------------------------
    425 @CppAD_IPOPT_TRUE@IPOPT_SRC_FILES = ipopt_solve.cpp 
     426@CppAD_IPOPT_TRUE@IPOPT_SRC_FILES = ipopt_solve.cpp
    426427@CppAD_IPOPT_FALSE@IPOPT_EXTRA_FILES = ipopt_solve.cpp
    427428@CppAD_IPOPT_TRUE@IPOPT_EXTRA_FILES =
     
    431432
    432433@CppAD_IPOPT_FALSE@IPOPT_FLAGS =
    433 @CppAD_IPOPT_TRUE@IPOPT_FLAGS = -DCPPAD_IPOPT_TEST -I$(IPOPT_DIR)/include 
     434@CppAD_IPOPT_TRUE@IPOPT_FLAGS = -DCPPAD_IPOPT_TEST -I$(IPOPT_DIR)/include
    434435@CppAD_EIGEN_DIR_FALSE@EIGEN_EXTRA_FILES = cppad_eigen.cpp
    435436# -------------------------------------------------------------------------
     
    444445@CppAD_EIGEN_DIR_TRUE@  $(CXX_FLAGS_EIGEN) \
    445446@CppAD_EIGEN_DIR_TRUE@  -DCPPAD_EIGEN_TEST \
    446 @CppAD_EIGEN_DIR_TRUE@   -I$(EIGEN_DIR)/include 
     447@CppAD_EIGEN_DIR_TRUE@   -I$(EIGEN_DIR)/include
    447448
    448449# -------------------------------------------------------------------------
     
    461462        $(ADOLC_FLAGS) \
    462463        $(IPOPT_FLAGS) \
    463         $(OPENMP_FLAGS) 
     464        $(OPENMP_FLAGS)
    464465
    465466#
    466467AM_CXXFLAGS = -g $(ADOLC_FLAGS) $(IPOPT_FLAGS) $(CXX_FLAGS)
    467468#
    468 AM_LDFLAGS = $(OPENMP_FLAGS) 
    469 LDADD = $(ADOLC_LIB) $(IPOPT_LIB) $(EIGEN_LIB) $(OPENMP_FLAGS) 
     469AM_LDFLAGS = $(OPENMP_FLAGS)
     470LDADD = $(ADOLC_LIB) $(IPOPT_LIB) $(EIGEN_LIB) $(OPENMP_FLAGS)
    470471#
    471472test_more_SOURCES = \
     
    478479        adfun_copy.cpp \
    479480        asin.cpp \
     481        asinh.cpp \
    480482        assign.cpp \
    481483        add.cpp \
     
    552554        vec_ad.cpp \
    553555        vec_ad_par.cpp \
    554         vec_unary.cpp 
     556        vec_unary.cpp
    555557
    556558all: all-am
     
    620622@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alloc_openmp.Po@am__quote@
    621623@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asin.Po@am__quote@
     624@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asinh.Po@am__quote@
    622625@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/assign.Po@am__quote@
    623626@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/atan.Po@am__quote@
  • trunk/test_more/test_one.sh.in

    r3677 r3679  
    4949        -o test_one.exe
    5050        $cxxflags
    51         -std=c++11
     51        -g
    5252        -DCPPAD_ADOLC_TEST
    5353        -DCPPAD_OPENMP_TEST
Note: See TracChangeset for help on using the changeset viewer.