Changeset: b764d0e2ef31 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b764d0e2ef31
Modified Files:
monetdb5/extras/rdf/rdfschema.c
monetdb5/extras/rdf/rdfschema.h
Branch: rdf
Log Message:
Small bug fix in using rule S1
diffs (70 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
@@ -603,7 +603,7 @@ void genCSPropTypesColIdx(CSPropTypes* c
}
}
csPropTypes[i].lstPropTypes[j].numMvTypes =
curNumTypeMVTbl;
- printf("Table %d with MV col %d has %d
types",i, j, curNumTypeMVTbl);
+ //printf("Table %d with MV col %d has %d
types",i, j, curNumTypeMVTbl);
/* Count the number of column for MV table
needed */
}
@@ -3112,7 +3112,7 @@ str mergeMaxFreqCSByS1(CSset *freqCSset,
if ((*labels)[freqId1].isOntology == 1) break;
}
cs1 = &(freqCSset->items[freqId1]);
- for (j = k; j < labelStat->lstCount[i]; j++){
+ for (j = k+1; j < labelStat->lstCount[i]; j++){
freqId2 = labelStat->freqIdList[i][j];
cs2 = &(freqCSset->items[freqId2]);
if ((*labels)[freqId2].isOntology == 1){
@@ -3129,7 +3129,7 @@ str mergeMaxFreqCSByS1(CSset *freqCSset,
if ((*labels)[freqId1].isType == 1) break;
}
cs1 = &(freqCSset->items[freqId1]);
- for (j = k; j < labelStat->lstCount[i]; j++){
+ for (j = k+1; j < labelStat->lstCount[i]; j++){
freqId2 = labelStat->freqIdList[i][j];
cs2 = &(freqCSset->items[freqId2]);
if ((*labels)[freqId2].isType == 1){
@@ -3146,7 +3146,7 @@ str mergeMaxFreqCSByS1(CSset *freqCSset,
if ((*labels)[freqId1].isFK == 1) break;
}
cs1 = &(freqCSset->items[freqId1]);
- for (j = k; j < labelStat->lstCount[i]; j++){
+ for (j = k+1; j < labelStat->lstCount[i]; j++){
freqId2 = labelStat->freqIdList[i][j];
cs2 = &(freqCSset->items[freqId2]);
if ((*labels)[freqId2].isFK == 1){
@@ -6077,6 +6077,7 @@ str RDFdistTriplesToCSs(int *ret, bat *s
BBPunfix(mbat->batCacheid);
free(tmpTblIdxPropIdxMap);
+ free(tmplastInsertedS);
TKNZRclose(ret);
@@ -6355,7 +6356,8 @@ RDFreorganize(int *ret, CStableStat *cst
freeCSset(freqCSset);
free(subjCSMap);
free(csTblIdxMapping);
-
+ free(mfreqIdxTblIdxMapping);
+ free(mTblIdxFreqIdxMapping);
free(lastSubjId);
//free(lastSubjIdEx);
freePropStat(propStat);
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
@@ -177,7 +177,8 @@ typedef struct SubCSSet{
int numAllocation;
} SubCSSet;
-#define INIT_NUM_CS 9999 // workaround
+//#define INIT_NUM_CS 9999 // workaround
+#define INIT_NUM_CS 100 // workaround
#define SIM_THRESHOLD 0.6
#define SIM_TFIDF_THRESHOLD 0.55
#define IMPORTANCE_THRESHOLD 0.01
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
