Merge branch 'feature/upstream' into develop

1 files changed, 11 insertions, 17 deletions

diff --git a/numlib/dhsx.h b/numlib/dhsx.h
index 828b8b2..78cdb10 100644..100755
--- a/numlib/dhsx.h
+++ b/numlib/dhsx.h
@@ -11,29 +11,23 @@
 #endif
 
 /* Down hill simplex function */
-/* return err on sucess, -1.0 on failure */
-/* Result will be in cp */
-/* Arrays start at 0 */
-
-/* Standard interface for optimizer function */
 /* return 0 on sucess, 1 on failure due to excessive itterations */
 /* Result will be in cp */
-/* Arrays start at 0 */
 int dhsx(
-double *rv,				/* If not NULL, return the residual error */
-int di,					/* Dimentionality */
-double cp[],			/* Initial starting point */
-double s[],				/* Size of initial search area */
-double ftol,			/* Tollerance of error change to stop on */
-double atol,			/* Absolute return value tollerance */
-int maxit,				/* Maximum iterations allowed */
-double (*funk)(void *fdata, double tp[]),		/* Error function to evaluate */
-void *fdata				/* Data needed by function */
+ double *rv,				/* If not NULL, return the residual error */
+ int di,					/* Dimentionality */
+ double *cp,				/* Initial starting point, return minimum */
+ double *s,				/* Size of initial search area */
+ double ftol,			/* Finishing tollerance of error change */
+ double athr,			/* Absolute return value threshold. (Set high to not use) */
+ int maxit,				/* Maximum iterations allowed */
+ double (*funk)(void *fdata, double *tp),		/* Error function to evaluate */
+ void *fdata				/* Data needed by function */
 );
 
 double dhsx_funk(		/* Return function value */
-	void *fdata,		/* Opaque data pointer */
-	double tp[]);		/* Multivriate input value */
+ void *fdata,		/* Opaque data pointer */
+ double tp[]);		/* Multivriate input value */
 
 #ifdef __cplusplus
 	}