Changeset 56


Ignore:
Timestamp:
Nov 17, 2009 1:26:08 PM (10 years ago)
Author:
awalther
Message:

const declaration for preparation of ipopt interface

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/ADOL-C/src/interfaces.h

    r42 r56  
    184184/* zos_forward(tag, m, n, keep, x[n], y[m])                                 */
    185185/* (defined in uni5_for.mc)                                                 */
    186 ADOLC_DLL_EXPORT int zos_forward(short,int,int,int,double*,double*);
     186ADOLC_DLL_EXPORT int zos_forward(short,int,int,int,const double*,double*);
    187187
    188188/* zos_forward_nk(tag, m, n, x[n], y[m])                                    */
     
    238238/* (defined in uni5_for.mc)                                                 */
    239239ADOLC_DLL_EXPORT int fov_forward(
    240     short, int,int,int,double*,double**,double*,double**);
     240    short, int,int,int,const double*,double**,double*,double**);
    241241ADOLC_DLL_EXPORT int fov_offset_forward(
    242242    short, int,int,int,int,double*,double**,double*,double**);
     
    294294
    295295ADOLC_DLL_EXPORT int int_forward_tight
    296 (short, int, int, int, double*, unsigned long int**, double*, unsigned long int**);
     296(short, int, int, int, const double*, unsigned long int**, double*, unsigned long int**);
    297297
    298298/****************************************************************************/
     
    303303
    304304ADOLC_DLL_EXPORT int indopro_forward_safe
    305 (short, int, int, double*, unsigned int**);
     305(short, int, int, const double*, unsigned int**);
    306306
    307307
     
    311311
    312312ADOLC_DLL_EXPORT int indopro_forward_tight
    313 (short, int, int, double*, unsigned int**);
     313(short, int, int, const double*, unsigned int**);
    314314
    315315/****************************************************************************/
     
    320320
    321321ADOLC_DLL_EXPORT int nonl_ind_forward_safe
    322 (short, int, double*, unsigned int**);
     322(short, int, const double*, unsigned int**);
    323323
    324324
     
    328328
    329329ADOLC_DLL_EXPORT int nonl_ind_forward_tight
    330 (short, int, double*, unsigned int**);
     330(short, int, const double*, unsigned int**);
    331331
    332332/****************************************************************************/
  • trunk/ADOL-C/src/uni5_for.c

    r51 r56  
    461461int  zos_forward_nk(
    462462#endif
    463     short  tnum,        /* tape id */
    464     int    depcheck,    /* consistency chk on # of deps */
    465     int    indcheck,    /* consistency chk on # of indeps */
     463    short  tnum,              /* tape id */
     464    int    depcheck,          /* consistency chk on # of deps */
     465    int    indcheck,          /* consistency chk on # of indeps */
    466466#if defined(_KEEP_)
    467     int    keep,        /* flag for reverse sweep */
    468 #endif
    469     double *basepoint,  /* independant variable values */
    470     double *valuepoint) /* dependent variable values */
     467    int    keep,              /* flag for reverse sweep */
     468#endif
     469    const double *basepoint,  /* independant variable values */
     470    double       *valuepoint) /* dependent variable values */
    471471
    472472#else
     
    499499/****************************************************************************/
    500500int int_forward_tight(
    501     short             tnum,     /* tape id                              */
    502     int               depcheck, /* consistency chk on # of dependents   */
    503     int               indcheck, /* consistency chk on # of independents */
    504     int               p,        /* # of taylor series, bit pattern      */
    505     double            *basepoint,  /* independent variable values   (in)*/
     501    short               tnum,     /* tape id                              */
     502    int                 depcheck, /* consistency chk on # of dependents   */
     503    int                 indcheck, /* consistency chk on # of independents */
     504    int                 p,        /* # of taylor series, bit pattern      */
     505    const double       *basepoint,  /* independent variable values   (in)*/
    506506    unsigned long int **argument,  /* Taylor coeff.                 (in)*/
    507     double            *valuepoint, /* dependent variable values    (out)*/
     507    double             *valuepoint, /* dependent variable values    (out)*/
    508508    unsigned long int **taylors)   /* matrix of coefficient vectors(out)*/
    509509
     
    558558    int               depcheck,    /* consistency chk on # of dependents   */
    559559    int               indcheck,    /* consistency chk on # of independents */
    560     double            *basepoint,  /* independent variable values   (in)   */
    561     unsigned int     **crs)        /* returned row index storage (out)     */
     560    const double     *basepoint,  /* independent variable values   (in)   */
     561    unsigned int    **crs)        /* returned row index storage (out)     */
    562562
    563563/* indopro_forward_tight( tag, m, n, x[n], *crs[m]),
     
    639639/****************************************************************************/
    640640int  fov_forward(
    641     short  tnum,        /* tape id */
    642     int    depcheck,    /* consistency chk on # of deps */
    643     int    indcheck,    /* consistency chk on # of indeps */
    644     int    p,           /* # of taylor series */
    645     double *basepoint,  /* independent variable values */
    646     double **argument,  /* Taylor coefficients (input) */
    647     double *valuepoint, /* Taylor coefficients (output) */
    648     double **taylors)   /* matrix of coifficient vectors */
     641    short         tnum,        /* tape id */
     642    int           depcheck,    /* consistency chk on # of deps */
     643    int           indcheck,    /* consistency chk on # of indeps */
     644    int           p,           /* # of taylor series */
     645    const double *basepoint,  /* independent variable values */
     646    double      **argument,  /* Taylor coefficients (input) */
     647    double       *valuepoint, /* Taylor coefficients (output) */
     648    double      **taylors)   /* matrix of coifficient vectors */
    649649/* the order of the indices in argument and taylors is [var][taylor] */
    650650#endif
  • trunk/configure

    r53 r56  
    11#! /bin/sh
    2 # From configure.ac Revision: 52 .
     2# From configure.ac Revision: 55 .
    33# Guess values for system-dependent variables and create Makefiles.
    4 # Generated by GNU Autoconf 2.61 for adolc 2.0.0-trunk.
     4# Generated by GNU Autoconf 2.61 for adolc 2.1.1-trunk.
    55#
    66# Report bugs to <adol-c@list.coin-or.org>.
     
    730730PACKAGE_NAME='adolc'
    731731PACKAGE_TARNAME='adolc'
    732 PACKAGE_VERSION='2.0.0-trunk'
    733 PACKAGE_STRING='adolc 2.0.0-trunk'
     732PACKAGE_VERSION='2.1.1-trunk'
     733PACKAGE_STRING='adolc 2.1.1-trunk'
    734734PACKAGE_BUGREPORT='adol-c@list.coin-or.org'
    735735
     
    14061406  # This message is too long to be a string in the A/UX 3.1 sh.
    14071407  cat <<_ACEOF
    1408 \`configure' configures adolc 2.0.0-trunk to adapt to many kinds of systems.
     1408\`configure' configures adolc 2.1.1-trunk to adapt to many kinds of systems.
    14091409
    14101410Usage: $0 [OPTION]... [VAR=VALUE]...
     
    14761476if test -n "$ac_init_help"; then
    14771477  case $ac_init_help in
    1478      short | recursive ) echo "Configuration of adolc 2.0.0-trunk:";;
     1478     short | recursive ) echo "Configuration of adolc 2.1.1-trunk:";;
    14791479   esac
    14801480  cat <<\_ACEOF
     
    16011601if $ac_init_version; then
    16021602  cat <<\_ACEOF
    1603 adolc configure 2.0.0-trunk
     1603adolc configure 2.1.1-trunk
    16041604generated by GNU Autoconf 2.61
    16051605
     
    16151615running configure, to aid debugging if configure makes a mistake.
    16161616
    1617 It was created by adolc $as_me 2.0.0-trunk, which was
     1617It was created by adolc $as_me 2.1.1-trunk, which was
    16181618generated by GNU Autoconf 2.61.  Invocation command line was
    16191619
     
    22582258# Define the identity of the package.
    22592259 PACKAGE='adolc'
    2260  VERSION='2.0.0-trunk'
     2260 VERSION='2.1.1-trunk'
    22612261
    22622262
     
    2176821768
    2176921769cat >>confdefs.h <<\_ACEOF
    21770 #define ADOLC_SUBVERSION 0
     21770#define ADOLC_SUBVERSION 1
    2177121771_ACEOF
    2177221772
    2177321773
    2177421774cat >>confdefs.h <<\_ACEOF
    21775 #define ADOLC_PATCHLEVEL 0
     21775#define ADOLC_PATCHLEVEL 1
    2177621776_ACEOF
    2177721777
     
    2205722057echo "${ECHO_T}$ac_adolc_cxxflags" >&6; }
    2205822058fi
     22059
     22060
     22061###########################################################################
     22062#                      COIN_PATCH_LIBTOOL_CYGWIN                          #
     22063###########################################################################
     22064
     22065# Patches to libtool for cygwin. Lots for cl, a few for GCC.
     22066# For cl:
     22067# - cygpath is not correctly quoted in fix_srcfile_path
     22068# - paths generated for .lib files is not run through cygpath -w
     22069
     22070
     22071 # COIN_PATCH_LIBTOOL_CYGWIN
    2205922072
    2206022073
     
    2250822521# values after options handling.
    2250922522ac_log="
    22510 This file was extended by adolc $as_me 2.0.0-trunk, which was
     22523This file was extended by adolc $as_me 2.1.1-trunk, which was
    2251122524generated by GNU Autoconf 2.61.  Invocation command line was
    2251222525
     
    2256122574cat >>$CONFIG_STATUS <<_ACEOF
    2256222575ac_cs_version="\\
    22563 adolc config.status 2.0.0-trunk
     22576adolc config.status 2.1.1-trunk
    2256422577configured by $0, generated by GNU Autoconf 2.61,
    2256522578  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
     
    2352123534
    2352223535
     23536
    2352323537# echo configuration
    2352423538echo \
Note: See TracChangeset for help on using the changeset viewer.