Changeset 3097
- Timestamp:
- Jan 26, 2005, 10:47:41 AM (21 years ago)
- Location:
- trunk/psLib/src
- Files:
-
- 5 edited
-
dataManip/psFunctions.c (modified) (6 diffs)
-
dataManip/psMinimize.c (modified) (5 diffs)
-
math/psMinimize.c (modified) (5 diffs)
-
math/psPolynomial.c (modified) (6 diffs)
-
math/psSpline.c (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/psLib/src/dataManip/psFunctions.c
r3096 r3097 7 7 * polynomials. It also contains a Gaussian functions. 8 8 * 9 * @version $Revision: 1.8 4$ $Name: not supported by cvs2svn $10 * @date $Date: 2005-01-26 20:4 1:04$9 * @version $Revision: 1.85 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-01-26 20:47:41 $ 11 11 * 12 12 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 1841 1841 1842 1842 XXX: Ensure that domain[i+1] != domain[i] 1843 1844 XXX: What should be the defualty type for knots be? psF32 is assumed. 1843 1845 *****************************************************************************/ 1844 1846 psSpline1D *psSpline1DAlloc(psS32 numSplines, … … 1884 1886 1885 1887 /***************************************************************************** 1888 XXX: What should be the defualty type for knots be? psF32 is assumed. 1886 1889 *****************************************************************************/ 1887 1890 psSpline1D *psSpline1DAllocGeneric(const psVector *bounds, … … 2142 2145 XXX: The spline eval functions require input and output to be F32. however 2143 2146 the spline fit functions require F32 and F64. 2147 2148 XXX: This only works if spline0>knots if psF32. Must add support for psU32 and 2149 psF64. 2144 2150 *****************************************************************************/ 2145 2151 psF32 psSpline1DEval( … … 2150 2156 PS_PTR_CHECK_NULL(spline, NAN); 2151 2157 PS_INT_CHECK_NON_NEGATIVE(spline->n, NAN); 2158 PS_VECTOR_CHECK_TYPE(spline->knots, PS_TYPE_F32, NAN); 2152 2159 2153 2160 psS32 binNum; … … 2186 2193 PS_VECTOR_CHECK_NULL(x, NULL); 2187 2194 PS_VECTOR_CHECK_TYPE_F32_OR_F64(x, NULL); 2195 PS_VECTOR_CHECK_TYPE(spline->knots, PS_TYPE_F32, NULL); 2188 2196 2189 2197 psS32 i; -
trunk/psLib/src/dataManip/psMinimize.c
r3096 r3097 9 9 * @author GLG, MHPCC 10 10 * 11 * @version $Revision: 1.10 2$ $Name: not supported by cvs2svn $12 * @date $Date: 2005-01-26 20:4 1:04$11 * @version $Revision: 1.103 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2005-01-26 20:47:41 $ 13 13 * 14 14 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 162 162 163 163 XXX: This is F32 only 164 165 XXX: spline->knots must be psF32 164 166 *****************************************************************************/ 165 167 /* … … 177 179 PS_VECTOR_CHECK_NULL(y, NAN); 178 180 PS_VECTOR_CHECK_TYPE(y, PS_TYPE_F32, NAN); 181 PS_VECTOR_CHECK_TYPE(spline->knots, PS_TYPE_F32, NULL); 179 182 180 183 psS32 n; … … 244 247 XXX: What happens if X is NULL, then an index vector is generated for X, but 245 248 that index vector lies outside the range vectors in mySpline? 249 250 XXX: Assumes mySpline->knots is psF32. Must add psU32 and psF64. 246 251 *****************************************************************************/ 247 252 psSpline1D *psVectorFitSpline1D(psSpline1D *mySpline, ///< The spline which will be generated. … … 252 257 PS_VECTOR_CHECK_NULL(y, NULL); 253 258 PS_VECTOR_CHECK_TYPE_F32_OR_F64(y, NULL); 259 PS_VECTOR_CHECK_TYPE(mySpline->knots, PS_TYPE_F32, NULL); 254 260 255 261 psTrace(".psLib.dataManip.psVectorFitSpline1D", 4, -
trunk/psLib/src/math/psMinimize.c
r3096 r3097 9 9 * @author GLG, MHPCC 10 10 * 11 * @version $Revision: 1.10 2$ $Name: not supported by cvs2svn $12 * @date $Date: 2005-01-26 20:4 1:04$11 * @version $Revision: 1.103 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2005-01-26 20:47:41 $ 13 13 * 14 14 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 162 162 163 163 XXX: This is F32 only 164 165 XXX: spline->knots must be psF32 164 166 *****************************************************************************/ 165 167 /* … … 177 179 PS_VECTOR_CHECK_NULL(y, NAN); 178 180 PS_VECTOR_CHECK_TYPE(y, PS_TYPE_F32, NAN); 181 PS_VECTOR_CHECK_TYPE(spline->knots, PS_TYPE_F32, NULL); 179 182 180 183 psS32 n; … … 244 247 XXX: What happens if X is NULL, then an index vector is generated for X, but 245 248 that index vector lies outside the range vectors in mySpline? 249 250 XXX: Assumes mySpline->knots is psF32. Must add psU32 and psF64. 246 251 *****************************************************************************/ 247 252 psSpline1D *psVectorFitSpline1D(psSpline1D *mySpline, ///< The spline which will be generated. … … 252 257 PS_VECTOR_CHECK_NULL(y, NULL); 253 258 PS_VECTOR_CHECK_TYPE_F32_OR_F64(y, NULL); 259 PS_VECTOR_CHECK_TYPE(mySpline->knots, PS_TYPE_F32, NULL); 254 260 255 261 psTrace(".psLib.dataManip.psVectorFitSpline1D", 4, -
trunk/psLib/src/math/psPolynomial.c
r3096 r3097 7 7 * polynomials. It also contains a Gaussian functions. 8 8 * 9 * @version $Revision: 1.8 4$ $Name: not supported by cvs2svn $10 * @date $Date: 2005-01-26 20:4 1:04$9 * @version $Revision: 1.85 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-01-26 20:47:41 $ 11 11 * 12 12 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 1841 1841 1842 1842 XXX: Ensure that domain[i+1] != domain[i] 1843 1844 XXX: What should be the defualty type for knots be? psF32 is assumed. 1843 1845 *****************************************************************************/ 1844 1846 psSpline1D *psSpline1DAlloc(psS32 numSplines, … … 1884 1886 1885 1887 /***************************************************************************** 1888 XXX: What should be the defualty type for knots be? psF32 is assumed. 1886 1889 *****************************************************************************/ 1887 1890 psSpline1D *psSpline1DAllocGeneric(const psVector *bounds, … … 2142 2145 XXX: The spline eval functions require input and output to be F32. however 2143 2146 the spline fit functions require F32 and F64. 2147 2148 XXX: This only works if spline0>knots if psF32. Must add support for psU32 and 2149 psF64. 2144 2150 *****************************************************************************/ 2145 2151 psF32 psSpline1DEval( … … 2150 2156 PS_PTR_CHECK_NULL(spline, NAN); 2151 2157 PS_INT_CHECK_NON_NEGATIVE(spline->n, NAN); 2158 PS_VECTOR_CHECK_TYPE(spline->knots, PS_TYPE_F32, NAN); 2152 2159 2153 2160 psS32 binNum; … … 2186 2193 PS_VECTOR_CHECK_NULL(x, NULL); 2187 2194 PS_VECTOR_CHECK_TYPE_F32_OR_F64(x, NULL); 2195 PS_VECTOR_CHECK_TYPE(spline->knots, PS_TYPE_F32, NULL); 2188 2196 2189 2197 psS32 i; -
trunk/psLib/src/math/psSpline.c
r3096 r3097 7 7 * polynomials. It also contains a Gaussian functions. 8 8 * 9 * @version $Revision: 1.8 4$ $Name: not supported by cvs2svn $10 * @date $Date: 2005-01-26 20:4 1:04$9 * @version $Revision: 1.85 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-01-26 20:47:41 $ 11 11 * 12 12 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 1841 1841 1842 1842 XXX: Ensure that domain[i+1] != domain[i] 1843 1844 XXX: What should be the defualty type for knots be? psF32 is assumed. 1843 1845 *****************************************************************************/ 1844 1846 psSpline1D *psSpline1DAlloc(psS32 numSplines, … … 1884 1886 1885 1887 /***************************************************************************** 1888 XXX: What should be the defualty type for knots be? psF32 is assumed. 1886 1889 *****************************************************************************/ 1887 1890 psSpline1D *psSpline1DAllocGeneric(const psVector *bounds, … … 2142 2145 XXX: The spline eval functions require input and output to be F32. however 2143 2146 the spline fit functions require F32 and F64. 2147 2148 XXX: This only works if spline0>knots if psF32. Must add support for psU32 and 2149 psF64. 2144 2150 *****************************************************************************/ 2145 2151 psF32 psSpline1DEval( … … 2150 2156 PS_PTR_CHECK_NULL(spline, NAN); 2151 2157 PS_INT_CHECK_NON_NEGATIVE(spline->n, NAN); 2158 PS_VECTOR_CHECK_TYPE(spline->knots, PS_TYPE_F32, NAN); 2152 2159 2153 2160 psS32 binNum; … … 2186 2193 PS_VECTOR_CHECK_NULL(x, NULL); 2187 2194 PS_VECTOR_CHECK_TYPE_F32_OR_F64(x, NULL); 2195 PS_VECTOR_CHECK_TYPE(spline->knots, PS_TYPE_F32, NULL); 2188 2196 2189 2197 psS32 i;
Note:
See TracChangeset
for help on using the changeset viewer.
