Changeset: 57ffe2bf4c3b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=57ffe2bf4c3b Modified Files: monetdb5/extras/rdf/rdfschema.c monetdb5/extras/rdf/rdfschema.h Branch: rdf Log Message:
Increase dimension factor diffs (45 lines): diff --git a/monetdb5/extras/rdf/rdfschema.c b/monetdb5/extras/rdf/rdfschema.c --- a/monetdb5/extras/rdf/rdfschema.c +++ b/monetdb5/extras/rdf/rdfschema.c @@ -3603,7 +3603,7 @@ void generatecsRelSum(CSrel csRel, int f freq = freqCSset->items[csRel.origFreqIdx].support; referredFreqId = csRel.lstRefFreqIdx[i]; freqOfReferredCS = freqCSset->items[referredFreqId].support; - if (freq > MIN_FROMTABLE_SIZE_S5 && (((float)freq * INFREQ_TYPE_THRESHOLD) < csRel.lstCnt[i])) + if (freq > MIN_FROMTABLE_SIZE_S5 && (((float)freq * INFREQ_TYPE_THRESHOLD) < csRel.lstCnt[i]) && freqOfReferredCS < csRel.lstCnt[i] * MIN_TO_PERCETAGE_S5){ p = csRel.lstPropId[i]; diff --git a/monetdb5/extras/rdf/rdfschema.h b/monetdb5/extras/rdf/rdfschema.h --- a/monetdb5/extras/rdf/rdfschema.h +++ b/monetdb5/extras/rdf/rdfschema.h @@ -142,7 +142,7 @@ typedef struct PropStat { //#define IR_DIMENSION_THRESHOLD_PERCENTAGE 0.02 // Score of indirect references that the CS can be considered as a dimension CS // IR_DIMENSION_THRESHOLD_PERCENTAGE * totalFrequency // Number of IR references should be several times larger than the CS frequency -#define IR_DIMENSION_FACTOR 100 //A table is a dimension table if the # of references to it is an order of magnitude (IR_DIMENSION_FACTOR) compared to # of its tuples +#define IR_DIMENSION_FACTOR 1000 //A table is a dimension table if the # of references to it is an order of magnitude (IR_DIMENSION_FACTOR) compared to # of its tuples // #define MAX_ITERATION_NO 6 //Max number of iteration run @@ -222,20 +222,6 @@ typedef struct SubCS { char isdefault; } SubCS; -/* -typedef struct mergeCS { // CS formed by merging CS id1 and CS id2 - oid* lstConsistsOf; - int numConsistsOf; - oid* lstProp; - int numProp; - int support; - int coverage; - char isRemove; - -} mergeCS; - -*/ - #define INIT_NUM_SUBCS 4 typedef struct SubCSSet{ _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list