diff --git a/a2/program.c b/a2/program.c index cbd43f4..4cd53d1 100644 --- a/a2/program.c +++ b/a2/program.c @@ -1,29 +1,37 @@ #include #include #include +#ifndef PANGRAM_H +#define PANGRAM_H + +#include + +bool is_pangram(const char *sentence); + +#endif // Please implement the header file from the assignment to fulfill the unit tests.. - // You can add any function -#include "pangram.h" + // You can add any function +//#include "pangram.h" bool is_pangram(const char *sentence) { - char alphabet[] = "abcdefghijklmnopqrstuvwxyz"; - char is_char_contained[] = "00000000000000000000000000"; - for (int i = 0; i < sizeof(sentence); i++) { - int iterator = 0; - for (int l = 0; l< 26; l++) { - if (sentence[i] == sentence[iterator]) { - is_char_contained[iterator] = 1; - break; - } - iterator++; - } - } + char alphabet[] = "abcdefghijklmnopqrstuvwxyz"; + int is_char_contained[26] = {0}; + int sentence_len = strlen(sentence); + for (int i = 0; i < sentence_len; i++) { + int iterator = 0; + for (int l = 0; l< 26; l++) { + if (sentence[i] == alphabet[iterator]) { + is_char_contained[iterator] = 1; + break; + } + iterator++; + } + } - for (int i = 0; i<26;i++) { - if (is_char_contained[i] == 0) return 0; - } - return 1; + for (int i = 0; i<26;i++) { + if (is_char_contained[i] == 0) return 0; + } + return 1; - return 0; } diff --git a/du4/program.c b/du4/program.c index a5a844c..b953969 100644 --- a/du4/program.c +++ b/du4/program.c @@ -3,19 +3,27 @@ #include #include +int compare_names(const void *a, const void *b){ + return strcasecmp((const char*)a, (const char*)b); +} + +int compare_int(const void* a, const void* b) { + return (*(int*)b - *(int*)a); +} + int main() { char buffer[999]; - char voting[99][10]; + int voting[99]; char names[99][50]; int count = 0; while(fgets(buffer, sizeof(buffer), stdin) != NULL) { - char current_votes[10] = ""; + int current_votes = 0; char current_name[50] = ""; - sscanf(buffer, "%s %[^\n]", current_votes, current_name); + sscanf(buffer, "%d %[^\n]", ¤t_votes, current_name); int is_contained = 0; for (int i=0; i