Changeset 3623


Ignore:
Timestamp:
Jan 29, 2015 6:42:49 AM (5 years ago)
Author:
bradbell
Message:

merge to branch: trunk
from repository: https://github.com/coin-or/CppAD
start hash code: 8d095acd93f572f8bd9611b329f52bd75b2ee4db
end hash code: dcce793a61e2cc6e1e6e8def4da195608bf34232

commit dcce793a61e2cc6e1e6e8def4da195608bf34232
Author: Brad Bell <bradbell@…>
Date: Thu Jan 29 04:26:36 2015 -0700

whats_new_15.omh: User's view of previous commit.

commit 4fc9232c954df8de3da79db8a46d663d10f020d5
Author: Brad Bell <bradbell@…>
Date: Thu Jan 29 04:22:40 2015 -0700

Fix some warnings generated by g++ 4.9.2.

commit b4c435e7cc77b17bd84e4f79128d772209957011
Author: Brad Bell <bradbell@…>
Date: Wed Jan 28 09:03:22 2015 -0700

Fix two doxygen multiple use of section label errors.

commit e827745d08bd08dfe496c99ad127f17488225d35
Author: Brad Bell <bradbell@…>
Date: Wed Jan 28 08:38:25 2015 -0700

new_release.sh: Changes tested on release 20150000.4.

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/bin/new_release.sh

    r3614 r3623  
    2424svn_repository="https://projects.coin-or.org/svn/CppAD"
    2525stable_version="20150000"
    26 release='3'
     26release='4'
    2727release_version="$stable_version.$release"
    2828# -----------------------------------------------------------------------------
     
    8989then
    9090        git tag -d $release_version
     91        git push --delete origin $release_version
    9192fi
     93#
    9294git tag -a \
    9395        -m "corresponds $svn_repository/releases/$release_version" \
    9496        $release_version
     97#
     98git push origin $release_version
    9599# -----------------------------------------------------------------------------
    96100msg="Creating releases/$release_version"
  • trunk/cppad/local/load_op.hpp

    r3322 r3623  
    44
    55/* --------------------------------------------------------------------------
    6 CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-14 Bradley M. Bell
     6CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-15 Bradley M. Bell
    77
    88CppAD is distributed under multiple licenses. This distribution is under
     
    234234        CPPAD_ASSERT_UNKNOWN( NumRes(LdpOp) == 1 );
    235235        CPPAD_ASSERT_UNKNOWN( 0 < arg[0] );
    236         CPPAD_ASSERT_UNKNOWN( arg[2] < play->num_load_op_rec() );
    237 
    238         // Because the index is a parameter, this indexing error should be
    239         // caught and reported to the user at an when the tape is recording.
     236        CPPAD_ASSERT_UNKNOWN( size_t(arg[2]) < play->num_load_op_rec() );
     237
     238        // Because the index is a parameter, this indexing error should have been
     239        // caught and reported to the user when the tape is recording.
    240240        size_t i_vec = arg[1];
    241241        CPPAD_ASSERT_UNKNOWN( i_vec < index_by_ind[ arg[0] - 1 ] );
     
    277277        CPPAD_ASSERT_UNKNOWN( NumRes(LdvOp) == 1 );
    278278        CPPAD_ASSERT_UNKNOWN( 0 < arg[0] );
    279         CPPAD_ASSERT_UNKNOWN( arg[2] < play->num_load_op_rec() );
     279        CPPAD_ASSERT_UNKNOWN( size_t(arg[2]) < play->num_load_op_rec() );
    280280
    281281        size_t i_vec = Integer( taylor[ arg[1] * cap_order + 0 ] );
     
    395395        CPPAD_ASSERT_UNKNOWN( 0 < p);
    396396        CPPAD_ASSERT_UNKNOWN( p <= q );
    397         CPPAD_ASSERT_UNKNOWN( arg[2] < play->num_load_op_rec() );
     397        CPPAD_ASSERT_UNKNOWN( size_t(arg[2]) < play->num_load_op_rec() );
    398398
    399399        size_t i_var = size_t( var_by_load_op[ arg[2] ] );
  • trunk/cppad/local/optimize.hpp

    r3607 r3623  
    22772277                                tape[i_var].new_var = rec->PutOp(op);
    22782278                                CPPAD_ASSERT_UNKNOWN(
    2279                                         size_t(new_arg[1]) < tape[i_var].new_var
     2279                                        new_arg[1] < tape[i_var].new_var
    22802280                                );
    22812281                                replace_hash = true;
  • trunk/cppad_ipopt/example/ode_check.cpp

    r2683 r3623  
    11/* $Id$ */
    22/* --------------------------------------------------------------------------
    3 CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-12 Bradley M. Bell
     3CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-15 Bradley M. Bell
    44
    55CppAD is distributed under multiple licenses. This distribution is under
     
    101101        ok &= CppAD::NearEqual(check, obj_value, rel_tol, abs_tol);
    102102
     103        // Use this empty namespace function to avoid warning that it is not used
     104        static size_t ode_check_count = 0;
     105        ode_check_count++;
     106        ok &= count_eval_r() == ode_check_count;
     107
    103108        return ok;
    104109}
  • trunk/cppad_ipopt/src/cppad_ipopt_nlp.cpp

    r3223 r3623  
    394394\param[in] new_x
    395395is false if the previous call to any one of the
    396 \ref Evaluation_Methods used the same value for \c x.
     396\ref Deprecated_Evaluation_Methods used the same value for \c x.
    397397
    398398\param[out] obj_value
     
    400400
    401401\return
    402 The return value is always true; see \ref Evaluation_Methods.
     402The return value is always true; see \ref Deprecated_Evaluation_Methods.
    403403
    404404\par Efficiency
     
    480480\param[in] new_x
    481481is false if the previous call to any one of the
    482 \ref Evaluation_Methods used the same value for \c x.
     482\ref Deprecated_Evaluation_Methods used the same value for \c x.
    483483
    484484\param[out] grad_f
     
    489489
    490490\return
    491 The return value is always true; see \ref Evaluation_Methods.
     491The return value is always true; see \ref Deprecated_Evaluation_Methods.
    492492*/
    493493bool cppad_ipopt_nlp::eval_grad_f(
     
    573573\param[in] new_x
    574574is false if the previous call to any one of the
    575 \ref Evaluation_Methods used the same value for \c x.
     575\ref Deprecated_Evaluation_Methods used the same value for \c x.
    576576
    577577\param[in] m
     
    585585
    586586\return
    587 The return value is always true; see \ref Evaluation_Methods.
     587The return value is always true; see \ref Deprecated_Evaluation_Methods.
    588588*/
    589589bool cppad_ipopt_nlp::eval_g(
     
    662662\param[in] new_x
    663663is false if the previous call to any one of the
    664 \ref Evaluation_Methods used the same value for \c x.
     664\ref Deprecated_Evaluation_Methods used the same value for \c x.
    665665
    666666\param[in] m
     
    701701
    702702\return
    703 The return value is always true; see \ref Evaluation_Methods.
     703The return value is always true; see \ref Deprecated_Evaluation_Methods.
    704704*/
    705705bool cppad_ipopt_nlp::eval_jac_g(Index n, const Number* x, bool new_x,
     
    786786Evaluate the Hessian of the Lagragian
    787787
    788 \section The_Hessian_of_the_Lagragian The Hessian of the Lagragian
     788\section Deprecated_Hessian_of_the_Lagragian The Hessian of the Lagragian
    789789The Hessian of the Lagragian is defined as
    790790\f[
     
    804804\param[in] new_x
    805805is false if the previous call to any one of the
    806 \ref Evaluation_Methods used the same value for \c x.
     806\ref Deprecated_Evaluation_Methods used the same value for \c x.
    807807
    808808\param[in] obj_factor
    809809the value \f$ \sigma \f$ multiplying the Hessian of
    810 f(x) in the expression for \ref The_Hessian_of_the_Lagragian.
     810f(x) in the expression for \ref Deprecated_Hessian_of_the_Lagragian.
    811811
    812812\param[in] m
     
    816816if \c values is not \c NULL, \c lambda
    817817is a vector of size \c m specifing the value of \f$ \lambda \f$
    818 in the expression for \ref The_Hessian_of_the_Lagragian.
     818in the expression for \ref Deprecated_Hessian_of_the_Lagragian.
    819819
    820820\param[in] new_lambda
     
    857857
    858858\return
    859 The return value is always true; see \ref Evaluation_Methods.
     859The return value is always true; see \ref Deprecated_Evaluation_Methods.
    860860*/
    861861bool cppad_ipopt_nlp::eval_h(Index n, const Number* x, bool new_x,
  • trunk/cppad_ipopt/src/cppad_ipopt_nlp.hpp

    r3607 r3623  
    721721\f$ r_k : {\bf R}^{q(k)} \rightarrow {\bf R}^{p(k)} \f$.
    722722
    723 \section Evaluation_Methods Evaluation Methods
     723\section Deprecated_Evaluation_Methods Evaluation Methods
    724724The set of evaluation methods for this class is
    725725\verbatim
  • trunk/omh/whats_new/whats_new_15.omh

    r3617 r3623  
    3333The purpose of this section is to
    3434assist you in learning about changes between various versions of CppAD.
     35
     36$head 01-29$$
     37Fix some warnings generated by $code g++ 4.9.2$$.
    3538
    3639$head 01-26$$
Note: See TracChangeset for help on using the changeset viewer.