Changeset 1584
- Timestamp:
- Aug 18, 2004, 4:48:32 PM (22 years ago)
- Location:
- trunk/archive/pslib/include
- Files:
-
- 2 edited
-
psFunctions.h (modified) (11 diffs)
-
psMinimize.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/archive/pslib/include/psFunctions.h
r1423 r1584 14 14 psGaussian(float x, ///< Value at which to evaluate 15 15 float mean, ///< Mean for the Gaussian 16 float s tddev,///< Standard deviation for the Gaussian17 intnormal) ///< normalized Gaussian?16 float sigma, ///< Standard deviation for the Gaussian 17 bool normal) ///< normalized Gaussian? 18 18 ; 19 19 20 20 psVector * 21 21 psGaussianDev(float mean, ///< Mean for the Gaussian 22 float s tddev, ///< Standard deviation for the Gaussian22 float sigma, ///< Standard deviation for the Gaussian 23 23 int Npts) ///< Number of points generated 24 24 ; … … 110 110 float 111 111 psPolynomial1DEval(float x, ///< Value at which to evaluate 112 const psPolynomial1D * restrictmyPoly ///< Coefficients for the polynomial112 const psPolynomial1D *myPoly ///< Coefficients for the polynomial 113 113 ); 114 114 … … 117 117 psPolynomial2DEval(float x, ///< Value x at which to evaluate 118 118 float y, ///< Value y at which to evaluate 119 const psPolynomial2D * restrictmyPoly ///< Coefficients for the polynomial119 const psPolynomial2D *myPoly ///< Coefficients for the polynomial 120 120 ); 121 121 … … 125 125 float y, ///< Value y at which to evaluate 126 126 float z, ///< Value z at which to evaluate 127 const psPolynomial3D * restrictmyPoly ///< Coefficients for the polynomial127 const psPolynomial3D *myPoly ///< Coefficients for the polynomial 128 128 ); 129 129 … … 134 134 float y, ///< Value y at which to evaluate 135 135 float z, ///< Value z at which to evaluate 136 const psPolynomial4D * restrictmyPoly ///< Coefficients for the polynomial136 const psPolynomial4D *myPoly ///< Coefficients for the polynomial 137 137 ); 138 138 139 139 /** Evaluate 1D polynomial: vector input */ 140 140 psVector * 141 psPolynomial1DEvalVector( psVector *x,///< Value at which to evaluate142 const psPolynomial1D * restrictmyPoly ///< Coefficients for the polynomial141 psPolynomial1DEvalVector(const psVector *x, ///< Value at which to evaluate 142 const psPolynomial1D *myPoly ///< Coefficients for the polynomial 143 143 ); 144 144 145 145 /** Evaluate 2D polynomial: vector input */ 146 146 psVector * 147 psPolynomial2DEvalVector( psVector *x,///< Value x at which to evaluate148 psVector *y,///< Value y at which to evaluate149 const psPolynomial2D * restrictmyPoly ///< Coefficients for the polynomial147 psPolynomial2DEvalVector(const psVector *x, ///< Value x at which to evaluate 148 const psVector *y, ///< Value y at which to evaluate 149 const psPolynomial2D *myPoly ///< Coefficients for the polynomial 150 150 ); 151 151 152 152 /** Evaluate 3D polynomial: vector input */ 153 153 psVector * 154 psPolynomial3DEvalVector( psVector *x,///< Value x at which to evaluate155 psVector *y,///< Value y at which to evaluate156 psVector *z,///< Value z at which to evaluate157 const psPolynomial3D * restrictmyPoly ///< Coefficients for the polynomial154 psPolynomial3DEvalVector(const psVector *x, ///< Value x at which to evaluate 155 const psVector *y, ///< Value y at which to evaluate 156 const psVector *z, ///< Value z at which to evaluate 157 const psPolynomial3D *myPoly ///< Coefficients for the polynomial 158 158 ); 159 159 160 160 /** Evaluate 4D polynomial: vector input */ 161 161 psVector * 162 psPolynomial4DEvalVector( psVector *w,///< Value w at which to evaluate163 psVector *x,///< Value x at which to evaluate164 psVector *y,///< Value y at which to evaluate165 psVector *z,///< Value z at which to evaluate166 const psPolynomial4D * restrictmyPoly ///< Coefficients for the polynomial162 psPolynomial4DEvalVector(const psVector *w, ///< Value w at which to evaluate 163 const psVector *x, ///< Value x at which to evaluate 164 const psVector *y, ///< Value y at which to evaluate 165 const psVector *z, ///< Value z at which to evaluate 166 const psPolynomial4D *myPoly ///< Coefficients for the polynomial 167 167 ); 168 168 … … 232 232 ); 233 233 234 235 /** Destructor */236 void psDPolynomial1DFree(psDPolynomial1D *restrict myPoly ///< Polynomial to destroy237 );238 /** Destructor */239 void psDPolynomial2DFree(psDPolynomial2D *restrict myPoly ///< Polynomial to destroy240 );241 /** Destructor */242 void psDPolynomial3DFree(psDPolynomial3D *restrict myPoly ///< Polynomial to destroy243 );244 /** Destructor */245 void psDPolynomial4DFree(psDPolynomial4D *restrict myPoly ///< Polynomial to destroy246 );247 248 249 234 /** Evaluate 1D polynomial (double precision) */ 250 235 double 251 236 psDPolynomial1DEval(double x, ///< Value at which to evaluate 252 const psDPolynomial1D * restrictmyPoly ///< Coefficients for the polynomial237 const psDPolynomial1D *myPoly ///< Coefficients for the polynomial 253 238 ); 254 239 … … 257 242 psDPolynomial2DEval(double x, ///< Value x at which to evaluate 258 243 double y, ///< Value y at which to evaluate 259 const psDPolynomial2D * restrictmyPoly ///< Coefficients for the polynomial244 const psDPolynomial2D *myPoly ///< Coefficients for the polynomial 260 245 ); 261 246 … … 265 250 double y, ///< Value y at which to evaluate 266 251 double z, ///< Value z at which to evaluate 267 const psDPolynomial3D * restrictmyPoly ///< Coefficients for the polynomial252 const psDPolynomial3D *myPoly ///< Coefficients for the polynomial 268 253 ); 269 254 … … 274 259 double y, ///< Value y at which to evaluate 275 260 double z, ///< Value z at which to evaluate 276 const psDPolynomial4D * restrictmyPoly ///< Coefficients for the polynomial261 const psDPolynomial4D *myPoly ///< Coefficients for the polynomial 277 262 ); 278 263 279 264 /** Evaluate 1D polynomial: vector input */ 280 265 psVector * 281 psDPolynomial1DEvalVector( psVector *x,///< Value at which to evaluate282 const psDPolynomial1D * restrictmyPoly ///< Coefficients for the polynomial266 psDPolynomial1DEvalVector(const psVector *x, ///< Value at which to evaluate 267 const psDPolynomial1D *myPoly ///< Coefficients for the polynomial 283 268 ); 284 269 285 270 /** Evaluate 2D polynomial: vector input */ 286 271 psVector * 287 psDPolynomial2DEvalVector( psVector *x,///< Value x at which to evaluate288 psVector *y,///< Value y at which to evaluate289 const psDPolynomial2D * restrictmyPoly ///< Coefficients for the polynomial272 psDPolynomial2DEvalVector(const psVector *x, ///< Value x at which to evaluate 273 const psVector *y, ///< Value y at which to evaluate 274 const psDPolynomial2D *myPoly ///< Coefficients for the polynomial 290 275 ); 291 276 292 277 /** Evaluate 3D polynomial: vector input */ 293 278 psVector * 294 psDPolynomial3DEvalVector( psVector *x,///< Value x at which to evaluate295 psVector *y,///< Value y at which to evaluate296 psVector *z,///< Value z at which to evaluate297 const psDPolynomial3D * restrictmyPoly ///< Coefficients for the polynomial279 psDPolynomial3DEvalVector(const psVector *x, ///< Value x at which to evaluate 280 const psVector *y, ///< Value y at which to evaluate 281 const psVector *z, ///< Value z at which to evaluate 282 const psDPolynomial3D *myPoly ///< Coefficients for the polynomial 298 283 ); 299 284 300 285 /** Evaluate 4D polynomial: vector input */ 301 286 psVector * 302 psDPolynomial4DEvalVector( psVector *w,///< Value w at which to evaluate303 psVector *x,///< Value x at which to evaluate304 psVector *y,///< Value y at which to evaluate305 psVector *z,///< Value z at which to evaluate306 const psDPolynomial4D * restrictmyPoly ///< Coefficients for the polynomial287 psDPolynomial4DEvalVector(const psVector *w, ///< Value w at which to evaluate 288 const psVector *x, ///< Value x at which to evaluate 289 const psVector *y, ///< Value y at which to evaluate 290 const psVector *z, ///< Value z at which to evaluate 291 const psDPolynomial4D *myPoly ///< Coefficients for the polynomial 307 292 ); 308 293 … … 313 298 /* Splines */ 314 299 315 /** A 1D cubic-spline */300 /** A 1D spline */ 316 301 typedef struct { 317 302 int n; ///< Number of spline pieces 318 psPolynomial1D * spline; ///< Array of nsplines303 psPolynomial1D **spline; ///< Array of n pointers to splines 319 304 float *domains; ///< The boundaries between each spline piece. Size is n+1. 320 305 } psSpline1D; … … 344 329 345 330 /** Evaluator: vector version */ 346 psVector *psSpline1DEvalVector( psVector *x, ///< Coordinates at which to evaluate331 psVector *psSpline1DEvalVector(const psVector *x, ///< Coordinates at which to evaluate 347 332 const psSpline1D *spline ///< Spline to evaluate 348 333 ); -
trunk/archive/pslib/include/psMinimize.h
r1454 r1584 85 85 psPolynomial1D * 86 86 psVectorFitPolynomial1D(psPolynomial1D *myPoly, ///< Polynomial to fit 87 const psVector * restrictx, ///< Ordinates (or NULL to just use the indices)88 const psVector * restricty, ///< Coordinates89 const psVector * restrictyErr) ///< Errors in coordinates, or NULL87 const psVector *x, ///< Ordinates (or NULL to just use the indices) 88 const psVector *y, ///< Coordinates 89 const psVector *yErr) ///< Errors in coordinates, or NULL 90 90 ; 91 91
Note:
See TracChangeset
for help on using the changeset viewer.
