version 1.188, 2015/04/30 08:27:53
|
version 1.189, 2015/04/30 14:45:16
|
Line 1
|
Line 1
|
/* $Id$ |
/* $Id$ |
$State$ |
$State$ |
$Log$ |
$Log$ |
|
Revision 1.189 2015/04/30 14:45:16 brouard |
|
Summary: 0.98q2 |
|
|
Revision 1.188 2015/04/30 08:27:53 brouard |
Revision 1.188 2015/04/30 08:27:53 brouard |
*** empty log message *** |
*** empty log message *** |
|
|
Line 681 typedef struct {
|
Line 684 typedef struct {
|
/* $Id$ */ |
/* $Id$ */ |
/* $State$ */ |
/* $State$ */ |
|
|
char version[]="Imach version 0.98q1, April 2015,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121), Intel Software 2015"; |
char version[]="Imach version 0.98q2, April 2015,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121), Intel Software 2015"; |
char fullversion[]="$Revision$ $Date$"; |
char fullversion[]="$Revision$ $Date$"; |
char strstart[80]; |
char strstart[80]; |
char optionfilext[10], optionfilefiname[FILENAMELENGTH]; |
char optionfilext[10], optionfilefiname[FILENAMELENGTH]; |
Line 1566 void linmin(double p[], double xi[], int
|
Line 1569 void linmin(double p[], double xi[], int
|
printf("retour brent fret=%.12e xmin=%.12e\n",*fret,xmin); |
printf("retour brent fret=%.12e xmin=%.12e\n",*fret,xmin); |
fprintf(ficlog,"retour brent fret=%.12e xmin=%.12e\n",*fret,xmin); |
fprintf(ficlog,"retour brent fret=%.12e xmin=%.12e\n",*fret,xmin); |
#endif |
#endif |
printf("linmin end "); |
/* printf("linmin end "); */ |
for (j=1;j<=n;j++) { |
for (j=1;j<=n;j++) { |
/* printf(" before xi[%d]=%12.8f", j,xi[j]); */ |
/* printf(" before xi[%d]=%12.8f", j,xi[j]); */ |
xi[j] *= xmin; /* xi rescaled by xmin: if xmin=-1.237 and xi=(1,0,...,0) xi=(-1.237,0,...,0) */ |
xi[j] *= xmin; /* xi rescaled by xmin: if xmin=-1.237 and xi=(1,0,...,0) xi=(-1.237,0,...,0) */ |
if(xxs <1.0) |
/* if(xxs <1.0) */ |
printf(" after xi[%d]=%12.8f, xmin=%12.8f, ax=%12.8f, xx=%12.8f, bx=%12.8f, xxs=%12.8f", j,xi[j], xmin, ax, xx, bx,xxs ); |
/* printf(" after xi[%d]=%12.8f, xmin=%12.8f, ax=%12.8f, xx=%12.8f, bx=%12.8f, xxs=%12.8f", j,xi[j], xmin, ax, xx, bx,xxs ); */ |
p[j] += xi[j]; /* Parameters values are updated accordingly */ |
p[j] += xi[j]; /* Parameters values are updated accordingly */ |
} |
} |
printf("\n"); |
/* printf("\n"); */ |
printf("Comparing last *frec(xmin)=%12.8f from Brent and frec(0.)=%12.8f \n", (*func)(p)); |
/* printf("Comparing last *frec(xmin)=%12.8f from Brent and frec(0.)=%12.8f \n", *fret, (*func)(p)); */ |
free_vector(xicom,1,n); |
free_vector(xicom,1,n); |
free_vector(pcom,1,n); |
free_vector(pcom,1,n); |
} |
} |