Changeset 4528
- Timestamp:
- Jul 8, 2005, 4:11:01 PM (21 years ago)
- Location:
- trunk/psLib
- Files:
-
- 8 edited
-
src/dataManip/psFunctions.c (modified) (20 diffs)
-
src/dataManip/psFunctions.h (modified) (20 diffs)
-
src/dataManip/psMinimize.c (modified) (8 diffs)
-
src/dataManip/psMinimize.h (modified) (14 diffs)
-
test/dataManip/verified/tst_psMinimize04.stderr (modified) (1 diff)
-
test/dataManip/verified/tst_psMinimize04_F32.stderr (modified) (1 diff)
-
test/dataManip/verified/tst_psMinimize04b.stderr (modified) (1 diff)
-
test/dataManip/verified/tst_psMinimize04b_F32.stderr (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/psLib/src/dataManip/psFunctions.c
r4447 r4528 7 7 * polynomials. It also contains a Gaussian functions. 8 8 * 9 * @version $Revision: 1.11 5$ $Name: not supported by cvs2svn $10 * @date $Date: 2005-07-0 1 22:01:17$9 * @version $Revision: 1.116 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-07-09 02:11:01 $ 11 11 * 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 280 280 Polynomial coefficients will be accessed in [w][x][y][z] fashion. 281 281 *****************************************************************************/ 282 static psF 32 ordPolynomial1DEval(psF32x, const psPolynomial1D* poly)282 static psF64 ordPolynomial1DEval(psF64 x, const psPolynomial1D* poly) 283 283 { 284 284 psS32 loop_x = 0; … … 310 310 // XXX: How does the mask vector effect Crenshaw's formula? 311 311 // XXX: We assume that x is scaled between -1.0 and 1.0; 312 static psF 32 chebPolynomial1DEval(psF32x, const psPolynomial1D* poly)312 static psF64 chebPolynomial1DEval(psF64 x, const psPolynomial1D* poly) 313 313 { 314 314 PS_ASSERT_FLOAT_WITHIN_RANGE(x, -1.0, 1.0, 0.0); … … 392 392 } 393 393 394 static psF 32 ordPolynomial2DEval(psF32x,395 psF 32y,394 static psF64 ordPolynomial2DEval(psF64 x, 395 psF64 y, 396 396 const psPolynomial2D* poly) 397 397 { … … 418 418 } 419 419 420 static psF 32 chebPolynomial2DEval(psF32 x, psF32y, const psPolynomial2D* poly)420 static psF64 chebPolynomial2DEval(psF64 x, psF64 y, const psPolynomial2D* poly) 421 421 { 422 422 PS_ASSERT_FLOAT_WITHIN_RANGE(x, -1.0, 1.0, 0.0); … … 455 455 } 456 456 457 static psF 32 ordPolynomial3DEval(psF32 x, psF32 y, psF32z, const psPolynomial3D* poly)457 static psF64 ordPolynomial3DEval(psF64 x, psF64 y, psF64 z, const psPolynomial3D* poly) 458 458 { 459 459 psS32 loop_x = 0; … … 483 483 } 484 484 485 static psF 32 chebPolynomial3DEval(psF32 x, psF32 y, psF32z, const psPolynomial3D* poly)485 static psF64 chebPolynomial3DEval(psF64 x, psF64 y, psF64 z, const psPolynomial3D* poly) 486 486 { 487 487 PS_ASSERT_FLOAT_WITHIN_RANGE(x, -1.0, 1.0, 0.0); … … 527 527 } 528 528 529 static psF 32 ordPolynomial4DEval(psF32 x, psF32 y, psF32 z, psF32t, const psPolynomial4D* poly)529 static psF64 ordPolynomial4DEval(psF64 x, psF64 y, psF64 z, psF64 t, const psPolynomial4D* poly) 530 530 { 531 531 psS32 loop_x = 0; … … 561 561 } 562 562 563 static psF 32 chebPolynomial4DEval(psF32 x, psF32 y, psF32 z, psF32t, const psPolynomial4D* poly)563 static psF64 chebPolynomial4DEval(psF64 x, psF64 y, psF64 z, psF64 t, const psPolynomial4D* poly) 564 564 { 565 565 PS_ASSERT_FLOAT_WITHIN_RANGE(x, -1.0, 1.0, 0.0); … … 1069 1069 This routine must allocate memory for the polynomial structures. 1070 1070 *****************************************************************************/ 1071 psPolynomial1D* psPolynomial1DAlloc( unsignedint n,1071 psPolynomial1D* psPolynomial1DAlloc(int n, 1072 1072 psPolynomialType type) 1073 1073 { … … 1094 1094 } 1095 1095 1096 psPolynomial2D* psPolynomial2DAlloc( unsigned int nX, unsignedint nY,1097 psPolynomialType type)1096 psPolynomial2D* psPolynomial2DAlloc( int nX, int nY, 1097 psPolynomialType type) 1098 1098 { 1099 1099 PS_ASSERT_INT_POSITIVE(nX, NULL); … … 1130 1130 } 1131 1131 1132 psPolynomial3D* psPolynomial3DAlloc( unsigned int nX, unsigned int nY, unsignedint nZ,1133 psPolynomialType type)1132 psPolynomial3D* psPolynomial3DAlloc( int nX, int nY, int nZ, 1133 psPolynomialType type) 1134 1134 { 1135 1135 PS_ASSERT_INT_POSITIVE(nX, NULL); … … 1176 1176 } 1177 1177 1178 psPolynomial4D* psPolynomial4DAlloc( unsigned int nX, unsigned int nY, unsigned int nZ, unsignedint nT,1179 psPolynomialType type)1178 psPolynomial4D* psPolynomial4DAlloc( int nX, int nY, int nZ, int nT, 1179 psPolynomialType type) 1180 1180 { 1181 1181 PS_ASSERT_INT_POSITIVE(nX, NULL); … … 1431 1431 1432 1432 1433 psDPolynomial1D* psDPolynomial1DAlloc( unsignedint n,1434 psPolynomialType type)1433 psDPolynomial1D* psDPolynomial1DAlloc( int n, 1434 psPolynomialType type) 1435 1435 { 1436 1436 PS_ASSERT_INT_POSITIVE(n, NULL); … … 1456 1456 } 1457 1457 1458 psDPolynomial2D* psDPolynomial2DAlloc( unsigned int nX, unsignedint nY,1459 psPolynomialType type)1458 psDPolynomial2D* psDPolynomial2DAlloc( int nX, int nY, 1459 psPolynomialType type) 1460 1460 { 1461 1461 PS_ASSERT_INT_POSITIVE(nX, NULL); … … 1492 1492 } 1493 1493 1494 psDPolynomial3D* psDPolynomial3DAlloc( unsigned int nX, unsigned int nY, unsignedint nZ,1495 psPolynomialType type)1494 psDPolynomial3D* psDPolynomial3DAlloc( int nX, int nY, int nZ, 1495 psPolynomialType type) 1496 1496 { 1497 1497 PS_ASSERT_INT_POSITIVE(nX, NULL); … … 1538 1538 } 1539 1539 1540 psDPolynomial4D* psDPolynomial4DAlloc( unsigned int nX, unsigned int nY, unsigned int nZ, unsignedint nT,1541 psPolynomialType type)1540 psDPolynomial4D* psDPolynomial4DAlloc( int nX, int nY, int nZ, int nT, 1541 psPolynomialType type) 1542 1542 { 1543 1543 PS_ASSERT_INT_POSITIVE(nX, NULL); … … 1822 1822 XXX: What should be the defualty type for knots be? psF32 is assumed. 1823 1823 *****************************************************************************/ 1824 psSpline1D *psSpline1DAlloc( unsignedint numSplines,1825 unsignedint order,1826 float min,1827 float max)1824 psSpline1D *psSpline1DAlloc( int numSplines, 1825 int order, 1826 float min, 1827 float max) 1828 1828 { 1829 1829 PS_ASSERT_INT_NONNEGATIVE(numSplines, NULL); … … 1867 1867 *****************************************************************************/ 1868 1868 psSpline1D *psSpline1DAllocGeneric(const psVector *bounds, 1869 unsignedint order)1869 int order) 1870 1870 { 1871 1871 PS_ASSERT_VECTOR_NON_NULL(bounds, NULL); … … 2045 2045 psScalar *p_psVectorInterpolate(psVector *domain, 2046 2046 psVector *range, 2047 unsignedint order,2047 int order, 2048 2048 psScalar *x) 2049 2049 { -
trunk/psLib/src/dataManip/psFunctions.h
r4447 r4528 12 12 * @author GLG, MHPCC 13 13 * 14 * @version $Revision: 1.5 2$ $Name: not supported by cvs2svn $15 * @date $Date: 2005-07-0 1 22:01:17$14 * @version $Revision: 1.53 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2005-07-09 02:11:01 $ 16 16 * 17 17 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 75 75 psPolynomialType type; ///< Polynomial type 76 76 psElemType ctype; ///< Polynomial precision 77 unsigned int n;///< Number of terms77 int n; ///< Number of terms 78 78 psF32 *coeff; ///< Coefficients 79 79 psF32 *coeffErr; ///< Error in coefficients … … 87 87 psPolynomialType type; ///< Polynomial type 88 88 psElemType ctype; ///< Polynomial precision 89 unsigned int nX;///< Number of terms in x90 unsigned int nY;///< Number of terms in y89 int nX; ///< Number of terms in x 90 int nY; ///< Number of terms in y 91 91 psF32 **coeff; ///< Coefficients 92 92 psF32 **coeffErr; ///< Error in coefficients … … 100 100 psPolynomialType type; ///< Polynomial type 101 101 psElemType ctype; ///< Polynomial precision 102 unsigned int nX;///< Number of terms in x103 unsigned int nY;///< Number of terms in y104 unsigned int nZ;///< Number of terms in z102 int nX; ///< Number of terms in x 103 int nY; ///< Number of terms in y 104 int nZ; ///< Number of terms in z 105 105 psF32 ***coeff; ///< Coefficients 106 106 psF32 ***coeffErr; ///< Error in coefficients … … 114 114 psPolynomialType type; ///< Polynomial type 115 115 psElemType ctype; ///< Polynomial precision 116 unsigned int nX;///< Number of terms in x117 unsigned int nY;///< Number of terms in y118 unsigned int nZ;///< Number of terms in z119 unsigned int nT;///< Number of terms in t116 int nX; ///< Number of terms in x 117 int nY; ///< Number of terms in y 118 int nZ; ///< Number of terms in z 119 int nT; ///< Number of terms in t 120 120 psF32 ****coeff; ///< Coefficients 121 121 psF32 ****coeffErr; ///< Error in coefficients … … 130 130 */ 131 131 psPolynomial1D* psPolynomial1DAlloc( 132 unsigned int n,///< Number of terms132 int n, ///< Number of terms 133 133 psPolynomialType type ///< Polynomial Type 134 134 ); … … 139 139 */ 140 140 psPolynomial2D* psPolynomial2DAlloc( 141 unsignedint nX, ///< Number of terms in x142 unsignedint nY, ///< Number of terms in y141 int nX, ///< Number of terms in x 142 int nY, ///< Number of terms in y 143 143 psPolynomialType type ///< Polynomial Type 144 144 ); … … 149 149 */ 150 150 psPolynomial3D* psPolynomial3DAlloc( 151 unsigned int nX,///< Number of terms in x152 unsigned int nY,///< Number of terms in y153 unsigned int nZ,///< Number of terms in z151 int nX, ///< Number of terms in x 152 int nY, ///< Number of terms in y 153 int nZ, ///< Number of terms in z 154 154 psPolynomialType type ///< Polynomial Type 155 155 ); … … 160 160 */ 161 161 psPolynomial4D* psPolynomial4DAlloc( 162 unsigned int nX,///< Number of terms in x163 unsigned int nY,///< Number of terms in y164 unsigned int nZ,///< Number of terms in z165 unsigned int nT,///< Number of terms in t162 int nX, ///< Number of terms in x 163 int nY, ///< Number of terms in y 164 int nZ, ///< Number of terms in z 165 int nT, ///< Number of terms in t 166 166 psPolynomialType type ///< Polynomial Type 167 167 ); … … 259 259 { 260 260 psPolynomialType type; ///< Polynomial type 261 unsigned int n;///< Number of terms261 int n; ///< Number of terms 262 262 psF64 *coeff; ///< Coefficients 263 263 psF64 *coeffErr; ///< Error in coefficients … … 270 270 { 271 271 psPolynomialType type; ///< Polynomial type 272 unsigned int nX;///< Number of terms in x273 unsigned int nY;///< Number of terms in y272 int nX; ///< Number of terms in x 273 int nY; ///< Number of terms in y 274 274 psF64 **coeff; ///< Coefficients 275 275 psF64 **coeffErr; ///< Error in coefficients … … 282 282 { 283 283 psPolynomialType type; ///< Polynomial type 284 unsigned int nX;///< Number of terms in x285 unsigned int nY;///< Number of terms in y286 unsigned int nZ;///< Number of terms in z284 int nX; ///< Number of terms in x 285 int nY; ///< Number of terms in y 286 int nZ; ///< Number of terms in z 287 287 psF64 ***coeff; ///< Coefficients 288 288 psF64 ***coeffErr; ///< Error in coefficients … … 295 295 { 296 296 psPolynomialType type; ///< Polynomial type 297 unsigned int nX;///< Number of terms in w298 unsigned int nY;///< Number of terms in x299 unsigned int nZ;///< Number of terms in y300 unsigned int nT;///< Number of terms in z297 int nX; ///< Number of terms in w 298 int nY; ///< Number of terms in x 299 int nZ; ///< Number of terms in y 300 int nT; ///< Number of terms in z 301 301 psF64 ****coeff; ///< Coefficients 302 302 psF64 ****coeffErr; ///< Error in coefficients … … 310 310 */ 311 311 psDPolynomial1D* psDPolynomial1DAlloc( 312 unsigned int n,///< Number of terms312 int n, ///< Number of terms 313 313 psPolynomialType type ///< Polynomial Type 314 314 ); … … 319 319 */ 320 320 psDPolynomial2D* psDPolynomial2DAlloc( 321 unsigned int nX,///< Number of terms in x322 unsigned int nY,///< Number of terms in y321 int nX, ///< Number of terms in x 322 int nY, ///< Number of terms in y 323 323 psPolynomialType type ///< Polynomial Type 324 324 ); … … 329 329 */ 330 330 psDPolynomial3D* psDPolynomial3DAlloc( 331 unsigned int nX,///< Number of terms in x332 unsigned int nY,///< Number of terms in y333 unsigned int nZ,///< Number of terms in z331 int nX, ///< Number of terms in x 332 int nY, ///< Number of terms in y 333 int nZ, ///< Number of terms in z 334 334 psPolynomialType type ///< Polynomial Type 335 335 ); … … 340 340 */ 341 341 psDPolynomial4D* psDPolynomial4DAlloc( 342 unsigned int nX,///< Number of terms in w343 unsigned int nY,///< Number of terms in x344 unsigned int nZ,///< Number of terms in y345 unsigned int nT,///< Number of terms in z342 int nX, ///< Number of terms in w 343 int nY, ///< Number of terms in x 344 int nZ, ///< Number of terms in y 345 int nT, ///< Number of terms in z 346 346 psPolynomialType type ///< Polynomial Type 347 347 ); … … 450 450 */ 451 451 psSpline1D *psSpline1DAlloc( 452 unsigned int n,///< Number of spline polynomials453 unsigned int order,///< Order of spline polynomials452 int n, ///< Number of spline polynomials 453 int order, ///< Order of spline polynomials 454 454 float min, ///< Lower boundary value of spline polynomials 455 455 float max ///< Upper boundary value of spline polynomials … … 464 464 psSpline1D *psSpline1DAllocGeneric( 465 465 const psVector *bounds, ///< Bounds for spline polynomials 466 unsigned int order///< Order of spline polynomials466 int order ///< Order of spline polynomials 467 467 ); 468 468 … … 503 503 psVector *domain, ///< Domain (x coords) for interpolation 504 504 psVector *range, ///< Range (y coords) for interpolation 505 unsigned int order,///< Order of interpolation function505 int order, ///< Order of interpolation function 506 506 psScalar *x ///< Location at which to evaluate 507 507 ); -
trunk/psLib/src/dataManip/psMinimize.c
r4321 r4528 9 9 * @author GLG, MHPCC 10 10 * 11 * @version $Revision: 1.12 3$ $Name: not supported by cvs2svn $12 * @date $Date: 2005-0 6-20 22:42:30$11 * @version $Revision: 1.124 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2005-07-09 02:11:01 $ 13 13 * 14 14 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 1357 1357 XXX: type F32 is done via vector conversion only. 1358 1358 *****************************************************************************/ 1359 psPolynomial1D* psVectorFitPolynomial1D(psPolynomial1D* myPoly,1359 psPolynomial1D* psVectorFitPolynomial1D(psPolynomial1D* poly, 1360 1360 const psVector* x, 1361 1361 const psVector* y, 1362 1362 const psVector* yErr) 1363 1363 { 1364 PS_ASSERT_POLY_NON_NULL( myPoly, NULL);1365 PS_ASSERT_INT_NONNEGATIVE( myPoly->n, NULL);1364 PS_ASSERT_POLY_NON_NULL(poly, NULL); 1365 PS_ASSERT_INT_NONNEGATIVE(poly->n, NULL); 1366 1366 PS_ASSERT_VECTOR_NON_NULL(y, NULL); 1367 1367 PS_ASSERT_VECTOR_NON_EMPTY(y, NULL); … … 1389 1389 if (x == NULL) { 1390 1390 PS_VECTOR_GEN_X_INDEX_STATIC_F64(x64Static, y->n); 1391 if ( myPoly->type == PS_POLYNOMIAL_CHEB) {1391 if (poly->type == PS_POLYNOMIAL_CHEB) { 1392 1392 p_psNormalizeVectorRangeF64(x64Static, -1.0, 1.0); 1393 1393 } … … 1396 1396 PS_ASSERT_VECTOR_TYPE_F32_OR_F64(x, NULL); 1397 1397 PS_VECTOR_CONVERT_F32_TO_F64_STATIC(x, x64, x64Static); 1398 if ( myPoly->type == PS_POLYNOMIAL_CHEB) {1398 if (poly->type == PS_POLYNOMIAL_CHEB) { 1399 1399 p_psNormalizeVectorRangeF64(x64, -1.0, 1.0); 1400 1400 } … … 1405 1405 // Call the appropriate vector fitting routine. 1406 1406 psPolynomial1D *rc = NULL; 1407 if ( myPoly->type == PS_POLYNOMIAL_CHEB) {1408 rc = vectorFitPolynomial1DCheby( myPoly, x64, y64, yErr64);1409 } else if ( myPoly->type == PS_POLYNOMIAL_ORD) {1410 rc = vectorFitPolynomial1DOrd( myPoly, x64, y64, yErr64);1407 if (poly->type == PS_POLYNOMIAL_CHEB) { 1408 rc = vectorFitPolynomial1DCheby(poly, x64, y64, yErr64); 1409 } else if (poly->type == PS_POLYNOMIAL_ORD) { 1410 rc = vectorFitPolynomial1DOrd(poly, x64, y64, yErr64); 1411 1411 } else { 1412 1412 psError(PS_ERR_BAD_PARAMETER_VALUE, true, … … 1419 1419 } 1420 1420 1421 return( myPoly);1421 return(poly); 1422 1422 } 1423 1423 … … 1432 1432 1433 1433 psMinimization *min = psAlloc(sizeof(psMinimization)); 1434 min->maxIter = maxIter;1435 min->tol = tol;1434 *(int*)&min->maxIter = maxIter; 1435 *(float*)&min->tol = tol; 1436 1436 min->value = 0.0; 1437 1437 min->iter = 0; … … 1993 1993 for (i=0;i<numDims;i++) { 1994 1994 if (myParamMask->data.U8[i] == 0) { 1995 dummyMin.maxIter = PS_MINIMIZE_POWELL_LINEMIN_MAX_ITERATIONS;1996 dummyMin.tol = PS_MINIMIZE_POWELL_LINEMIN_ERROR_TOLERANCE;1995 *(int*)&dummyMin.maxIter = PS_MINIMIZE_POWELL_LINEMIN_MAX_ITERATIONS; 1996 *(float*)&dummyMin.tol = PS_MINIMIZE_POWELL_LINEMIN_ERROR_TOLERANCE; 1997 1997 mul = p_psLineMin(&dummyMin, 1998 1998 Q, -
trunk/psLib/src/dataManip/psMinimize.h
r4330 r4528 8 8 * @author GLG, MHPCC 9 9 * 10 * @version $Revision: 1.4 8$ $Name: not supported by cvs2svn $11 * @date $Date: 2005-0 6-21 03:01:37$10 * @version $Revision: 1.49 $ $Name: not supported by cvs2svn $ 11 * @date $Date: 2005-07-09 02:11:01 $ 12 12 * 13 13 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 38 38 39 39 /** A data structure for minimization routines. 40 * 40 * 41 41 * Contains numerical analysis parameters/values 42 42 */ 43 43 typedef struct 44 44 { 45 psS32 maxIter;///< Convergence limit46 psF32 tol;///< Error Tolerance47 psF32value; ///< Value of function at minimum48 psS32 iter;///< Number of iterations to date49 psF32lastDelta; ///< The last difference for the fit45 const int maxIter; ///< Convergence limit 46 const float tol; ///< Error Tolerance 47 float value; ///< Value of function at minimum 48 int iter; ///< Number of iterations to date 49 float lastDelta; ///< The last difference for the fit 50 50 } 51 51 psMinimization; 52 52 53 53 /** Allocates a psMinimization structure. 54 * 54 * 55 55 * @return psMinimization* : a new psMinimization struct 56 56 */ … … 74 74 */ 75 75 psPolynomial1D* psVectorFitPolynomial1D( 76 psPolynomial1D* myPoly, ///< Polynomial to fit76 psPolynomial1D* poly, ///< Polynomial to fit 77 77 const psVector* x, ///< Ordinates (or NULL to just use the indices) 78 78 const psVector* y, ///< Coordinates … … 81 81 82 82 /** Derive a one-dimensional spline fit. 83 * 84 * Given a psSpline1D data structure and a set of x,y vectors, this routine 83 * 84 * Given a psSpline1D data structure and a set of x,y vectors, this routine 85 85 * generates the linear splines which satisfy those data points. 86 * 86 * 87 87 * @return psSpline1D*: the calculated one-dimensional splines 88 88 */ … … 96 96 /** Specifies the format of a user-defined function that the general Levenberg- 97 97 * Marquardt minimizer routine will accept. 98 * 99 * @return psF64: the single float value of the function given the parameters,98 * 99 * @return float: the single float value of the function given the parameters, 100 100 * positions, and derivatives. 101 101 */ 102 102 typedef 103 psF64(*psMinimizeLMChi2Func)(103 float (*psMinimizeLMChi2Func)( 104 104 psVector *deriv, ///< derivatives of the function 105 psVector *params,///< the parameters used to evaluate the function106 psVector *x///< positions for evaluation105 const psVector *params, ///< the parameters used to evaluate the function 106 const psVector *x ///< positions for evaluation 107 107 ); 108 108 109 109 /** Minimizes a specified function based on the Levenberg-Marquardt method. 110 * 110 * 111 111 * @return bool: True if successful. 112 112 */ … … 123 123 124 124 /** Use specified alpha, beta, params to generate a new guess for Alpha, Beta, Params 125 * 125 * 126 126 * @return psBool: True if successful. 127 127 */ … … 138 138 139 139 /** Function used to set parameters for generating "best guess" in minimizing Chi-Squared value. 140 * 140 * 141 141 * @return psF64: Chi-squared value for new guess 142 142 */ … … 153 153 /** Specifies the format of a user-defined function that the general Powell 154 154 * minimizer routine will accept. 155 * 156 * @return psF32: the single float value of the function given the parameters155 * 156 * @return float: the single float value of the function given the parameters 157 157 * and coordinate vectors. 158 158 */ 159 159 typedef 160 psF32(*psMinimizePowellFunc)(160 float (*psMinimizePowellFunc)( 161 161 const psVector *params, ///< Parameters used to evaluate the function 162 162 const psArray *coords ///< Coordinates at which to evaluate … … 164 164 165 165 /** Minimizes a specified function based on the Powell method. 166 * 166 * 167 167 * @return bool: True if successful. 168 168 */ … … 177 177 /** Calculates the one-dimensional Gaussian in a format acceptable to the Levenberg- 178 178 * Marquardt minimizer routine. 179 * 179 * 180 180 * @return psVector*: Calculated values 181 181 */ … … 188 188 /** Calculates the one-dimensional Gaussian in a format acceptable to the Powell 189 189 * chi-squared minimizer routine. 190 * 190 * 191 191 * @return psVector*: Calculated values 192 192 */ … … 198 198 /** Specifies the format of a user-defined function that the general Powell chi- 199 199 * squared minimizer routine will accept. 200 * 200 * 201 201 * @return psVector*: Calculated values given the parameters and coordinates. 202 202 */ … … 208 208 209 209 /** Minimizes a specified function based on the Powell chi-squared method. 210 * 210 * 211 211 * @return bool: True is successful. 212 212 */ … … 222 222 223 223 /** Gauss-Jordan numerical solver. 224 * 224 * 225 225 * @return bool: True if successful. 226 226 */ -
trunk/psLib/test/dataManip/verified/tst_psMinimize04.stderr
r3127 r4528 2 2 Following should generate an error for null input polynomial. 3 3 <DATE><TIME>|<HOST>|E|psVectorFitPolynomial1D (FILE:LINENO) 4 Unallowable operation: polynomial myPoly or its coeffs is NULL.4 Unallowable operation: polynomial poly or its coeffs is NULL. -
trunk/psLib/test/dataManip/verified/tst_psMinimize04_F32.stderr
r3127 r4528 2 2 Following should generate an error for null input polynomial. 3 3 <DATE><TIME>|<HOST>|E|psVectorFitPolynomial1D (FILE:LINENO) 4 Unallowable operation: polynomial myPoly or its coeffs is NULL.4 Unallowable operation: polynomial poly or its coeffs is NULL. -
trunk/psLib/test/dataManip/verified/tst_psMinimize04b.stderr
r3127 r4528 2 2 Following should generate an error for null arguments. 3 3 <DATE><TIME>|<HOST>|E|psVectorFitPolynomial1D (FILE:LINENO) 4 Unallowable operation: polynomial myPoly or its coeffs is NULL.4 Unallowable operation: polynomial poly or its coeffs is NULL. -
trunk/psLib/test/dataManip/verified/tst_psMinimize04b_F32.stderr
r3127 r4528 2 2 Following should generate an error for null arguments. 3 3 <DATE><TIME>|<HOST>|E|psVectorFitPolynomial1D (FILE:LINENO) 4 Unallowable operation: polynomial myPoly or its coeffs is NULL.4 Unallowable operation: polynomial poly or its coeffs is NULL.
Note:
See TracChangeset
for help on using the changeset viewer.
