Removed most of the sideeffecting

master
Nicholas Hope 2022-09-10 14:16:43 -04:00
parent ab6efc0572
commit 4561c6418e
3 changed files with 17 additions and 19 deletions

View File

@ -1,4 +1,5 @@
#include <stdio.h> #include <stdio.h>
#include <string.h>
#include "boilerplate.h" #include "boilerplate.h"
int compare(const void * a, const void * b) { int compare(const void * a, const void * b) {
@ -16,4 +17,15 @@ uint32_t getsig(char * word) {
result |= bit; result |= bit;
} }
return result; return result;
}
uint32_t rmdups(signature * arr, uint32_t nitems) {
// list is already sorted
for (uint32_t i = 0; i < nitems; i++) {
while (arr[i].sign == arr[i + 1].sign) {
memmove( &arr[ i ], &arr[ i + 1 ], (nitems - i) * sizeof(signature));
nitems--;
}
}
return nitems;
} }

View File

@ -64,5 +64,5 @@ typedef struct signature {
uint32_t getsig(char*); uint32_t getsig(char*);
void findWords(signature*, uint32_t); void findWords(signature*, uint32_t);
signature* rmdups(signature*); uint32_t rmdups(signature*, uint32_t);
/* </declarations> */ /* </declarations> */

View File

@ -5,9 +5,8 @@
#include "boilerplate.h" #include "boilerplate.h"
uint32_t uint32_t
rawWC = 0, rawWC,
fiveUniqWC = 0, fiveUniqWC
cookedWC = 0
; ;
void findWords(signature* sigs, uint32_t len) { void findWords(signature* sigs, uint32_t len) {
@ -52,19 +51,6 @@ void findWords(signature* sigs, uint32_t len) {
return; return;
} }
signature* rmdups(signature * arr) {
// list is already sorted
uint32_t nitems = fiveUniqWC;
for (uint32_t i = 0; i < nitems; i++) {
while (arr[i].sign == arr[i + 1].sign) {
memmove( &arr[ i ], &arr[ i + 1 ], (nitems - i) * sizeof(signature));
nitems--;
}
}
cookedWC = nitems;
return arr;
}
signature* makeArray(FILE * f) { signature* makeArray(FILE * f) {
signature* sigs = (signature*) calloc(WORDS, sizeof(signature)); signature* sigs = (signature*) calloc(WORDS, sizeof(signature));
char word[WORDLEN + sizeof(char)]; // 5 letters + \n char word[WORDLEN + sizeof(char)]; // 5 letters + \n
@ -121,10 +107,10 @@ int main(int argc, char * argv[]) {
END_TIME END_TIME
START_TIME("removing duplicates") START_TIME("removing duplicates")
sigs = rmdups(sigs); uint32_t cookedWC = rmdups(sigs, fiveUniqWC);
END_TIME END_TIME
#else #else
cookedWC = fiveUniqWC; uint32_t cookedWC = fiveUniqWC;
#endif #endif
#if PRINT_INTERMEDIATES #if PRINT_INTERMEDIATES