Changeset: 899f395274f6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=899f395274f6
Modified Files:
        monetdb5/extras/rdf/rdfschema.c
        monetdb5/extras/rdf/rdfschema.h
Branch: rdf
Log Message:

Add options for writing output


diffs (truncated from 689 to 300 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
@@ -329,6 +329,7 @@ void freeCSrelSet(CSrel *csrelSet, int n
        free(csrelSet);
 }
 
+#if NO_OUTPUTFILE == 0
 static 
 void printCSrelSet(CSrel *csrelSet, CSset *freqCSset,  int num,  int 
freqThreshold){
 
@@ -362,7 +363,7 @@ void printCSrelSet(CSrel *csrelSet, CSse
        fclose(fout);
        
 }
-
+#endif
 
 static 
 void getOrigRefCount(CSrel *csrelSet, CSset *freqCSset, int num,  int* 
refCount){
@@ -514,6 +515,8 @@ void setdefaultSubCSs(SubCSSet *subcsset
 #endif
 
 #if NEEDSUBCS
+
+#if NO_OUTPUTFILE == 0 
 static 
 void printSubCSInformation(SubCSSet *subcsset, BAT* freqBat, int num, char 
isWriteTofile, int freqThreshold){
 
@@ -593,7 +596,7 @@ void printSubCSInformation(SubCSSet *sub
                printf("Avg. number of subCSs per CS: %f \n", (float) 
totalNumSubCS / num);
        }
 }
-
+#endif /*NO_OUTPUTFILE*/
 #endif  /* NEEDSUBCS */
 
 char
@@ -690,16 +693,21 @@ char isInfrequentProp(PropTypes pt, CS c
 
 }
 
+#if NO_OUTPUTFILE == 0 
 static
 char isInfrequentSampleProp(CS freqCS, int propIdx){
        if (freqCS.lstPropSupport[propIdx] * 100 < freqCS.support * 
SAMPLE_FILTER_THRESHOLD) return 1; 
        else return 0;
 }
+#endif
+
+#if NO_OUTPUTFILE == 0 
 static
 char isInfrequentSampleCol(CS freqCS, PropTypes pt){
        if (pt.propFreq * 100 <  freqCS.support * SAMPLE_FILTER_THRESHOLD) 
return 1;
        else return 0; 
 }
+#endif
 
 static 
 void genCSPropTypesColIdx(CSPropTypes* csPropTypes, int numMergedCS, CSset* 
freqCSset){
@@ -836,6 +844,8 @@ void updatePropSupport(CSPropTypes* csPr
 
 
 #endif /* #if COLORINGPROP */
+
+#if NO_OUTPUTFILE == 0
 static 
 void printCSPropTypes(CSPropTypes* csPropTypes, int numMergedCS, CSset* 
freqCSset, int freqThreshold){
        char filename[100]; 
@@ -912,8 +922,9 @@ void printCSPropTypes(CSPropTypes* csPro
        fclose(fout); 
 
 }
-
-
+#endif
+
+#if NO_OUTPUTFILE == 0
 static 
 void getTableStatisticViaCSPropTypes(CSPropTypes* csPropTypes, int 
numMergedCS, CSset* freqCSset, int freqThreshold){
        char filename[100]; 
@@ -982,6 +993,7 @@ void getTableStatisticViaCSPropTypes(CSP
        fclose(fout); 
 
 }
+#endif
 
 /*
  * Add types of properties 
@@ -1802,6 +1814,7 @@ int* mergeMultiCS(CSset *freqCSset, int 
 
 #endif /* USE_MULTIWAY_MERGING */
 
+#if NO_OUTPUTFILE == 0
 static 
 str printFreqCSSet(CSset *freqCSset, BAT *freqBat, BAT *mapbat, char 
isWriteTofile, int freqThreshold, CSlabel* labels){
 
@@ -1932,7 +1945,7 @@ str printFreqCSSet(CSset *freqCSset, BAT
 #endif
        return MAL_SUCCEED;
 }
-
+#endif
 
 /*
 static 
@@ -1966,6 +1979,7 @@ str printamergeCS(mergeCS cs, int mergec
 }
 */
 
+#if NO_OUTPUTFILE == 0
 static 
 str printmergeCSSet(CSset *freqCSset, int freqThreshold){
 
@@ -2030,8 +2044,10 @@ str printmergeCSSet(CSset *freqCSset, in
        TKNZRclose(&ret);
        return MAL_SUCCEED;
 }
-
-
+#endif
+
+
+#if NO_OUTPUTFILE == 0 
 static 
 str printsubsetFromCSset(CSset *freqCSset, BAT* subsetIdxBat, int num, int* 
mergeCSFreqCSMap, CSlabel *label, int sampleVersion){
 
@@ -2105,6 +2121,7 @@ str printsubsetFromCSset(CSset *freqCSse
        TKNZRclose(&ret);
        return MAL_SUCCEED;
 }
+#endif
 
 /*
  * Hashing function for a set of values
@@ -2954,7 +2971,7 @@ PropStat* getPropStatisticsByTable(int n
        return propStat; 
 }
 
-
+#if NO_OUTPUTFILE == 0
 void printPropStat(PropStat* propStat, int printToFile){
        int i, j; 
        oid     *pbt; 
@@ -2991,9 +3008,8 @@ void printPropStat(PropStat* propStat, i
        
        }
 
-
-
-}
+}
+#endif
 
 static 
 void freePropStat(PropStat *propStat){
@@ -3299,12 +3315,13 @@ str mergeMaxFreqCSByS1(CSset *freqCSset,
        #endif
        LabelStat       *labelStat = NULL; 
        oid             *name;
+       int             tmpCount; 
+
        #if OUTPUT_FREQID_PER_LABEL
        FILE            *fout;
        char*           schema = "rdf";
        int             ret = 0;
        str             tmpLabel; 
-       int             tmpCount; 
        
        #if USE_SHORT_NAMES
        str canStrShort = NULL;
@@ -3364,7 +3381,9 @@ str mergeMaxFreqCSByS1(CSset *freqCSset,
                                        tmpCount++;
                                }
                        }
+                       #if OUTPUT_FREQID_PER_LABEL
                        fprintf(fout, " %d freqCS merged as having same name by 
Ontology. MergedCS has %d prop. \n", tmpCount, 
freqCSset->items[freqCSset->numCSadded -1].numProp);
+                       #endif
 
                        //For Type
                        tmpCount = 0;
@@ -3392,7 +3411,9 @@ str mergeMaxFreqCSByS1(CSset *freqCSset,
                                        tmpCount++;
                                }
                        }
+                       #if OUTPUT_FREQID_PER_LABEL
                        fprintf(fout, " %d freqCS merged as having same name by 
TYPE. MergedCS has %d prop. \n", tmpCount, 
freqCSset->items[freqCSset->numCSadded -1].numProp);
+                       #endif
 
                        //For FK
                        tmpCount = 0;
@@ -3421,9 +3442,10 @@ str mergeMaxFreqCSByS1(CSset *freqCSset,
                                }
                        }
                        #endif /* USE_MULTIWAY_MERGING */
+
+                       #if OUTPUT_FREQID_PER_LABEL
+
                        fprintf(fout, " %d freqCS merged as having same name by 
FK. MergedCS has %d prop. \n", tmpCount, freqCSset->items[freqCSset->numCSadded 
-1].numProp);
-
-                       #if OUTPUT_FREQID_PER_LABEL
                        
                        takeOid(*name, &tmpLabel); 
                        #if USE_SHORT_NAMES
@@ -3459,7 +3481,7 @@ str mergeMaxFreqCSByS1(CSset *freqCSset,
 static
 void mergeMaxFreqCSByS6(CSrel *csrelMergeFreqSet, CSset *freqCSset, CSlabel** 
labels, oid* mergeCSFreqCSMap, int curNumMergeCS, oid *mergecsId, oid** 
ontmetadata, int ontmetadataCount){
        int             i; 
-       int             freqId, refFreqId;
+       int             freqId;
        //int           relId; 
        //CS*           cs1;
        CSrelSum        *csRelSum; 
@@ -3474,18 +3496,23 @@ void mergeMaxFreqCSByS6(CSrel *csrelMerg
        int             isNew = 0; 
        int             mergeFreqIdx = -1; 
        #endif  
-
+       
+       #if NO_OUTPUTFILE == 0
        char            filename[100];
-       FILE            *fout; 
+       FILE            *fout;
+       int             refFreqId;
+       #endif
        int             maxNumPropInMergeCS =0;
        //int           numCombinedP = 0; 
        int             startIdx = 0; 
        
        printf("Start merging CS by using S6 \n");
-
+       
+       #if NO_OUTPUTFILE == 0
        strcpy(filename, "csRelSum.txt");
 
        fout = fopen(filename,"wt"); 
+       #endif
 
        for (i = 0; i < curNumMergeCS; i++){
                freqId = mergeCSFreqCSMap[i];
@@ -3505,14 +3532,19 @@ void mergeMaxFreqCSByS6(CSrel *csrelMerg
                if (csrelMergeFreqSet[freqId].numRef != 0){
                        generatecsRelSum(csrelMergeFreqSet[freqId], freqId, 
freqCSset, csRelSum);
                        /* Check the number of */
+                       #if NO_OUTPUTFILE == 0
                        fprintf(fout, "csRelSum " BUNFMT " (support: %d, 
coverage %d ): ",csRelSum->origFreqIdx, freqCSset->items[freqId].support, 
freqCSset->items[freqId].coverage);
+                       #endif
                        for (j = 0; j < csRelSum->numProp; j++){
                                if ( csRelSum->numPropRef[j] > 1){
+                                       #if NO_OUTPUTFILE == 0
                                        fprintf(fout, "  P " BUNFMT " 
-->",csRelSum->lstPropId[j]);
                                        for (k = 0; k < 
csRelSum->numPropRef[j]; k++){
                                                refFreqId = 
csRelSum->freqIdList[j][k];
                                                fprintf(fout, " %d | ", 
refFreqId);
                                        }       
+                                       #endif
+
                                        /* Merge each refCS into the first CS. 
                                         * TODO: The Multi-way merging should 
be better
                                         * */ 
@@ -3555,14 +3587,16 @@ void mergeMaxFreqCSByS6(CSrel *csrelMerg
                                        #endif /*If USE_MULTIWAY_MERGING */
                                }
                        }
+                       #if NO_OUTPUTFILE == 0
                        fprintf(fout, "\n");
-               }
-       }
-       
-
-
+                       #endif
+               }
+       }
+       
+
+       #if NO_OUTPUTFILE == 0
        fclose(fout); 
-
+       #endif
 
        freeCSrelSum(maxNumPropInMergeCS, csRelSum);
 
@@ -3934,7 +3968,7 @@ static void getStatisticCSsBySize(map_t 
 }
 */
 
-
+#if NO_OUTPUTFILE == 0
 static void getStatisticCSsBySupports(BAT *pOffsetBat, BAT *freqBat, BAT 
*coverageBat, BAT *fullPBat, char isWriteToFile, int freqThreshold){
 
        //int   *csPropNum; 
@@ -3983,7 +4017,9 @@ static void getStatisticCSsBySupports(BA
        fclose(fout); 
        //free(csPropNum); 
 }
-
+#endif
+
+#if NO_OUTPUTFILE == 0
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to