Changeset 3679 for trunk/test_more


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/test_more
Files:
4 edited

Legend:

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