Changeset 3802


Ignore:
Timestamp:
Mar 17, 2016 10:25:43 PM (4 years ago)
Author:
bradbell
Message:

merge to branch: trunk
from repository: https://github.com/coin-or/CppAD
start hash code: 86f9f8c0c7811bfa69a3ea0fff1188cd37705cea
end hash code: d75b0cba62a41b958b974a326168299773bc4614

commit d75b0cba62a41b958b974a326168299773bc4614
Author: Brad Bell <bradbell@…>
Date: Thu Mar 17 18:53:04 2016 -0700

Add atomic_ode.cpp example.

commit dec6fb33860c355cfb1af2cb487623d499d4f04d
Author: Brad Bell <bradbell@…>
Date: Thu Mar 17 07:15:39 2016 -0700

  1. Add the atomic_extended_ode.cpp example.
  2. Modify atomic/test_one.sh so that is uses system configuration.
  3. Advance version to cppad-20160317.
Location:
trunk
Files:
3 added
15 edited

Legend:

Unmodified
Added
Removed
  • trunk/AUTHORS

    r3800 r3802  
    22             ===========================================
    33
    4 To date, 2016-03-12, Bradley M. Bell is the sole author of CppAD.
     4To date, 2016-03-17, Bradley M. Bell is the sole author of CppAD.
    55While Bradley M. Bell worked for the University of Washington during
    66the development of CppAD, the following are also true:
  • trunk/CMakeLists.txt

    r3800 r3802  
    1818
    1919# cppad_version is used by set_version.sh to get the version number.
    20 SET(cppad_version      "20160312" )
     20SET(cppad_version      "20160317" )
    2121SET(cppad_url          "http://www.coin-or.org/CppAD" )
    2222SET(cppad_description  "Differentiation of C++ Algorithms" )
  • trunk/configure

    r3800 r3802  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.69 for cppad 20160312.
     3# Generated by GNU Autoconf 2.69 for cppad 20160317.
    44#
    55# Report bugs to <cppad@list.coin-or.org>.
     
    581581PACKAGE_NAME='cppad'
    582582PACKAGE_TARNAME='cppad'
    583 PACKAGE_VERSION='20160312'
    584 PACKAGE_STRING='cppad 20160312'
     583PACKAGE_VERSION='20160317'
     584PACKAGE_STRING='cppad 20160317'
    585585PACKAGE_BUGREPORT='cppad@list.coin-or.org'
    586586PACKAGE_URL=''
     
    14071407  # This message is too long to be a string in the A/UX 3.1 sh.
    14081408  cat <<_ACEOF
    1409 \`configure' configures cppad 20160312 to adapt to many kinds of systems.
     1409\`configure' configures cppad 20160317 to adapt to many kinds of systems.
    14101410
    14111411Usage: $0 [OPTION]... [VAR=VALUE]...
     
    14771477if test -n "$ac_init_help"; then
    14781478  case $ac_init_help in
    1479      short | recursive ) echo "Configuration of cppad 20160312:";;
     1479     short | recursive ) echo "Configuration of cppad 20160317:";;
    14801480   esac
    14811481  cat <<\_ACEOF
     
    16111611if $ac_init_version; then
    16121612  cat <<\_ACEOF
    1613 cppad configure 20160312
     1613cppad configure 20160317
    16141614generated by GNU Autoconf 2.69
    16151615
     
    22402240running configure, to aid debugging if configure makes a mistake.
    22412241
    2242 It was created by cppad $as_me 20160312, which was
     2242It was created by cppad $as_me 20160317, which was
    22432243generated by GNU Autoconf 2.69.  Invocation command line was
    22442244
     
    31303130# Define the identity of the package.
    31313131 PACKAGE='cppad'
    3132  VERSION='20160312'
     3132 VERSION='20160317'
    31333133
    31343134
     
    85688568# values after options handling.
    85698569ac_log="
    8570 This file was extended by cppad $as_me 20160312, which was
     8570This file was extended by cppad $as_me 20160317, which was
    85718571generated by GNU Autoconf 2.69.  Invocation command line was
    85728572
     
    86258625ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
    86268626ac_cs_version="\\
    8627 cppad config.status 20160312
     8627cppad config.status 20160317
    86288628configured by $0, generated by GNU Autoconf 2.69,
    86298629  with options \\"\$ac_cs_config\\"
  • trunk/configure.ac

    r3800 r3802  
    1313dnl Process this file with autoconf to produce a configure script.
    1414dnl   package   version              bug-report
    15 AC_INIT([cppad], [20160312], [cppad@list.coin-or.org])
     15AC_INIT([cppad], [20160317], [cppad@list.coin-or.org])
    1616AM_SILENT_RULES([yes])
    1717
  • trunk/cppad/local/checkpoint.hpp

    r3800 r3802  
    209209$children%example/atomic/checkpoint.cpp
    210210        %example/atomic/mul_level.cpp
     211        %example/atomic/ode.cpp
     212        %example/atomic/extended_ode.cpp
    211213%$$
    212214$head Example$$
  • trunk/doc.omh

    r3800 r3802  
    9292$comment bin/version assumes that : follows cppad version number here$$
    9393$section
    94 cppad-20160312: A Package for Differentiation of C++ Algorithms
     94cppad-20160317: A Package for Differentiation of C++ Algorithms
    9595$$
    9696$mindex AD algorithmic differentiation automatic C++ algorithm derivative CppAD version cppad.hpp$$
  • trunk/example/atomic/CMakeLists.txt

    r3800 r3802  
    1515# empty, Debug, Release, RelWithDebInfo and MinSizeRel
    1616SET(CMAKE_BUILD_TYPE DEBUG)
    17 
     17#
     18CONFIGURE_FILE(
     19        ${CMAKE_CURRENT_SOURCE_DIR}/test_one.sh.in
     20        ${CMAKE_CURRENT_SOURCE_DIR}/test_one.sh
     21)
    1822#
    1923ADD_EXECUTABLE(example_atomic EXCLUDE_FROM_ALL
    2024        atomic.cpp
    2125        checkpoint.cpp
     26        extended_ode.cpp
    2227        for_sparse_hes.cpp
    2328        for_sparse_jac.cpp
     
    2732        mul_level.cpp
    2833        norm_sq.cpp
     34        ode.cpp
    2935        reciprocal.cpp
    3036        rev_sparse_hes.cpp
  • trunk/example/atomic/atomic.cpp

    r3800 r3802  
    2222// external complied tests
    2323extern bool checkpoint(void);
     24extern bool extended_ode(void);
    2425extern bool for_sparse_hes(void);
    2526extern bool for_sparse_jac(void);
     
    2930extern bool mul_level(void);
    3031extern bool norm_sq(void);
     32extern bool ode(void);
    3133extern bool reciprocal(void);
    3234extern bool rev_sparse_hes(void);
     
    6365        // external compiled tests
    6466        ok &= Run( checkpoint,          "checkpoint"     );
     67        ok &= Run( extended_ode,        "extended_ode"   );
    6568        ok &= Run( for_sparse_hes,      "for_sparse_hes" );
    6669        ok &= Run( for_sparse_jac,      "for_sparse_jac" );
     
    7073        ok &= Run( mul_level,           "mul_level"      );
    7174        ok &= Run( norm_sq,             "norm_sq"        );
     75        ok &= Run( ode,                 "ode"            );
    7276        ok &= Run( reciprocal,          "reciprocal"     );
    7377        ok &= Run( rev_sparse_hes,      "rev_sparse_hes" );
  • trunk/example/atomic/makefile.am

    r3800 r3802  
    2727        atomic.cpp \
    2828        checkpoint.cpp \
     29        extended_ode.cpp \
    2930        for_sparse_hes.cpp \
    3031        for_sparse_jac.cpp \
     
    3435        mul_level.cpp \
    3536        norm_sq.cpp \
     37        ode.cpp \
    3638        reciprocal.cpp \
    3739        rev_sparse_hes.cpp \
  • trunk/example/atomic/makefile.in

    r3800 r3802  
    9999CONFIG_CLEAN_VPATH_FILES =
    100100am_atomic_OBJECTS = atomic.$(OBJEXT) checkpoint.$(OBJEXT) \
    101         for_sparse_hes.$(OBJEXT) for_sparse_jac.$(OBJEXT) \
    102         forward.$(OBJEXT) get_started.$(OBJEXT) mat_mul.$(OBJEXT) \
    103         mul_level.$(OBJEXT) norm_sq.$(OBJEXT) reciprocal.$(OBJEXT) \
     101        extended_ode.$(OBJEXT) for_sparse_hes.$(OBJEXT) \
     102        for_sparse_jac.$(OBJEXT) forward.$(OBJEXT) \
     103        get_started.$(OBJEXT) mat_mul.$(OBJEXT) mul_level.$(OBJEXT) \
     104        norm_sq.$(OBJEXT) ode.$(OBJEXT) reciprocal.$(OBJEXT) \
    104105        rev_sparse_hes.$(OBJEXT) rev_sparse_jac.$(OBJEXT) \
    105106        reverse.$(OBJEXT) set_sparsity.$(OBJEXT) tangent.$(OBJEXT)
     
    349350        atomic.cpp \
    350351        checkpoint.cpp \
     352        extended_ode.cpp \
    351353        for_sparse_hes.cpp \
    352354        for_sparse_jac.cpp \
     
    356358        mul_level.cpp \
    357359        norm_sq.cpp \
     360        ode.cpp \
    358361        reciprocal.cpp \
    359362        rev_sparse_hes.cpp \
     
    412415@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/atomic.Po@am__quote@
    413416@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checkpoint.Po@am__quote@
     417@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/extended_ode.Po@am__quote@
    414418@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/for_sparse_hes.Po@am__quote@
    415419@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/for_sparse_jac.Po@am__quote@
     
    419423@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mul_level.Po@am__quote@
    420424@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/norm_sq.Po@am__quote@
     425@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ode.Po@am__quote@
    421426@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reciprocal.Po@am__quote@
    422427@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rev_sparse_hes.Po@am__quote@
  • trunk/example/atomic/mul_level.cpp

    r3800 r3802  
    5757bool mul_level(void)
    5858{       bool ok = true;
    59         using std::cout;
    60         using std::endl;
    6159        using CppAD::checkpoint;
    6260        using CppAD::ADFun;
    63         using CppAD::NearEqual;
    6461        using CppAD::Independent;
    6562
  • trunk/example/atomic/test_one.sh

    r3323 r3802  
    22# $Id$
    33# -----------------------------------------------------------------------------
    4 # CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-13 Bradley M. Bell
     4# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-16 Bradley M. Bell
    55#
    66# CppAD is distributed under multiple licenses. This distribution is under
    7 # the terms of the 
     7# the terms of the
    88#                     Eclipse Public License Version 1.0.
    99#
     
    2525fi
    2626# determine the function name
    27 fun=`grep "^bool *[a-zA-Z0-9_]*( *void *)" $1 | tail -1 | \
     27fun=`grep "^bool *[a-zA-Z0-9_]* *( *void *)" $1 | tail -1 | \
    2828        sed -e "s/^bool *\([a-zA-Z0-9_]*\) *( *void *)/\1/"`
    2929#
     
    3838sed < atomic.cpp > test_one.cpp \
    3939-e '/ok *\&= *Run( /d' \
    40 -e "s/.*This line is used by test_one.sh.*/     ok \&= Run( $fun, \"$fun\");/" 
     40-e "s/.*This line is used by test_one.sh.*/     ok \&= Run( $fun, \"$fun\");/"
    4141#
     42cxxflags='-Wall -pedantic-errors -std=c++11 -Wshadow'
    4243if echo "$fun" | grep 'eigen' > /dev/null
    4344then
    44         cxxflags='-g -Wall -ansi -pedantic-errors -Wno-long-long'
    45 else
    46         cxxflags='-g -Wall -ansi -pedantic-errors -Wshadow'
     45        cxxflags=`echo "$cxxflags" | sed -e 's|-Wshadow||'`
    4746fi
    48 cmd="g++ test_one.cpp $*
     47cmd="g++ test_one.cpp $*"
     48cmd="$cmd
    4949        -o test_one.exe
    5050        $cxxflags
     51        -L /home/bradbell/cppad.git/build/cppad_lib
     52        -lcppad_lib
    5153        -g
    52         -std=c++11
    53         -I../..
     54        -fopenmp
     55        -lboost_thread
     56        -lpthread
     57        -DCPPAD_ADOLC_EXAMPLES
     58        -DCPPAD_EIGEN_EXAMPLES
     59        -I../..
    5460"
     61if [ -e /home/bradbell/prefix/adolc/include ]
     62then
     63        cmd="$cmd -I/home/bradbell/prefix/adolc/include"
     64fi
     65if [ -e /home/bradbell/prefix/colpack/include ]
     66then
     67        cmd="$cmd -I/home/bradbell/prefix/colpack/include"
     68fi
     69if [ -e /home/bradbell/prefix/eigen/include ]
     70then
     71        cmd="$cmd -I/home/bradbell/prefix/eigen/include"
     72fi
     73for lib in lib lib64
     74do
     75        if [ -e /home/bradbell/prefix/adolc/$lib ]
     76        then
     77                cmd="$cmd -L/home/bradbell/prefix/adolc/$lib -ladolc -lColPack"
     78                export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/home/bradbell/prefix/adolc/$lib"
     79        fi
     80        if [ -e /home/bradbell/prefix/colpack/$lib ]
     81        then
     82                cmd="$cmd -L/home/bradbell/prefix/colpack/$lib -lColPack"
     83                export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/home/bradbell/prefix/colpack/$lib"
     84        fi
     85done
     86export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/home/bradbell/cppad.git/build/cppad_lib"
    5587echo $cmd
    5688$cmd
  • trunk/omh/example_list.omh

    r3800 r3802  
    9696$rref atan.cpp$$
    9797$rref atanh.cpp$$
     98$rref atomic_extended_ode.cpp$$
    9899$rref atomic_for_sparse_hes.cpp$$
    99100$rref atomic_for_sparse_jac.cpp$$
     
    104105$rref atomic_mul_level.cpp$$
    105106$rref atomic_norm_sq.cpp$$
     107$rref atomic_ode.cpp$$
    106108$rref atomic_reciprocal.cpp$$
    107109$rref atomic_reverse.cpp$$
  • trunk/omh/install/download.omh

    r3800 r3802  
    9797$rnext
    9898current  $cnext EPL $cnext $href%
    99 http://www.coin-or.org/download/source/CppAD/cppad-20160312.epl.tgz%
    100 cppad-20160312.epl.tgz%$$
     99http://www.coin-or.org/download/source/CppAD/cppad-20160317.epl.tgz%
     100cppad-20160317.epl.tgz%$$
    101101$rnext
    102102current  $cnext GPL $cnext $href%
    103 http://www.coin-or.org/download/source/CppAD/cppad-20160312.gpl.tgz%
    104 cppad-20160312.gpl.tgz%$$
     103http://www.coin-or.org/download/source/CppAD/cppad-20160317.gpl.tgz%
     104cppad-20160317.gpl.tgz%$$
    105105$tend
    106106
  • trunk/omh/whats_new/whats_new_16.omh

    r3801 r3802  
    3434The purpose of these sections is to
    3535assist you in learning about changes between various versions of CppAD.
     36
     37$head 03-17$$
     38Add the
     39$cref atomic_ode.cpp$$ and $cref atomic_extended_ode.cpp$$ examples.
    3640
    3741$head 03-12$$
Note: See TracChangeset for help on using the changeset viewer.