From 7151733b7d7c05d5302744fa6f3f693473837701 Mon Sep 17 00:00:00 2001 From: Vaibhav Gaur Date: Sun, 4 Apr 2021 13:39:05 +0530 Subject: [PATCH 1/4] commit --- .../calculator_complex/README.md | 1 + .../calculator_complex/main.c | 30 +++++++++++++++---- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/Example_Programs/programming_concpets/calculator_complex/README.md b/Example_Programs/programming_concpets/calculator_complex/README.md index a2ffd3bf..9469d777 100644 --- a/Example_Programs/programming_concpets/calculator_complex/README.md +++ b/Example_Programs/programming_concpets/calculator_complex/README.md @@ -50,3 +50,4 @@ typedef struct complex_t { * By [Annarose K](https://github.com/AnnaroseK/SFID-255976complex_calculator) * By [Jeevak Raj](https://github.com/JeevakRaj/LTTS_Stepin_Exercises/tree/main/Question_1a_Complex_Calculator) * By [Vivek Valagadri](https://github.com/vivekvalagadri/Stepin.git) +* By [260735] (https://github.com/VaibhavGaur56789/MiniProject_Template/tree/master/Example_Programs/programming_concpets/calculator_complex) diff --git a/Example_Programs/programming_concpets/calculator_complex/main.c b/Example_Programs/programming_concpets/calculator_complex/main.c index 5833eb24..a2bccffe 100644 --- a/Example_Programs/programming_concpets/calculator_complex/main.c +++ b/Example_Programs/programming_concpets/calculator_complex/main.c @@ -1,7 +1,25 @@ -#include -#include "complex_calculator.h" -int main() -{ - //TODO Write all the logic for Calculator app - printf("Complex calculator "); +#include "stdio.h" +#include "inc\complex_calculator.h" + +int main(){ + complex_t a = {1, 1}, b = {3, 1}, c = {0, 0}; + + complex_sumcd(&a, &b, &c); + printf("%f %f\n\n", c.real, c.imaginary); + + c.real = 0.0; + c.imaginary = 0.0; + complexSub(&a, &b, &c); + printf("%f %f\n\n", c.real, c.imaginary); + + c.real = 0.0; + c.imaginary = 0.0; + complexMul(&a, &b, &c); + printf("%f %f\n\n", c.real, c.imaginary); + + c.real = 0.0; + c.imaginary = 0.0; + complexDiv(&a, &b, &c); + printf("%f %f\n\n", c.real, c.imaginary); + return 0; } \ No newline at end of file From 35c215c8ed0b622dbc5c44b1c92f731da6d3364c Mon Sep 17 00:00:00 2001 From: Vaibhav Gaur Date: Sun, 4 Apr 2021 13:48:33 +0530 Subject: [PATCH 2/4] first commit --- .../programming_concpets/calculator_complex/README.md | 2 +- Example_Programs/programming_concpets/calculator_complex/main.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Example_Programs/programming_concpets/calculator_complex/README.md b/Example_Programs/programming_concpets/calculator_complex/README.md index 9469d777..b79bfd5a 100644 --- a/Example_Programs/programming_concpets/calculator_complex/README.md +++ b/Example_Programs/programming_concpets/calculator_complex/README.md @@ -50,4 +50,4 @@ typedef struct complex_t { * By [Annarose K](https://github.com/AnnaroseK/SFID-255976complex_calculator) * By [Jeevak Raj](https://github.com/JeevakRaj/LTTS_Stepin_Exercises/tree/main/Question_1a_Complex_Calculator) * By [Vivek Valagadri](https://github.com/vivekvalagadri/Stepin.git) -* By [260735] (https://github.com/VaibhavGaur56789/MiniProject_Template/tree/master/Example_Programs/programming_concpets/calculator_complex) +* By [260735](https://github.com/VaibhavGaur56789/MiniProject_Template/tree/master/Example_Programs/programming_concpets/calculator_complex) diff --git a/Example_Programs/programming_concpets/calculator_complex/main.c b/Example_Programs/programming_concpets/calculator_complex/main.c index a2bccffe..afec6328 100644 --- a/Example_Programs/programming_concpets/calculator_complex/main.c +++ b/Example_Programs/programming_concpets/calculator_complex/main.c @@ -1,4 +1,5 @@ #include "stdio.h" +#include "conio.h" #include "inc\complex_calculator.h" int main(){ From 3cded4cdb8dc08ac78ca3aff2e4cecbe5e2b8770 Mon Sep 17 00:00:00 2001 From: Vaibhav Gaur Date: Mon, 5 Apr 2021 21:49:28 +0530 Subject: [PATCH 3/4] commit --- .../programming_concpets/calculator_complex/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Example_Programs/programming_concpets/calculator_complex/README.md b/Example_Programs/programming_concpets/calculator_complex/README.md index b79bfd5a..a49b3e2a 100644 --- a/Example_Programs/programming_concpets/calculator_complex/README.md +++ b/Example_Programs/programming_concpets/calculator_complex/README.md @@ -50,4 +50,4 @@ typedef struct complex_t { * By [Annarose K](https://github.com/AnnaroseK/SFID-255976complex_calculator) * By [Jeevak Raj](https://github.com/JeevakRaj/LTTS_Stepin_Exercises/tree/main/Question_1a_Complex_Calculator) * By [Vivek Valagadri](https://github.com/vivekvalagadri/Stepin.git) -* By [260735](https://github.com/VaibhavGaur56789/MiniProject_Template/tree/master/Example_Programs/programming_concpets/calculator_complex) +* By [260735 - Vaibhav Gaur](https://github.com/VaibhavGaur56789/MiniProject_Template/tree/master/Example_Programs/programming_concpets/calculator_complex) From 437160feaacbc66c5fba27a6359088cfbe2ac463 Mon Sep 17 00:00:00 2001 From: Vaibhav Gaur Date: Mon, 5 Apr 2021 21:56:13 +0530 Subject: [PATCH 4/4] new commit --- .../programming_concpets/calculator_complex/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Example_Programs/programming_concpets/calculator_complex/README.md b/Example_Programs/programming_concpets/calculator_complex/README.md index a49b3e2a..0ba4d2b4 100644 --- a/Example_Programs/programming_concpets/calculator_complex/README.md +++ b/Example_Programs/programming_concpets/calculator_complex/README.md @@ -50,4 +50,4 @@ typedef struct complex_t { * By [Annarose K](https://github.com/AnnaroseK/SFID-255976complex_calculator) * By [Jeevak Raj](https://github.com/JeevakRaj/LTTS_Stepin_Exercises/tree/main/Question_1a_Complex_Calculator) * By [Vivek Valagadri](https://github.com/vivekvalagadri/Stepin.git) -* By [260735 - Vaibhav Gaur](https://github.com/VaibhavGaur56789/MiniProject_Template/tree/master/Example_Programs/programming_concpets/calculator_complex) +* By [260735-Vaibhav Gaur](https://github.com/VaibhavGaur56789/MiniProject_Template/tree/master/Example_Programs/programming_concpets/calculator_complex)