Changeset 3760


Ignore:
Timestamp:
Nov 30, 2015 11:12:28 PM (4 years ago)
Author:
bradbell
Message:

merge to branch: trunk
from repository: https://github.com/coin-or/CppAD
start hash code: 45a12ad2239733dd6fed7375a21cc8afe670c79a
end hash code: 1c6bd0d4a9645624a8353a71abce8d13a689e72b

commit 1c6bd0d4a9645624a8353a71abce8d13a689e72b
Author: Brad Bell <bradbell@…>
Date: Mon Nov 30 20:00:00 2015 -0800

Put removeal of old directories at front (havning permissions trouble with it).

commit 2ed11779bd51c8dc02900df1f933d6d883af5dd3
Author: Brad Bell <bradbell@…>
Date: Mon Nov 30 18:39:13 2015 -0800

Deprecate individual include files for the utilities and remove from install
(when deprecated is no).

commit 76fe973d931b111bb5c3cde60ae94e7828001919
Author: Brad Bell <bradbell@…>
Date: Mon Nov 30 16:29:38 2015 -0800

Change cppad_implicit_ctor_from_any_type -> cppad_deprecated
(in preparation for excluding more features from installation).

commit 8b429e9401f5ca315c461517f8c12724cf823c55
Author: Brad Bell <bradbell@…>
Date: Mon Nov 30 15:24:44 2015 -0800

Change verbose documentaiton to be YES/NO instead of 0/1.

commit d6f726e0f6145fd59f8ffc5f4080d08faf86c083
Author: Brad Bell <bradbell@…>
Date: Mon Nov 30 15:07:54 2015 -0800

Change cmake_install_prefix->cppad_prefix, cmake_install_postfix->cppad_postfix

Location:
trunk
Files:
20 edited

Legend:

Unmodified
Added
Removed
  • trunk/CMakeLists.txt

    r3757 r3760  
    9191)
    9292# -----------------------------------------------------------------------------
    93 # cmake_install_prefix
    94 command_line_arg(cmake_install_prefix /usr PATH
     93# cppad_prefix
     94command_line_arg(cppad_prefix /usr PATH
    9595        "cppad install prefix"
    9696)
    97 SET(CMAKE_INSTALL_PREFIX "${cmake_install_prefix}"
    98         CACHE PATH "value copied from cmake_install_prefix" FORCE
    99 )
    100 # -----------------------------------------------------------------------------
    101 # cmake_install_postfix
    102 command_line_arg(cmake_install_postfix NOTFOUND STRING
     97SET(CMAKE_INSTALL_PREFIX "${cppad_prefix}"
     98        CACHE PATH "value copied from cppad_prefix" FORCE
     99)
     100IF( cmake_install_prefix )
     101        MESSAGE(FATAL_ERROR
     102                "cmake_install_prefix has been changed to cppad_prefix"
     103        )
     104ENDIF( cmake_install_prefix )
     105# -----------------------------------------------------------------------------
     106# cppad_postfix
     107command_line_arg(cppad_postfix NOTFOUND STRING
    103108        "cppad install postfix"
    104109)
     110IF( cmake_install_postfix )
     111        MESSAGE(FATAL_ERROR
     112                "cmake_install_postfix has been changed to cppad_postfix"
     113        )
     114ENDIF( cmake_install_postfix )
    105115# -----------------------------------------------------------------------------
    106116# cppad_cxx_flags
     
    192202        ENDFOREACH(dir ${cmake_install_${middle_names}})
    193203        #
    194         SET(tmp "${cmake_install_prefix}/${middle_value}" )
    195         IF ( cmake_install_postfix )
    196                 SET(cppad_abs_${middle_name} ${tmp}/${cmake_install_postfix})
    197         ELSE ( cmake_install_postfix )
     204        SET(tmp "${cppad_prefix}/${middle_value}" )
     205        IF ( cppad_postfix )
     206                SET(cppad_abs_${middle_name} ${tmp}/${cppad_postfix})
     207        ELSE ( cppad_postfix )
    198208                SET(cppad_abs_${middle_name} ${tmp})
    199         ENDIF ( cmake_install_postfix )
     209        ENDIF ( cppad_postfix )
    200210ENDFOREACH(middle_names includedirs libdirs datadir docdir)
    201211# -----------------------------------------------------------------------------
     
    328338# ${cppad_abs_includedir}/cppad
    329339INSTALL(
    330         DIRECTORY "${CMAKE_BINARY_DIR}/cppad/utility/"
    331         DESTINATION ${cppad_abs_includedir}/cppad
    332 )
    333 INSTALL(
    334340        DIRECTORY "${CMAKE_SOURCE_DIR}/cppad/"
    335341        DESTINATION ${cppad_abs_includedir}/cppad
     
    341347        INSTALL( DIRECTORY "doc/" DESTINATION ${cppad_abs_docdir}/cppad )
    342348ENDIF ( cmake_install_docdir )
     349#
     350IF( ${cppad_deprecated} )
     351        # During install copy deprecated include files
     352        INSTALL(
     353                DIRECTORY "${CMAKE_BINARY_DIR}/cppad/utility/"
     354                DESTINATION ${cppad_abs_includedir}/cppad
     355        )
     356ENDIF( ${cppad_deprecated} )
  • trunk/bin/check_all.sh

    r3123 r3760  
    22# $Id$
    33# -----------------------------------------------------------------------------
    4 # CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-14 Bradley M. Bell
     4# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-15 Bradley M. Bell
    55#
    66# CppAD is distributed under multiple licenses. This distribution is under
     
    2929        then
    3030                echo "$msg"
    31                 echo 'Warning: see check_all.err' 
     31                echo 'Warning: see check_all.err'
    3232                exit 1
    3333        fi
     
    5555}
    5656# ---------------------------------------------------------------------------
     57list="
     58        $HOME/prefix/cppad
     59        build
     60"
     61for name in $list
     62do
     63        if [ -e "$name" ]
     64        then
     65                echo_log_eval rm -r $name
     66        fi
     67done
     68# ---------------------------------------------------------------------------
    5769# Create package to run test in
    5870echo "bin/package.sh"
     
    7688echo_log_eval cd cppad-$version
    7789# -----------------------------------------------------------------------------
    78 list="
    79         $HOME/prefix/cppad
    80         build
    81 "
    82 for name in $list
    83 do
    84         if [ -e "$name" ]
    85         then
    86                 echo_log_eval rm -r $name
    87         fi
    88 done
    89 echo_log_eval bin/run_cmake.sh --boost_vector
     90random_zero_one=`expr $RANDOM % 2`
     91if [ "$random_zero_one" == '0' ]
     92then
     93        echo_log_eval bin/run_cmake.sh --boost_vector
     94else
     95        echo_log_eval bin/run_cmake.sh --deprecated
     96fi
    9097echo_log_eval cd build
    9198# -----------------------------------------------------------------------------
    92 echo_log_eval make check 
     99echo_log_eval make check
    93100# -----------------------------------------------------------------------------
    94101for package in adolc eigen ipopt fadbad sacado
     
    133140        next_program
    134141        echo_log_eval ./$program harmonic 1 4 1
    135         # 
     142        #
    136143        # test_time=2,max_thread=4,num_zero=20,num_sub=30,num_sum=500,use_ad=true
    137144        next_program
     
    147154fi
    148155#
    149 # print_for test 
     156# print_for test
    150157if [ ! -e 'print_for/print_for' ]
    151158then
    152159        skip="$skip print_for/print_for"
    153160else
    154         echo_log_eval print_for/print_for 
     161        echo_log_eval print_for/print_for
    155162        print_for/print_for | sed -e '/^Test passes/,$d' > junk.1.$$
    156163        print_for/print_for | sed -e '1,/^Test passes/d' > junk.2.$$
     
    158165        then
    159166                rm junk.1.$$ junk.2.$$
    160                 echo_log_eval echo "print_for: OK" 
     167                echo_log_eval echo "print_for: OK"
    161168        else
    162169                echo_log_eval echo "print_for: Error"
     
    165172fi
    166173#
    167 echo_log_eval make install 
     174echo_log_eval make install
    168175#
    169176if [ "$skip" != '' ]
  • trunk/bin/run_cmake.sh

    r3725 r3760  
    2626standard='c++11'
    2727debug_speed='no'
     28deprecated='no'
    2829profile_speed='no'
    2930clang='no'
     
    4344        [--c++98] \\
    4445        [--debug_speed] \\
     46        [--deprecated] \\
    4547        [--profile_speed] \\
    4648        [--clang ] \\
     
    6567                debug_speed='yes'
    6668                profile_speed='no'
     69        elif [ "$1" == '--deprecated' ]
     70        then
     71                deprecated='yes'
    6772        elif [ "$1" == '--profile_speed' ]
    6873        then
     
    123128then
    124129        # echo each command that make executes
    125         cmake_args="$cmake_args  -D CMAKE_VERBOSE_MAKEFILE=1"
     130        cmake_args="$cmake_args  -D CMAKE_VERBOSE_MAKEFILE=YES"
    126131fi
    127132# -----------------------------------------------------------------------------
    128 # cmake_install_prefix
    129 cmake_args="$cmake_args  -D cmake_install_prefix=$HOME/prefix/cppad"
     133# cppad_prefix
     134cmake_args="$cmake_args  -D cppad_prefix=$HOME/prefix/cppad"
    130135#
    131136# cmake_install_includedirs
     
    204209fi
    205210#
     211# deprecated
     212if [ "$deprecated" == 'yes' ]
     213then
     214        cmake_args="$cmake_args -D cppad_deprecated=YES"
     215else
     216        cmake_args="$cmake_args -D cppad_deprecated=NO"
     217fi
     218#
    206219# simple options
    207 cmake_args="$cmake_args -D cppad_implicit_ctor_from_any_type=NO"
    208220cmake_args="$cmake_args -D cppad_testvector=$testvector"
    209221cmake_args="$cmake_args -D cppad_tape_id_type='int32_t'"
  • trunk/bug/test_install.sh

    r3754 r3760  
    1313cat << EOF
    1414This is not a bug but rather a test of installing with
    15         cmake_install_prefix=$HOME/prefix
     15        cppad_prefix=$HOME/prefix
    1616EOF
    1717cat << EOF > bug.$$
  • trunk/configure.ac

    r3758 r3760  
    226226AC_MSG_RESULT([$implicit_ctor])
    227227if test "$implicit_ctor" = "yes" ; then
    228         AC_SUBST(cppad_implicit_ctor_from_any_type, "1")
    229 else
    230         AC_SUBST(cppad_implicit_ctor_from_any_type, "0")
     228        AC_SUBST(cppad_deprecated, "1")
     229else
     230        AC_SUBST(cppad_deprecated, "0")
    231231fi
    232232
  • trunk/cppad/CMakeLists.txt

    r3756 r3760  
    4949)
    5050#
    51 # cppad_implicit_ctor_from_any_type
    52 command_line_arg(cppad_implicit_ctor_from_any_type NO BOOL
     51# cppad_deprecated
     52command_line_arg(cppad_deprecated NO BOOL
    5353        "implicit (instead of explicit) conversion from any type to AD<Base>"
    5454)
    5555# -----------------------------------------------------------------------------
    56 # cppad_explicit_ctor
    57 IF( cppad_implicit_ctor_from_any_type )
    58         SET(cppad_implicit_ctor_from_any_type 1)
    59 ELSE( cppad_implicit_ctor_from_any_type )
    60         SET(cppad_implicit_ctor_from_any_type 0)
    61 ENDIF( cppad_implicit_ctor_from_any_type )
     56# cppad_deprecated
     57IF( cppad_deprecated )
     58        SET(cppad_deprecated 1)
     59ELSE( cppad_deprecated )
     60        SET(cppad_deprecated 0)
     61ENDIF( cppad_deprecated )
    6262# -----------------------------------------------------------------------------
    6363# cppad_internal_sparse_set
  • trunk/cppad/configure.hpp.in

    r3757 r3760  
    8888
    8989/*!
    90 \def CPPAD_IMPLICIT_CTOR_FROM_ANY_TYPE
     90\def CPPAD_DEPRECATED
    9191If this symbol is one, an implicit constor of AD<Base> is defined
    9292where the argument has any type.
    9393Otherwise this constructor is explicit.
    9494*/
    95 # define CPPAD_IMPLICIT_CTOR_FROM_ANY_TYPE @cppad_implicit_ctor_from_any_type@
     95# define CPPAD_DEPRECATED @cppad_deprecated@
    9696
    9797/*!
  • trunk/cppad/local/ad.hpp

    r3757 r3760  
    166166        inline AD& operator=(const VecAD_reference<Base> &x);
    167167
    168 # if CPPAD_IMPLICIT_CTOR_FROM_ANY_TYPE
     168# if CPPAD_DEPRECATED
    169169        // implicit construction from some other type (depricated)
    170170        template <class T> inline AD(const T &t);
  • trunk/cppad/local/ad_ctor.hpp

    r3757 r3760  
    5959
    6060$subhead Deprecated 2013-12-31$$
    61 If you set
    62 $cref/cppad_implicit_ctor_from_any_type
    63         /cmake
    64         /cppad_implicit_ctor_from_any_type
    65 /$$
     61If you set $cref/cppad_deprecated/cmake/cppad_deprecated/$$
    6662to be $code YES$$ during the install procedure,
    6763you will get an implicit constructor with prototype
  • trunk/cppad/local/undef.hpp

    r3757 r3760  
    5656
    5757// for conditional testing when implicit conversion is not present
    58 # undef CPPAD_IMPLICIT_CTOR_FROM_ANY_TYPE
     58# undef CPPAD_DEPRECATED
    5959-----------------------------------------------------------------------------
    6060*/
  • trunk/omh/deprecated/include_deprecated.omh

    r3757 r3760  
    2828$section Deprecated Include Files$$
    2929
     30$head Deprecated 2015-11-30$$
     31The $cref utility$$ individual include files; e.g.,
     32$codep
     33        # include <cppad/runge_45.hpp>
     34$$
     35You should instead use
     36$codep
     37        # include <cppad/utility.hpp>
     38$$
    3039
    3140$head Deprecated 2006-12-17$$
  • trunk/omh/install/cmake.omh

    r3755 r3760  
    8787$codei%
    8888cmake %%                                                                     \
    89         -D CMAKE_VERBOSE_MAKEFILE=%cmake_verbose_makefile%                       \
     89    -D CMAKE_VERBOSE_MAKEFILE=%cmake_verbose_makefile%                       \
    9090    -G %generator%                                                           \
    9191        \
    92     -D cmake_install_prefix=%cmake_install_prefix%                           \
    93     -D cmake_install_postfix=%cmake_install_postfix%                         \
     92    -D cppad_prefix=%cppad_prefix%                                           \
     93    -D cppad_postfix=%cppad_postfix%                                         \
    9494        \
    9595    -D cmake_install_includedirs=%cmake_install_includedirs%                 \
     
    114114    -D cppad_tape_id_type=%cppad_tape_id_type%                               \
    115115    -D cppad_tape_addr_type=%cppad_tape_addr_type%                           \
    116     -D cppad_implicit_ctor_from_any_type=%cppad_implicit_ctor_from_any_type% \
     116    -D cppad_deprecated=%cppad_deprecated% \
    117117    \
    118118    ..
     
    120120
    121121$head cmake_verbose_makefile$$
    122 This value should be either $code 0$$ or $code 1$$.
    123 The default value, when it is not present, is zero.
    124 If it is $code 1$$, then the output of the $code make$$ commands
     122This value should be either $code YES$$ or $code NO$$.
     123The default value, when it is not present, is $code NO$$.
     124If it is $code YES$$, then the output of the $code make$$ commands
    125125will include all of the files and flags used to run the compiler
    126126and linker. This can be useful for seeing how to compile and link
     
    139139generators%$$ documentation.
    140140
    141 $head cmake_install_prefix$$
     141$head cppad_prefix$$
    142142This is the top level absolute path below which
    143143all of the CppAD files are installed by the command
     
    146146%$$
    147147For example,
    148 if $icode cmake_install_prefix$$ is $code /usr$$,
     148if $icode cppad_prefix$$ is $code /usr$$,
    149149$icode cmake_install_includedirs$$ is $code include$$, and
    150 $icode cmake_install_postfix$$ is not specified,
     150$icode cppad_postfix$$ is not specified,
    151151the file $code cppad.hpp$$ is installed in the location
    152152$codei%
    153153        /usr/include/cppad/cppad.hpp
    154154%$$
    155 The default value for $icode cmake_install_prefix$$ is $code /usr$$.
    156 
    157 $head cmake_install_postfix$$
     155The default value for $icode cppad_prefix$$ is $code /usr$$.
     156
     157$head cppad_postfix$$
    158158This is the bottom level relative path below which
    159159all of the CppAD files are installed.
    160160For example,
    161 if $icode cmake_install_prefix$$ is $code /usr$$,
     161if $icode cppad_prefix$$ is $code /usr$$,
    162162$icode cmake_install_includedirs$$ is $code include$$, and
    163 $icode cmake_install_postfix$$ is $code coin$$,
     163$icode cppad_postfix$$ is $code coin$$,
    164164the file $code cppad.hpp$$ is installed in the location
    165165$codei%
    166166        /usr/include/coin/cppad/cppad.hpp
    167167%$$
    168 The default value for $icode cmake_install_postfix$$ is empty; i.e,
     168The default value for $icode cppad_postfix$$ is empty; i.e,
    169169there is no bottom level relative directory for the installed files.
    170170
     
    177177The entire list is used for searching for include files.
    178178For example,
    179 if $icode cmake_install_prefix$$ is $code /usr$$,
     179if $icode cppad_prefix$$ is $code /usr$$,
    180180$icode cmake_install_includedirs$$ is $code include$$, and
    181 $icode cmake_install_postfix$$ is not specified,
     181$icode cppad_postfix$$ is not specified,
    182182the file $code cppad.hpp$$ is installed in the location
    183183$codei%
     
    194194The entire list is used for searching for library files.
    195195For example,
    196 if $icode cmake_install_prefix$$ is $code /usr$$,
     196if $icode cppad_prefix$$ is $code /usr$$,
    197197$icode cmake_install_libdirs$$ is $code lib$$,
    198 $icode cmake_install_postfix$$ is not specified,
     198$icode cppad_postfix$$ is not specified,
    199199and $icode ipopt_prefix$$ is specified,
    200200the file $code libcppad_ipopt.a$$ is installed in the location
     
    208208the CppAD data files are installed.
    209209For example,
    210 if $icode cmake_install_prefix$$ is $code /usr$$,
     210if $icode cppad_prefix$$ is $code /usr$$,
    211211$icode cmake_install_datadir$$ is $code share$$, and
    212 $icode cmake_install_postfix$$ is not specified,
     212$icode cppad_postfix$$ is not specified,
    213213the $cref pkgconfig$$ file $code cppad.pc$$ is installed in the location
    214214$codei%
     
    221221the CppAD documentation files are installed.
    222222For example,
    223 if $icode cmake_install_prefix$$ is $code /usr$$,
     223if $icode cppad_prefix$$ is $code /usr$$,
    224224$icode cmake_install_docdir$$ is $code share/doc$$, and
    225 $icode cmake_install_postfix$$ is not specified,
     225$icode cppad_postfix$$ is not specified,
    226226the file $code cppad.xml$$ is installed in the location
    227227$codei%
     
    354354$code uint64_t$$.
    355355
    356 $head cppad_implicit_ctor_from_any_type$$
    357 The default value for $icode cppad_implicit_ctor_from_any_type$$ is $code NO$$.
    358 If it is $code YES$$, there is a
    359 $cref/deprecated/ad_ctor/x/Deprecated 2013-12-31/$$
    360 implicit type constructor (type conversion)
    361 from any type to $codei%AD<%Base%>%$$.
    362 Otherwise this constructor is
    363 $cref/explicit/ad_ctor/x/explicit/$$.
    364 
     356$head cppad_deprecated$$
     357The default value for $icode cppad_deprecated$$ is $code NO$$.
     358If it is $code YES$$, then all the CppAD
     359$cref deprecated$$ features are included in the
     360$cref/installation/install/Instructions/Step 4: Installation/$$.
     361Otherwise, some of the deprecated features
     362may be excluded from the installation.
     363(The intention here is to exclude more deprecated features as time marches on.)
    365364
    366365$children%
  • trunk/omh/install/install.omh

    r3757 r3760  
    3636CppAD examples and tests.
    3737
    38 $subhead Step 4: Install$$
     38$subhead Step 4: Installation$$
    3939Use the command
    4040$codep
  • trunk/omh/install/pkgconfig.omh

    r3757 r3760  
    8686$cref/cmake command/cmake/CMake Command/$$ is executed.
    8787The directory $icode prefix$$ is the value of
    88 $cref/cmake_install_prefix/cmake/cmake_install_prefix/$$ during configuration.
     88$cref/cppad_prefix/cmake/cppad_prefix/$$ during configuration.
    8989The directory $icode datadir$$ is the value of
    9090$cref/cmake_install_datadir/cmake/cmake_install_datadir/$$.
     
    9494        $icode Description$$ $rnext
    9595$icode%prefix%/%datadir%/pkgconfig/cppad.pc%$$              $cnext
    96         for use after $cref/make install/install/Instructions/Step 4: Install/$$
     96        for use after
     97        $cref/make install/install/Instructions/Step 4: Installation/$$
    9798$rnext
    9899$icode%builddir%/pkgconfig/cppad-uninstalled.pc%$$       $cnext
  • trunk/omh/whats_new/whats_new_12.omh

    r3757 r3760  
    184184$cref pkgconfig$$ file in
    185185$codei%
    186         cmake_install_prefix%/cmake_install_datadir%/cppad.pc
     186        cppad_prefix%/cmake_install_datadir%/cppad.pc
    187187%$$
    188188This has been fixed and is now
    189189$codei%
    190         cmake_install_prefix%/cmake_install_datadir%/pkgconfig/cppad.pc
     190        cppad_prefix%/cmake_install_datadir%/pkgconfig/cppad.pc
    191191%$$
    192192$lnext
  • trunk/omh/whats_new/whats_new_13.omh

    r3738 r3760  
    100100%$$
    101101A deprecated alternative is to make this constructor implicit using the
    102 $cref/cppad_implicit_ctor_from_any_type
    103         /cmake
    104         /cppad_implicit_ctor_from_any_type
    105 /$$
     102$cref/cppad_deprecated/cmake/cppad_deprecated/$$
    106103option during the install procedure.
    107104
  • trunk/omh/whats_new/whats_new_14.omh

    r3754 r3760  
    9090$lnext
    9191Fix $code cmake$$ setting
    92 $cref/cppad_implicit_ctor_from_any_type/
    93         cmake/cppad_implicit_ctor_from_any_type
    94 /$$.
    95 Note that this option is deprecated and may eventually be removed.
     92$code cppad_implicit_ctor_from_any_type$$
     93Note that this cmake option has since been replaced by
     94$cref/cppad_deprecated/cmake/cppad_deprecated/$$.
    9695$lnext
    9796The $code clang++$$ compiler was optimizing out the calculations
  • trunk/omh/whats_new/whats_new_15.omh

    r3758 r3760  
    1414$dollar @$$
    1515$spell
     16        runge
    1617        lcppad
    1718        ind
     
    8485have been moved to $code cppad/utility$$.
    8586$lnext
    86 The include commands for the utilities have been changed from
    87 particular files for each utility,
     87The individual $cref utility$$ include files have been deprecated; see
     88$cref include_deprecated$$.
     89For example,
     90$codep
     91        # include <cppad/runge_45.hpp>
     92$$
     93You should us the utility include instead; i.e.,
    8894$codep
    8995        # include <cppad/utility.hpp>
    9096$$
    91 i.e., the same command for all the utilities.
    92 If you are using the deprecated $cref auto_tools$$ install procedure,
    93 you will have to change to this new convention
    94 (it does not provide a backward compatible option).
    9597$lnext
    9698The $cref numeric_ad$$ routines where moved from the $code library$$
    9799the a separate documentation section.
     100$lnext
     101Change $code cmake_install_prefix$$ to
     102$cref/cppad_prefix/cmake/cppad_prefix/$$ and
     103Change $code cmake_install_postfix$$ to
     104$cref/cppad_postfix/cmake/cppad_postfix/$$.
     105$lnext
     106Change $code cppad_implicit_ctor_from_any_type$$ to
     107$cref/cppad_deprecated/cmake/cppad_deprecated/$$ and
     108changes is specifications to refer to all deprecated features.
    98109$lend
    99110
  • trunk/pkgconfig/cppad.pc.in

    r3608 r3760  
    11# $Id$
    22# -----------------------------------------------------------------------------
    3 # CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-12 Bradley M. Bell
     3# CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-15 Bradley M. Bell
    44#
    55# CppAD is distributed under multiple licenses. This distribution is under
    6 # the terms of the 
     6# the terms of the
    77#                     Eclipse Public License Version 1.0.
    88#
     
    1414# -------------------------------------------------------------------------
    1515# HACK: With no specifications as to what will work in the future, set the
    16 # values 'includedir' and 'prefix' so cppad.pc works with the 2015-01-21 
     16# values 'includedir' and 'prefix' so cppad.pc works with the 2015-01-21
    1717# verison of https://build.opensuse.org/package/view_file/
    1818#       windows:mingw:win32/mingw32-filesystem/mingw32-install-post.sh?expand=1
    19 prefix=@cmake_install_prefix@
     19prefix=@cppad_prefix@
    2020includedir=@cppad_abs_includedir@
    2121# -------------------------------------------------------------------------
  • trunk/test_more/cppad_eigen.cpp

    r3070 r3760  
    1 /* $Id$ */
     1// $Id$
    22/* --------------------------------------------------------------------------
    3 CppAD: C++ Algorithmic Differentiation: Copyright (C) 2003-13 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
     
    3333        ok &= traits::MulCost                == 2;
    3434
    35         ok &= traits::epsilon() == 
     35        ok &= traits::epsilon() ==
    3636                std::numeric_limits<double>::epsilon();
    37         ok &= traits::dummy_precision() == 
     37        ok &= traits::dummy_precision() ==
    3838                100.* std::numeric_limits<double>::epsilon();
    39         ok &= traits::highest() == 
     39        ok &= traits::highest() ==
    4040                std::numeric_limits<double>::max();
    41         ok &= traits::lowest() == 
     41        ok &= traits::lowest() ==
    4242                std::numeric_limits<double>::min();
    4343
     
    4949
    5050        // Outputing a matrix used to fail before partial specialization of
    51         // struct significant_decimals_default_impl in cppad_eigen.hpp. 
     51        // struct significant_decimals_default_impl in cppad_eigen.hpp.
    5252        Matrix< AD<double>, 1, 1> X;
    5353        X(0, 0) = AD<double>(1);
     
    5656        ok &= "1" == stream_out.str();
    5757
    58 # if ! CPPAD_IMPLICIT_CTOR_FROM_ANY_TYPE
     58# if ! CPPAD_DEPRECATED
    5959        // multiplying three matrices together used to cause warning
    6060        // before making ctor from arbitrary type to AD<Base> explicit.
     
    6464        B(0,0) = 2.0;
    6565        C(0,0) = 3.0;
    66         D      = A * B * C; 
     66        D      = A * B * C;
    6767        ok    &= D(0,0) == 6.0 ;
    6868# endif
    69        
     69
    7070        return ok;
    7171}
Note: See TracChangeset for help on using the changeset viewer.