Changeset 3758


Ignore:
Timestamp:
Nov 30, 2015 10:29:22 AM (5 years ago)
Author:
bradbell
Message:

merge to branch: trunk
from repository: https://github.com/coin-or/CppAD
start hash code: aec9ede58726ce1a40825eac63d4d8f7cb40bfba
end hash code: 795afdb7877d874de9be24a5d13930f3144eeb78

commit 795afdb7877d874de9be24a5d13930f3144eeb78
Author: Brad Bell <bradbell@…>
Date: Mon Nov 30 07:27:03 2015 -0800

makefile.am: fix error (misplaced line continuation character).
jenkins.sh: fix comment.
makefile.in: automatic changes corresponding to makefile.am.

commit c139a1e9a0610595cbe312d696c331e5119f11d6
Author: Brad Bell <bradbell@…>
Date: Mon Nov 30 05:28:32 2015 -0800

Automatic changes in makefile.in corresponding to bin/batch_edit.sh
changes to correpsonding makefile.am.


configure.ac: check for cppad/cppad.hpp (cppad/CppAD.h no longer exists).
whats_new_15.omh: comments related to auto-tools install.

commit 3a6e7eebde8a697eeab816340b2a5bff964ddb4f
Author: Brad Bell <bradbell@…>
Date: Mon Nov 30 05:11:48 2015 -0800

Improve utility section documentation and split out numeric_ad section.

commit 0f55b73f76724630d4b8736023dc70d402b04689
Author: Brad Bell <bradbell@…>
Date: Mon Nov 30 04:45:28 2015 -0800

Fix the include part of the documentation syntax for the utilities.

commit cb2b0d2fe2c96f74f693d674c42006c86e6b7ae5
Author: Brad Bell <bradbell@…>
Date: Mon Nov 30 04:08:56 2015 -0800

add list of svn commands at top of file

Location:
trunk
Files:
1 added
27 edited

Legend:

Unmodified
Added
Removed
  • trunk/bin/jenkins.sh

    r3730 r3758  
    100100fi
    101101# -----------------------------------------------------------------------
    102 # Use trunk_dir/../build to build and test CppAD (no reuse)
     102# Use trunk_dir/build/auto_tools to build and test CppAD (no reuse)
    103103echo_eval cd build
    104104echo_eval rm -rf auto_tools
  • trunk/bin/push_git2svn.py

    r3666 r3758  
    1111# Please visit http://www.coin-or.org/CppAD/ for information on other licenses.
    1212# -----------------------------------------------------------------------------
     13from __future__ import print_function
     14# -----------------------------------------------------------------------------
     15# list of svn commands to execute in the svn directory before make changes
     16# indicated by git directory; some example commands are included below
     17svn_commands = [
     18        # 'svn mkdir  cppad/utility',
     19        # 'svn move cppad/*.hpp                    cppad/utility',
     20        # 'svn move cppad/utility/cppad.hpp        cppad/cppad.hpp',
     21        # 'svn move cppad/utility/base_require.hpp cppad/base_require.hpp',
     22        # 'svn move omh/library.omh                omh/utility.omh'
     23]
     24# -----------------------------------------------------------------------------
    1325# imports
    14 from __future__ import print_function
    1526import sys
    1627import os
     
    135146        print_system(cmd)
    136147# ----------------------------------------------------------------------------
     148tmp = os.getcwd()
     149os.chdir( svn_directory )
     150for cmd in svn_commands :
     151        assert cmd.startswith('svn')
     152        print_system(cmd)
     153os.chdir( tmp )
     154# ----------------------------------------------------------------------------
    137155# git hash code corresponding to verison in svn directory
    138156cmd           = 'svn info ' + svn_directory
  • trunk/configure

    r3745 r3758  
    623623#endif"
    624624
    625 ac_unique_file="cppad/CppAD.h"
     625ac_unique_file="cppad/cppad.hpp"
    626626ac_subst_vars='am__EXEEXT_FALSE
    627627am__EXEEXT_TRUE
  • trunk/configure.ac

    r3754 r3758  
    548548
    549549
    550 dnl Have configure check source directory to see if cppad/CppAD.h is there
    551 AC_CONFIG_SRCDIR(cppad/CppAD.h)
     550dnl Have configure check source directory to see if cppad/cppad.hpp is there
     551AC_CONFIG_SRCDIR(cppad/cppad.hpp)
    552552
    553553dnl AC_PROG_CP outputs CPP as command to run C preprocessor
  • trunk/cppad/utility/check_numeric_type.hpp

    r3757 r3758  
    2626
    2727$head Syntax$$
    28 $code%# include <cppad/utility.hpp>$$
    29 $pre
    30 $$
     28$codei%# include <cppad/utility.hpp>
     29%$$
    3130$codei%CheckNumericType<%NumericType%>()%$$
    3231
  • trunk/cppad/utility/check_simple_vector.hpp

    r3757 r3758  
    2727
    2828$head Syntax$$
    29 $code%# include <cppad/utility.hpp>$$
    30 $pre
    31 $$
     29$codei%# include <cppad/utility.hpp>
     30%$$
    3231$codei%CheckSimpleVector<%Scalar%, %Vector%>()%$$
    3332$pre
  • trunk/cppad/utility/elapsed_seconds.hpp

    r3757 r3758  
    1717$begin elapsed_seconds$$
    1818$spell
     19        cppad.hpp
    1920        Microsoft
    2021        gettimeofday
     
    2829
    2930$head Syntax$$
     31$codei%# include <cppad/utility.hpp>
     32%$$
    3033$icode%s% = elapsed_seconds()%$$
    3134
  • trunk/cppad/utility/error_handler.hpp

    r3757 r3758  
    2727
    2828$head Syntax$$
     29$codei%# include <cppad/utility.hpp>
     30%$$
    2931$codei%ErrorHandler %info%(%handler%)
    3032%$$
  • trunk/cppad/utility/index_sort.hpp

    r3757 r3758  
    2727
    2828$head Syntax$$
    29 $codei%# include <cppad/near_equal.hpp>
    30 index_sort(%keys%, %ind%)%$$
     29$codei%# include <cppad/utility.hpp>
     30%$$
     31$codei%index_sort(%keys%, %ind%)%$$
    3132
    3233$head keys$$
  • trunk/cppad/utility/lu_factor.hpp

    r3757 r3758  
    3838$$
    3939
    40 $head Syntax$$ $code%# include <cppad/utility.hpp>$$
    41 $pre
    42 $$
     40$head Syntax$$ $codei%# include <cppad/utility.hpp>
     41%$$
    4342$icode%sign% = LuFactor(%ip%, %jp%, %LU%)%$$
    4443
  • trunk/cppad/utility/lu_invert.hpp

    r3757 r3758  
    3636$$
    3737
    38 $head Syntax$$ $code%# include <cppad/utility.hpp>$$
    39 $pre
    40 $$
     38$head Syntax$$ $codei%# include <cppad/utility.hpp>
     39%$$
    4140$codei%LuInvert(%ip%, %jp%, %LU%, %X%)%$$
    4241
  • trunk/cppad/utility/lu_solve.hpp

    r3757 r3758  
    4141$$
    4242
    43 $head Syntax$$ $code%# include <cppad/utility.hpp>$$
    44 $pre
    45 $$
     43$head Syntax$$ $codei%# include <cppad/utility.hpp>
     44%$$
    4645$icode%signdet% = LuSolve(%n%, %m%, %A%, %B%, %X%, %logdet%)%$$
    4746
  • trunk/cppad/utility/memory_leak.hpp

    r3757 r3758  
    1616$begin memory_leak$$
    1717$spell
     18        cppad
    1819        num
    1920        alloc
     
    3132
    3233$head Syntax$$
     34$codei%# include <cppad/utility.hpp>
     35%$$
    3336$icode%flag% = %memory_leak()
    3437%$$
  • trunk/cppad/utility/near_equal.hpp

    r3757 r3758  
    3535$head Syntax$$
    3636
    37 $code%# include <cppad/utility.hpp>$$
    38 $pre
    39 $$
     37$codei%# include <cppad/utility.hpp>
     38%$$
    4039$icode%b% = NearEqual(%x%, %y%, %r%, %a%)%$$
    4140
  • trunk/cppad/utility/ode_err_control.hpp

    r3757 r3758  
    4545
    4646$head Syntax$$
    47 $code%# include <cppad/utility.hpp>$$
    48 $pre
    49 $$
     47$codei%# include <cppad/utility.hpp>
     48%$$
    5049$icode%xf% = OdeErrControl(%method%, %ti%, %tf%, %xi%,
    5150        %smin%, %smax%, %scur%, %eabs%, %erel%, %ef% , %maxabs%, %nstep% )%$$
  • trunk/cppad/utility/omp_alloc.hpp

    r3757 r3758  
    2525$begin omp_max_num_threads$$
    2626$spell
     27        cppad.hpp
    2728        inv
    2829        CppAD
     
    3738
    3839$head Syntax$$
     40$codei%# include <cppad/utility.hpp>
     41%$$
    3942$codei%omp_alloc::set_max_num_threads(%number%)
    4043%$$
     
    9699$mindex in_parallel$$
    97100$spell
     101        cppad.hpp
    98102        omp_alloc
    99103        bool
     
    104108
    105109$head Syntax$$
     110$codei%# include <cppad/utility.hpp>
     111%$$
    106112$icode%flag% = omp_alloc::in_parallel()%$$
    107113
     
    139145$begin omp_get_thread_num$$
    140146$spell
     147        cppad.hpp
    141148        CppAD
    142149        num
     
    152159
    153160$head Syntax$$
     161$codei%# include <cppad/utility.hpp>
     162%$$
    154163$icode%thread% = omp_alloc::get_thread_num()%$$
    155164
     
    184193$begin omp_get_memory$$
    185194$spell
     195        cppad.hpp
    186196        num
    187197        ptr
     
    195205
    196206$head Syntax$$
     207$codei%# include <cppad/utility.hpp>
     208%$$
    197209$icode%v_ptr% = omp_alloc::get_memory(%min_bytes%, %cap_bytes%)%$$
    198210
     
    267279$begin omp_return_memory$$
    268280$spell
     281        cppad.hpp
    269282        ptr
    270283        omp_alloc
     
    278291
    279292$head Syntax$$
     293$codei%# include <cppad/utility.hpp>
     294%$$
    280295$codei%omp_alloc::return_memory(%v_ptr%)%$$
    281296
     
    331346$begin omp_free_available$$
    332347$spell
     348        cppad.hpp
    333349        omp_alloc
    334350$$
     
    342358
    343359$head Syntax$$
     360$codei%# include <cppad/utility.hpp>
     361%$$
    344362$codei%omp_alloc::free_available(%thread%)%$$
    345363
     
    375393$begin omp_inuse$$
    376394$spell
     395        cppad.hpp
    377396        num
    378397        inuse
     
    386405
    387406$head Syntax$$
     407$codei%# include <cppad/utility.hpp>
     408%$$
    388409$icode%num_bytes% = omp_alloc::inuse(%thread%)%$$
    389410Use the function $cref/thread_alloc::inuse/ta_inuse/$$ instead.
     
    433454$begin omp_available$$
    434455$spell
     456        cppad.hpp
    435457        num
    436458        omp_alloc
     
    443465
    444466$head Syntax$$
     467$codei%# include <cppad/utility.hpp>
     468%$$
    445469$icode%num_bytes% = omp_alloc::available(%thread%)%$$
    446470
     
    482506$begin omp_create_array$$
    483507$spell
     508        cppad.hpp
    484509        omp_alloc
    485510        sizeof
     
    493518
    494519$head Syntax$$
     520$codei%# include <cppad/utility.hpp>
     521%$$
    495522$icode%array% = omp_alloc::create_array<%Type%>(%size_min%, %size_out%)%$$.
    496523
     
    574601$begin omp_delete_array$$
    575602$spell
     603        cppad.hpp
    576604        omp_alloc
    577605        sizeof
     
    585613
    586614$head Syntax$$
     615$codei%# include <cppad/utility.hpp>
     616%$$
    587617$codei%omp_alloc::delete_array(%array%)%$$.
    588618
     
    643673$begin omp_efficient$$
    644674$spell
     675        cppad.hpp
    645676        omp_alloc
    646677        ptr
     
    657688
    658689$head Syntax$$
     690$codei%# include <cppad/utility.hpp>
     691%$$
    659692$icode%flag% = omp_alloc::efficient(%v_ptr%, %num_bytes%)%$$
    660693
     
    708741$begin old_max_num_threads$$
    709742$spell
     743        cppad.hpp
    710744        inv
    711745        CppAD
     
    722756
    723757$head Syntax$$
     758$codei%# include <cppad/utility.hpp>
     759%$$
    724760$codei%omp_alloc::max_num_threads(%number%)%$$
    725761
  • trunk/cppad/utility/poly.hpp

    r3757 r3758  
    3333
    3434$head Syntax$$
    35 $code%# include <cppad/utility.hpp>$$
    36 $pre
    37 $$
     35$codei%# include <cppad/utility.hpp>
     36%$$
    3837$icode%p% = Poly(%k%, %a%, %z%)%$$
    3938
  • trunk/cppad/utility/pow_int.hpp

    r3757 r3758  
    2929
    3030$head Syntax$$
    31 $code%# include <cppad/utility.hpp>$$
    32 $pre
    33 $$
     31$codei%# include <cppad/utility.hpp>
     32%$$
    3433$icode%z% = pow(%x%, %y%)%$$
    3534
  • trunk/cppad/utility/romberg_mul.hpp

    r3757 r3758  
    2828
    2929$head Syntax$$
    30 $code%# include <cppad/utility.hpp>$$
    31 $pre
    32 $$
     30$codei%# include <cppad/utility.hpp>
     31%$$
    3332$codei%RombergMul<%Fun%, %SizeVector%, %FloatVector%, %m%> %R%$$
    3433$pre
  • trunk/cppad/utility/romberg_one.hpp

    r3757 r3758  
    2828
    2929$head Syntax$$
    30 $code%# include <cppad/utility.hpp>$$
    31 $pre
    32 $$
     30$codei%# include <cppad/utility.hpp>
     31%$$
    3332$icode%r% = RombergOne(%F%, %a%, %b%, %n%, %e%)%$$
    3433
  • trunk/cppad/utility/speed_test.hpp

    r3757 r3758  
    3737
    3838$head Syntax$$
    39 $code%# include <cppad/utility.hpp>$$
    40 $pre
    41 $$
     39$codei%# include <cppad/utility.hpp>
     40%$$
    4241$icode%rate_vec% = speed_test(%test%, %size_vec%, %time_min%)%$$
    4342
     
    210209$head Syntax$$
    211210
    212 $code%# include <cppad/utility.hpp>$$
    213 $pre
    214 $$
     211$codei%# include <cppad/utility.hpp>
     212%$$
    215213$codei%SpeedTest(%Test%, %first%, %inc%, %last%)%$$
    216214
  • trunk/makefile.am

    r3757 r3758  
    7777        $(SPEED_TESTS)
    7878else
     79        SPEED_TESTS =
    7980        SPEED_DIRS =
    8081endif
     
    8687#
    8788nobase_myinclude_HEADERS =  \
    88         \
    89         cppad/utility.hpp
     89        cppad/utility.hpp \
    9090        cppad/base_require.hpp \
    9191        cppad/utility/check_numeric_type.hpp \
  • trunk/makefile.in

    r3756 r3758  
    478478#
    479479nobase_myinclude_HEADERS = \
    480         cppad/CheckNumericType.h \
    481         cppad/CheckSimpleVector.h \
    482         cppad/CppAD.h \
    483         cppad/CppAD_vector.h \
    484         cppad/ErrorHandler.h \
    485         cppad/LuFactor.h \
    486         cppad/LuInvert.h \
    487         cppad/LuSolve.h \
    488         cppad/NearEqual.h \
    489         cppad/OdeErrControl.h \
    490         cppad/OdeGearControl.h \
    491         cppad/OdeGear.h \
    492         cppad/Poly.h \
    493         cppad/PowInt.h \
    494         cppad/RombergMul.h \
    495         cppad/RombergOne.h \
    496         cppad/Rosen34.h \
    497         cppad/Runge45.h \
    498         cppad/SpeedTest.h \
    499         cppad/TrackNewDel.h \
    500         \
     480        cppad/utility.hpp \
    501481        cppad/base_require.hpp \
    502         cppad/check_numeric_type.hpp \
    503         cppad/check_simple_vector.hpp \
     482        cppad/utility/check_numeric_type.hpp \
     483        cppad/utility/check_simple_vector.hpp \
    504484        cppad/configure.hpp \
    505485        cppad/cppad.hpp \
    506         cppad/elapsed_seconds.hpp \
     486        cppad/utility/elapsed_seconds.hpp \
    507487        cppad/example/base_adolc.hpp \
    508488        cppad/example/cppad_eigen.hpp \
    509489        cppad/example/eigen_plugin.hpp \
    510490        cppad/example/matrix_mul.hpp \
    511         cppad/error_handler.hpp \
    512         cppad/index_sort.hpp \
     491        cppad/utility/error_handler.hpp \
     492        cppad/utility/index_sort.hpp \
    513493        cppad/ipopt/solve.hpp \
    514494        cppad/ipopt/solve_callback.hpp \
     
    673653        cppad/local/zdouble.hpp \
    674654        cppad/local/zmul_op.hpp \
    675         cppad/lu_factor.hpp \
    676         cppad/lu_invert.hpp \
    677         cppad/lu_solve.hpp \
    678         cppad/memory_leak.hpp \
    679         cppad/nan.hpp \
    680         cppad/near_equal.hpp \
    681         cppad/ode_err_control.hpp \
    682         cppad/ode_gear_control.hpp \
    683         cppad/ode_gear.hpp \
    684         cppad/omp_alloc.hpp \
    685         cppad/poly.hpp \
    686         cppad/pow_int.hpp \
    687         cppad/romberg_mul.hpp \
    688         cppad/romberg_one.hpp \
    689         cppad/rosen_34.hpp \
    690         cppad/runge_45.hpp \
     655        cppad/utility/lu_factor.hpp \
     656        cppad/utility/lu_invert.hpp \
     657        cppad/utility/lu_solve.hpp \
     658        cppad/utility/memory_leak.hpp \
     659        cppad/utility/nan.hpp \
     660        cppad/utility/near_equal.hpp \
     661        cppad/utility/ode_err_control.hpp \
     662        cppad/utility/ode_gear_control.hpp \
     663        cppad/utility/ode_gear.hpp \
     664        cppad/utility/omp_alloc.hpp \
     665        cppad/utility/poly.hpp \
     666        cppad/utility/pow_int.hpp \
     667        cppad/utility/romberg_mul.hpp \
     668        cppad/utility/romberg_one.hpp \
     669        cppad/utility/rosen_34.hpp \
     670        cppad/utility/runge_45.hpp \
    691671        cppad/speed/det_33.hpp \
    692672        cppad/speed/det_by_lu.hpp \
     
    698678        cppad/speed/sparse_hes_fun.hpp \
    699679        cppad/speed/sparse_jac_fun.hpp \
    700         cppad/speed_test.hpp \
     680        cppad/utility/speed_test.hpp \
    701681        cppad/speed/uniform_01.hpp \
    702         cppad/thread_alloc.hpp \
    703         cppad/time_test.hpp \
    704         cppad/track_new_del.hpp \
    705         cppad/vector.hpp
     682        cppad/utility/thread_alloc.hpp \
     683        cppad/utility/time_test.hpp \
     684        cppad/utility/track_new_del.hpp \
     685        cppad/utility/vector.hpp
    706686
    707687# End nobase_myinclude_HEADERS (check_makefile.sh uses this comment)
     
    13301310$(top_srcdir)/cppad/configure.hpp: cppad/configure.hpp
    13311311        cp cppad/configure.hpp $(top_srcdir)/cppad/configure.hpp
     1312@CppAD_HAVE_AR_FALSE@   SPEED_TESTS =
    13321313@CppAD_HAVE_AR_FALSE@   SPEED_DIRS =
    13331314
  • trunk/omh/appendix.omh

    r3627 r3758  
    11$Id$
    22/* --------------------------------------------------------------------------
    3 CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-14 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
    6 the terms of the 
     6the terms of the
    77                    Eclipse Public License Version 1.0.
    88
     
    2626        omh/deprecated/deprecated.omh%
    2727        compare_c/CMakeLists.txt%
     28        omh/numeric_ad.omh%
    2829        omh/license.omh
    2930%$$
  • trunk/omh/utility.omh

    r3757 r3758  
    1616        namespace
    1717        alloc
     18        cppad.hpp
    1819$$
    1920
    2021
    2122$section Some General Purpose Utilities$$
     23These routines can be included separate from the rest of CppAD using
     24$codep
     25        # include <cppad/utility.hpp>
     26$$
     27They will also be included, along with the rest of CppAD, using
     28$codep
     29        # include <cppad/cppad.hpp>
     30$$
    2231
    2332$children%
     
    4756        cppad/utility/vector.hpp%
    4857        omh/thread_alloc.omh%
    49         cppad/utility/index_sort.hpp%
    50 
    51         cppad/local/bender_quad.hpp%
    52         cppad/local/opt_val_hes.hpp%
    53         cppad/local/lu_ratio.hpp
     58        cppad/utility/index_sort.hpp
    5459%$$
    5560
     
    9499$tend
    95100
    96 $head CppAD Numerical$$
    97 The routines listed below are numerical routines that are specially
    98 designed to work with CppAD in particular.
    99 $table
    100 $rref BenderQuad$$
    101 $rref opt_val_hes$$
    102 $rref LuRatio$$
    103 $tend
    104 
    105101$head Miscellaneous$$
    106102
     
    112108$tend
    113109
    114 $subhead CppAD::vector$$
     110$subhead Simple Vector Template Class$$
    115111A simple implementation of a template vector class
    116112(that is easy to view in a C++ debugger):
     
    119115$tend
    120116
    121 $subhead thread_alloc$$
     117$subhead Multi-Threading Memory Allocation$$
    122118$table
    123119$rref thread_alloc$$
    124120$tend
    125121
    126 $subhead index_sort$$
     122$subhead Sorting Indices$$
    127123$table
    128124$rref index_sort$$
  • trunk/omh/whats_new/whats_new_15.omh

    r3754 r3758  
    7777assist you in learning about changes between various versions of CppAD.
    7878
     79$head 11-30$$
     80$list number$$
     81The $code library$$ section has been moved to the
     82$cref/utilities/utility/$$ section.
     83In addition, the corresponding source code files in $code cppad$$
     84have been moved to $code cppad/utility$$.
     85$lnext
     86The include commands for the utilities have been changed from
     87particular files for each utility,
     88$codep
     89        # include <cppad/utility.hpp>
     90$$
     91i.e., the same command for all the utilities.
     92If you are using the deprecated $cref auto_tools$$ install procedure,
     93you will have to change to this new convention
     94(it does not provide a backward compatible option).
     95$lnext
     96The $cref numeric_ad$$ routines where moved from the $code library$$
     97the a separate documentation section.
     98$lend
     99
    79100$head 11-25$$
    80101$list number$$
  • trunk/speed/sacado/makefile.in

    r3745 r3758  
    328328# $Id$
    329329# -----------------------------------------------------------------------------
    330 # CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-14 Bradley M. Bell
     330# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-15 Bradley M. Bell
    331331#
    332332# CppAD is distributed under multiple licenses. This distribution is under
    333 # the terms of the 
     333# the terms of the
    334334#                     Eclipse Public License Version 1.0.
    335335#
     
    350350# BEGIN OPTIMIZE
    351351AM_CXXFLAGS = -O2 -DNDEBUG -DCPPAD_SACADO_SPEED \
    352         -DRAD_EQ_ALIAS -DRAD_AUTO_AD_Const $(CXX_FLAGS)
     352        -DRAD_EQ_ALIAS -DRAD_AUTO_AD_Const $(CXX_FLAGS)
    353353
    354354# END OPTIMIZE
     
    654654
    655655test: check
    656         ./speed_sacado correct 123 
     656        ./speed_sacado correct 123
    657657
    658658# Tell versions [3.59,3.63) of GNU make to not export all variables.
Note: See TracChangeset for help on using the changeset viewer.