Changeset 42500

Timestamp:

Aug 15, 2023, 4:43:48 PM (3 years ago)

Author:

eugene

Message:

fix print type for rowcount in psDB.h

Location:

branches/eam_branches/ipp-20230313/psLib

Files:

• src/db/psDB.c (modified) (1 diff)
• test/math/tap_psMatrix08.c (modified) (7 diffs)
• test/math/tap_psPolyFit_IRLS.c (modified) (2 diffs)
• test/math/tap_psSpline1D.c (modified) (6 diffs)
• test/types/tap_psMetadataConfigFormat.c (modified) (1 diff)
• test/types/tap_psMetadataConfigWrite.c (modified) (1 diff)

branches/eam_branches/ipp-20230313/psLib/src/db/psDB.c

@@ -1040 +1040 @@
     fieldCount = mysql_num_fields(result);
 
-    psTrace("psLib.db", PS_LOG_INFO, "query returned %lld rows with %d fields",             rowCount, fieldCount);
+    psTrace("psLib.db", PS_LOG_INFO, "query returned %lu rows with %d fields",             rowCount, fieldCount);
 
     while ((row = mysql_fetch_row(result))) {

branches/eam_branches/ipp-20230313/psLib/test/math/tap_psMatrix08.c

@@ -20 +20 @@
 psS32 main( psS32 argc, char* argv[] )
 {
+    fprintf (stderr, "path: %s\n", argv[0]);
+
+    char imApath[1024];
+    char imBpath[1024];
+    char topPath[1024];
+    char *libpath = strstr (argv[0], ".libs/");
+    if (!libpath) {
+        fprintf (stderr, "ERROR: cannot find input data\n");
+        exit (2);
+    }
+
+    // if (strncmp(argv[0], ".libs/", 6))
+    int nTopPath = libpath - argv[0]; // 
+    if (nTopPath) {
+        ps_strncpy_nowarn (topPath, argv[0], nTopPath); topPath[nTopPath] = 0;
+        ps_snprintf_nowarn (imApath, 1024, "%s/%s", topPath, "data/Agj.fits");
+        ps_snprintf_nowarn (imBpath, 1024, "%s/%s", topPath, "data/Bgj.fits");
+    } else {
+        ps_snprintf_nowarn (imApath, 1024, "%s", "data/Agj.fits");
+        ps_snprintf_nowarn (imBpath, 1024, "%s", "data/Bgj.fits");
+    }
+
     plan_tests(23);
     // psTraceSetLevel("psLib.math.psMatrixGJSolve", 4);
@@ -32 +54 @@
         // XXX this is an ill-conditioned matrix.  LU Decomposition does not inform us that it is ill-conditioned.  
         // the result solves the equation, but what are the errors on the values?
-        fits = psFitsOpen ("data/Agj.fits", "r");
+        fits = psFitsOpen (imApath, "r");
         ok(fits, "opened test image Agj.fits");
 
@@ -43 +65 @@
         psFitsClose (fits);
 
-        fits = psFitsOpen ("data/Bgj.fits", "r");
+        fits = psFitsOpen (imBpath, "r");
         ok(fits, "opened test image Bgj.fits");
 
@@ -98 +120 @@
 
         // we have a specific ill-conditioned matrix in Agj.fits. psMatrixGJSolve detects this and reports a failure.
-        fits = psFitsOpen ("data/Agj.fits", "r");
+        fits = psFitsOpen (imApath, "r");
         ok(fits, "opened test image Agj.fits");
 
@@ -106 +128 @@
         psFitsClose (fits);
 
-        fits = psFitsOpen ("data/Bgj.fits", "r");
+        fits = psFitsOpen (imBpath, "r");
         ok(fits, "opened test image Bgj.fits");
 
@@ -147 +169 @@
 
         // we have a specific ill-conditioned matrix in Agj.fits. psMatrixGJSolve detects this and reports a failure.
-        fits = psFitsOpen ("data/Agj.fits", "r");
+        fits = psFitsOpen (imApath, "r");
         ok(fits, "opened test image Agj.fits");
 
@@ -158 +180 @@
         psFitsClose (fits);
 
-        fits = psFitsOpen ("data/Bgj.fits", "r");
+        fits = psFitsOpen (imBpath, "r");
         ok(fits, "opened test image Bgj.fits");
 

branches/eam_branches/ipp-20230313/psLib/test/math/tap_psPolyFit_IRLS.c

@@ -84 +84 @@
         ok(rc == true, "fit succeeded mechanically");
 
+# if (0)
         // XXX test:
         FILE *ftest = fopen ("irls.ft.dat", "w");
@@ -90 +91 @@
         }
         fclose (ftest);
+# endif
     } else {
         diag ("ORD fits with %f outliers: sigma = %f", outfrac, sigma);

branches/eam_branches/ipp-20230313/psLib/test/math/tap_psSpline1D.c

@@ -107 +107 @@
         psSpline1D *tmpSpline = NULL;
         if (!xNull) {
-            tmpSpline = psSpline1DFitVector(xF32, yF32);
+            tmpSpline = psSpline1DFitVector(xF32, yF32, NAN, NAN);
         } else {
-            tmpSpline = psSpline1DFitVector(NULL, yF32);
+            tmpSpline = psSpline1DFitVector(NULL, yF32, NAN, NAN);
         }
 
@@ -120 +120 @@
                 testStatus = false;
             }
-            if(tmpSpline->spline == NULL) {
-                diag("psSpline1DFitVector() returned a NULL psSpline1D->spline member.");
-                testStatus = false;
-            }
-            for (psS32 i = 0 ; i < NumSplines ; i++) {
-                if (tmpSpline->spline[i] == NULL) {
-                    diag("psSpline1DFitVector() returned a NULL psSpline1D->spline[%d] member.", i);
-                    testStatus = false;
-                }
-            }
-            if (tmpSpline->knots == NULL) {
+            if (tmpSpline->xKnots == NULL) {
                 diag("psSpline1DFitVector() returned a NULL psSpline1D->knots member");
                 testStatus = false;
             }
-            if (tmpSpline->p_psDeriv2 == NULL) {
+            if (tmpSpline->yKnots == NULL) {
+                diag("psSpline1DFitVector() returned a NULL psSpline1D->knots member");
+                testStatus = false;
+            }
+            if (tmpSpline->d2yKnots == NULL) {
                 diag("psSpline1DFitVector()returned a NULL psSpline1D->p_psDeriv2 member");
                 testStatus = false;
-            }
-
-            // Test psSpline1DEval()
-            for (psS32 i=0;i<NumSplines;i++) {
-                psF32 x = 0.5 + (float) i;
-                psF32 y = psSpline1DEval(tmpSpline, x);
-                if (CheckErrorF32(y, func(x))) {
-                    testStatus = false;
-                    diag("TEST ERROR: f(%f) is %f, should be %f", x, y, myFunc00(x));
-                    // XXX EAM : the truth value above should be 'func' not myFunc00
-                }
             }
 
@@ -196 +179 @@
         psSpline1D *tmpSpline = NULL;
         if (!xNull) {
-            tmpSpline = psSpline1DFitVector(xF64, yF64);
+            tmpSpline = psSpline1DFitVector(xF64, yF64, NAN, NAN);
         } else {
-            tmpSpline = psSpline1DFitVector(NULL, yF64);
+            tmpSpline = psSpline1DFitVector(NULL, yF64, NAN, NAN);
         }
         if(tmpSpline == NULL) {
@@ -208 +191 @@
                 testStatus = false;
             }
-            if(tmpSpline->spline == NULL) {
-                diag("psSpline1DFitVector() returned a NULL psSpline1D->spline member.");
-                testStatus = false;
-            }
-            for (psS32 i = 0 ; i < NumSplines ; i++) {
-                if (tmpSpline->spline[i] == NULL) {
-                    diag("psSpline1DFitVector() returned a NULL psSpline1D->spline[%d] member.", i);
-                    testStatus = false;
-                }
-            }
-            if (tmpSpline->knots == NULL) {
-                diag("psSpline1DFitVector() returned a NULL psSpline1D->knots member");
-                testStatus = false;
-            }
-            if (tmpSpline->p_psDeriv2 == NULL) {
-                diag("psSpline1DFitVector()returned a NULL psSpline1D->p_psDeriv2 member");
+            if (tmpSpline->xKnots == NULL) {
+                diag("psSpline1DFitVector() returned a NULL psSpline1D->xKnots member");
+                testStatus = false;
+            }
+            if (tmpSpline->yKnots == NULL) {
+                diag("psSpline1DFitVector() returned a NULL psSpline1D->yKnots member");
+                testStatus = false;
+            }
+            if (tmpSpline->d2yKnots == NULL) {
+                diag("psSpline1DFitVector()returned a NULL psSpline1D->d2yKnots member");
                 testStatus = false;
             }
@@ -278 +255 @@
         skip_start(tmpSpline == NULL, 4, "Skipping tests because psSpline1DAlloc() failed");
         ok(tmpSpline->n == 0, "psSpline1DAlloc() properly set the psSpline1D->n member");
-        ok(tmpSpline->spline == NULL, "psSpline1DAlloc() properly set the psSpline1D->spline member");
-        ok(tmpSpline->knots == NULL, "psSpline1DAlloc() properly set the psSpline1D->knots member");
-        ok(tmpSpline->p_psDeriv2 == NULL, "psSpline1DAlloc() properly set the psSpline1D->p_psDeriv2 member");
+        ok(tmpSpline->xKnots   == NULL, "psSpline1DAlloc() properly set the psSpline1D->xKnots member");
+        ok(tmpSpline->yKnots   == NULL, "psSpline1DAlloc() properly set the psSpline1D->yKnots member");
+        ok(tmpSpline->d2yKnots == NULL, "psSpline1DAlloc() properly set the psSpline1D->d2yKnots member");
         psFree(tmpSpline);
         skip_end();
@@ -289 +266 @@
     {
         psMemId id = psMemGetId();
-        psSpline1D *tmpSpline = psSpline1DFitVector(NULL, NULL);
+        psSpline1D *tmpSpline = psSpline1DFitVector(NULL, NULL, NAN, NAN);
         ok(tmpSpline == NULL, "psSpline1DFitVector() returns NULL with NULL arguments");
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");

branches/eam_branches/ipp-20230313/psLib/test/types/tap_psMetadataConfigFormat.c

@@ -101 +101 @@
             "containing a NULL time.");
         char configTest[32];
-        strncpy(configTest, "time             TAI       NULL", 31);
+        ps_strncpy_nowarn(configTest, "time             TAI       NULL", 31);
         is_strn(configTest, out, 31,
                 "psMetadataConfigFormat:         return correct output string.");

branches/eam_branches/ipp-20230313/psLib/test/types/tap_psMetadataConfigWrite.c

@@ -74 +74 @@
         FILE *mdcfg = fopen("mdcfg.wrt", "r");
         fgets(fileStr, 61, mdcfg);
-        strncpy(configTest,
-                "item1-1          BOOL      T                # I am a boolean", 60);
+        ps_strncpy_nowarn(configTest, "item1-1          BOOL      T                # I am a boolean", 60);
         is_strn(configTest, fileStr, 60,
                 "return correct output.");