IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 1026


Ignore:
Timestamp:
Jun 14, 2004, 10:19:30 AM (22 years ago)
Author:
gusciora
Message:

...

Location:
trunk/psLib
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src/dataManip/psStats.c

    r1022 r1026  
    265265                    binNum = (int) ((in->data.F32[i] - out->bounds->data.F32[0]) /
    266266                                    binSize);
     267                    (out->nums->data.S32[binNum])++;
    267268                    // If this is a non-uniform histogram, determining the correct
    268269                    // bin number requires a bit more work.

  • trunk/psLib/src/math/psStats.c

    r1022 r1026  
    265265                    binNum = (int) ((in->data.F32[i] - out->bounds->data.F32[0]) /
    266266                                    binSize);
     267                    (out->nums->data.S32[binNum])++;
    267268                    // If this is a non-uniform histogram, determining the correct
    268269                    // bin number requires a bit more work.

  • trunk/psLib/test/dataManip/tst_psStats07.c

    r937 r1026  
    3333    float realMeanWithMask   = 0.0;
    3434    float realMedianWithMask = 0.0;
    35     float realModeWithMask   = -1.0;
     35    float realModeWithMask   = 40.0;
    3636    float realStdevWithMask  = 0.0;
    3737    float realLQWithMask     = 0.0;

  • trunk/psLib/test/dataManip/verified/tst_psStats07.stdout

    r937 r1026  
    109109\----------------------------------------------------------------------------------/
    110110
    111 The expected Mode was -1.000000; the calculated Mode was -1.000000
     111The expected Mode was 40.000000; the calculated Mode was 40.000000
    112112
    113113---> TESTPOINT PASSED (psVector functions{PS_STAT_ROBUST_STATS: robust Mode: with vector mask} | tst_psStats07.c)

  • trunk/psLib/test/image/tst_psImageStats02.c

    r1022 r1026  
    6767
    6868    rc = psImageEvalPolynomial(outImage, my2DPoly);
    69     for (i=0;i<IMAGE_SIZE;i++) {
    70         for (j=0;j<IMAGE_SIZE;j++) {
    71             printf("pixel[%d][%d] is (%f, %f)\n", i, j,
    72                    tmpImage->data.F32[i][j],
    73                    outImage->data.F32[i][j]);
    74         }
    75     }
     69    //    for (i=0;i<IMAGE_SIZE;i++) {
     70    //        for (j=0;j<IMAGE_SIZE;j++) {
     71    //             printf("pixel[%d][%d] is (%f, %f)\n", i, j,
     72    //                   tmpImage->data.F32[i][j],
     73    //                   outImage->data.F32[i][j]);
     74    //        }
     75    //    }
    7676
    7777    psMemCheckCorruption(1);

  • trunk/psLib/test/image/verified/tst_psImageStats00.stdout

    r1018 r1026  
    222222Bin number 2 bounds: (6.400000 - 9.600000) data (27)
    223223Bin number 3 bounds: (9.600000 - 12.800000) data (36)
    224 Bin number 4 bounds: (12.800000 - 16.000000) data (45)
    225 Bin number 5 bounds: (16.000000 - 19.200001) data (74)
     224Bin number 4 bounds: (12.800000 - 16.000000) data (62)
     225Bin number 5 bounds: (16.000000 - 19.200001) data (57)
    226226Bin number 6 bounds: (19.200001 - 22.400000) data (66)
    227227Bin number 7 bounds: (22.400000 - 25.600000) data (75)
    228228Bin number 8 bounds: (25.600000 - 28.800001) data (84)
    229 Bin number 9 bounds: (28.800001 - 32.000000) data (93)
    230 Bin number 10 bounds: (32.000000 - 35.200001) data (118)
     229Bin number 9 bounds: (28.800001 - 32.000000) data (124)
     230Bin number 10 bounds: (32.000000 - 35.200001) data (87)
    231231Bin number 11 bounds: (35.200001 - 38.400002) data (78)
    232232Bin number 12 bounds: (38.400002 - 41.600002) data (69)
    233233Bin number 13 bounds: (41.600002 - 44.799999) data (60)
    234 Bin number 14 bounds: (44.799999 - 48.000000) data (51)
    235 Bin number 15 bounds: (48.000000 - 51.200001) data (54)
     234Bin number 14 bounds: (44.799999 - 48.000000) data (66)
     235Bin number 15 bounds: (48.000000 - 51.200001) data (39)
    236236Bin number 16 bounds: (51.200001 - 54.400002) data (30)
    237237Bin number 17 bounds: (54.400002 - 57.600002) data (21)
    … …  
    251251Bin number 2 bounds: (6.400000 - 9.600000) data (27)
    252252Bin number 3 bounds: (9.600000 - 12.800000) data (36)
    253 Bin number 4 bounds: (12.800000 - 16.000000) data (45)
    254 Bin number 5 bounds: (16.000000 - 19.200001) data (74)
     253Bin number 4 bounds: (12.800000 - 16.000000) data (62)
     254Bin number 5 bounds: (16.000000 - 19.200001) data (57)
    255255Bin number 6 bounds: (19.200001 - 22.400000) data (66)
    256256Bin number 7 bounds: (22.400000 - 25.600000) data (75)
    257257Bin number 8 bounds: (25.600000 - 28.800001) data (84)
    258 Bin number 9 bounds: (28.800001 - 32.000000) data (93)
    259 Bin number 10 bounds: (32.000000 - 35.200001) data (115)
     258Bin number 9 bounds: (28.800001 - 32.000000) data (124)
     259Bin number 10 bounds: (32.000000 - 35.200001) data (84)
    260260Bin number 11 bounds: (35.200001 - 38.400002) data (66)
    261261Bin number 12 bounds: (38.400002 - 41.600002) data (48)
    … …  
    292292Bin number 2 bounds: (9.600000 - 14.400001) data (65)
    293293Bin number 3 bounds: (14.400001 - 19.200001) data (90)
    294 Bin number 4 bounds: (19.200001 - 24.000000) data (90)
    295 Bin number 5 bounds: (24.000000 - 28.800001) data (135)
     294Bin number 4 bounds: (19.200001 - 24.000000) data (115)
     295Bin number 5 bounds: (24.000000 - 28.800001) data (110)
    296296Bin number 6 bounds: (28.800001 - 33.600002) data (157)
    297297Bin number 7 bounds: (33.600002 - 38.400002) data (160)
    298298Bin number 8 bounds: (38.400002 - 43.200001) data (160)
    299 Bin number 9 bounds: (43.200001 - 48.000000) data (128)
    300 Bin number 10 bounds: (48.000000 - 52.800003) data (160)
     299Bin number 9 bounds: (43.200001 - 48.000000) data (160)
     300Bin number 10 bounds: (48.000000 - 52.800003) data (128)
    301301Bin number 11 bounds: (52.800003 - 57.600002) data (160)
    302302Bin number 12 bounds: (57.600002 - 62.400002) data (160)
    … …  
    321321Bin number 2 bounds: (9.600000 - 14.400001) data (65)
    322322Bin number 3 bounds: (14.400001 - 19.200001) data (90)
    323 Bin number 4 bounds: (19.200001 - 24.000000) data (90)
    324 Bin number 5 bounds: (24.000000 - 28.800001) data (135)
     323Bin number 4 bounds: (19.200001 - 24.000000) data (115)
     324Bin number 5 bounds: (24.000000 - 28.800001) data (110)
    325325Bin number 6 bounds: (28.800001 - 33.600002) data (157)
    326326Bin number 7 bounds: (33.600002 - 38.400002) data (160)
    327327Bin number 8 bounds: (38.400002 - 43.200001) data (160)
    328 Bin number 9 bounds: (43.200001 - 48.000000) data (128)
    329 Bin number 10 bounds: (48.000000 - 52.800003) data (154)
     328Bin number 9 bounds: (43.200001 - 48.000000) data (160)
     329Bin number 10 bounds: (48.000000 - 52.800003) data (122)
    330330Bin number 11 bounds: (52.800003 - 57.600002) data (130)
    331331Bin number 12 bounds: (57.600002 - 62.400002) data (105)
    … …  
    362362Bin number 2 bounds: (9.600000 - 14.400001) data (65)
    363363Bin number 3 bounds: (14.400001 - 19.200001) data (90)
    364 Bin number 4 bounds: (19.200001 - 24.000000) data (90)
    365 Bin number 5 bounds: (24.000000 - 28.800001) data (135)
     364Bin number 4 bounds: (19.200001 - 24.000000) data (115)
     365Bin number 5 bounds: (24.000000 - 28.800001) data (110)
    366366Bin number 6 bounds: (28.800001 - 33.600002) data (157)
    367367Bin number 7 bounds: (33.600002 - 38.400002) data (160)
    368368Bin number 8 bounds: (38.400002 - 43.200001) data (160)
    369 Bin number 9 bounds: (43.200001 - 48.000000) data (128)
    370 Bin number 10 bounds: (48.000000 - 52.800003) data (160)
     369Bin number 9 bounds: (43.200001 - 48.000000) data (160)
     370Bin number 10 bounds: (48.000000 - 52.800003) data (128)
    371371Bin number 11 bounds: (52.800003 - 57.600002) data (160)
    372372Bin number 12 bounds: (57.600002 - 62.400002) data (160)
    … …  
    391391Bin number 2 bounds: (9.600000 - 14.400001) data (65)
    392392Bin number 3 bounds: (14.400001 - 19.200001) data (90)
    393 Bin number 4 bounds: (19.200001 - 24.000000) data (90)
    394 Bin number 5 bounds: (24.000000 - 28.800001) data (135)
     393Bin number 4 bounds: (19.200001 - 24.000000) data (115)
     394Bin number 5 bounds: (24.000000 - 28.800001) data (110)
    395395Bin number 6 bounds: (28.800001 - 33.600002) data (157)
    396396Bin number 7 bounds: (33.600002 - 38.400002) data (160)
    397397Bin number 8 bounds: (38.400002 - 43.200001) data (160)
    398 Bin number 9 bounds: (43.200001 - 48.000000) data (128)
    399 Bin number 10 bounds: (48.000000 - 52.800003) data (154)
     398Bin number 9 bounds: (43.200001 - 48.000000) data (160)
     399Bin number 10 bounds: (48.000000 - 52.800003) data (122)
    400400Bin number 11 bounds: (52.800003 - 57.600002) data (130)
    401401Bin number 12 bounds: (57.600002 - 62.400002) data (105)

  • trunk/psLib/test/image/verified/tst_psImageStats02.stdout

    r1018 r1026  
    1 (0.000000, 0.000000)
    2 (1.000000, 0.000000)
    3 (2.000000, 0.000000)
    4 (3.000000, 0.000000)
    5 (4.000000, 0.000000)
    6 (5.000000, 0.000000)
    7 (6.000000, 0.000000)
    8 (7.000000, 0.000000)
    9 (8.000000, 0.000000)
    10 (9.000000, 0.000000)
    11 (1.000000, 0.000000)
    12 (2.000000, 0.000000)
    13 (3.000000, 0.000000)
    14 (4.000000, 0.000000)
    15 (5.000000, 0.000000)
    16 (6.000000, 0.000000)
    17 (7.000000, 0.000000)
    18 (8.000000, 0.000000)
    19 (9.000000, 0.000000)
    20 (10.000000, 0.000000)
    21 (2.000000, 0.000000)
    22 (3.000000, 0.000000)
    23 (4.000000, 0.000000)
    24 (5.000000, 0.000000)
    25 (6.000000, 0.000000)
    26 (7.000000, 0.000000)
    27 (8.000000, 0.000000)
    28 (9.000000, 0.000000)
    29 (10.000000, 0.000000)
    30 (11.000000, 0.000000)
    31 (3.000000, 0.000000)
    32 (4.000000, 0.000000)
    33 (5.000000, 0.000000)
    34 (6.000000, 0.000000)
    35 (7.000000, 0.000000)
    36 (8.000000, 0.000000)
    37 (9.000000, 0.000000)
    38 (10.000000, 0.000000)
    39 (11.000000, 0.000000)
    40 (12.000000, 0.000000)
    41 (4.000000, 0.000000)
    42 (5.000000, 0.000000)
    43 (6.000000, 0.000000)
    44 (7.000000, 0.000000)
    45 (8.000000, 0.000000)
    46 (9.000000, 0.000000)
    47 (10.000000, 0.000000)
    48 (11.000000, 0.000000)
    49 (12.000000, 0.000000)
    50 (13.000000, 0.000000)
    51 (5.000000, 0.000000)
    52 (6.000000, 0.000000)
    53 (7.000000, 0.000000)
    54 (8.000000, 0.000000)
    55 (9.000000, 0.000000)
    56 (10.000000, 0.000000)
    57 (11.000000, 0.000000)
    58 (12.000000, 0.000000)
    59 (13.000000, 0.000000)
    60 (14.000000, 0.000000)
    61 (6.000000, 0.000000)
    62 (7.000000, 0.000000)
    63 (8.000000, 0.000000)
    64 (9.000000, 0.000000)
    65 (10.000000, 0.000000)
    66 (11.000000, 0.000000)
    67 (12.000000, 0.000000)
    68 (13.000000, 0.000000)
    69 (14.000000, 0.000000)
    70 (15.000000, 0.000000)
    71 (7.000000, 0.000000)
    72 (8.000000, 0.000000)
    73 (9.000000, 0.000000)
    74 (10.000000, 0.000000)
    75 (11.000000, 0.000000)
    76 (12.000000, 0.000000)
    77 (13.000000, 0.000000)
    78 (14.000000, 0.000000)
    79 (15.000000, 0.000000)
    80 (16.000000, 0.000000)
    81 (8.000000, 0.000000)
    82 (9.000000, 0.000000)
    83 (10.000000, 0.000000)
    84 (11.000000, 0.000000)
    85 (12.000000, 0.000000)
    86 (13.000000, 0.000000)
    87 (14.000000, 0.000000)
    88 (15.000000, 0.000000)
    89 (16.000000, 0.000000)
    90 (17.000000, 0.000000)
    91 (9.000000, 0.000000)
    92 (10.000000, 0.000000)
    93 (11.000000, 0.000000)
    94 (12.000000, 0.000000)
    95 (13.000000, 0.000000)
    96 (14.000000, 0.000000)
    97 (15.000000, 0.000000)
    98 (16.000000, 0.000000)
    99 (17.000000, 0.000000)
    100 (18.000000, 0.000000)
    1011/----------------------------- TESTPOINT ------------------------------------------\
    1022|             TestFile: tst_psImageStats02.c                                       |
    … …  
    11414\----------------------------------------------------------------------------------/
    11515
    116 (0.000000, -69840.000000)
    117 (1.000000, -135200.000000)
    118 (2.000000, -200560.000000)
    119 (3.000000, -265920.000000)
    120 (4.000000, -331280.000000)
    121 (5.000000, -396640.000000)
    122 (6.000000, -462000.000000)
    123 (7.000000, -527360.000000)
    124 (8.000000, -592720.000000)
    125 (9.000000, -658080.000000)
    126 (1.000000, 1108128.000000)
    127 (2.000000, 2201856.000000)
    128 (3.000000, 3295584.000000)
    129 (4.000000, 4389312.000000)
    130 (5.000000, 5483040.000000)
    131 (6.000000, 6576768.000000)
    132 (7.000000, 7670496.000000)
    133 (8.000000, 8764224.000000)
    134 (9.000000, 9857952.000000)
    135 (10.000000, 10951680.000000)
    136 (2.000000, 27349008.000000)
    137 (3.000000, 54532576.000000)
    138 (4.000000, 81716144.000000)
    139 (5.000000, 108899712.000000)
    140 (6.000000, 136083280.000000)
    141 (7.000000, 163266848.000000)
    142 (8.000000, 190450416.000000)
    143 (9.000000, 217633984.000000)
    144 (10.000000, 244817552.000000)
    145 (11.000000, 272001120.000000)
    146 (3.000000, 103435392.000000)
    147 (4.000000, 206308864.000000)
    148 (5.000000, 309182336.000000)
    149 (6.000000, 412055808.000000)
    150 (7.000000, 514929280.000000)
    151 (8.000000, 617802752.000000)
    152 (9.000000, 720676224.000000)
    153 (10.000000, 823549696.000000)
    154 (11.000000, 926423168.000000)
    155 (12.000000, 1029296640.000000)
    156 (4.000000, 254149872.000000)
    157 (5.000000, 506982624.000000)
    158 (6.000000, 759815360.000000)
    159 (7.000000, 1012648128.000000)
    160 (8.000000, 1265480832.000000)
    161 (9.000000, 1518313728.000000)
    162 (10.000000, 1771146368.000000)
    163 (11.000000, 2023979008.000000)
    164 (12.000000, 2276811776.000000)
    165 (13.000000, 2529644800.000000)
    166 (5.000000, 504275040.000000)
    167 (6.000000, 1006005760.000000)
    168 (7.000000, 1507736576.000000)
    169 (8.000000, 2009467264.000000)
    170 (9.000000, 2511197952.000000)
    171 (10.000000, 3012928768.000000)
    172 (11.000000, 3514659328.000000)
    173 (12.000000, 4016390144.000000)
    174 (13.000000, 4518120960.000000)
    175 (14.000000, 5019851776.000000)
    176 (6.000000, 878593536.000000)
    177 (7.000000, 1752830208.000000)
    178 (8.000000, 2627066880.000000)
    179 (9.000000, 3501303552.000000)
    180 (10.000000, 4375540224.000000)
    181 (11.000000, 5249777152.000000)
    182 (12.000000, 6124013568.000000)
    183 (13.000000, 6998250496.000000)
    184 (14.000000, 7872486912.000000)
    185 (15.000000, 8746723328.000000)
    186 (7.000000, 1401887744.000000)
    187 (8.000000, 2796908032.000000)
    188 (9.000000, 4191927808.000000)
    189 (10.000000, 5586948096.000000)
    190 (11.000000, 6981967872.000000)
    191 (12.000000, 8376987648.000000)
    192 (13.000000, 9772007424.000000)
    193 (14.000000, 11167027200.000000)
    194 (15.000000, 12562048000.000000)
    195 (16.000000, 13957066752.000000)
    196 (8.000000, 2098940672.000000)
    197 (9.000000, 4187690496.000000)
    198 (10.000000, 6276440064.000000)
    199 (11.000000, 8365190144.000000)
    200 (12.000000, 10453940224.000000)
    201 (13.000000, 12542689280.000000)
    202 (14.000000, 14631439360.000000)
    203 (15.000000, 16720189440.000000)
    204 (16.000000, 18808938496.000000)
    205 (17.000000, 20897689600.000000)
    206 (9.000000, 2994534400.000000)
    207 (10.000000, 5974630400.000000)
    208 (11.000000, 8954726400.000000)
    209 (12.000000, 11934822400.000000)
    210 (13.000000, 14914918400.000000)
    211 (14.000000, 17895014400.000000)
    212 (15.000000, 20875110400.000000)
    213 (16.000000, 23855204352.000000)
    214 (17.000000, 26835300352.000000)
    215 (18.000000, 29815394304.000000)
    21616
    21717---> TESTPOINT PASSED (psImageStats functions{Calculate Chebyshev Polynomials, no mask} | tst_psImageStats02.c)

  • trunk/psLib/test/sysUtils/verified/tst_psLogMsg02.stderr

    r1018 r1026  
    2727 <DATE> <TIME> <HOST> |W|           main|Hello World!  My level is 2
    2828 <DATE> <TIME> <HOST> |I|           main|Hello World!  My level is 3
     29 <DATE> <TIME> <HOST> |A| Under 15 chars|Hello World!
     30 <DATE> <TIME> <HOST> |A|This string is |Hello World!
     31 <DATE> <TIME> <HOST> |A|           main|Line #1
     32 <DATE> <TIME> <HOST> |A|           main|Line #2
     33 <DATE> <TIME> <HOST> |A|           main|Line #3
     34 <DATE> <TIME> <HOST> |A|           main|Line #4

  • trunk/psLib/test/sysUtils/verified/tst_psLogMsg02.stdout

    r963 r1026  
    1515---> TESTPOINT PASSED (psLogMsg functions{psLogSetFormat()} | tst_psLogMsg02.c)
    1616
     17/----------------------------- TESTPOINT ------------------------------------------\
     18|             TestFile: tst_psLogMsg02.c                                           |
     19|            TestPoint: psLogMsg functions{Output Format}                          |
     20|             TestType: Positive                                                   |
     21\----------------------------------------------------------------------------------/
     22
     23
     24---> TESTPOINT PASSED (psLogMsg functions{Output Format} | tst_psLogMsg02.c)
     25

  • trunk/psLib/test/sysUtils/verified/tst_psLogMsg03.stdout

    r963 r1026  
    88------------- psLogSetDestination(PS_LOG_TO_STDERR) -------------
    99------------- psLogSetDestination(PS_LOG_TO_STDOUT) -------------
    10  <DATE> <TIME> <HOST> |A|main           |
     10 <DATE> <TIME> <HOST> |A|           main|
    1111Hello World!  My level is 0
    12  <DATE> <TIME> <HOST> |E|main           |
     12 <DATE> <TIME> <HOST> |E|           main|
    1313Hello World!  My level is 1
    14  <DATE> <TIME> <HOST> |W|main           |
     14 <DATE> <TIME> <HOST> |W|           main|
    1515Hello World!  My level is 2
    16  <DATE> <TIME> <HOST> |I|main           |
     16 <DATE> <TIME> <HOST> |I|           main|
    1717Hello World!  My level is 3
    1818
Note: See TracChangeset for help on using the changeset viewer.