IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Dec 21, 2004, 2:54:28 PM (22 years ago)
Author:
gusciora
Message:

Modified histogram->nums to be of type F32, not U32.

Location:
trunk/psLib/test/dataManip
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    r2718 r2782  
    5050
    5151        for (i=0;i<numBins;i++) {
    52             if (myHist->nums->data.U32[i] != 0) {
     52            if (myHist->nums->data.F32[i] != 0.0) {
    5353                printf("ERROR: myHist->nums->data.U32[%d] not initialized to 0.\n", i);
    5454                testStatus = false;
    5555            }
    56             myHist->nums->data.U32[i] = 0;
     56            myHist->nums->data.F32[i] = 0.0;
    5757        }
    5858

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

    r2392 r2782  
    5656
    5757        for (i=0;i<numBins;i++) {
    58             if (myHist->nums->data.U32[i] != 0) {
    59                 printf("ERROR: myHist->nums->data.U32[%d] not initialized to 0.\n", i);
     58            if (myHist->nums->data.F32[i] != 0.0) {
     59                printf("ERROR: myHist->nums->data.F32[%d] not initialized to 0.\n", i);
    6060                testStatus = false;
    6161            }
    62             myHist->nums->data.U32[i] = 0;
     62            myHist->nums->data.F32[i] = 0.0;
    6363        }
    6464

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

    r2780 r2782  
    6969
    7070        for ( i = 0;i < numBins;i++ ) {
    71             printf( "Bin number %d bounds: (%.2f - %.2f) data (%d)\n", i,
     71            printf( "Bin number %d bounds: (%.2f - %.2f) data (%f)\n", i,
    7272                    myHist->bounds->data.F32[ i ],
    7373                    myHist->bounds->data.F32[ i + 1 ],
    74                     myHist->nums->data.U32[ i ] );
     74                    myHist->nums->data.F32[ i ] );
    7575        }
    7676        psMemCheckCorruption( 1 );
    … …  
    9494
    9595        for ( i = 0;i < numBins;i++ ) {
    96             printf( "Bin number %d bounds: (%6.3f - %6.3f) data (%d)\n", i,
     96            printf( "Bin number %d bounds: (%6.3f - %6.3f) data (%f)\n", i,
    9797                    myHist->bounds->data.F32[ i ],
    9898                    myHist->bounds->data.F32[ i + 1 ],
    99                     myHist->nums->data.U32[ i ] );
     99                    myHist->nums->data.F32[ i ] );
    100100        }
    101101        psMemCheckCorruption( 1 );

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

    r2780 r2782  
    6767
    6868        for (i=0;i<numBins;i++) {
    69             if (myHist->nums->data.U32[i] != 0) {
    70                 printf("ERROR: myHist->nums->data.U32[%d] not initialized to 0.\n", i);
     69            if (myHist->nums->data.F32[i] != 0.0) {
     70                printf("ERROR: myHist->nums->data.F32[%d] not initialized to 0.\n", i);
    7171                testStatus = false;
    7272            }
    73             myHist->nums->data.U32[i] = 0;
     73            myHist->nums->data.F32[i] = 0.0;
    7474        }
    7575
    … …  
    9191        myHist = psVectorHistogram( myHist, myData, NULL, NULL, 0 );
    9292        for (i=0;i<numBins;i++) {
    93             printf("Bin number %d bounds: (%6.3f - %6.3f): data: (%d)\n", i,
     93            printf("Bin number %d bounds: (%6.3f - %6.3f): data: (%f)\n", i,
    9494                   myHist->bounds->data.F32[i],
    9595                   myHist->bounds->data.F32[i+1],
    96                    myHist->nums->data.S32[i]);
     96                   myHist->nums->data.F32[i]);
    9797        }
    9898

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

    r2721 r2782  
    55\**********************************************************************************/
    66
    7 Bin number 0 bounds: (20.00 - 30.00) data (10000)
     7Bin number 0 bounds: (20.00 - 30.00) data (10000.000000)
    88
    99---> TESTPOINT PASSED (psStats functions{Allocate and Perform Histogram, no mask} | tst_psHist02.c)
    … …  
    1515\**********************************************************************************/
    1616
    17 Bin number 0 bounds: (20.000 - 30.000) data (5000)
     17Bin number 0 bounds: (20.000 - 30.000) data (5000.000000)
    1818
    1919---> TESTPOINT PASSED (psStats functions{Allocate and Perform Histogram with mask} | tst_psHist02.c)
    … …  
    2525\**********************************************************************************/
    2626
    27 Bin number 0 bounds: (20.00 - 25.00) data (5000)
    28 Bin number 1 bounds: (25.00 - 30.00) data (5000)
     27Bin number 0 bounds: (20.00 - 25.00) data (5000.000000)
     28Bin number 1 bounds: (25.00 - 30.00) data (5000.000000)
    2929
    3030---> TESTPOINT PASSED (psStats functions{Allocate and Perform Histogram, no mask} | tst_psHist02.c)
    … …  
    3636\**********************************************************************************/
    3737
    38 Bin number 0 bounds: (20.000 - 25.000) data (5000)
    39 Bin number 1 bounds: (25.000 - 30.000) data (0)
     38Bin number 0 bounds: (20.000 - 25.000) data (5000.000000)
     39Bin number 1 bounds: (25.000 - 30.000) data (0.000000)
    4040
    4141---> TESTPOINT PASSED (psStats functions{Allocate and Perform Histogram with mask} | tst_psHist02.c)
    … …  
    4747\**********************************************************************************/
    4848
    49 Bin number 0 bounds: (20.00 - 21.00) data (1000)
    50 Bin number 1 bounds: (21.00 - 22.00) data (1000)
    51 Bin number 2 bounds: (22.00 - 23.00) data (1000)
    52 Bin number 3 bounds: (23.00 - 24.00) data (1000)
    53 Bin number 4 bounds: (24.00 - 25.00) data (1000)
    54 Bin number 5 bounds: (25.00 - 26.00) data (1000)
    55 Bin number 6 bounds: (26.00 - 27.00) data (1000)
    56 Bin number 7 bounds: (27.00 - 28.00) data (1000)
    57 Bin number 8 bounds: (28.00 - 29.00) data (1000)
    58 Bin number 9 bounds: (29.00 - 30.00) data (1000)
     49Bin number 0 bounds: (20.00 - 21.00) data (1000.000000)
     50Bin number 1 bounds: (21.00 - 22.00) data (1000.000000)
     51Bin number 2 bounds: (22.00 - 23.00) data (1000.000000)
     52Bin number 3 bounds: (23.00 - 24.00) data (1000.000000)
     53Bin number 4 bounds: (24.00 - 25.00) data (1000.000000)
     54Bin number 5 bounds: (25.00 - 26.00) data (1000.000000)
     55Bin number 6 bounds: (26.00 - 27.00) data (1000.000000)
     56Bin number 7 bounds: (27.00 - 28.00) data (1000.000000)
     57Bin number 8 bounds: (28.00 - 29.00) data (1000.000000)
     58Bin number 9 bounds: (29.00 - 30.00) data (1000.000000)
    5959
    6060---> TESTPOINT PASSED (psStats functions{Allocate and Perform Histogram, no mask} | tst_psHist02.c)
    … …  
    6666\**********************************************************************************/
    6767
    68 Bin number 0 bounds: (20.000 - 21.000) data (1000)
    69 Bin number 1 bounds: (21.000 - 22.000) data (1000)
    70 Bin number 2 bounds: (22.000 - 23.000) data (1000)
    71 Bin number 3 bounds: (23.000 - 24.000) data (1000)
    72 Bin number 4 bounds: (24.000 - 25.000) data (1000)
    73 Bin number 5 bounds: (25.000 - 26.000) data (0)
    74 Bin number 6 bounds: (26.000 - 27.000) data (0)
    75 Bin number 7 bounds: (27.000 - 28.000) data (0)
    76 Bin number 8 bounds: (28.000 - 29.000) data (0)
    77 Bin number 9 bounds: (29.000 - 30.000) data (0)
     68Bin number 0 bounds: (20.000 - 21.000) data (1000.000000)
     69Bin number 1 bounds: (21.000 - 22.000) data (1000.000000)
     70Bin number 2 bounds: (22.000 - 23.000) data (1000.000000)
     71Bin number 3 bounds: (23.000 - 24.000) data (1000.000000)
     72Bin number 4 bounds: (24.000 - 25.000) data (1000.000000)
     73Bin number 5 bounds: (25.000 - 26.000) data (0.000000)
     74Bin number 6 bounds: (26.000 - 27.000) data (0.000000)
     75Bin number 7 bounds: (27.000 - 28.000) data (0.000000)
     76Bin number 8 bounds: (28.000 - 29.000) data (0.000000)
     77Bin number 9 bounds: (29.000 - 30.000) data (0.000000)
    7878
    7979---> TESTPOINT PASSED (psStats functions{Allocate and Perform Histogram with mask} | tst_psHist02.c)
    … …  
    8585\**********************************************************************************/
    8686
    87 Bin number 0 bounds: (20.00 - 20.50) data (500)
    88 Bin number 1 bounds: (20.50 - 21.00) data (500)
    89 Bin number 2 bounds: (21.00 - 21.50) data (500)
    90 Bin number 3 bounds: (21.50 - 22.00) data (500)
    91 Bin number 4 bounds: (22.00 - 22.50) data (500)
    92 Bin number 5 bounds: (22.50 - 23.00) data (500)
    93 Bin number 6 bounds: (23.00 - 23.50) data (500)
    94 Bin number 7 bounds: (23.50 - 24.00) data (500)
    95 Bin number 8 bounds: (24.00 - 24.50) data (500)
    96 Bin number 9 bounds: (24.50 - 25.00) data (500)
    97 Bin number 10 bounds: (25.00 - 25.50) data (500)
    98 Bin number 11 bounds: (25.50 - 26.00) data (500)
    99 Bin number 12 bounds: (26.00 - 26.50) data (500)
    100 Bin number 13 bounds: (26.50 - 27.00) data (500)
    101 Bin number 14 bounds: (27.00 - 27.50) data (500)
    102 Bin number 15 bounds: (27.50 - 28.00) data (500)
    103 Bin number 16 bounds: (28.00 - 28.50) data (500)
    104 Bin number 17 bounds: (28.50 - 29.00) data (500)
    105 Bin number 18 bounds: (29.00 - 29.50) data (500)
    106 Bin number 19 bounds: (29.50 - 30.00) data (500)
     87Bin number 0 bounds: (20.00 - 20.50) data (500.000000)
     88Bin number 1 bounds: (20.50 - 21.00) data (500.000000)
     89Bin number 2 bounds: (21.00 - 21.50) data (500.000000)
     90Bin number 3 bounds: (21.50 - 22.00) data (500.000000)
     91Bin number 4 bounds: (22.00 - 22.50) data (500.000000)
     92Bin number 5 bounds: (22.50 - 23.00) data (500.000000)
     93Bin number 6 bounds: (23.00 - 23.50) data (500.000000)
     94Bin number 7 bounds: (23.50 - 24.00) data (500.000000)
     95Bin number 8 bounds: (24.00 - 24.50) data (500.000000)
     96Bin number 9 bounds: (24.50 - 25.00) data (500.000000)
     97Bin number 10 bounds: (25.00 - 25.50) data (500.000000)
     98Bin number 11 bounds: (25.50 - 26.00) data (500.000000)
     99Bin number 12 bounds: (26.00 - 26.50) data (500.000000)
     100Bin number 13 bounds: (26.50 - 27.00) data (500.000000)
     101Bin number 14 bounds: (27.00 - 27.50) data (500.000000)
     102Bin number 15 bounds: (27.50 - 28.00) data (500.000000)
     103Bin number 16 bounds: (28.00 - 28.50) data (500.000000)
     104Bin number 17 bounds: (28.50 - 29.00) data (500.000000)
     105Bin number 18 bounds: (29.00 - 29.50) data (500.000000)
     106Bin number 19 bounds: (29.50 - 30.00) data (500.000000)
    107107
    108108---> TESTPOINT PASSED (psStats functions{Allocate and Perform Histogram, no mask} | tst_psHist02.c)
    … …  
    114114\**********************************************************************************/
    115115
    116 Bin number 0 bounds: (20.000 - 20.500) data (500)
    117 Bin number 1 bounds: (20.500 - 21.000) data (500)
    118 Bin number 2 bounds: (21.000 - 21.500) data (500)
    119 Bin number 3 bounds: (21.500 - 22.000) data (500)
    120 Bin number 4 bounds: (22.000 - 22.500) data (500)
    121 Bin number 5 bounds: (22.500 - 23.000) data (500)
    122 Bin number 6 bounds: (23.000 - 23.500) data (500)
    123 Bin number 7 bounds: (23.500 - 24.000) data (500)
    124 Bin number 8 bounds: (24.000 - 24.500) data (500)
    125 Bin number 9 bounds: (24.500 - 25.000) data (500)
    126 Bin number 10 bounds: (25.000 - 25.500) data (0)
    127 Bin number 11 bounds: (25.500 - 26.000) data (0)
    128 Bin number 12 bounds: (26.000 - 26.500) data (0)
    129 Bin number 13 bounds: (26.500 - 27.000) data (0)
    130 Bin number 14 bounds: (27.000 - 27.500) data (0)
    131 Bin number 15 bounds: (27.500 - 28.000) data (0)
    132 Bin number 16 bounds: (28.000 - 28.500) data (0)
    133 Bin number 17 bounds: (28.500 - 29.000) data (0)
    134 Bin number 18 bounds: (29.000 - 29.500) data (0)
    135 Bin number 19 bounds: (29.500 - 30.000) data (0)
     116Bin number 0 bounds: (20.000 - 20.500) data (500.000000)
     117Bin number 1 bounds: (20.500 - 21.000) data (500.000000)
     118Bin number 2 bounds: (21.000 - 21.500) data (500.000000)
     119Bin number 3 bounds: (21.500 - 22.000) data (500.000000)
     120Bin number 4 bounds: (22.000 - 22.500) data (500.000000)
     121Bin number 5 bounds: (22.500 - 23.000) data (500.000000)
     122Bin number 6 bounds: (23.000 - 23.500) data (500.000000)
     123Bin number 7 bounds: (23.500 - 24.000) data (500.000000)
     124Bin number 8 bounds: (24.000 - 24.500) data (500.000000)
     125Bin number 9 bounds: (24.500 - 25.000) data (500.000000)
     126Bin number 10 bounds: (25.000 - 25.500) data (0.000000)
     127Bin number 11 bounds: (25.500 - 26.000) data (0.000000)
     128Bin number 12 bounds: (26.000 - 26.500) data (0.000000)
     129Bin number 13 bounds: (26.500 - 27.000) data (0.000000)
     130Bin number 14 bounds: (27.000 - 27.500) data (0.000000)
     131Bin number 15 bounds: (27.500 - 28.000) data (0.000000)
     132Bin number 16 bounds: (28.000 - 28.500) data (0.000000)
     133Bin number 17 bounds: (28.500 - 29.000) data (0.000000)
     134Bin number 18 bounds: (29.000 - 29.500) data (0.000000)
     135Bin number 19 bounds: (29.500 - 30.000) data (0.000000)
    136136
    137137---> TESTPOINT PASSED (psStats functions{Allocate and Perform Histogram with mask} | tst_psHist02.c)
Note: See TracChangeset for help on using the changeset viewer.