Changeset 4999
- Timestamp:
- Sep 12, 2005, 10:54:17 AM (21 years ago)
- Location:
- trunk
- Files:
-
- 12 edited
-
psLib/test/math/verified/tst_psMinimize04.stderr (modified) (1 diff)
-
psLib/test/math/verified/tst_psMinimize04.stdout (modified) (1 diff)
-
psLib/test/math/verified/tst_psMinimize04_F32.stderr (modified) (1 diff)
-
psLib/test/math/verified/tst_psMinimize04_F32.stdout (modified) (4 diffs)
-
psLib/test/math/verified/tst_psMinimize04b_F32.stderr (modified) (1 diff)
-
psLib/test/math/verified/tst_psMinimize04b_F32.stdout (modified) (5 diffs)
-
psModules/src/pmMaskBadPixels.c (modified) (2 diffs)
-
psModules/test/Makefile.am (modified) (2 diffs)
-
psModules/test/tst_pmImageSubtract.c (modified) (3 diffs)
-
psModules/test/verified/tst_pmFlatField.stderr (modified) (1 diff)
-
psModules/test/verified/tst_pmFlatField.stdout (modified) (2 diffs)
-
psModules/test/verified/tst_pmMaskBadPixels.stderr (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/psLib/test/math/verified/tst_psMinimize04.stderr
r4862 r4999 1 <HOST>|I|t03 2 Following should generate an error for null input polynomial. 3 <HOST>|E|psVectorFitPolynomial1D (FILE:LINENO) 1 <HOST>|E|psVectorFitPolynomial2D (FILE:LINENO) 4 2 Unallowable operation: polynomial poly or its coeffs is NULL. -
trunk/psLib/test/math/verified/tst_psMinimize04.stdout
r4547 r4999 1 1 /***************************** TESTPOINT ******************************************\ 2 2 * TestFile: tst_psMinimize04.c * 3 * TestPoint: psMinimize functions{psVectorFitPolynomial 1D(): equal difference in variable yE *3 * TestPoint: psMinimize functions{psVectorFitPolynomial2D(): equal difference in variable fE * 4 4 * TestType: Positive * 5 5 \**********************************************************************************/ 6 6 7 TEST: calling psVectorFitPolynomial2D() with f, fErr, y, x as F32 vectors. 8 Running test with fErr set to NULL. 9 Running test with x, y set to NULL. Should generate error. 7 10 8 ---> TESTPOINT PASSED (psMinimize functions{psVectorFitPolynomial 1D(): equal differences in variable yErr} | tst_psMinimize04.c)11 ---> TESTPOINT PASSED (psMinimize functions{psVectorFitPolynomial2D(): equal differences in variable fErr} | tst_psMinimize04.c) 9 12 10 /***************************** TESTPOINT ******************************************\11 * TestFile: tst_psMinimize04.c *12 * TestPoint: psMinimize functions{psVectorFitPolynomial1D(): yErr is NULL} *13 * TestType: Positive *14 \**********************************************************************************/15 16 17 ---> TESTPOINT PASSED (psMinimize functions{psVectorFitPolynomial1D(): yErr is NULL} | tst_psMinimize04.c)18 19 /***************************** TESTPOINT ******************************************\20 * TestFile: tst_psMinimize04.c *21 * TestPoint: psMinimize functions{psVectorFitPolynomial1D(): x, yErr is NULL} *22 * TestType: Positive *23 \**********************************************************************************/24 25 26 ---> TESTPOINT PASSED (psMinimize functions{psVectorFitPolynomial1D(): x, yErr is NULL} | tst_psMinimize04.c)27 28 /***************************** TESTPOINT ******************************************\29 * TestFile: tst_psMinimize04.c *30 * TestPoint: psMinimize functions{psVectorFitPolynomial1D(): all inputs are NULL} *31 * TestType: Positive *32 \**********************************************************************************/33 34 35 ---> TESTPOINT PASSED (psMinimize functions{psVectorFitPolynomial1D(): all inputs are NULL} | tst_psMinimize04.c)36 -
trunk/psLib/test/math/verified/tst_psMinimize04_F32.stderr
r4862 r4999 1 1 <HOST>|I|t03 2 Following should generate an error for null input polynomial.2 Following should generate error for null arguments. 3 3 <HOST>|E|psVectorFitPolynomial1D (FILE:LINENO) 4 4 Unallowable operation: polynomial poly or its coeffs is NULL. -
trunk/psLib/test/math/verified/tst_psMinimize04_F32.stdout
r4547 r4999 1 1 /***************************** TESTPOINT ******************************************\ 2 * TestFile: tst_psMinimize04 .c*3 * TestPoint: psMinimize functions{psVectorFitPolynomial1D(): equal difference in variable yE*2 * TestFile: tst_psMinimize04_F32.c * 3 * TestPoint: psMinimize functions{psVectorFitPolynomial1D(): equal errors in yErr} * 4 4 * TestType: Positive * 5 5 \**********************************************************************************/ 6 6 7 7 8 ---> TESTPOINT PASSED (psMinimize functions{psVectorFitPolynomial1D(): equal differences in variable yErr} | tst_psMinimize04.c)8 ---> TESTPOINT PASSED (psMinimize functions{psVectorFitPolynomial1D(): equal errors in yErr} | tst_psMinimize04_F32.c) 9 9 10 10 /***************************** TESTPOINT ******************************************\ 11 * TestFile: tst_psMinimize04 .c*11 * TestFile: tst_psMinimize04_F32.c * 12 12 * TestPoint: psMinimize functions{psVectorFitPolynomial1D(): yErr is NULL} * 13 13 * TestType: Positive * … … 15 15 16 16 17 ---> TESTPOINT PASSED (psMinimize functions{psVectorFitPolynomial1D(): yErr is NULL} | tst_psMinimize04 .c)17 ---> TESTPOINT PASSED (psMinimize functions{psVectorFitPolynomial1D(): yErr is NULL} | tst_psMinimize04_F32.c) 18 18 19 19 /***************************** TESTPOINT ******************************************\ 20 * TestFile: tst_psMinimize04 .c*20 * TestFile: tst_psMinimize04_F32.c * 21 21 * TestPoint: psMinimize functions{psVectorFitPolynomial1D(): x, yErr is NULL} * 22 22 * TestType: Positive * … … 24 24 25 25 26 ---> TESTPOINT PASSED (psMinimize functions{psVectorFitPolynomial1D(): x, yErr is NULL} | tst_psMinimize04 .c)26 ---> TESTPOINT PASSED (psMinimize functions{psVectorFitPolynomial1D(): x, yErr is NULL} | tst_psMinimize04_F32.c) 27 27 28 28 /***************************** TESTPOINT ******************************************\ 29 * TestFile: tst_psMinimize04 .c*29 * TestFile: tst_psMinimize04_F32.c * 30 30 * TestPoint: psMinimize functions{psVectorFitPolynomial1D(): all inputs are NULL} * 31 31 * TestType: Positive * … … 33 33 34 34 35 ---> TESTPOINT PASSED (psMinimize functions{psVectorFitPolynomial1D(): all inputs are NULL} | tst_psMinimize04 .c)35 ---> TESTPOINT PASSED (psMinimize functions{psVectorFitPolynomial1D(): all inputs are NULL} | tst_psMinimize04_F32.c) 36 36 -
trunk/psLib/test/math/verified/tst_psMinimize04b_F32.stderr
r4862 r4999 1 1 <HOST>|I|t03 2 Following should generate anerror for null arguments.2 Following should generate error for null arguments. 3 3 <HOST>|E|psVectorFitPolynomial1D (FILE:LINENO) 4 4 Unallowable operation: polynomial poly or its coeffs is NULL. -
trunk/psLib/test/math/verified/tst_psMinimize04b_F32.stdout
r4547 r4999 1 1 /***************************** TESTPOINT ******************************************\ 2 * TestFile: tst_psMinimize04b .c*2 * TestFile: tst_psMinimize04b_F32.c * 3 3 * TestPoint: psMinimize functions{psVectorFitPolynomial1D(): CHEB, equal errors in yErr} * 4 4 * TestType: Positive * … … 6 6 7 7 8 ---> TESTPOINT PASSED (psMinimize functions{psVectorFitPolynomial1D(): CHEB, equal errors in yErr} | tst_psMinimize04b .c)8 ---> TESTPOINT PASSED (psMinimize functions{psVectorFitPolynomial1D(): CHEB, equal errors in yErr} | tst_psMinimize04b_F32.c) 9 9 10 10 /***************************** TESTPOINT ******************************************\ 11 * TestFile: tst_psMinimize04b .c*11 * TestFile: tst_psMinimize04b_F32.c * 12 12 * TestPoint: psMinimize functions{psVectorFitPolynomial1D(): CHEB, yErr is NULL} * 13 13 * TestType: Positive * … … 15 15 16 16 17 ---> TESTPOINT PASSED (psMinimize functions{psVectorFitPolynomial1D(): CHEB, yErr is NULL} | tst_psMinimize04b .c)17 ---> TESTPOINT PASSED (psMinimize functions{psVectorFitPolynomial1D(): CHEB, yErr is NULL} | tst_psMinimize04b_F32.c) 18 18 19 19 /***************************** TESTPOINT ******************************************\ 20 * TestFile: tst_psMinimize04b .c*20 * TestFile: tst_psMinimize04b_F32.c * 21 21 * TestPoint: psMinimize functions{psVectorFitPolynomial1D(): CHEB, x, yErr is NULL} * 22 22 * TestType: Positive * … … 24 24 25 25 26 ---> TESTPOINT PASSED (psMinimize functions{psVectorFitPolynomial1D(): CHEB, x, yErr is NULL} | tst_psMinimize04b .c)26 ---> TESTPOINT PASSED (psMinimize functions{psVectorFitPolynomial1D(): CHEB, x, yErr is NULL} | tst_psMinimize04b_F32.c) 27 27 28 28 /***************************** TESTPOINT ******************************************\ 29 * TestFile: tst_psMinimize04b .c*29 * TestFile: tst_psMinimize04b_F32.c * 30 30 * TestPoint: psMinimize functions{psVectorFitPolynomial1D(): CHEB, yErr is NULL} * 31 31 * TestType: Positive * … … 33 33 34 34 35 ---> TESTPOINT PASSED (psMinimize functions{psVectorFitPolynomial1D(): CHEB, yErr is NULL} | tst_psMinimize04b .c)35 ---> TESTPOINT PASSED (psMinimize functions{psVectorFitPolynomial1D(): CHEB, yErr is NULL} | tst_psMinimize04b_F32.c) 36 36 -
trunk/psModules/src/pmMaskBadPixels.c
r4770 r4999 19 19 * @author Ross Harman, MHPCC 20 20 * 21 * @version $Revision: 1. 8$ $Name: not supported by cvs2svn $22 * @date $Date: 2005-0 8-16 01:10:34$21 * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ 22 * @date $Date: 2005-09-12 20:51:10 $ 23 23 * 24 24 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 36 36 #include "pmMaskBadPixelsErrors.h" 37 37 38 bool pmMaskBadPixels(pmReadout *in, const psImage *mask, unsigned int maskVal, float sat, 39 unsigned int growVal, int grow) 38 bool pmMaskBadPixels( 39 pmReadout *in, 40 const psImage *mask, 41 unsigned int maskVal, 42 float sat, 43 unsigned int growVal, 44 int grow) 40 45 { 41 46 int i = 0; -
trunk/psModules/test/Makefile.am
r4992 r4999 13 13 tst_pmImageCombine \ 14 14 tst_pmObjects01 \ 15 tst_psAstrometry \ 16 tst_psAstrometry01 15 tst_psAstrometry 17 16 18 17 check_PROGRAMS = $(TESTS) … … 36 35 tst_pmObjects01_SOURCES = tst_pmObjects01.c 37 36 tst_psAstrometry_SOURCES = tst_psAstrometry.c 38 tst_psAstrometry01_SOURCES = tst_psAstrometry01.c39 37 40 38 test: check -
trunk/psModules/test/tst_pmImageSubtract.c
r4579 r4999 10 10 * data. More work need to be done to verify the results. 11 11 * 12 * @version $Revision: 1. 5$ $Name: not supported by cvs2svn $13 * @date $Date: 2005-0 7-19 01:44:48$12 * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2005-09-12 20:51:10 $ 14 14 * 15 15 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 115 115 } 116 116 117 if (kernels-> p_size != size) {118 printf("TEST ERROR: pmSubtractionKernelsAllocPOIS() generated an incorrect -> p_size member (%d).\n", kernels->p_size);119 testStatus = true; 120 } 121 122 if (kernels-> p_spatialOrder != SpatialOrder) {123 printf("TEST ERROR: pmSubtractionKernelsAllocPOIS() generated an incorrect -> p_spatialOrder member (%d).\n", kernels->p_spatialOrder);117 if (kernels->size != size) { 118 printf("TEST ERROR: pmSubtractionKernelsAllocPOIS() generated an incorrect ->size member (%d).\n", kernels->size); 119 testStatus = true; 120 } 121 122 if (kernels->spatialOrder != SpatialOrder) { 123 printf("TEST ERROR: pmSubtractionKernelsAllocPOIS() generated an incorrect ->spatialOrder member (%d).\n", kernels->spatialOrder); 124 124 testStatus = true; 125 125 } … … 275 275 } 276 276 277 if (kernels-> p_size != size) {278 printf("TEST ERROR: pmSubtractionKernelsAllocISIS() generated an incorrect -> p_size member (%d).\n", kernels->p_size);279 testStatus = true; 280 } 281 282 if (kernels-> p_spatialOrder != SpatialOrder) {283 printf("TEST ERROR: pmSubtractionKernelsAllocISIS() generated an incorrect -> p_spatialOrder member (%d).\n", kernels->p_spatialOrder);277 if (kernels->size != size) { 278 printf("TEST ERROR: pmSubtractionKernelsAllocISIS() generated an incorrect ->size member (%d).\n", kernels->size); 279 testStatus = true; 280 } 281 282 if (kernels->spatialOrder != SpatialOrder) { 283 printf("TEST ERROR: pmSubtractionKernelsAllocISIS() generated an incorrect ->spatialOrder member (%d).\n", kernels->spatialOrder); 284 284 testStatus = true; 285 285 } -
trunk/psModules/test/verified/tst_pmFlatField.stderr
r3623 r4999 5 5 \**********************************************************************************/ 6 6 7 < DATE><TIME>|<HOST>|E|pmFlatField (FILE:LINENO)7 <HOST>|E|pmFlatField (FILE:LINENO) 8 8 Null not allowed for flat readout. 9 < DATE><TIME>|<HOST>|E|pmFlatField (FILE:LINENO)9 <HOST>|E|pmFlatField (FILE:LINENO) 10 10 Null not allowed for input image. 11 < DATE><TIME>|<HOST>|E|pmFlatField (FILE:LINENO)11 <HOST>|E|pmFlatField (FILE:LINENO) 12 12 Null not allowed for flat image. 13 < DATE><TIME>|<HOST>|E|pmFlatField (FILE:LINENO)13 <HOST>|E|pmFlatField (FILE:LINENO) 14 14 Input image size exceeds that of flat image: (3, 3) vs (2, 2) 15 < DATE><TIME>|<HOST>|E|pmFlatField (FILE:LINENO)16 Input image mask size exceeds that of flat image: ( 4, 4) vs (3, 3)17 < DATE><TIME>|<HOST>|E|pmFlatField (FILE:LINENO)18 Total offset >= flat image size: (50, 50) vs (3, 3)19 < DATE><TIME>|<HOST>|E|pmFlatField (FILE:LINENO)20 Complex types not allowed for input image. Type: 206421 < DATE><TIME>|<HOST>|E|pmFlatField (FILE:LINENO)22 Complex types not allowed for flat image. Type: 206423 < DATE><TIME>|<HOST>|E|pmFlatField (FILE:LINENO)24 Input and flat image types differ: (1032 vs 1028)25 < DATE><TIME>|<HOST>|E|pmFlatField (FILE:LINENO)26 Mask must be PS_TYPE_MASK type. Type: 102815 <HOST>|E|pmFlatField (FILE:LINENO) 16 Input image mask size exceeds that of flat image: (5, 5) vs (3, 3) 17 <HOST>|E|pmFlatField (FILE:LINENO) 18 Input image mask size exceeds that of flat image: (5, 5) vs (3, 3) 19 <HOST>|E|pmFlatField (FILE:LINENO) 20 Input image mask size exceeds that of flat image: (5, 5) vs (3, 3) 21 <HOST>|E|pmFlatField (FILE:LINENO) 22 Input image mask size exceeds that of flat image: (5, 5) vs (3, 3) 23 <HOST>|E|pmFlatField (FILE:LINENO) 24 Input image mask size exceeds that of flat image: (5, 5) vs (3, 3) 25 <HOST>|E|pmFlatField (FILE:LINENO) 26 Input image mask size exceeds that of flat image: (5, 5) vs (3, 3) 27 27 28 28 ---> TESTPOINT PASSED (Test Point Driver{pmFlatField} | tst_pmFlatField.c) -
trunk/psModules/test/verified/tst_pmFlatField.stdout
r2298 r4999 10 10 6.000000 6.000000 6.000000 11 11 12 Input mask: 13 0 0 0 14 0 0 0 15 0 0 0 16 12 17 Flat image: 13 18 2.000000 2.000000 2.000000 … … 80 85 81 86 Resulting mask: 82 8 8 883 8 8 884 0 8 887 0 0 0 88 0 0 0 89 0 0 0 85 90 86 91 Resulting image: 87 92 3.000000 3.000000 3.000000 88 93 3.000000 3.000000 3.000000 89 1.000000 3.000000 3.00000094 3.000000 3.000000 3.000000 90 95 91 96 -
trunk/psModules/test/verified/tst_pmMaskBadPixels.stderr
r3623 r4999 41 41 \**********************************************************************************/ 42 42 43 < DATE><TIME>|<HOST>|E|pmMaskBadPixels (FILE:LINENO)43 <HOST>|E|pmMaskBadPixels (FILE:LINENO) 44 44 Null not allowed for mask image. 45 45 … … 52 52 \**********************************************************************************/ 53 53 54 < DATE><TIME>|<HOST>|E|pmMaskBadPixels (FILE:LINENO)54 <HOST>|E|pmMaskBadPixels (FILE:LINENO) 55 55 Null not allowed for input image. 56 56 … … 63 63 \**********************************************************************************/ 64 64 65 < DATE><TIME>|<HOST>|E|pmMaskBadPixels (FILE:LINENO)65 <HOST>|E|pmMaskBadPixels (FILE:LINENO) 66 66 Input image size exceeds that of mask image: (60, 60) vs (50, 50) 67 67 … … 74 74 \**********************************************************************************/ 75 75 76 < DATE><TIME>|<HOST>|E|pmMaskBadPixels (FILE:LINENO)76 <HOST>|E|pmMaskBadPixels (FILE:LINENO) 77 77 Input image mask size exceeds that of mask image: (60, 60) vs (50, 50) 78 78 … … 85 85 \**********************************************************************************/ 86 86 87 < DATE><TIME>|<HOST>|E|pmMaskBadPixels (FILE:LINENO)87 <HOST>|E|pmMaskBadPixels (FILE:LINENO) 88 88 Total offset >= mask image: (150, 150) vs (50, 50) 89 89 … … 96 96 \**********************************************************************************/ 97 97 98 < DATE><TIME>|<HOST>|E|pmMaskBadPixels (FILE:LINENO)98 <HOST>|E|pmMaskBadPixels (FILE:LINENO) 99 99 Complex types not allowed for input image. Type: 2064 100 100 … … 107 107 \**********************************************************************************/ 108 108 109 < DATE><TIME>|<HOST>|E|pmMaskBadPixels (FILE:LINENO)109 <HOST>|E|pmMaskBadPixels (FILE:LINENO) 110 110 Mask must be PS_TYPE_MASK type. Type: 1032 111 111
Note:
See TracChangeset
for help on using the changeset viewer.
