Changeset: be8060691638 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=be8060691638
Modified Files:
sql/backends/monet5/UDF/ssdb.c
Branch: ssdb
Log Message:
Changes in gouping function.
diffs (47 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
@@ -1334,9 +1334,9 @@ SSDBgrouping(Client cntxt, MalBlkPtr mb,
int *tout_grp_obsgroupid_t = NULL, *tout_grp_center_traj_x_t = NULL,
*tout_grp_center_traj_y_t = NULL, *tout_grp_fromtime_t = NULL,
*tout_grp_totime_t = NULL;
int *tout_obs_obsgroupid_t = NULL, *tout_obs_obsid_t = NULL;
- obs_group **groupFrom;
- int **groupTo;
- int *current_groupids;
+ obs_group **groupFrom = NULL;
+ int **groupTo = NULL;
+ int *current_groupids = NULL;
if (msg)
@@ -1423,8 +1423,6 @@ SSDBgrouping(Client cntxt, MalBlkPtr mb,
msg = sql_message("GROUPING(): GDKzalloc
'groupFrom[%d]->obsid' failed", l);
goto CLEANUP_RETURN;
}
- groupFrom[l]->fromtime=0;
- groupFrom[l]->totime=0;
groupFrom[l]->totalx=0;
groupFrom[l]->totaly=0;
groupFrom[l]->cnt=0;
@@ -1466,10 +1464,8 @@ SSDBgrouping(Client cntxt, MalBlkPtr mb,
groupFrom[groups]->totalx = groupFrom[groups]->totalx +
tin_r_centerx_t[idx];
groupFrom[groups]->totaly = groupFrom[groups]->totaly +
tin_r_centery_t[idx];
groupFrom[groups]->cnt = groupFrom[groups]->cnt + 1;
- if(tin_r_time_t[idx] < (groupFrom[groups]->fromtime))
- groupFrom[groups]->fromtime = tin_r_time_t[idx];
- else if(tin_r_time_t[idx] > (groupFrom[groups]->totime))
- groupFrom[groups]->totime = tin_r_time_t[idx];
+ groupFrom[groups]->fromtime = tin_r_time_t[idx];
+ groupFrom[groups]->totime = tin_r_time_t[idx];
groups++;
}
if(((idx<(nr_points-1)) &&
(tin_l_obsid_t[idx]!=tin_l_obsid_t[idx+1])) || (idx==nr_points-1))
@@ -1479,7 +1475,7 @@ SSDBgrouping(Client cntxt, MalBlkPtr mb,
if(current_groupids[l]!=0)
{
groupTo[tin_l_obsid_t[idx]][l]=1;
-
if(groupFrom[l]->obsid[tin_l_obsid_t[idx]]==0)
+
if((groupFrom[l]->obsid[tin_l_obsid_t[idx]])==0)
{
groupFrom[l]->obsid[tin_l_obsid_t[idx]]=1;
groupFrom[l]->totalx =
groupFrom[l]->totalx + tin_l_centerx_t[idx];
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
