Changeset 3639


Ignore:
Timestamp:
Feb 10, 2015 9:01:35 PM (5 years ago)
Author:
bradbell
Message:

merge to branch: stable/20150000
from repository: https://github.com/coin-or/CppAD
start hash code: 387c7c936a2d61d3638533071802c8d92c72d99d
end hash code: a909822ae00b8df33b9a1e1c9d62d3622f8cf454

commit a909822ae00b8df33b9a1e1c9d62d3622f8cf454
Author: Brad Bell <bradbell@…>
Date: Tue Feb 10 18:53:58 2015 -0700

Advance version number to 20150000.6.

commit 0a50083c8dea11a4a34105831bcf5e07ddb5d1c3
Author: Brad Bell <bradbell@…>
Date: Tue Feb 10 18:51:28 2015 -0700

Branch: stable/20150000: Modified version of bug fix on 2015-02-10.

Location:
stable/20150000
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • stable/20150000/CMakeLists.txt

    r3634 r3639  
    1717
    1818# cppad_version is used by set_version.sh to get the version number.
    19 SET(cppad_version      "20150000.5" )
     19SET(cppad_version      "20150000.6" )
    2020SET(cppad_url          "http://www.coin-or.org/CppAD" )
    2121SET(cppad_description  "Differentiation of C++ Algorithms" )
  • stable/20150000/bin/new_release.sh

    r3634 r3639  
    2424svn_repository="https://projects.coin-or.org/svn/CppAD"
    2525stable_version="20150000"
    26 release='5'
     26release='6'
    2727release_version="$stable_version.$release"
    2828# -----------------------------------------------------------------------------
  • stable/20150000/configure

    r3634 r3639  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.69 for cppad 20150000.5.
     3# Generated by GNU Autoconf 2.69 for cppad 20150000.6.
    44#
    55# Report bugs to <cppad@list.coin-or.org>.
     
    581581PACKAGE_NAME='cppad'
    582582PACKAGE_TARNAME='cppad'
    583 PACKAGE_VERSION='20150000.5'
    584 PACKAGE_STRING='cppad 20150000.5'
     583PACKAGE_VERSION='20150000.6'
     584PACKAGE_STRING='cppad 20150000.6'
    585585PACKAGE_BUGREPORT='cppad@list.coin-or.org'
    586586PACKAGE_URL=''
     
    14021402  # This message is too long to be a string in the A/UX 3.1 sh.
    14031403  cat <<_ACEOF
    1404 \`configure' configures cppad 20150000.5 to adapt to many kinds of systems.
     1404\`configure' configures cppad 20150000.6 to adapt to many kinds of systems.
    14051405
    14061406Usage: $0 [OPTION]... [VAR=VALUE]...
     
    14721472if test -n "$ac_init_help"; then
    14731473  case $ac_init_help in
    1474      short | recursive ) echo "Configuration of cppad 20150000.5:";;
     1474     short | recursive ) echo "Configuration of cppad 20150000.6:";;
    14751475   esac
    14761476  cat <<\_ACEOF
     
    16051605if $ac_init_version; then
    16061606  cat <<\_ACEOF
    1607 cppad configure 20150000.5
     1607cppad configure 20150000.6
    16081608generated by GNU Autoconf 2.69
    16091609
     
    22342234running configure, to aid debugging if configure makes a mistake.
    22352235
    2236 It was created by cppad $as_me 20150000.5, which was
     2236It was created by cppad $as_me 20150000.6, which was
    22372237generated by GNU Autoconf 2.69.  Invocation command line was
    22382238
     
    52425242# Define the identity of the package.
    52435243 PACKAGE='cppad'
    5244  VERSION='20150000.5'
     5244 VERSION='20150000.6'
    52455245
    52465246
     
    84148414# values after options handling.
    84158415ac_log="
    8416 This file was extended by cppad $as_me 20150000.5, which was
     8416This file was extended by cppad $as_me 20150000.6, which was
    84178417generated by GNU Autoconf 2.69.  Invocation command line was
    84188418
     
    84718471ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
    84728472ac_cs_version="\\
    8473 cppad config.status 20150000.5
     8473cppad config.status 20150000.6
    84748474configured by $0, generated by GNU Autoconf 2.69,
    84758475  with options \\"\$ac_cs_config\\"
  • stable/20150000/configure.ac

    r3634 r3639  
    1313dnl Process this file with autoconf to produce a configure script.
    1414dnl   package   version              bug-report
    15 AC_INIT([cppad], [20150000.5], [cppad@list.coin-or.org])
     15AC_INIT([cppad], [20150000.6], [cppad@list.coin-or.org])
    1616AM_SILENT_RULES([yes])
    1717
  • stable/20150000/cppad/local/for_jac_sweep.hpp

    r3495 r3639  
    337337
    338338                        case ErfOp:
    339                         CPPAD_ASSERT_NARG_NRES(op, 1, 1);
     339                        CPPAD_ASSERT_NARG_NRES(op, 3, 5);
    340340                        forward_sparse_jacobian_unary_op(
    341341                                i_var, arg[0], var_sparsity
  • stable/20150000/cppad/local/hash_code.hpp

    r3359 r3639  
    218218                case CosOp:
    219219                case CoshOp:
     220                case ErfOp:
    220221                case ExpOp:
    221222                case LogOp:
  • stable/20150000/cppad/local/optimize.hpp

    r3624 r3639  
    14161416                        case CoshOp:
    14171417                        case DivvpOp:
     1418                        case ErfOp:
    14181419                        case ExpOp:
    14191420                        case LogOp:
     
    21752176                        }
    21762177                        break;
     2178
     2179                        case ErfOp:
     2180                        // 20150000 version does not optimzie this out
     2181                        // next years version does.
     2182                        {       CPPAD_ASSERT_UNKNOWN( NumArg(ErfOp) == 3 );
     2183                                // second argument is always parameter 0
     2184                                // third argument is always parameter 2 / sqrt(pi)
     2185                                tape[i_var].new_op  = rec->num_op_rec();
     2186                                tape[i_var].new_var = rec->PutOp(op);
     2187                                rec->PutArg( tape[ arg[0] ].new_var );
     2188                                rec->PutArg( rec->PutPar( Base(0) ) );
     2189                                rec->PutArg( rec->PutPar(
     2190                                        Base( 1.0 / std::sqrt( std::atan(1.0) ) )
     2191                                ) );
     2192                        }
     2193                        break;
     2194
    21772195                        // ---------------------------------------------------
    21782196                        // Binary operators where
  • stable/20150000/cppad/local/rev_hes_sweep.hpp

    r3495 r3639  
    359359
    360360                        case ErfOp:
    361                         CPPAD_ASSERT_NARG_NRES(op, 1, 1)
     361                        CPPAD_ASSERT_NARG_NRES(op, 3, 5)
    362362                        reverse_sparse_hessian_nonlinear_unary_op(
    363363                        i_var, arg[0], RevJac, for_jac_sparse, rev_hes_sparse
  • stable/20150000/doc.omh

    r3634 r3639  
    9696$comment bin/version assumes that : follows cppad version number here$$
    9797$section
    98 cppad-20150000.5: A Package for Differentiation of C++ Algorithms
     98cppad-20150000.6: A Package for Differentiation of C++ Algorithms
    9999$$
    100100
  • stable/20150000/omh/install/download.omh

    r3634 r3639  
    6464$rnext
    6565current  $cnext EPL $cnext $href%
    66 http://www.coin-or.org/download/source/CppAD/cppad-20150000.5.epl.tgz%
    67 cppad-20150000.5.epl.tgz%$$
     66http://www.coin-or.org/download/source/CppAD/cppad-20150000.6.epl.tgz%
     67cppad-20150000.6.epl.tgz%$$
    6868$rnext
    6969current  $cnext GPL $cnext $href%
    70 http://www.coin-or.org/download/source/CppAD/cppad-20150000.5.gpl.tgz%
    71 cppad-20150000.5.gpl.tgz%$$
     70http://www.coin-or.org/download/source/CppAD/cppad-20150000.6.gpl.tgz%
     71cppad-20150000.6.gpl.tgz%$$
    7272$rnext
    7373old      $cnext Both $cnext
  • stable/20150000/test_more/optimize.cpp

    r3634 r3639  
    546546                return ok;
    547547        }
     548        bool depend_four(void)
     549        {       // erf function is a special case for optimize
     550                bool ok = true;
     551# if CPPAD_COMPILER_HAS_ERF
     552                using CppAD::AD;
     553                using CppAD::vector;
     554
     555                size_t n = 1;
     556                size_t m = 1;
     557                vector< AD<double> > X(n), Y(m);
     558                vector<double>       x(n);
     559                X[0] = x[0] = double(0.5);
     560
     561                CppAD::Independent(X);
     562
     563                Y[0] = erf(X[0]) + erf(X[0]);
     564
     565                CppAD::ADFun<double> F(X, Y);
     566
     567                vector<double> y_original     = F.Forward(0, x);
     568                size_t         size_original  = F.size_var();
     569                F.optimize();
     570                // version 20150000 does not remove duplicate erf function calls.
     571                ok &= F.size_var() == size_original;
     572                vector<double> y = F.Forward(0, x);
     573                ok &=  CppAD::NearEqual(y[0], y_original[0], 1e-10, 1e-10);
     574# endif
     575                return ok;
     576        }
    548577        // ===================================================================
    549578        // Test duplicate operation analysis
     
    16521681        ok     &= depend_two();
    16531682        ok     &= depend_three();
     1683        ok     &= depend_four();
    16541684        // check removal of duplicate expressions
    16551685        ok     &= duplicate_one();
Note: See TracChangeset for help on using the changeset viewer.