Index: /trunk/psLib/src/dataManip/psFunctions.c =================================================================== --- /trunk/psLib/src/dataManip/psFunctions.c (revision 4425) +++ /trunk/psLib/src/dataManip/psFunctions.c (revision 4426) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.113 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-29 00:43:46 $ + * @version $Revision: 1.114 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-29 03:23:19 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -1069,5 +1069,5 @@ This routine must allocate memory for the polynomial structures. *****************************************************************************/ -psPolynomial1D* psPolynomial1DAlloc(int n, +psPolynomial1D* psPolynomial1DAlloc(unsigned int n, psPolynomialType type) { @@ -1094,5 +1094,5 @@ } -psPolynomial2D* psPolynomial2DAlloc(int nX, int nY, +psPolynomial2D* psPolynomial2DAlloc(unsigned int nX, unsigned int nY, psPolynomialType type) { @@ -1130,5 +1130,5 @@ } -psPolynomial3D* psPolynomial3DAlloc(int nX, int nY, int nZ, +psPolynomial3D* psPolynomial3DAlloc(unsigned int nX, unsigned int nY, unsigned int nZ, psPolynomialType type) { @@ -1176,5 +1176,5 @@ } -psPolynomial4D* psPolynomial4DAlloc(int nX, int nY, int nZ, int nT, +psPolynomial4D* psPolynomial4DAlloc(unsigned int nX, unsigned int nY, unsigned int nZ, unsigned int nT, psPolynomialType type) { @@ -1431,5 +1431,5 @@ -psDPolynomial1D* psDPolynomial1DAlloc(int n, +psDPolynomial1D* psDPolynomial1DAlloc(unsigned int n, psPolynomialType type) { @@ -1456,5 +1456,5 @@ } -psDPolynomial2D* psDPolynomial2DAlloc(int nX, int nY, +psDPolynomial2D* psDPolynomial2DAlloc(unsigned int nX, unsigned int nY, psPolynomialType type) { @@ -1492,5 +1492,5 @@ } -psDPolynomial3D* psDPolynomial3DAlloc(int nX, int nY, int nZ, +psDPolynomial3D* psDPolynomial3DAlloc(unsigned int nX, unsigned int nY, unsigned int nZ, psPolynomialType type) { @@ -1538,5 +1538,5 @@ } -psDPolynomial4D* psDPolynomial4DAlloc(int nX, int nY, int nZ, int nT, +psDPolynomial4D* psDPolynomial4DAlloc(unsigned int nX, unsigned int nY, unsigned int nZ, unsigned int nT, psPolynomialType type) { Index: /trunk/psLib/src/dataManip/psFunctions.h =================================================================== --- /trunk/psLib/src/dataManip/psFunctions.h (revision 4425) +++ /trunk/psLib/src/dataManip/psFunctions.h (revision 4426) @@ -12,6 +12,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.50 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-29 00:43:46 $ + * @version $Revision: 1.51 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-29 03:23:19 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -126,5 +126,5 @@ */ psPolynomial1D* psPolynomial1DAlloc( - int n, ///< Number of terms + unsigned int n, ///< Number of terms psPolynomialType type ///< Polynomial Type ); @@ -135,6 +135,6 @@ */ psPolynomial2D* psPolynomial2DAlloc( - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y + unsigned int nX, ///< Number of terms in x + unsigned int nY, ///< Number of terms in y psPolynomialType type ///< Polynomial Type ); @@ -145,7 +145,7 @@ */ psPolynomial3D* psPolynomial3DAlloc( - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y - int nZ, ///< Number of terms in z + unsigned int nX, ///< Number of terms in x + unsigned int nY, ///< Number of terms in y + unsigned int nZ, ///< Number of terms in z psPolynomialType type ///< Polynomial Type ); @@ -156,8 +156,8 @@ */ psPolynomial4D* psPolynomial4DAlloc( - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y - int nZ, ///< Number of terms in z - int nT, ///< Number of terms in t + unsigned int nX, ///< Number of terms in x + unsigned int nY, ///< Number of terms in y + unsigned int nZ, ///< Number of terms in z + unsigned int nT, ///< Number of terms in t psPolynomialType type ///< Polynomial Type ); @@ -306,5 +306,5 @@ */ psDPolynomial1D* psDPolynomial1DAlloc( - int n, ///< Number of terms + unsigned int n, ///< Number of terms psPolynomialType type ///< Polynomial Type ); @@ -315,6 +315,6 @@ */ psDPolynomial2D* psDPolynomial2DAlloc( - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y + unsigned int nX, ///< Number of terms in x + unsigned int nY, ///< Number of terms in y psPolynomialType type ///< Polynomial Type ); @@ -325,7 +325,7 @@ */ psDPolynomial3D* psDPolynomial3DAlloc( - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y - int nZ, ///< Number of terms in z + unsigned int nX, ///< Number of terms in x + unsigned int nY, ///< Number of terms in y + unsigned int nZ, ///< Number of terms in z psPolynomialType type ///< Polynomial Type ); @@ -336,8 +336,8 @@ */ psDPolynomial4D* psDPolynomial4DAlloc( - int nX, ///< Number of terms in w - int nY, ///< Number of terms in x - int nZ, ///< Number of terms in y - int nT, ///< Number of terms in z + unsigned int nX, ///< Number of terms in w + unsigned int nY, ///< Number of terms in x + unsigned int nZ, ///< Number of terms in y + unsigned int nT, ///< Number of terms in z psPolynomialType type ///< Polynomial Type ); Index: /trunk/psLib/src/math/psPolynomial.c =================================================================== --- /trunk/psLib/src/math/psPolynomial.c (revision 4425) +++ /trunk/psLib/src/math/psPolynomial.c (revision 4426) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.113 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-29 00:43:46 $ + * @version $Revision: 1.114 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-29 03:23:19 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -1069,5 +1069,5 @@ This routine must allocate memory for the polynomial structures. *****************************************************************************/ -psPolynomial1D* psPolynomial1DAlloc(int n, +psPolynomial1D* psPolynomial1DAlloc(unsigned int n, psPolynomialType type) { @@ -1094,5 +1094,5 @@ } -psPolynomial2D* psPolynomial2DAlloc(int nX, int nY, +psPolynomial2D* psPolynomial2DAlloc(unsigned int nX, unsigned int nY, psPolynomialType type) { @@ -1130,5 +1130,5 @@ } -psPolynomial3D* psPolynomial3DAlloc(int nX, int nY, int nZ, +psPolynomial3D* psPolynomial3DAlloc(unsigned int nX, unsigned int nY, unsigned int nZ, psPolynomialType type) { @@ -1176,5 +1176,5 @@ } -psPolynomial4D* psPolynomial4DAlloc(int nX, int nY, int nZ, int nT, +psPolynomial4D* psPolynomial4DAlloc(unsigned int nX, unsigned int nY, unsigned int nZ, unsigned int nT, psPolynomialType type) { @@ -1431,5 +1431,5 @@ -psDPolynomial1D* psDPolynomial1DAlloc(int n, +psDPolynomial1D* psDPolynomial1DAlloc(unsigned int n, psPolynomialType type) { @@ -1456,5 +1456,5 @@ } -psDPolynomial2D* psDPolynomial2DAlloc(int nX, int nY, +psDPolynomial2D* psDPolynomial2DAlloc(unsigned int nX, unsigned int nY, psPolynomialType type) { @@ -1492,5 +1492,5 @@ } -psDPolynomial3D* psDPolynomial3DAlloc(int nX, int nY, int nZ, +psDPolynomial3D* psDPolynomial3DAlloc(unsigned int nX, unsigned int nY, unsigned int nZ, psPolynomialType type) { @@ -1538,5 +1538,5 @@ } -psDPolynomial4D* psDPolynomial4DAlloc(int nX, int nY, int nZ, int nT, +psDPolynomial4D* psDPolynomial4DAlloc(unsigned int nX, unsigned int nY, unsigned int nZ, unsigned int nT, psPolynomialType type) { Index: /trunk/psLib/src/math/psPolynomial.h =================================================================== --- /trunk/psLib/src/math/psPolynomial.h (revision 4425) +++ /trunk/psLib/src/math/psPolynomial.h (revision 4426) @@ -12,6 +12,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.50 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-29 00:43:46 $ + * @version $Revision: 1.51 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-29 03:23:19 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -126,5 +126,5 @@ */ psPolynomial1D* psPolynomial1DAlloc( - int n, ///< Number of terms + unsigned int n, ///< Number of terms psPolynomialType type ///< Polynomial Type ); @@ -135,6 +135,6 @@ */ psPolynomial2D* psPolynomial2DAlloc( - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y + unsigned int nX, ///< Number of terms in x + unsigned int nY, ///< Number of terms in y psPolynomialType type ///< Polynomial Type ); @@ -145,7 +145,7 @@ */ psPolynomial3D* psPolynomial3DAlloc( - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y - int nZ, ///< Number of terms in z + unsigned int nX, ///< Number of terms in x + unsigned int nY, ///< Number of terms in y + unsigned int nZ, ///< Number of terms in z psPolynomialType type ///< Polynomial Type ); @@ -156,8 +156,8 @@ */ psPolynomial4D* psPolynomial4DAlloc( - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y - int nZ, ///< Number of terms in z - int nT, ///< Number of terms in t + unsigned int nX, ///< Number of terms in x + unsigned int nY, ///< Number of terms in y + unsigned int nZ, ///< Number of terms in z + unsigned int nT, ///< Number of terms in t psPolynomialType type ///< Polynomial Type ); @@ -306,5 +306,5 @@ */ psDPolynomial1D* psDPolynomial1DAlloc( - int n, ///< Number of terms + unsigned int n, ///< Number of terms psPolynomialType type ///< Polynomial Type ); @@ -315,6 +315,6 @@ */ psDPolynomial2D* psDPolynomial2DAlloc( - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y + unsigned int nX, ///< Number of terms in x + unsigned int nY, ///< Number of terms in y psPolynomialType type ///< Polynomial Type ); @@ -325,7 +325,7 @@ */ psDPolynomial3D* psDPolynomial3DAlloc( - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y - int nZ, ///< Number of terms in z + unsigned int nX, ///< Number of terms in x + unsigned int nY, ///< Number of terms in y + unsigned int nZ, ///< Number of terms in z psPolynomialType type ///< Polynomial Type ); @@ -336,8 +336,8 @@ */ psDPolynomial4D* psDPolynomial4DAlloc( - int nX, ///< Number of terms in w - int nY, ///< Number of terms in x - int nZ, ///< Number of terms in y - int nT, ///< Number of terms in z + unsigned int nX, ///< Number of terms in w + unsigned int nY, ///< Number of terms in x + unsigned int nZ, ///< Number of terms in y + unsigned int nT, ///< Number of terms in z psPolynomialType type ///< Polynomial Type ); Index: /trunk/psLib/src/math/psSpline.c =================================================================== --- /trunk/psLib/src/math/psSpline.c (revision 4425) +++ /trunk/psLib/src/math/psSpline.c (revision 4426) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.113 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-29 00:43:46 $ + * @version $Revision: 1.114 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-29 03:23:19 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -1069,5 +1069,5 @@ This routine must allocate memory for the polynomial structures. *****************************************************************************/ -psPolynomial1D* psPolynomial1DAlloc(int n, +psPolynomial1D* psPolynomial1DAlloc(unsigned int n, psPolynomialType type) { @@ -1094,5 +1094,5 @@ } -psPolynomial2D* psPolynomial2DAlloc(int nX, int nY, +psPolynomial2D* psPolynomial2DAlloc(unsigned int nX, unsigned int nY, psPolynomialType type) { @@ -1130,5 +1130,5 @@ } -psPolynomial3D* psPolynomial3DAlloc(int nX, int nY, int nZ, +psPolynomial3D* psPolynomial3DAlloc(unsigned int nX, unsigned int nY, unsigned int nZ, psPolynomialType type) { @@ -1176,5 +1176,5 @@ } -psPolynomial4D* psPolynomial4DAlloc(int nX, int nY, int nZ, int nT, +psPolynomial4D* psPolynomial4DAlloc(unsigned int nX, unsigned int nY, unsigned int nZ, unsigned int nT, psPolynomialType type) { @@ -1431,5 +1431,5 @@ -psDPolynomial1D* psDPolynomial1DAlloc(int n, +psDPolynomial1D* psDPolynomial1DAlloc(unsigned int n, psPolynomialType type) { @@ -1456,5 +1456,5 @@ } -psDPolynomial2D* psDPolynomial2DAlloc(int nX, int nY, +psDPolynomial2D* psDPolynomial2DAlloc(unsigned int nX, unsigned int nY, psPolynomialType type) { @@ -1492,5 +1492,5 @@ } -psDPolynomial3D* psDPolynomial3DAlloc(int nX, int nY, int nZ, +psDPolynomial3D* psDPolynomial3DAlloc(unsigned int nX, unsigned int nY, unsigned int nZ, psPolynomialType type) { @@ -1538,5 +1538,5 @@ } -psDPolynomial4D* psDPolynomial4DAlloc(int nX, int nY, int nZ, int nT, +psDPolynomial4D* psDPolynomial4DAlloc(unsigned int nX, unsigned int nY, unsigned int nZ, unsigned int nT, psPolynomialType type) { Index: /trunk/psLib/src/math/psSpline.h =================================================================== --- /trunk/psLib/src/math/psSpline.h (revision 4425) +++ /trunk/psLib/src/math/psSpline.h (revision 4426) @@ -12,6 +12,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.50 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-29 00:43:46 $ + * @version $Revision: 1.51 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-29 03:23:19 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -126,5 +126,5 @@ */ psPolynomial1D* psPolynomial1DAlloc( - int n, ///< Number of terms + unsigned int n, ///< Number of terms psPolynomialType type ///< Polynomial Type ); @@ -135,6 +135,6 @@ */ psPolynomial2D* psPolynomial2DAlloc( - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y + unsigned int nX, ///< Number of terms in x + unsigned int nY, ///< Number of terms in y psPolynomialType type ///< Polynomial Type ); @@ -145,7 +145,7 @@ */ psPolynomial3D* psPolynomial3DAlloc( - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y - int nZ, ///< Number of terms in z + unsigned int nX, ///< Number of terms in x + unsigned int nY, ///< Number of terms in y + unsigned int nZ, ///< Number of terms in z psPolynomialType type ///< Polynomial Type ); @@ -156,8 +156,8 @@ */ psPolynomial4D* psPolynomial4DAlloc( - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y - int nZ, ///< Number of terms in z - int nT, ///< Number of terms in t + unsigned int nX, ///< Number of terms in x + unsigned int nY, ///< Number of terms in y + unsigned int nZ, ///< Number of terms in z + unsigned int nT, ///< Number of terms in t psPolynomialType type ///< Polynomial Type ); @@ -306,5 +306,5 @@ */ psDPolynomial1D* psDPolynomial1DAlloc( - int n, ///< Number of terms + unsigned int n, ///< Number of terms psPolynomialType type ///< Polynomial Type ); @@ -315,6 +315,6 @@ */ psDPolynomial2D* psDPolynomial2DAlloc( - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y + unsigned int nX, ///< Number of terms in x + unsigned int nY, ///< Number of terms in y psPolynomialType type ///< Polynomial Type ); @@ -325,7 +325,7 @@ */ psDPolynomial3D* psDPolynomial3DAlloc( - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y - int nZ, ///< Number of terms in z + unsigned int nX, ///< Number of terms in x + unsigned int nY, ///< Number of terms in y + unsigned int nZ, ///< Number of terms in z psPolynomialType type ///< Polynomial Type ); @@ -336,8 +336,8 @@ */ psDPolynomial4D* psDPolynomial4DAlloc( - int nX, ///< Number of terms in w - int nY, ///< Number of terms in x - int nZ, ///< Number of terms in y - int nT, ///< Number of terms in z + unsigned int nX, ///< Number of terms in w + unsigned int nY, ///< Number of terms in x + unsigned int nZ, ///< Number of terms in y + unsigned int nT, ///< Number of terms in z psPolynomialType type ///< Polynomial Type ); Index: /trunk/psLib/test/dataManip/tst_psFunc00.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psFunc00.c (revision 4425) +++ /trunk/psLib/test/dataManip/tst_psFunc00.c (revision 4426) @@ -14,6 +14,6 @@ * orders are created. * -* @version $Revision: 1.22 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-29 00:43:46 $ +* @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-29 03:23:19 $ * * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii @@ -99,11 +99,11 @@ psFree(my1DPoly); - // Attempt to allocate with negative order - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); - if(psPolynomial1DAlloc(-1,PS_POLYNOMIAL_ORD) != NULL) { - psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); - return 7; - } - + /* // Attempt to allocate with negative order + psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); + if(psPolynomial1DAlloc(-1,PS_POLYNOMIAL_ORD) != NULL) { + psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); + return 7; + } + */ return 0; } @@ -151,11 +151,11 @@ psFree(my1DDPoly); - // Attempt to allocate with negative order - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); - if(psDPolynomial1DAlloc(-1,PS_POLYNOMIAL_ORD) != NULL) { - psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); - return 7; - } - + /* // Attempt to allocate with negative order + psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); + if(psDPolynomial1DAlloc(-1,PS_POLYNOMIAL_ORD) != NULL) { + psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); + return 7; + } + */ return 0; } @@ -211,17 +211,17 @@ psFree(my2DPoly); - // Attempt to allocate with negative order - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); - if(psPolynomial2DAlloc(-1,1,PS_POLYNOMIAL_ORD) != NULL) { - psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); - return 8; - } - // Attempt to allocate with negative order - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); - if(psPolynomial2DAlloc(1,-1,PS_POLYNOMIAL_ORD) != NULL) { - psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); - return 9; - } - + /* // Attempt to allocate with negative order + psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); + if(psPolynomial2DAlloc(-1,1,PS_POLYNOMIAL_ORD) != NULL) { + psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); + return 8; + } + // Attempt to allocate with negative order + psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); + if(psPolynomial2DAlloc(1,-1,PS_POLYNOMIAL_ORD) != NULL) { + psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); + return 9; + } + */ return 0; } @@ -276,18 +276,18 @@ } psFree(my2DDPoly); - - // Attempt to allocate with negative order - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); - if(psDPolynomial2DAlloc(-1,1,PS_POLYNOMIAL_ORD) != NULL) { - psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); - return 8; - } - // Attempt to allocate with negative order - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); - if(psDPolynomial2DAlloc(1,-1,PS_POLYNOMIAL_ORD) != NULL) { - psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); - return 9; - } - + /* + // Attempt to allocate with negative order + psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); + if(psDPolynomial2DAlloc(-1,1,PS_POLYNOMIAL_ORD) != NULL) { + psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); + return 8; + } + // Attempt to allocate with negative order + psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); + if(psDPolynomial2DAlloc(1,-1,PS_POLYNOMIAL_ORD) != NULL) { + psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); + return 9; + } + */ return 0; } @@ -351,23 +351,23 @@ psFree(my3DPoly); - // Attempt to allocate with negative order - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); - if(psPolynomial3DAlloc(-1,1,1,PS_POLYNOMIAL_ORD) != NULL) { - psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); - return 9; - } - // Attempt to allocate with negative order - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); - if(psPolynomial3DAlloc(1,-1,1,PS_POLYNOMIAL_ORD) != NULL) { - psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); - return 10; - } - // Attempt to allocate with negative order - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); - if(psPolynomial3DAlloc(1,1,-1,PS_POLYNOMIAL_ORD) != NULL) { - psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); - return 11; - } - + /* // Attempt to allocate with negative order + psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); + if(psPolynomial3DAlloc(-1,1,1,PS_POLYNOMIAL_ORD) != NULL) { + psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); + return 9; + } + // Attempt to allocate with negative order + psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); + if(psPolynomial3DAlloc(1,-1,1,PS_POLYNOMIAL_ORD) != NULL) { + psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); + return 10; + } + // Attempt to allocate with negative order + psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); + if(psPolynomial3DAlloc(1,1,-1,PS_POLYNOMIAL_ORD) != NULL) { + psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); + return 11; + } + */ return 0; } @@ -431,23 +431,23 @@ psFree(my3DDPoly); - // Attempt to allocate with negative order - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); - if(psDPolynomial3DAlloc(-1,1,1,PS_POLYNOMIAL_ORD) != NULL) { - psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); - return 9; - } - // Attempt to allocate with negative order - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); - if(psDPolynomial3DAlloc(1,-1,1,PS_POLYNOMIAL_ORD) != NULL) { - psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); - return 10; - } - // Attempt to allocate with negative order - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); - if(psDPolynomial3DAlloc(1,1,-1,PS_POLYNOMIAL_ORD) != NULL) { - psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); - return 11; - } - + /* // Attempt to allocate with negative order + psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); + if(psDPolynomial3DAlloc(-1,1,1,PS_POLYNOMIAL_ORD) != NULL) { + psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); + return 9; + } + // Attempt to allocate with negative order + psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); + if(psDPolynomial3DAlloc(1,-1,1,PS_POLYNOMIAL_ORD) != NULL) { + psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); + return 10; + } + // Attempt to allocate with negative order + psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); + if(psDPolynomial3DAlloc(1,1,-1,PS_POLYNOMIAL_ORD) != NULL) { + psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); + return 11; + } + */ return 0; } @@ -519,29 +519,29 @@ psFree(my4DPoly); - // Attempt to allocate with negative order - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); - if(psPolynomial4DAlloc(-1,1,1,1,PS_POLYNOMIAL_ORD) != NULL) { - psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); - return 10; - } - // Attempt to allocate with negative order - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); - if(psPolynomial4DAlloc(1,-1,1,1,PS_POLYNOMIAL_ORD) != NULL) { - psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); - return 11; - } - // Attempt to allocate with negative order - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); - if(psPolynomial4DAlloc(1,1,-1,1,PS_POLYNOMIAL_ORD) != NULL) { - psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); - return 12; - } - // Attempt to allocate with negative order - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); - if(psPolynomial4DAlloc(1,1,1,-1,PS_POLYNOMIAL_ORD) != NULL) { - psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); - return 13; - } - + /* // Attempt to allocate with negative order + psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); + if(psPolynomial4DAlloc(-1,1,1,1,PS_POLYNOMIAL_ORD) != NULL) { + psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); + return 10; + } + // Attempt to allocate with negative order + psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); + if(psPolynomial4DAlloc(1,-1,1,1,PS_POLYNOMIAL_ORD) != NULL) { + psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); + return 11; + } + // Attempt to allocate with negative order + psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); + if(psPolynomial4DAlloc(1,1,-1,1,PS_POLYNOMIAL_ORD) != NULL) { + psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); + return 12; + } + // Attempt to allocate with negative order + psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); + if(psPolynomial4DAlloc(1,1,1,-1,PS_POLYNOMIAL_ORD) != NULL) { + psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); + return 13; + } + */ return 0; } @@ -613,30 +613,30 @@ psFree(my4DDPoly); - // Attempt to allocate with negative order - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); - if(psDPolynomial4DAlloc(-1,1,1,1,PS_POLYNOMIAL_ORD) != NULL) { - psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); - return 10; - } - // Attempt to allocate with negative order - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); - if(psDPolynomial4DAlloc(1,-1,1,1,PS_POLYNOMIAL_ORD) != NULL) { - psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); - return 11; - } - // Attempt to allocate with negative order - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); - if(psDPolynomial4DAlloc(1,1,-1,1,PS_POLYNOMIAL_ORD) != NULL) { - psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); - return 12; - } - // Attempt to allocate with negative order - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); - if(psDPolynomial4DAlloc(1,1,1,-1,PS_POLYNOMIAL_ORD) != NULL) { - psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); - return 13; - } - - return 0; -} - + /* // Attempt to allocate with negative order + psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); + if(psDPolynomial4DAlloc(-1,1,1,1,PS_POLYNOMIAL_ORD) != NULL) { + psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); + return 10; + } + // Attempt to allocate with negative order + psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); + if(psDPolynomial4DAlloc(1,-1,1,1,PS_POLYNOMIAL_ORD) != NULL) { + psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); + return 11; + } + // Attempt to allocate with negative order + psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); + if(psDPolynomial4DAlloc(1,1,-1,1,PS_POLYNOMIAL_ORD) != NULL) { + psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); + return 12; + } + // Attempt to allocate with negative order + psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); + if(psDPolynomial4DAlloc(1,1,1,-1,PS_POLYNOMIAL_ORD) != NULL) { + psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); + return 13; + } + */ + return 0; +} + Index: /trunk/psLib/test/dataManip/verified/tst_psFunc00.stderr =================================================================== --- /trunk/psLib/test/dataManip/verified/tst_psFunc00.stderr (revision 4425) +++ /trunk/psLib/test/dataManip/verified/tst_psFunc00.stderr (revision 4426) @@ -5,8 +5,4 @@ \**********************************************************************************/ -