Changeset 18579 for trunk/ippTools/src/stacktool.c

Timestamp:

Jul 16, 2008, 1:01:47 PM (18 years ago)

Author:

Paul Price

Message:

Fixing buggy query to get list of warps and stacks. It would return a row for every stack that exists, rather than a row for every skycell/filter combination. Completely re-crafted the query so that it returns a single row for each skycell/filter combination, with the number of warps available to be stacked and the number of warps in the biggest stack. It's a bit complicated, and I'm not entirely sure it's 100% correct, but it seems to work on the simtest (though that's only a single skycell).

File:

• trunk/ippTools/src/stacktool.c (modified) (4 diffs)

trunk/ippTools/src/stacktool.c

@@ -125 +125 @@
     PXOPT_LOOKUP_S32(randomLimit, config->args, "-random", false, false);
 
-    PXOPT_COPY_S32(config->args, having, "-min_num", "num_avail", ">=");
-    PXOPT_COPY_S32(config->args, having, "-min_new", "(num_avail - num_extant)", ">=");
+    PXOPT_COPY_S32(config->args, having, "-min_num", "num_warp", ">=");
+    PXOPT_COPY_S32(config->args, having, "-min_new", "(num_warp - num_stack)", ">=");
 
     PXOPT_LOOKUP_F32(min_frac, config->args, "-min_frac", false, false);
@@ -144 +144 @@
     PXOPT_COPY_F32(config->args, whereWSF, "-select_good_frac_min", "good_frac", ">=");
 
-    psString select = pxDataGet("stacktool_definebyquery_select.sql");
+    psString select = pxDataGet("stacktool_definebyquery_part1.sql");
     if (!select) {
         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
@@ -164 +164 @@
     psFree(whereWSF);
 
-    psString groupby = pxDataGet("stacktool_definebyquery_groupby.sql");
+    psString groupby = pxDataGet("stacktool_definebyquery_part2.sql");
     if (!groupby) {
         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
@@ -185 +185 @@
             psStringAppend(&select, " HAVING");
         }
-        psStringAppend(&select, " num_avail >= %f * num_extant", (double)min_frac);
+        psStringAppend(&select, " num_warp >= %f * num_stack", (double)min_frac);
     }