diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-01 10:32:14 +0100 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-01 10:32:14 +0100 |
commit | 4097e27114d227692d53c5d28487e12a3833cd24 (patch) | |
tree | d5c2a62c4db97de94f92150340612c64d3997669 /numlib/powell.h | |
parent | f8a0a4e1c775a90c313cb83201eec4cea4e9a7da (diff) | |
parent | 5514d94483c98e3320b202b1bb882023a7d12027 (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'numlib/powell.h')
-rwxr-xr-x[-rw-r--r--] | numlib/powell.h | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/numlib/powell.h b/numlib/powell.h index a1db8b6..4b86573 100644..100755 --- a/numlib/powell.h +++ b/numlib/powell.h @@ -54,18 +54,20 @@ double powell_funk( /* Return function value */ void *fdata, /* Opaque data pointer */ double tp[]); /* Multivriate input value */ -/* Line in multi-dimensional space minimiser */ -double brentnd( /* vector multiplier return value */ -double ax, /* Minimum of multiplier range */ -double bx, /* Starting point multiplier of search */ -double cx, /* Maximum of multiplier range */ -double ftol, /* Tollerance to stop search */ -double *xmin, /* Return value of multiplier at minimum */ -int n, /* Dimensionality */ +/* Line bracketing and minimisation routine. */ +/* Return value at minimum. */ +double linmin( +double cp[], /* Start point, and returned value */ +double xi[], /* Search vector */ +int di, /* Dimensionality */ +#ifdef ABSTOL +double ftol, /* Absolute tolerance to stop on */ +#else +double ftol, /* Relative tolerance to stop on */ +#endif double (*func)(void *fdata, double tp[]), /* Error function to evaluate */ -void *fdata, /* Opaque data */ -double pcom[], /* Base vector point */ -double xicom[]); /* Vector that will be multiplied and added to pcom[] */ +void *fdata /* Opaque data for func() */ +); #ifdef __cplusplus } |