Changeset 2106
- Timestamp:
- Oct 13, 2004, 3:44:48 PM (22 years ago)
- Location:
- trunk/psLib/src
- Files:
-
- 7 edited
-
dataManip/psConstants.h (modified) (2 diffs)
-
dataManip/psFunctions.c (modified) (5 diffs)
-
dataManip/psMinimize.c (modified) (2 diffs)
-
math/psConstants.h (modified) (2 diffs)
-
math/psMinimize.c (modified) (2 diffs)
-
math/psPolynomial.c (modified) (5 diffs)
-
math/psSpline.c (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/psLib/src/dataManip/psConstants.h
r2058 r2106 6 6 * @author GLG, MHPCC 7 7 * 8 * @version $Revision: 1. 9$ $Name: not supported by cvs2svn $9 * @date $Date: 2004-10-1 2 20:53:02$8 * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ 9 * @date $Date: 2004-10-14 01:44:48 $ 10 10 * 11 11 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 113 113 return(NULL); \ 114 114 } 115 /** Preprocessor macro to generate error on a NULL poniter */ 116 #define PS_CHECK_NULL_PTR_RETURN_ZERO(NAME) \ 117 if (NAME == NULL) { \ 118 psError(__func__,"Unallowable operation: %s is NULL.", #NAME); \ 119 return(0); \ 120 } 115 121 116 122 /** Preprocessor macro to generate error for zero length vector */ -
trunk/psLib/src/dataManip/psFunctions.c
r1985 r2106 7 7 * polynomials. It also contains a Gaussian functions. 8 8 * 9 * @version $Revision: 1.5 1$ $Name: not supported by cvs2svn $10 * @date $Date: 2004-10- 06 22:27:06$9 * @version $Revision: 1.52 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2004-10-14 01:44:48 $ 11 11 * 12 12 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 206 206 } 207 207 208 //XXX: remove this209 //typedef enum {210 // PS_POLYNOMIAL_ORD, ///< Ordinary Polynomial211 // PS_POLYNOMIAL_CHEB ///< Chebyshev Polynomial212 //} psPolynomialType;213 214 208 /***************************************************************************** 215 209 This routine must allocate memory for the polynomial structures. … … 1858 1852 { 1859 1853 if (x->type.type != bins->type.type) { 1860 // XXX: Generate error message.1861 return(- 1);1854 psError(__func__, "x->type.type != bins->type.type"); 1855 return(-2); 1862 1856 } 1863 1857 … … 1867 1861 return(p_psVectorBinDisectF32(bins->data.F32, bins->n, x->data.F32)); 1868 1862 } else { 1869 // XXX: Generate error message. 1863 psError(__func__, "Unallowable data type."); 1864 return(-2); 1870 1865 } 1871 1866 return(-1); … … 2064 2059 by a call to the 1D polynomial functions. 2065 2060 2066 XXX: SDR is silent about data types. PS_TYPE_F32 is implemented.2067 2068 2061 XXX: The spline eval functions require input and output to be F32. however 2069 2062 the spline fit functions require F32 and F64. -
trunk/psLib/src/dataManip/psMinimize.c
r1992 r2106 9 9 * @author GLF, MHPCC 10 10 * 11 * @version $Revision: 1.5 7$ $Name: not supported by cvs2svn $12 * @date $Date: 2004-10- 06 23:38:49$11 * @version $Revision: 1.58 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2004-10-14 01:44:48 $ 13 13 * 14 14 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 895 895 tmpPoly = p_psVectorFitPolynomial1DOrd(myPoly, x64, y64, yErr64); 896 896 } else { 897 // XXX: psErrorMsg()897 psError(__func__, "unknown polynomial type.\n"); 898 898 return(NULL); 899 899 } -
trunk/psLib/src/math/psConstants.h
r2058 r2106 6 6 * @author GLG, MHPCC 7 7 * 8 * @version $Revision: 1. 9$ $Name: not supported by cvs2svn $9 * @date $Date: 2004-10-1 2 20:53:02$8 * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ 9 * @date $Date: 2004-10-14 01:44:48 $ 10 10 * 11 11 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 113 113 return(NULL); \ 114 114 } 115 /** Preprocessor macro to generate error on a NULL poniter */ 116 #define PS_CHECK_NULL_PTR_RETURN_ZERO(NAME) \ 117 if (NAME == NULL) { \ 118 psError(__func__,"Unallowable operation: %s is NULL.", #NAME); \ 119 return(0); \ 120 } 115 121 116 122 /** Preprocessor macro to generate error for zero length vector */ -
trunk/psLib/src/math/psMinimize.c
r1992 r2106 9 9 * @author GLF, MHPCC 10 10 * 11 * @version $Revision: 1.5 7$ $Name: not supported by cvs2svn $12 * @date $Date: 2004-10- 06 23:38:49$11 * @version $Revision: 1.58 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2004-10-14 01:44:48 $ 13 13 * 14 14 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 895 895 tmpPoly = p_psVectorFitPolynomial1DOrd(myPoly, x64, y64, yErr64); 896 896 } else { 897 // XXX: psErrorMsg()897 psError(__func__, "unknown polynomial type.\n"); 898 898 return(NULL); 899 899 } -
trunk/psLib/src/math/psPolynomial.c
r1985 r2106 7 7 * polynomials. It also contains a Gaussian functions. 8 8 * 9 * @version $Revision: 1.5 1$ $Name: not supported by cvs2svn $10 * @date $Date: 2004-10- 06 22:27:06$9 * @version $Revision: 1.52 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2004-10-14 01:44:48 $ 11 11 * 12 12 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 206 206 } 207 207 208 //XXX: remove this209 //typedef enum {210 // PS_POLYNOMIAL_ORD, ///< Ordinary Polynomial211 // PS_POLYNOMIAL_CHEB ///< Chebyshev Polynomial212 //} psPolynomialType;213 214 208 /***************************************************************************** 215 209 This routine must allocate memory for the polynomial structures. … … 1858 1852 { 1859 1853 if (x->type.type != bins->type.type) { 1860 // XXX: Generate error message.1861 return(- 1);1854 psError(__func__, "x->type.type != bins->type.type"); 1855 return(-2); 1862 1856 } 1863 1857 … … 1867 1861 return(p_psVectorBinDisectF32(bins->data.F32, bins->n, x->data.F32)); 1868 1862 } else { 1869 // XXX: Generate error message. 1863 psError(__func__, "Unallowable data type."); 1864 return(-2); 1870 1865 } 1871 1866 return(-1); … … 2064 2059 by a call to the 1D polynomial functions. 2065 2060 2066 XXX: SDR is silent about data types. PS_TYPE_F32 is implemented.2067 2068 2061 XXX: The spline eval functions require input and output to be F32. however 2069 2062 the spline fit functions require F32 and F64. -
trunk/psLib/src/math/psSpline.c
r1985 r2106 7 7 * polynomials. It also contains a Gaussian functions. 8 8 * 9 * @version $Revision: 1.5 1$ $Name: not supported by cvs2svn $10 * @date $Date: 2004-10- 06 22:27:06$9 * @version $Revision: 1.52 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2004-10-14 01:44:48 $ 11 11 * 12 12 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 206 206 } 207 207 208 //XXX: remove this209 //typedef enum {210 // PS_POLYNOMIAL_ORD, ///< Ordinary Polynomial211 // PS_POLYNOMIAL_CHEB ///< Chebyshev Polynomial212 //} psPolynomialType;213 214 208 /***************************************************************************** 215 209 This routine must allocate memory for the polynomial structures. … … 1858 1852 { 1859 1853 if (x->type.type != bins->type.type) { 1860 // XXX: Generate error message.1861 return(- 1);1854 psError(__func__, "x->type.type != bins->type.type"); 1855 return(-2); 1862 1856 } 1863 1857 … … 1867 1861 return(p_psVectorBinDisectF32(bins->data.F32, bins->n, x->data.F32)); 1868 1862 } else { 1869 // XXX: Generate error message. 1863 psError(__func__, "Unallowable data type."); 1864 return(-2); 1870 1865 } 1871 1866 return(-1); … … 2064 2059 by a call to the 1D polynomial functions. 2065 2060 2066 XXX: SDR is silent about data types. PS_TYPE_F32 is implemented.2067 2068 2061 XXX: The spline eval functions require input and output to be F32. however 2069 2062 the spline fit functions require F32 and F64.
Note:
See TracChangeset
for help on using the changeset viewer.
