Update of /cvsroot/monetdb/pathfinder/modules/pftijah/tjc
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv1957/modules/pftijah/tjc
Modified Files:
Tag: M5XQ
tjc_main.c
Log Message:
propagated changes of Wednesday Apr 22 2009
from the development trunk to the M5XQ branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/04/22 - hrode: modules/pftijah/tjc/tjc_main.c,1.18
correct semantics
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: tjc_main.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/tjc/tjc_main.c,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -u -d -r1.17 -r1.17.2.1
--- tjc_main.c 16 Apr 2009 10:29:37 -0000 1.17
+++ tjc_main.c 22 Apr 2009 14:27:44 -0000 1.17.2.1
@@ -70,7 +70,7 @@
tjc_c->lambda = 0.8;
tjc_c->okapik1 = 1.2;
tjc_c->okapib = 0.75;
- tjc_c->returnall = 0;
+ tjc_c->semantics = 0;
tjc_c->rmoverlap = 0;
/*
@@ -167,7 +167,12 @@
tjc_c->okapib = atof (optVal);
} else if ( strcmp(optName,"return-all") == 0 ) {
if ( strcasecmp(optVal,"TRUE") == 0 )
- tjc_c->returnall = 1;
+ tjc_c->semantics = 1;
+ } else if ( strcmp(optName,"semantics") == 0 ) {
+ if ( strcasecmp(optVal,"strict") == 0 )
+ tjc_c->semantics = 0;
+ else if ( strcasecmp(optVal,"vague") == 0 )
+ tjc_c->semantics = 1;
} else if (strcmp(optName, "prior") == 0) {
if (strcasecmp(optVal, "LENGTH_PRIOR") == 0) {
tjc_c->prior = "ls";
@@ -240,7 +245,7 @@
if (DEBUG) stream_printf(GDKout,"#!tjc start normalize query\n");
normalize_query(tjc_c, ptree);
if (DEBUG) stream_printf(GDKout,"#!tjc start physical optimization\n");
- atree = phys_optimize (ptree, root, rtagbat);
+ atree = phys_optimize (tjc_c, ptree, root, rtagbat);
if (DEBUG) stream_printf(GDKout,"#!tjc start mil generation\n");
milres = milprint (tjc_c, atree);
------------------------------------------------------------------------------
Stay on top of everything new and different, both inside and
around Java (TM) technology - register by April 22, and save
$200 on the JavaOne (SM) conference, June 2-5, 2009, San Francisco.
300 plus technical and hands-on sessions. Register today.
Use priority code J9JMT32. http://p.sf.net/sfu/p
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
