|
From: <kin...@us...> - 2004-02-19 03:56:57
|
Update of /cvsroot/teem/teem/src/bane/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22355/test Modified Files: tblah.c Log Message: INCOMPLETE RE-WRITE. NON_FUNCTIONALcvs diff | & more! Sorry. Index: tblah.c =================================================================== RCS file: /cvsroot/teem/teem/src/bane/test/tblah.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tblah.c 7 Jan 2004 15:34:27 -0000 1.4 --- tblah.c 19 Feb 2004 03:46:52 -0000 1.5 *************** *** 29,37 **** printf("input range (%g,%g) ---------------------\n", imin, imax); ! for (i=1; i<=BANE_RANGE_MAX; i++) { ! range = baneRangeArray[i]; ! range->ans(&omin, &omax, imin, imax); printf("%s: range %s --> (%g,%g)\n", me, range->name, omin, omax); } } --- 29,38 ---- printf("input range (%g,%g) ---------------------\n", imin, imax); ! for (i=1; i<baneRangeLast; i++) { ! range = baneRangeNew(i); ! range->answer(&omin, &omax, imin, imax); printf("%s: range %s --> (%g,%g)\n", me, range->name, omin, omax); + range = baneRangeNix(range); } } *************** *** 39,43 **** void incTest(char *me, int num, baneRange *range) { ! double *val, tmp, incParm[BANE_INC_PARM_NUM], omin, omax, rmin, rmax; baneInc *inc; Nrrd *hist; --- 40,44 ---- void incTest(char *me, int num, baneRange *range) { ! double *val, tmp, incParm[BANE_PARM_NUM], omin, omax, rmin, rmax; baneInc *inc; Nrrd *hist; *************** *** 62,92 **** fprintf(stderr, "incTest: real min,max = %g,%g\n", rmin, rmax); ! for (i=1; i<=BANE_INC_MAX; i++) { ! inc = baneIncArray[i]; printf("%s: inclusion %s ------\n", me, inc->name); switch(i) { ! case baneIncAbsolute_e: ELL_3V_SET(incParm, -0.8, 1.5, AIR_NAN); break; ! case baneIncRangeRatio_e: ELL_3V_SET(incParm, 0.99, AIR_NAN, AIR_NAN); break; ! case baneIncPercentile_e: ELL_3V_SET(incParm, 1024, 10, AIR_NAN); break; ! case baneIncStdv_e: ELL_3V_SET(incParm, 1.0, AIR_NAN, AIR_NAN); break; } ! hist = inc->histNew(incParm); if (inc->passA) { for (j=0; j<num; j++) ! inc->passA(hist, val[j], incParm); } if (inc->passB) { for (j=0; j<num; j++) ! inc->passB(hist, val[j], incParm); } inc->ans(&omin, &omax, hist, incParm, range); printf(" --> (%g,%g)\n", omin, omax); } --- 63,96 ---- fprintf(stderr, "incTest: real min,max = %g,%g\n", rmin, rmax); ! for (i=1; i<baneIncLast; i++) { ! /* NOTE: THIS IS BROKEN !!! */ ! inc = baneIncNew(i, NULL, incParm); printf("%s: inclusion %s ------\n", me, inc->name); switch(i) { ! case baneIncAbsolute: ELL_3V_SET(incParm, -0.8, 1.5, AIR_NAN); break; ! case baneIncRangeRatio: ELL_3V_SET(incParm, 0.99, AIR_NAN, AIR_NAN); break; ! case baneIncPercentile: ELL_3V_SET(incParm, 1024, 10, AIR_NAN); break; ! case baneIncStdv: ELL_3V_SET(incParm, 1.0, AIR_NAN, AIR_NAN); break; } ! fprintf(stderr, "!%s: THIS IS BROKEN!!!\n", "incTest"); ! /* if (inc->passA) { for (j=0; j<num; j++) ! inc->process[0](hist, val[j], incParm); } if (inc->passB) { for (j=0; j<num; j++) ! inc->process[1](hist, val[j], incParm); } inc->ans(&omin, &omax, hist, incParm, range); + */ printf(" --> (%g,%g)\n", omin, omax); } |