Changeset 320


Ignore:
Timestamp:
May 15, 2012 4:57:45 AM (7 years ago)
Author:
kulshres
Message:

Merge branch 'master' of 'gitclone' into svn

The following changes were merged:

commit 349d8f2e54b8d6fb1af75c60c871b738a44d178c
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Thu May 3 14:24:22 2012 +0200

really...vector assignment!

Signed-off-by: Kshitij Kulshreshtha <kshitij@…>

commit 3a978af4c7690ffd21512fb90fc051aa16c1249f
Author: Benjamin Letschert <letschi@…>
Date: Thu May 3 12:29:37 2012 +0200

Fixing adouble array in adolc-manual

commit b30a5d981717861e38f0c9ffbfc002ec920bd2a4
Author: Benjamin Letschert <letschi@…>
Date: Thu May 3 11:17:06 2012 +0200

Fixing tapedoc typos in tapedoc.c

commit f46994a5ea9fc1b8d2600e0b41c9296bc95898db
Merge: 1f8f8c1 1da1fa5
Author: Benjamin Letschert <letschi@…>
Date: Thu May 3 11:13:02 2012 +0200

Merge branch 'master' of gitorious.org:adol-c/adol-c

commit 1f8f8c10e35ade64b7ad8813998369e2a7d18423
Author: Benjamin Letschert <letschi@…>
Date: Thu May 3 10:56:43 2012 +0200

change adoublev type to adouble in odexam in adolc-manual

commit 1da1fa5bc7f5b9eada18c25026fd8ff25c8a91bb
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Mon Apr 30 12:17:41 2012 +0200

simply get rid of fmin/fmax for doubles

most modern computers have this now and only cause conflicts

we should concentrate on finding cases where they are not defined
instead of where they are defined.

Signed-off-by: Kshitij Kulshreshtha <kshitij@…>

Location:
trunk/ADOL-C
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/ADOL-C/doc/adolc-manual.tex

    r190 r320  
    39553955
    39563956void tracerhs(short int tag, double* py, double* pyprime) {
    3957 adoublev y(3);                        // this time we left the parameters
    3958 adoublev yprime(3);                   // passive and use the vector types
     3957adouble y[3];                         // this time we left the parameters
     3958adouble yprime[3];                    // passive and use the vector types
    39593959trace_on(tag);
    3960 y <<= py;                             // initialize and mark independents
     3960for (int i=0; i<3; i++)
     3961     y[i] <<= py[i];                  // initialize and mark independents
    39613962yprime[0] = -sin(y[2]) + 1e8*y[2]*(1-1/y[0]);
    39623963yprime[1] = -10*y[0] + 3e7*y[2]*(1-y[1]);
  • trunk/ADOL-C/src/adouble.cpp

    r316 r320  
    4141    res = cond > 0 ? arg : res;
    4242}
    43 
    44 #if !defined(HAVE_FMAX)
    45 /*--------------------------------------------------------------------------*/
    46 double fmax( const double &x, const double &y ) {
    47     if (y > x)
    48         return y;
    49     else
    50         return x;
    51 }
    52 #endif
    53 
    54 #if !defined(HAVE_FMIN)
    55 /*--------------------------------------------------------------------------*/
    56 double fmin( const double &x, const double &y ) {
    57     if (y < x)
    58         return y;
    59     else
    60         return x;
    61 }
    62 #endif
    6343
    6444/*--------------------------------------------------------------------------*/
  • trunk/ADOL-C/src/adouble.h

    r316 r320  
    6868void ADOLC_DLL_EXPORT condassign( double &res, const double &cond,
    6969                                  const double &arg );
    70 
    71 #if !defined(HAVE_FMIN)
    72 double ADOLC_DLL_EXPORT fmin( const double &x, const double &y );
    73 #endif
    74 #if !defined(HAVE_FMAX)
    75 double ADOLC_DLL_EXPORT fmax( const double &x, const double &y );
    76 #endif
    7770
    7871
  • trunk/ADOL-C/src/tapedoc/tapedoc.c

    r249 r320  
    139139    fprintf(fp,"\\begin{tabular}{|r|r|r|l|r|r|r|r||r|r||r|r|r|r|} \\hline \n");
    140140    fprintf(fp," & & code & op & loc & loc & loc & loc & double & double & value & value & value & value \\\\ \\hline \n");
    141     fprintf(fp," %i & start of tape & & & & & & & & & &  \\\\ \\hline \n",opcode);
     141    fprintf(fp," & & %i & start of tape & & & & & & & & & &  \\\\ \\hline \n",opcode);
    142142#else
    143143    fprintf(fp,"\\begin{tabular}{|r|r|r|l|r|r|r|r||r|r|} \\hline \n");
    144144    fprintf(fp," & & code & op & loc & loc & loc & loc & double & double \\\\ \\hline \n");
    145     fprintf(fp," %i & start of tape & & & & & & & \\\\ \\hline \n",opcode);
     145    fprintf(fp," & & %i & start of tape & & & & & & & \\\\ \\hline \n",opcode);
    146146#endif
    147147    pagelength = 0;
Note: See TracChangeset for help on using the changeset viewer.