IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 2090


Ignore:
Timestamp:
Oct 13, 2004, 12:26:55 PM (22 years ago)
Author:
evanalst
Message:

Update test and verified files.

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

Legend:

Unmodified
Added
Removed

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

    r1991 r2090  
    5555        y->data.F64[i] = setData(x->data.F64[i]);
    5656        yErr->data.F64[i] = YERR;
    57         printf("Original data %d: (%.1f %.1f)\n", i, x->data.F64[i], y->data.F64[i]);
     57        //        printf("Original data %d: (%.1f %.1f)\n", i, x->data.F64[i], y->data.F64[i]);
    5858    }
    5959
    … …  
    6464    psVectorFitPolynomial1D(myPoly, x, y, yErr);
    6565
    66     for (i=0;i<POLY_ORDER+1;i++) {
    67         printf("Polynomial coefficient %d is %0.1f\n", i, myPoly->coeff[i]);
    68     }
     66    //    for (i=0;i<POLY_ORDER+1;i++) {
     67    //        printf("Polynomial coefficient %d is %0.1f\n", i, myPoly->coeff[i]);
     68    //    }
    6969
    7070    for (i=0;i<NUM_DATA;i++) {
    … …  
    7575                   i, x->data.F64[i], actualData, expectData);
    7676            testStatus = false;
    77         } else {
    78             printf("Fitted data %d: (%.1f %.1f), expected was (%.1f)\n",
    79                    i, x->data.F64[i], actualData, expectData);
    8077        }
     78        //        } else {
     79        //            printf("Fitted data %d: (%.1f %.1f), expected was (%.1f)\n",
     80        //                   i, x->data.F64[i], actualData, expectData);
     81        //        }
    8182    }
    8283
    … …  
    119120        x->data.F64[i] = (double) i;
    120121        y->data.F64[i] = setData(x->data.F64[i]);
    121         printf("Original data %d: (%.1f %.1f)\n", i, x->data.F64[i], y->data.F64[i]);
     122        //        printf("Original data %d: (%.1f %.1f)\n", i, x->data.F64[i], y->data.F64[i]);
    122123    }
    123124
    … …  
    128129    psVectorFitPolynomial1D(myPoly, x, y, NULL);
    129130
    130     for (i=0;i<POLY_ORDER+1;i++) {
    131         printf("Polynomial coefficient %d is %0.1f\n", i, myPoly->coeff[i]);
    132     }
     131    //    for (i=0;i<POLY_ORDER+1;i++) {
     132    //        printf("Polynomial coefficient %d is %0.1f\n", i, myPoly->coeff[i]);
     133    //    }
    133134
    134135    for (i=0;i<NUM_DATA;i++) {
    … …  
    139140                   i, x->data.F64[i], actualData, expectData);
    140141            testStatus = false;
    141         } else {
    142             printf("Fitted data %d: (%.1f %.1f), expected was (%.1f)\n",
    143                    i, x->data.F64[i], actualData, expectData);
     142            //        } else {
     143            //            printf("Fitted data %d: (%.1f %.1f), expected was (%.1f)\n",
     144            //                   i, x->data.F64[i], actualData, expectData);
    144145        }
    145146    }
    … …  
    179180    for (i=0;i<NUM_DATA;i++) {
    180181        y->data.F64[i] = setData((double) i);
    181         printf("Original data %d: (%.1f)\n", i, y->data.F64[i]);
     182        //        printf("Original data %d: (%.1f)\n", i, y->data.F64[i]);
    182183    }
    183184
    … …  
    188189    psVectorFitPolynomial1D(myPoly, NULL, y, NULL);
    189190
    190     for (i=0;i<POLY_ORDER+1;i++) {
    191         printf("Polynomial coefficient %d is %0.1f\n", i, myPoly->coeff[i]);
    192     }
     191    //    for (i=0;i<POLY_ORDER+1;i++) {
     192    //        printf("Polynomial coefficient %d is %0.1f\n", i, myPoly->coeff[i]);
     193    //    }
    193194
    194195    for (i=0;i<NUM_DATA;i++) {
    … …  
    199200                   i, (double) i, actualData, expectData);
    200201            testStatus = false;
    201         } else {
    202             printf("Fitted data %d: (%.1f %.1f), expected was (%.1f)\n",
    203                    i, (double) i, actualData, expectData);
     202            //        } else {
     203            //            printf("Fitted data %d: (%.1f %.1f), expected was (%.1f)\n",
     204            //                   i, (double) i, actualData, expectData);
    204205        }
    205206    }

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

    r1976 r2090  
    1 Original data 0: (0.0 3.0)
    2 Original data 1: (1.0 8.0)
    3 Original data 2: (2.0 19.0)
    4 Original data 3: (3.0 36.0)
    5 Original data 4: (4.0 59.0)
    6 Original data 5: (5.0 88.0)
    7 Original data 6: (6.0 123.0)
    8 Original data 7: (7.0 164.0)
    9 Original data 8: (8.0 211.0)
    10 Original data 9: (9.0 264.0)
    111/***************************** TESTPOINT ******************************************\
    122*             TestFile: tst_psMinimize04.c                                         *
    … …  
    155\**********************************************************************************/
    166
    17 Polynomial coefficient 0 is 3.0
    18 Polynomial coefficient 1 is 2.0
    19 Polynomial coefficient 2 is 3.0
    20 Polynomial coefficient 3 is -0.0
    21 Polynomial coefficient 4 is 0.0
    22 Polynomial coefficient 5 is -0.0
    23 Fitted data 0: (0.0 3.0), expected was (3.0)
    24 Fitted data 1: (1.0 8.0), expected was (8.0)
    25 Fitted data 2: (2.0 19.0), expected was (19.0)
    26 Fitted data 3: (3.0 36.0), expected was (36.0)
    27 Fitted data 4: (4.0 59.0), expected was (59.0)
    28 Fitted data 5: (5.0 88.0), expected was (88.0)
    29 Fitted data 6: (6.0 123.0), expected was (123.0)
    30 Fitted data 7: (7.0 164.0), expected was (164.0)
    31 Fitted data 8: (8.0 211.0), expected was (211.0)
    32 Fitted data 9: (9.0 264.0), expected was (264.0)
    337
    348---> TESTPOINT PASSED (psMinimize functions{psVectorFitPolynomial1D(): equal differences in variable yErr} | tst_psMinimize04.c)
    359
    36 Original data 0: (0.0 3.0)
    37 Original data 1: (1.0 8.0)
    38 Original data 2: (2.0 19.0)
    39 Original data 3: (3.0 36.0)
    40 Original data 4: (4.0 59.0)
    41 Original data 5: (5.0 88.0)
    42 Original data 6: (6.0 123.0)
    43 Original data 7: (7.0 164.0)
    44 Original data 8: (8.0 211.0)
    45 Original data 9: (9.0 264.0)
    4610/***************************** TESTPOINT ******************************************\
    4711*             TestFile: tst_psMinimize04.c                                         *
    … …  
    5014\**********************************************************************************/
    5115
    52 Polynomial coefficient 0 is 3.0
    53 Polynomial coefficient 1 is 2.0
    54 Polynomial coefficient 2 is 3.0
    55 Polynomial coefficient 3 is -0.0
    56 Polynomial coefficient 4 is 0.0
    57 Polynomial coefficient 5 is -0.0
    58 Fitted data 0: (0.0 3.0), expected was (3.0)
    59 Fitted data 1: (1.0 8.0), expected was (8.0)
    60 Fitted data 2: (2.0 19.0), expected was (19.0)
    61 Fitted data 3: (3.0 36.0), expected was (36.0)
    62 Fitted data 4: (4.0 59.0), expected was (59.0)
    63 Fitted data 5: (5.0 88.0), expected was (88.0)
    64 Fitted data 6: (6.0 123.0), expected was (123.0)
    65 Fitted data 7: (7.0 164.0), expected was (164.0)
    66 Fitted data 8: (8.0 211.0), expected was (211.0)
    67 Fitted data 9: (9.0 264.0), expected was (264.0)
    6816
    6917---> TESTPOINT PASSED (psMinimize functions{psVectorFitPolynomial1D(): yErr is NULL} | tst_psMinimize04.c)
    7018
    71 Original data 0: (3.0)
    72 Original data 1: (8.0)
    73 Original data 2: (19.0)
    74 Original data 3: (36.0)
    75 Original data 4: (59.0)
    76 Original data 5: (88.0)
    77 Original data 6: (123.0)
    78 Original data 7: (164.0)
    79 Original data 8: (211.0)
    80 Original data 9: (264.0)
    8119/***************************** TESTPOINT ******************************************\
    8220*             TestFile: tst_psMinimize04.c                                         *
    … …  
    8523\**********************************************************************************/
    8624
    87 Polynomial coefficient 0 is 3.0
    88 Polynomial coefficient 1 is 2.0
    89 Polynomial coefficient 2 is 3.0
    90 Polynomial coefficient 3 is -0.0
    91 Polynomial coefficient 4 is 0.0
    92 Polynomial coefficient 5 is -0.0
    93 Fitted data 0: (0.0 3.0), expected was (3.0)
    94 Fitted data 1: (1.0 8.0), expected was (8.0)
    95 Fitted data 2: (2.0 19.0), expected was (19.0)
    96 Fitted data 3: (3.0 36.0), expected was (36.0)
    97 Fitted data 4: (4.0 59.0), expected was (59.0)
    98 Fitted data 5: (5.0 88.0), expected was (88.0)
    99 Fitted data 6: (6.0 123.0), expected was (123.0)
    100 Fitted data 7: (7.0 164.0), expected was (164.0)
    101 Fitted data 8: (8.0 211.0), expected was (211.0)
    102 Fitted data 9: (9.0 264.0), expected was (264.0)
    10325
    10426---> TESTPOINT PASSED (psMinimize functions{psVectorFitPolynomial1D(): x, yErr is NULL} | tst_psMinimize04.c)
Note: See TracChangeset for help on using the changeset viewer.