Update of /cvsroot/monetdb/pathfinder/modules/pftijah
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3625
Modified Files:
pftijah.mx serialize_pftijah_options.mx
Log Message:
- fixed bug in concept retrieval model
- empty start nodes sequence does not cause errors anymore
- propperly reset debugging state to '0', when the debbugging option is not set
(concept retrieval is so far only present in the development branch)
U serialize_pftijah_options.mx
Index: serialize_pftijah_options.mx
===================================================================
RCS file:
/cvsroot/monetdb/pathfinder/modules/pftijah/serialize_pftijah_options.mx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- serialize_pftijah_options.mx 25 Aug 2008 13:37:19 -0000 1.18
+++ serialize_pftijah_options.mx 13 Mar 2009 08:07:25 -0000 1.19
@@ -194,6 +194,7 @@
/* error locked ?? */
return GDK_FAIL;
}
+ SET_TDEBUG(0);
GLOBAL_PTOS = &ptos;
ptos.cnt = 0;
ptos.bat = BATnew(TYPE_str, TYPE_str, 32);
U pftijah.mx
Index: pftijah.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/pftijah.mx,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -d -r1.216 -r1.217
--- pftijah.mx 5 Mar 2009 20:57:01 -0000 1.216
+++ pftijah.mx 13 Mar 2009 08:07:24 -0000 1.217
@@ -2617,7 +2617,7 @@
var offset1 := int(index.fetch(int(tid)));
var offset2 := int(index.fetch(int(tid) + 1));
var res := bat("tj_" + ftindex + "_Concepts").slice(offset1, offset2 - 1);
- res := res.seqbase(0...@0).chk_order();
+ res := res.chk_order();
return res;
}
@@ -2631,7 +2631,7 @@
# get doc - Concept relation
var c_Scr := bat("tj_" + ftindex + "_ConceptScore");
var e_c := treemergejo...@1_nid(e_pre, e_size, c_pre);
- var eself_c := e_pre.join(c_pre.reverse());
+ var eself_c := e_pre.join(c_pre.reverse());
var e_cScr := {sum}(c_Scr, e_c.reverse(), e_c.kunique()).sort();
var eself_cScr := {sum}(c_Scr, eself_c.reverse(),
eself_c.kunique()).sort();
return union_add(e_cScr, eself_cScr);
@@ -4553,15 +4553,22 @@
int CMDpf2tijah_node(BAT** res, BAT* doc_name, BAT* doc_firstpre, BAT*
doc_pfpre, BAT* item, BAT* kind, BAT* doc_loaded ) {
int debug = 0;
+ int nDocs;
+ BAT **rangeBAT;
- int nDocs = BATcount(doc_loaded);
- BAT **rangeBAT = (BAT**)GDKmalloc(nDocs*sizeof(BAT*));
- if (!rangeBAT) {
+ if (BATcount(item) == 0) {
+ *res = BATnew(TYPE_void, TYPE_oid, 0);
+ return GDK_SUCCEED;
+ }
+
+ nDocs = BATcount(doc_loaded);
+ rangeBAT = (BAT**)GDKmalloc(nDocs*sizeof(BAT*));
+ if (!rangeBAT) {
GDKerror("CMDpf2tijah_node: GDKmalloc() failed.\n");
- return GDK_FAIL;
- }
- for(int i=0; i<nDocs; i++) {
- rangeBAT[i] = NULL;
+ return GDK_FAIL;
+ }
+ for(int i=0; i<nDocs; i++) {
+ rangeBAT[i] = NULL;
}
*res = BATnew(TYPE_void, TYPE_oid, BATcount(item));
------------------------------------------------------------------------------
Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are
powering Web 2.0 with engaging, cross-platform capabilities. Quickly and
easily build your RIAs with Flex Builder, the Eclipse(TM)based development
software that enables intelligent coding and step-through debugging.
Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
