Changeset 8528 for trunk/ippdb/tests/pop.c

Timestamp:

Aug 23, 2006, 1:55:03 PM (20 years ago)

Author:

jhoblitt

Message:

VERSION 0.0.32

File:

• trunk/ippdb/tests/pop.c (modified) (5 diffs)

trunk/ippdb/tests/pop.c

@@ -512 +512 @@
         char            exp_id[256];
         bool            include;
-        bool            accept;
-
-        dbh = psDBInit("localhost", "test", NULL, "test");
-        if (!dbh) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (!detInputExpPop(dbh, &det_id, &iteration, (char **)&exp_id, &include, &accept)) { 
+
+        dbh = psDBInit("localhost", "test", NULL, "test");
+        if (!dbh) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (!detInputExpPop(dbh, &det_id, &iteration, (char **)&exp_id, &include)) { 
             exit(EXIT_FAILURE);
         }
@@ -556 +555 @@
         char            uri[256];
         char            recipe[256];
-
-        dbh = psDBInit("localhost", "test", NULL, "test");
-        if (!dbh) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (!detStackedImfilePop(dbh, &det_id, &iteration, (char **)&class_id, (char **)&uri, (char **)&recipe)) { 
+        psF64           bg;
+        psF64           bg_stdev;
+        psF64           bg_mean_stdev;
+
+        dbh = psDBInit("localhost", "test", NULL, "test");
+        if (!dbh) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (!detStackedImfilePop(dbh, &det_id, &iteration, (char **)&class_id, (char **)&uri, (char **)&recipe, &bg, &bg_stdev, &bg_mean_stdev)) { 
             exit(EXIT_FAILURE);
         }
@@ -650 +652 @@
         char            exp_id[256];
         char            class_id[256];
-        char            recipe[256];
-        char            uri[256];
+        char            uri[256];
+        char            recipe[256];
+        psF64           bg;
+        psF64           bg_stdev;
+        psF64           bg_mean_stdev;
         char            b1_uri[256];
         char            b2_uri[256];
@@ -660 +665 @@
         }
 
-        if (!detResidImfilePop(dbh, &det_id, &iteration, (char **)&exp_id, (char **)&class_id, (char **)&recipe, (char **)&uri, (char **)&b1_uri, (char **)&b2_uri)) { 
-            exit(EXIT_FAILURE);
-        }
-
-        psDBCleanup(dbh);
-    }
-
-    {
-        psDB            *dbh;
-        psS32           det_id;
-        psS32           iteration;
-        char            exp_id[256];
-        char            recipe[256];
-        bool            keep;
+        if (!detResidImfilePop(dbh, &det_id, &iteration, (char **)&exp_id, (char **)&class_id, (char **)&uri, (char **)&recipe, &bg, &bg_stdev, &bg_mean_stdev, (char **)&b1_uri, (char **)&b2_uri)) { 
+            exit(EXIT_FAILURE);
+        }
+
+        psDBCleanup(dbh);
+    }
+
+    {
+        psDB            *dbh;
+        psS32           det_id;
+        psS32           iteration;
+        char            exp_id[256];
+        char            recipe[256];
+        psF64           bg;
+        psF64           bg_stdev;
+        psF64           bg_mean_stdev;
+        char            b1_uri[256];
+        char            b2_uri[256];
         bool            accept;
 
@@ -681 +690 @@
         }
 
-        if (!detResidExpPop(dbh, &det_id, &iteration, (char **)&exp_id, (char **)&recipe, &keep, &accept)) { 
+        if (!detResidExpPop(dbh, &det_id, &iteration, (char **)&exp_id, (char **)&recipe, &bg, &bg_stdev, &bg_mean_stdev, (char **)&b1_uri, (char **)&b2_uri, &accept)) { 
+            exit(EXIT_FAILURE);
+        }
+
+        psDBCleanup(dbh);
+    }
+
+    {
+        psDB            *dbh;
+        psS32           det_id;
+        psS32           iteration;
+        psF64           bg;
+        psF64           bg_stdev;
+        psF64           bg_mean_stdev;
+        bool            accept;
+
+        dbh = psDBInit("localhost", "test", NULL, "test");
+        if (!dbh) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (!detRunSummaryPop(dbh, &det_id, &iteration, &bg, &bg_stdev, &bg_mean_stdev, &accept)) { 
             exit(EXIT_FAILURE);
         }