From 015ae09f7d51ddb2939b050677f4cc4d9c5641ca Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Thu, 1 Apr 2021 13:10:17 +0000 Subject: [PATCH 01/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du4/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit raz --- du4/program.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/du4/program.c b/du4/program.c index f0aeabc..22ad1c1 100644 --- a/du4/program.c +++ b/du4/program.c @@ -1,5 +1,81 @@ #include +#include +#include +#include +#include int main(){ + char* input = (char*) calloc (100, sizeof(char)); + char symbol = '\0'; + int counter = 0; + int operation = 0; + char* number1 = (char*) calloc (25, sizeof(char)); + char* number2 = (char*) calloc (25, sizeof(char)); + char* result = (char*) calloc (30, sizeof(char)); + char* ptr; + bool equals = false; + for(int i = 0; fgets(input, 100, stdin); i++){ + counter = 0; + operation = 0; + equals = false; + memset(number1, '\0', 25); + memset(number2, '\0', 25); + + while (input[counter] != '\0'){ + symbol = input[counter++]; + while(isspace(symbol)) + symbol = input[counter++]; + switch(symbol){ + case '+': + operation = 1; + break; + case '-': + operation = 2; + break; + case '*': + operation = 3; + break; + case '/': + operation = 4; + break; + case '=': + equals = true; + break; + default: + if(isdigit(symbol) || symbol == '.'){ + if(operation == 0) + number1 += symbol; + else if (!equals) + number2 += symbol; + else + result += symbol; + } + else if(!isdigit(symbol)){ + printf("CHYBA"); + goto LABEL; + } + break; + } + } + LABEL: + switch(operation){ + case 1: + printf("%.s\n", (strtof(number1, &ptr) + strtof(number2, &ptr) == strtof(result, &ptr)) ? "OK" : "ZLE"); + break; + case 2: + printf("%.s\n", strtof(number1, &ptr) - strtof(number2, &ptr) == strtof(result, &ptr)) ? "OK" : "ZLE"); + break + case 3: + printf("%.s\n", strtof(number1, &ptr) * strtof(number2, &ptr) == strtof(result, &ptr)) ? "OK" : "ZLE"); + break; + case 4: + printf("%.s\n", strtof(number1, &ptr) / strtof(number2, &ptr) == strtof(result, &ptr)) ? "OK" : "ZLE"); + break; + default: + printf("CHYBA"); + } + } + + return 0; } From fcb3ed093253fdbdf5d41428df176a854c86e539 Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Thu, 1 Apr 2021 13:11:46 +0000 Subject: [PATCH 02/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du4/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit dva --- du4/program.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/du4/program.c b/du4/program.c index 22ad1c1..6c50d5f 100644 --- a/du4/program.c +++ b/du4/program.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include int main(){ From e04808b5d32eb2aa602a01123a369b36d36436bf Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Thu, 1 Apr 2021 13:13:15 +0000 Subject: [PATCH 03/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du4/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ^^ --- du4/program.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/du4/program.c b/du4/program.c index 6c50d5f..64958ed 100644 --- a/du4/program.c +++ b/du4/program.c @@ -61,16 +61,16 @@ int main(){ LABEL: switch(operation){ case 1: - printf("%.s\n", (strtof(number1, &ptr) + strtof(number2, &ptr) == strtof(result, &ptr)) ? "OK" : "ZLE"); + printf("%s\n", (strtof(number1, &ptr) + strtof(number2, &ptr) == strtof(result, &ptr)) ? "OK" : "ZLE"); break; case 2: - printf("%.s\n", strtof(number1, &ptr) - strtof(number2, &ptr) == strtof(result, &ptr)) ? "OK" : "ZLE"); - break + printf("%s\n", strtof(number1, &ptr) - strtof(number2, &ptr) == strtof(result, &ptr)) ? "OK" : "ZLE"); + break; case 3: - printf("%.s\n", strtof(number1, &ptr) * strtof(number2, &ptr) == strtof(result, &ptr)) ? "OK" : "ZLE"); + printf("%s\n", strtof(number1, &ptr) * strtof(number2, &ptr) == strtof(result, &ptr)) ? "OK" : "ZLE"); break; case 4: - printf("%.s\n", strtof(number1, &ptr) / strtof(number2, &ptr) == strtof(result, &ptr)) ? "OK" : "ZLE"); + printf("%s\n", strtof(number1, &ptr) / strtof(number2, &ptr) == strtof(result, &ptr)) ? "OK" : "ZLE"); break; default: printf("CHYBA"); From 67e9fdfc108eeb2bbc12ad4ee71442f650e47903 Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Thu, 1 Apr 2021 13:14:29 +0000 Subject: [PATCH 04/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du4/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ^^ --- du4/program.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/du4/program.c b/du4/program.c index 64958ed..4bc46de 100644 --- a/du4/program.c +++ b/du4/program.c @@ -64,13 +64,13 @@ int main(){ printf("%s\n", (strtof(number1, &ptr) + strtof(number2, &ptr) == strtof(result, &ptr)) ? "OK" : "ZLE"); break; case 2: - printf("%s\n", strtof(number1, &ptr) - strtof(number2, &ptr) == strtof(result, &ptr)) ? "OK" : "ZLE"); + printf("%s\n", (strtof(number1, &ptr) - strtof(number2, &ptr) == strtof(result, &ptr)) ? "OK" : "ZLE"); break; case 3: - printf("%s\n", strtof(number1, &ptr) * strtof(number2, &ptr) == strtof(result, &ptr)) ? "OK" : "ZLE"); + printf("%s\n", (strtof(number1, &ptr) * strtof(number2, &ptr) == strtof(result, &ptr)) ? "OK" : "ZLE"); break; case 4: - printf("%s\n", strtof(number1, &ptr) / strtof(number2, &ptr) == strtof(result, &ptr)) ? "OK" : "ZLE"); + printf("%s\n", (strtof(number1, &ptr) / strtof(number2, &ptr) == strtof(result, &ptr)) ? "OK" : "ZLE"); break; default: printf("CHYBA"); From 485f9e10562a393b197e864f123787aaa5bfefca Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Thu, 1 Apr 2021 13:20:25 +0000 Subject: [PATCH 05/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du4/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit vv --- du4/program.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/du4/program.c b/du4/program.c index 4bc46de..10e0b95 100644 --- a/du4/program.c +++ b/du4/program.c @@ -15,17 +15,19 @@ int main(){ char* ptr; bool equals = false; - for(int i = 0; fgets(input, 100, stdin); i++){ + for(int i = 0; fgets(input, 100, stdin) != NULL; i++){ counter = 0; operation = 0; equals = false; memset(number1, '\0', 25); memset(number2, '\0', 25); - while (input[counter] != '\0'){ + while (input[counter] != '\0' && input[counter] != '\n'){ symbol = input[counter++]; while(isspace(symbol)) symbol = input[counter++]; + if(symbol == '\0' || symbol == '\n') + break; switch(symbol){ case '+': operation = 1; From c67863fa4bc129948fa0bb9b850bcbfe5e68396a Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Thu, 1 Apr 2021 13:24:09 +0000 Subject: [PATCH 06/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du4/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ^^ --- du4/program.c | 1 + 1 file changed, 1 insertion(+) diff --git a/du4/program.c b/du4/program.c index 10e0b95..9c92661 100644 --- a/du4/program.c +++ b/du4/program.c @@ -16,6 +16,7 @@ int main(){ bool equals = false; for(int i = 0; fgets(input, 100, stdin) != NULL; i++){ + if(!input || !strcmp(input, "") || input[0] == EOF) break; counter = 0; operation = 0; equals = false; From ccfc25ac227319221e332ac00c430ef40f6eacb2 Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Thu, 1 Apr 2021 13:26:01 +0000 Subject: [PATCH 07/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du4/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ^^ --- du4/program.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/du4/program.c b/du4/program.c index 9c92661..9b035ee 100644 --- a/du4/program.c +++ b/du4/program.c @@ -16,7 +16,8 @@ int main(){ bool equals = false; for(int i = 0; fgets(input, 100, stdin) != NULL; i++){ - if(!input || !strcmp(input, "") || input[0] == EOF) break; + if(!input || !strcmp(input, "") || input[0] == EOF || input[0] == '\n' || input[0] == '\0') + break; counter = 0; operation = 0; equals = false; From 311797618a19cc713c9d140e8557a19786939d9d Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Thu, 1 Apr 2021 13:32:11 +0000 Subject: [PATCH 08/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du4/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ^^ --- du4/program.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/du4/program.c b/du4/program.c index 9b035ee..5055940 100644 --- a/du4/program.c +++ b/du4/program.c @@ -65,16 +65,16 @@ int main(){ LABEL: switch(operation){ case 1: - printf("%s\n", (strtof(number1, &ptr) + strtof(number2, &ptr) == strtof(result, &ptr)) ? "OK" : "ZLE"); + printf("%s\n", (strtof(number1, &ptr) + strtof(number2, &ptr) > strtof(result, &ptr) - 0.001 && strtof(number1, &ptr) + strtof(number2, &ptr) < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); break; case 2: - printf("%s\n", (strtof(number1, &ptr) - strtof(number2, &ptr) == strtof(result, &ptr)) ? "OK" : "ZLE"); + printf("%s\n", (strtof(number1, &ptr) + strtof(number2, &ptr) > strtof(result, &ptr) - 0.001 && strtof(number1, &ptr) - strtof(number2, &ptr) < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); break; case 3: - printf("%s\n", (strtof(number1, &ptr) * strtof(number2, &ptr) == strtof(result, &ptr)) ? "OK" : "ZLE"); + printf("%s\n", (strtof(number1, &ptr) + strtof(number2, &ptr) > strtof(result, &ptr) - 0.001 && strtof(number1, &ptr) * strtof(number2, &ptr) < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); break; case 4: - printf("%s\n", (strtof(number1, &ptr) / strtof(number2, &ptr) == strtof(result, &ptr)) ? "OK" : "ZLE"); + printf("%s\n", (strtof(number1, &ptr) + strtof(number2, &ptr) > strtof(result, &ptr) - 0.001 && strtof(number1, &ptr) / strtof(number2, &ptr) < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); break; default: printf("CHYBA"); From 9fef31bff3c70aab94d621326228092a5e2a2018 Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Thu, 1 Apr 2021 13:36:42 +0000 Subject: [PATCH 09/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du4/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ^^ --- du4/program.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/du4/program.c b/du4/program.c index 5055940..8992694 100644 --- a/du4/program.c +++ b/du4/program.c @@ -6,9 +6,9 @@ int main(){ char* input = (char*) calloc (100, sizeof(char)); - char symbol = '\0'; - int counter = 0; - int operation = 0; + char symbol; + int counter; + int operation; char* number1 = (char*) calloc (25, sizeof(char)); char* number2 = (char*) calloc (25, sizeof(char)); char* result = (char*) calloc (30, sizeof(char)); @@ -55,7 +55,7 @@ int main(){ else result += symbol; } - else if(!isdigit(symbol)){ + else { printf("CHYBA"); goto LABEL; } From 95212f7acdef19b2c301222f8fba657340f71f82 Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Thu, 1 Apr 2021 13:38:09 +0000 Subject: [PATCH 10/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du4/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ^^ --- du4/program.c | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/du4/program.c b/du4/program.c index 8992694..8679b8e 100644 --- a/du4/program.c +++ b/du4/program.c @@ -4,33 +4,32 @@ #include #include -int main(){ - char* input = (char*) calloc (100, sizeof(char)); +int main() { + char* input = (char*) calloc(100, sizeof(char)); char symbol; int counter; int operation; - char* number1 = (char*) calloc (25, sizeof(char)); - char* number2 = (char*) calloc (25, sizeof(char)); - char* result = (char*) calloc (30, sizeof(char)); + char* number1 = (char*) calloc(25, sizeof(char)); + char* number2 = (char*) calloc(25, sizeof(char)); + char* result = (char*) calloc(30, sizeof(char)); char* ptr; bool equals = false; for(int i = 0; fgets(input, 100, stdin) != NULL; i++){ - if(!input || !strcmp(input, "") || input[0] == EOF || input[0] == '\n' || input[0] == '\0') + if(!input || !strcmp(input, "") || input[0] == EOF || input[0] == '\n' || input[0] == '\0') break; counter = 0; operation = 0; equals = false; memset(number1, '\0', 25); memset(number2, '\0', 25); - - while (input[counter] != '\0' && input[counter] != '\n'){ + while(input[counter] != '\0' && input[counter] != '\n'){ symbol = input[counter++]; - while(isspace(symbol)) + while (isspace(symbol)) symbol = input[counter++]; if(symbol == '\0' || symbol == '\n') break; - switch(symbol){ + switch (symbol) { case '+': operation = 1; break; @@ -47,19 +46,19 @@ int main(){ equals = true; break; default: - if(isdigit(symbol) || symbol == '.'){ - if(operation == 0) + if (isdigit(symbol) || symbol == '.'){ + if (operation == 0) number1 += symbol; - else if (!equals) + else if(!equals) number2 += symbol; else result += symbol; } - else { - printf("CHYBA"); + else{ + printf("CHYBA\n"); goto LABEL; } - break; + break; } } LABEL: @@ -68,18 +67,18 @@ int main(){ printf("%s\n", (strtof(number1, &ptr) + strtof(number2, &ptr) > strtof(result, &ptr) - 0.001 && strtof(number1, &ptr) + strtof(number2, &ptr) < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); break; case 2: - printf("%s\n", (strtof(number1, &ptr) + strtof(number2, &ptr) > strtof(result, &ptr) - 0.001 && strtof(number1, &ptr) - strtof(number2, &ptr) < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); + printf("%s\n", (strtof(number1, &ptr) - strtof(number2, &ptr) > strtof(result, &ptr) - 0.001 && strtof(number1, &ptr) - strtof(number2, &ptr) < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); break; case 3: - printf("%s\n", (strtof(number1, &ptr) + strtof(number2, &ptr) > strtof(result, &ptr) - 0.001 && strtof(number1, &ptr) * strtof(number2, &ptr) < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); + printf("%s\n", (strtof(number1, &ptr) * strtof(number2, &ptr) > strtof(result, &ptr) - 0.001 && strtof(number1, &ptr) * strtof(number2, &ptr) < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); break; case 4: - printf("%s\n", (strtof(number1, &ptr) + strtof(number2, &ptr) > strtof(result, &ptr) - 0.001 && strtof(number1, &ptr) / strtof(number2, &ptr) < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); + printf("%s\n", (strtof(number1, &ptr) / strtof(number2, &ptr) > strtof(result, &ptr) - 0.001 && strtof(number1, &ptr) / strtof(number2, &ptr) < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); break; default: - printf("CHYBA"); + printf("CHYBA\n"); } } return 0; -} +} \ No newline at end of file From c3625aca004a9d3266cf6a5959b28c532e4e0cea Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Thu, 1 Apr 2021 13:40:23 +0000 Subject: [PATCH 11/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du4/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ^ --- du4/program.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/du4/program.c b/du4/program.c index 8679b8e..44f6d2b 100644 --- a/du4/program.c +++ b/du4/program.c @@ -80,5 +80,10 @@ int main() { } } + free(number1); + free(number2); + free(result); + free(input); + return 0; } \ No newline at end of file From 9bd06aa07cb323340bcb78fddc73bc1afc3f5742 Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Thu, 1 Apr 2021 13:43:21 +0000 Subject: [PATCH 12/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du4/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ^^ --- du4/program.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/du4/program.c b/du4/program.c index 44f6d2b..0910da6 100644 --- a/du4/program.c +++ b/du4/program.c @@ -80,9 +80,6 @@ int main() { } } - free(number1); - free(number2); - free(result); free(input); return 0; From 68c8725ddba93ab753a4a1aae9824597d357c3dc Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Thu, 1 Apr 2021 14:59:07 +0000 Subject: [PATCH 13/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du5/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ^^ --- du5/program.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/du5/program.c b/du5/program.c index f0aeabc..ab45005 100644 --- a/du5/program.c +++ b/du5/program.c @@ -1,5 +1,40 @@ #include +#include +#include + +struct entry{ + char* name; + int votes; +} + +struct entry* createEntry(char* name, int votes){ + struct entry* newEntry = (struct entry*) calloc(1, sizeof(struct entry)); + strcpy(newEntry->name, name); + newEntry->votes = votes; + return newEntry; +} int main(){ + struct entry myEntries[100]; + char inputs[100][50]; + int counter = 0; + char symbol; + char* number1 = (char*) calloc (25, sizeof(char)); + for(int i = 0; fgets(inputs[1], 50, stdin) != NULL; i++){ + counter = 0; + symbol = inputs[i][counter++]; + while(symbol != '\0' && symbol != '\n'){ + while(isspace(symbol)) + symbol = inputs[i][counter++]; + + if(isdigit(symbol)) + number1 += symbol; + else if(isalpha) + } + } + + + + return 0; } From 7a952879dbec014e0f5eede69f37d213b9bce601 Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Thu, 1 Apr 2021 15:01:54 +0000 Subject: [PATCH 14/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du4/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ^^ --- du4/program.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/du4/program.c b/du4/program.c index 0910da6..a20a671 100644 --- a/du4/program.c +++ b/du4/program.c @@ -48,11 +48,11 @@ int main() { default: if (isdigit(symbol) || symbol == '.'){ if (operation == 0) - number1 += symbol; + strcat(number1, symbol+""); else if(!equals) - number2 += symbol; + strcat(number2, symbol+""); else - result += symbol; + strcat(result, symbol+""); } else{ printf("CHYBA\n"); From c27fd811f990f68bba0c2831e4c35e1816036f3a Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Thu, 1 Apr 2021 15:05:13 +0000 Subject: [PATCH 15/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du4/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- du4/program.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/du4/program.c b/du4/program.c index a20a671..e41301f 100644 --- a/du4/program.c +++ b/du4/program.c @@ -48,7 +48,7 @@ int main() { default: if (isdigit(symbol) || symbol == '.'){ if (operation == 0) - strcat(number1, symbol+""); + strcat(number1, symbol+""); else if(!equals) strcat(number2, symbol+""); else From 9d724fe3636487e015df1a35752530196504a644 Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Thu, 1 Apr 2021 15:11:24 +0000 Subject: [PATCH 16/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du4/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ^^ --- du4/program.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/du4/program.c b/du4/program.c index e41301f..c2df95b 100644 --- a/du4/program.c +++ b/du4/program.c @@ -47,12 +47,18 @@ int main() { break; default: if (isdigit(symbol) || symbol == '.'){ - if (operation == 0) - strcat(number1, symbol+""); - else if(!equals) - strcat(number2, symbol+""); - else - strcat(result, symbol+""); + if (operation == 0) { + number1[strlen(number1)] = symbol; + number1[strlen(number1)] = '\0'; + } + else if(!equals){ + number2[strlen(number2)] = symbol; + number2[strlen(number2)] = '\0'; + } + else{ + result[strlen(result)] = symbol; + result[strlen(result)] = '\0'; + } } else{ printf("CHYBA\n"); From 0cba852f8755bf3f49f3716700f37e7252fe9d41 Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Thu, 1 Apr 2021 15:17:39 +0000 Subject: [PATCH 17/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du4/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ^^ --- du4/program.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/du4/program.c b/du4/program.c index c2df95b..afbee1a 100644 --- a/du4/program.c +++ b/du4/program.c @@ -34,7 +34,12 @@ int main() { operation = 1; break; case '-': - operation = 2; + if(operation == 0) + operation = 2; + else{ + result[strlen(result)] = symbol; + result[strlen(result)] = '\0'; + } break; case '*': operation = 3; From 27960d28e8b660469693eb5a7ab9a7521f92fd0a Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Thu, 1 Apr 2021 15:24:12 +0000 Subject: [PATCH 18/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du4/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ^^ --- du4/program.c | 1 + 1 file changed, 1 insertion(+) diff --git a/du4/program.c b/du4/program.c index afbee1a..1406a7d 100644 --- a/du4/program.c +++ b/du4/program.c @@ -23,6 +23,7 @@ int main() { equals = false; memset(number1, '\0', 25); memset(number2, '\0', 25); + memset(result, '\0', 30); while(input[counter] != '\0' && input[counter] != '\n'){ symbol = input[counter++]; while (isspace(symbol)) From f39dea1f679c0149904f799b5777df3e0212977f Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Thu, 1 Apr 2021 15:39:27 +0000 Subject: [PATCH 19/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du4/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ^^ --- du4/program.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/du4/program.c b/du4/program.c index 1406a7d..44cd1a9 100644 --- a/du4/program.c +++ b/du4/program.c @@ -3,6 +3,7 @@ #include #include #include +#include int main() { char* input = (char*) calloc(100, sizeof(char)); @@ -76,16 +77,16 @@ int main() { LABEL: switch(operation){ case 1: - printf("%s\n", (strtof(number1, &ptr) + strtof(number2, &ptr) > strtof(result, &ptr) - 0.001 && strtof(number1, &ptr) + strtof(number2, &ptr) < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); + printf("%s\n", (roundf(strtof(number1, &ptr) + strtof(number2, &ptr)*100)/100 > strtof(result, &ptr) - 0.001 && roundf(strtof(number1, &ptr) + strtof(number2, &ptr)*100)/100 < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); break; case 2: - printf("%s\n", (strtof(number1, &ptr) - strtof(number2, &ptr) > strtof(result, &ptr) - 0.001 && strtof(number1, &ptr) - strtof(number2, &ptr) < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); + printf("%s\n", (roundf(strtof(number1, &ptr) - strtof(number2, &ptr)*100)/100 > strtof(result, &ptr) - 0.001 && roundf(strtof(number1, &ptr) - strtof(number2, &ptr)*100)/100 < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); break; case 3: - printf("%s\n", (strtof(number1, &ptr) * strtof(number2, &ptr) > strtof(result, &ptr) - 0.001 && strtof(number1, &ptr) * strtof(number2, &ptr) < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); + printf("%s\n", (roundf(strtof(number1, &ptr) * strtof(number2, &ptr)*100)/100 > strtof(result, &ptr) - 0.001 && roundf(strtof(number1, &ptr) * strtof(number2, &ptr)*100)/100 < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); break; case 4: - printf("%s\n", (strtof(number1, &ptr) / strtof(number2, &ptr) > strtof(result, &ptr) - 0.001 && strtof(number1, &ptr) / strtof(number2, &ptr) < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); + printf("%s\n", (roundf(strtof(number1, &ptr) / strtof(number2, &ptr)*100)/100 > strtof(result, &ptr) - 0.001 && roundf(strtof(number1, &ptr) / strtof(number2, &ptr)*100)/100 < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); break; default: printf("CHYBA\n"); From 565ebc311c4f63340cc069d20bba1b8afee3a8a1 Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Thu, 1 Apr 2021 15:49:50 +0000 Subject: [PATCH 20/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du4/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ^^ --- du4/program.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/du4/program.c b/du4/program.c index 44cd1a9..426efd9 100644 --- a/du4/program.c +++ b/du4/program.c @@ -77,16 +77,28 @@ int main() { LABEL: switch(operation){ case 1: - printf("%s\n", (roundf(strtof(number1, &ptr) + strtof(number2, &ptr)*100)/100 > strtof(result, &ptr) - 0.001 && roundf(strtof(number1, &ptr) + strtof(number2, &ptr)*100)/100 < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); + if(strtof(number1, &ptr) != roundf(strtof(number2, &ptr))) + printf("%s\n", (roundf(strtof(number1, &ptr) + strtof(number2, &ptr)*100)/100 > strtof(result, &ptr) - 0.001 && roundf(strtof(number1, &ptr) + strtof(number2, &ptr)*100)/100 < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); + else + printf("%s\n", (strtof(number1, &ptr) + strtof(number2, &ptr) > strtof(result, &ptr) - 0.001 && strtof(number1, &ptr) + strtof(number2, &ptr) < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); break; case 2: - printf("%s\n", (roundf(strtof(number1, &ptr) - strtof(number2, &ptr)*100)/100 > strtof(result, &ptr) - 0.001 && roundf(strtof(number1, &ptr) - strtof(number2, &ptr)*100)/100 < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); + if(strtof(number1, &ptr) != roundf(strtof(number2, &ptr))) + printf("%s\n", (roundf(strtof(number1, &ptr) - strtof(number2, &ptr)*100)/100 > strtof(result, &ptr) - 0.001 && roundf(strtof(number1, &ptr) - strtof(number2, &ptr)*100)/100 < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); + else + printf("%s\n", (strtof(number1, &ptr) - strtof(number2, &ptr) > strtof(result, &ptr) - 0.001 && strtof(number1, &ptr) - strtof(number2, &ptr) < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); break; case 3: - printf("%s\n", (roundf(strtof(number1, &ptr) * strtof(number2, &ptr)*100)/100 > strtof(result, &ptr) - 0.001 && roundf(strtof(number1, &ptr) * strtof(number2, &ptr)*100)/100 < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); + if(strtof(number1, &ptr) != roundf(strtof(number2, &ptr))) + printf("%s\n", (roundf(strtof(number1, &ptr) * strtof(number2, &ptr)*100)/100 > strtof(result, &ptr) - 0.001 && roundf(strtof(number1, &ptr) * strtof(number2, &ptr)*100)/100 < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); + else + printf("%s\n", (strtof(number1, &ptr) * strtof(number2, &ptr) > strtof(result, &ptr) - 0.001 && strtof(number1, &ptr) * strtof(number2, &ptr) < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); break; case 4: - printf("%s\n", (roundf(strtof(number1, &ptr) / strtof(number2, &ptr)*100)/100 > strtof(result, &ptr) - 0.001 && roundf(strtof(number1, &ptr) / strtof(number2, &ptr)*100)/100 < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); + if(strtof(number1, &ptr) != roundf(strtof(number2, &ptr))) + printf("%s\n", (roundf(strtof(number1, &ptr) / strtof(number2, &ptr)*100)/100 > strtof(result, &ptr) - 0.001 && roundf(strtof(number1, &ptr) / strtof(number2, &ptr)*100)/100 < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); + else + printf("%s\n", (strtof(number1, &ptr) / strtof(number2, &ptr) > strtof(result, &ptr) - 0.001 && strtof(number1, &ptr) / strtof(number2, &ptr) < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); break; default: printf("CHYBA\n"); From b8d96f2e7e493ac9386621de4b7c8254338aa3e2 Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Thu, 1 Apr 2021 15:57:28 +0000 Subject: [PATCH 21/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du4/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ^^ --- du4/program.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/du4/program.c b/du4/program.c index 426efd9..03fa1d9 100644 --- a/du4/program.c +++ b/du4/program.c @@ -77,25 +77,25 @@ int main() { LABEL: switch(operation){ case 1: - if(strtof(number1, &ptr) != roundf(strtof(number2, &ptr))) + if(strtof(number1, &ptr) != roundf(strtof(number1, &ptr))) printf("%s\n", (roundf(strtof(number1, &ptr) + strtof(number2, &ptr)*100)/100 > strtof(result, &ptr) - 0.001 && roundf(strtof(number1, &ptr) + strtof(number2, &ptr)*100)/100 < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); else printf("%s\n", (strtof(number1, &ptr) + strtof(number2, &ptr) > strtof(result, &ptr) - 0.001 && strtof(number1, &ptr) + strtof(number2, &ptr) < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); break; case 2: - if(strtof(number1, &ptr) != roundf(strtof(number2, &ptr))) + if(strtof(number1, &ptr) != roundf(strtof(number1, &ptr))) printf("%s\n", (roundf(strtof(number1, &ptr) - strtof(number2, &ptr)*100)/100 > strtof(result, &ptr) - 0.001 && roundf(strtof(number1, &ptr) - strtof(number2, &ptr)*100)/100 < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); else printf("%s\n", (strtof(number1, &ptr) - strtof(number2, &ptr) > strtof(result, &ptr) - 0.001 && strtof(number1, &ptr) - strtof(number2, &ptr) < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); break; case 3: - if(strtof(number1, &ptr) != roundf(strtof(number2, &ptr))) + if(strtof(number1, &ptr) != roundf(strtof(number1, &ptr))) printf("%s\n", (roundf(strtof(number1, &ptr) * strtof(number2, &ptr)*100)/100 > strtof(result, &ptr) - 0.001 && roundf(strtof(number1, &ptr) * strtof(number2, &ptr)*100)/100 < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); else printf("%s\n", (strtof(number1, &ptr) * strtof(number2, &ptr) > strtof(result, &ptr) - 0.001 && strtof(number1, &ptr) * strtof(number2, &ptr) < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); break; case 4: - if(strtof(number1, &ptr) != roundf(strtof(number2, &ptr))) + if(strtof(number1, &ptr) != roundf(strtof(number1, &ptr))) printf("%s\n", (roundf(strtof(number1, &ptr) / strtof(number2, &ptr)*100)/100 > strtof(result, &ptr) - 0.001 && roundf(strtof(number1, &ptr) / strtof(number2, &ptr)*100)/100 < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); else printf("%s\n", (strtof(number1, &ptr) / strtof(number2, &ptr) > strtof(result, &ptr) - 0.001 && strtof(number1, &ptr) / strtof(number2, &ptr) < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); From c79f2f5737238fec8b4ad429900c13ba67f6de9d Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Thu, 1 Apr 2021 16:02:05 +0000 Subject: [PATCH 22/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du4/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ^^ --- du4/program.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/du4/program.c b/du4/program.c index 03fa1d9..534ce30 100644 --- a/du4/program.c +++ b/du4/program.c @@ -78,25 +78,25 @@ int main() { switch(operation){ case 1: if(strtof(number1, &ptr) != roundf(strtof(number1, &ptr))) - printf("%s\n", (roundf(strtof(number1, &ptr) + strtof(number2, &ptr)*100)/100 > strtof(result, &ptr) - 0.001 && roundf(strtof(number1, &ptr) + strtof(number2, &ptr)*100)/100 < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); + printf("%s\n", (roundf((strtof(number1, &ptr) + strtof(number2, &ptr))*100)/100 > strtof(result, &ptr) - 0.001 && roundf(strtof(number1, &ptr) + strtof(number2, &ptr)*100)/100 < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); else printf("%s\n", (strtof(number1, &ptr) + strtof(number2, &ptr) > strtof(result, &ptr) - 0.001 && strtof(number1, &ptr) + strtof(number2, &ptr) < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); break; case 2: if(strtof(number1, &ptr) != roundf(strtof(number1, &ptr))) - printf("%s\n", (roundf(strtof(number1, &ptr) - strtof(number2, &ptr)*100)/100 > strtof(result, &ptr) - 0.001 && roundf(strtof(number1, &ptr) - strtof(number2, &ptr)*100)/100 < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); + printf("%s\n", (roundf((strtof(number1, &ptr) - strtof(number2, &ptr))*100)/100 > strtof(result, &ptr) - 0.001 && roundf(strtof(number1, &ptr) - strtof(number2, &ptr)*100)/100 < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); else printf("%s\n", (strtof(number1, &ptr) - strtof(number2, &ptr) > strtof(result, &ptr) - 0.001 && strtof(number1, &ptr) - strtof(number2, &ptr) < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); break; case 3: if(strtof(number1, &ptr) != roundf(strtof(number1, &ptr))) - printf("%s\n", (roundf(strtof(number1, &ptr) * strtof(number2, &ptr)*100)/100 > strtof(result, &ptr) - 0.001 && roundf(strtof(number1, &ptr) * strtof(number2, &ptr)*100)/100 < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); + printf("%s\n", (roundf((strtof(number1, &ptr) * strtof(number2, &ptr))*100)/100 > strtof(result, &ptr) - 0.001 && roundf(strtof(number1, &ptr) * strtof(number2, &ptr)*100)/100 < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); else printf("%s\n", (strtof(number1, &ptr) * strtof(number2, &ptr) > strtof(result, &ptr) - 0.001 && strtof(number1, &ptr) * strtof(number2, &ptr) < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); break; case 4: if(strtof(number1, &ptr) != roundf(strtof(number1, &ptr))) - printf("%s\n", (roundf(strtof(number1, &ptr) / strtof(number2, &ptr)*100)/100 > strtof(result, &ptr) - 0.001 && roundf(strtof(number1, &ptr) / strtof(number2, &ptr)*100)/100 < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); + printf("%s\n", (roundf((strtof(number1, &ptr) / strtof(number2, &ptr))*100)/100 > strtof(result, &ptr) - 0.001 && roundf(strtof(number1, &ptr) / strtof(number2, &ptr)*100)/100 < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); else printf("%s\n", (strtof(number1, &ptr) / strtof(number2, &ptr) > strtof(result, &ptr) - 0.001 && strtof(number1, &ptr) / strtof(number2, &ptr) < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); break; From 3afe448e77887a241fc38b444c1d3bf929c1ba3c Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Thu, 1 Apr 2021 16:05:40 +0000 Subject: [PATCH 23/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du4/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ^^ --- du4/program.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/du4/program.c b/du4/program.c index 534ce30..9db7963 100644 --- a/du4/program.c +++ b/du4/program.c @@ -78,25 +78,25 @@ int main() { switch(operation){ case 1: if(strtof(number1, &ptr) != roundf(strtof(number1, &ptr))) - printf("%s\n", (roundf((strtof(number1, &ptr) + strtof(number2, &ptr))*100)/100 > strtof(result, &ptr) - 0.001 && roundf(strtof(number1, &ptr) + strtof(number2, &ptr)*100)/100 < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); + printf("%s\n", (roundf((strtof(number1, &ptr) + strtof(number2, &ptr))*100)/100 > strtof(result, &ptr) - 0.001 && roundf((strtof(number1, &ptr) + strtof(number2, &ptr))*100)/100 < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); else printf("%s\n", (strtof(number1, &ptr) + strtof(number2, &ptr) > strtof(result, &ptr) - 0.001 && strtof(number1, &ptr) + strtof(number2, &ptr) < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); break; case 2: if(strtof(number1, &ptr) != roundf(strtof(number1, &ptr))) - printf("%s\n", (roundf((strtof(number1, &ptr) - strtof(number2, &ptr))*100)/100 > strtof(result, &ptr) - 0.001 && roundf(strtof(number1, &ptr) - strtof(number2, &ptr)*100)/100 < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); + printf("%s\n", (roundf((strtof(number1, &ptr) - strtof(number2, &ptr))*100)/100 > strtof(result, &ptr) - 0.001 && roundf((strtof(number1, &ptr) - strtof(number2, &ptr))*100)/100 < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); else printf("%s\n", (strtof(number1, &ptr) - strtof(number2, &ptr) > strtof(result, &ptr) - 0.001 && strtof(number1, &ptr) - strtof(number2, &ptr) < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); break; case 3: if(strtof(number1, &ptr) != roundf(strtof(number1, &ptr))) - printf("%s\n", (roundf((strtof(number1, &ptr) * strtof(number2, &ptr))*100)/100 > strtof(result, &ptr) - 0.001 && roundf(strtof(number1, &ptr) * strtof(number2, &ptr)*100)/100 < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); + printf("%s\n", (roundf((strtof(number1, &ptr) * strtof(number2, &ptr))*100)/100 > strtof(result, &ptr) - 0.001 && roundf((strtof(number1, &ptr) * strtof(number2, &ptr))*100)/100 < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); else printf("%s\n", (strtof(number1, &ptr) * strtof(number2, &ptr) > strtof(result, &ptr) - 0.001 && strtof(number1, &ptr) * strtof(number2, &ptr) < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); break; case 4: if(strtof(number1, &ptr) != roundf(strtof(number1, &ptr))) - printf("%s\n", (roundf((strtof(number1, &ptr) / strtof(number2, &ptr))*100)/100 > strtof(result, &ptr) - 0.001 && roundf(strtof(number1, &ptr) / strtof(number2, &ptr)*100)/100 < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); + printf("%s\n", (roundf((strtof(number1, &ptr) / strtof(number2, &ptr))*100)/100 > strtof(result, &ptr) - 0.001 && roundf((strtof(number1, &ptr) / strtof(number2, &ptr))*100)/100 < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); else printf("%s\n", (strtof(number1, &ptr) / strtof(number2, &ptr) > strtof(result, &ptr) - 0.001 && strtof(number1, &ptr) / strtof(number2, &ptr) < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); break; From 0b06221f03ae3d1a9bf6dfe3939af87ef6224d80 Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Thu, 1 Apr 2021 16:12:11 +0000 Subject: [PATCH 24/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du4/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ^^ --- du4/program.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/du4/program.c b/du4/program.c index 9db7963..7247876 100644 --- a/du4/program.c +++ b/du4/program.c @@ -74,7 +74,7 @@ int main() { break; } } - LABEL: + switch(operation){ case 1: if(strtof(number1, &ptr) != roundf(strtof(number1, &ptr))) @@ -103,6 +103,8 @@ int main() { default: printf("CHYBA\n"); } + LABEL: + i = i; } free(input); From 208655149d8391ac70c6e58c5103702d83d094fe Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Thu, 1 Apr 2021 16:27:33 +0000 Subject: [PATCH 25/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du4/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ^^ --- du4/program.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/du4/program.c b/du4/program.c index 7247876..dc7790e 100644 --- a/du4/program.c +++ b/du4/program.c @@ -77,25 +77,25 @@ int main() { switch(operation){ case 1: - if(strtof(number1, &ptr) != roundf(strtof(number1, &ptr))) + if((strtof(number1, &ptr) != roundf(strtof(number1, &ptr))) || (strtof(number2, &ptr) != roundf(strtof(number2, &ptr))) || (strtof(result, &ptr) != roundf(strtof(result, &ptr)))) printf("%s\n", (roundf((strtof(number1, &ptr) + strtof(number2, &ptr))*100)/100 > strtof(result, &ptr) - 0.001 && roundf((strtof(number1, &ptr) + strtof(number2, &ptr))*100)/100 < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); else printf("%s\n", (strtof(number1, &ptr) + strtof(number2, &ptr) > strtof(result, &ptr) - 0.001 && strtof(number1, &ptr) + strtof(number2, &ptr) < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); break; case 2: - if(strtof(number1, &ptr) != roundf(strtof(number1, &ptr))) + if((strtof(number1, &ptr) != roundf(strtof(number1, &ptr))) || (strtof(number2, &ptr) != roundf(strtof(number2, &ptr))) || (strtof(result, &ptr) != roundf(strtof(result, &ptr)))) printf("%s\n", (roundf((strtof(number1, &ptr) - strtof(number2, &ptr))*100)/100 > strtof(result, &ptr) - 0.001 && roundf((strtof(number1, &ptr) - strtof(number2, &ptr))*100)/100 < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); else printf("%s\n", (strtof(number1, &ptr) - strtof(number2, &ptr) > strtof(result, &ptr) - 0.001 && strtof(number1, &ptr) - strtof(number2, &ptr) < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); break; case 3: - if(strtof(number1, &ptr) != roundf(strtof(number1, &ptr))) + if((strtof(number1, &ptr) != roundf(strtof(number1, &ptr))) || (strtof(number2, &ptr) != roundf(strtof(number2, &ptr))) || (strtof(result, &ptr) != roundf(strtof(result, &ptr)))) printf("%s\n", (roundf((strtof(number1, &ptr) * strtof(number2, &ptr))*100)/100 > strtof(result, &ptr) - 0.001 && roundf((strtof(number1, &ptr) * strtof(number2, &ptr))*100)/100 < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); else printf("%s\n", (strtof(number1, &ptr) * strtof(number2, &ptr) > strtof(result, &ptr) - 0.001 && strtof(number1, &ptr) * strtof(number2, &ptr) < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); break; case 4: - if(strtof(number1, &ptr) != roundf(strtof(number1, &ptr))) + if((strtof(number1, &ptr) != roundf(strtof(number1, &ptr))) || (strtof(number2, &ptr) != roundf(strtof(number2, &ptr))) || (strtof(result, &ptr) != roundf(strtof(result, &ptr)))) printf("%s\n", (roundf((strtof(number1, &ptr) / strtof(number2, &ptr))*100)/100 > strtof(result, &ptr) - 0.001 && roundf((strtof(number1, &ptr) / strtof(number2, &ptr))*100)/100 < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); else printf("%s\n", (strtof(number1, &ptr) / strtof(number2, &ptr) > strtof(result, &ptr) - 0.001 && strtof(number1, &ptr) / strtof(number2, &ptr) < strtof(result, &ptr) + 0.001) ? "OK" : "ZLE"); From fb2937528842b72714376d3b69a3bc0507f3da81 Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Tue, 6 Apr 2021 14:45:56 +0000 Subject: [PATCH 26/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du5/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- du5/program.c | 88 +++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 74 insertions(+), 14 deletions(-) diff --git a/du5/program.c b/du5/program.c index ab45005..4a69940 100644 --- a/du5/program.c +++ b/du5/program.c @@ -1,40 +1,100 @@ #include #include #include +#include +#include struct entry{ char* name; int votes; -} +}; struct entry* createEntry(char* name, int votes){ - struct entry* newEntry = (struct entry*) calloc(1, sizeof(struct entry)); + struct entry* newEntry = (struct entry*)calloc(1, sizeof(struct entry)); + newEntry->name = (char*)calloc(25, sizeof(char)); strcpy(newEntry->name, name); newEntry->votes = votes; return newEntry; } -int main(){ - struct entry myEntries[100]; - char inputs[100][50]; - int counter = 0; - char symbol; - char* number1 = (char*) calloc (25, sizeof(char)); +bool addPoints(struct entry* myEntries, int votes, char* name){ + if(!myEntries) + return false; + if(!strcmp(myEntries->name, name)) { + myEntries->votes += votes; + return true; + } - for(int i = 0; fgets(inputs[1], 50, stdin) != NULL; i++){ + return false; +} + +void bsortDesc(struct entry* list[80], int s){ + int i, j; + struct entry* temp; + + for (i = 0; i < s - 1; i++) + { + for (j = 0; j < (s - 1-i); j++) + { + if (list[j]->votes < list[j + 1]->votes) + { + temp = list[j]; + list[j] = list[j + 1]; + list[j + 1] = temp; + } + } + } +} + +int main() { + struct entry* myEntries[100]; + for(int i = 0; i < 100; i++) + myEntries[i] = (struct entry*) calloc(1, sizeof(struct entry)); + char inputs[100][50]; //input + int counter; //counter + char symbol; //current symbol + char* number1 = (char*) calloc(25, sizeof(char)); //temporary points + char* name = (char*) calloc(25, sizeof(char)); //temporary name + char* ptr; + bool checked = false; + int position = 0; + + for(int i = 0; fgets(inputs[i], 50, stdin) != NULL; i++){ counter = 0; + memset(number1, '\0', 25); + memset(name, '\0', 25); symbol = inputs[i][counter++]; while(symbol != '\0' && symbol != '\n'){ + if(symbol == '|') goto LABEL; while(isspace(symbol)) symbol = inputs[i][counter++]; - if(isdigit(symbol)) - number1 += symbol; - else if(isalpha) + if(isdigit(symbol)) { + number1[strlen(number1)] = symbol; + number1[strlen(number1)] = '\0'; + } + else{ + name[strlen(name)] = symbol; + name[strlen(name)] = '\0'; + } + symbol = inputs[i][counter++]; } + + for(int j = 0; myEntries[j]->name != NULL; j++) { + if(addPoints(myEntries[j], (int)strtol(number1, &ptr, 10), name)) + checked = true; + position = j+1; + } + + if(!checked) + myEntries[position] = createEntry(name, (int)strtol(number1, &ptr, 10)); } - + LABEL: + bsortDesc(myEntries, position+1); + for(int i = 0; myEntries[i]->name != NULL; i++) { + printf("%d %s\n", myEntries[i]->votes, myEntries[i]->name); + } return 0; -} +} \ No newline at end of file From d273fa9213e28f86349cf6c1c0619f44bd816e47 Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Tue, 6 Apr 2021 14:47:48 +0000 Subject: [PATCH 27/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du5/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- du5/program.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/du5/program.c b/du5/program.c index 4a69940..680ba77 100644 --- a/du5/program.c +++ b/du5/program.c @@ -65,7 +65,6 @@ int main() { memset(name, '\0', 25); symbol = inputs[i][counter++]; while(symbol != '\0' && symbol != '\n'){ - if(symbol == '|') goto LABEL; while(isspace(symbol)) symbol = inputs[i][counter++]; @@ -90,7 +89,6 @@ int main() { myEntries[position] = createEntry(name, (int)strtol(number1, &ptr, 10)); } - LABEL: bsortDesc(myEntries, position+1); for(int i = 0; myEntries[i]->name != NULL; i++) { printf("%d %s\n", myEntries[i]->votes, myEntries[i]->name); From 3001fcb96284b7b29c87fc6a811e7c46c302fbf9 Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Tue, 6 Apr 2021 14:50:38 +0000 Subject: [PATCH 28/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du5/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- du5/program.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/du5/program.c b/du5/program.c index 680ba77..1d68f2c 100644 --- a/du5/program.c +++ b/du5/program.c @@ -63,9 +63,10 @@ int main() { counter = 0; memset(number1, '\0', 25); memset(name, '\0', 25); + if (symbol == '\n') break; symbol = inputs[i][counter++]; while(symbol != '\0' && symbol != '\n'){ - while(isspace(symbol)) + if(isspace(symbol) && isdigit(inputs[i][counter-2])) symbol = inputs[i][counter++]; if(isdigit(symbol)) { From 677a3a082f284bd1a39ea8d673d3a3d982bf1a0e Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Tue, 6 Apr 2021 14:51:59 +0000 Subject: [PATCH 29/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du5/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- du5/program.c | 1 + 1 file changed, 1 insertion(+) diff --git a/du5/program.c b/du5/program.c index 1d68f2c..8e8b2c2 100644 --- a/du5/program.c +++ b/du5/program.c @@ -91,6 +91,7 @@ int main() { } bsortDesc(myEntries, position+1); + printf("Vysledky:\n"); for(int i = 0; myEntries[i]->name != NULL; i++) { printf("%d %s\n", myEntries[i]->votes, myEntries[i]->name); } From 70ecbcac8456e5c993a55272b32b7b7c458208b1 Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Tue, 6 Apr 2021 14:55:09 +0000 Subject: [PATCH 30/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du5/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- du5/program.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/du5/program.c b/du5/program.c index 8e8b2c2..ff66f2d 100644 --- a/du5/program.c +++ b/du5/program.c @@ -63,8 +63,8 @@ int main() { counter = 0; memset(number1, '\0', 25); memset(name, '\0', 25); - if (symbol == '\n') break; symbol = inputs[i][counter++]; + if(symbol == '\n') break; while(symbol != '\0' && symbol != '\n'){ if(isspace(symbol) && isdigit(inputs[i][counter-2])) symbol = inputs[i][counter++]; From 013cf048b4fd908ef6cc63e27fa690ea15d5021b Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Tue, 6 Apr 2021 14:58:45 +0000 Subject: [PATCH 31/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du5/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- du5/program.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/du5/program.c b/du5/program.c index ff66f2d..17dc28c 100644 --- a/du5/program.c +++ b/du5/program.c @@ -42,6 +42,11 @@ void bsortDesc(struct entry* list[80], int s){ list[j] = list[j + 1]; list[j + 1] = temp; } + else if ((list[j]->votes == list[j + 1]->votes) && (list[j]->name[0] < list[j + 1]->name[0])){ + temp = list[j]; + list[j] = list[j + 1]; + list[j + 1] = temp; + } } } } From 8d94d553daf60f850858a08d5143322f1d4f40de Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Tue, 6 Apr 2021 15:02:59 +0000 Subject: [PATCH 32/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du5/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- du5/program.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/du5/program.c b/du5/program.c index 17dc28c..6763f2c 100644 --- a/du5/program.c +++ b/du5/program.c @@ -42,7 +42,7 @@ void bsortDesc(struct entry* list[80], int s){ list[j] = list[j + 1]; list[j + 1] = temp; } - else if ((list[j]->votes == list[j + 1]->votes) && (list[j]->name[0] < list[j + 1]->name[0])){ + else if ((list[j]->votes == list[j + 1]->votes) && (list[j]->name[0] > list[j + 1]->name[0])){ temp = list[j]; list[j] = list[j + 1]; list[j + 1] = temp; From 8e6618468dbd6635673c17de3e62f0d5d2a03462 Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Tue, 6 Apr 2021 15:07:21 +0000 Subject: [PATCH 33/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du5/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- du5/program.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/du5/program.c b/du5/program.c index 6763f2c..35bc1ac 100644 --- a/du5/program.c +++ b/du5/program.c @@ -31,6 +31,7 @@ bool addPoints(struct entry* myEntries, int votes, char* name){ void bsortDesc(struct entry* list[80], int s){ int i, j; struct entry* temp; + int count = 0; for (i = 0; i < s - 1; i++) { @@ -42,10 +43,14 @@ void bsortDesc(struct entry* list[80], int s){ list[j] = list[j + 1]; list[j + 1] = temp; } - else if ((list[j]->votes == list[j + 1]->votes) && (list[j]->name[0] > list[j + 1]->name[0])){ - temp = list[j]; - list[j] = list[j + 1]; - list[j + 1] = temp; + else if (list[j]->votes == list[j + 1]->votes){ + while (list[j]->name[count] == list[j + 1]->name[count]) + count++; + if (list[j]->name[0] > list[j + 1]->name[0]){ + temp = list[j]; + list[j] = list[j + 1]; + list[j + 1] = temp; + } } } } From aedbd606adf4d0535d4463fe36c2f2b24c376fbf Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Tue, 6 Apr 2021 15:13:28 +0000 Subject: [PATCH 34/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du5/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- du5/program.c | 1 + 1 file changed, 1 insertion(+) diff --git a/du5/program.c b/du5/program.c index 35bc1ac..a1d5d6f 100644 --- a/du5/program.c +++ b/du5/program.c @@ -52,6 +52,7 @@ void bsortDesc(struct entry* list[80], int s){ list[j + 1] = temp; } } + count = 0; } } } From 8dd779e748bc23577aef5162ca95e7fea1775f48 Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Tue, 6 Apr 2021 15:14:43 +0000 Subject: [PATCH 35/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du5/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- du5/program.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/du5/program.c b/du5/program.c index a1d5d6f..eaf43a2 100644 --- a/du5/program.c +++ b/du5/program.c @@ -46,7 +46,7 @@ void bsortDesc(struct entry* list[80], int s){ else if (list[j]->votes == list[j + 1]->votes){ while (list[j]->name[count] == list[j + 1]->name[count]) count++; - if (list[j]->name[0] > list[j + 1]->name[0]){ + if (list[j]->name[count] > list[j + 1]->name[count]){ temp = list[j]; list[j] = list[j + 1]; list[j + 1] = temp; From f292dd2575f5dff150854cbba70821ba4ca96710 Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Tue, 6 Apr 2021 15:22:28 +0000 Subject: [PATCH 36/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du5/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- du5/program.c | 1 + 1 file changed, 1 insertion(+) diff --git a/du5/program.c b/du5/program.c index eaf43a2..994efc5 100644 --- a/du5/program.c +++ b/du5/program.c @@ -72,6 +72,7 @@ int main() { for(int i = 0; fgets(inputs[i], 50, stdin) != NULL; i++){ counter = 0; + checked = false; memset(number1, '\0', 25); memset(name, '\0', 25); symbol = inputs[i][counter++]; From 271e517175b3a60ec2e9fa8755ced1edbf1a9f0f Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Tue, 6 Apr 2021 15:24:36 +0000 Subject: [PATCH 37/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du5/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- du5/program.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/du5/program.c b/du5/program.c index 994efc5..8446c63 100644 --- a/du5/program.c +++ b/du5/program.c @@ -76,7 +76,7 @@ int main() { memset(number1, '\0', 25); memset(name, '\0', 25); symbol = inputs[i][counter++]; - if(symbol == '\n') break; + if(!isdigit(symbol)) break; while(symbol != '\0' && symbol != '\n'){ if(isspace(symbol) && isdigit(inputs[i][counter-2])) symbol = inputs[i][counter++]; From da19e6cc6a4169bf8d942b9a040b29fb77d4e42b Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Tue, 6 Apr 2021 15:26:57 +0000 Subject: [PATCH 38/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du5/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- du5/program.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/du5/program.c b/du5/program.c index 8446c63..4d0f09e 100644 --- a/du5/program.c +++ b/du5/program.c @@ -76,7 +76,13 @@ int main() { memset(number1, '\0', 25); memset(name, '\0', 25); symbol = inputs[i][counter++]; - if(!isdigit(symbol)) break; + if(!isdigit(symbol)){ + if (i == 0){ + printf("Nepodarilo nacitat nic"); + return 0; + } + break; + } while(symbol != '\0' && symbol != '\n'){ if(isspace(symbol) && isdigit(inputs[i][counter-2])) symbol = inputs[i][counter++]; From 7a45dbdaca03ab768b330405cf76f2594798bd5a Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Tue, 6 Apr 2021 15:27:40 +0000 Subject: [PATCH 39/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du5/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- du5/program.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/du5/program.c b/du5/program.c index 4d0f09e..78f4884 100644 --- a/du5/program.c +++ b/du5/program.c @@ -78,7 +78,7 @@ int main() { symbol = inputs[i][counter++]; if(!isdigit(symbol)){ if (i == 0){ - printf("Nepodarilo nacitat nic"); + printf("Nepodarilo nacitat nic\n"); return 0; } break; From 14c9578ef11050934b6e97b24766703d336907fe Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Tue, 6 Apr 2021 15:31:39 +0000 Subject: [PATCH 40/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du5/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- du5/program.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/du5/program.c b/du5/program.c index 78f4884..54019f4 100644 --- a/du5/program.c +++ b/du5/program.c @@ -62,6 +62,7 @@ int main() { for(int i = 0; i < 100; i++) myEntries[i] = (struct entry*) calloc(1, sizeof(struct entry)); char inputs[100][50]; //input + strcpy(inputs[0], "('-_-)") int counter; //counter char symbol; //current symbol char* number1 = (char*) calloc(25, sizeof(char)); //temporary points @@ -107,7 +108,9 @@ int main() { if(!checked) myEntries[position] = createEntry(name, (int)strtol(number1, &ptr, 10)); } - + if(!strcmp(inputs[0], "('-_-)"){ + return 0; + } bsortDesc(myEntries, position+1); printf("Vysledky:\n"); for(int i = 0; myEntries[i]->name != NULL; i++) { From 6408a4c1a2805fbe05f1c7e007b717ae8606bbe6 Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Tue, 6 Apr 2021 15:32:23 +0000 Subject: [PATCH 41/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du5/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- du5/program.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/du5/program.c b/du5/program.c index 54019f4..82ddc60 100644 --- a/du5/program.c +++ b/du5/program.c @@ -62,7 +62,7 @@ int main() { for(int i = 0; i < 100; i++) myEntries[i] = (struct entry*) calloc(1, sizeof(struct entry)); char inputs[100][50]; //input - strcpy(inputs[0], "('-_-)") + strcpy(inputs[0], "('-_-)"); int counter; //counter char symbol; //current symbol char* number1 = (char*) calloc(25, sizeof(char)); //temporary points From 7cbc4791fbaddbe6873d08c2bc5c5d475afedda0 Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Tue, 6 Apr 2021 15:33:17 +0000 Subject: [PATCH 42/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du5/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- du5/program.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/du5/program.c b/du5/program.c index 82ddc60..6efaef1 100644 --- a/du5/program.c +++ b/du5/program.c @@ -108,7 +108,7 @@ int main() { if(!checked) myEntries[position] = createEntry(name, (int)strtol(number1, &ptr, 10)); } - if(!strcmp(inputs[0], "('-_-)"){ + if(!strcmp(inputs[0], "('-_-)")){ return 0; } bsortDesc(myEntries, position+1); From 159ef02dbafebe10197e765b8542613c757ca43e Mon Sep 17 00:00:00 2001 From: Oleksandr Hryshchenko Date: Tue, 6 Apr 2021 15:34:00 +0000 Subject: [PATCH 43/43] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'du5/program.c'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- du5/program.c | 1 + 1 file changed, 1 insertion(+) diff --git a/du5/program.c b/du5/program.c index 6efaef1..3fcd60e 100644 --- a/du5/program.c +++ b/du5/program.c @@ -109,6 +109,7 @@ int main() { myEntries[position] = createEntry(name, (int)strtol(number1, &ptr, 10)); } if(!strcmp(inputs[0], "('-_-)")){ + printf("Nepodarilo nacitat nic\n"); return 0; } bsortDesc(myEntries, position+1);