IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
May 8, 2025, 4:42:12 PM (12 months ago)
Author:
eugene
Message:

remove old deprecated tests, add some new ones

Location:
trunk/psLib/test
Files:
39 deleted
9 edited
2 copied

Legend:

Unmodified
Added
Removed

  • trunk/psLib/test

    • Property svn:ignore

      •  

        old new  
        66*.da
        77gmon.out
         8test.00.jpg
         9test.01.jpg
         10test.02.jpg
         11test.03.jpg
         12test.04.jpg
         13test.05.jpg
         14test.06.jpg
         15test.07.jpg
         16test.08.jpg
         17test.09.jpg
         18test.10.jpg
         19test.11.jpg
         20test.12.jpg
         21test.im.fits
         22test.mk.fits
         23test.sm1.fits
         24test.sm2.fits
         25test.sm3.fits
         26test.sm4.fits
         27tmpImages
         28tst_psTrace02_OUT

  • trunk/psLib/test/math

    • Property svn:ignore

      •  

        old new  
        5353tap_psSpline1D
        5454tap_psPolynomialMD
         55tap_psMinimizeLMM
         56tap_psMinimizeLMM_Alt
         57tap_psMinimizeLMM_Trail
         58tap_psPolyFit_IRLS_1D
         59tap_psPolyFit_IRLS_2D
         60tap_psPolynomialMD_sampleDark
         61test-suite.log

  • trunk/psLib/test/math/Makefile.am

    r35767 r42822  
    2323        tap_psMatrix07 \
    2424        tap_psMatrix08 \
    25         tap_psPolyFit1D \
    26         tap_psPolyFit2D \
    27         tap_psPolyFit3D \
    28         tap_psPolyFit4D \
    2925        tap_psPolynomial \
    3026        tap_psPolynomialEval1D \
    … …  
    3329        tap_psPolynomialEval4D \
    3430        tap_psPolynomialUtils_Derivatives \
     31        tap_psPolyFit1D \
     32        tap_psPolyFit2D \
     33        tap_psPolyFit3D \
     34        tap_psPolyFit4D \
     35        tap_psPolyFit_IRLS_1D \
     36        tap_psPolyFit_IRLS_2D \
    3537        tap_psSparse \
    3638        tap_psStats00 \

  • trunk/psLib/test/math/tap_psMatrix08.c

    r24087 r42822  
    2020psS32 main( psS32 argc, char* argv[] )
    2121{
     22    fprintf (stderr, "path: %s\n", argv[0]);
     23
     24    char imApath[1024];
     25    char imBpath[1024];
     26    char topPath[1024];
     27    char *libpath = strstr (argv[0], ".libs/");
     28    if (!libpath) {
     29        fprintf (stderr, "ERROR: cannot find input data\n");
     30        exit (2);
     31    }
     32
     33    // if (strncmp(argv[0], ".libs/", 6))
     34    int nTopPath = libpath - argv[0]; //
     35    if (nTopPath) {
     36        ps_strncpy_nowarn (topPath, argv[0], nTopPath); topPath[nTopPath] = 0;
     37        ps_snprintf_nowarn (imApath, 1024, "%s/%s", topPath, "data/Agj.fits");
     38        ps_snprintf_nowarn (imBpath, 1024, "%s/%s", topPath, "data/Bgj.fits");
     39    } else {
     40        ps_snprintf_nowarn (imApath, 1024, "%s", "data/Agj.fits");
     41        ps_snprintf_nowarn (imBpath, 1024, "%s", "data/Bgj.fits");
     42    }
     43
    2244    plan_tests(23);
    2345    // psTraceSetLevel("psLib.math.psMatrixGJSolve", 4);
    … …  
    3254        // XXX this is an ill-conditioned matrix.  LU Decomposition does not inform us that it is ill-conditioned. 
    3355        // the result solves the equation, but what are the errors on the values?
    34         fits = psFitsOpen ("data/Agj.fits", "r");
     56        fits = psFitsOpen (imApath, "r");
    3557        ok(fits, "opened test image Agj.fits");
    3658
    … …  
    4365        psFitsClose (fits);
    4466
    45         fits = psFitsOpen ("data/Bgj.fits", "r");
     67        fits = psFitsOpen (imBpath, "r");
    4668        ok(fits, "opened test image Bgj.fits");
    4769
    … …  
    98120
    99121        // we have a specific ill-conditioned matrix in Agj.fits. psMatrixGJSolve detects this and reports a failure.
    100         fits = psFitsOpen ("data/Agj.fits", "r");
     122        fits = psFitsOpen (imApath, "r");
    101123        ok(fits, "opened test image Agj.fits");
    102124
    … …  
    106128        psFitsClose (fits);
    107129
    108         fits = psFitsOpen ("data/Bgj.fits", "r");
     130        fits = psFitsOpen (imBpath, "r");
    109131        ok(fits, "opened test image Bgj.fits");
    110132
    … …  
    147169
    148170        // we have a specific ill-conditioned matrix in Agj.fits. psMatrixGJSolve detects this and reports a failure.
    149         fits = psFitsOpen ("data/Agj.fits", "r");
     171        fits = psFitsOpen (imApath, "r");
    150172        ok(fits, "opened test image Agj.fits");
    151173
    … …  
    158180        psFitsClose (fits);
    159181
    160         fits = psFitsOpen ("data/Bgj.fits", "r");
     182        fits = psFitsOpen (imBpath, "r");
    161183        ok(fits, "opened test image Bgj.fits");
    162184

  • trunk/psLib/test/math/tap_psMinimizeLMM.c

    r23259 r42822  
    5353
    5454#define NUM_ITER 10
    55 #define TOL  20.0
     55#define MIN_TOL  20.0
     56#define MAX_TOL  40.0
    5657psS32 main(psS32 argc, char* argv[])
    5758{
    … …  
    6465    {
    6566        psMemId id = psMemGetId();
    66         psMinimization *tmp = psMinimizationAlloc(NUM_ITER, TOL);
     67        psMinimization *tmp = psMinimizationAlloc(NUM_ITER, MIN_TOL, MAX_TOL);
    6768        ok(tmp != NULL, "psMinimizationAlloc() returned non-NULL");
    6869        skip_start(tmp == NULL, 5, "Skipping tests because psMinimizationAlloc() failed");
    6970        ok(tmp->maxIter == NUM_ITER, "psMinimizationAlloc() properly set ->maxIter");
    70         ok(tmp->tol == TOL, "psMinimizationAlloc() properly set ->tol");
     71        ok(tmp->minTol == MIN_TOL, "psMinimizationAlloc() properly set ->tol");
     72        ok(tmp->maxTol == MAX_TOL, "psMinimizationAlloc() properly set ->tol");
    7173        ok(tmp->value == 0.0, "psMinimizationAlloc() properly set ->value");
    7274        ok(tmp->iter == 0, "psMinimizationAlloc() properly set ->iter (%d)", tmp->iter);
    … …  
    9698        psMemId id = psMemGetId();
    9799        psRandom *rng = psRandomAllocSpecific(PS_RANDOM_TAUS, 1); // Random number generator; using known seed
    98         psMinimization *min = psMinimizationAlloc(NUM_ITERATIONS, ERR_TOL);
     100        psMinimization *min = psMinimizationAlloc(NUM_ITERATIONS, ERR_TOL, 100);
    99101        psArray *ordinates = psArrayAlloc(NUM_DATA_POINTS);
    100102        psVector *coordinates = psVectorAlloc(NUM_DATA_POINTS, PS_TYPE_F32);
    … …  
    204206        psMemId id = psMemGetId();
    205207        psRandom *rng = psRandomAllocSpecific(PS_RANDOM_TAUS, 1); // Random number generator; using known seed
    206         psMinimization *min = psMinimizationAlloc(NUM_ITERATIONS, ERR_TOL);
     208        psMinimization *min = psMinimizationAlloc(NUM_ITERATIONS, ERR_TOL, 100);
    207209        psArray *ordinates = psArrayAlloc(NUM_DATA_POINTS);
    208210        psVector *coordinates = psVectorAlloc(NUM_DATA_POINTS, PS_TYPE_F32);

  • trunk/psLib/test/math/tap_psMinimizePowell.c

    r13124 r42822  
    8181        psVector *myParams = psVectorAlloc(NUM_PARAMS, PS_TYPE_F32);
    8282        psVector *myParamMask = psVectorAlloc(NUM_PARAMS, PS_TYPE_U8);
    83         psMinimization *min = psMinimizationAlloc(100, 0.01);
     83        psMinimization *min = psMinimizationAlloc(100, 0.01, 0.1);
    8484        psArray *myCoords = psArrayAlloc(N);
    8585
    … …  
    136136        psMemId id = psMemGetId();
    137137        psVector *myParams = psVectorAlloc(NUM_PARAMS, PS_TYPE_F32);
    138         psMinimization *min = psMinimizationAlloc(100, 0.01);
     138        psMinimization *min = psMinimizationAlloc(100, 0.01, 0.1);
    139139        psArray *myCoords = psArrayAlloc(N);
    140140        psVector *myParamMask = psVectorAlloc(NUM_PARAMS, PS_TYPE_U8);

  • trunk/psLib/test/math/tap_psPolyFit1D.c

    r23259 r42822  
    88 
    99XXX: Try null stats.
     10
     11XXX: this function is confused about POLY_ORDER (5 should have x^5, but setData stops at x^4)
    1012 *****************************************************************************/
    1113#include <stdio.h>
    … …  
    350352    plan_tests(104);
    351353
     354    // psTraceSetLevel ("psLib.math.psMatrixGJSolve", 4);
    352355
    353356    // psVectorFitPolynomial1D()

  • trunk/psLib/test/math/tap_psSparse.c

    r13124 r42822  
    1     #include <stdio.h>
     1#include <stdio.h>
    22#include <string.h>
    33#include <pslib.h>
    … …  
    227227        // test the support functions: LowerProduct
    228228        fVec = psSparseBorderLowerProduct(NULL, border, xRef);
    229         is_float(fVec->n, 1.0, "f dimen: %d", fVec->n);
     229        is_int(fVec->n, 1.0, "f dimen: %d", fVec->n);
    230230        is_float(fVec->data.F32[0], 0.3, "f(0): %f", fVec->data.F32[0]);
    231231        psFree(fVec);
    … …  
    233233        // test the support functions: Upper Product
    234234        fVec = psSparseBorderUpperProduct(NULL, border, yRef);
    235         is_float(fVec->n, 2.0, "f dimen: %d", fVec->n);
     235        is_int(fVec->n, 2.0, "f dimen: %d", fVec->n);
    236236        is_float(fVec->data.F32[0], 0.05, "f(0): %f", fVec->data.F32[0]);
    237237        is_float(fVec->data.F32[1], 0.10, "f(0): %f", fVec->data.F32[1]);
    … …  
    240240        // test the support functions: Square Product
    241241        fVec = psSparseBorderSquareProduct(NULL, border, yRef);
    242         is_float(fVec->n, 1.0, "f dimen: %d", fVec->n);
     242        is_int(fVec->n, 1.0, "f dimen: %d", fVec->n);
    243243        is_float(fVec->data.F32[0], 0.25, "f(0): %f", fVec->data.F32[0]);
    244244        psFree(fVec);

  • trunk/psLib/test/math/tap_psSpline1D.c

    r42336 r42822  
    107107        psSpline1D *tmpSpline = NULL;
    108108        if (!xNull) {
    109             tmpSpline = psSpline1DFitVector(xF32, yF32);
     109            tmpSpline = psSpline1DFitVector(xF32, yF32, NAN, NAN);
    110110        } else {
    111             tmpSpline = psSpline1DFitVector(NULL, yF32);
     111            tmpSpline = psSpline1DFitVector(NULL, yF32, NAN, NAN);
    112112        }
    113113
    … …  
    120120                testStatus = false;
    121121            }
    122             if(tmpSpline->spline == NULL) {
    123                 diag("psSpline1DFitVector() returned a NULL psSpline1D->spline member.");
    124                 testStatus = false;
    125             }
    126             for (psS32 i = 0 ; i < NumSplines ; i++) {
    127                 if (tmpSpline->spline[i] == NULL) {
    128                     diag("psSpline1DFitVector() returned a NULL psSpline1D->spline[%d] member.", i);
    129                     testStatus = false;
    130                 }
    131             }
    132             if (tmpSpline->knots == NULL) {
     122            if (tmpSpline->xKnots == NULL) {
    133123                diag("psSpline1DFitVector() returned a NULL psSpline1D->knots member");
    134124                testStatus = false;
    135125            }
    136             if (tmpSpline->p_psDeriv2 == NULL) {
     126            if (tmpSpline->yKnots == NULL) {
     127                diag("psSpline1DFitVector() returned a NULL psSpline1D->knots member");
     128                testStatus = false;
     129            }
     130            if (tmpSpline->d2yKnots == NULL) {
    137131                diag("psSpline1DFitVector()returned a NULL psSpline1D->p_psDeriv2 member");
    138132                testStatus = false;
    139             }
    140 
    141             // Test psSpline1DEval()
    142             for (psS32 i=0;i<NumSplines;i++) {
    143                 psF32 x = 0.5 + (float) i;
    144                 psF32 y = psSpline1DEval(tmpSpline, x);
    145                 if (CheckErrorF32(y, func(x))) {
    146                     testStatus = false;
    147                     diag("TEST ERROR: f(%f) is %f, should be %f", x, y, myFunc00(x));
    148                     // XXX EAM : the truth value above should be 'func' not myFunc00
    149                 }
    150133            }
    151134
    … …  
    196179        psSpline1D *tmpSpline = NULL;
    197180        if (!xNull) {
    198             tmpSpline = psSpline1DFitVector(xF64, yF64);
     181            tmpSpline = psSpline1DFitVector(xF64, yF64, NAN, NAN);
    199182        } else {
    200             tmpSpline = psSpline1DFitVector(NULL, yF64);
     183            tmpSpline = psSpline1DFitVector(NULL, yF64, NAN, NAN);
    201184        }
    202185        if(tmpSpline == NULL) {
    … …  
    208191                testStatus = false;
    209192            }
    210             if(tmpSpline->spline == NULL) {
    211                 diag("psSpline1DFitVector() returned a NULL psSpline1D->spline member.");
    212                 testStatus = false;
    213             }
    214             for (psS32 i = 0 ; i < NumSplines ; i++) {
    215                 if (tmpSpline->spline[i] == NULL) {
    216                     diag("psSpline1DFitVector() returned a NULL psSpline1D->spline[%d] member.", i);
    217                     testStatus = false;
    218                 }
    219             }
    220             if (tmpSpline->knots == NULL) {
    221                 diag("psSpline1DFitVector() returned a NULL psSpline1D->knots member");
    222                 testStatus = false;
    223             }
    224             if (tmpSpline->p_psDeriv2 == NULL) {
    225                 diag("psSpline1DFitVector()returned a NULL psSpline1D->p_psDeriv2 member");
     193            if (tmpSpline->xKnots == NULL) {
     194                diag("psSpline1DFitVector() returned a NULL psSpline1D->xKnots member");
     195                testStatus = false;
     196            }
     197            if (tmpSpline->yKnots == NULL) {
     198                diag("psSpline1DFitVector() returned a NULL psSpline1D->yKnots member");
     199                testStatus = false;
     200            }
     201            if (tmpSpline->d2yKnots == NULL) {
     202                diag("psSpline1DFitVector()returned a NULL psSpline1D->d2yKnots member");
    226203                testStatus = false;
    227204            }
    … …  
    278255        skip_start(tmpSpline == NULL, 4, "Skipping tests because psSpline1DAlloc() failed");
    279256        ok(tmpSpline->n == 0, "psSpline1DAlloc() properly set the psSpline1D->n member");
    280         ok(tmpSpline->spline == NULL, "psSpline1DAlloc() properly set the psSpline1D->spline member");
    281         ok(tmpSpline->knots == NULL, "psSpline1DAlloc() properly set the psSpline1D->knots member");
    282         ok(tmpSpline->p_psDeriv2 == NULL, "psSpline1DAlloc() properly set the psSpline1D->p_psDeriv2 member");
     257        ok(tmpSpline->xKnots   == NULL, "psSpline1DAlloc() properly set the psSpline1D->xKnots member");
     258        ok(tmpSpline->yKnots   == NULL, "psSpline1DAlloc() properly set the psSpline1D->yKnots member");
     259        ok(tmpSpline->d2yKnots == NULL, "psSpline1DAlloc() properly set the psSpline1D->d2yKnots member");
    283260        psFree(tmpSpline);
    284261        skip_end();
    … …  
    289266    {
    290267        psMemId id = psMemGetId();
    291         psSpline1D *tmpSpline = psSpline1DFitVector(NULL, NULL);
     268        psSpline1D *tmpSpline = psSpline1DFitVector(NULL, NULL, NAN, NAN);
    292269        ok(tmpSpline == NULL, "psSpline1DFitVector() returns NULL with NULL arguments");
    293270        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
Note: See TracChangeset for help on using the changeset viewer.