MonetDB: ssdb - distSum => wgtDistSum

[Jennie Zhang]

Changeset: e3cf020b3bf6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e3cf020b3bf6
Modified Files:
        sql/backends/monet5/UDF/ssdb.c
Branch: ssdb
Log Message:

distSum => wgtDistSum


diffs (50 lines):

diff --git a/sql/backends/monet5/UDF/ssdb.c b/sql/backends/monet5/UDF/ssdb.c
--- a/sql/backends/monet5/UDF/ssdb.c
+++ b/sql/backends/monet5/UDF/ssdb.c
@@ -114,7 +114,7 @@ SSDBcooking(Client cntxt, MalBlkPtr mb, 
        dbl *tout_obs_avgdist_t = NULL;
        /* intermediate sums */
        lng *wtdSumX = NULL, *wtdSumY = NULL; /* weighted sum X,Y */
-       dbl *distSum = NULL;
+       dbl *wtdDistSum = NULL;
 
        str msg = getSQLContext(cntxt, mb, &sql, NULL);
        str tin_name  = *(str *) getArgReference(stk, pci, pci->retc + 0);
@@ -262,7 +262,7 @@ SSDBcooking(Client cntxt, MalBlkPtr mb, 
                msg = sql_message("COOKING(): GDKmallo 'wtdSumY' failed");
                goto CLEANUP_RETURN;
        }
-       if(!(distSum = GDKmalloc(nr_obs * sizeof(dbl)))) {
+       if(!(wtdDistSum = GDKmalloc(nr_obs * sizeof(dbl)))) {
                msg = sql_message("COOKING(): GDKmallo 'weightedDistSum' 
failed");
                goto CLEANUP_RETURN;
        }
@@ -310,16 +310,16 @@ SSDBcooking(Client cntxt, MalBlkPtr mb, 
                        cur_obsid = obsid[idx];
                        distX = tin_x_t[idx] - tout_obs_centerx_t[cur_obsid];
                        distY = tin_y_t[idx] - tout_obs_centery_t[cur_obsid];
-                       distSum[cur_obsid] = sqrt(distX * distX + distY * 
distY);
+                       wtdDistSum[cur_obsid] = tin_val_t[idx] * sqrt(distX * 
distX + distY * distY);
                } else {
                        distX = tin_x_t[idx] - tout_obs_centerx_t[cur_obsid];
                        distY = tin_y_t[idx] - tout_obs_centery_t[cur_obsid];
-                       distSum[cur_obsid] += sqrt(distX * distX + distY * 
distY);
+                       wtdDistSum[cur_obsid] +=  tin_val_t[idx] * sqrt(distX * 
distX + distY * distY);
                }
        }
        /* Second pass over all observations to compute the average distance */
        for (cur_obsid = 0; cur_obsid < nr_obs; idx++) {
-               tout_obs_avgdist_t[cur_obsid] = distSum[cur_obsid] / 
tout_obs_pixsum_t[cur_obsid];
+               tout_obs_avgdist_t[cur_obsid] = wtdDistSum[cur_obsid] / 
tout_obs_pixsum_t[cur_obsid];
        }
 
        /* Set proper properties for all BATs */
@@ -456,7 +456,7 @@ CLEANUP_RETURN:
        if(obsid) GDKfree(obsid);
        if(wtdSumX) GDKfree(wtdSumX);
        if(wtdSumY) GDKfree(wtdSumY);
-       if(distSum) GDKfree(distSum);
+       if(wtdDistSum) GDKfree(wtdDistSum);
 
        return msg ? msg : MAL_SUCCEED;
 }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list