Changeset 4426
- Timestamp:
- Jun 28, 2005, 5:23:19 PM (21 years ago)
- Location:
- trunk/psLib
- Files:
-
- 8 edited
-
src/dataManip/psFunctions.c (modified) (9 diffs)
-
src/dataManip/psFunctions.h (modified) (9 diffs)
-
src/math/psPolynomial.c (modified) (9 diffs)
-
src/math/psPolynomial.h (modified) (9 diffs)
-
src/math/psSpline.c (modified) (9 diffs)
-
src/math/psSpline.h (modified) (9 diffs)
-
test/dataManip/tst_psFunc00.c (modified) (9 diffs)
-
test/dataManip/verified/tst_psFunc00.stderr (modified) (8 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/psLib/src/dataManip/psFunctions.c
r4422 r4426 7 7 * polynomials. It also contains a Gaussian functions. 8 8 * 9 * @version $Revision: 1.11 3$ $Name: not supported by cvs2svn $10 * @date $Date: 2005-06-29 0 0:43:46$9 * @version $Revision: 1.114 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-06-29 03:23:19 $ 11 11 * 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 1069 1069 This routine must allocate memory for the polynomial structures. 1070 1070 *****************************************************************************/ 1071 psPolynomial1D* psPolynomial1DAlloc( int n,1071 psPolynomial1D* psPolynomial1DAlloc(unsigned int n, 1072 1072 psPolynomialType type) 1073 1073 { … … 1094 1094 } 1095 1095 1096 psPolynomial2D* psPolynomial2DAlloc( int nX,int nY,1096 psPolynomial2D* psPolynomial2DAlloc(unsigned int nX, unsigned int nY, 1097 1097 psPolynomialType type) 1098 1098 { … … 1130 1130 } 1131 1131 1132 psPolynomial3D* psPolynomial3DAlloc( int nX, int nY,int nZ,1132 psPolynomial3D* psPolynomial3DAlloc(unsigned int nX, unsigned int nY, unsigned int nZ, 1133 1133 psPolynomialType type) 1134 1134 { … … 1176 1176 } 1177 1177 1178 psPolynomial4D* psPolynomial4DAlloc( int nX, int nY, int nZ,int nT,1178 psPolynomial4D* psPolynomial4DAlloc(unsigned int nX, unsigned int nY, unsigned int nZ, unsigned int nT, 1179 1179 psPolynomialType type) 1180 1180 { … … 1431 1431 1432 1432 1433 psDPolynomial1D* psDPolynomial1DAlloc( int n,1433 psDPolynomial1D* psDPolynomial1DAlloc(unsigned int n, 1434 1434 psPolynomialType type) 1435 1435 { … … 1456 1456 } 1457 1457 1458 psDPolynomial2D* psDPolynomial2DAlloc( int nX,int nY,1458 psDPolynomial2D* psDPolynomial2DAlloc(unsigned int nX, unsigned int nY, 1459 1459 psPolynomialType type) 1460 1460 { … … 1492 1492 } 1493 1493 1494 psDPolynomial3D* psDPolynomial3DAlloc( int nX, int nY,int nZ,1494 psDPolynomial3D* psDPolynomial3DAlloc(unsigned int nX, unsigned int nY, unsigned int nZ, 1495 1495 psPolynomialType type) 1496 1496 { … … 1538 1538 } 1539 1539 1540 psDPolynomial4D* psDPolynomial4DAlloc( int nX, int nY, int nZ,int nT,1540 psDPolynomial4D* psDPolynomial4DAlloc(unsigned int nX, unsigned int nY, unsigned int nZ, unsigned int nT, 1541 1541 psPolynomialType type) 1542 1542 { -
trunk/psLib/src/dataManip/psFunctions.h
r4422 r4426 12 12 * @author GLG, MHPCC 13 13 * 14 * @version $Revision: 1.5 0$ $Name: not supported by cvs2svn $15 * @date $Date: 2005-06-29 0 0:43:46$14 * @version $Revision: 1.51 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2005-06-29 03:23:19 $ 16 16 * 17 17 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 126 126 */ 127 127 psPolynomial1D* psPolynomial1DAlloc( 128 int n, ///< Number of terms128 unsigned int n, ///< Number of terms 129 129 psPolynomialType type ///< Polynomial Type 130 130 ); … … 135 135 */ 136 136 psPolynomial2D* psPolynomial2DAlloc( 137 int nX, ///< Number of terms in x138 int nY, ///< Number of terms in y137 unsigned int nX, ///< Number of terms in x 138 unsigned int nY, ///< Number of terms in y 139 139 psPolynomialType type ///< Polynomial Type 140 140 ); … … 145 145 */ 146 146 psPolynomial3D* psPolynomial3DAlloc( 147 int nX, ///< Number of terms in x148 int nY, ///< Number of terms in y149 int nZ, ///< Number of terms in z147 unsigned int nX, ///< Number of terms in x 148 unsigned int nY, ///< Number of terms in y 149 unsigned int nZ, ///< Number of terms in z 150 150 psPolynomialType type ///< Polynomial Type 151 151 ); … … 156 156 */ 157 157 psPolynomial4D* psPolynomial4DAlloc( 158 int nX, ///< Number of terms in x159 int nY, ///< Number of terms in y160 int nZ, ///< Number of terms in z161 int nT, ///< Number of terms in t158 unsigned int nX, ///< Number of terms in x 159 unsigned int nY, ///< Number of terms in y 160 unsigned int nZ, ///< Number of terms in z 161 unsigned int nT, ///< Number of terms in t 162 162 psPolynomialType type ///< Polynomial Type 163 163 ); … … 306 306 */ 307 307 psDPolynomial1D* psDPolynomial1DAlloc( 308 int n, ///< Number of terms308 unsigned int n, ///< Number of terms 309 309 psPolynomialType type ///< Polynomial Type 310 310 ); … … 315 315 */ 316 316 psDPolynomial2D* psDPolynomial2DAlloc( 317 int nX, ///< Number of terms in x318 int nY, ///< Number of terms in y317 unsigned int nX, ///< Number of terms in x 318 unsigned int nY, ///< Number of terms in y 319 319 psPolynomialType type ///< Polynomial Type 320 320 ); … … 325 325 */ 326 326 psDPolynomial3D* psDPolynomial3DAlloc( 327 int nX, ///< Number of terms in x328 int nY, ///< Number of terms in y329 int nZ, ///< Number of terms in z327 unsigned int nX, ///< Number of terms in x 328 unsigned int nY, ///< Number of terms in y 329 unsigned int nZ, ///< Number of terms in z 330 330 psPolynomialType type ///< Polynomial Type 331 331 ); … … 336 336 */ 337 337 psDPolynomial4D* psDPolynomial4DAlloc( 338 int nX, ///< Number of terms in w339 int nY, ///< Number of terms in x340 int nZ, ///< Number of terms in y341 int nT, ///< Number of terms in z338 unsigned int nX, ///< Number of terms in w 339 unsigned int nY, ///< Number of terms in x 340 unsigned int nZ, ///< Number of terms in y 341 unsigned int nT, ///< Number of terms in z 342 342 psPolynomialType type ///< Polynomial Type 343 343 ); -
trunk/psLib/src/math/psPolynomial.c
r4422 r4426 7 7 * polynomials. It also contains a Gaussian functions. 8 8 * 9 * @version $Revision: 1.11 3$ $Name: not supported by cvs2svn $10 * @date $Date: 2005-06-29 0 0:43:46$9 * @version $Revision: 1.114 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-06-29 03:23:19 $ 11 11 * 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 1069 1069 This routine must allocate memory for the polynomial structures. 1070 1070 *****************************************************************************/ 1071 psPolynomial1D* psPolynomial1DAlloc( int n,1071 psPolynomial1D* psPolynomial1DAlloc(unsigned int n, 1072 1072 psPolynomialType type) 1073 1073 { … … 1094 1094 } 1095 1095 1096 psPolynomial2D* psPolynomial2DAlloc( int nX,int nY,1096 psPolynomial2D* psPolynomial2DAlloc(unsigned int nX, unsigned int nY, 1097 1097 psPolynomialType type) 1098 1098 { … … 1130 1130 } 1131 1131 1132 psPolynomial3D* psPolynomial3DAlloc( int nX, int nY,int nZ,1132 psPolynomial3D* psPolynomial3DAlloc(unsigned int nX, unsigned int nY, unsigned int nZ, 1133 1133 psPolynomialType type) 1134 1134 { … … 1176 1176 } 1177 1177 1178 psPolynomial4D* psPolynomial4DAlloc( int nX, int nY, int nZ,int nT,1178 psPolynomial4D* psPolynomial4DAlloc(unsigned int nX, unsigned int nY, unsigned int nZ, unsigned int nT, 1179 1179 psPolynomialType type) 1180 1180 { … … 1431 1431 1432 1432 1433 psDPolynomial1D* psDPolynomial1DAlloc( int n,1433 psDPolynomial1D* psDPolynomial1DAlloc(unsigned int n, 1434 1434 psPolynomialType type) 1435 1435 { … … 1456 1456 } 1457 1457 1458 psDPolynomial2D* psDPolynomial2DAlloc( int nX,int nY,1458 psDPolynomial2D* psDPolynomial2DAlloc(unsigned int nX, unsigned int nY, 1459 1459 psPolynomialType type) 1460 1460 { … … 1492 1492 } 1493 1493 1494 psDPolynomial3D* psDPolynomial3DAlloc( int nX, int nY,int nZ,1494 psDPolynomial3D* psDPolynomial3DAlloc(unsigned int nX, unsigned int nY, unsigned int nZ, 1495 1495 psPolynomialType type) 1496 1496 { … … 1538 1538 } 1539 1539 1540 psDPolynomial4D* psDPolynomial4DAlloc( int nX, int nY, int nZ,int nT,1540 psDPolynomial4D* psDPolynomial4DAlloc(unsigned int nX, unsigned int nY, unsigned int nZ, unsigned int nT, 1541 1541 psPolynomialType type) 1542 1542 { -
trunk/psLib/src/math/psPolynomial.h
r4422 r4426 12 12 * @author GLG, MHPCC 13 13 * 14 * @version $Revision: 1.5 0$ $Name: not supported by cvs2svn $15 * @date $Date: 2005-06-29 0 0:43:46$14 * @version $Revision: 1.51 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2005-06-29 03:23:19 $ 16 16 * 17 17 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 126 126 */ 127 127 psPolynomial1D* psPolynomial1DAlloc( 128 int n, ///< Number of terms128 unsigned int n, ///< Number of terms 129 129 psPolynomialType type ///< Polynomial Type 130 130 ); … … 135 135 */ 136 136 psPolynomial2D* psPolynomial2DAlloc( 137 int nX, ///< Number of terms in x138 int nY, ///< Number of terms in y137 unsigned int nX, ///< Number of terms in x 138 unsigned int nY, ///< Number of terms in y 139 139 psPolynomialType type ///< Polynomial Type 140 140 ); … … 145 145 */ 146 146 psPolynomial3D* psPolynomial3DAlloc( 147 int nX, ///< Number of terms in x148 int nY, ///< Number of terms in y149 int nZ, ///< Number of terms in z147 unsigned int nX, ///< Number of terms in x 148 unsigned int nY, ///< Number of terms in y 149 unsigned int nZ, ///< Number of terms in z 150 150 psPolynomialType type ///< Polynomial Type 151 151 ); … … 156 156 */ 157 157 psPolynomial4D* psPolynomial4DAlloc( 158 int nX, ///< Number of terms in x159 int nY, ///< Number of terms in y160 int nZ, ///< Number of terms in z161 int nT, ///< Number of terms in t158 unsigned int nX, ///< Number of terms in x 159 unsigned int nY, ///< Number of terms in y 160 unsigned int nZ, ///< Number of terms in z 161 unsigned int nT, ///< Number of terms in t 162 162 psPolynomialType type ///< Polynomial Type 163 163 ); … … 306 306 */ 307 307 psDPolynomial1D* psDPolynomial1DAlloc( 308 int n, ///< Number of terms308 unsigned int n, ///< Number of terms 309 309 psPolynomialType type ///< Polynomial Type 310 310 ); … … 315 315 */ 316 316 psDPolynomial2D* psDPolynomial2DAlloc( 317 int nX, ///< Number of terms in x318 int nY, ///< Number of terms in y317 unsigned int nX, ///< Number of terms in x 318 unsigned int nY, ///< Number of terms in y 319 319 psPolynomialType type ///< Polynomial Type 320 320 ); … … 325 325 */ 326 326 psDPolynomial3D* psDPolynomial3DAlloc( 327 int nX, ///< Number of terms in x328 int nY, ///< Number of terms in y329 int nZ, ///< Number of terms in z327 unsigned int nX, ///< Number of terms in x 328 unsigned int nY, ///< Number of terms in y 329 unsigned int nZ, ///< Number of terms in z 330 330 psPolynomialType type ///< Polynomial Type 331 331 ); … … 336 336 */ 337 337 psDPolynomial4D* psDPolynomial4DAlloc( 338 int nX, ///< Number of terms in w339 int nY, ///< Number of terms in x340 int nZ, ///< Number of terms in y341 int nT, ///< Number of terms in z338 unsigned int nX, ///< Number of terms in w 339 unsigned int nY, ///< Number of terms in x 340 unsigned int nZ, ///< Number of terms in y 341 unsigned int nT, ///< Number of terms in z 342 342 psPolynomialType type ///< Polynomial Type 343 343 ); -
trunk/psLib/src/math/psSpline.c
r4422 r4426 7 7 * polynomials. It also contains a Gaussian functions. 8 8 * 9 * @version $Revision: 1.11 3$ $Name: not supported by cvs2svn $10 * @date $Date: 2005-06-29 0 0:43:46$9 * @version $Revision: 1.114 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-06-29 03:23:19 $ 11 11 * 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 1069 1069 This routine must allocate memory for the polynomial structures. 1070 1070 *****************************************************************************/ 1071 psPolynomial1D* psPolynomial1DAlloc( int n,1071 psPolynomial1D* psPolynomial1DAlloc(unsigned int n, 1072 1072 psPolynomialType type) 1073 1073 { … … 1094 1094 } 1095 1095 1096 psPolynomial2D* psPolynomial2DAlloc( int nX,int nY,1096 psPolynomial2D* psPolynomial2DAlloc(unsigned int nX, unsigned int nY, 1097 1097 psPolynomialType type) 1098 1098 { … … 1130 1130 } 1131 1131 1132 psPolynomial3D* psPolynomial3DAlloc( int nX, int nY,int nZ,1132 psPolynomial3D* psPolynomial3DAlloc(unsigned int nX, unsigned int nY, unsigned int nZ, 1133 1133 psPolynomialType type) 1134 1134 { … … 1176 1176 } 1177 1177 1178 psPolynomial4D* psPolynomial4DAlloc( int nX, int nY, int nZ,int nT,1178 psPolynomial4D* psPolynomial4DAlloc(unsigned int nX, unsigned int nY, unsigned int nZ, unsigned int nT, 1179 1179 psPolynomialType type) 1180 1180 { … … 1431 1431 1432 1432 1433 psDPolynomial1D* psDPolynomial1DAlloc( int n,1433 psDPolynomial1D* psDPolynomial1DAlloc(unsigned int n, 1434 1434 psPolynomialType type) 1435 1435 { … … 1456 1456 } 1457 1457 1458 psDPolynomial2D* psDPolynomial2DAlloc( int nX,int nY,1458 psDPolynomial2D* psDPolynomial2DAlloc(unsigned int nX, unsigned int nY, 1459 1459 psPolynomialType type) 1460 1460 { … … 1492 1492 } 1493 1493 1494 psDPolynomial3D* psDPolynomial3DAlloc( int nX, int nY,int nZ,1494 psDPolynomial3D* psDPolynomial3DAlloc(unsigned int nX, unsigned int nY, unsigned int nZ, 1495 1495 psPolynomialType type) 1496 1496 { … … 1538 1538 } 1539 1539 1540 psDPolynomial4D* psDPolynomial4DAlloc( int nX, int nY, int nZ,int nT,1540 psDPolynomial4D* psDPolynomial4DAlloc(unsigned int nX, unsigned int nY, unsigned int nZ, unsigned int nT, 1541 1541 psPolynomialType type) 1542 1542 { -
trunk/psLib/src/math/psSpline.h
r4422 r4426 12 12 * @author GLG, MHPCC 13 13 * 14 * @version $Revision: 1.5 0$ $Name: not supported by cvs2svn $15 * @date $Date: 2005-06-29 0 0:43:46$14 * @version $Revision: 1.51 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2005-06-29 03:23:19 $ 16 16 * 17 17 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 126 126 */ 127 127 psPolynomial1D* psPolynomial1DAlloc( 128 int n, ///< Number of terms128 unsigned int n, ///< Number of terms 129 129 psPolynomialType type ///< Polynomial Type 130 130 ); … … 135 135 */ 136 136 psPolynomial2D* psPolynomial2DAlloc( 137 int nX, ///< Number of terms in x138 int nY, ///< Number of terms in y137 unsigned int nX, ///< Number of terms in x 138 unsigned int nY, ///< Number of terms in y 139 139 psPolynomialType type ///< Polynomial Type 140 140 ); … … 145 145 */ 146 146 psPolynomial3D* psPolynomial3DAlloc( 147 int nX, ///< Number of terms in x148 int nY, ///< Number of terms in y149 int nZ, ///< Number of terms in z147 unsigned int nX, ///< Number of terms in x 148 unsigned int nY, ///< Number of terms in y 149 unsigned int nZ, ///< Number of terms in z 150 150 psPolynomialType type ///< Polynomial Type 151 151 ); … … 156 156 */ 157 157 psPolynomial4D* psPolynomial4DAlloc( 158 int nX, ///< Number of terms in x159 int nY, ///< Number of terms in y160 int nZ, ///< Number of terms in z161 int nT, ///< Number of terms in t158 unsigned int nX, ///< Number of terms in x 159 unsigned int nY, ///< Number of terms in y 160 unsigned int nZ, ///< Number of terms in z 161 unsigned int nT, ///< Number of terms in t 162 162 psPolynomialType type ///< Polynomial Type 163 163 ); … … 306 306 */ 307 307 psDPolynomial1D* psDPolynomial1DAlloc( 308 int n, ///< Number of terms308 unsigned int n, ///< Number of terms 309 309 psPolynomialType type ///< Polynomial Type 310 310 ); … … 315 315 */ 316 316 psDPolynomial2D* psDPolynomial2DAlloc( 317 int nX, ///< Number of terms in x318 int nY, ///< Number of terms in y317 unsigned int nX, ///< Number of terms in x 318 unsigned int nY, ///< Number of terms in y 319 319 psPolynomialType type ///< Polynomial Type 320 320 ); … … 325 325 */ 326 326 psDPolynomial3D* psDPolynomial3DAlloc( 327 int nX, ///< Number of terms in x328 int nY, ///< Number of terms in y329 int nZ, ///< Number of terms in z327 unsigned int nX, ///< Number of terms in x 328 unsigned int nY, ///< Number of terms in y 329 unsigned int nZ, ///< Number of terms in z 330 330 psPolynomialType type ///< Polynomial Type 331 331 ); … … 336 336 */ 337 337 psDPolynomial4D* psDPolynomial4DAlloc( 338 int nX, ///< Number of terms in w339 int nY, ///< Number of terms in x340 int nZ, ///< Number of terms in y341 int nT, ///< Number of terms in z338 unsigned int nX, ///< Number of terms in w 339 unsigned int nY, ///< Number of terms in x 340 unsigned int nZ, ///< Number of terms in y 341 unsigned int nT, ///< Number of terms in z 342 342 psPolynomialType type ///< Polynomial Type 343 343 ); -
trunk/psLib/test/dataManip/tst_psFunc00.c
r4422 r4426 14 14 * orders are created. 15 15 * 16 * @version $Revision: 1.2 2$ $Name: not supported by cvs2svn $17 * @date $Date: 2005-06-29 0 0:43:46$16 * @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ 17 * @date $Date: 2005-06-29 03:23:19 $ 18 18 * 19 19 * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii … … 99 99 psFree(my1DPoly); 100 100 101 / / Attempt to allocate with negative order102 psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms");103 if(psPolynomial1DAlloc(-1,PS_POLYNOMIAL_ORD) != NULL) {104 psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL");105 return 7;106 }107 101 /* // Attempt to allocate with negative order 102 psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); 103 if(psPolynomial1DAlloc(-1,PS_POLYNOMIAL_ORD) != NULL) { 104 psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); 105 return 7; 106 } 107 */ 108 108 return 0; 109 109 } … … 151 151 psFree(my1DDPoly); 152 152 153 / / Attempt to allocate with negative order154 psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms");155 if(psDPolynomial1DAlloc(-1,PS_POLYNOMIAL_ORD) != NULL) {156 psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL");157 return 7;158 }159 153 /* // Attempt to allocate with negative order 154 psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); 155 if(psDPolynomial1DAlloc(-1,PS_POLYNOMIAL_ORD) != NULL) { 156 psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); 157 return 7; 158 } 159 */ 160 160 return 0; 161 161 } … … 211 211 psFree(my2DPoly); 212 212 213 / / Attempt to allocate with negative order214 psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms");215 if(psPolynomial2DAlloc(-1,1,PS_POLYNOMIAL_ORD) != NULL) {216 psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL");217 return 8;218 }219 // Attempt to allocate with negative order220 psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms");221 if(psPolynomial2DAlloc(1,-1,PS_POLYNOMIAL_ORD) != NULL) {222 psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL");223 return 9;224 }225 213 /* // Attempt to allocate with negative order 214 psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); 215 if(psPolynomial2DAlloc(-1,1,PS_POLYNOMIAL_ORD) != NULL) { 216 psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); 217 return 8; 218 } 219 // Attempt to allocate with negative order 220 psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); 221 if(psPolynomial2DAlloc(1,-1,PS_POLYNOMIAL_ORD) != NULL) { 222 psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); 223 return 9; 224 } 225 */ 226 226 return 0; 227 227 } … … 276 276 } 277 277 psFree(my2DDPoly); 278 279 // Attempt to allocate with negative order280 psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms");281 if(psDPolynomial2DAlloc(-1,1,PS_POLYNOMIAL_ORD) != NULL) {282 psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL");283 return 8;284 }285 // Attempt to allocate with negative order286 psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms");287 if(psDPolynomial2DAlloc(1,-1,PS_POLYNOMIAL_ORD) != NULL) {288 psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL");289 return 9;290 }291 278 /* 279 // Attempt to allocate with negative order 280 psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); 281 if(psDPolynomial2DAlloc(-1,1,PS_POLYNOMIAL_ORD) != NULL) { 282 psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); 283 return 8; 284 } 285 // Attempt to allocate with negative order 286 psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); 287 if(psDPolynomial2DAlloc(1,-1,PS_POLYNOMIAL_ORD) != NULL) { 288 psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); 289 return 9; 290 } 291 */ 292 292 return 0; 293 293 } … … 351 351 psFree(my3DPoly); 352 352 353 / / Attempt to allocate with negative order354 psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms");355 if(psPolynomial3DAlloc(-1,1,1,PS_POLYNOMIAL_ORD) != NULL) {356 psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL");357 return 9;358 }359 // Attempt to allocate with negative order360 psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms");361 if(psPolynomial3DAlloc(1,-1,1,PS_POLYNOMIAL_ORD) != NULL) {362 psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL");363 return 10;364 }365 // Attempt to allocate with negative order366 psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms");367 if(psPolynomial3DAlloc(1,1,-1,PS_POLYNOMIAL_ORD) != NULL) {368 psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL");369 return 11;370 }371 353 /* // Attempt to allocate with negative order 354 psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); 355 if(psPolynomial3DAlloc(-1,1,1,PS_POLYNOMIAL_ORD) != NULL) { 356 psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); 357 return 9; 358 } 359 // Attempt to allocate with negative order 360 psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); 361 if(psPolynomial3DAlloc(1,-1,1,PS_POLYNOMIAL_ORD) != NULL) { 362 psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); 363 return 10; 364 } 365 // Attempt to allocate with negative order 366 psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); 367 if(psPolynomial3DAlloc(1,1,-1,PS_POLYNOMIAL_ORD) != NULL) { 368 psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); 369 return 11; 370 } 371 */ 372 372 return 0; 373 373 } … … 431 431 psFree(my3DDPoly); 432 432 433 / / Attempt to allocate with negative order434 psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms");435 if(psDPolynomial3DAlloc(-1,1,1,PS_POLYNOMIAL_ORD) != NULL) {436 psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL");437 return 9;438 }439 // Attempt to allocate with negative order440 psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms");441 if(psDPolynomial3DAlloc(1,-1,1,PS_POLYNOMIAL_ORD) != NULL) {442 psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL");443 return 10;444 }445 // Attempt to allocate with negative order446 psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms");447 if(psDPolynomial3DAlloc(1,1,-1,PS_POLYNOMIAL_ORD) != NULL) {448 psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL");449 return 11;450 }451 433 /* // Attempt to allocate with negative order 434 psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); 435 if(psDPolynomial3DAlloc(-1,1,1,PS_POLYNOMIAL_ORD) != NULL) { 436 psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); 437 return 9; 438 } 439 // Attempt to allocate with negative order 440 psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); 441 if(psDPolynomial3DAlloc(1,-1,1,PS_POLYNOMIAL_ORD) != NULL) { 442 psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); 443 return 10; 444 } 445 // Attempt to allocate with negative order 446 psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); 447 if(psDPolynomial3DAlloc(1,1,-1,PS_POLYNOMIAL_ORD) != NULL) { 448 psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); 449 return 11; 450 } 451 */ 452 452 return 0; 453 453 } … … 519 519 psFree(my4DPoly); 520 520 521 / / Attempt to allocate with negative order522 psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms");523 if(psPolynomial4DAlloc(-1,1,1,1,PS_POLYNOMIAL_ORD) != NULL) {524 psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL");525 return 10;526 }527 // Attempt to allocate with negative order528 psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms");529 if(psPolynomial4DAlloc(1,-1,1,1,PS_POLYNOMIAL_ORD) != NULL) {530 psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL");531 return 11;532 }533 // Attempt to allocate with negative order534 psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms");535 if(psPolynomial4DAlloc(1,1,-1,1,PS_POLYNOMIAL_ORD) != NULL) {536 psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL");537 return 12;538 }539 // Attempt to allocate with negative order540 psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms");541 if(psPolynomial4DAlloc(1,1,1,-1,PS_POLYNOMIAL_ORD) != NULL) {542 psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL");543 return 13;544 }545 521 /* // Attempt to allocate with negative order 522 psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); 523 if(psPolynomial4DAlloc(-1,1,1,1,PS_POLYNOMIAL_ORD) != NULL) { 524 psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); 525 return 10; 526 } 527 // Attempt to allocate with negative order 528 psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); 529 if(psPolynomial4DAlloc(1,-1,1,1,PS_POLYNOMIAL_ORD) != NULL) { 530 psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); 531 return 11; 532 } 533 // Attempt to allocate with negative order 534 psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); 535 if(psPolynomial4DAlloc(1,1,-1,1,PS_POLYNOMIAL_ORD) != NULL) { 536 psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); 537 return 12; 538 } 539 // Attempt to allocate with negative order 540 psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); 541 if(psPolynomial4DAlloc(1,1,1,-1,PS_POLYNOMIAL_ORD) != NULL) { 542 psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); 543 return 13; 544 } 545 */ 546 546 return 0; 547 547 } … … 613 613 psFree(my4DDPoly); 614 614 615 / / Attempt to allocate with negative order616 psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms");617 if(psDPolynomial4DAlloc(-1,1,1,1,PS_POLYNOMIAL_ORD) != NULL) {618 psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL");619 return 10;620 }621 // Attempt to allocate with negative order622 psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms");623 if(psDPolynomial4DAlloc(1,-1,1,1,PS_POLYNOMIAL_ORD) != NULL) {624 psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL");625 return 11;626 }627 // Attempt to allocate with negative order628 psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms");629 if(psDPolynomial4DAlloc(1,1,-1,1,PS_POLYNOMIAL_ORD) != NULL) {630 psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL");631 return 12;632 }633 // Attempt to allocate with negative order634 psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms");635 if(psDPolynomial4DAlloc(1,1,1,-1,PS_POLYNOMIAL_ORD) != NULL) {636 psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL");637 return 13;638 }639 640 return 0; 641 } 642 615 /* // Attempt to allocate with negative order 616 psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); 617 if(psDPolynomial4DAlloc(-1,1,1,1,PS_POLYNOMIAL_ORD) != NULL) { 618 psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); 619 return 10; 620 } 621 // Attempt to allocate with negative order 622 psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); 623 if(psDPolynomial4DAlloc(1,-1,1,1,PS_POLYNOMIAL_ORD) != NULL) { 624 psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); 625 return 11; 626 } 627 // Attempt to allocate with negative order 628 psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); 629 if(psDPolynomial4DAlloc(1,1,-1,1,PS_POLYNOMIAL_ORD) != NULL) { 630 psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); 631 return 12; 632 } 633 // Attempt to allocate with negative order 634 psLogMsg(__func__,PS_LOG_INFO,"Following should generate error msg for negative terms"); 635 if(psDPolynomial4DAlloc(1,1,1,-1,PS_POLYNOMIAL_ORD) != NULL) { 636 psError(PS_ERR_UNKNOWN,true,"Returned structure but expected NULL"); 637 return 13; 638 } 639 */ 640 return 0; 641 } 642 -
trunk/psLib/test/dataManip/verified/tst_psFunc00.stderr
r4422 r4426 5 5 \**********************************************************************************/ 6 6 7 <DATE><TIME>|<HOST>|I|testPolynomial1DAlloc8 Following should generate error msg for negative terms9 <DATE><TIME>|<HOST>|E|psPolynomial1DAlloc (FILE:LINENO)10 Error: n is 0 or less.11 7 12 8 ---> TESTPOINT PASSED (psPolynomialXD{psPolynomial1DAlloc} | tst_psFunc00.c) … … 18 14 \**********************************************************************************/ 19 15 20 <DATE><TIME>|<HOST>|I|testPolynomial2DAlloc21 Following should generate error msg for negative terms22 <DATE><TIME>|<HOST>|E|psPolynomial2DAlloc (FILE:LINENO)23 Error: nX is 0 or less.24 <DATE><TIME>|<HOST>|I|testPolynomial2DAlloc25 Following should generate error msg for negative terms26 <DATE><TIME>|<HOST>|E|psPolynomial2DAlloc (FILE:LINENO)27 Error: nY is 0 or less.28 16 29 17 ---> TESTPOINT PASSED (psPolynomialXD{psPolynomial2DAlloc} | tst_psFunc00.c) … … 35 23 \**********************************************************************************/ 36 24 37 <DATE><TIME>|<HOST>|I|testPolynomial3DAlloc38 Following should generate error msg for negative terms39 <DATE><TIME>|<HOST>|E|psPolynomial3DAlloc (FILE:LINENO)40 Error: nX is 0 or less.41 <DATE><TIME>|<HOST>|I|testPolynomial3DAlloc42 Following should generate error msg for negative terms43 <DATE><TIME>|<HOST>|E|psPolynomial3DAlloc (FILE:LINENO)44 Error: nY is 0 or less.45 <DATE><TIME>|<HOST>|I|testPolynomial3DAlloc46 Following should generate error msg for negative terms47 <DATE><TIME>|<HOST>|E|psPolynomial3DAlloc (FILE:LINENO)48 Error: nZ is 0 or less.49 25 50 26 ---> TESTPOINT PASSED (psPolynomialXD{psPolynomial3DAlloc} | tst_psFunc00.c) … … 56 32 \**********************************************************************************/ 57 33 58 <DATE><TIME>|<HOST>|I|testPolynomial4DAlloc59 Following should generate error msg for negative terms60 <DATE><TIME>|<HOST>|E|psPolynomial4DAlloc (FILE:LINENO)61 Error: nX is 0 or less.62 <DATE><TIME>|<HOST>|I|testPolynomial4DAlloc63 Following should generate error msg for negative terms64 <DATE><TIME>|<HOST>|E|psPolynomial4DAlloc (FILE:LINENO)65 Error: nY is 0 or less.66 <DATE><TIME>|<HOST>|I|testPolynomial4DAlloc67 Following should generate error msg for negative terms68 <DATE><TIME>|<HOST>|E|psPolynomial4DAlloc (FILE:LINENO)69 Error: nZ is 0 or less.70 <DATE><TIME>|<HOST>|I|testPolynomial4DAlloc71 Following should generate error msg for negative terms72 <DATE><TIME>|<HOST>|E|psPolynomial4DAlloc (FILE:LINENO)73 Error: nT is 0 or less.74 34 75 35 ---> TESTPOINT PASSED (psPolynomialXD{psPolynomial4DAlloc} | tst_psFunc00.c) … … 81 41 \**********************************************************************************/ 82 42 83 <DATE><TIME>|<HOST>|I|testDPolynomial1DAlloc84 Following should generate error msg for negative terms85 <DATE><TIME>|<HOST>|E|psDPolynomial1DAlloc (FILE:LINENO)86 Error: n is 0 or less.87 43 88 44 ---> TESTPOINT PASSED (psPolynomialXD{psDPolynomial1DAlloc} | tst_psFunc00.c) … … 94 50 \**********************************************************************************/ 95 51 96 <DATE><TIME>|<HOST>|I|testDPolynomial2DAlloc97 Following should generate error msg for negative terms98 <DATE><TIME>|<HOST>|E|psDPolynomial2DAlloc (FILE:LINENO)99 Error: nX is 0 or less.100 <DATE><TIME>|<HOST>|I|testDPolynomial2DAlloc101 Following should generate error msg for negative terms102 <DATE><TIME>|<HOST>|E|psDPolynomial2DAlloc (FILE:LINENO)103 Error: nY is 0 or less.104 52 105 53 ---> TESTPOINT PASSED (psPolynomialXD{psDPolynomial2DAlloc} | tst_psFunc00.c) … … 111 59 \**********************************************************************************/ 112 60 113 <DATE><TIME>|<HOST>|I|testDPolynomial3DAlloc114 Following should generate error msg for negative terms115 <DATE><TIME>|<HOST>|E|psDPolynomial3DAlloc (FILE:LINENO)116 Error: nX is 0 or less.117 <DATE><TIME>|<HOST>|I|testDPolynomial3DAlloc118 Following should generate error msg for negative terms119 <DATE><TIME>|<HOST>|E|psDPolynomial3DAlloc (FILE:LINENO)120 Error: nY is 0 or less.121 <DATE><TIME>|<HOST>|I|testDPolynomial3DAlloc122 Following should generate error msg for negative terms123 <DATE><TIME>|<HOST>|E|psDPolynomial3DAlloc (FILE:LINENO)124 Error: nZ is 0 or less.125 61 126 62 ---> TESTPOINT PASSED (psPolynomialXD{psDPolynomial3DAlloc} | tst_psFunc00.c) … … 132 68 \**********************************************************************************/ 133 69 134 <DATE><TIME>|<HOST>|I|testDPolynomial4DAlloc135 Following should generate error msg for negative terms136 <DATE><TIME>|<HOST>|E|psDPolynomial4DAlloc (FILE:LINENO)137 Error: nX is 0 or less.138 <DATE><TIME>|<HOST>|I|testDPolynomial4DAlloc139 Following should generate error msg for negative terms140 <DATE><TIME>|<HOST>|E|psDPolynomial4DAlloc (FILE:LINENO)141 Error: nY is 0 or less.142 <DATE><TIME>|<HOST>|I|testDPolynomial4DAlloc143 Following should generate error msg for negative terms144 <DATE><TIME>|<HOST>|E|psDPolynomial4DAlloc (FILE:LINENO)145 Error: nZ is 0 or less.146 <DATE><TIME>|<HOST>|I|testDPolynomial4DAlloc147 Following should generate error msg for negative terms148 <DATE><TIME>|<HOST>|E|psDPolynomial4DAlloc (FILE:LINENO)149 Error: nT is 0 or less.150 70 151 71 ---> TESTPOINT PASSED (psPolynomialXD{psDPolynomial4DAlloc} | tst_psFunc00.c)
Note:
See TracChangeset
for help on using the changeset viewer.
