diff --git a/CMakeLists.txt b/CMakeLists.txt index 8334bf2..409c998 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,18 @@ project(skola C) set(CMAKE_C_STANDARD 23) -add_executable(skola main.c) +add_executable(skola calc.c + kruh.c + main_rovnice.c + newoldmain.c + oldmain.c + tyzden.c + main.c + tyzden.h + newoldmain.h + main_rovnice.h + kruh.h + calc.h + znak.c) target_link_libraries(skola m) diff --git a/calc.c b/calc.c new file mode 100644 index 0000000..92c4a14 --- /dev/null +++ b/calc.c @@ -0,0 +1,39 @@ +#include "stdio.h" +#include "math.h" +#include "calc.h" +int calc(){ + double a = 0; + double b = 0; + char operacia = 0; + double vysledok = 0; + printf("Zadaj prvé číslo:\n"); + scanf("%lf", &a); + printf("Zadaj druhé číslo:\n"); + scanf("%lf", &b); + printf("Zadaj operáciu(+ - * /):\n"); + scanf(" %c", &operacia); + vysledok = a; + switch (operacia) { + case '+': + vysledok += b; + break; + + case '-': + vysledok -= b; + break; + + case '*': + vysledok *= b; + break; + + case '/': + vysledok /= b; + break; + + default: + printf("Nesprávna operácia.\n"); + return 1; + } + printf("Vysledok %f %c %f je: %f\nKalkulačka skončila úspešne.\n", a, operacia, b, vysledok); + return 0; +} \ No newline at end of file diff --git a/calc.h b/calc.h new file mode 100644 index 0000000..49769b5 --- /dev/null +++ b/calc.h @@ -0,0 +1 @@ +int calc(); diff --git a/kruh.c b/kruh.c index de6475d..811a387 100644 --- a/kruh.c +++ b/kruh.c @@ -1,7 +1,7 @@ #include #include - -int main(){ +#include "kruh.h" +int circle(){ float r = 0; float obsah = 0; float obvod = 0; diff --git a/kruh.h b/kruh.h new file mode 100644 index 0000000..98a26b1 --- /dev/null +++ b/kruh.h @@ -0,0 +1 @@ +int circle(); diff --git a/main.c b/main.c index 26dbafb..5f850c6 100644 --- a/main.c +++ b/main.c @@ -1,39 +1,5 @@ -#include "stdio.h" -#include "math.h" +#include "znak.h" int main(){ - double a = 0; - double b = 0; - char operacia = 0; - double vysledok = 0; - printf("Zadaj prvé číslo:\n"); - scanf("%lf", &a); - printf("Zadaj druhé číslo:\n"); - scanf("%lf", &b); - printf("Zadaj operáciu(+ - * /):\n"); - scanf(" %c", &operacia); - vysledok = a; - switch (operacia) { - case '+': - vysledok += b; - break; - - case '-': - vysledok -= b; - break; - - case '*': - vysledok *= b; - break; - - case '/': - vysledok /= b; - break; - - default: - printf("Nesprávna operácia.\n"); - return 1; - } - printf("Vysledok %f %c %f je: %f\nKalkulačka skončila úspešne.\n", a, operacia, b, vysledok); - return 0; + return znak(); } \ No newline at end of file diff --git a/main_rovnice.c b/main_rovnice.c index 7636f4e..6eb8d61 100644 --- a/main_rovnice.c +++ b/main_rovnice.c @@ -1,7 +1,7 @@ #include #include - +#include "main_rovnice.h" int trojuholnikalgo(int a, int b, int c) { if (((a + b) > c) && ((a + c) > b) && ((b + c) > a)) { @@ -76,7 +76,7 @@ void rovnicapriamky() { } } -int main() { +int rovnice() { //trojuholnik(); rovnicapriamky(); diff --git a/main_rovnice.h b/main_rovnice.h new file mode 100644 index 0000000..6f1d532 --- /dev/null +++ b/main_rovnice.h @@ -0,0 +1,9 @@ +int trojuholnikalgo(int a, int b, int c); + +void trojuholniktyp(int a, int b, int c); + +void trojuholnik(); + +void rovnicapriamky(); + +int rovnice(); diff --git a/newoldmain.c b/newoldmain.c index 17ddfca..0c024ad 100644 --- a/newoldmain.c +++ b/newoldmain.c @@ -1,5 +1,8 @@ #include #include +#include "stdint.h" +#include "stdlib.h" +#include "newoldmain.h" const float pi = 3.14; @@ -45,7 +48,7 @@ float otrojuholnik(float a, float b, float c){ return a + b + c; } -void trojuholnik(){ +void trojuholnikold(){ float a = 0; float b = 0; float c = 0; @@ -73,13 +76,6 @@ void trojuholnik(){ } -int main(){ - //valec(); - trojuholnik(); - - return 0; -} - void parne(){ int cislo = 0; printf("Zadaj cislo:"); @@ -95,7 +91,7 @@ void parne(){ } -int porovnavanie(cislo1, cislo2, cislo3){ +int porovnavanie(int cislo1, int cislo2, int cislo3){ int min = 0; if (cislo1 < cislo2){ diff --git a/newoldmain.h b/newoldmain.h new file mode 100644 index 0000000..bc7b708 --- /dev/null +++ b/newoldmain.h @@ -0,0 +1,25 @@ +extern const float pi; + +float skruhu(float r); + +float okruhu(float r); + +float svalec(float r, float h); + +float vvalec(float r, float h); + +void valec(); + +float strojuholnik(float a, float va); + +float otrojuholnik(float a, float b, float c); + +void trojuholnikold(); + +void parne(); + +int porovnavanie(int cislo1, int cislo2, int cislo3); + +int porovnavanietest(int *cisla, int pocet); + +void porovnavaniecelok(); diff --git a/oldmain.c b/oldmain.c index 09802f7..3e37aae 100644 --- a/oldmain.c +++ b/oldmain.c @@ -5,7 +5,7 @@ FILE *fp; char c; int a; -int main(){ +int oldmain(){ fp = fopen("test.txt", "r"); while (!feof(fp)){ diff --git a/tyzden.c b/tyzden.c new file mode 100644 index 0000000..62d5236 --- /dev/null +++ b/tyzden.c @@ -0,0 +1,36 @@ +#include "tyzden.h" +#include "stdio.h" +#include "stdint.h" + + +int tyzden(){ + uint8_t den = 0; + printf("Zadaj číslo dňa v týždni:"); + scanf("%hhd", &den); + switch (den) { + case 1: + printf("1. deň v týždni je pondelok\n"); + break; + case 2: + printf("2. deň v týždni je utorok\n"); + break; + case 3: + printf("3. deň v týždni je streda\n"); + break; + case 4: + printf("4. deň v týždni je štvrtok\n"); + break; + case 5: + printf("5. deň v týždni je piatok\n"); + break; + case 6: + printf("6. deň v týždni je sobota\n"); + break; + case 7: + printf("7. deň v týždni je nedeľa\n"); + break; + default: + printf("Taký deň v týždni neexistuje."); + + } +} \ No newline at end of file diff --git a/tyzden.h b/tyzden.h new file mode 100644 index 0000000..1b151ac --- /dev/null +++ b/tyzden.h @@ -0,0 +1 @@ +int tyzden(); \ No newline at end of file diff --git a/znak.c b/znak.c new file mode 100644 index 0000000..5115363 --- /dev/null +++ b/znak.c @@ -0,0 +1,16 @@ +#include "stdio.h" +int znak(){ + char in; + printf("Zadaj znak:"); + scanf("%c", &in); + switch (in) { + case 'a': printf("Volba a.\n"); + case 'b': printf("Volba b.\n"); + case 'c': printf("Volba c.\n"); + break; + default: + printf("Nevybral si si a/b/c.\n"); + } + + return 0; +} \ No newline at end of file diff --git a/znak.h b/znak.h new file mode 100644 index 0000000..d1ed7ee --- /dev/null +++ b/znak.h @@ -0,0 +1 @@ +int znak(); \ No newline at end of file