IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jan 26, 2005, 10:41:04 AM (21 years ago)
Author:
gusciora
Message:

Substituted knots for domains in the spline structs.

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

Legend:

Unmodified
Added
Removed

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

    r2730 r3096  
    5656    }
    5757
    58     if (tmpSpline->domains == NULL) {
    59         printf("ERROR: Could not allocate psSpline1D->domains data structure\n");
     58    if (tmpSpline->knots == NULL) {
     59        printf("ERROR: Could not allocate psSpline1D->knots data structure\n");
    6060        testStatus = false;
    6161    }
    6262
    6363    for (i=0;i<N+1;i++) {
    64         printf("psSpline1D->domains[%d] is %f\n", i, tmpSpline->domains[i]);
     64        printf("psSpline1D->knots->data.F32[%d] is %f\n", i,
     65               tmpSpline->knots->data.F32[i]);
    6566    }
    6667
    … …  
    137138    }
    138139
    139     if (tmpSpline->domains == NULL) {
    140         printf("ERROR: Could not allocate psSpline1D->domains data structure\n");
     140    if (tmpSpline->knots == NULL) {
     141        printf("ERROR: Could not allocate psSpline1D->knots data structure\n");
    141142        testStatus = false;
    142143    }
    143144
    144145    for (i=0;i<N+1;i++) {
    145         printf("psSpline1D->domains[%d] is %f\n", i, tmpSpline->domains[i]);
     146        printf("psSpline1D->knots->data.F32[%d] is %f\n", i,
     147               tmpSpline->knots->data.F32[i]);
    146148    }
    147149
    … …  
    191193    }
    192194
    193     if (tmpSpline->domains == NULL) {
    194         printf("ERROR: Could not allocate psSpline1D->domains data structure\n");
     195    if (tmpSpline->knots == NULL) {
     196        printf("ERROR: Could not allocate psSpline1D->knots data structure\n");
    195197        testStatus = false;
    196198    }
    197199
    198200    for (i=0;i<N+1;i++) {
    199         printf("psSpline1D->domains[%d] is %f\n", i, tmpSpline->domains[i]);
     201        printf("psSpline1D->data.F32[%d] is %f\n", i,
     202               tmpSpline->knots->data.F32[i]);
    200203    }
    201204
    … …  
    272275    }
    273276
    274     if (tmpSpline->domains == NULL) {
    275         printf("ERROR: Could not allocate psSpline1D->domains data structure\n");
     277    if (tmpSpline->knots == NULL) {
     278        printf("ERROR: Could not allocate psSpline1D->knots data structure\n");
    276279        testStatus = false;
    277280    }
    278281
    279282    for (i=0;i<N+1;i++) {
    280         printf("psSpline1D->domains[%d] is %f\n", i, tmpSpline->domains[i]);
     283        printf("psSpline1D->knots->data.F32[%d] is %f\n", i,
     284               tmpSpline->knots->data.F32[i]);
    281285    }
    282286
    … …  
    331335    }
    332336
    333     if (tmpSpline->domains == NULL) {
    334         printf("ERROR: Could not allocate psSpline1D->domains data structure\n");
     337    if (tmpSpline->knots == NULL) {
     338        printf("ERROR: Could not allocate psSpline1D->knots data structure\n");
    335339        testStatus = false;
    336340    }
    337341
    338342    for (i=0;i<N+1;i++) {
    339         printf("psSpline1D->domains[%d] is %f\n", i, tmpSpline->domains[i]);
     343        printf("psSpline1D->knots->data.F32[%d] is %f\n", i,
     344               tmpSpline->knots->data.F32[i]);
    340345    }
    341346    psFree(bounds);

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

    r2392 r3096  
    6161    }
    6262
    63     if (tmpSpline->domains == NULL) {
    64         printf("ERROR: Could not allocate psSpline1D->domains data structure\n");
     63    if (tmpSpline->knots == NULL) {
     64        printf("ERROR: Could not allocate psSpline1D->knots data structure\n");
    6565        testStatus = false;
    6666    }
    6767
    6868    for (i=0;i<N+1;i++) {
    69         if (tmpSpline->domains[i] != bounds->data.F32[i]) {
    70             printf("ERROR: psSpline1D->domains[%d] is %f\n", i, tmpSpline->domains[i]);
     69        if (tmpSpline->knots->data.F32[i] != bounds->data.F32[i]) {
     70            printf("ERROR: psSpline1D->knots->data.F32[%d] is %f\n", i,
     71                   tmpSpline->knots->data.F32[i]);
    7172        }
    7273    }
    … …  
    121122    }
    122123
    123     if (tmpSpline->domains == NULL) {
    124         printf("ERROR: Could not allocate psSpline1D->domains data structure\n");
     124    if (tmpSpline->knots == NULL) {
     125        printf("ERROR: Could not allocate psSpline1D->knots data structure\n");
    125126        testStatus = false;
    126127    }
    127128
    128129    for (i=0;i<N+1;i++) {
    129         if (tmpSpline->domains[i] != bounds->data.F32[i]) {
    130             printf("ERROR: psSpline1D->domains[%d] is %f\n", i, tmpSpline->domains[i]);
     130        if (tmpSpline->knots->data.F32[i] != bounds->data.F32[i]) {
     131            printf("ERROR: psSpline1D->knots->data.F32[%d] is %f\n", i,
     132                   tmpSpline->knots->data.F32[i]);
    131133        }
    132134    }

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

    r2846 r3096  
    4040
    4141    for (i=0;i<N+1;i++) {
    42         data->data.F32[i] = tmpSpline->domains[i];
     42        data->data.F32[i] = tmpSpline->knots->data.F32[i];
    4343    }
    4444    psVectorFitSpline1D(tmpSpline, data, data, NULL);
    … …  
    9595
    9696    for (i=0;i<N+1;i++) {
    97         data->data.F32[i] = tmpSpline->domains[i];
     97        data->data.F32[i] = tmpSpline->knots->data.F32[i];
    9898    }
    9999    psVectorFitSpline1D(tmpSpline, data, data, NULL);

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

    r2439 r3096  
    4141
    4242    for (i=0;i<N+1;i++) {
    43         data->data.F32[i] = tmpSpline->domains[i];
     43        data->data.F32[i] = tmpSpline->knots->data.F32[i];
    4444    }
    4545

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

    r2439 r3096  
    5454
    5555    for (i=0;i<NUM_SPLINES+1;i++) {
    56         x->data.F32[i] = tmpSpline->domains[i];
     56        x->data.F32[i] = tmpSpline->knots->data.F32[i];
    5757        y->data.F32[i] = myFunc(x->data.F32[i]);
    5858    }
    … …  
    126126
    127127    for (i=0;i<NUM_SPLINES+1;i++) {
    128         x->data.F64[i] = tmpSpline->domains[i];
     128        x->data.F64[i] = tmpSpline->knots->data.F32[i];
    129129        y->data.F64[i] = myFunc(x->data.F64[i]);
    130130    }
Note: See TracChangeset for help on using the changeset viewer.