Changeset 3671


Ignore:
Timestamp:
Apr 7, 2015 11:36:16 AM (5 years ago)
Author:
bradbell
Message:

merge to branch: trunk
from repository: https://github.com/coin-or/CppAD
start hash code: f5e0577b12bc56554f95ed2d3897c11e267fa0ab
end hash code: 5206ad739385a8aa124401c5dcaf04c7de56a216

commit 5206ad739385a8aa124401c5dcaf04c7de56a216
Author: Brad Bell <bradbell@…>
Date: Tue Apr 7 08:33:44 2015 -0700

Remove trialing white space.

commit b4c86cfb419d68c3bb07a2e74c80669182990a97
Author: Brad Bell <bradbell@…>
Date: Tue Apr 7 08:32:59 2015 -0700

value.hpp: Add see also var2par.
var2par.hpp: add see also value.
check_copyright.sh: bring up to date so works with Brad's new git_commit.sh

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/bin/check_copyright.sh

    r3580 r3671  
    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#
     
    1616        exit 1
    1717fi
    18 if [ -d '.git' ]
    19 then
    20         scc='git'
    21 elif [ -d '.svn' ]
    22 then
    23         scc='svn'
    24 else
    25         echo 'check_copright.sh: cannot find .git or .svn'
    26         exit 1
    27 fi
    28 if ! ${scc}_commit.sh list > /dev/null
    29 then
    30         ${scc}_commit.sh list
    31 fi
    32 list=`${scc}_commit.sh list | sed -e '/makefile.in$/d'`
     18list=`git status | sed -n \
     19        -e '/^[#\t ]*deleted:/p' \
     20        -e '/^[#\t ]*modified:/p' \
     21        -e '/^[#\t ]*both modified:/p' \
     22        -e '/^[#\t ]*renamed:/p' \
     23        -e '/^[#\t ]*new file:/p' | \
     24            sed -e 's/^.*: *//' -e 's/ -> /\n/' | \
     25                        sed -e '/makefile.in$/d' |
     26                sort -u`
    3327cat << EOF > check_copyright.1.$$
    3428# Change copyright second year to current year
  • trunk/cppad/local/value.hpp

    r2506 r3671  
    44
    55/* --------------------------------------------------------------------------
    6 CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-12 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
    9 the terms of the 
     9the terms of the
    1010                    Eclipse Public License Version 1.0.
    1111
     
    3131$icode%b% = Value(%x%)%$$
    3232
     33$head See Also$$
     34$cref var2par$$
     35
    3336
    3437$head Purpose$$
     
    4952
    5053$head Operation Sequence$$
    51 The result of this operation is not an 
     54The result of this operation is not an
    5255$cref/AD of Base/glossary/AD of Base/$$ object.
    5356Thus it will not be recorded as part of an
     
    5659
    5760$head Restriction$$
    58 If the argument $icode x$$ is a 
    59 $cref/variable/glossary/Variable/$$ its dependency information 
     61If the argument $icode x$$ is a
     62$cref/variable/glossary/Variable/$$ its dependency information
    6063would not be included in the $code Value$$ result (see above).
    6164For this reason,
     
    8184template <class Base>
    8285CPPAD_INLINE_FRIEND_TEMPLATE_FUNCTION
    83 Base Value(const AD<Base> &x) 
     86Base Value(const AD<Base> &x)
    8487{       Base result;
    8588
    8689        CPPAD_ASSERT_KNOWN(
    8790                Parameter(x) ,
    88                 "Value: argument is a variable (not a parameter)" 
     91                "Value: argument is a variable (not a parameter)"
    8992        );
    90                
     93
    9194
    9295        result = x.value_;
  • trunk/cppad/local/var2par.hpp

    r2506 r3671  
    44
    55/* --------------------------------------------------------------------------
    6 CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-12 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
    9 the terms of the 
     9the terms of the
    1010                    Eclipse Public License Version 1.0.
    1111
     
    3333$icode%y% = Var2Par(%x%)%$$
    3434
     35$head See Also$$
     36$cref value$$
     37
    3538
    3639$head Purpose$$
    37 Returns a 
     40Returns a
    3841$cref/parameter/glossary/Parameter/$$ $icode y$$
    39 with the same value as the 
     42with the same value as the
    4043$cref/variable/glossary/Variable/$$ $icode x$$.
    4144
     
    4447$codei%
    4548        const AD<%Base%> &x
    46 %$$ 
     49%$$
    4750The argument $icode x$$ may be a variable or parameter.
    4851
     
    5255$codei%
    5356        AD<%Base%> &y
    54 %$$ 
    55 The return value $icode y$$ will be a parameter. 
     57%$$
     58The return value $icode y$$ will be a parameter.
    5659
    5760
     
    8386CPPAD_INLINE_FRIEND_TEMPLATE_FUNCTION
    8487AD<Base> Var2Par(const VecAD_reference<Base> &x)
    85 {       AD<Base> y(x.ADBase()); 
     88{       AD<Base> y(x.ADBase());
    8689        y.id_ = 0;
    8790}
Note: See TracChangeset for help on using the changeset viewer.