Changeset 91


Ignore:
Timestamp:
Feb 24, 2010 2:56:58 AM (10 years ago)
Author:
awalther
Message:

mergestable version 2.1 with revision 89

Location:
stable/2.1
Files:
39 edited
28 copied

Legend:

Unmodified
Added
Removed
  • stable/2.1

  • stable/2.1/ADOL-C/Makefile.am

    r40 r91  
    1111##############################################################################
    1212
     13AUTOMAKE_OPTIONS     = foreign
     14
    1315if DOCEXA
    14 SUBDIRS              = src examples
     16SUBDIRS              = src examples test
    1517else
    1618if ADDEXA
    17 SUBDIRS              = src examples
     19SUBDIRS              = src examples test
    1820else
    1921if PAREXA
    20 SUBDIRS              = src examples
     22SUBDIRS              = src examples test
    2123else
    22 SUBDIRS              = src
     24SUBDIRS              = src test
    2325endif
    2426endif
     
    2628
    2729MAINTAINERCLEANFILES = Makefile.in
     30
     31test: all
     32        cd test; $(MAKE) test
     33
     34
  • stable/2.1/ADOL-C/Makefile.in

    r40 r91  
    155155sysconfdir = @sysconfdir@
    156156target_alias = @target_alias@
    157 @ADDEXA_FALSE@@DOCEXA_FALSE@@PAREXA_FALSE@SUBDIRS = src
    158 @ADDEXA_TRUE@@DOCEXA_FALSE@SUBDIRS = src examples
    159 
    160 @DOCEXA_TRUE@SUBDIRS = src examples
    161 @ADDEXA_FALSE@@DOCEXA_FALSE@@PAREXA_TRUE@SUBDIRS = src examples
     157
     158AUTOMAKE_OPTIONS = foreign
     159@ADDEXA_FALSE@@DOCEXA_FALSE@@PAREXA_FALSE@SUBDIRS = src test
     160@ADDEXA_TRUE@@DOCEXA_FALSE@SUBDIRS = src examples test
     161
     162@DOCEXA_TRUE@SUBDIRS = src examples test
     163@ADDEXA_FALSE@@DOCEXA_FALSE@@PAREXA_TRUE@SUBDIRS = src examples test
    162164
    163165MAINTAINERCLEANFILES = Makefile.in
     
    175177        check-recursive installcheck-recursive
    176178DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
    177 DIST_SUBDIRS = src examples
     179DIST_SUBDIRS = src test examples
    178180all: all-recursive
    179181
     
    181183$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
    182184        cd $(top_srcdir) && \
    183           $(AUTOMAKE) --gnu  ADOL-C/Makefile
     185          $(AUTOMAKE) --foreign  ADOL-C/Makefile
    184186Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
    185187        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
     
    458460        uninstall-info-recursive uninstall-recursive
    459461
     462
     463test: all
     464        cd test; $(MAKE) test
    460465# Tell versions [3.59,3.63) of GNU make to not export all variables.
    461466# Otherwise a system limit (for SysV at least) may be exceeded.
  • stable/2.1/ADOL-C/doc/adolc-20.tex

    r42 r91  
    1 % Latex file containing the documentation of ADOL-C version 2.0.0
     1% Latex file containing the documentation of ADOL-C version 2.1.2
    22%
    33% Copyright (C) Andrea Walther, Andreas Griewank, Andreas Kowarz,
     
    4848{\Large of Algorithms Written in C/C++}\\
    4949\vspace{.2in}
    50 {\large\bf  Version 2.0.0, December 2008} \\
     50{\large\bf  Version 2.1.2, December 2009} \\
    5151\bigskip
    5252 \mbox{Andrea Walther}\footnote{Institute of Mathematics, University
     
    932932the overall mass storage requirement. Sometimes one can avoid exceeding
    933933the accessible range of {\sf unsigned short}s by using more local variables and deleting
    934 {\sf adouble}s or {\sf adoublev}s created by the new operator in a
     934{\sf adouble}s created by the new operator in a
    935935last-in-first-out
    936936fashion.  When memory for {\sf adouble}s is requested through a call to
     
    33783378located in the path \verb=<\$HOME/adolc_base/lib>=. Furthermore a
    33793379copy of all header files of ColPack is assumed to be found in
    3380 the directory \verb=</SOMEPATH/ADOL-C-2.1.0/ThirdParty/ColPack>=.
     3380the directory \verb=</SOMEPATH/ADOL-C-2.1.0/ThirdParty/ColPack/include>=.
    33813381%
    33823382\subsection{Compiling and Linking the Example Programs}
  • stable/2.1/ADOL-C/examples/additional_examples/detexam/detexam-old.cpp

    r42 r91  
    191191        for (j=0; j<n; j++)
    192192            sum += (*pt++)*B[j];
    193         fprintf(stdout,"%le ",sum.value());
     193        fprintf(stdout,"%E ",sum.value());
    194194    }
    195195    fprintf(stdout,"\n\n times for ");
    196     fprintf(stdout,"\n tracing          : \t%le",(t01-t00)*rtu);
    197     fprintf(stdout," units \t%le    seconds",(t01-t00));
    198     fprintf(stdout,"\n forward (no keep): \t%le",(t41-t40)*rtu/itu);
    199     fprintf(stdout," units \t%le    seconds",(t41-t40)/itu);
    200     fprintf(stdout,"\n forward + keep   : \t%le",(t21-t20)*rtu/itu);
    201     fprintf(stdout," units \t%le    seconds",(t21-t20)/itu);
    202     fprintf(stdout,"\n reverse          : \t%le",(t31-t30)*rtu/itu);
    203     fprintf(stdout," units \t%le    seconds\n",(t31-t30)/itu);
     196    fprintf(stdout,"\n tracing          : \t%E",(t01-t00)*rtu);
     197    fprintf(stdout," units \t%E    seconds",(t01-t00));
     198    fprintf(stdout,"\n forward (no keep): \t%E",(t41-t40)*rtu/itu);
     199    fprintf(stdout," units \t%E    seconds",(t41-t40)/itu);
     200    fprintf(stdout,"\n forward + keep   : \t%E",(t21-t20)*rtu/itu);
     201    fprintf(stdout," units \t%E    seconds",(t21-t20)/itu);
     202    fprintf(stdout,"\n reverse          : \t%E",(t31-t30)*rtu/itu);
     203    fprintf(stdout," units \t%E    seconds\n",(t31-t30)/itu);
    204204
    205205    return 1;
  • stable/2.1/ADOL-C/examples/additional_examples/detexam/detexam.cpp

    r42 r91  
    210210        for (j=0; j<n; j++)
    211211            sum += (*pt++)*B[j];
    212         fprintf(stdout,"%le ",sum.value());
     212        fprintf(stdout,"%E ",sum.value());
    213213    }
    214214    fprintf(stdout,"\n\n times for ");
    215     fprintf(stdout,"\n tracing          : \t%le",(t01-t00)*rtu);
    216     fprintf(stdout," units \t%le    seconds",(t01-t00));
    217     fprintf(stdout,"\n forward (no keep): \t%le",(t41-t40)*rtu/itu);
    218     fprintf(stdout," units \t%le    seconds",(t41-t40)/itu);
    219     fprintf(stdout,"\n forward + keep   : \t%le",(t21-t20)*rtu/itu);
    220     fprintf(stdout," units \t%le    seconds",(t21-t20)/itu);
    221     fprintf(stdout,"\n reverse          : \t%le",(t31-t30)*rtu/itu);
    222     fprintf(stdout," units \t%le    seconds\n",(t31-t30)/itu);
     215    fprintf(stdout,"\n tracing          : \t%E",(t01-t00)*rtu);
     216    fprintf(stdout," units \t%E    seconds",(t01-t00));
     217    fprintf(stdout,"\n forward (no keep): \t%E",(t41-t40)*rtu/itu);
     218    fprintf(stdout," units \t%E    seconds",(t41-t40)/itu);
     219    fprintf(stdout,"\n forward + keep   : \t%E",(t21-t20)*rtu/itu);
     220    fprintf(stdout," units \t%E    seconds",(t21-t20)/itu);
     221    fprintf(stdout,"\n reverse          : \t%E",(t31-t30)*rtu/itu);
     222    fprintf(stdout," units \t%E    seconds\n",(t31-t30)/itu);
    223223
    224224    return 1;
  • stable/2.1/ADOL-C/examples/additional_examples/helm/helm-auto-exam.cpp

    r42 r91  
    8383    he >>= result;
    8484    trace_off();
    85     fprintf(stdout, "%14.6le -- energy\n",result);
     85    fprintf(stdout, "%14.6E -- energy\n",result);
    8686
    8787    /*--------------------------------------------------------------------------*/
     
    9090    /*--------------------------------------------------------------------------*/
    9191    for (l=0; l<n; l++)                                            /* results */
    92         fprintf(stdout,"%3d: %14.6le,  \n",l,grad[l]);
    93     fprintf(stdout,"%14.6le -- energy\n",result);
     92        fprintf(stdout,"%3d: %14.6E,  \n",l,grad[l]);
     93    fprintf(stdout,"%14.6E -- energy\n",result);
    9494
    9595    delete [] x;
  • stable/2.1/ADOL-C/examples/additional_examples/helm/helm-diff-exam.cpp

    r42 r91  
    8383    /*--------------------------------------------------------------------------*/
    8484    result2 = energy(n,x,bv);                                    /* basepoint */
    85     fprintf(stdout,"%14.6le -- energy\n",result2);
     85    fprintf(stdout,"%14.6E -- energy\n",result2);
    8686
    8787    /*--------------------------------------------------------------------------*/
     
    9191        x[l]    = x[l]-delta;
    9292        q       = (result1-result2)/delta;
    93         fprintf(stdout,"%3d: %14.6le,  \n",l,q);
     93        fprintf(stdout,"%3d: %14.6E,  \n",l,q);
    9494    }
    95     fprintf(stdout,"%14.6le -- energy\n",result2);
     95    fprintf(stdout,"%14.6E -- energy\n",result2);
    9696
    9797    free((char*) bv);
  • stable/2.1/ADOL-C/examples/additional_examples/lufact/LUdet.cpp

    r42 r91  
    8383    Adet >>= det;
    8484    trace_off();
    85     fprintf(stdout," Determinant (original):  %16.4le\n",det);
     85    fprintf(stdout," Determinant (original):  %16.4E\n",det);
    8686
    8787
     
    8989    /* Recomputation of determinant */
    9090    function(tag,depen,indep,args,&det);
    91     fprintf(stdout," Determinant (from tape): %16.4le\n",det);
     91    fprintf(stdout," Determinant (from tape): %16.4E\n",det);
    9292
    9393
     
    9898    for (i=0; i<size; i++) {
    9999        for (j=0; j<size; j++)
    100             fprintf(stdout," %14.6le",grad[i*size+j]);
     100            fprintf(stdout," %14.6E",grad[i*size+j]);
    101101        fprintf(stdout,"\n");
    102102    }
     
    108108    for (i=0; i<size; i++) {
    109109        for (j=0; j<size; j++)
    110             fprintf(stdout," %14.6le",hess[0][i*size+j]);
     110            fprintf(stdout," %14.6E",hess[0][i*size+j]);
    111111        fprintf(stdout,"\n");
    112112    }
  • stable/2.1/ADOL-C/examples/additional_examples/lufact/LUsolve.cpp

    r42 r91  
    8787        Abx[i] >>= x[i];
    8888    trace_off();
    89     fprintf(stdout," x[0] (original):  %16.4le\n",x[0]);
     89    fprintf(stdout," x[0] (original):  %16.4E\n",x[0]);
    9090
    9191
     
    9393    /* Recomputation  */
    9494    function(tag,depen,indep,args,x);
    95     fprintf(stdout," x[0] (from tape): %16.4le\n",x[0]);
     95    fprintf(stdout," x[0] (from tape): %16.4E\n",x[0]);
    9696
    9797
     
    102102    for (i=0; i<depen; i++) {
    103103        for (j=0; j<indep; j++)
    104             fprintf(stdout," %14.6le",jac[i][j]);
     104            fprintf(stdout," %14.6E",jac[i][j]);
    105105        fprintf(stdout,"\n");
    106106    }
     
    112112    for (i=0; i<size; i++) {
    113113        for (j=0; j<size; j++)
    114             fprintf(stdout," %14.6le",laghessvec[i*size+j]);
     114            fprintf(stdout," %14.6E",laghessvec[i*size+j]);
    115115        fprintf(stdout,"\n");
    116116    }
  • stable/2.1/ADOL-C/examples/additional_examples/ode/vgenodemain.cpp

    r42 r91  
    3737/****************************************************************************/
    3838/*                                                                   MACROS */
    39 #define TIMEFORMAT " %12.6le units,   %12.6le scunits,   %12.6le seconds\n"
     39#define TIMEFORMAT " %12.6E units,   %12.6E scunits,   %12.6E seconds\n"
    4040
    4141
     
    254254            err += fabs(w[j][i]*tau-indeps2[j][i+1]*(i+1))/avg;
    255255        }
    256     fprintf(stdout,"%14.6le = total error \n",err);
     256    fprintf(stdout,"%14.6E = total error \n",err);
    257257
    258258    /*------------------------------------------------------------------------*/
     
    266266            for (j=0; j<indepDim; j++) {
    267267                for (k=0; k<indepDim; k++)
    268                     fprintf(stdout,"%14.6le ",B[j][k][i]);
     268                    fprintf(stdout,"%14.6E ",B[j][k][i]);
    269269                fprintf(stdout,"\n");
    270270            }
     
    290290                           : fabs((w[j][i+1]-indeps2[j][i+1])/h) ;
    291291            }
    292             fprintf(stdout," Relative truncation errors in B(%d) ---> %14.6le\n",
     292            fprintf(stdout," Relative truncation errors in B(%d) ---> %14.6E\n",
    293293                    i,err);
    294294        }
  • stable/2.1/ADOL-C/examples/additional_examples/scal/scalexam.cpp

    r42 r91  
    137137    /*--------------------------------------------------------------------------*/
    138138    if( id < 0 )
    139         fprintf(stdout,"Round-off error: %14.6le\n",(y-x).value());
     139        fprintf(stdout,"Round-off error: %14.6E\n",(y-x).value());
    140140
    141141    /*--------------------------------------------------------------------------*/
     
    176176        xp[i+2]=0;
    177177        forward(tag,1,1,i,i+1,xpoint,respoint);
    178         fprintf(stdout,"%d\t%14.6le\t\t%14.6le\n",i,res[i],yp[i]);
     178        fprintf(stdout,"%d\t%14.6E\t\t%14.6E\n",i,res[i],yp[i]);
    179179        reverse(tag,1,1,i,u,ypoint); // call higher order scalar reverse
    180180        reverse(tag,1,1,i,1,U,V);
    181181        yp[i+1] = yp[i]/(i+1);
    182182        if (V[0][0][i] != yp[i])
    183             fprintf(stdout,"%d-th component in error %14.6le\n",i,V[0][0][i]-yp[i]);
     183            fprintf(stdout,"%d-th component in error %14.6E\n",i,V[0][0][i]-yp[i]);
    184184    }
    185185    cout << "\nWhen n<0 all rows except the first two should vanish \n";
  • stable/2.1/ADOL-C/examples/additional_examples/speelpenning/speelpenning.cpp

    r42 r91  
    7676    double t11 = myclock();
    7777
    78     fprintf(stdout,"%le =? %le  function values should be the same \n",yout,yp);
     78    fprintf(stdout,"%E =? %E  function values should be the same \n",yout,yp);
    7979
    8080    /*--------------------------------------------------------------------------*/
     
    124124    }
    125125
    126     fprintf(stdout,"%le = maximum relative errors in gradient (fw+rv)\n",err);
     126    fprintf(stdout,"%E = maximum relative errors in gradient (fw+rv)\n",err);
    127127
    128128    /*--------------------------------------------------------------------------*/
     
    136136        err =  maxabs(err,g[i]/z[i] - 1.0);
    137137
    138     fprintf(stdout,"%le = gradient error should be exactly zero \n",err);
     138    fprintf(stdout,"%E = gradient error should be exactly zero \n",err);
    139139
    140140    /*--------------------------------------------------------------------------*/
     
    153153        err = maxabs(err,xp[0]*h[i]/g[i]-1.0);
    154154
    155     fprintf(stdout,"%le = maximum relative error in Hessian column \n",err);
     155    fprintf(stdout,"%E = maximum relative error in Hessian column \n",err);
    156156
    157157    /*--------------------------------------------------------------------------*/
     
    162162
    163163    fprintf(stdout,
    164             "%le = %le (1,n) and (n,1) entry should be the same\n",h1n,h[0]);
     164            "%E = %E (1,n) and (n,1) entry should be the same\n",h1n,h[0]);
    165165
    166166    /*--------------------------------------------------------------------------*/
     
    169169        double rtu = 1.0/(t01-t00);
    170170        fprintf(stdout,"\n\n times for ");
    171         fprintf(stdout,"\n unitime          : \t%le  seconds",(t01-t00)/itu);
    172         fprintf(stdout,"\n tracing          : \t%le",(t11-t10)*rtu*itu);
    173         fprintf(stdout,"   units \t%le seconds",(t11-t10));
     171        fprintf(stdout,"\n unitime          : \t%E  seconds",(t01-t00)/itu);
     172        fprintf(stdout,"\n tracing          : \t%E",(t11-t10)*rtu*itu);
     173        fprintf(stdout,"   units \t%E seconds",(t11-t10));
    174174        fprintf(stdout,
    175175                "\n----------------------------------------------------------");
    176         fprintf(stdout,"\n forward (no keep): \t%le",(t61-t60)*rtu);
    177         fprintf(stdout,"   units \t%le seconds",(t61-t60)/itu);
    178         fprintf(stdout,"\n forward + keep   : \t%le",(t21-t20)*rtu);
    179         fprintf(stdout,"   units \t%le seconds",(t21-t20)/itu);
    180         fprintf(stdout,"\n reverse          : \t%le",(t31-t30)*rtu);
    181         fprintf(stdout,"   units \t%le seconds",(t31-t30)/itu);
     176        fprintf(stdout,"\n forward (no keep): \t%E",(t61-t60)*rtu);
     177        fprintf(stdout,"   units \t%E seconds",(t61-t60)/itu);
     178        fprintf(stdout,"\n forward + keep   : \t%E",(t21-t20)*rtu);
     179        fprintf(stdout,"   units \t%E seconds",(t21-t20)/itu);
     180        fprintf(stdout,"\n reverse          : \t%E",(t31-t30)*rtu);
     181        fprintf(stdout,"   units \t%E seconds",(t31-t30)/itu);
    182182        fprintf(stdout,
    183183                "\n----------------------------------------------------------");
    184         fprintf(stdout,"\n gradient         : \t%le",(t41-t40)*rtu);
    185         fprintf(stdout,"   units \t%le seconds",(t41-t40)/itu);
    186         fprintf(stdout,"\n hess*vec         : \t%le",(t51-t50)*rtu);
    187         fprintf(stdout,"   units \t%le seconds\n",(t51-t50)/itu);
     184        fprintf(stdout,"\n gradient         : \t%E",(t41-t40)*rtu);
     185        fprintf(stdout,"   units \t%E seconds",(t41-t40)/itu);
     186        fprintf(stdout,"\n hess*vec         : \t%E",(t51-t50)*rtu);
     187        fprintf(stdout,"   units \t%E seconds\n",(t51-t50)/itu);
    188188    } else
    189189        fprintf(stdout,"\n-> zero timing due to small problem dimension \n");
  • stable/2.1/ADOL-C/examples/additional_examples/tapesave/useTape.cpp

    r42 r91  
    6060
    6161    /* print the results */
    62     fprintf(stdout,"f  = %le\n",f);
    63     fprintf(stdout,"df = (%le, %le, %le)\n",gradf[0],gradf[1],gradf[2]);
     62    fprintf(stdout,"f  = %E\n",f);
     63    fprintf(stdout,"df = (%E, %E, %E)\n",gradf[0],gradf[1],gradf[2]);
    6464
    6565    return 0;
  • stable/2.1/ADOL-C/examples/additional_examples/timing/sgenmain.cpp

    r42 r91  
    3838/****************************************************************************/
    3939/*                                                                   MACROS */
    40 #define TIMEFORMAT " %12.6le units,   %12.6le seconds\n"
     40#define TIMEFORMAT " %12.6E units,   %12.6E seconds\n"
    4141
    4242
     
    319319            fprintf(stdout,"\n    Return value: %d\n",retVal);
    320320            fprintf(stdout,"    Should be the same values:\n");
    321             fprintf(stdout,"    (original) %12.8le =? %12.8le (forward from tape)\n",
     321            fprintf(stdout,"    (original) %12.8E =? %12.8E (forward from tape)\n",
    322322                    depOrig,depTape);
    323323        }
     
    370370            fprintf(stdout,"\n    Return value: %d\n",retVal);
    371371            fprintf(stdout,"    Should be the same values:\n");
    372             fprintf(stdout,"    (original) %12.8le =? %12.8le (forward from tape)\n",
     372            fprintf(stdout,"    (original) %12.8E =? %12.8E (forward from tape)\n",
    373373                    depOrig,YP[0]);
    374374        }
     
    429429            fprintf(stdout,"\n    Return value: %d\n",retVal);
    430430            fprintf(stdout,"    Should be the same values:\n");
    431             fprintf(stdout,"    (original) %12.8le =? %12.8le (forward from tape)\n",
     431            fprintf(stdout,"    (original) %12.8E =? %12.8E (forward from tape)\n",
    432432                    depOrig,YP[0]);
    433433        }
     
    795795            fprintf(stdout,"\n    Return value: %d\n",retVal);
    796796            fprintf(stdout,"    Should be the same values:\n");
    797             fprintf(stdout,"    (original) %12.8le =? %12.8le (forward from tape)\n",
     797            fprintf(stdout,"    (original) %12.8E =? %12.8E (forward from tape)\n",
    798798                    depOrig,depTape);
    799799        }
  • stable/2.1/ADOL-C/examples/additional_examples/timing/vgenmain.cpp

    r42 r91  
    4040/****************************************************************************/
    4141/*                                                                   MACROS */
    42 #define TIMEFORMAT " %12.6le units,   %12.6le seconds\n"
     42#define TIMEFORMAT " %12.6E units,   %12.6E seconds\n"
    4343
    4444
  • stable/2.1/ADOL-C/src/adouble.cpp

    r62 r91  
    14261426    double vy = y.getValue();
    14271427
    1428     if (!(vx > 0))
     1428    if (!(vx > 0)) {
    14291429        if (vx < 0 || vy >= 0)
    14301430            fprintf(DIAG_OUT,"\nADOL-C message: exponent of zero/negative basis deactivated\n");
    14311431        else
    14321432            fprintf(DIAG_OUT,"\nADOL-C message: negative exponent and zero basis deactivated\n");
    1433 
     1433    }
    14341434    condassign(a1,-y, ADOLC_MATH_NSP::pow(vx,vy), pow(x,vy));
    14351435    condassign(a2, fabs(x), pow(x, vy),a1);
  • stable/2.1/ADOL-C/src/adouble.h

    r62 r91  
    3434using std::ostream;
    3535using std::istream;
    36 #ifdef ATRIG_ERF
    37 #if defined(AD_ERR_FUN)
    38 #include <tr1/cmath>
    39 #endif
    40 #endif
    4136
    4237#include <common.h>
     
    867862    tmp.val=ADOLC_MATH_NSP::log(a.val);
    868863    FOR_I_EQ_0_LT_NUMDIR
    869     if (a.val>0 || a.val==0 && a.ADVAL_I>=0) tmp.ADVAL_I=a.ADVAL_I/a.val;
     864      if ((a.val>0 || a.val==0) && a.ADVAL_I>=0) tmp.ADVAL_I=a.ADVAL_I/a.val;
    870865    else tmp.ADVAL_I=makeNaN();
    871866    return tmp;
     
    876871    tmp.val=ADOLC_MATH_NSP::sqrt(a.val);
    877872    FOR_I_EQ_0_LT_NUMDIR
    878     if (a.val>0 || a.val==0 && a.ADVAL_I>=0) tmp.ADVAL_I=a.ADVAL_I/tmp.val/2;
     873      if ((a.val>0 || a.val==0) && a.ADVAL_I>=0) tmp.ADVAL_I=a.ADVAL_I/tmp.val/2;
    879874    else tmp.ADVAL_I=makeNaN();
    880875    return tmp;
  • stable/2.1/ADOL-C/src/checkpointing.cpp

    r42 r91  
    313313    ADOLC_OPENMP_THREAD_NUMBER;
    314314    ADOLC_OPENMP_GET_THREAD_NUMBER;
    315     double *A = ADOLC_CURRENT_TAPE_INFOS.dp_A;
     315    revreal *A = ADOLC_CURRENT_TAPE_INFOS.rp_A;
    316316    int oldTraceFlag;
    317317    locint arg;
     
    411411    ADOLC_OPENMP_THREAD_NUMBER;
    412412    ADOLC_OPENMP_GET_THREAD_NUMBER;
    413     double **A = ADOLC_CURRENT_TAPE_INFOS.dpp_A;
     413    revreal **A = ADOLC_CURRENT_TAPE_INFOS.rpp_A;
    414414    int oldTraceFlag, numDirs;
    415415    locint arg;
  • stable/2.1/ADOL-C/src/convolut.c

    r42 r91  
    2323/*--------------------------------------------------------------------------*/
    2424/* Evaluates convolution of a and b to c */
    25 void conv( int dim, double *a, revreal *b, double *c ) {
     25void conv( int dim, revreal *a, revreal *b, revreal *c ) {
    2626    double tmpVal;
    2727    int i,j;
     
    3434}
    3535
    36 void conv0( int dim, revreal *a, revreal *b, double *c ) {
     36void conv0( int dim, revreal *a, revreal *b, revreal *c ) {
    3737    double tmpVal;
    3838    int i,j;
     
    5050/*--------------------------------------------------------------------------*/
    5151/* Increments truncated convolution of a and b to c */
    52 void inconv( int dim, double *a, revreal *b, double *c ) {
     52void inconv( int dim, revreal *a, revreal *b, revreal *c ) {
    5353    double tmpVal;
    5454    int i,j;
     
    6464/* olvo 980616 nf */
    6565/* Increments truncated convolution of a and b to c and sets a to zero */
    66 void inconv0( int dim, double *a, revreal *b, double *c ) {
     66void inconv0( int dim, revreal *a, revreal *b, revreal *c ) {
    6767    double tmpVal;
    6868    int i,j;
     
    7878/*--------------------------------------------------------------------------*/
    7979/* olvo 980616 nf */
    80 /* Increments truncated convolution of a and b to c and sets a to zero */
     80/* Increments truncated convolution of a and b to c */
    8181void inconv1( int dim, revreal *a, revreal *b, revreal *c ) {
    8282    revreal tmpVal;
     
    8484    for (i=dim-1; i>=0; i--) {
    8585        tmpVal = a[i]*b[0];
    86         a[i] = 0;
    8786        for (j=1; j<=i; j++)
    8887            tmpVal += a[i-j]*b[j];
     
    9695/*--------------------------------------------------------------------------*/
    9796/* Decrements truncated convolution of a and b to c */
    98 void deconv( int dim, double *a, double *b, double *c ) {
     97void deconv( int dim, revreal *a, revreal *b, revreal *c ) {
    9998    double tmpVal;
    10099    int i,j;
     
    110109/* olvo 980616 nf */
    111110/* Decrements truncated convolution of a and b to c and sets a to zero */
    112 void deconv0( int dim, double *a, revreal *b, double *c ) {
     111void deconv0( int dim, revreal *a, revreal *b, revreal *c ) {
    113112    double tmpVal;
    114113    int i,j;
     
    129128    for (i=dim-1; i>=0; i--) {
    130129        tmpVal = a[i]*b[0];
     130        for (j=1; j<=i; j++)
     131            tmpVal += a[i-j]*b[j];
     132        c[i] -= tmpVal;
     133    }
     134}
     135
     136/*--------------------------------------------------------------------------*/
     137/* Decrements truncated convolution of a and b to c and sets a to zero */
     138void deconvZeroR( int dim, revreal *a, revreal *b, revreal *c ) {
     139    double tmpVal;
     140    int i,j;
     141    for (i=dim-1; i>=0; i--) {
     142        tmpVal = a[i]*b[0];
     143        a[i] = 0;
    131144        for (j=1; j<=i; j++)
    132145            tmpVal += a[i-j]*b[j];
     
    177190/* olvo 980616 nf */
    178191/* Copies a to tmp and initializes a to zero */
    179 void copyAndZeroset( int dim, double *a, double* tmp ) {
     192void copyAndZeroset( int dim, revreal *a, revreal* tmp ) {
    180193    int i;
    181194    for (i=0; i<dim; i++) {
  • stable/2.1/ADOL-C/src/convolut.h

    r42 r91  
    2626/*--------------------------------------------------------------------------*/
    2727/* Evaluates convolution of a and b to c */
    28 void conv( int dim, double *a, revreal *b, double *c );
    29 void conv0( int dim, revreal *a, revreal *b, double *c );
     28void conv( int dim, revreal *a, revreal *b, revreal *c );
     29void conv0( int dim, revreal *a, revreal *b, revreal *c );
    3030
    3131/****************************************************************************/
     
    3434/*--------------------------------------------------------------------------*/
    3535/* Increments truncated convolution of a and b to c */
    36 void inconv ( int dim, double *a, revreal *b, double* c );
     36void inconv ( int dim, revreal *a, revreal *b, revreal* c );
    3737
    3838/*--------------------------------------------------------------------------*/
    3939/* Increments truncated convolution of a and b to c and sets a to zero */
    40 void inconv0( int dim, double *a, revreal *b, double* c );
     40void inconv0( int dim, revreal *a, revreal *b, revreal* c );
    4141void inconv1( int dim, revreal *a, revreal *b, revreal* c );
    4242
     
    4747/*--------------------------------------------------------------------------*/
    4848/* Decrements truncated convolution of a and b to c */
    49 void deconv ( int dim, double* a, double *b, double* c );
     49void deconv ( int dim, revreal* a, revreal *b, revreal* c );
    5050
    5151/*--------------------------------------------------------------------------*/
    5252/* Decrements truncated convolution of a and b to c and sets a to zero */
    53 void deconv0( int dim, double* a, revreal *b, double* c );
     53void deconv0( int dim, revreal* a, revreal *b, revreal* c );
    5454void deconv1( int dim, revreal* a, revreal *b, revreal* c );
     55void deconvZeroR( int dim, revreal *a, revreal *b, revreal *c );
    5556
    5657
     
    7475/*--------------------------------------------------------------------------*/
    7576/* Copies a to tmp and initializes a to zero */
    76 void copyAndZeroset( int dim, double *a, double* tmp);
     77void copyAndZeroset( int dim, revreal *a, revreal* tmp);
    7778
    7879
  • stable/2.1/ADOL-C/src/drivers/drivers.c

    r62 r91  
    8787             int depen,
    8888             int indep,
    89              double *argument,
     89             const double *argument,
    9090             double **jacobian) {
    9191    int rc;
     
    105105        myfreeI2(depen, I);
    106106    }
     107
     108    myfree1(result);
     109
    107110    return rc;
    108111}
  • stable/2.1/ADOL-C/src/drivers/drivers.h

    r62 r91  
    4040/*                                                                 jacobian */
    4141/* jacobian(tag, m, n, x[n], J[m][n])                                       */
    42 ADOLC_DLL_EXPORT int jacobian(short,int,int,double*,double**);
     42ADOLC_DLL_EXPORT int jacobian(short,int,int,const double*,double**);
    4343ADOLC_DLL_EXPORT fint jacobian_(fint*,fint*,fint*,fdouble*,fdouble*);
    4444
  • stable/2.1/ADOL-C/src/drivers/taylor.c

    r62 r91  
    350350        if (ZERO > v) {
    351351            fprintf(DIAG_OUT,
    352                     "Error:LUFactorisation(..): no Pivot in step %d (%le)\n",k+1,v);
     352                    "Error:LUFactorisation(..): no Pivot in step %d (%E)\n",k+1,v);
    353353            return -(k+1);
    354354        }
     
    590590                for (j=0; j<n; j++)
    591591                    if (nonzero[i][j]>1) {
    592                         int indj = j;
    593                         int indX = l;
    594592                        Aij = A[i][j];
    595593                        indexA = l-1;
  • stable/2.1/ADOL-C/src/dvlparms.h

    r62 r91  
    3030#define ADOLC_MATH_NSP std
    3131/* For error function with gcc compiler                                     */
    32 #define ADOLC_MATH_NSP_ERF std::tr1
     32#define ADOLC_MATH_NSP_ERF
    3333
    3434/*--------------------------------------------------------------------------*/
  • stable/2.1/ADOL-C/src/fo_rev.c

    r62 r91  
    291291    /* Adjoint stuff */
    292292#ifdef _FOS_
    293     double *dp_A;
    294     double aTmp;
     293    revreal *rp_A;
     294    revreal aTmp;
    295295#endif
    296296#ifdef _FOV_
    297     double **dpp_A;
    298     double aTmp;
     297    revreal **rpp_A, *Aqo;
     298    revreal aTmp;
    299299#endif
    300300#if !defined(_NTIGHT_)
     
    302302#endif /* !_NTIGHT_ */
    303303#if !defined _INT_REV_
    304     double  *Ares, *Aarg, *Aarg1, *Aarg2;
     304    revreal  *Ares, *Aarg, *Aarg1, *Aarg2;
    305305#else
    306306    unsigned long int **upp_A;
     
    386386    /*--------------------------------------------------------------------------*/
    387387#ifdef _FOS_                                                         /* FOS */
    388     dp_A = myalloc1(ADOLC_CURRENT_TAPE_INFOS.stats[NUM_MAX_LIVES]);
    389     ADOLC_CURRENT_TAPE_INFOS.dp_A = dp_A;
     388    rp_A = (revreal*) malloc(ADOLC_CURRENT_TAPE_INFOS.stats[NUM_MAX_LIVES] * sizeof(revreal));
     389    if (rp_A == NULL) fail(ADOLC_MALLOC_FAILED);
     390    ADOLC_CURRENT_TAPE_INFOS.rp_A = rp_A;
    390391    rp_T = (revreal *)malloc(ADOLC_CURRENT_TAPE_INFOS.stats[NUM_MAX_LIVES] *
    391392            sizeof(revreal));
    392393    if (rp_T == NULL) fail(ADOLC_MALLOC_FAILED);
    393394#if !defined(ADOLC_USE_CALLOC)
    394     c_Ptr = (char *) ADOLC_GLOBAL_TAPE_VARS.dp_A;
     395    c_Ptr = (char *) ADOLC_GLOBAL_TAPE_VARS.rp_A;
    395396    *c_Ptr = 0;
    396397    memcpy(c_Ptr + 1, c_Ptr, sizeof(double) *
    397398            ADOLC_CURRENT_TAPE_INFOS.stats[NUM_MAX_LIVES] - 1);
    398399#endif
    399 # define ADJOINT_BUFFER dp_A
    400 # define ADJOINT_BUFFER_ARG_L dp_A[arg]
    401 # define ADJOINT_BUFFER_RES_L dp_A[res]
     400# define ADJOINT_BUFFER rp_A
     401# define ADJOINT_BUFFER_ARG_L rp_A[arg]
     402# define ADJOINT_BUFFER_RES_L rp_A[res]
    402403# define ADOLC_EXT_FCT_U_L_LOOP edfct->dp_U[loop]
    403404# define ADOLC_EXT_FCT_Z_L_LOOP edfct->dp_Z[loop]
     
    406407#else
    407408#if defined _FOV_                                                          /* FOV */
    408     dpp_A = myalloc2(ADOLC_CURRENT_TAPE_INFOS.stats[NUM_MAX_LIVES], p);
    409     ADOLC_CURRENT_TAPE_INFOS.dpp_A = dpp_A;
     409    Aqo = (revreal*)malloc(ADOLC_CURRENT_TAPE_INFOS.stats[NUM_MAX_LIVES] * p *
     410            sizeof(revreal));
     411    if (Aqo == NULL) fail(ADOLC_MALLOC_FAILED);
     412    for (j=0; j<ADOLC_CURRENT_TAPE_INFOS.stats[NUM_MAX_LIVES]; j++) {
     413        rpp_A[j] = Aqo;
     414        Aqo += p;
     415    }
     416    ADOLC_CURRENT_TAPE_INFOS.rpp_A = rpp_A;
    410417    rp_T = (revreal *)malloc(ADOLC_CURRENT_TAPE_INFOS.stats[NUM_MAX_LIVES] *
    411418            sizeof(revreal));
     
    417424            ADOLC_CURRENT_TAPE_INFOS.stats[NUM_MAX_LIVES] - 1);
    418425#endif
    419 # define ADJOINT_BUFFER dpp_A
    420 # define ADJOINT_BUFFER_ARG_L dpp_A[arg][l]
    421 # define ADJOINT_BUFFER_RES_L dpp_A[res][l]
     426# define ADJOINT_BUFFER rpp_A
     427# define ADJOINT_BUFFER_ARG_L rpp_A[arg][l]
     428# define ADJOINT_BUFFER_RES_L rpp_A[res][l]
    422429# define ADOLC_EXT_FCT_U_L_LOOP edfct->dpp_U[l][loop]
    423430# define ADOLC_EXT_FCT_Z_L_LOOP edfct->dpp_Z[l][loop]
     
    17821789#endif
    17831790#ifdef _FOS_
    1784     free(dp_A);
     1791    free(rp_A);
    17851792#endif
    17861793#ifdef _FOV_
    1787     myfree2(dpp_A);
     1794    myfree2(rpp_A);
    17881795#endif
    17891796#ifdef _INT_REV_
  • stable/2.1/ADOL-C/src/ho_rev.c

    r62 r91  
    142142
    143143#define ASSIGN_A(a,b)  a = &b;
    144 #define HOS_OV_ASSIGN_A(Aqo,  dp_Atemp)
     144#define HOS_OV_ASSIGN_A(Aqo,  rp_Atemp)
    145145#define FOR_0_LE_l_LT_q l = 0;
    146146
     
    399399# define A_TEMP Atemp
    400400#endif
    401     double *Ares, *Aarg=NULL, *Aarg1, *Aarg2, *Aqo, *dp_Atemp, *dp_Atemp2;
    402     double **dpp_A, *AP1, *AP2;
     401    revreal *Ares, *Aarg=NULL, *Aarg1, *Aarg2, *Aqo, *rp_Atemp, *rp_Atemp2;
     402    revreal **rpp_A, *AP1, *AP2;
    403403
    404404    /*----------------------------------------------------------------------*/
     
    422422#endif
    423423
     424
    424425    ADOLC_OPENMP_THREAD_NUMBER;
    425426    ADOLC_OPENMP_GET_THREAD_NUMBER;
     
    463464    /*----------------------------------------------------------------------*/
    464465#ifdef _HOS_                                                         /* HOS */
    465     dpp_A = myalloc2(ADOLC_CURRENT_TAPE_INFOS.stats[NUM_MAX_LIVES], k1);
     466    rpp_A = (revreal**)malloc(ADOLC_CURRENT_TAPE_INFOS.stats[NUM_MAX_LIVES] *
     467            sizeof(revreal*));
     468    if (rpp_A == NULL) fail(ADOLC_MALLOC_FAILED);
     469    Aqo = (revreal*)malloc(ADOLC_CURRENT_TAPE_INFOS.stats[NUM_MAX_LIVES] * k1 *
     470            sizeof(revreal));
     471    if (Aqo == NULL) fail(ADOLC_MALLOC_FAILED);
     472    for (i=0; i<ADOLC_CURRENT_TAPE_INFOS.stats[NUM_MAX_LIVES]; i++) {
     473        rpp_A[i] = Aqo;
     474        Aqo += k1;
     475    }
    466476    rpp_T = (revreal**)malloc(ADOLC_CURRENT_TAPE_INFOS.stats[NUM_MAX_LIVES] *
    467477            sizeof(revreal*));
     
    474484        Tqo += k;
    475485    }
    476     dp_Atemp  = myalloc1(k1);
    477     dp_Atemp2 = myalloc1(k1);
     486    rp_Atemp  = (revreal *)malloc(k1 * sizeof(revreal));
     487    rp_Atemp2 = (revreal *)malloc(k1 * sizeof(revreal));
    478488    rp_Ttemp2 = (revreal *)malloc(k * sizeof(revreal));
    479489    /*----------------------------------------------------------------------*/
    480490#elif _HOV_                                                          /* HOV */
    481     dpp_A = myalloc2(ADOLC_CURRENT_TAPE_INFOS.stats[NUM_MAX_LIVES], pk1);
     491    rpp_A = (revreal**)malloc(ADOLC_CURRENT_TAPE_INFOS.stats[NUM_MAX_LIVES] *
     492            sizeof(revreal*));
     493    if (rpp_A == NULL) fail(ADOLC_MALLOC_FAILED);
     494    Aqo = (revreal*)malloc(ADOLC_CURRENT_TAPE_INFOS.stats[NUM_MAX_LIVES] * pk1 *
     495            sizeof(revreal));
     496    if (Aqo == NULL) fail(ADOLC_MALLOC_FAILED);
     497    for (i=0; i<ADOLC_CURRENT_TAPE_INFOS.stats[NUM_MAX_LIVES]; i++) {
     498        rpp_A[i] = Aqo;
     499        Aqo += pk1;
     500    }
    482501    rpp_T = (revreal**)malloc(ADOLC_CURRENT_TAPE_INFOS.stats[NUM_MAX_LIVES] *
    483502            sizeof(revreal*));
     
    490509        Tqo += k;
    491510    }
    492     dp_Atemp  = myalloc1(pk1);
    493     dp_Atemp2 = myalloc1(pk1);
     511    rp_Atemp  = (revreal*) malloc(pk1 * sizeof(revreal));
     512    rp_Atemp2 = (revreal*) malloc(pk1 * sizeof(revreal));
    494513    rp_Ttemp2 = (revreal*) malloc(k * sizeof(revreal));
    495514    /*----------------------------------------------------------------------*/
    496515#elif _HOS_OV_                                                    /* HOS_OV */
    497     dpp_A = myalloc2(ADOLC_CURRENT_TAPE_INFOS.stats[NUM_MAX_LIVES], pk1);
     516    rpp_A = (revreal**)malloc(ADOLC_CURRENT_TAPE_INFOS.stats[NUM_MAX_LIVES] *
     517            sizeof(revreal*));
     518    if (rpp_A == NULL) fail(ADOLC_MALLOC_FAILED);
     519    Aqo = (revreal*)malloc(ADOLC_CURRENT_TAPE_INFOS.stats[NUM_MAX_LIVES] * pk1 *
     520            sizeof(revreal));
     521    if (Aqo == NULL) fail(ADOLC_MALLOC_FAILED);
     522    for (i=0; i<ADOLC_CURRENT_TAPE_INFOS.stats[NUM_MAX_LIVES]; i++) {
     523        rpp_A[i] = Aqo;
     524        Aqo += pk1;
     525    }
    498526    rpp_T = (revreal**)malloc(ADOLC_CURRENT_TAPE_INFOS.stats[NUM_MAX_LIVES] *
    499527            sizeof(revreal*));
     
    506534        Tqo += p*k;
    507535    }
    508     dp_Atemp  = myalloc1(pk1);
    509     dp_Atemp2 = myalloc1(pk1);
     536    rp_Atemp  = (revreal*) malloc(pk1 * sizeof(revreal));
     537    rp_Atemp2 = (revreal*) malloc(pk1 * sizeof(revreal));
    510538    rp_Ttemp2 = (revreal*) malloc(p*k*sizeof(revreal));
    511539#endif
     
    519547    /************************************************************************/
    520548    /*                                                TAYLOR INITIALIZATION */
    521     ADOLC_CURRENT_TAPE_INFOS.dpp_A = dpp_A;
     549    ADOLC_CURRENT_TAPE_INFOS.rpp_A = rpp_A;
    522550    ADOLC_CURRENT_TAPE_INFOS.rpp_T = rpp_T;
    523551    taylor_back(tnum,&numdep,&numind,&taycheck);
     
    556584    ++countPerOperation[operation];
    557585#endif /* ADOLC_DEBUG */
     586
    558587    while (operation != start_of_tape) {
    559588        /* Switch statement to execute the operations in Reverse */
     
    623652                arg = get_locint_r();
    624653
    625                 ASSIGN_A(Aarg, dpp_A[arg])
    626                 ASSIGN_A(Ares, dpp_A[res])
     654                ASSIGN_A(Aarg, rpp_A[arg])
     655                ASSIGN_A(Ares, rpp_A[res])
    627656
    628657                FOR_0_LE_l_LT_p
     
    650679                coval = get_val_r();
    651680
    652                 ASSIGN_A(Ares, dpp_A[res])
     681                ASSIGN_A(Ares, rpp_A[res])
    653682
    654683                FOR_0_LE_l_LT_pk1
     
    663692                res   = get_locint_r();
    664693
    665                 ASSIGN_A(Ares, dpp_A[res])
     694                ASSIGN_A(Ares, rpp_A[res])
    666695
    667696                FOR_0_LE_l_LT_pk1
     
    676705                res = get_locint_r();
    677706
    678                 ASSIGN_A(Ares, dpp_A[res])
     707                ASSIGN_A(Ares, rpp_A[res])
    679708
    680709                FOR_0_LE_l_LT_p
     
    698727                res = get_locint_r();
    699728
    700                 ASSIGN_A(Ares, dpp_A[res])
    701                 ASSIGN_A(Aarg, dpp_A[res])   /* just a helpful pointers */
     729                ASSIGN_A(Ares, rpp_A[res])
     730                ASSIGN_A(Aarg, rpp_A[res])   /* just a helpful pointers */
    702731
    703732                FOR_0_LE_l_LT_p
     
    733762                arg = get_locint_r();
    734763
    735                 ASSIGN_A(Ares, dpp_A[res])
    736                 ASSIGN_A(Aarg, dpp_A[arg]);
     764                ASSIGN_A(Ares, rpp_A[res])
     765                ASSIGN_A(Aarg, rpp_A[arg]);
    737766
    738767                FOR_0_LE_l_LT_p
     
    766795                arg = get_locint_r();
    767796
    768                 ASSIGN_A(Ares, dpp_A[res])
    769                 ASSIGN_A(Aarg, dpp_A[arg])
     797                ASSIGN_A(Ares, rpp_A[res])
     798                ASSIGN_A(Aarg, rpp_A[arg])
    770799
    771800                FOR_0_LE_l_LT_p
     
    790819                coval = get_val_r();
    791820
    792                 ASSIGN_A(Ares, dpp_A[res])
     821                ASSIGN_A(Ares, rpp_A[res])
    793822
    794823                FOR_0_LE_l_LT_p
     
    810839                GET_TAYL(res,k,p)
    811840
    812                 ASSIGN_A(Ares, dpp_A[res])
    813                 ASSIGN_A(Aarg, dpp_A[arg])
    814                 ASSIGN_A(Aqo,  dp_Atemp)
     841                ASSIGN_A(Ares, rpp_A[res])
     842                ASSIGN_A(Aarg, rpp_A[arg])
     843                ASSIGN_A(Aqo,  rp_Atemp)
    815844                ASSIGN_T(Tres, rpp_T[res])
    816845                ASSIGN_T(Targ, rpp_T[arg])
     
    825854                        AARG_INC_O;
    826855                        ARES_INC_O;
    827                         conv(k,Ares,Targ,dp_Atemp);
     856                        conv(k,Ares,Targ,rp_Atemp);
    828857                        if(arg != res) {
    829858                            inconv(k,Ares,Tres,Aarg);
     
    836865                        HOS_OV_INC(Tres,k)
    837866                        HOS_OV_INC(Targ,k)
    838                         HOS_OV_ASSIGN_A(Aqo,  dp_Atemp)
     867                        HOS_OV_ASSIGN_A(Aqo,  rp_Atemp)
    839868                    }
    840869            }
     
    859888                arg1 = get_locint_r();
    860889
    861                 ASSIGN_A(Ares,  dpp_A[res])
    862                 ASSIGN_A(Aarg1, dpp_A[arg1])
    863                 ASSIGN_A(Aarg2, dpp_A[arg2])
     890                ASSIGN_A(Ares,  rpp_A[res])
     891                ASSIGN_A(Aarg1, rpp_A[arg1])
     892                ASSIGN_A(Aarg2, rpp_A[arg2])
    864893
    865894                FOR_0_LE_l_LT_p
     
    893922                coval = get_val_r();
    894923
    895                 ASSIGN_A(Ares, dpp_A[res])
    896                 ASSIGN_A(Aarg, dpp_A[arg])
     924                ASSIGN_A(Ares, rpp_A[res])
     925                ASSIGN_A(Aarg, rpp_A[arg])
    897926
    898927                FOR_0_LE_l_LT_p
     
    922951                arg1 = get_locint_r();
    923952
    924                 ASSIGN_A(Ares,  dpp_A[res])
    925                 ASSIGN_A(Aarg1, dpp_A[arg1])
    926                 ASSIGN_A(Aarg2, dpp_A[arg2])
     953                ASSIGN_A(Ares,  rpp_A[res])
     954                ASSIGN_A(Aarg1, rpp_A[arg1])
     955                ASSIGN_A(Aarg2, rpp_A[arg2])
    927956
    928957                FOR_0_LE_l_LT_p
     
    956985                coval = get_val_r();
    957986
    958                 ASSIGN_A(Ares, dpp_A[res])
    959                 ASSIGN_A(Aarg, dpp_A[arg])
     987                ASSIGN_A(Ares, rpp_A[res])
     988                ASSIGN_A(Aarg, rpp_A[arg])
    960989
    961990                FOR_0_LE_l_LT_p
     
    9861015                GET_TAYL(res,k,p)
    9871016
    988                 ASSIGN_A(Ares,  dpp_A[res])
    989                 ASSIGN_A(Aarg2, dpp_A[arg2])
    990                 ASSIGN_A(Aarg1, dpp_A[arg1])
     1017                ASSIGN_A(Ares,  rpp_A[res])
     1018                ASSIGN_A(Aarg2, rpp_A[arg2])
     1019                ASSIGN_A(Aarg1, rpp_A[arg1])
    9911020                ASSIGN_T(Targ1, rpp_T[arg1])
    9921021                ASSIGN_T(Targ2, rpp_T[arg2])
     
    10051034                    AARG2_INC_O;
    10061035
    1007                     copyAndZeroset(k,Ares,dp_Atemp);
    1008                     inconv(k,dp_Atemp,Targ1,Aarg2);
    1009                     inconv(k,dp_Atemp,Targ2,Aarg1);
     1036                    copyAndZeroset(k,Ares,rp_Atemp);
     1037                    inconv(k,rp_Atemp,Targ1,Aarg2);
     1038                    inconv(k,rp_Atemp,Targ2,Aarg1);
    10101039
    10111040                    HOV_INC(Ares,  k)
     
    10261055
    10271056
    1028                 ASSIGN_A(Ares,  dpp_A[res])
    1029                 ASSIGN_A(Aarg2, dpp_A[arg2])
    1030                 ASSIGN_A(Aarg1, dpp_A[arg1])
     1057                ASSIGN_A(Ares,  rpp_A[res])
     1058                ASSIGN_A(Aarg2, rpp_A[arg2])
     1059                ASSIGN_A(Aarg1, rpp_A[arg1])
    10311060                ASSIGN_T(Targ1, rpp_T[arg1])
    10321061                ASSIGN_T(Targ2, rpp_T[arg2])
     
    10691098
    10701099
    1071                 ASSIGN_A(Ares,  dpp_A[res])
    1072                 ASSIGN_A(Aarg2, dpp_A[arg2])
    1073                 ASSIGN_A(Aarg1, dpp_A[arg1])
     1100                ASSIGN_A(Ares,  rpp_A[res])
     1101                ASSIGN_A(Aarg2, rpp_A[arg2])
     1102                ASSIGN_A(Aarg1, rpp_A[arg1])
    10741103                ASSIGN_T(Targ1, rpp_T[arg1])
    10751104                ASSIGN_T(Targ2, rpp_T[arg2])
     
    10921121                    AARG2_INC_O;
    10931122
    1094                     deconv0(k,Ares,Targ1,Aarg2);
    1095                     deconv0(k,Ares,Targ2,Aarg1);
     1123                    deconv1(k,Ares,Targ1,Aarg2);
     1124                    deconv1(k,Ares,Targ2,Aarg1);
    10961125
    10971126                    HOV_INC(Ares,  k)
     
    11101139                coval = get_val_r();
    11111140
    1112                 ASSIGN_A(Ares, dpp_A[res])
    1113                 ASSIGN_A(Aarg, dpp_A[arg])
     1141                ASSIGN_A(Ares, rpp_A[res])
     1142                ASSIGN_A(Aarg, rpp_A[arg])
    11141143
    11151144                FOR_0_LE_l_LT_p
     
    11391168                arg1 = get_locint_r();
    11401169
    1141                 ASSIGN_A(Ares,  dpp_A[res])
    1142                 ASSIGN_A(Aarg2, dpp_A[arg2])
    1143                 ASSIGN_A(Aarg1, dpp_A[arg1])
     1170                ASSIGN_A(Ares,  rpp_A[res])
     1171                ASSIGN_A(Aarg2, rpp_A[arg2])
     1172                ASSIGN_A(Aarg1, rpp_A[arg1])
    11441173                ASSIGN_T(Tres,  rpp_T[res])
    11451174                ASSIGN_T(Targ2, rpp_T[arg2])
     
    11721201                      recipr(k,1.0,Targ2,rp_Ttemp);
    11731202                      conv0(k ,rp_Ttemp,
    1174                            Tres, dp_Atemp2);
     1203                           Tres, rp_Atemp2);
    11751204                      VEC_COMPUTED_END
    1176                       copyAndZeroset(k,Ares,dp_Atemp);
    1177                       inconv(k, dp_Atemp,
     1205                      copyAndZeroset(k,Ares,rp_Atemp);
     1206                      inconv(k, rp_Atemp,
    11781207                             rp_Ttemp, Aarg1);
    1179                       deconv(k, dp_Atemp,
    1180                              dp_Atemp2, Aarg2);
     1208                      deconv(k, rp_Atemp,
     1209                             rp_Atemp2, Aarg2);
    11811210
    11821211                      HOV_INC(Ares,  k)
     
    11981227                coval = get_val_r();
    11991228
    1200                 ASSIGN_A(Ares, dpp_A[res])
    1201                 ASSIGN_A(Aarg, dpp_A[arg])
     1229                ASSIGN_A(Ares, rpp_A[res])
     1230                ASSIGN_A(Aarg, rpp_A[arg])
    12021231                ASSIGN_T(Tres, rpp_T[res])
    12031232                ASSIGN_T(Targ, rpp_T[arg])
     
    12261255                      recipr(k,1.0,Targ,rp_Ttemp);
    12271256                      conv0(k, rp_Ttemp,
    1228                            Tres, dp_Atemp);
     1257                           Tres, rp_Atemp);
    12291258                      VEC_COMPUTED_END
    1230                       deconv(k,Ares,dp_Atemp,Aarg);
     1259                      deconvZeroR(k,Ares,rp_Atemp,Aarg);
    12311260
    12321261                      HOV_INC(Ares, k)
     
    12491278                arg   = get_locint_r();
    12501279
    1251                 ASSIGN_A(Ares, dpp_A[res])
    1252                 ASSIGN_A(Aarg, dpp_A[arg])
     1280                ASSIGN_A(Ares, rpp_A[res])
     1281                ASSIGN_A(Aarg, rpp_A[arg])
    12531282
    12541283                FOR_0_LE_l_LT_p
     
    12761305                arg   = get_locint_r();
    12771306
    1278                 ASSIGN_A(Ares, dpp_A[res])
    1279                 ASSIGN_A(Aarg, dpp_A[arg])
     1307                ASSIGN_A(Ares, rpp_A[res])
     1308                ASSIGN_A(Aarg, rpp_A[arg])
    12801309
    12811310                FOR_0_LE_l_LT_p
     
    13071336                arg = get_locint_r();
    13081337
    1309                 ASSIGN_A(Ares, dpp_A[res])
    1310                 ASSIGN_A(Aarg, dpp_A[arg])
     1338                ASSIGN_A(Ares, rpp_A[res])
     1339                ASSIGN_A(Aarg, rpp_A[arg])
    13111340                ASSIGN_T(Tres, rpp_T[res])
    13121341                ASSIGN_T(Targ, rpp_T[arg])
     
    13401369                arg1 = get_locint_r();
    13411370
    1342                 ASSIGN_A(Ares,  dpp_A[res])
    1343                 ASSIGN_A(Aarg1, dpp_A[arg1])
     1371                ASSIGN_A(Ares,  rpp_A[res])
     1372                ASSIGN_A(Aarg1, rpp_A[arg1])
    13441373                ASSIGN_T(Targ2, rpp_T[arg2])
    13451374
     
    13651394                GET_TAYL(res,k,p)
    13661395                GET_TAYL(arg2,k,p) /* olvo 980710 covalue */
    1367                 /* NOTE: dpp_A[arg2] should be 0 already */
     1396                /* NOTE: rpp_A[arg2] should be 0 already */
    13681397                break;
    13691398
     
    13741403                arg1 = get_locint_r();
    13751404
    1376                 ASSIGN_A(Ares,  dpp_A[res])
    1377                 ASSIGN_A(Aarg1, dpp_A[arg1])
     1405                ASSIGN_A(Ares,  rpp_A[res])
     1406                ASSIGN_A(Aarg1, rpp_A[arg1])
    13781407                ASSIGN_T(Targ2, rpp_T[arg2])
    13791408
     
    13991428                GET_TAYL(res,k,p)
    14001429                GET_TAYL(arg2,k,p) /* olvo 980710 covalue */
    1401                 /* NOTE: dpp_A[arg2] should be 0 already */
     1430                /* NOTE: rpp_A[arg2] should be 0 already */
    14021431                break;
    14031432                /*xxx*/
     
    14161445                GET_TAYL(res,k,p)
    14171446
    1418                 ASSIGN_A(Ares,  dpp_A[res])
    1419                 ASSIGN_A(Aarg1, dpp_A[arg1])
     1447                ASSIGN_A(Ares,  rpp_A[res])
     1448                ASSIGN_A(Aarg1, rpp_A[arg1])
    14201449                ASSIGN_T(Targ2, rpp_T[arg2])
    14211450
     
    14471476                GET_TAYL(res,k,p)
    14481477
    1449                 ASSIGN_A(Ares, dpp_A[res])
    1450                 ASSIGN_A(Aarg, dpp_A[arg])
     1478                ASSIGN_A(Ares, rpp_A[res])
     1479                ASSIGN_A(Aarg, rpp_A[arg])
    14511480                ASSIGN_T(Targ, rpp_T[arg])
    14521481
     
    14831512                ASSIGN_T(Targ, rpp_T[arg])
    14841513                ASSIGN_T(Tres, rpp_T[res])
    1485                 ASSIGN_A(Ares, dpp_A[res])
    1486                 ASSIGN_A(Aarg, dpp_A[arg])
     1514                ASSIGN_A(Ares, rpp_A[res])
     1515                ASSIGN_A(Aarg, rpp_A[arg])
    14871516
    14881517                /* olvo 980921 allows reflexive operation */
     
    15521581                                    /* it reformulates x^n into x* ... *x n times */
    15531582
    1554                                     copyAndZeroset(k,Ares,dp_Atemp);
    1555                                     inconv(k,dp_Atemp,Targ,Aarg);
    1556                                     inconv(k,dp_Atemp,Targ,Aarg);
     1583                                    copyAndZeroset(k,Ares,rp_Atemp);
     1584                                    inconv(k,rp_Atemp,Targ,Aarg);
     1585                                    inconv(k,rp_Atemp,Targ,Aarg);
    15571586                                    if (coval == 3) {
    1558                                         conv(k,Aarg,Targ,dp_Atemp);
     1587                                        conv(k,Aarg,Targ,rp_Atemp);
    15591588                                        FOR_0_LE_i_LT_k
    1560                                         Aarg[i] = 2.0 * dp_Atemp[i];
     1589                                        Aarg[i] = 2.0 * rp_Atemp[i];
    15611590                                   }
    15621591                                }
     
    15801609                arg = get_locint_r();
    15811610
    1582                 ASSIGN_A(Ares, dpp_A[res])
    1583                 ASSIGN_A(Aarg, dpp_A[arg])
     1611                ASSIGN_A(Ares, rpp_A[res])
     1612                ASSIGN_A(Aarg, rpp_A[arg])
    15841613                ASSIGN_T(Tres, rpp_T[res])
    15851614
     
    16171646                coval = get_val_r();
    16181647
    1619                 ASSIGN_A(Ares,  dpp_A[res])
    1620                 ASSIGN_A(Aarg1, dpp_A[arg1])
     1648                ASSIGN_A(Ares,  rpp_A[res])
     1649                ASSIGN_A(Aarg1, rpp_A[arg1])
    16211650                ASSIGN_T(Targ2, rpp_T[arg2])
    16221651
     
    16571686                GET_TAYL(res,k,p)
    16581687
    1659                 ASSIGN_A(Aarg1, dpp_A[arg1])
    1660                 ASSIGN_A(Aarg2, dpp_A[arg2])
    1661                 ASSIGN_A(Ares,  dpp_A[res])
     1688                ASSIGN_A(Aarg1, rpp_A[arg1])
     1689                ASSIGN_A(Aarg2, rpp_A[arg2])
     1690                ASSIGN_A(Ares,  rpp_A[res])
    16621691                ASSIGN_T(Targ1, rpp_T[arg1])
    16631692                ASSIGN_T(Targ2, rpp_T[arg2])
     
    17641793                GET_TAYL(res,k,p)
    17651794
    1766                 ASSIGN_A(Ares, dpp_A[res])
    1767                 ASSIGN_A(Aarg, dpp_A[arg])
     1795                ASSIGN_A(Ares, rpp_A[res])
     1796                ASSIGN_A(Aarg, rpp_A[arg])
    17681797                ASSIGN_T(Targ, rpp_T[arg])
    17691798
     
    18261855                coval = (coval != ceil(*rpp_T[arg]) );
    18271856
    1828                 ASSIGN_A(Ares, dpp_A[res])
     1857                ASSIGN_A(Ares, rpp_A[res])
    18291858
    18301859                FOR_0_LE_l_LT_p
     
    18541883                coval = ( coval != floor(*rpp_T[arg]) );
    18551884
    1856                 ASSIGN_A(Ares, dpp_A[res])
    1857                 ASSIGN_A(Aarg, dpp_A[arg])
     1885                ASSIGN_A(Ares, rpp_A[res])
     1886                ASSIGN_A(Aarg, rpp_A[arg])
    18581887
    18591888                FOR_0_LE_l_LT_p
     
    18871916                GET_TAYL(res,k,p)
    18881917
    1889                 ASSIGN_A(Aarg1, dpp_A[arg1])
    1890                 ASSIGN_A(Ares,  dpp_A[res])
    1891                 ASSIGN_A(Aarg2, dpp_A[arg2])
     1918                ASSIGN_A(Aarg1, rpp_A[arg1])
     1919                ASSIGN_A(Ares,  rpp_A[res])
     1920                ASSIGN_A(Aarg2, rpp_A[arg2])
    18921921                ASSIGN_T(Targ,  rpp_T[arg])
    18931922
     
    19701999                GET_TAYL(res,k,p)
    19712000
    1972                 ASSIGN_A(Aarg1, dpp_A[arg1])
    1973                 ASSIGN_A(Ares,  dpp_A[res])
     2001                ASSIGN_A(Aarg1, rpp_A[arg1])
     2002                ASSIGN_A(Ares,  rpp_A[res])
    19742003                ASSIGN_T(Targ,  rpp_T[arg])
    19752004
     
    20242053                    res--;
    20252054
    2026                     ASSIGN_A( Ares, dpp_A[res])
     2055                    ASSIGN_A( Ares, rpp_A[res])
    20272056
    20282057                    FOR_0_LE_l_LT_pk1
     
    20372066
    20382067                for (j=arg1;j<=arg2;j++) {
    2039                     ASSIGN_A(Aarg1, dpp_A[j])
     2068                    ASSIGN_A(Aarg1, rpp_A[j])
    20402069
    20412070                    FOR_0_LE_l_LT_p
     
    20602089        } /* endswitch */
    20612090
    2062         /* Get the next operation */
     2091        /* Get the next operation */   
    20632092        operation=get_op_r();
    20642093#if defined(ADOLC_DEBUG)
     
    20782107    free((char*)*rpp_T);
    20792108    free((char*) rpp_T);
    2080     myfree2(dpp_A);
     2109    free(rpp_A);
    20812110    free(rp_Ttemp);
    20822111    free(rp_Ttemp2);
    2083     free(dp_Atemp);
    2084     free(dp_Atemp2);
     2112    free(rp_Atemp);
     2113    free(rp_Atemp2);
    20852114
    20862115    free((char*) jj);
  • stable/2.1/ADOL-C/src/oplate.h

    r42 r91  
    8383  floor_op,
    8484  ext_diff,
    85   ignore_me,
     85  ignore_me
    8686};
    8787
  • stable/2.1/ADOL-C/src/sparse/sparsedrivers.cpp

    r66 r91  
    2020#include <taping_p.h>
    2121
    22 #include <../../ThirdParty/ColPack/ColPackHeaders.h>
     22#include <../../ThirdParty/ColPack/include/ColPackHeaders.h>
    2323
    2424#include <math.h>
     
    222222    BipartiteGraphPartialColoringInterface *g;
    223223    TapeInfos *tapeInfos;
    224     JacobianRecovery1D jr1d;
     224    JacobianRecovery1D *jr1d;
     225    JacobianRecovery1D jr1d_loc;
    225226
    226227    ADOLC_OPENMP_THREAD_NUMBER;
     
    270271                       
    271272      g = new BipartiteGraphPartialColoringInterface;
     273      jr1d = new JacobianRecovery1D;
    272274       
    273275      if (options[3] == 1)
     
    286288     
    287289      sJinfos.g = (void *) g;
     290      sJinfos.jr1d = (void *) jr1d;
    288291      setTapeInfoJacSparse(tag, sJinfos);
    289292      tapeInfos=getTapeInfos(tag);
     
    301304        sJinfos.p      = ADOLC_CURRENT_TAPE_INFOS.pTapeInfos.sJinfos.p;
    302305        g = (BipartiteGraphPartialColoringInterface *)ADOLC_CURRENT_TAPE_INFOS.pTapeInfos.sJinfos.g;
     306        jr1d = (JacobianRecovery1D *)ADOLC_CURRENT_TAPE_INFOS.pTapeInfos.sJinfos.jr1d;
    303307      }
    304308       
     
    327331
    328332    /* recover compressed Jacobian => ColPack library */
    329 
    330 //     if (options[3] == 1)
    331 //       JacobianRecovery1D::RecoverForPD2RowWise_CoordinateFormat(g, sJinfos.B, sJinfos.JP, rind, cind, values);
    332 //     else
    333 //       JacobianRecovery1D::RecoverForPD2ColumnWise_CoordinateFormat(g, sJinfos.B, sJinfos.JP, rind, cind, values);
    334 //
    335      if (options[3] == 1)
    336       jr1d.RecoverForPD2RowWise_CoordinateFormat(g, sJinfos.B, sJinfos.JP, rind, cind, values);
    337     else
    338       jr1d.RecoverForPD2ColumnWise_CoordinateFormat(g, sJinfos.B, sJinfos.JP, rind, cind, values);
    339    
     333 
     334      if (options[3] == 1)
     335       jr1d->RecoverForPD2RowWise_CoordinateFormat(g, sJinfos.B, sJinfos.JP, rind, cind, values);
     336     else
     337       jr1d->RecoverForPD2ColumnWise_CoordinateFormat(g, sJinfos.B, sJinfos.JP, rind, cind, values);
     338
    340339    return ret_val;
    341340
    342341}
    343 
    344342
    345343/****************************************************************************/
     
    375373    TapeInfos *tapeInfos;
    376374    double *v, *w, **X, yt, lag=1;
    377     HessianRecovery hr;
     375    HessianRecovery *hr;
    378376
    379377    ADOLC_OPENMP_THREAD_NUMBER;
     
    421419
    422420        g = new GraphColoringInterface;
     421        hr = new HessianRecovery;
    423422
    424423        if (options[1] == 0)
     
    438437
    439438        for (i=0; i<indep; i++)
    440           delete Seed[i];
    441 
    442         delete Seed;
     439          delete[] Seed[i];
     440
     441        delete[] Seed;
    443442        Seed = NULL;
    444443
     
    452451
    453452        sHinfos.g = (void *) g;
     453        sHinfos.hr = (void *) hr;
    454454        setTapeInfoHessSparse(tag, sHinfos);
    455455        tapeInfos=getTapeInfos(tag);
     
    469469        sHinfos.p      = ADOLC_CURRENT_TAPE_INFOS.pTapeInfos.sHinfos.p;
    470470        g = (GraphColoringInterface *)ADOLC_CURRENT_TAPE_INFOS.pTapeInfos.sHinfos.g;
     471        hr = (HessianRecovery *)ADOLC_CURRENT_TAPE_INFOS.pTapeInfos.sHinfos.hr;
    471472      }
    472473
     
    525526    /* recover compressed Hessian => ColPack library */
    526527
    527 //     if (options[1] == 0)
    528 //       HessianRecovery::IndirectRecover_CoordinateFormat(g, sHinfos.Hcomp, sHinfos.HP, rind, cind, values);
    529 //     else
    530 //       HessianRecovery::DirectRecover_CoordinateFormat(g, sHinfos.Hcomp, sHinfos.HP, rind, cind, values);
     528//      if (options[1] == 0)
     529//        HessianRecovery::IndirectRecover_CoordinateFormat(g, sHinfos.Hcomp, sHinfos.HP, rind, cind, values);
     530//      else
     531//        HessianRecovery::DirectRecover_CoordinateFormat(g, sHinfos.Hcomp, sHinfos.HP, rind, cind, values);
    531532 
    532     if (options[1] == 0)
    533       hr.IndirectRecover_CoordinateFormat(g, sHinfos.Hcomp, sHinfos.HP, rind, cind, values);
    534     else
    535       hr.DirectRecover_CoordinateFormat(g, sHinfos.Hcomp, sHinfos.HP, rind, cind, values);
     533     if (options[1] == 0)
     534       hr->IndirectRecover_CoordinateFormat(g, sHinfos.Hcomp, sHinfos.HP, rind, cind, values);
     535     else
     536       hr->DirectRecover_CoordinateFormat(g, sHinfos.Hcomp, sHinfos.HP, rind, cind, values);
    536537 
    537538    return ret_val;
  • stable/2.1/ADOL-C/src/tape_handling.cpp

    r62 r91  
    339339                    tapeInfos->pTapeInfos.sJinfos.p=sJinfos.p;
    340340                    tapeInfos->pTapeInfos.sJinfos.g=sJinfos.g;
     341                    tapeInfos->pTapeInfos.sJinfos.jr1d=sJinfos.jr1d;
    341342            }
    342343        }
     
    369370                    tapeInfos->pTapeInfos.sHinfos.p=sHinfos.p;
    370371                    tapeInfos->pTapeInfos.sHinfos.g=sHinfos.g;
     372                    tapeInfos->pTapeInfos.sHinfos.hr=sHinfos.hr;
    371373            }
    372374        }
  • stable/2.1/ADOL-C/src/tapedoc/tapedoc.c

    r62 r91  
    3636static short tag;
    3737
    38 static int file_cnt;
    39 static int read_cnt;
     38static int op_cnt;
     39static int rev_op_cnt;
    4040static int pagelength;
    4141static FILE *fp;
     
    137137    fprintf(fp,"\\tiny\n");
    138138#ifdef computenumbers
    139     fprintf(fp,"\\begin{tabular}{|r|l|r|r|r|r||r|r||r|r|r|r|} \\hline \n");
    140     fprintf(fp," code & op & loc & loc & loc & loc & double & double & value & value & value & value \\\\ \\hline \n");
     139    fprintf(fp,"\\begin{tabular}{|r|r|r|l|r|r|r|r||r|r||r|r|r|r|} \\hline \n");
     140    fprintf(fp," & & code & op & loc & loc & loc & loc & double & double & value & value & value & value \\\\ \\hline \n");
    141141    fprintf(fp," %i & start of tape & & & & & & & & & &  \\\\ \\hline \n",opcode);
    142142#else
    143     fprintf(fp,"\\begin{tabular}{|r|l|r|r|r|r||r|r|} \\hline \n");
    144     fprintf(fp," code & op & loc & loc & loc & loc & double & double \\\\ \\hline \n");
     143    fprintf(fp,"\\begin{tabular}{|r|r|r|l|r|r|r|r||r|r|} \\hline \n");
     144    fprintf(fp," & & code & op & loc & loc & loc & loc & double & double \\\\ \\hline \n");
    145145    fprintf(fp," %i & start of tape & & & & & & & \\\\ \\hline \n",opcode);
    146146#endif
     
    156156    int i;
    157157
     158    ++op_cnt;
     159    --rev_op_cnt;
     160
    158161    if (pagelength == 100) { /* 101 lines per page */
    159162        fprintf(fp,"\\end{tabular}\\\\\n");
    160163        fprintf(fp,"\\newpage\n");
    161164#ifdef computenumbers
    162         fprintf(fp,"\\begin{tabular}{|r|l|r|r|r|r||r|r||r|r|r|r|} \\hline \n");
    163         fprintf(fp," code & op & loc & loc & loc & loc & double & double & value & value & value & value \\\\ \\hline \n");
     165        fprintf(fp,"\\begin{tabular}{|r|r|r|l|r|r|r|r||r|r||r|r|r|r|} \\hline \n");
     166        fprintf(fp," & & code & op & loc & loc & loc & loc & double & double & value & value & value & value \\\\ \\hline \n");
    164167#else
    165         fprintf(fp,"\\begin{tabular}{|r|l|r|r|r|r||r|r|} \\hline \n");
    166         fprintf(fp," code & op & loc & loc & loc & loc & double & double \\\\ \\hline \n");
     168        fprintf(fp,"\\begin{tabular}{|r|r|r|l|r|r|r|r||r|r|} \\hline \n");
     169        fprintf(fp," & & code & op & loc & loc & loc & loc & double & double \\\\ \\hline \n");
    167170#endif
    168171        pagelength=-1;
    169172    }
    170173
    171     /* write opcode number */
    172     fprintf(fp,"%i & ",opcode);
     174    /* write opcode counters and  number */
     175    fprintf(fp,"%i & %i & %i & ",op_cnt, rev_op_cnt, opcode);
    173176
    174177    /* write opcode name if available */
     
    235238/*--------------------------------------------------------------------------*/
    236239void filewrite_end( int opcode ) {
    237 #ifdef computenumbers
    238     fprintf(fp," %i & end of tape & & & & & & & & & &  \\\\ \\hline \n",opcode);
     240    ++op_cnt;
     241    --rev_op_cnt;
     242#ifdef computenumbers
     243  fprintf(fp," %i & %i & %i & end of tape & & & & & & & & & &  \\\\ \\hline \n",op_cnt,rev_op_cnt, opcode);
    239244#else
    240     fprintf(fp," %i & end of tape & & & & & & & \\\\ \\hline \n",opcode);
     245    fprintf(fp," %i & %i & %i & end of tape & & & & & & & \\\\ \\hline \n",op_cnt,rev_op_cnt,opcode);
    241246#endif
    242247    fprintf(fp,"\\end{tabular}");
     
    287292    tag = tnum;
    288293
    289     read_cnt = 0;
    290     file_cnt = 80;
    291 
    292294    if ((depcheck != ADOLC_CURRENT_TAPE_INFOS.stats[NUM_DEPENDENTS]) ||
    293295            (indcheck != ADOLC_CURRENT_TAPE_INFOS.stats[NUM_INDEPENDENTS]) ) {
     
    301303    }
    302304
     305    /* globals */
     306    op_cnt=0;
     307    rev_op_cnt=ADOLC_CURRENT_TAPE_INFOS.stats[NUM_OPERATIONS];
     308
    303309    dp_T0 = myalloc1(ADOLC_CURRENT_TAPE_INFOS.stats[NUM_MAX_LIVES]);
    304310
  • stable/2.1/ADOL-C/src/taping.c

    r42 r91  
    15571557        ADOLC_CURRENT_TAPE_INFOS.val_file = NULL;
    15581558    }
    1559     if (ADOLC_CURRENT_TAPE_INFOS.deg_save > 0) releaseTape(1); /* keep value stack */
    1560     else releaseTape(0); /* no value stack */
     1559    if (ADOLC_CURRENT_TAPE_INFOS.deg_save > 0) releaseTape(); /* keep value stack */
     1560    else releaseTape(); /* no value stack */
    15611561}
    15621562
  • stable/2.1/ADOL-C/src/taping_p.h

    r42 r91  
    3535    ADOLC_FOV_REVERSE,
    3636    ADOLC_HOS_REVERSE,
    37     ADOLC_HOV_REVERSE,
     37    ADOLC_HOV_REVERSE
    3838};
    3939
     
    124124typedef struct SparseJacInfos {
    125125    void *g;
     126    void *jr1d;
    126127
    127128    double *y;
     
    136137typedef struct SparseHessInfos {
    137138    void *g;
     139    void *hr;
    138140
    139141    double **Hcomp;
     
    243245    revreal *rp_T;
    244246    revreal **rpp_T;
    245     double *dp_A;
    246     double **dpp_A;
     247    revreal *rp_A;
     248    revreal **rpp_A;
    247249    unsigned long int **upp_A;
    248250
  • stable/2.1/ADOL-C/src/uni5_for.c

    r62 r91  
    903903    init_for_sweep(tnum);
    904904
    905 #if !defined(_NONLIND_)
    906905      if ( (depcheck != ADOLC_CURRENT_TAPE_INFOS.stats[NUM_DEPENDENTS]) ||
    907906            (indcheck != ADOLC_CURRENT_TAPE_INFOS.stats[NUM_INDEPENDENTS]) ) {
     
    915914        exit (-1);
    916915    }
    917 #else
    918       if ( (1 != ADOLC_CURRENT_TAPE_INFOS.stats[NUM_DEPENDENTS]) ||
    919             (indcheck != ADOLC_CURRENT_TAPE_INFOS.stats[NUM_INDEPENDENTS]) ) {
    920         fprintf(DIAG_OUT,"ADOL-C error: forward sweep on tape %d  aborted!\n"
    921                 "Number of dependent(%u) and/or independent(%u) variables passed"
    922                 " to forward is\ninconsistent with number "
    923                 "recorded on tape (%d, %d) \n", tnum,
    924                 1, indcheck,
    925                 ADOLC_CURRENT_TAPE_INFOS.stats[NUM_DEPENDENTS],
    926                 ADOLC_CURRENT_TAPE_INFOS.stats[NUM_INDEPENDENTS]);
    927         exit (-1);
    928     }
    929 #endif
    930916
    931917
  • stable/2.1/Makefile.am

    r39 r91  
    2020MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure ADOL-C/src/config.h.in \
    2121                       ADOL-C/src/stamp-h.in *~ *.orig
     22
     23test: all
     24        cd ADOL-C; $(MAKE) test
     25
  • stable/2.1/Makefile.in

    r43 r91  
    563563        uninstall-info-recursive uninstall-recursive
    564564
     565
     566test: all
     567        cd ADOL-C; $(MAKE) test
    565568# Tell versions [3.59,3.63) of GNU make to not export all variables.
    566569# Otherwise a system limit (for SysV at least) may be exceeded.
  • stable/2.1/aclocal.m4

    r43 r91  
    836836# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
    837837
    838 # serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
     838# serial 52 Debian 1.5.26-4+lenny1 AC_PROG_LIBTOOL
    839839
    840840
  • stable/2.1/configure

    r62 r91  
    11#! /bin/sh
    2 # From configure.ac Revision: 57 .
     2# From configure.ac Revision: 77 .
    33# Guess values for system-dependent variables and create Makefiles.
    4 # Generated by GNU Autoconf 2.61 for adolc 2.1.1-trunk.
     4# Generated by GNU Autoconf 2.61 for adolc 2.1.2-trunk.
    55#
    66# Report bugs to <adol-c@list.coin-or.org>.
     
    730730PACKAGE_NAME='adolc'
    731731PACKAGE_TARNAME='adolc'
    732 PACKAGE_VERSION='2.1.1-trunk'
    733 PACKAGE_STRING='adolc 2.1.1-trunk'
     732PACKAGE_VERSION='2.1.2-trunk'
     733PACKAGE_STRING='adolc 2.1.2-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.1.1-trunk to adapt to many kinds of systems.
     1408\`configure' configures adolc 2.1.2-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.1.1-trunk:";;
     1478     short | recursive ) echo "Configuration of adolc 2.1.2-trunk:";;
    14791479   esac
    14801480  cat <<\_ACEOF
     
    16011601if $ac_init_version; then
    16021602  cat <<\_ACEOF
    1603 adolc configure 2.1.1-trunk
     1603adolc configure 2.1.2-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.1.1-trunk, which was
     1617It was created by adolc $as_me 2.1.2-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.1.1-trunk'
     2260 VERSION='2.1.2-trunk'
    22612261
    22622262
     
    2177321773
    2177421774cat >>confdefs.h <<\_ACEOF
    21775 #define ADOLC_PATCHLEVEL 1
     21775#define ADOLC_PATCHLEVEL 2
    2177621776_ACEOF
    2177721777
     
    2202222022             fi
    2202322023             ac_adolc_cflags="$ac_adolc_cflags $ac_adolc_openmpflag"
    22024              if test "$GCC" = yes; then
    22025                 ac_adolc_cflags="$ac_adolc_cflags -DAD_ERR_FUN=1"
    22026              fi
    2202722024
    2202822025
     
    2205722054             fi
    2205822055             ac_adolc_cxxflags="$ac_adolc_cxxflags $ac_adolc_openmpflag"
    22059              if test "$GCC" = yes; then
    22060                 ac_adolc_cxxflags="$ac_adolc_cxxflags -DAD_ERR_FUN=1"
    22061              fi
    2206222056
    2206322057             { echo "$as_me:$LINENO: result: $ac_adolc_cxxflags" >&5
     
    2207522069# - paths generated for .lib files is not run through cygpath -w
    2207622070
     22071#
     22072# REQUIRED FOR COMPILATION WITH CYGWIN !!!
     22073#
     22074
    2207722075
    2207822076 # COIN_PATCH_LIBTOOL_CYGWIN
    2207922077
    2208022078
     22079
    2208122080# output
    22082 ac_config_files="$ac_config_files Makefile ADOL-C/Makefile ADOL-C/src/Makefile ADOL-C/src/drivers/Makefile ADOL-C/src/sparse/Makefile ADOL-C/src/tapedoc/Makefile ADOL-C/examples/Makefile ADOL-C/examples/additional_examples/Makefile ADOL-C/examples/additional_examples/clock/Makefile ADOL-C/examples/additional_examples/checkpointing/Makefile ADOL-C/examples/additional_examples/ext_diff_func/Makefile ADOL-C/examples/additional_examples/fixpoint_exam/Makefile ADOL-C/examples/additional_examples/hessmat/Makefile ADOL-C/examples/additional_examples/lufact/Makefile ADOL-C/examples/additional_examples/openmp_exam/Makefile ADOL-C/examples/additional_examples/scal/Makefile ADOL-C/examples/additional_examples/speelpenning/Makefile ADOL-C/examples/additional_examples/taylor/Makefile ADOL-C/examples/additional_examples/detexam/Makefile ADOL-C/examples/additional_examples/helm/Makefile ADOL-C/examples/additional_examples/lighthouse/Makefile ADOL-C/examples/additional_examples/ode/Makefile ADOL-C/examples/additional_examples/sparse/Makefile ADOL-C/examples/additional_examples/tapesave/Makefile ADOL-C/examples/additional_examples/pow/Makefile ADOL-C/examples/additional_examples/timing/Makefile"
     22081ac_config_files="$ac_config_files Makefile ADOL-C/Makefile ADOL-C/src/Makefile ADOL-C/src/drivers/Makefile ADOL-C/src/sparse/Makefile ADOL-C/src/tapedoc/Makefile ADOL-C/examples/Makefile ADOL-C/examples/additional_examples/Makefile ADOL-C/examples/additional_examples/clock/Makefile ADOL-C/examples/additional_examples/checkpointing/Makefile ADOL-C/examples/additional_examples/ext_diff_func/Makefile ADOL-C/examples/additional_examples/fixpoint_exam/Makefile ADOL-C/examples/additional_examples/hessmat/Makefile ADOL-C/examples/additional_examples/lufact/Makefile ADOL-C/examples/additional_examples/openmp_exam/Makefile ADOL-C/examples/additional_examples/scal/Makefile ADOL-C/examples/additional_examples/speelpenning/Makefile ADOL-C/examples/additional_examples/taylor/Makefile ADOL-C/examples/additional_examples/detexam/Makefile ADOL-C/examples/additional_examples/helm/Makefile ADOL-C/examples/additional_examples/lighthouse/Makefile ADOL-C/examples/additional_examples/ode/Makefile ADOL-C/examples/additional_examples/sparse/Makefile ADOL-C/examples/additional_examples/tapesave/Makefile ADOL-C/examples/additional_examples/pow/Makefile ADOL-C/examples/additional_examples/timing/Makefile ADOL-C/test/Makefile"
    2208322082
    2208422083
     
    2252822527# values after options handling.
    2252922528ac_log="
    22530 This file was extended by adolc $as_me 2.1.1-trunk, which was
     22529This file was extended by adolc $as_me 2.1.2-trunk, which was
    2253122530generated by GNU Autoconf 2.61.  Invocation command line was
    2253222531
     
    2258122580cat >>$CONFIG_STATUS <<_ACEOF
    2258222581ac_cs_version="\\
    22583 adolc config.status 2.1.1-trunk
     22582adolc config.status 2.1.2-trunk
    2258422583configured by $0, generated by GNU Autoconf 2.61,
    2258522584  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
     
    2272222721    "ADOL-C/examples/additional_examples/pow/Makefile") CONFIG_FILES="$CONFIG_FILES ADOL-C/examples/additional_examples/pow/Makefile" ;;
    2272322722    "ADOL-C/examples/additional_examples/timing/Makefile") CONFIG_FILES="$CONFIG_FILES ADOL-C/examples/additional_examples/timing/Makefile" ;;
     22723    "ADOL-C/test/Makefile") CONFIG_FILES="$CONFIG_FILES ADOL-C/test/Makefile" ;;
    2272422724
    2272522725  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
     
    2354723547echo "$as_me: Applying patches to libtool for cl compiler" >&6;}
    2354823548      sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
    23549           -e 's|fix_srcfile_path=\"\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
    23550           -e 's%compile_deplibs=\"\$dir/\$old_library \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$old_library | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
    23551           -e 's%compile_deplibs=\"\$dir/\$linklib \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$linklib | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
    23552           -e 's%lib /OUT:%lib -OUT:%' \
    23553           -e "s%cygpath -w%$CYGPATH_W%" \
    23554           -e 's%$AR x \\$f_ex_an_ar_oldlib%bla=\\`lib -nologo -list \\$f_ex_an_ar_oldlib | xargs echo '"$mydos2unix"'\\`; echo \\$bla; for i in \\$bla; do lib -nologo -extract:\\$i \\$f_ex_an_ar_oldlib; done%' \
    23555           -e 's/$AR t/lib -nologo -list/' \
    23556           -e 's%f_ex_an_ar_oldlib="\($?*1*\)"%f_ex_an_ar_oldlib='\`"$CYGPATH_W"' \1`%' \
    23557           -e 's%^archive_cmds=.*%archive_cmds="\\$CC -o \\$lib \\$libobjs \\$compiler_flags \\\\\\`echo \\\\\\"\\$deplibs\\\\\\" | \\$SED -e '"\'"'s/ -lc\\$//'"\'"'\\\\\\` -link -dll~linknames="%' \
    23558           -e 's%old_archive_cmds="lib -OUT:\\$oldlib\\$oldobjs\\$old_deplibs"%old_archive_cmds="if test -r \\$oldlib; then bla=\\"\\$oldlib\\"; else bla=; fi; lib -OUT:\\$oldlib \\\\\\$bla\\$oldobjs\\$old_deplibs"%' \
     23549          -e 's|fix_srcfile_path=\"\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
     23550          -e 's%compile_deplibs=\"\$dir/\$old_library \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$old_library | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
     23551          -e 's%compile_deplibs=\"\$dir/\$linklib \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$linklib | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
     23552          -e 's%lib /OUT:%lib -OUT:%' \
     23553          -e "s%cygpath -w%$CYGPATH_W%" \
     23554          -e 's%$AR x \\$f_ex_an_ar_oldlib%bla=\\`lib -nologo -list \\$f_ex_an_ar_oldlib | xargs echo '"$mydos2unix"'\\`; echo \\$bla; for i in \\$bla; do lib -nologo -extract:\\$i \\$f_ex_an_ar_oldlib; done%' \
     23555          -e 's/$AR t/lib -nologo -list/' \
     23556          -e 's%f_ex_an_ar_oldlib="\($?*1*\)"%f_ex_an_ar_oldlib='\`"$CYGPATH_W"' \1`%' \
     23557          -e 's%^archive_cmds=.*%archive_cmds="\\$CC -o \\$lib \\$libobjs \\$compiler_flags \\\\\\`echo \\\\\\"\\$deplibs\\\\\\" | \\$SED -e '"\'"'s/ -lc\\$//'"\'"'\\\\\\` -link -dll~linknames="%' \
     23558          -e 's%old_archive_cmds="lib -OUT:\\$oldlib\\$oldobjs\\$old_deplibs"%old_archive_cmds="if test -r \\$oldlib; then bla=\\"\\$oldlib\\"; else bla=; fi; lib -OUT:\\$oldlib \\\\\\$bla\\$oldobjs\\$old_deplibs"%' \
    2355923559      libtool > conftest.bla
    2356023560
     
    2356623566echo "$as_me: Applying patches to libtool for GNU compiler" >&6;}
    2356723567      sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
    23568           -e 's|"lib /OUT:\\$oldlib\\$oldobjs\\$old_deplibs"|"\\$AR \\$AR_FLAGS \\$oldlib\\$oldobjs\\$old_deplibs~\\$RANLIB \\$oldlib"|' \
    23569           -e 's|libext="lib"|libext="a"|' \
     23568          -e 's|"lib /OUT:\\$oldlib\\$oldobjs\\$old_deplibs"|"\\$AR \\$AR_FLAGS \\$oldlib\\$oldobjs\\$old_deplibs~\\$RANLIB \\$oldlib"|' \
     23569          -e 's|libext="lib"|libext="a"|' \
    2357023570      libtool > conftest.bla
    2357123571
  • stable/2.1/configure.ac

    r62 r91  
    1010define([ADOLC_VER], [2])
    1111define([ADOLC_SUB], [1])
    12 define([ADOLC_LVL], [1])
     12define([ADOLC_LVL], [3])
    1313
    1414AC_PREREQ(2.57)
     
    202202             fi
    203203             ac_adolc_cflags="$ac_adolc_cflags $ac_adolc_openmpflag"
    204              if test "$GCC" = yes; then
    205                 ac_adolc_cflags="$ac_adolc_cflags -DAD_ERR_FUN=1"
    206              fi
    207204
    208205             AC_SUBST(ac_adolc_cflags)
     
    231228             fi
    232229             ac_adolc_cxxflags="$ac_adolc_cxxflags $ac_adolc_openmpflag"
    233              if test "$GCC" = yes; then
    234                 ac_adolc_cxxflags="$ac_adolc_cxxflags -DAD_ERR_FUN=1"
    235              fi
    236              AC_SUBST(ac_adolc_cxxflags)
     230            AC_SUBST(ac_adolc_cxxflags)
    237231             AC_MSG_RESULT($ac_adolc_cxxflags)])
    238232
     
    246240# - paths generated for .lib files is not run through cygpath -w
    247241
     242#
     243# REQUIRED FOR COMPILATION WITH CYGWIN !!!
     244#
     245 
    248246
    249247AC_DEFUN([AC_COIN_PATCH_LIBTOOL_CYGWIN],
     
    252250      AC_MSG_NOTICE(Applying patches to libtool for cl compiler)
    253251      sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
    254           -e 's|fix_srcfile_path=\"\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
    255           -e 's%compile_deplibs=\"\$dir/\$old_library \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$old_library | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
    256           -e 's%compile_deplibs=\"\$dir/\$linklib \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$linklib | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
    257           -e 's%lib /OUT:%lib -OUT:%' \
    258           -e "s%cygpath -w%$CYGPATH_W%" \
    259           -e 's%$AR x \\$f_ex_an_ar_oldlib%bla=\\`lib -nologo -list \\$f_ex_an_ar_oldlib | xargs echo '"$mydos2unix"'\\`; echo \\$bla; for i in \\$bla; do lib -nologo -extract:\\$i \\$f_ex_an_ar_oldlib; done%' \
    260           -e 's/$AR t/lib -nologo -list/' \
    261           -e 's%f_ex_an_ar_oldlib="\($?*1*\)"%f_ex_an_ar_oldlib='\`"$CYGPATH_W"' \1`%' \
    262           -e 's%^archive_cmds=.*%archive_cmds="\\$CC -o \\$lib \\$libobjs \\$compiler_flags \\\\\\`echo \\\\\\"\\$deplibs\\\\\\" | \\$SED -e '"\'"'s/ -lc\\$//'"\'"'\\\\\\` -link -dll~linknames="%' \
    263           -e 's%old_archive_cmds="lib -OUT:\\$oldlib\\$oldobjs\\$old_deplibs"%old_archive_cmds="if test -r \\$oldlib; then bla=\\"\\$oldlib\\"; else bla=; fi; lib -OUT:\\$oldlib \\\\\\$bla\\$oldobjs\\$old_deplibs"%' \
     252          -e 's|fix_srcfile_path=\"\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
     253          -e 's%compile_deplibs=\"\$dir/\$old_library \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$old_library | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
     254          -e 's%compile_deplibs=\"\$dir/\$linklib \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$linklib | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
     255          -e 's%lib /OUT:%lib -OUT:%' \
     256          -e "s%cygpath -w%$CYGPATH_W%" \
     257          -e 's%$AR x \\$f_ex_an_ar_oldlib%bla=\\`lib -nologo -list \\$f_ex_an_ar_oldlib | xargs echo '"$mydos2unix"'\\`; echo \\$bla; for i in \\$bla; do lib -nologo -extract:\\$i \\$f_ex_an_ar_oldlib; done%' \
     258          -e 's/$AR t/lib -nologo -list/' \
     259          -e 's%f_ex_an_ar_oldlib="\($?*1*\)"%f_ex_an_ar_oldlib='\`"$CYGPATH_W"' \1`%' \
     260          -e 's%^archive_cmds=.*%archive_cmds="\\$CC -o \\$lib \\$libobjs \\$compiler_flags \\\\\\`echo \\\\\\"\\$deplibs\\\\\\" | \\$SED -e '"\'"'s/ -lc\\$//'"\'"'\\\\\\` -link -dll~linknames="%' \
     261          -e 's%old_archive_cmds="lib -OUT:\\$oldlib\\$oldobjs\\$old_deplibs"%old_archive_cmds="if test -r \\$oldlib; then bla=\\"\\$oldlib\\"; else bla=; fi; lib -OUT:\\$oldlib \\\\\\$bla\\$oldobjs\\$old_deplibs"%' \
    264262      libtool > conftest.bla
    265263
     
    270268      AC_MSG_NOTICE(Applying patches to libtool for GNU compiler)
    271269      sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
    272           -e 's|"lib /OUT:\\$oldlib\\$oldobjs\\$old_deplibs"|"\\$AR \\$AR_FLAGS \\$oldlib\\$oldobjs\\$old_deplibs~\\$RANLIB \\$oldlib"|' \
    273           -e 's|libext="lib"|libext="a"|' \
     270          -e 's|"lib /OUT:\\$oldlib\\$oldobjs\\$old_deplibs"|"\\$AR \\$AR_FLAGS \\$oldlib\\$oldobjs\\$old_deplibs~\\$RANLIB \\$oldlib"|' \
     271          -e 's|libext="lib"|libext="a"|' \
    274272      libtool > conftest.bla
    275273
     
    278276      ;;
    279277  esac ]) # COIN_PATCH_LIBTOOL_CYGWIN
     278 
    280279
    281280
     
    306305                ADOL-C/examples/additional_examples/tapesave/Makefile
    307306                ADOL-C/examples/additional_examples/pow/Makefile
    308                 ADOL-C/examples/additional_examples/timing/Makefile)
     307                ADOL-C/examples/additional_examples/timing/Makefile
     308                ADOL-C/test/Makefile)
    309309
    310310AC_OUTPUT
    311311
    312 #call libtool for cygwin
    313 AC_COIN_PATCH_LIBTOOL_CYGWIN
     312#call libtool for cygwin 
     313AC_COIN_PATCH_LIBTOOL_CYGWIN 
    314314
    315315# echo configuration
Note: See TracChangeset for help on using the changeset viewer.