Index: trunk/psLib/test/astro/tap_psEarthOrientation_corrections.c =================================================================== --- trunk/psLib/test/astro/tap_psEarthOrientation_corrections.c (revision 12596) +++ trunk/psLib/test/astro/tap_psEarthOrientation_corrections.c (revision 12607) @@ -130,9 +130,9 @@ "Skipping 3 tests because psEarthPole is NULL!"); psCube *outCube = psSphereToCube(apparent); - ok_double_tol( outCube->x, x, 0.001, + is_double_tol( outCube->x, x, 0.001, "psAberration: return correct sphere for valid inputs."); - ok_double_tol( outCube->y, y, 0.001, + is_double_tol( outCube->y, y, 0.001, "psAberration: return correct sphere for valid inputs."); - ok_double_tol( outCube->z, z, 0.001, + is_double_tol( outCube->z, z, 0.001, "psAberration: return correct sphere for valid inputs."); psFree(outCube); Index: trunk/psLib/test/astro/tap_psEarthOrientation_motion.c =================================================================== --- trunk/psLib/test/astro/tap_psEarthOrientation_motion.c (revision 12596) +++ trunk/psLib/test/astro/tap_psEarthOrientation_motion.c (revision 12607) @@ -114,9 +114,9 @@ skip_start( ep == NULL, 3, "Skipping 3 tests because psEarthPole is NULL!"); - ok_double_tol(ep->x, x, 0.1, + is_double_tol(ep->x, x, 0.1, "psEOC_PrecessionModel: return valid EarthPole for valid inputs (x)."); - ok_double_tol(ep->y, y, 0.1, + is_double_tol(ep->y, y, 0.1, "psEOC_PrecessionModel: return valid EarthPole for valid inputs (y)."); - ok_double_tol(ep->s, s, 0.1, + is_double_tol(ep->s, s, 0.1, "psEOC_PrecessionModel: return valid EarthPole for valid inputs (s)."); skip_end(); @@ -198,11 +198,11 @@ skip_start( polarMotion == NULL, 3, "Skipping 3 tests because psEarthPole is NULL!"); - ok_double_tol(polarMotion->x, x, 0.1, + is_double_tol(polarMotion->x, x, 0.1, "psEOC_GetPolarMotion: return valid EarthPole for valid inputs " "(x) - IERS B."); - ok_double_tol(polarMotion->y, y, 0.1, + is_double_tol(polarMotion->y, y, 0.1, "psEOC_GetPolarMotion: return valid EarthPole for valid inputs " "(y) - IERS B."); - ok_double_tol(polarMotion->s, s, 0.1, + is_double_tol(polarMotion->s, s, 0.1, "psEOC_GetPolarMotion: return valid EarthPole for valid inputs " "(s) - IERS B."); @@ -219,11 +219,11 @@ skip_start( polarMotion == NULL, 3, "Skipping 3 tests because psEarthPole is NULL!"); - ok_double_tol(polarMotion->x, x, 0.1, + is_double_tol(polarMotion->x, x, 0.1, "psEOC_GetPolarMotion: return valid EarthPole for valid inputs " "(x) - IERS A."); - ok_double_tol(polarMotion->y, y, 0.1, + is_double_tol(polarMotion->y, y, 0.1, "psEOC_GetPolarMotion: return valid EarthPole for valid inputs " "(y) - IERS A."); - ok_double_tol(polarMotion->s, s, 0.1, + is_double_tol(polarMotion->s, s, 0.1, "psEOC_GetPolarMotion: return valid EarthPole for valid inputs " "(s) - IERS A."); @@ -289,11 +289,11 @@ skip_start( out == NULL, 4, "Skipping 4 tests because psSphereRot output is NULL!"); - ok_double_tol( out->q0, q0, 0.0001, + is_double_tol( out->q0, q0, 0.0001, "psSphereRot_CEOtoGCRS: return correct psSphereRot for valid input (q0)."); - ok_double_tol( out->q1, q1, 0.0001, + is_double_tol( out->q1, q1, 0.0001, "psSphereRot_CEOtoGCRS: return correct psSphereRot for valid input (q1)."); - ok_double_tol( out->q2, q2, 0.0001, + is_double_tol( out->q2, q2, 0.0001, "psSphereRot_CEOtoGCRS: return correct psSphereRot for valid input (q2)."); - ok_double_tol( out->q3, -q3, 0.0001, + is_double_tol( out->q3, -q3, 0.0001, "psSphereRot_CEOtoGCRS: return correct psSphereRot for valid input (q3)."); skip_end(); @@ -355,9 +355,9 @@ psSphere *result = psSphereRotApply(NULL, earthRot, obj); psCube *cube = psSphereToCube(result); - ok_double_tol( cube->x, x, 0.0001, + is_double_tol( cube->x, x, 0.0001, "psSphereRot_TEOtoCEO: return NULL for NULL time input. (x)"); - ok_double_tol( cube->y, y, 0.0001, + is_double_tol( cube->y, y, 0.0001, "psSphereRot_TEOtoCEO: return NULL for NULL time input. (y)"); - ok_double_tol( cube->z, z, 0.0001, + is_double_tol( cube->z, z, 0.0001, "psSphereRot_TEOtoCEO: return NULL for NULL time input. (z)"); psFree(earthRot); @@ -390,11 +390,11 @@ skip_start( out == NULL, 4, "Skipping 4 tests because psSphereRot output is NULL!"); - ok_double_tol( out->q0, q0, 0.0001, + is_double_tol( out->q0, q0, 0.0001, "psSphereRot_ITRStoTEO: return correct psSphereRot for valid input (q0)."); - ok_double_tol( out->q1, q1, 0.0001, + is_double_tol( out->q1, q1, 0.0001, "psSphereRot_ITRStoTEO: return correct psSphereRot for valid input (q1)."); - ok_double_tol( out->q2, q2, 0.0001, + is_double_tol( out->q2, q2, 0.0001, "psSphereRot_ITRStoTEO: return correct psSphereRot for valid input (q2)."); - ok_double_tol( out->q3, q3, 0.0001, + is_double_tol( out->q3, q3, 0.0001, "psSphereRot_ITRStoTEO: return correct psSphereRot for valid input (q3)."); skip_end(); @@ -462,8 +462,8 @@ skip_start( rot == NULL || outputCoord == NULL, 2, "Skipping 2 tests because psSphereRot output is NULL!"); - ok_double_tol( outputCoord->r, SPHERE_PRECESS_TP1_EXPECT_R, ERROR_TOL, + is_double_tol( outputCoord->r, SPHERE_PRECESS_TP1_EXPECT_R, ERROR_TOL, "psSpherePrecess: return correct psSphereRot for valid" " inputs and PS_PRECESS_ROUGH mode. (r)"); - ok_double_tol( outputCoord->d, SPHERE_PRECESS_TP1_EXPECT_D, ERROR_TOL, + is_double_tol( outputCoord->d, SPHERE_PRECESS_TP1_EXPECT_D, ERROR_TOL, "psSpherePrecess: return correct psSphereRot for valid" " inputs and PS_PRECESS_ROUGH mode. (d)"); @@ -485,8 +485,8 @@ skip_start( rot == NULL || outputCoord == NULL, 2, "Skipping 2 tests because psSphereRot output is NULL!"); - ok_double_tol( outputCoord->r, SPHERE_PRECESS_TP2_EXPECT_R, ERROR_TOL, + is_double_tol( outputCoord->r, SPHERE_PRECESS_TP2_EXPECT_R, ERROR_TOL, "psSpherePrecess: return correct psSphereRot for valid" " inputs and PS_PRECESS_ROUGH mode. (r)"); - ok_double_tol( outputCoord->d, SPHERE_PRECESS_TP2_EXPECT_D, ERROR_TOL, + is_double_tol( outputCoord->d, SPHERE_PRECESS_TP2_EXPECT_D, ERROR_TOL, "psSpherePrecess: return correct psSphereRot for valid" " inputs and PS_PRECESS_ROUGH mode. (d)"); @@ -508,8 +508,8 @@ skip_start( rot == NULL || outputCoord == NULL, 2, "Skipping 2 tests because psSphereRot output is NULL!"); - ok_double_tol( outputCoord->r, SPHERE_PRECESS_TP3_EXPECT_R, ERROR_TOL, + is_double_tol( outputCoord->r, SPHERE_PRECESS_TP3_EXPECT_R, ERROR_TOL, "psSpherePrecess: return correct psSphereRot for valid" " inputs and PS_PRECESS_ROUGH mode. (r)"); - ok_double_tol( outputCoord->d, SPHERE_PRECESS_TP3_EXPECT_D, ERROR_TOL, + is_double_tol( outputCoord->d, SPHERE_PRECESS_TP3_EXPECT_D, ERROR_TOL, "psSpherePrecess: return correct psSphereRot for valid" " inputs and PS_PRECESS_ROUGH mode. (d)"); Index: trunk/psLib/test/astro/tap_psSphereOps_all.c =================================================================== --- trunk/psLib/test/astro/tap_psSphereOps_all.c (revision 12596) +++ trunk/psLib/test/astro/tap_psSphereOps_all.c (revision 12607) @@ -77,11 +77,11 @@ ok( myST != NULL && psMemCheckSphereRot(myST), "psSphereRotAlloc: return allocated SphereRot for valid inputs."); - ok_double(q0, myST->q0, + is_double(q0, myST->q0, "psSphereRotAlloc: return correct q0 value."); - ok_double(q1, myST->q1, + is_double(q1, myST->q1, "psSphereRotAlloc: return correct q1 value."); - ok_double(q2, myST->q2, + is_double(q2, myST->q2, "psSphereRotAlloc: return correct q2 value."); - ok_double(q3, myST->q3, + is_double(q3, myST->q3, "psSphereRotAlloc: return correct q3 value."); } @@ -107,11 +107,11 @@ ok( myST != NULL && psMemCheckSphereRot(myST), "psSphereRotQuat: return allocated SphereRot for valid inputs."); - ok_double(q0, myST->q0, + is_double(q0, myST->q0, "psSphereRotQuat: return correct q0 value."); - ok_double(q1, myST->q1, + is_double(q1, myST->q1, "psSphereRotQuat: return correct q1 value."); - ok_double(q2, myST->q2, + is_double(q2, myST->q2, "psSphereRotQuat: return correct q2 value."); - ok_double(q3, myST->q3, + is_double(q3, myST->q3, "psSphereRotQuat: return correct q3 value."); } @@ -190,7 +190,7 @@ "Skipping 1 tests because psSphereRotApply failed!"); out2 = psSphereRotApply(out2, s1, out); - ok_double( out2->r, 0.0, + is_double( out2->r, 0.0, "psSphereRotConjugate: return correct SphereRot values."); - ok_double( out2->d, 0.0, + is_double( out2->d, 0.0, "psSphereRotConjugate: return correct SphereRot values."); skip_end(); @@ -207,11 +207,11 @@ { s1 = psSphereRotInvert(-PHI_P, -DELTA_P, -ALPHA_P); - ok_double(s1->q0, myST->q0, + is_double(s1->q0, myST->q0, "psSphereRotInvert: return correct q0 value."); - ok_double(s1->q1, myST->q1, + is_double(s1->q1, myST->q1, "psSphereRotInvert: return correct q1 value."); - ok_double(s1->q2, myST->q2, + is_double(s1->q2, myST->q2, "psSphereRotInvert: return correct q2 value."); - ok_double(s1->q3, myST->q3, + is_double(s1->q3, myST->q3, "psSphereRotInvert: return correct q3 value."); psFree(s1); @@ -240,7 +240,7 @@ icrs->d = DEG_TO_RAD(90.0); psSphere* ecliptic = psSphereRotApply(NULL, s1, icrs); - ok_double_tol(DEG_TO_RAD(90.0), ecliptic->r, 0.00001, + is_double_tol(DEG_TO_RAD(90.0), ecliptic->r, 0.00001, "psSphereRotICRSToEcliptic: return correct SphereRot for MJD_2000 date."); - ok_double_tol(DEG_TO_RAD(66.560719), ecliptic->d, 0.00001, + is_double_tol(DEG_TO_RAD(66.560719), ecliptic->d, 0.00001, "psSphereRotICRSToEcliptic: return correct SphereRot for MJD_2000 date."); psFree(ecliptic); @@ -271,7 +271,7 @@ psSphere* fromEcliptic = psSphereRotApply(NULL, s2, ecliptic); //XXX: Pretty sure the following can be 180 degrees OR 0 degrees. (= the poles) - ok_double_tol(DEG_TO_RAD(180.0), fromEcliptic->r, 0.00001, + is_double_tol(DEG_TO_RAD(180.0), fromEcliptic->r, 0.00001, "psSphereRotEclipticToICRS: return correct SphereRot for MJD_2000 date."); - ok_double_tol(DEG_TO_RAD(90.0), fromEcliptic->d, 0.00001, + is_double_tol(DEG_TO_RAD(90.0), fromEcliptic->d, 0.00001, "psSphereRotEclipticToICRS: return correct SphereRot for MJD_2000 date."); psFree(ecliptic); @@ -289,7 +289,7 @@ s2 = psSphereRotICRSToGalactic(); galactic = psSphereRotApply(NULL, s2, icrs); - ok_double_tol(DEG_TO_RAD(122.93192), galactic->r, 0.00001, + is_double_tol(DEG_TO_RAD(122.93192), galactic->r, 0.00001, "psSphereRotICRSToGalactic: return correct SphereRot."); - ok_double_tol(DEG_TO_RAD(27.12825), galactic->d, 0.00001, + is_double_tol(DEG_TO_RAD(27.12825), galactic->d, 0.00001, "psSphereRotICRSToGalactic: return correct SphereRot."); } @@ -300,7 +300,7 @@ psSphere *test = psSphereRotApply(NULL, s1, galactic); //XXX: Pretty sure the following can be 180 degrees OR 0 degrees. (= the poles) - ok_double_tol(DEG_TO_RAD(180.0), test->r, 0.00001, + is_double_tol(DEG_TO_RAD(180.0), test->r, 0.00001, "psSphereRotGalacticToICRS: return correct SphereRot."); - ok_double_tol(DEG_TO_RAD(90.0), test->d, 0.00001, + is_double_tol(DEG_TO_RAD(90.0), test->d, 0.00001, "psSphereRotGalacticToICRS: return correct SphereRot."); psFree(test); @@ -382,7 +382,7 @@ output = psSphereGetOffset(origin, offset, PS_SPHERICAL, PS_ARCMIN); empty = psSphereGetOffset(origin, offset, PS_SPHERICAL, PS_DEGREE); - ok_double_tol(DEG_TO_RAD(empty->r), MIN_TO_RAD(output->r), 0.0001, + is_double_tol(DEG_TO_RAD(empty->r), MIN_TO_RAD(output->r), 0.0001, "psSphereGetOffset: return correct offset for differing units."); - ok_double_tol(DEG_TO_RAD(empty->d), MIN_TO_RAD(output->d), 0.0001, + is_double_tol(DEG_TO_RAD(empty->d), MIN_TO_RAD(output->d), 0.0001, "psSphereGetOffset: return correct offset for differing units."); psFree(output); @@ -426,7 +426,7 @@ skip_start( output == NULL, 2, "Skipping 2 tests because Sphere output is NULL!"); - ok_double(output->r, M_PI/4.0, + is_double(output->r, M_PI/4.0, "psSphereSetOffset: return correct spherical offset."); - ok_double(output->d, M_PI/6.0, + is_double(output->d, M_PI/6.0, "psSphereSetOffset: return correct spherical offset."); skip_end(); @@ -443,7 +443,7 @@ skip_start( empty == NULL, 2, "Skipping 2 tests because Sphere output is NULL!"); - ok_double_tol(empty->r, offset->r, 0.00001, + is_double_tol(empty->r, offset->r, 0.00001, "psSphereGetOffset: return correct spherical offset."); - ok_double_tol(empty->d, offset->d, 0.00001, + is_double_tol(empty->d, offset->d, 0.00001, "psSphereGetOffset: return correct spherical offset."); skip_end(); @@ -464,7 +464,7 @@ skip_start( empty == NULL, 2, "Skipping 2 tests because Sphere output is NULL!"); - ok_double_tol(empty->r, (M_PI / 4.0), 0.0001, + is_double_tol(empty->r, (M_PI / 4.0), 0.0001, "psSphereGetOffset: return correct spherical offset."); - ok_double_tol(empty->d, (M_PI / 6.0), 0.0001, + is_double_tol(empty->d, (M_PI / 6.0), 0.0001, "psSphereGetOffset: return correct spherical offset."); skip_end(); @@ -480,7 +480,7 @@ offset->d = (M_PI / 6.0); //30 deg empty = psSphereSetOffset(origin, offset, PS_SPHERICAL, PS_RADIAN); - ok_double_tol(empty->r, offset->r, 0.0001, + is_double_tol(empty->r, offset->r, 0.0001, "psSphereSetOffset: return correct offset for differing units."); - ok_double_tol(empty->d, offset->d, 0.0001, + is_double_tol(empty->d, offset->d, 0.0001, "psSphereSetOffset: return correct offset for differing units."); psFree(output); Index: trunk/psLib/test/astro/tap_psTime_01.c =================================================================== --- trunk/psLib/test/astro/tap_psTime_01.c (revision 12596) +++ trunk/psLib/test/astro/tap_psTime_01.c (revision 12607) @@ -23,6 +23,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-03-13 00:01:37 $ + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-03-27 22:52:02 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -187,5 +187,5 @@ psMemId id = psMemGetId(); psF64 ut1Delta = psTimeGetUT1Delta(NULL, PS_IERS_B); - ok_double(ut1Delta, NAN, "psTimeGetUT1Delta(NULL, PS_IERS_B) returned NAN"); + is_double(ut1Delta, NAN, "psTimeGetUT1Delta(NULL, PS_IERS_B) returned NAN"); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); } @@ -200,5 +200,5 @@ time->leapsecond = false; psF64 ut1Delta = psTimeGetUT1Delta(time, PS_IERS_B); - ok_double(ut1Delta, NAN, "psTimeGetUT1Delta() returned NAN for incorrect time"); + is_double(ut1Delta, NAN, "psTimeGetUT1Delta() returned NAN for incorrect time"); psFree(time); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -214,5 +214,5 @@ time->leapsecond = false; psF64 ut1Delta = psTimeGetUT1Delta(time, -100); - ok_double(ut1Delta, NAN, "psTimeGetUT1Delta(time, -100) returned NAN (incorrect bulletin)"); + is_double(ut1Delta, NAN, "psTimeGetUT1Delta(time, -100) returned NAN (incorrect bulletin)"); psFree(time); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -229,5 +229,5 @@ psF64 ut1Delta = psTimeGetUT1Delta(time, PS_IERS_A); - ok_double_tol(ut1Delta, testTime1UT1DeltaBullA, ERROR_TOL, "psTimeGetUT1Delta() produced the correct result: bulletin A"); + is_double_tol(ut1Delta, testTime1UT1DeltaBullA, ERROR_TOL, "psTimeGetUT1Delta() produced the correct result: bulletin A"); psFree(time); @@ -244,5 +244,5 @@ psF64 ut1Delta = psTimeGetUT1Delta(time, PS_IERS_B); - ok_double_tol(ut1Delta, testTime1UT1DeltaBullB, ERROR_TOL, "psTimeGetUT1Delta() produced the correct result: bulletin B"); + is_double_tol(ut1Delta, testTime1UT1DeltaBullB, ERROR_TOL, "psTimeGetUT1Delta() produced the correct result: bulletin B"); psFree(time); @@ -262,5 +262,5 @@ psF64 ut1Delta = psTimeGetUT1Delta(time,PS_IERS_A); - ok_double_tol(ut1Delta, testTime2UT1DeltaBullA, ERROR_TOL, "psTimeGetUT1Delta() produced the correct result: bulletin B"); + is_double_tol(ut1Delta, testTime2UT1DeltaBullA, ERROR_TOL, "psTimeGetUT1Delta() produced the correct result: bulletin B"); psFree(time); @@ -280,5 +280,5 @@ psF64 ut1Delta = psTimeGetUT1Delta(time,PS_IERS_B); - ok_double_tol(ut1Delta, testTime2UT1DeltaBullB, ERROR_TOL, "psTimeGetUT1Delta() produced the correct result: bulletin B"); + is_double_tol(ut1Delta, testTime2UT1DeltaBullB, ERROR_TOL, "psTimeGetUT1Delta() produced the correct result: bulletin B"); psFree(time); @@ -298,5 +298,5 @@ psF64 ut1Delta = psTimeGetUT1Delta(time,PS_IERS_A); - ok_double_tol(ut1Delta, testTime3UT1DeltaBullA, ERROR_TOL, "psTimeGetUT1Delta() produced the correct result: bulletin B"); + is_double_tol(ut1Delta, testTime3UT1DeltaBullA, ERROR_TOL, "psTimeGetUT1Delta() produced the correct result: bulletin B"); psFree(time); @@ -315,5 +315,5 @@ psF64 ut1Delta = psTimeGetUT1Delta(time,PS_IERS_B); - ok_double_tol(ut1Delta, testTime3UT1DeltaBullB, ERROR_TOL, "psTimeGetUT1Delta() produced the correct result: bulletin B"); + is_double_tol(ut1Delta, testTime3UT1DeltaBullB, ERROR_TOL, "psTimeGetUT1Delta() produced the correct result: bulletin B"); psFree(time); @@ -329,5 +329,5 @@ psMemId id = psMemGetId(); psF64 mjd = psTimeToMJD(NULL); - ok_double(mjd, NAN, "psTimeToMJD(NULL) returned NULL"); + is_double(mjd, NAN, "psTimeToMJD(NULL) returned NULL"); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); } @@ -346,5 +346,5 @@ time->leapsecond = false; psF64 mjd = psTimeToMJD(time); - ok_double(mjd, NAN, "psTimeToMJD() returned NAN for incorrect time"); + is_double(mjd, NAN, "psTimeToMJD() returned NAN for incorrect time"); psFree(time); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -361,5 +361,5 @@ psF64 mjd = psTimeToMJD(time); - ok_double_tol(mjd, 53207.765929, ERROR_TOL, "psTimeToMJD() returned correct time after 1/1/1970 epoch"); + is_double_tol(mjd, 53207.765929, ERROR_TOL, "psTimeToMJD() returned correct time after 1/1/1970 epoch"); psFree(time); @@ -376,5 +376,5 @@ psF64 mjd = psTimeToMJD(time); - ok_double_tol(mjd, testTime4MJD, ERROR_TOL, "psTimeToMJD() returned correct time before 1/1/1970 epoch"); + is_double_tol(mjd, testTime4MJD, ERROR_TOL, "psTimeToMJD() returned correct time before 1/1/1970 epoch"); psFree(time); @@ -391,5 +391,5 @@ psF64 jd = psTimeToJD(NULL); - ok_double(jd, NAN, "psTimeToJD(NULL) returned NULL"); + is_double(jd, NAN, "psTimeToJD(NULL) returned NULL"); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); } @@ -407,5 +407,5 @@ psF64 jd = psTimeToJD(time); - ok_double(jd, NAN, "psTimeToJD() returned NAN for incorrect time"); + is_double(jd, NAN, "psTimeToJD() returned NAN for incorrect time"); psFree(time); @@ -423,5 +423,5 @@ psF64 jd = psTimeToJD(time); - ok_double_tol(jd, 2453208.265929, ERROR_TOL, "psTimeToJD() returned the correct time after 1/1/1970 epoch"); + is_double_tol(jd, 2453208.265929, ERROR_TOL, "psTimeToJD() returned the correct time after 1/1/1970 epoch"); psFree(time); @@ -439,5 +439,5 @@ psF64 jd = psTimeToJD(time); - ok_double_tol(jd, testTime4JD, ERROR_TOL, "psTimeToJD() returned the correct time before 1/1/1970 epoch"); + is_double_tol(jd, testTime4JD, ERROR_TOL, "psTimeToJD() returned the correct time before 1/1/1970 epoch"); psFree(time); @@ -528,5 +528,5 @@ char *timeStr = psTimeToISO(time); - ok_str(timeStr, testTime1Str, "psTimeToISO(time) returned correct time (no leapsecond)"); + is_str(timeStr, testTime1Str, "psTimeToISO(time) returned correct time (no leapsecond)"); psFree(timeStr); @@ -547,5 +547,5 @@ char *timeStr = psTimeToISO(time); - ok_str(timeStr, testTime1StrLeap, "psTimeToISO(time) returned correct time (with leapsecond)"); + is_str(timeStr, testTime1StrLeap, "psTimeToISO(time) returned correct time (with leapsecond)"); psFree(timeStr); Index: trunk/psLib/test/astro/tap_psTime_02.c =================================================================== --- trunk/psLib/test/astro/tap_psTime_02.c (revision 12596) +++ trunk/psLib/test/astro/tap_psTime_02.c (revision 12607) @@ -12,6 +12,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-03-13 00:02:14 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-03-27 22:52:02 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -66,5 +66,5 @@ psF64 lmst = psTimeToLMST(NULL, 0); - ok_double(lmst, NAN, "psTimeToLMST(time,0) returned NAN"); + is_double(lmst, NAN, "psTimeToLMST(time,0) returned NAN"); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -82,5 +82,5 @@ psF64 lmst = psTimeToLMST(time, 0.0); - ok_double_tol(lmst, testTime1LMST0, ERROR_TOL, "psTimeToLMST() returned the correct time"); + is_double_tol(lmst, testTime1LMST0, ERROR_TOL, "psTimeToLMST() returned the correct time"); psFree(time); @@ -102,5 +102,5 @@ psF64 lmst = psTimeToLMST(time,0.0); - ok_double(lmst, NAN, "psTimeToLMST() generated a NAN for incorrect type"); + is_double(lmst, NAN, "psTimeToLMST() generated a NAN for incorrect type"); psFree(time); Index: trunk/psLib/test/astro/tap_psTime_03.c =================================================================== --- trunk/psLib/test/astro/tap_psTime_03.c (revision 12596) +++ trunk/psLib/test/astro/tap_psTime_03.c (revision 12607) @@ -11,6 +11,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-03-13 00:19:21 $ + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-03-27 22:52:02 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -326,5 +326,5 @@ psF64 delta = psTimeDelta(NULL, NULL); - ok_double_tol(delta, 0.0, ERROR_TOL, "psTimeDelta(NULL, NULL) returned 0.0"); + is_double_tol(delta, 0.0, ERROR_TOL, "psTimeDelta(NULL, NULL) returned 0.0"); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -341,5 +341,5 @@ psF64 delta = psTimeDelta(time1, NULL); - ok_double_tol(delta, 0.0, ERROR_TOL, "psTimeDelta(time1, NULL) returned 0.0"); + is_double_tol(delta, 0.0, ERROR_TOL, "psTimeDelta(time1, NULL) returned 0.0"); psFree(time1); @@ -360,5 +360,5 @@ psF64 delta = psTimeDelta(time1, time2); - ok_double_tol(delta, 0.0, ERROR_TOL, "psTimeDelta(time1, NULL) returned 0.0 for unallowed time1 arg"); + is_double_tol(delta, 0.0, ERROR_TOL, "psTimeDelta(time1, NULL) returned 0.0 for unallowed time1 arg"); psFree(time1); @@ -382,5 +382,5 @@ psF64 delta = psTimeDelta(time1, time2); - ok_double_tol(delta, 0.0, ERROR_TOL, "psTimeDelta(time1, NULL) returned 0.0 for unallowed time2 arg"); + is_double_tol(delta, 0.0, ERROR_TOL, "psTimeDelta(time1, NULL) returned 0.0 for unallowed time2 arg"); psFree(time1); @@ -406,5 +406,5 @@ psF64 delta = psTimeDelta(time1, time2); - ok_double_tol(delta, 0.0, ERROR_TOL, "psTimeDelta(time1, NULL) returned 0.0 for different time types"); + is_double_tol(delta, 0.0, ERROR_TOL, "psTimeDelta(time1, NULL) returned 0.0 for different time types"); psFree(time1); @@ -428,5 +428,5 @@ psF64 delta = psTimeDelta(time2, time1); - ok_double_tol(delta, deltaTime1, ERROR_TOL, "psTimeDelta(time1, NULL) returned correct delta for times of the same type"); + is_double_tol(delta, deltaTime1, ERROR_TOL, "psTimeDelta(time1, NULL) returned correct delta for times of the same type"); psFree(time1); @@ -451,5 +451,5 @@ psF64 delta = psTimeDelta(time2,time1); - ok_double_tol(delta, deltaTime2, ERROR_TOL, "psTimeDelta(time1, NULL) returned correct delta for times of the same type"); + is_double_tol(delta, deltaTime2, ERROR_TOL, "psTimeDelta(time1, NULL) returned correct delta for times of the same type"); psFree(time1); @@ -474,5 +474,5 @@ psF64 delta = psTimeDelta(time2,time1); - ok_double_tol(delta, deltaTime3, ERROR_TOL, "psTimeDelta(time1, NULL) returned correct delta for times of the same type"); + is_double_tol(delta, deltaTime3, ERROR_TOL, "psTimeDelta(time1, NULL) returned correct delta for times of the same type"); psFree(time1); @@ -494,10 +494,10 @@ // Verify TAI ISO string char *timeStr = psTimeToISO(time); - ok_str(timeStr, testTimeBStrTAI[i], "TAI ISO string"); + is_str(timeStr, testTimeBStrTAI[i], "TAI ISO string"); psFree(timeStr); time = psTimeConvert(time, PS_TIME_TT); timeStr = psTimeToISO(time); - ok_str(timeStr, testTimeBStrTT[i], "TT ISO string"); + is_str(timeStr, testTimeBStrTT[i], "TT ISO string"); psFree(timeStr); @@ -506,10 +506,10 @@ time->leapsecond = testTimeBLeapsecond[i]; timeStr = psTimeToISO(time); - ok_str(timeStr, testTimeBStrUTC[i], "UTC ISO string"); + is_str(timeStr, testTimeBStrUTC[i], "UTC ISO string"); psFree(timeStr); time = psTimeConvert(time, PS_TIME_UT1); timeStr = psTimeToISO(time); - ok_str(timeStr, testTimeBStrUT1[i], "UT1 ISO string"); + is_str(timeStr, testTimeBStrUT1[i], "UT1 ISO string"); psFree(timeStr); Index: trunk/psLib/test/db/tap_psDB.c =================================================================== --- trunk/psLib/test/db/tap_psDB.c (revision 12596) +++ trunk/psLib/test/db/tap_psDB.c (revision 12607) @@ -6,6 +6,6 @@ * @author Joshua Hoblitt, University of Hawaii * - * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-03-10 01:24:09 $ + * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-03-27 22:52:02 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -164,7 +164,7 @@ // XXX this test is depending on the order the rows come out it... // this shouldn't be depended upon - ok_str((char *)column->data[0], "brown", "horse.color == 'brown'"); + is_str((char *)column->data[0], "brown", "horse.color == 'brown'"); ok((char *)column->data[1] == NULL, "horse.color == NULL"); - ok_str((char *)column->data[2], "pink", "horse.color == 'pink'"); + is_str((char *)column->data[2], "pink", "horse.color == 'pink'"); psFree(column); @@ -177,6 +177,6 @@ is_long(psVectorLength(column), 2, "psDBSelectColumnNum() - number of elements"); - ok_float(column->data.F32[0], 10e3, "hair == 10e3") - ok_float(column->data.F32[1], NAN, "hair == NAN") + is_float(column->data.F32[0], 10e3, "hair == 10e3") + is_float(column->data.F32[1], NAN, "hair == NAN") psFree(column); @@ -197,6 +197,6 @@ psMetadataItem *item = psListGet(md->list, 0); - ok_str(item->name, "color", "column name"); - ok_str((char *)item->data.V, "brown", "column value"); + is_str(item->name, "color", "column name"); + is_str((char *)item->data.V, "brown", "column value"); } psFree(resultSet); @@ -219,5 +219,5 @@ psMetadataItem *item = psListGet(columns->list, 0); - ok_str(item->name, "color", "column name"); + is_str(item->name, "color", "column name"); is_long(psArrayLength((psArray*)item->data.V), 3, "column array length"); @@ -245,5 +245,5 @@ psMetadataItem *item = psListGet(md->list, 0); - ok_str((char *)item->data.V, "HOT pink", "psDBUpdateRows() - psDBSelectRows() found HOT pink"); + is_str((char *)item->data.V, "HOT pink", "psDBUpdateRows() - psDBSelectRows() found HOT pink"); } Index: trunk/psLib/test/imageops/tap_psImageShift.c =================================================================== --- trunk/psLib/test/imageops/tap_psImageShift.c (revision 12596) +++ trunk/psLib/test/imageops/tap_psImageShift.c (revision 12607) @@ -28,13 +28,13 @@ // integer shifts should be exact psImage *shift = psImageShift (NULL, image, 1.0, 1.0, 0.0, PS_INTERPOLATE_BILINEAR); - ok_float (shift->data.F32[10][10], 0.0, "point 10,10 should be 0.0 : %f", shift->data.F32[10][10]); - ok_float (shift->data.F32[10][11], 0.0, "point 10,11 should be 0.0 : %f", shift->data.F32[10][11]); - ok_float (shift->data.F32[10][12], 0.0, "point 10,12 should be 0.0 : %f", shift->data.F32[10][12]); - ok_float (shift->data.F32[11][10], 0.0, "point 11,10 should be 0.0 : %f", shift->data.F32[11][10]); - ok_float (shift->data.F32[11][11], 1.0, "point 11,11 should be 1.0 : %f", shift->data.F32[11][11]); - ok_float (shift->data.F32[11][12], 0.0, "point 11,12 should be 0.0 : %f", shift->data.F32[11][12]); - ok_float (shift->data.F32[12][10], 0.0, "point 12,10 should be 0.0 : %f", shift->data.F32[12][10]); - ok_float (shift->data.F32[12][11], 0.0, "point 12,11 should be 0.0 : %f", shift->data.F32[12][11]); - ok_float (shift->data.F32[12][12], 0.0, "point 12,12 should be 0.0 : %f", shift->data.F32[12][12]); + is_float (shift->data.F32[10][10], 0.0, "point 10,10 should be 0.0 : %f", shift->data.F32[10][10]); + is_float (shift->data.F32[10][11], 0.0, "point 10,11 should be 0.0 : %f", shift->data.F32[10][11]); + is_float (shift->data.F32[10][12], 0.0, "point 10,12 should be 0.0 : %f", shift->data.F32[10][12]); + is_float (shift->data.F32[11][10], 0.0, "point 11,10 should be 0.0 : %f", shift->data.F32[11][10]); + is_float (shift->data.F32[11][11], 1.0, "point 11,11 should be 1.0 : %f", shift->data.F32[11][11]); + is_float (shift->data.F32[11][12], 0.0, "point 11,12 should be 0.0 : %f", shift->data.F32[11][12]); + is_float (shift->data.F32[12][10], 0.0, "point 12,10 should be 0.0 : %f", shift->data.F32[12][10]); + is_float (shift->data.F32[12][11], 0.0, "point 12,11 should be 0.0 : %f", shift->data.F32[12][11]); + is_float (shift->data.F32[12][12], 0.0, "point 12,12 should be 0.0 : %f", shift->data.F32[12][12]); psFree(shift); psFree(image); @@ -64,13 +64,13 @@ psImage *shift = psImageShift (NULL, image, 0.2, 0.4, 0.0, PS_INTERPOLATE_BILINEAR); // diag("these require tolerance of 4 epsilon (why?)"); - ok_float_tol (shift->data.F32[10][10], 0.8*0.6, 4*FLT_EPSILON, "point 10,10 should be %f : %f", 0.8*0.6, shift->data.F32[10][10]); - ok_float_tol (shift->data.F32[10][11], 0.2*0.6, 4*FLT_EPSILON, "point 10,11 should be %f : %f", 0.2*0.6, shift->data.F32[10][11]); - ok_float_tol (shift->data.F32[10][12], 0.0, 4*FLT_EPSILON, "point 10,12 should be %f : %f", 0.0, shift->data.F32[10][12]); - ok_float_tol (shift->data.F32[11][10], 0.8*0.4, 4*FLT_EPSILON, "point 11,10 should be %f : %f", 0.8*0.4, shift->data.F32[11][10]); - ok_float_tol (shift->data.F32[11][11], 0.2*0.4, 4*FLT_EPSILON, "point 11,11 should be %f : %f", 0.2*0.4, shift->data.F32[11][11]); - ok_float_tol (shift->data.F32[11][12], 0.0, 4*FLT_EPSILON, "point 11,12 should be %f : %f", 0.0, shift->data.F32[11][12]); - ok_float_tol (shift->data.F32[12][10], 0.0, 4*FLT_EPSILON, "point 12,10 should be %f : %f", 0.0, shift->data.F32[12][10]); - ok_float_tol (shift->data.F32[12][11], 0.0, 4*FLT_EPSILON, "point 12,11 should be %f : %f", 0.0, shift->data.F32[12][11]); - ok_float_tol (shift->data.F32[12][12], 0.0, 4*FLT_EPSILON, "point 12,12 should be %f : %f", 0.0, shift->data.F32[12][12]); + is_float_tol (shift->data.F32[10][10], 0.8*0.6, 4*FLT_EPSILON, "point 10,10 should be %f : %f", 0.8*0.6, shift->data.F32[10][10]); + is_float_tol (shift->data.F32[10][11], 0.2*0.6, 4*FLT_EPSILON, "point 10,11 should be %f : %f", 0.2*0.6, shift->data.F32[10][11]); + is_float_tol (shift->data.F32[10][12], 0.0, 4*FLT_EPSILON, "point 10,12 should be %f : %f", 0.0, shift->data.F32[10][12]); + is_float_tol (shift->data.F32[11][10], 0.8*0.4, 4*FLT_EPSILON, "point 11,10 should be %f : %f", 0.8*0.4, shift->data.F32[11][10]); + is_float_tol (shift->data.F32[11][11], 0.2*0.4, 4*FLT_EPSILON, "point 11,11 should be %f : %f", 0.2*0.4, shift->data.F32[11][11]); + is_float_tol (shift->data.F32[11][12], 0.0, 4*FLT_EPSILON, "point 11,12 should be %f : %f", 0.0, shift->data.F32[11][12]); + is_float_tol (shift->data.F32[12][10], 0.0, 4*FLT_EPSILON, "point 12,10 should be %f : %f", 0.0, shift->data.F32[12][10]); + is_float_tol (shift->data.F32[12][11], 0.0, 4*FLT_EPSILON, "point 12,11 should be %f : %f", 0.0, shift->data.F32[12][11]); + is_float_tol (shift->data.F32[12][12], 0.0, 4*FLT_EPSILON, "point 12,12 should be %f : %f", 0.0, shift->data.F32[12][12]); psFree(shift); psFree(image); @@ -117,6 +117,6 @@ // diag ("these require a tolerance of 100 epsilon"); - ok_float_tol (xo, 16.0, 100*FLT_EPSILON, "x-centroid should be %f : %f", 16.0, xo); - ok_float_tol (xo, 16.0, 100*FLT_EPSILON, "y-centroid should be %f : %f", 16.0, yo); + is_float_tol (xo, 16.0, 100*FLT_EPSILON, "x-centroid should be %f : %f", 16.0, xo); + is_float_tol (xo, 16.0, 100*FLT_EPSILON, "y-centroid should be %f : %f", 16.0, yo); // fractional shifts introduce smoothing, @@ -137,6 +137,6 @@ // diag ("these require a tolerance of 100 epsilon"); - ok_float_tol (xo, 17.2, 100*FLT_EPSILON, "x-centroid should be %f : %f", 17.2, xo); - ok_float_tol (yo, 14.8, 100*FLT_EPSILON, "y-centroid should be %f : %f", 14.8, yo); + is_float_tol (xo, 17.2, 100*FLT_EPSILON, "x-centroid should be %f : %f", 17.2, xo); + is_float_tol (yo, 14.8, 100*FLT_EPSILON, "y-centroid should be %f : %f", 14.8, yo); psFree(shift); @@ -161,13 +161,13 @@ // fractional shifts introduce smoothing, psImage *shift = psImageShift (NULL, image, 0.2, 0.4, 0.0, PS_INTERPOLATE_BICUBE); - ok_float_tol (shift->data.F32[10][10], -0.157778, 4*FLT_EPSILON, "point 10,10 should be %f : %f", -0.157778, shift->data.F32[10][10]); - ok_float_tol (shift->data.F32[10][11], +0.168889, 4*FLT_EPSILON, "point 10,11 should be %f : %f", +0.168889, shift->data.F32[10][11]); - ok_float_tol (shift->data.F32[10][12], -0.131111, 4*FLT_EPSILON, "point 10,12 should be %f : %f", -0.131111, shift->data.F32[10][12]); - ok_float_tol (shift->data.F32[11][10], +0.142221, 4*FLT_EPSILON, "point 11,10 should be %f : %f", +0.142221, shift->data.F32[11][10]); - ok_float_tol (shift->data.F32[11][11], +0.488884, 4*FLT_EPSILON, "point 11,11 should be %f : %f", +0.488884, shift->data.F32[11][11]); - ok_float_tol (shift->data.F32[11][12], +0.208878, 4*FLT_EPSILON, "point 11,12 should be %f : %f", +0.208878, shift->data.F32[11][12]); - ok_float_tol (shift->data.F32[12][10], -0.064500, 4*FLT_EPSILON, "point 12,10 should be %f : %f", -0.064500, shift->data.F32[12][10]); - ok_float_tol (shift->data.F32[12][11], +0.302066, 4*FLT_EPSILON, "point 12,11 should be %f : %f", +0.302066, shift->data.F32[12][11]); - ok_float_tol (shift->data.F32[12][12], +0.041884, 4*FLT_EPSILON, "point 12,12 should be %f : %f", +0.041884, shift->data.F32[12][12]); + is_float_tol (shift->data.F32[10][10], -0.157778, 4*FLT_EPSILON, "point 10,10 should be %f : %f", -0.157778, shift->data.F32[10][10]); + is_float_tol (shift->data.F32[10][11], +0.168889, 4*FLT_EPSILON, "point 10,11 should be %f : %f", +0.168889, shift->data.F32[10][11]); + is_float_tol (shift->data.F32[10][12], -0.131111, 4*FLT_EPSILON, "point 10,12 should be %f : %f", -0.131111, shift->data.F32[10][12]); + is_float_tol (shift->data.F32[11][10], +0.142221, 4*FLT_EPSILON, "point 11,10 should be %f : %f", +0.142221, shift->data.F32[11][10]); + is_float_tol (shift->data.F32[11][11], +0.488884, 4*FLT_EPSILON, "point 11,11 should be %f : %f", +0.488884, shift->data.F32[11][11]); + is_float_tol (shift->data.F32[11][12], +0.208878, 4*FLT_EPSILON, "point 11,12 should be %f : %f", +0.208878, shift->data.F32[11][12]); + is_float_tol (shift->data.F32[12][10], -0.064500, 4*FLT_EPSILON, "point 12,10 should be %f : %f", -0.064500, shift->data.F32[12][10]); + is_float_tol (shift->data.F32[12][11], +0.302066, 4*FLT_EPSILON, "point 12,11 should be %f : %f", +0.302066, shift->data.F32[12][11]); + is_float_tol (shift->data.F32[12][12], +0.041884, 4*FLT_EPSILON, "point 12,12 should be %f : %f", +0.041884, shift->data.F32[12][12]); psFree(shift); psFree(image); Index: trunk/psLib/test/imageops/tap_psImageShiftKernel.c =================================================================== --- trunk/psLib/test/imageops/tap_psImageShiftKernel.c (revision 12596) +++ trunk/psLib/test/imageops/tap_psImageShiftKernel.c (revision 12607) @@ -29,13 +29,13 @@ // integer shifts should be exact psImage *shift = psImageShiftKernel (NULL, image, 1.0, 1.0, PS_INTERPOLATE_BILINEAR); - ok_float (shift->data.F32[10][10], 0.0, "point 10,10 should be 0.0 : %f", shift->data.F32[10][10]); - ok_float (shift->data.F32[10][11], 0.0, "point 10,11 should be 0.0 : %f", shift->data.F32[10][11]); - ok_float (shift->data.F32[10][12], 0.0, "point 10,12 should be 0.0 : %f", shift->data.F32[10][12]); - ok_float (shift->data.F32[11][10], 0.0, "point 11,10 should be 0.0 : %f", shift->data.F32[11][10]); - ok_float (shift->data.F32[11][11], 1.0, "point 11,11 should be 1.0 : %f", shift->data.F32[11][11]); - ok_float (shift->data.F32[11][12], 0.0, "point 11,12 should be 0.0 : %f", shift->data.F32[11][12]); - ok_float (shift->data.F32[12][10], 0.0, "point 12,10 should be 0.0 : %f", shift->data.F32[12][10]); - ok_float (shift->data.F32[12][11], 0.0, "point 12,11 should be 0.0 : %f", shift->data.F32[12][11]); - ok_float (shift->data.F32[12][12], 0.0, "point 12,12 should be 0.0 : %f", shift->data.F32[12][12]); + is_float (shift->data.F32[10][10], 0.0, "point 10,10 should be 0.0 : %f", shift->data.F32[10][10]); + is_float (shift->data.F32[10][11], 0.0, "point 10,11 should be 0.0 : %f", shift->data.F32[10][11]); + is_float (shift->data.F32[10][12], 0.0, "point 10,12 should be 0.0 : %f", shift->data.F32[10][12]); + is_float (shift->data.F32[11][10], 0.0, "point 11,10 should be 0.0 : %f", shift->data.F32[11][10]); + is_float (shift->data.F32[11][11], 1.0, "point 11,11 should be 1.0 : %f", shift->data.F32[11][11]); + is_float (shift->data.F32[11][12], 0.0, "point 11,12 should be 0.0 : %f", shift->data.F32[11][12]); + is_float (shift->data.F32[12][10], 0.0, "point 12,10 should be 0.0 : %f", shift->data.F32[12][10]); + is_float (shift->data.F32[12][11], 0.0, "point 12,11 should be 0.0 : %f", shift->data.F32[12][11]); + is_float (shift->data.F32[12][12], 0.0, "point 12,12 should be 0.0 : %f", shift->data.F32[12][12]); psFree(shift); psFree(image); @@ -66,13 +66,13 @@ psImage *shift = psImageShiftKernel (NULL, image, 0.2, 0.4, PS_INTERPOLATE_BICUBE); // diag("these require tolerance of 4 epsilon (why?)"); - ok_float_tol (shift->data.F32[10][10], 0.8*0.6, 4*FLT_EPSILON, "point 10,10 should be %f : %f", 0.8*0.6, shift->data.F32[10][10]); - ok_float_tol (shift->data.F32[10][11], 0.2*0.6, 4*FLT_EPSILON, "point 10,11 should be %f : %f", 0.2*0.6, shift->data.F32[10][11]); - ok_float_tol (shift->data.F32[10][12], 0.0, 4*FLT_EPSILON, "point 10,12 should be %f : %f", 0.0, shift->data.F32[10][12]); - ok_float_tol (shift->data.F32[11][10], 0.8*0.4, 4*FLT_EPSILON, "point 11,10 should be %f : %f", 0.8*0.4, shift->data.F32[11][10]); - ok_float_tol (shift->data.F32[11][11], 0.2*0.4, 4*FLT_EPSILON, "point 11,11 should be %f : %f", 0.2*0.4, shift->data.F32[11][11]); - ok_float_tol (shift->data.F32[11][12], 0.0, 4*FLT_EPSILON, "point 11,12 should be %f : %f", 0.0, shift->data.F32[11][12]); - ok_float_tol (shift->data.F32[12][10], 0.0, 4*FLT_EPSILON, "point 12,10 should be %f : %f", 0.0, shift->data.F32[12][10]); - ok_float_tol (shift->data.F32[12][11], 0.0, 4*FLT_EPSILON, "point 12,11 should be %f : %f", 0.0, shift->data.F32[12][11]); - ok_float_tol (shift->data.F32[12][12], 0.0, 4*FLT_EPSILON, "point 12,12 should be %f : %f", 0.0, shift->data.F32[12][12]); + is_float_tol (shift->data.F32[10][10], 0.8*0.6, 4*FLT_EPSILON, "point 10,10 should be %f : %f", 0.8*0.6, shift->data.F32[10][10]); + is_float_tol (shift->data.F32[10][11], 0.2*0.6, 4*FLT_EPSILON, "point 10,11 should be %f : %f", 0.2*0.6, shift->data.F32[10][11]); + is_float_tol (shift->data.F32[10][12], 0.0, 4*FLT_EPSILON, "point 10,12 should be %f : %f", 0.0, shift->data.F32[10][12]); + is_float_tol (shift->data.F32[11][10], 0.8*0.4, 4*FLT_EPSILON, "point 11,10 should be %f : %f", 0.8*0.4, shift->data.F32[11][10]); + is_float_tol (shift->data.F32[11][11], 0.2*0.4, 4*FLT_EPSILON, "point 11,11 should be %f : %f", 0.2*0.4, shift->data.F32[11][11]); + is_float_tol (shift->data.F32[11][12], 0.0, 4*FLT_EPSILON, "point 11,12 should be %f : %f", 0.0, shift->data.F32[11][12]); + is_float_tol (shift->data.F32[12][10], 0.0, 4*FLT_EPSILON, "point 12,10 should be %f : %f", 0.0, shift->data.F32[12][10]); + is_float_tol (shift->data.F32[12][11], 0.0, 4*FLT_EPSILON, "point 12,11 should be %f : %f", 0.0, shift->data.F32[12][11]); + is_float_tol (shift->data.F32[12][12], 0.0, 4*FLT_EPSILON, "point 12,12 should be %f : %f", 0.0, shift->data.F32[12][12]); psFree(shift); psFree(image); @@ -118,6 +118,6 @@ // diag ("these require a tolerance of 100 epsilon"); - ok_float_tol (xo, 16.0, 100*FLT_EPSILON, "x-centroid should be %f : %f", 16.0, xo); - ok_float_tol (xo, 16.0, 100*FLT_EPSILON, "y-centroid should be %f : %f", 16.0, yo); + is_float_tol (xo, 16.0, 100*FLT_EPSILON, "x-centroid should be %f : %f", 16.0, xo); + is_float_tol (xo, 16.0, 100*FLT_EPSILON, "y-centroid should be %f : %f", 16.0, yo); // fractional shifts introduce smoothing, @@ -137,6 +137,6 @@ // diag ("these require a tolerance of 100 epsilon"); - ok_float_tol (xo, 17.2, 100*FLT_EPSILON, "x-centroid should be %f : %f", 17.2, xo); - ok_float_tol (yo, 14.8, 100*FLT_EPSILON, "y-centroid should be %f : %f", 14.8, yo); + is_float_tol (xo, 17.2, 100*FLT_EPSILON, "x-centroid should be %f : %f", 17.2, xo); + is_float_tol (yo, 14.8, 100*FLT_EPSILON, "y-centroid should be %f : %f", 14.8, yo); psFree(shift); @@ -162,13 +162,13 @@ psImage *shift = psImageShiftKernel (NULL, image, 0.2, 0.4, PS_INTERPOLATE_BICUBE); // diag ("please check these values: this kernel is very steep and ringy. what is the right BICUBE kernel?"); - ok_float_tol (shift->data.F32[10][10], -1.444445, 4*FLT_EPSILON, "point 10,10 should be %f : %f", -1.444445, shift->data.F32[10][10]); - ok_float_tol (shift->data.F32[10][11], -0.277778, 4*FLT_EPSILON, "point 10,11 should be %f : %f", -0.277778, shift->data.F32[10][11]); - ok_float_tol (shift->data.F32[10][12], -0.777778, 4*FLT_EPSILON, "point 10,12 should be %f : %f", -0.777778, shift->data.F32[10][12]); - ok_float_tol (shift->data.F32[11][10], +0.055556, 4*FLT_EPSILON, "point 11,10 should be %f : %f", +0.055556, shift->data.F32[11][10]); - ok_float_tol (shift->data.F32[11][11], +1.222222, 4*FLT_EPSILON, "point 11,11 should be %f : %f", +1.222222, shift->data.F32[11][11]); - ok_float_tol (shift->data.F32[11][12], +0.722222, 4*FLT_EPSILON, "point 11,12 should be %f : %f", +0.722222, shift->data.F32[11][12]); - ok_float_tol (shift->data.F32[12][10], -0.111111, 4*FLT_EPSILON, "point 12,10 should be %f : %f", -0.111111, shift->data.F32[12][10]); - ok_float_tol (shift->data.F32[12][11], +1.055556, 4*FLT_EPSILON, "point 12,11 should be %f : %f", +1.055556, shift->data.F32[12][11]); - ok_float_tol (shift->data.F32[12][12], +0.555556, 4*FLT_EPSILON, "point 12,12 should be %f : %f", +0.555556, shift->data.F32[12][12]); + is_float_tol (shift->data.F32[10][10], -1.444445, 4*FLT_EPSILON, "point 10,10 should be %f : %f", -1.444445, shift->data.F32[10][10]); + is_float_tol (shift->data.F32[10][11], -0.277778, 4*FLT_EPSILON, "point 10,11 should be %f : %f", -0.277778, shift->data.F32[10][11]); + is_float_tol (shift->data.F32[10][12], -0.777778, 4*FLT_EPSILON, "point 10,12 should be %f : %f", -0.777778, shift->data.F32[10][12]); + is_float_tol (shift->data.F32[11][10], +0.055556, 4*FLT_EPSILON, "point 11,10 should be %f : %f", +0.055556, shift->data.F32[11][10]); + is_float_tol (shift->data.F32[11][11], +1.222222, 4*FLT_EPSILON, "point 11,11 should be %f : %f", +1.222222, shift->data.F32[11][11]); + is_float_tol (shift->data.F32[11][12], +0.722222, 4*FLT_EPSILON, "point 11,12 should be %f : %f", +0.722222, shift->data.F32[11][12]); + is_float_tol (shift->data.F32[12][10], -0.111111, 4*FLT_EPSILON, "point 12,10 should be %f : %f", -0.111111, shift->data.F32[12][10]); + is_float_tol (shift->data.F32[12][11], +1.055556, 4*FLT_EPSILON, "point 12,11 should be %f : %f", +1.055556, shift->data.F32[12][11]); + is_float_tol (shift->data.F32[12][12], +0.555556, 4*FLT_EPSILON, "point 12,12 should be %f : %f", +0.555556, shift->data.F32[12][12]); psFree(shift); @@ -216,6 +216,6 @@ // diag ("these require a tolerance of 100 epsilon"); - ok_float_tol (xo, 16.0, 100*FLT_EPSILON, "x-centroid should be %f : %f", 16.0, xo); - ok_float_tol (xo, 16.0, 100*FLT_EPSILON, "y-centroid should be %f : %f", 16.0, yo); + is_float_tol (xo, 16.0, 100*FLT_EPSILON, "x-centroid should be %f : %f", 16.0, xo); + is_float_tol (xo, 16.0, 100*FLT_EPSILON, "y-centroid should be %f : %f", 16.0, yo); // fractional shifts introduce smoothing, @@ -236,6 +236,6 @@ // diag ("these require a tolerance of 100 epsilon"); - ok_float_tol (xo, 16.2, 100*FLT_EPSILON, "x-centroid should be %f : %f", 16.2, xo); - ok_float_tol (yo, 15.8, 100*FLT_EPSILON, "y-centroid should be %f : %f", 15.8, yo); + is_float_tol (xo, 16.2, 100*FLT_EPSILON, "x-centroid should be %f : %f", 16.2, xo); + is_float_tol (yo, 15.8, 100*FLT_EPSILON, "y-centroid should be %f : %f", 15.8, yo); psFree(shift); @@ -260,13 +260,13 @@ // fractional shifts introduce smoothing, psImage *shift = psImageShiftKernel (NULL, image, 0.0, 0.0, PS_INTERPOLATE_GAUSS); - ok_float_tol (shift->data.F32[10][10], -0.157778, 4*FLT_EPSILON, "point 10,10 should be %f : %f", -0.157778, shift->data.F32[10][10]); - ok_float_tol (shift->data.F32[10][11], +0.168889, 4*FLT_EPSILON, "point 10,11 should be %f : %f", +0.168889, shift->data.F32[10][11]); - ok_float_tol (shift->data.F32[10][12], -0.131111, 4*FLT_EPSILON, "point 10,12 should be %f : %f", -0.131111, shift->data.F32[10][12]); - ok_float_tol (shift->data.F32[11][10], +0.142221, 4*FLT_EPSILON, "point 11,10 should be %f : %f", +0.142221, shift->data.F32[11][10]); - ok_float_tol (shift->data.F32[11][11], +0.488884, 4*FLT_EPSILON, "point 11,11 should be %f : %f", +0.488884, shift->data.F32[11][11]); - ok_float_tol (shift->data.F32[11][12], +0.208878, 4*FLT_EPSILON, "point 11,12 should be %f : %f", +0.208878, shift->data.F32[11][12]); - ok_float_tol (shift->data.F32[12][10], -0.064500, 4*FLT_EPSILON, "point 12,10 should be %f : %f", -0.064500, shift->data.F32[12][10]); - ok_float_tol (shift->data.F32[12][11], +0.302066, 4*FLT_EPSILON, "point 12,11 should be %f : %f", +0.302066, shift->data.F32[12][11]); - ok_float_tol (shift->data.F32[12][12], +0.041884, 4*FLT_EPSILON, "point 12,12 should be %f : %f", +0.041884, shift->data.F32[12][12]); + is_float_tol (shift->data.F32[10][10], -0.157778, 4*FLT_EPSILON, "point 10,10 should be %f : %f", -0.157778, shift->data.F32[10][10]); + is_float_tol (shift->data.F32[10][11], +0.168889, 4*FLT_EPSILON, "point 10,11 should be %f : %f", +0.168889, shift->data.F32[10][11]); + is_float_tol (shift->data.F32[10][12], -0.131111, 4*FLT_EPSILON, "point 10,12 should be %f : %f", -0.131111, shift->data.F32[10][12]); + is_float_tol (shift->data.F32[11][10], +0.142221, 4*FLT_EPSILON, "point 11,10 should be %f : %f", +0.142221, shift->data.F32[11][10]); + is_float_tol (shift->data.F32[11][11], +0.488884, 4*FLT_EPSILON, "point 11,11 should be %f : %f", +0.488884, shift->data.F32[11][11]); + is_float_tol (shift->data.F32[11][12], +0.208878, 4*FLT_EPSILON, "point 11,12 should be %f : %f", +0.208878, shift->data.F32[11][12]); + is_float_tol (shift->data.F32[12][10], -0.064500, 4*FLT_EPSILON, "point 12,10 should be %f : %f", -0.064500, shift->data.F32[12][10]); + is_float_tol (shift->data.F32[12][11], +0.302066, 4*FLT_EPSILON, "point 12,11 should be %f : %f", +0.302066, shift->data.F32[12][11]); + is_float_tol (shift->data.F32[12][12], +0.041884, 4*FLT_EPSILON, "point 12,12 should be %f : %f", +0.041884, shift->data.F32[12][12]); psFree(shift); psFree(image); @@ -313,6 +313,6 @@ // diag ("these require a tolerance of 100 epsilon"); - ok_float_tol (xo, 16.0, 100*FLT_EPSILON, "x-centroid should be %f : %f", 16.0, xo); - ok_float_tol (xo, 16.0, 100*FLT_EPSILON, "y-centroid should be %f : %f", 16.0, yo); + is_float_tol (xo, 16.0, 100*FLT_EPSILON, "x-centroid should be %f : %f", 16.0, xo); + is_float_tol (xo, 16.0, 100*FLT_EPSILON, "y-centroid should be %f : %f", 16.0, yo); // fractional shifts introduce smoothing, @@ -333,6 +333,6 @@ // diag ("these require a tolerance of 100 epsilon"); - ok_float_tol (xo, 16.2, 100*FLT_EPSILON, "x-centroid should be %f : %f", 16.2, xo); - ok_float_tol (yo, 15.8, 100*FLT_EPSILON, "y-centroid should be %f : %f", 15.8, yo); + is_float_tol (xo, 16.2, 100*FLT_EPSILON, "x-centroid should be %f : %f", 16.2, xo); + is_float_tol (yo, 15.8, 100*FLT_EPSILON, "y-centroid should be %f : %f", 15.8, yo); psFits *fits = psFitsOpen ("gauss.fits", "w"); Index: trunk/psLib/test/math/tap_psPolynomialUtils_Derivatives.c =================================================================== --- trunk/psLib/test/math/tap_psPolynomialUtils_Derivatives.c (revision 12596) +++ trunk/psLib/test/math/tap_psPolynomialUtils_Derivatives.c (revision 12607) @@ -42,7 +42,7 @@ ok(dX->nY == 2, "new y order is %d", dX->nY); - ok_float(dX->coeff[0][0], +2.0, "x^0 y^0 coeff is %f", dX->coeff[0][0]); - ok_float(dX->coeff[1][0], -6.0, "x^1 y^0 coeff is %f", dX->coeff[1][0]); - ok_float(dX->coeff[0][1], +4.0, "x^0 y^1 coeff is %f", dX->coeff[0][1]); + is_float(dX->coeff[0][0], +2.0, "x^0 y^0 coeff is %f", dX->coeff[0][0]); + is_float(dX->coeff[1][0], -6.0, "x^1 y^0 coeff is %f", dX->coeff[1][0]); + is_float(dX->coeff[0][1], +4.0, "x^0 y^1 coeff is %f", dX->coeff[0][1]); ok(!dX->mask[0][0], "x^0 y^0 coeff is unmasked"); @@ -91,7 +91,7 @@ ok(dX->nY == 2, "new y order is %d", dX->nY); - ok_float(dX->coeff[0][0], +2.0, "x^0 y^0 coeff is %f", dX->coeff[0][0]); - ok_float(dX->coeff[1][0], -6.0, "x^1 y^0 coeff is %f", dX->coeff[1][0]); - ok_float(dX->coeff[0][1], +4.0, "x^0 y^1 coeff is %f", dX->coeff[0][1]); + is_float(dX->coeff[0][0], +2.0, "x^0 y^0 coeff is %f", dX->coeff[0][0]); + is_float(dX->coeff[1][0], -6.0, "x^1 y^0 coeff is %f", dX->coeff[1][0]); + is_float(dX->coeff[0][1], +4.0, "x^0 y^1 coeff is %f", dX->coeff[0][1]); ok(!dX->mask[0][0], "x^0 y^0 coeff is unmasked"); @@ -172,7 +172,7 @@ ok(dY->nY == 1, "new y order is %d", dY->nY); - ok_float(dY->coeff[0][0], +3.0, "x^0 y^0 coeff is %f", dY->coeff[0][0]); - ok_float(dY->coeff[1][0], +4.0, "x^1 y^0 coeff is %f", dY->coeff[1][0]); - ok_float(dY->coeff[0][1], -4.0, "x^0 y^1 coeff is %f", dY->coeff[0][1]); + is_float(dY->coeff[0][0], +3.0, "x^0 y^0 coeff is %f", dY->coeff[0][0]); + is_float(dY->coeff[1][0], +4.0, "x^1 y^0 coeff is %f", dY->coeff[1][0]); + is_float(dY->coeff[0][1], -4.0, "x^0 y^1 coeff is %f", dY->coeff[0][1]); ok(!dY->mask[0][0], "x^0 y^0 coeff is unmasked"); @@ -221,7 +221,7 @@ ok(dY->nY == 1, "new y order is %d", dY->nY); - ok_float(dY->coeff[0][0], +3.0, "x^0 y^0 coeff is %f", dY->coeff[0][0]); - ok_float(dY->coeff[1][0], +4.0, "x^1 y^0 coeff is %f", dY->coeff[1][0]); - ok_float(dY->coeff[0][1], -4.0, "x^0 y^1 coeff is %f", dY->coeff[0][1]); + is_float(dY->coeff[0][0], +3.0, "x^0 y^0 coeff is %f", dY->coeff[0][0]); + is_float(dY->coeff[1][0], +4.0, "x^1 y^0 coeff is %f", dY->coeff[1][0]); + is_float(dY->coeff[0][1], -4.0, "x^0 y^1 coeff is %f", dY->coeff[0][1]); ok(!dY->mask[0][0], "x^0 y^0 coeff is unmasked"); Index: trunk/psLib/test/math/tap_psRandom.c =================================================================== --- trunk/psLib/test/math/tap_psRandom.c (revision 12596) +++ trunk/psLib/test/math/tap_psRandom.c (revision 12607) @@ -39,5 +39,5 @@ #define ERROR_TOLERANCE 0.2 #define VERBOSE 0 -# define ok_float_tol_per(VALUE,EXPECT,TOL,COMMENT, ...)\ +# define is_float_tol_per(VALUE,EXPECT,TOL,COMMENT, ...)\ ok((fabs((VALUE)-(EXPECT)) < (TOL)), COMMENT, ## __VA_ARGS__); @@ -102,6 +102,6 @@ // Verify mean and stdev - ok_float_tol_per(stats->sampleMean, UNIFORM_MEAN, ERROR_TOLERANCE, "Mean is within expected range"); - ok_float_tol_per(stats->sampleStdev, UNIFORM_STDEV, ERROR_TOLERANCE, "StDev is within expected range"); + is_float_tol_per(stats->sampleMean, UNIFORM_MEAN, ERROR_TOLERANCE, "Mean is within expected range"); + is_float_tol_per(stats->sampleStdev, UNIFORM_STDEV, ERROR_TOLERANCE, "StDev is within expected range"); skip_end(); @@ -143,6 +143,6 @@ // Verify mean and stdev - ok_float_tol_per(stats->sampleMean, GAUSSIAN_MEAN, ERROR_TOLERANCE, "Mean is within expected range"); - ok_float_tol_per(stats->sampleStdev, GAUSSIAN_STDEV, ERROR_TOLERANCE, "StDev is within expected range"); + is_float_tol_per(stats->sampleMean, GAUSSIAN_MEAN, ERROR_TOLERANCE, "Mean is within expected range"); + is_float_tol_per(stats->sampleStdev, GAUSSIAN_STDEV, ERROR_TOLERANCE, "StDev is within expected range"); skip_end(); @@ -185,6 +185,6 @@ stats = psVectorStats(stats, rans, NULL, NULL, 0); // Verify mean and stdev - ok_float_tol_per(stats->sampleMean, POISSON_MEAN, ERROR_TOLERANCE, "Mean is within expected range"); - ok_float_tol_per(stats->sampleStdev, POISSON_STDEV, ERROR_TOLERANCE, "StDev is within expected range"); + is_float_tol_per(stats->sampleMean, POISSON_MEAN, ERROR_TOLERANCE, "Mean is within expected range"); + is_float_tol_per(stats->sampleStdev, POISSON_STDEV, ERROR_TOLERANCE, "StDev is within expected range"); skip_end(); Index: trunk/psLib/test/math/tap_psSparse.c =================================================================== --- trunk/psLib/test/math/tap_psSparse.c (revision 12596) +++ trunk/psLib/test/math/tap_psSparse.c (revision 12607) @@ -74,5 +74,5 @@ dS2 = sqrt (dS2/100.0 - dS*dS); - ok_float_tol (dS2, 0.0, 1e-4, "scatter: %.20f", dS2); + is_float_tol (dS2, 0.0, 1e-4, "scatter: %.20f", dS2); psFree (matrix); @@ -147,5 +147,5 @@ dS2 = sqrt (dS2/100.0 - dS*dS); - ok_float_tol (dS2, 0.0, 1e-4, "scatter: %.20f", dS2); + is_float_tol (dS2, 0.0, 1e-4, "scatter: %.20f", dS2); psFree (matrix); @@ -219,19 +219,19 @@ // test the support functions: LowerProduct fVec = psSparseBorderLowerProduct (NULL, border, xRef); - ok_float (fVec->n, 1.0, "f dimen: %d", fVec->n); - ok_float (fVec->data.F32[0], 0.3, "f(0): %f", fVec->data.F32[0]); + is_float (fVec->n, 1.0, "f dimen: %d", fVec->n); + is_float (fVec->data.F32[0], 0.3, "f(0): %f", fVec->data.F32[0]); psFree (fVec); // test the support functions: Upper Product fVec = psSparseBorderUpperProduct (NULL, border, yRef); - ok_float (fVec->n, 2.0, "f dimen: %d", fVec->n); - ok_float (fVec->data.F32[0], 0.05, "f(0): %f", fVec->data.F32[0]); - ok_float (fVec->data.F32[1], 0.10, "f(0): %f", fVec->data.F32[1]); + is_float (fVec->n, 2.0, "f dimen: %d", fVec->n); + is_float (fVec->data.F32[0], 0.05, "f(0): %f", fVec->data.F32[0]); + is_float (fVec->data.F32[1], 0.10, "f(0): %f", fVec->data.F32[1]); psFree (fVec); // test the support functions: Square Product fVec = psSparseBorderSquareProduct (NULL, border, yRef); - ok_float (fVec->n, 1.0, "f dimen: %d", fVec->n); - ok_float (fVec->data.F32[0], 0.25, "f(0): %f", fVec->data.F32[0]); + is_float (fVec->n, 1.0, "f dimen: %d", fVec->n); + is_float (fVec->data.F32[0], 0.25, "f(0): %f", fVec->data.F32[0]); psFree (fVec); @@ -239,7 +239,7 @@ psVector *gVec = NULL; psSparseBorderMultiply (&fVec, &gVec, border, xRef, yRef); - ok_float (fVec->data.F32[0], 1.15, "f(0): %f", fVec->data.F32[0]); - ok_float (fVec->data.F32[1], 1.20, "f(1): %f", fVec->data.F32[1]); - ok_float (gVec->data.F32[0], 0.55, "g(0): %f", gVec->data.F32[0]); + is_float (fVec->data.F32[0], 1.15, "f(0): %f", fVec->data.F32[0]); + is_float (fVec->data.F32[1], 1.20, "f(1): %f", fVec->data.F32[1]); + is_float (gVec->data.F32[0], 0.55, "g(0): %f", gVec->data.F32[0]); // supply the fVec and gVec data to the border @@ -263,7 +263,7 @@ psVector *yFit = NULL; psSparseBorderSolve (&xFit, &yFit, constraint, border, 4); - ok_float_tol (xFit->data.F32[0], 1.0, 1e-4, "f(0): %f", xFit->data.F32[0]); - ok_float_tol (xFit->data.F32[1], 1.0, 1e-4, "f(1): %f", xFit->data.F32[1]); - ok_float_tol (yFit->data.F32[0], 0.5, 1e-4, "g(0): %f", yFit->data.F32[0]); + is_float_tol (xFit->data.F32[0], 1.0, 1e-4, "f(0): %f", xFit->data.F32[0]); + is_float_tol (xFit->data.F32[1], 1.0, 1e-4, "f(1): %f", xFit->data.F32[1]); + is_float_tol (yFit->data.F32[0], 0.5, 1e-4, "g(0): %f", yFit->data.F32[0]); psFree (xFit); @@ -321,5 +321,5 @@ } } - ok_float(border->Bij->data.F32[0][0], 0.1, "set matrix element %d,%d", 0, 0); + is_float(border->Bij->data.F32[0][0], 0.1, "set matrix element %d,%d", 0, 0); // construct the Q component: @@ -381,10 +381,10 @@ dS /= Nrows; dS2 = sqrt (dS2/Nrows - dS*dS); - ok_float_tol (dS2, 0.0, 1e-4, "scatter: %.20f", dS2); + is_float_tol (dS2, 0.0, 1e-4, "scatter: %.20f", dS2); // measure stdev between yFit and yRef float dY = yRef->data.F32[0] - yFit->data.F32[0]; // fprintf (stderr, "%5.3f %5.3f %5.3f %5.3f\n", gVec->data.F32[0], yRef->data.F32[0], yFit->data.F32[0], dS); - ok_float_tol (dY, 0.0, 2e-4, "scatter: %.20f", dY); + is_float_tol (dY, 0.0, 2e-4, "scatter: %.20f", dY); psFree (xRef); Index: trunk/psLib/test/math/tap_psStats00.c =================================================================== --- trunk/psLib/test/math/tap_psStats00.c (revision 12596) +++ trunk/psLib/test/math/tap_psStats00.c (revision 12607) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-03-05 23:23:38 $ + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-03-27 22:52:03 $ * * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii @@ -120,5 +120,5 @@ ok(result, "psVectorStats suceeded (F32: no mask vector, no error vector)"); ok(!isnan(myStats->sampleMean), "psVectorStats() returned non-NAN"); - ok_float_tol(myStats->sampleMean, expectedMeanNoMaskF32, 1e-4, + is_float_tol(myStats->sampleMean, expectedMeanNoMaskF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanNoMaskF32); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -131,5 +131,5 @@ ok(result, "psVectorStats suceeded (F32: no mask vector, with error vector)"); ok(!isnan(myStats->sampleMean), "psVectorStats() returned non-NAN"); - ok_float_tol(myStats->sampleMean, expectedWeightMeanNoMaskF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedWeightMeanNoMaskF32); + is_float_tol(myStats->sampleMean, expectedWeightMeanNoMaskF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedWeightMeanNoMaskF32); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); } @@ -144,5 +144,5 @@ ok(result, "psVectorStats suceeded (F32, no mask, no errors, with data range)"); ok(!isnan(myStats->sampleMean), "psVectorStats() returned non-NAN"); - ok_float_tol(myStats->sampleMean, expectedMeanRangeNoMaskF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanRangeNoMaskF32); + is_float_tol(myStats->sampleMean, expectedMeanRangeNoMaskF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanRangeNoMaskF32); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); } @@ -156,5 +156,5 @@ ok(result, "psVectorStats suceeded (F32, no mask, with errors and data range)"); ok(!isnan(myStats->sampleMean), "psVectorStats() returned non-NAN"); - ok_float_tol(myStats->sampleMean, expectedWeightMeanNoMaskRangeF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedWeightMeanNoMaskRangeF32); + is_float_tol(myStats->sampleMean, expectedWeightMeanNoMaskRangeF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedWeightMeanNoMaskRangeF32); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); } @@ -167,5 +167,5 @@ ok(result, "psVectorStats suceeded (F32, with mask, no errors)"); ok(!isnan(myStats->sampleMean), "psVectorStats() returned non-NAN"); - ok_float_tol(myStats->sampleMean, expectedMeanWithMaskF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanWithMaskF32); + is_float_tol(myStats->sampleMean, expectedMeanWithMaskF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanWithMaskF32); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); } @@ -177,5 +177,5 @@ ok(result, "psVectorStats suceeded (F32, with mask and errors)"); ok(!isnan(myStats->sampleMean), "psVectorStats() returned non-NAN"); - ok_float_tol(myStats->sampleMean, expectedWeightMeanWithMaskF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedWeightMeanWithMaskF32); + is_float_tol(myStats->sampleMean, expectedWeightMeanWithMaskF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedWeightMeanWithMaskF32); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); } @@ -188,5 +188,5 @@ ok(result, "psVectorStats suceeded (F32, with mask and data range)"); ok(!isnan(myStats->sampleMean), "psVectorStats() returned non-NAN"); - ok_float_tol(myStats->sampleMean, expectedMeanRangeWithMaskF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanRangeWithMaskF32); + is_float_tol(myStats->sampleMean, expectedMeanRangeWithMaskF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanRangeWithMaskF32); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); } @@ -198,5 +198,5 @@ ok(result, "psVectorStats suceeded (F32, withmask, errors, and data range)"); ok(!isnan(myStats->sampleMean), "psVectorStats() returned non-NAN"); - ok_float_tol(myStats->sampleMean, expectedWeightMeanWithMaskRangeF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedWeightMeanWithMaskRangeF32); + is_float_tol(myStats->sampleMean, expectedWeightMeanWithMaskRangeF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedWeightMeanWithMaskRangeF32); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); } @@ -214,5 +214,5 @@ ok(result, "psVectorStats suceeded (F32, with mask = 2, no errors)"); ok(!isnan(myStats->sampleMean), "psVectorStats() returned non-NAN"); - ok_float_tol(myStats->sampleMean, expectedMeanWithMaskF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanWithMaskF32); + is_float_tol(myStats->sampleMean, expectedMeanWithMaskF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanWithMaskF32); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); } @@ -230,5 +230,5 @@ ok(result, "psVectorStats suceeded (F32, with mask = 3, no errors)"); ok(!isnan(myStats->sampleMean), "psVectorStats() returned non-NAN"); - ok_float_tol(myStats->sampleMean, expectedMeanNoMaskF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanNoMaskF32); + is_float_tol(myStats->sampleMean, expectedMeanNoMaskF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanNoMaskF32); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); } @@ -276,5 +276,5 @@ ok(result, "psVectorStats suceeded (S8, no mask, no errors)"); ok(!isnan(myStats->sampleMean), "psVectorStats() returned non-NAN"); - ok_float_tol(myStats->sampleMean, expectedMeanNoMaskS8, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanNoMaskS8); + is_float_tol(myStats->sampleMean, expectedMeanNoMaskS8, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanNoMaskS8); psFree(myStats); psFree(myVector); @@ -297,5 +297,5 @@ ok(result, "psVectorStats suceeded (U16, no mask, no errors)"); ok(!isnan(myStats->sampleMean), "psVectorStats() returned non-NAN"); - ok_float_tol(myStats->sampleMean, expectedMeanNoMaskU16, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanNoMaskU16); + is_float_tol(myStats->sampleMean, expectedMeanNoMaskU16, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanNoMaskU16); psFree(myStats); psFree(myVector); @@ -317,5 +317,5 @@ ok(result, "psVectorStats suceeded (F64, no mask, no errors)"); ok(!isnan(myStats->sampleMean), "psVectorStats() returned non-NAN"); - ok_float_tol(myStats->sampleMean, expectedMeanNoMaskF64, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanNoMaskF64); + is_float_tol(myStats->sampleMean, expectedMeanNoMaskF64, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanNoMaskF64); psFree(myStats); psFree(myVector); Index: trunk/psLib/test/math/tap_psStats01.c =================================================================== --- trunk/psLib/test/math/tap_psStats01.c (revision 12596) +++ trunk/psLib/test/math/tap_psStats01.c (revision 12607) @@ -8,6 +8,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ -* @date $Date: 2007-01-30 04:41:51 $ +* @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ +* @date $Date: 2007-03-27 22:52:03 $ * * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii @@ -63,5 +63,5 @@ ok(result, "psVectorStats suceeded"); ok(!isnan(myStats->max), "psVectorStats() returned non-NAN"); - ok_float_tol(myStats->max, expectedMaxNoMaskF32, 1e-4, + is_float_tol(myStats->max, expectedMaxNoMaskF32, 1e-4, "The max was %f, should be %f", myStats->max, expectedMaxNoMaskF32); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -74,5 +74,5 @@ ok(result, "psVectorStats suceeded"); ok(!isnan(myStats->max), "psVectorStats() returned non-NAN"); - ok_float_tol(myStats->max, expectedMaxWithMaskF32, 1e-4, + is_float_tol(myStats->max, expectedMaxWithMaskF32, 1e-4, "The max was %f, should be %f", myStats->max, expectedMaxWithMaskF32); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -88,5 +88,5 @@ ok(result, "psVectorStats suceeded"); ok(!isnan(myStats->max), "psVectorStats() returned non-NAN"); - ok_float_tol(myStats->max, expectedMaxRangeNoMaskF32, 1e-4, + is_float_tol(myStats->max, expectedMaxRangeNoMaskF32, 1e-4, "The max was %f, should be %f", myStats->max, expectedMaxRangeNoMaskF32); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -101,5 +101,5 @@ ok(result, "psVectorStats suceeded"); ok(!isnan(myStats->max), "psVectorStats() returned non-NAN"); - ok_float_tol(myStats->max, expectedMaxRangeWithMaskF32, 1e-4, + is_float_tol(myStats->max, expectedMaxRangeWithMaskF32, 1e-4, "The max was %f, should be %f", myStats->max, expectedMaxRangeWithMaskF32); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -136,5 +136,5 @@ ok(result, "psVectorStats suceeded"); ok(!isnan(myStats->max), "psVectorStats() returned non-NAN"); - ok_float_tol(myStats->max, expectedMaxNoMaskS8, 1e-4, + is_float_tol(myStats->max, expectedMaxNoMaskS8, 1e-4, "The max was %f, should be %f", myStats->max, expectedMaxNoMaskS8); psFree(myStats); @@ -157,5 +157,5 @@ ok(result, "psVectorStats suceeded"); ok(!isnan(myStats->max), "psVectorStats() returned non-NAN"); - ok_float_tol(myStats->max, expectedMaxNoMaskU16, 1e-4, + is_float_tol(myStats->max, expectedMaxNoMaskU16, 1e-4, "The max was %f, should be %f", myStats->max, expectedMaxNoMaskU16); psFree(myStats); @@ -178,5 +178,5 @@ ok(result, "psVectorStats suceeded"); ok(!isnan(myStats->max), "psVectorStats() returned non-NAN"); - ok_float_tol(myStats->max, expectedMaxNoMaskF64, 1e-4, + is_float_tol(myStats->max, expectedMaxNoMaskF64, 1e-4, "The max was %f, should be %f", myStats->max, expectedMaxNoMaskF64); psFree(myStats); Index: trunk/psLib/test/math/tap_psStats02.c =================================================================== --- trunk/psLib/test/math/tap_psStats02.c (revision 12596) +++ trunk/psLib/test/math/tap_psStats02.c (revision 12607) @@ -11,6 +11,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ -* @date $Date: 2007-01-30 04:41:51 $ +* @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ +* @date $Date: 2007-03-27 22:52:03 $ * * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii @@ -67,5 +67,5 @@ ok(result, "psVectorStats suceeded"); ok(!isnan(myStats->min), "psVectorStats() returned non-NAN"); - ok_float_tol(myStats->min, expectedMinNoMaskF32, 1e-4, + is_float_tol(myStats->min, expectedMinNoMaskF32, 1e-4, "The min was %f, should be %f", myStats->min, expectedMinNoMaskF32); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -80,5 +80,5 @@ ok(result, "psVectorStats suceeded"); ok(!isnan(myStats->min), "psVectorStats() returned non-NAN"); - ok_float_tol(myStats->min, expectedMinWithMaskF32, 1e-4, + is_float_tol(myStats->min, expectedMinWithMaskF32, 1e-4, "The min was %f, should be %f", myStats->min, expectedMinWithMaskF32); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -94,5 +94,5 @@ ok(result, "psVectorStats suceeded"); ok(!isnan(myStats->min), "psVectorStats() returned non-NAN"); - ok_float_tol(myStats->min, expectedMinRangeNoMaskF32, 1e-4, + is_float_tol(myStats->min, expectedMinRangeNoMaskF32, 1e-4, "The min was %f, should be %f", myStats->min, expectedMinRangeNoMaskF32); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -107,5 +107,5 @@ ok(result, "psVectorStats succeeded"); ok(!isnan(myStats->min), "psVectorStats() returned non-NAN"); - ok_float_tol(myStats->min, expectedMinRangeWithMaskF32, 1e-4, + is_float_tol(myStats->min, expectedMinRangeWithMaskF32, 1e-4, "The min was %f, should be %f", myStats->min, expectedMinRangeWithMaskF32); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -142,5 +142,5 @@ ok(result, "psVectorStats succeeded"); ok(!isnan(myStats->min), "psVectorStats() returned non-NAN"); - ok_float_tol(myStats->min, expectedMinNoMaskS8, 1e-4, + is_float_tol(myStats->min, expectedMinNoMaskS8, 1e-4, "The min was %f, should be %f", myStats->min, expectedMinNoMaskS8); psFree(myStats); @@ -163,5 +163,5 @@ ok(result, "psVectorStats succeeded"); ok(!isnan(myStats->min), "psVectorStats() returned non-NAN"); - ok_float_tol(myStats->min, expectedMinNoMaskU16, 1e-4, + is_float_tol(myStats->min, expectedMinNoMaskU16, 1e-4, "The min was %f, should be %f", myStats->min, expectedMinNoMaskU16); psFree(myStats); @@ -184,5 +184,5 @@ ok(result, "psVectorStats succeeded"); ok(!isnan(myStats->min), "psVectorStats() returned non-NAN"); - ok_float_tol(myStats->min, expectedMinNoMaskF64, 1e-4, + is_float_tol(myStats->min, expectedMinNoMaskF64, 1e-4, "The min was %f, should be %f", myStats->min, expectedMinNoMaskF64); psFree(myStats); Index: trunk/psLib/test/math/tap_psStats03.c =================================================================== --- trunk/psLib/test/math/tap_psStats03.c (revision 12596) +++ trunk/psLib/test/math/tap_psStats03.c (revision 12607) @@ -44,5 +44,5 @@ ok(result, "psVectorStats succeeded"); ok(!isnan(myStats->sampleMedian), "psVectorStats() returned non-NAN"); - ok_float_tol(myStats->sampleMedian, realMedianNoMask, 1e-4, + is_float_tol(myStats->sampleMedian, realMedianNoMask, 1e-4, "The sample median was %f, should be %f", myStats->sampleMedian, realMedianNoMask); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -55,5 +55,5 @@ ok(result, "psVectorStats succeeded"); ok(!isnan(myStats->sampleMedian), "psVectorStats() returned non-NAN"); - ok_float_tol(myStats->sampleMedian, realMedianWithMask, 1e-4, + is_float_tol(myStats->sampleMedian, realMedianWithMask, 1e-4, "The sample median was %f, should be %f", myStats->sampleMedian, realMedianWithMask); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); Index: trunk/psLib/test/math/tap_psStats06.c =================================================================== --- trunk/psLib/test/math/tap_psStats06.c (revision 12596) +++ trunk/psLib/test/math/tap_psStats06.c (revision 12607) @@ -45,5 +45,5 @@ ok(result, "psVectorStats succeeded"); ok(!isnan(myStats->sampleStdev), "psVectorStats() returned non-NAN"); - ok_float_tol(myStats->sampleStdev, realStdevNoMask, 1e-4, + is_float_tol(myStats->sampleStdev, realStdevNoMask, 1e-4, "The mean was %f, should be %f", myStats->sampleStdev, realStdevNoMask); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -56,5 +56,5 @@ ok(result, "psVectorStats succeeded"); ok(!isnan(myStats->sampleStdev), "psVectorStats() returned non-NAN"); - ok_float_tol(myStats->sampleStdev, realStdevWithMask, 1e-4, + is_float_tol(myStats->sampleStdev, realStdevWithMask, 1e-4, "The mean was %f, should be %f", myStats->sampleStdev, realStdevWithMask); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); Index: trunk/psLib/test/math/tap_psStats08.c =================================================================== --- trunk/psLib/test/math/tap_psStats08.c (revision 12596) +++ trunk/psLib/test/math/tap_psStats08.c (revision 12607) @@ -45,5 +45,5 @@ ok(result, "psVectorStats succeeded"); ok(!isnan(myStats->sampleLQ), "psVectorStats() returned non-NAN"); - ok_float_tol(myStats->sampleLQ, realLQNoMask, 1e-4, + is_float_tol(myStats->sampleLQ, realLQNoMask, 1e-4, "The sampleLQ was %f, should be %f", myStats->sampleLQ, realLQNoMask); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -56,5 +56,5 @@ ok(result, "psVectorStats succeeded"); ok(!isnan(myStats->sampleUQ), "psVectorStats() returned non-NAN"); - ok_float_tol(myStats->sampleUQ, realUQNoMask, 1e-4, + is_float_tol(myStats->sampleUQ, realUQNoMask, 1e-4, "The sampleUQ was %f, should be %f", myStats->sampleUQ, realUQNoMask); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -67,5 +67,5 @@ ok(result, "psVectorStats succeeded"); ok(!isnan(myStats->sampleLQ), "psVectorStats() returned non-NAN"); - ok_float_tol(myStats->sampleLQ, realLQWithMask, 1e-4, + is_float_tol(myStats->sampleLQ, realLQWithMask, 1e-4, "The sampleLQ was %f, should be %f", myStats->sampleLQ, realLQWithMask); @@ -79,5 +79,5 @@ ok(result, "psVectorStats succeeded"); ok(!isnan(myStats->sampleUQ), "psVectorStats() returned non-NAN"); - ok_float_tol(myStats->sampleUQ, realUQWithMask, 1e-4, + is_float_tol(myStats->sampleUQ, realUQWithMask, 1e-4, "The sampleUQ was %f, should be %f", myStats->sampleUQ, realUQWithMask); Index: trunk/psLib/test/mathtypes/tap_psImageInterpolate.c =================================================================== --- trunk/psLib/test/mathtypes/tap_psImageInterpolate.c (revision 12596) +++ trunk/psLib/test/mathtypes/tap_psImageInterpolate.c (revision 12607) @@ -29,15 +29,15 @@ value = psImagePixelInterpolate (image, 10.5, 10.5, NULL, 0, 0.0, PS_INTERPOLATE_BILINEAR); - ok_float (value, 1.0, "pixel center value - %f", value); + is_float (value, 1.0, "pixel center value - %f", value); // diag ("why do I need to have tolerances of 4epsilon or so??"); value = psImagePixelInterpolate (image, 10.9, 10.5, NULL, 0, 0.0, PS_INTERPOLATE_BILINEAR); - ok_float_tol (value, 0.6, 4.0*FLT_EPSILON, "pixel value - %.20f", value); + is_float_tol (value, 0.6, 4.0*FLT_EPSILON, "pixel value - %.20f", value); value = psImagePixelInterpolate (image, 10.5, 10.9, NULL, 0, 0.0, PS_INTERPOLATE_BILINEAR); - ok_float_tol (value, 0.6, 4.0*FLT_EPSILON, "pixel value - %.20f", value); + is_float_tol (value, 0.6, 4.0*FLT_EPSILON, "pixel value - %.20f", value); value = psImagePixelInterpolate (image, 10.1, 10.5, NULL, 0, 0.0, PS_INTERPOLATE_BILINEAR); - ok_float_tol (value, 0.6, 4.0*FLT_EPSILON, "pixel value - %.20f", value); + is_float_tol (value, 0.6, 4.0*FLT_EPSILON, "pixel value - %.20f", value); skip_end(); @@ -69,27 +69,27 @@ value = psImagePixelInterpolate (image, 2.5, 2.5, NULL, 0, 0.0, PS_INTERPOLATE_BILINEAR); - ok_float (value, 2.5, "pixel center value - %f", value); + is_float (value, 2.5, "pixel center value - %f", value); value = psImagePixelInterpolate (image, 2.2, 2.5, NULL, 0, 0.0, PS_INTERPOLATE_BILINEAR); - ok_float (value, 2.2, "coord: 2.2, 2.5, value: %f", value); + is_float (value, 2.2, "coord: 2.2, 2.5, value: %f", value); value = psImagePixelInterpolate (image, 2.8, 2.5, NULL, 0, 0.0, PS_INTERPOLATE_BILINEAR); - ok_float (value, 2.8, "coord: 2.8, value: %f", value); + is_float (value, 2.8, "coord: 2.8, value: %f", value); value = psImagePixelInterpolate (image, 2.8, 2.2, NULL, 0, 0.0, PS_INTERPOLATE_BILINEAR); - ok_float (value, 2.8, "coord: 2.8, value: %f", value); + is_float (value, 2.8, "coord: 2.8, value: %f", value); value = psImagePixelInterpolate (image, 2.8, 2.8, NULL, 0, 0.0, PS_INTERPOLATE_BILINEAR); - ok_float (value, 2.8, "coord: 2.8, value: %f", value); + is_float (value, 2.8, "coord: 2.8, value: %f", value); value = psImagePixelInterpolate (image, 0.8, 2.8, NULL, 0, 0.0, PS_INTERPOLATE_BILINEAR); - ok_float (value, 0.8, "coord: 0.8, value: %f", value); + is_float (value, 0.8, "coord: 0.8, value: %f", value); // no extrapolation value = psImagePixelInterpolate (image, 0.3, 2.8, NULL, 0, 0.0, PS_INTERPOLATE_BILINEAR); - ok_float (value, 0.5, "coord: 0.3, value: %f", value); + is_float (value, 0.5, "coord: 0.3, value: %f", value); value = psImagePixelInterpolate (image, -0.2, 2.8, NULL, 0, 0.0, PS_INTERPOLATE_BILINEAR); - ok_float (value, 0.5, "coord: -0.2, value: %f", value); + is_float (value, 0.5, "coord: -0.2, value: %f", value); skip_end(); @@ -121,17 +121,17 @@ value = psImagePixelInterpolate (image, 2.5, 2.5, NULL, 0, 0.0, PS_INTERPOLATE_BILINEAR); - ok_float (value, 2.5, "pixel center value - %f", value); + is_float (value, 2.5, "pixel center value - %f", value); value = psImagePixelInterpolate (image, 2.2, 2.2, NULL, 0, 0.0, PS_INTERPOLATE_BILINEAR); - ok_float (value, 2.2, "coord: 2.2, 2.5, value: %f", value); + is_float (value, 2.2, "coord: 2.2, 2.5, value: %f", value); value = psImagePixelInterpolate (image, 2.5, 2.8, NULL, 0, 0.0, PS_INTERPOLATE_BILINEAR); - ok_float (value, 2.8, "coord: 2.8, value: %f", value); + is_float (value, 2.8, "coord: 2.8, value: %f", value); value = psImagePixelInterpolate (image, 2.2, 2.8, NULL, 0, 0.0, PS_INTERPOLATE_BILINEAR); - ok_float (value, 2.8, "coord: 2.8, value: %f", value); + is_float (value, 2.8, "coord: 2.8, value: %f", value); value = psImagePixelInterpolate (image, 2.8, 2.8, NULL, 0, 0.0, PS_INTERPOLATE_BILINEAR); - ok_float (value, 2.8, "coord: 2.8, value: %f", value); + is_float (value, 2.8, "coord: 2.8, value: %f", value); skip_end(); @@ -163,17 +163,17 @@ value = psImagePixelInterpolate (image, 2.5, 2.5, NULL, 0, 0.0, PS_INTERPOLATE_BICUBE); - ok_float (value, 2.5, "coord; 2.5, 2.5, value - %f", value); + is_float (value, 2.5, "coord; 2.5, 2.5, value - %f", value); value = psImagePixelInterpolate (image, 2.2, 2.5, NULL, 0, 0.0, PS_INTERPOLATE_BICUBE); - ok_float (value, 2.2, "coord: 2.2, 2.5, value: %f", value); + is_float (value, 2.2, "coord: 2.2, 2.5, value: %f", value); value = psImagePixelInterpolate (image, 2.8, 2.5, NULL, 0, 0.0, PS_INTERPOLATE_BICUBE); - ok_float (value, 2.8, "coord: 2.8, 2.5, value: %f", value); + is_float (value, 2.8, "coord: 2.8, 2.5, value: %f", value); value = psImagePixelInterpolate (image, 2.8, 2.2, NULL, 0, 0.0, PS_INTERPOLATE_BICUBE); - ok_float (value, 2.8, "coord: 2.8, 2.2, value: %f", value); + is_float (value, 2.8, "coord: 2.8, 2.2, value: %f", value); value = psImagePixelInterpolate (image, 2.8, 2.8, NULL, 0, 0.0, PS_INTERPOLATE_BICUBE); - ok_float (value, 2.8, "coord: 2.8, 2.8, value: %f", value); + is_float (value, 2.8, "coord: 2.8, 2.8, value: %f", value); // diag ("coords outside of nominal range (1 < x < Nx - 2) return 'uncover'"); @@ -181,11 +181,11 @@ // no extrapolation: these return the 'uncover' value value = psImagePixelInterpolate (image, 0.8, 2.8, NULL, 0, 0.0, PS_INTERPOLATE_BICUBE); - ok_float (value, 0.0, "coord: 0.8, 2.8, value: %f", value); + is_float (value, 0.0, "coord: 0.8, 2.8, value: %f", value); value = psImagePixelInterpolate (image, 0.3, 2.8, NULL, 0, 0.0, PS_INTERPOLATE_BICUBE); - ok_float (value, 0.0, "coord: 0.3, 2.8, value: %f", value); + is_float (value, 0.0, "coord: 0.3, 2.8, value: %f", value); value = psImagePixelInterpolate (image, -0.2, 2.8, NULL, 0, 0.0, PS_INTERPOLATE_BICUBE); - ok_float (value, 0.0, "coord: -0.2, 2.8, value: %f", value); + is_float (value, 0.0, "coord: -0.2, 2.8, value: %f", value); skip_end(); @@ -217,17 +217,17 @@ value = psImagePixelInterpolate (image, 2.5, 2.5, NULL, 0, 0.0, PS_INTERPOLATE_BICUBE); - ok_float (value, 2.5, "pixel center value - %f", value); + is_float (value, 2.5, "pixel center value - %f", value); value = psImagePixelInterpolate (image, 2.2, 2.2, NULL, 0, 0.0, PS_INTERPOLATE_BICUBE); - ok_float (value, 2.2, "coord: 2.2, 2.5, value: %f", value); + is_float (value, 2.2, "coord: 2.2, 2.5, value: %f", value); value = psImagePixelInterpolate (image, 2.5, 2.8, NULL, 0, 0.0, PS_INTERPOLATE_BICUBE); - ok_float (value, 2.8, "coord: 2.8, value: %f", value); + is_float (value, 2.8, "coord: 2.8, value: %f", value); value = psImagePixelInterpolate (image, 2.2, 2.8, NULL, 0, 0.0, PS_INTERPOLATE_BICUBE); - ok_float (value, 2.8, "coord: 2.8, value: %f", value); + is_float (value, 2.8, "coord: 2.8, value: %f", value); value = psImagePixelInterpolate (image, 2.8, 2.8, NULL, 0, 0.0, PS_INTERPOLATE_BICUBE); - ok_float (value, 2.8, "coord: 2.8, value: %f", value); + is_float (value, 2.8, "coord: 2.8, value: %f", value); skip_end(); @@ -259,17 +259,17 @@ value = psImagePixelInterpolate (image, 2.5, 2.5, NULL, 0, 0.0, PS_INTERPOLATE_BICUBE); - ok_float (value, 4.0625, "pixel center value - %f", value); + is_float (value, 4.0625, "pixel center value - %f", value); value = psImagePixelInterpolate (image, 2.2, 2.2, NULL, 0, 0.0, PS_INTERPOLATE_BICUBE); - ok_float (value, 3.41, "coord: 2.2, 2.5, value: %f", value); + is_float (value, 3.41, "coord: 2.2, 2.5, value: %f", value); value = psImagePixelInterpolate (image, 2.5, 2.8, NULL, 0, 0.0, PS_INTERPOLATE_BICUBE); - ok_float (value, 4.3625002, "coord: 2.5, 2.8, value: %f", value); + is_float (value, 4.3625002, "coord: 2.5, 2.8, value: %f", value); value = psImagePixelInterpolate (image, 2.2, 2.8, NULL, 0, 0.0, PS_INTERPOLATE_BICUBE); - ok_float (value, 4.010000229, "coord: 2.2, 2.8, value: %f", value); + is_float (value, 4.010000229, "coord: 2.2, 2.8, value: %f", value); value = psImagePixelInterpolate (image, 2.8, 2.8, NULL, 0, 0.0, PS_INTERPOLATE_BICUBE); - ok_float (value, 4.75999975, "coord: 2.8, 2.8, value: %f", value); + is_float (value, 4.75999975, "coord: 2.8, 2.8, value: %f", value); skip_end(); Index: trunk/psLib/test/pstap/src/pstap.h =================================================================== --- trunk/psLib/test/pstap/src/pstap.h (revision 12596) +++ trunk/psLib/test/pstap/src/pstap.h (revision 12607) @@ -25,5 +25,5 @@ // use to test the value of a float -# define ok_float(VALUE, EXPECT, ...) \ +# define is_float(VALUE, EXPECT, ...) \ { \ bool status = false; \ @@ -42,5 +42,5 @@ // use to test the value of a float within a defined tolerance -# define ok_float_tol(VALUE,EXPECT,TOL,...)\ +# define is_float_tol(VALUE,EXPECT,TOL,...)\ { \ bool status = false; \ @@ -59,5 +59,5 @@ // use to test the value of a double -# define ok_double(VALUE,EXPECT,...)\ +# define is_double(VALUE,EXPECT,...)\ { \ bool status = false; \ @@ -76,5 +76,5 @@ // use to test the value of a double -# define ok_double_tol(VALUE,EXPECT,TOL, ...)\ +# define is_double_tol(VALUE,EXPECT,TOL, ...)\ { \ bool status = false; \ @@ -92,5 +92,5 @@ -# define ok_str(VALUE, EXPECT, ...) \ +# define is_str(VALUE, EXPECT, ...) \ { \ int cmp = (strcmp(VALUE, EXPECT) == 0); \ @@ -103,5 +103,5 @@ -# define ok_strn(VALUE, EXPECT, N, ...)\ +# define is_strn(VALUE, EXPECT, N, ...)\ { \ int cmp = (strncmp(VALUE, EXPECT, N) == 0); \ Index: trunk/psLib/test/sys/tap_psString.c =================================================================== --- trunk/psLib/test/sys/tap_psString.c (revision 12596) +++ trunk/psLib/test/sys/tap_psString.c (revision 12607) @@ -20,6 +20,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-03-20 03:57:25 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-03-27 22:52:03 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -313,5 +313,5 @@ // test null-op psStringAppend(&str, "%s", ""); - ok_str(str, STR_0, "Failed test point"); + is_str(str, STR_0, "Failed test point"); psFree(str); Index: trunk/psLib/test/types/tap_psLookupTable_all.c =================================================================== --- trunk/psLib/test/types/tap_psLookupTable_all.c (revision 12596) +++ trunk/psLib/test/types/tap_psLookupTable_all.c (revision 12607) @@ -273,5 +273,5 @@ skip_start( vec == NULL, 1, "Skipping 1 tests because psLookupTableInterpolateAll failed"); - ok_double(vec->data.F64[0], 1.0, + is_double(vec->data.F64[0], 1.0, "psLookupTableInterpolateAll: return correct output vector for valid inputs."); skip_end(); Index: trunk/psLib/test/types/tap_psMetadataConfigFormat.c =================================================================== --- trunk/psLib/test/types/tap_psMetadataConfigFormat.c (revision 12596) +++ trunk/psLib/test/types/tap_psMetadataConfigFormat.c (revision 12607) @@ -102,5 +102,5 @@ char configTest[32]; strncpy(configTest, "time TAI NULL", 31); - ok_strn(configTest, out, 31, + is_strn(configTest, out, 31, "psMetadataConfigFormat: return correct output string."); psFree(time); @@ -124,5 +124,5 @@ char configTest[62]; strncpy(configTest, "new_S32 MULTI\nnew_S32 S32 666", 61); - ok_strn(configTest, out, strlen(configTest), + is_strn(configTest, out, strlen(configTest), "psMetadataConfigFormat: return correct output string."); psFree(out); @@ -150,5 +150,5 @@ "\nf32 S32 666 # f32_3" "\nf32 S32 665 # f32_2", 200); - ok_strn(configTest, out, strlen(configTest), + is_strn(configTest, out, strlen(configTest), "psMetadataConfigFormat: return correct output string."); psFree(out); Index: trunk/psLib/test/types/tap_psMetadataConfigParse.c =================================================================== --- trunk/psLib/test/types/tap_psMetadataConfigParse.c (revision 12596) +++ trunk/psLib/test/types/tap_psMetadataConfigParse.c (revision 12607) @@ -61,6 +61,6 @@ ok(item->type == PS_TYPE_S32, "return correcot metdataItem type"); is_int(item->data.S32, 666, "return correct metadataItem data"); - ok_str(item->name, "new", "return correct metadataItem name"); - ok_str(item->comment, "", "return correct metadataItem comment"); + is_str(item->name, "new", "return correct metadataItem name"); + is_str(item->comment, "", "return correct metadataItem comment"); skip_end(); @@ -81,7 +81,7 @@ "Skipping 1 tests because metadata container is empty!"); ok(item->type == PS_DATA_F64, "return correct metadataItem type"); - ok_float(6.28, item->data.F64, "return correct metadataItem data"); - ok_str(item->name, "item4", "return correct metadataItem name"); - ok_str(item->comment, "", "return correct metadataItem comment"); + is_float(6.28, item->data.F64, "return correct metadataItem data"); + is_str(item->name, "item4", "return correct metadataItem name"); + is_str(item->comment, "", "return correct metadataItem comment"); skip_end(); @@ -106,6 +106,6 @@ ok(item->type == PS_TYPE_S8, "metdataItem type"); is_int(item->data.S8, 3, "metdataItem value"); - ok_str(item->name, "item8", "return correct metadataItem name"); - ok_str(item->comment, "", "return correct metadataItem comment"); + is_str(item->name, "item8", "return correct metadataItem name"); + is_str(item->comment, "", "return correct metadataItem comment"); skip_end(); psFree(md); @@ -128,7 +128,7 @@ is_int(((psVector*)(item->data.V))->data.U8[0], 1, "return correct metadataItem data (Vector)"); - ok_str(item->name, "vector6", + is_str(item->name, "vector6", "return correct metadataItem name (Vector)"); - ok_str(item->comment, "I am a vector", "return correct metadataItem comment"); + is_str(item->comment, "I am a vector", "return correct metadataItem comment"); skip_end(); Index: trunk/psLib/test/types/tap_psMetadataConfigPrint.c =================================================================== --- trunk/psLib/test/types/tap_psMetadataConfigPrint.c (revision 12596) +++ trunk/psLib/test/types/tap_psMetadataConfigPrint.c (revision 12607) @@ -96,5 +96,5 @@ fread(fileStr2, 1, 31, mdcfg); - ok_strn(fileStr2, "\nnew S32 S32 666 ", 30, + is_strn(fileStr2, "\nnew S32 S32 666 ", 30, "return correct output."); Index: trunk/psLib/test/types/tap_psMetadataConfigWrite.c =================================================================== --- trunk/psLib/test/types/tap_psMetadataConfigWrite.c (revision 12596) +++ trunk/psLib/test/types/tap_psMetadataConfigWrite.c (revision 12607) @@ -62,5 +62,5 @@ strncpy(configTest, "item1-1 BOOL T # I am a boolean", 60); - ok_strn(configTest, fileStr, 60, + is_strn(configTest, fileStr, 60, "return correct output."); fclose(mdcfg); Index: trunk/psLib/test/types/tap_psMetadataConfig_input.c =================================================================== --- trunk/psLib/test/types/tap_psMetadataConfig_input.c (revision 12596) +++ trunk/psLib/test/types/tap_psMetadataConfig_input.c (revision 12607) @@ -88,16 +88,16 @@ psMetadataItem *item = psMetadataGet(md, PS_LIST_HEAD); // XXX shouldn't assume item isn't NULL - ok_str(item->name, "item1", "metadataItem name"); + is_str(item->name, "item1", "metadataItem name"); ok(item->type == PS_DATA_BOOL, "metadataItem type"); is_bool(item->data.B, true, "metdataItem value"); - ok_str(item->comment, "I am a boolean", "metadataItem comment."); + is_str(item->comment, "I am a boolean", "metadataItem comment."); // look at the last item item = psMetadataGet(md, PS_LIST_TAIL); // XXX shouldn't assume item isn't NULL - ok_str(item->name, "M2", "metadataItem name"); + is_str(item->name, "M2", "metadataItem name"); ok(item->type == PS_DATA_S32, "metdataItem type"); is_int(item->data.S32, 666, "metdataItem value"); - ok_str(item->comment, "this line is \"GOOD\" but parsed in the top level", "metadataItem comment."); + is_str(item->comment, "this line is \"GOOD\" but parsed in the top level", "metadataItem comment."); skip_end(); @@ -123,8 +123,8 @@ // note that item1 gets added to the "tail" of the metdata was it's // replaced - ok_str(item->name, "item2", "metadataItem name"); + is_str(item->name, "item2", "metadataItem name"); ok(item->type == PS_DATA_S32, "metdataItem type"); is_bool(item->data.S32, 55, "metadataItem value"); - ok_str(item->comment, "I am int", "metadataItem value"); + is_str(item->comment, "I am int", "metadataItem value"); // look at the last item @@ -132,8 +132,8 @@ // XXX shouldn't assume item isn't NULL // meta1 is from "the bad section" - ok_str(item->name, "meta1", "metadataItem name"); + is_str(item->name, "meta1", "metadataItem name"); ok(item->type == PS_DATA_METADATA, "metadataItem type"); - ok_str(item->comment, "", "metadataItem comment"); + is_str(item->comment, "", "metadataItem comment"); skip_end(); Index: trunk/psLib/test/types/tap_psMetadataItemParse.c =================================================================== --- trunk/psLib/test/types/tap_psMetadataItemParse.c (revision 12596) +++ trunk/psLib/test/types/tap_psMetadataItemParse.c (revision 12607) @@ -110,37 +110,37 @@ "psMetadataItem input." ); //Return 1.666 for string with "1.666" - ok_float( psMetadataItemParseF32(itemString2), 1.666, + is_float( psMetadataItemParseF32(itemString2), 1.666, "psMetadataItemParse: return 1.666 in F32 for string-item with " "value '1.666'." ); //Return 0.0 for F32 value 0.0 - ok_float( psMetadataItemParseF32(itemF32), 0.0, + is_float( psMetadataItemParseF32(itemF32), 0.0, "psMetadataItemParse: return 0.0 in F32 for F32-item with " "value '0.0'." ); //Return 0.5 for F64 value 0.5 - ok_float( psMetadataItemParseF32(itemF64), 0.5, + is_float( psMetadataItemParseF32(itemF64), 0.5, "psMetadataItemParse: return 0.5 in F32 for F64-item with " "value '0.5'." ); //Return 1.0 for S8 value 1 - ok_float( psMetadataItemParseF32(itemS8), 1.0, + is_float( psMetadataItemParseF32(itemS8), 1.0, "psMetadataItemParse: return 1.0 in F32 for S8-item with " "value '1'." ); //Return 0.0 for S16 value 0 - ok_float( psMetadataItemParseF32(itemS16), 0.0, + is_float( psMetadataItemParseF32(itemS16), 0.0, "psMetadataItemParse: return 0.0 in F32 for S16-item with " "value '0'." ); //Return 1.0 for S32 value 1 - ok_float( psMetadataItemParseF32(itemS32), 1.0, + is_float( psMetadataItemParseF32(itemS32), 1.0, "psMetadataItemParse: return 1.0 in F32 for S32-item with " "value '1'." ); //Return 2.0 for U8 value 2 - ok_float( psMetadataItemParseF32(itemU8), 2.0, + is_float( psMetadataItemParseF32(itemU8), 2.0, "psMetadataItemParse: return 2.0 in F32 for U8-item with " "value '2'." ); //Return 0.0 for U16 value 0 - ok_float( psMetadataItemParseF32(itemU16), 0.0, + is_float( psMetadataItemParseF32(itemU16), 0.0, "psMetadataItemParse: return 0.0 in F32 for U16-item with " "value '0'." ); //Return 1.0 for U32 value 1 - ok_float( psMetadataItemParseF32(itemU32), 1.0, + is_float( psMetadataItemParseF32(itemU32), 1.0, "psMetadataItemParse: return 1.0 in F32 for U32-item with " "value '1'." ); @@ -157,37 +157,37 @@ "psMetadataItem input." ); //Return 1.666 for string with "1.666" - ok_double_tol( psMetadataItemParseF64(itemString2), 1.666, 0.00001, + is_double_tol( psMetadataItemParseF64(itemString2), 1.666, 0.00001, "psMetadataItemParse: return 1.666 in F64 for string-item with " "value '1.666'." ); //Return 0.0 for F32 value 0.0 - ok_double( psMetadataItemParseF64(itemF32), 0.0, + is_double( psMetadataItemParseF64(itemF32), 0.0, "psMetadataItemParse: return 0.0 in F64 for F32-item with " "value '0.0'." ); //Return 0.5 for F64 value 0.5 - ok_double( psMetadataItemParseF64(itemF64), 0.5, + is_double( psMetadataItemParseF64(itemF64), 0.5, "psMetadataItemParse: return 0.5 in F64 for F64-item with " "value '0.5'." ); //Return 1.0 for S8 value 1 - ok_double( psMetadataItemParseF64(itemS8), 1.0, + is_double( psMetadataItemParseF64(itemS8), 1.0, "psMetadataItemParse: return 1.0 in F64 for S8-item with " "value '1'." ); //Return 0.0 for S16 value 0 - ok_double( psMetadataItemParseF64(itemS16), 0.0, + is_double( psMetadataItemParseF64(itemS16), 0.0, "psMetadataItemParse: return 0.0 in F64 for S16-item with " "value '0'." ); //Return 1.0 for S32 value 1 - ok_double( psMetadataItemParseF64(itemS32), 1.0, + is_double( psMetadataItemParseF64(itemS32), 1.0, "psMetadataItemParse: return 1.0 in F64 for S32-item with " "value '1'." ); //Return 2.0 for U8 value 2 - ok_double( psMetadataItemParseF64(itemU8), 2.0, + is_double( psMetadataItemParseF64(itemU8), 2.0, "psMetadataItemParse: return 2.0 in F64 for U8-item with " "value '2'." ); //Return 0.0 for U16 value 0 - ok_double( psMetadataItemParseF64(itemU16), 0.0, + is_double( psMetadataItemParseF64(itemU16), 0.0, "psMetadataItemParse: return 0.0 in F64 for U16-item with " "value '0'." ); //Return 1.0 for U32 value 1 - ok_double( psMetadataItemParseF64(itemU32), 1.0, + is_double( psMetadataItemParseF64(itemU32), 1.0, "psMetadataItemParse: return 1.0 in F64 for U32-item with " "value '1'." ); @@ -448,5 +448,5 @@ //Return "true" for STRING of value "true" psString tempString = psMetadataItemParseString(itemString1); - ok_strn( tempString, "true", 6, + is_strn( tempString, "true", 6, "psMetadataItemParse: return 'true' in STRING for STRING with " "value 'true'." ); @@ -455,5 +455,5 @@ //Return 0.000000 for F32 of value 0.000000 tempString = psMetadataItemParseString(itemF32); - ok_strn( tempString, "0.000000", 4, + is_strn( tempString, "0.000000", 4, "psMetadataItemParse: return '0.000000' in STRING for F32 with " "value '0.000000'. (actual result=%s)", tempString); @@ -462,5 +462,5 @@ //Return 0.500000 for F64 value 0.5 tempString = psMetadataItemParseString(itemF64); - ok_strn( tempString, "0.500000", 10, + is_strn( tempString, "0.500000", 10, "psMetadataItemParse: return '0.500000' in STRING for F64 with " "value '0.5'. (actual result=%s)", tempString); @@ -469,5 +469,5 @@ //Return 1 for S8 value 1 tempString = psMetadataItemParseString(itemS8); - ok_strn( tempString, "1", 3, + is_strn( tempString, "1", 3, "psMetadataItemParse: return '1' in STRING for S8 with " "value '1'. (actual result=%s)", tempString); @@ -476,5 +476,5 @@ //Return 0 for S16 value 0 tempString = psMetadataItemParseString(itemS16); - ok_strn( tempString, "0", 3, + is_strn( tempString, "0", 3, "psMetadataItemParse: return '0' in STRING for S8 with " "value '0'. (actual result=%s)", tempString); @@ -483,5 +483,5 @@ //Return 1 for S32 value 1 tempString = psMetadataItemParseString(itemS32); - ok_strn( tempString, "1", 3, + is_strn( tempString, "1", 3, "psMetadataItemParse: return '1' in STRING for S8 with " "value '1'. (actual result=%s)", tempString); @@ -490,5 +490,5 @@ //Return 2 for U8 value 2 tempString = psMetadataItemParseString(itemU8); - ok_strn( tempString, "2", 3, + is_strn( tempString, "2", 3, "psMetadataItemParse: return '2' in STRING for S8 with " "value '2'. (actual result=%s)", tempString); @@ -497,5 +497,5 @@ //Return 0 for U16 value 0 tempString = psMetadataItemParseString(itemU16); - ok_strn( tempString, "0", 3, + is_strn( tempString, "0", 3, "psMetadataItemParse: return '0' in STRING for S8 with " "value '0'. (actual result=%s)", tempString); @@ -504,5 +504,5 @@ //Return 1 for U32 value 1 tempString = psMetadataItemParseString(itemU32); - ok_strn( tempString, "1", 3, + is_strn( tempString, "1", 3, "psMetadataItemParse: return '1' in STRING for S8 with " "value '1'. (actual result=%s)", tempString); Index: trunk/psLib/test/types/tap_psMetadata_copying.c =================================================================== --- trunk/psLib/test/types/tap_psMetadata_copying.c (revision 12596) +++ trunk/psLib/test/types/tap_psMetadata_copying.c (revision 12607) @@ -221,7 +221,7 @@ ok(copy->type == PS_DATA_S64, "item type"); - ok_str(copy->name, "itemS64", "item name"); + is_str(copy->name, "itemS64", "item name"); is_long(copy->data.S64, 4, "item data"); - ok_str(copy->comment, "", "item comment"); + is_str(copy->comment, "", "item comment"); psFree(copy); Index: trunk/psLib/test/types/tap_psMetadata_polynomials.c =================================================================== --- trunk/psLib/test/types/tap_psMetadata_polynomials.c (revision 12596) +++ trunk/psLib/test/types/tap_psMetadata_polynomials.c (revision 12607) @@ -69,5 +69,5 @@ ok(status, "psPolynomial1DtoMetadata: found VAL_X00"); - ok_double(val, 1.1, + is_double(val, 1.1, "psPolynomial1DtoMetadata: VAL_X00 is %lf", val); @@ -75,5 +75,5 @@ ok(status, "psPolynomial1DtoMetadata: found VAL_X01"); - ok_double(val, 2.2, + is_double(val, 2.2, "psPolynomial1DtoMetadata: VAL_X01 is %lf", val); skip_end(); @@ -278,5 +278,5 @@ ok(status, "psPolynomial2DtoMetadata: found VAL_X00_Y00"); - ok_double(val, 1.1, + is_double(val, 1.1, "psPolynomial2DtoMetadata: VAL_X00_Y00 is %lf", val); @@ -284,5 +284,5 @@ ok(status, "psPolynomial2DtoMetadata: found VAL_X01_Y01"); - ok_double(val, 4.4, + is_double(val, 4.4, "psPolynomial2DtoMetadata: VAL_X01_Y01 is %lf", val);