Update of /cvsroot/monetdb/pathfinder/modules/pftijah
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29306/modules/pftijah

Modified Files:
        pftijah.mx 
Log Message:

With the last location-step being loop-lifted we can start cleaning-up the code 
base:

removed iterative location-step legacy

(changes are wrapped in tags
 "before_iterative_location-step_clean-up" & 
"after_iterative_location-step_clean-up")


Index: pftijah.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/pftijah.mx,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -d -r1.150 -r1.151
--- pftijah.mx  3 Aug 2007 07:32:20 -0000       1.150
+++ pftijah.mx  10 Aug 2007 00:26:41 -0000      1.151
@@ -1843,7 +1843,17 @@
 
     var ctx      := region.sort();
     var pre_size := load( "tj_" + qenv.find(QENV_FTINAME) + "_size1");    
-    var desc     := scj_desc( pre_size, ctx, count(pre_size) );
+        ctx       := ctx.hmark([EMAIL PROTECTED]);
+    var one_ctx   := (ctx.fetch(0) = ctx.fetch(count(ctx)-1));
+    var cands     := pre_size;
+    var one_iter  := TRUE;
+    var min_iter  := [EMAIL PROTECTED];
+    var max_iter  := min_iter;
+    var iter      := ctx.project(min_iter);
+    var kind_test := chr(nil);
+    var no_iter_order := TRUE;
+    var desc      := ll_descendant(iter, ctx, pre_size, cands, one_iter, 
one_ctx, min_iter, max_iter, no_iter_order, kind_test);
+        desc      := desc.reverse().project(nil);
     var result   := nodes( desc, qenv ).project( 
dbl(qenv.find(QENV_SCOREBASE)) );
     
     if ( trace ) tj_trace( "END  contained_by_1" );


-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins

Reply via email to