From e9dcff49cadd8a1a0e698851d3bc97c4b0f03b43 Mon Sep 17 00:00:00 2001 From: Matt Strapp Date: Mon, 5 Oct 2020 20:23:15 -0500 Subject: Edit reducer (#6) --- P1/include/mapper.h | 1 - P1/include/utils.h | 1 + P1/src/reducer.c | 14 +++++++------- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/P1/include/mapper.h b/P1/include/mapper.h index bbc6ef1..2e3693c 100644 --- a/P1/include/mapper.h +++ b/P1/include/mapper.h @@ -6,7 +6,6 @@ // ###### DO NOT REMOVE ###### #define MAXKEYSZ 100 #define MAXVALUESZ 100 -#define BUFFSIZE 150 // ###### DO NOT REMOVE ###### char *mapOutDir; diff --git a/P1/include/utils.h b/P1/include/utils.h index cfe56f2..da5ffd8 100644 --- a/P1/include/utils.h +++ b/P1/include/utils.h @@ -18,6 +18,7 @@ #define MSGSIZE 1100 #define ENDTYPE 1000 #define ACKTYPE 1100 +#define BUFFSIZE 150 struct msgBuffer { long msgType; diff --git a/P1/src/reducer.c b/P1/src/reducer.c index 8656629..9519fa3 100644 --- a/P1/src/reducer.c +++ b/P1/src/reducer.c @@ -51,20 +51,20 @@ void reduce(char *key) { // write the contents of the final intermediate structure // to output/ReduceOut/Reduce_reducerID.txt void writeFinalDS(int reducerID){ - + finalKeyValueDS *root = &DS; - finalKeyValueDS *tempNode = root; + finalKeyValueDS *tempNode = root -> next; while(tempNode != NULL) { - // Shove word and ones in a file named word.txt - char filename[150]; - sprintf(filename, "output/MapOut/Map_%d/%s.txt", reducerID, tempNode -> key); + // Shove word and number of occurances in a file named word.txt + char filename[BUFFSIZE] = ""; + sprintf(filename, "output/ReduceOut/Reduce_%d.txt", reducerID); FILE* fptr = fopen(filename, "w"); - fprintf(fptr, "%s %d", tempNode -> key, tempNode -> value); + fprintf(fptr, "%s %s", tempNode -> key, tempNode -> value); fclose(fptr); tempNode = tempNode -> next; } - freeFinalDS(root); + freeInterDS(root -> next); } int main(int argc, char *argv[]) { -- cgit v1.2.3