From cc09065762e7b0a2d71e69270d6fce163264ed05 Mon Sep 17 00:00:00 2001 From: DoraPancar Date: Thu, 23 Jan 2025 01:16:11 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=E2=80=9CmultiplyAndDivideFcnsAreAdded?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- simpleCalculator.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/simpleCalculator.cpp b/simpleCalculator.cpp index aeb29c1..2bab743 100644 --- a/simpleCalculator.cpp +++ b/simpleCalculator.cpp @@ -29,4 +29,18 @@ int main(){ std::cout << "Result to your operation:"; std::cout << a << " " << oper << " " << b << " = " << result; +} + +double multiply(double a, double b) +{ + return a * b; +} + +double divide(double a, double b) +{ + if (b != 0) + { + return a/b; + } + } \ No newline at end of file From 5646540ee94c90efa3502632c05eeb72812e019f Mon Sep 17 00:00:00 2001 From: DoraPancar Date: Thu, 23 Jan 2025 01:20:04 +0300 Subject: [PATCH 2/4] =?UTF-8?q?=E2=80=9CmultiplyAndDivideFcnsAreAdded?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- simpleCalculator.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/simpleCalculator.cpp b/simpleCalculator.cpp index 2bab743..f9a7e7a 100644 --- a/simpleCalculator.cpp +++ b/simpleCalculator.cpp @@ -21,10 +21,14 @@ int main(){ double result = 0; //uncomment this to add your operation - // if (oper == YOUR_OPERATION){ - // result = YOUR_FUNCTION(a,b); - // } - // elif(oper == YOUR_OTHER_OPERATION)......... + if (oper == multiply) + { + result = multiply(a,b); + } + else if(oper == divide) + { + result = divide(a,b); + } std::cout << "Result to your operation:"; From 874a2182a4af4294a195a08eef33d7acc7a9df60 Mon Sep 17 00:00:00 2001 From: DoraPancar Date: Sun, 26 Jan 2025 21:45:32 +0300 Subject: [PATCH 3/4] Corrected the mistakes --- simpleCalculator | Bin 0 -> 60784 bytes simpleCalculator.cpp | 48 ++++++++++++++++++++++++++--------------- tempCodeRunnerFile.cpp | 3 +++ 3 files changed, 34 insertions(+), 17 deletions(-) create mode 100755 simpleCalculator create mode 100644 tempCodeRunnerFile.cpp diff --git a/simpleCalculator b/simpleCalculator new file mode 100755 index 0000000000000000000000000000000000000000..fb65d7ef68e149e7d4b3c6b03a043d18ef30bf7d GIT binary patch literal 60784 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 +double multiply(double a, double b) +{ + return a * b; +} + +double divide(double a, double b) +{ + if (b != 0) + { + return a/b; + } + else + { + std::cout << "Invalid Divisor 0!"; + } +} + + int main(){ //initializing the numbers and the operator double a = 0; @@ -21,30 +39,26 @@ int main(){ double result = 0; //uncomment this to add your operation - if (oper == multiply) + if (oper == "*") { result = multiply(a,b); + std::cout << "Result to your operation:"; + std::cout << a << " " << oper << " " << b << " = " << result; } - else if(oper == divide) + else if(oper == "/") { result = divide(a,b); + if (b != 0) + { + std::cout << "Result to your operation:"; + std::cout << a << " " << oper << " " << b << " = " << result; + } + } + else + { + std::cout << "Invalid Operation!"; } - std::cout << "Result to your operation:"; - std::cout << a << " " << oper << " " << b << " = " << result; -} - -double multiply(double a, double b) -{ - return a * b; -} -double divide(double a, double b) -{ - if (b != 0) - { - return a/b; - } - } \ No newline at end of file diff --git a/tempCodeRunnerFile.cpp b/tempCodeRunnerFile.cpp new file mode 100644 index 0000000..60b7fbd --- /dev/null +++ b/tempCodeRunnerFile.cpp @@ -0,0 +1,3 @@ + result = divide(a,b); + std::cout << "Result to your operation:"; + std::cout << a << " " << oper << " " << b << " = " << result; \ No newline at end of file From 3ad40f33dafe7a817ce8a3b9835f8c15cd805af4 Mon Sep 17 00:00:00 2001 From: DoraPancar Date: Sun, 26 Jan 2025 22:29:03 +0300 Subject: [PATCH 4/4] added operation subtract and add to if statement --- simpleCalculator | Bin 60888 -> 60888 bytes simpleCalculator.cpp | 19 +++++++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/simpleCalculator b/simpleCalculator index 60891f6bde23c19c6a330ca2701c694f470948a7..8707081c3afa64227015af03b432637f3ef99455 100755 GIT binary patch delta 1870 zcmZ`)ZERCj7=CZp569NEn_IWCwY}X4nHlPgV%Qj?E_S(~#Ht{K1RO?V7YH~Wj_)KqDc~NC zM+lDzc;cRHBvy#nB@n-I+(;Y}@T(l}CjV9e|Jc9>=h-ifE7hOo&h6y9B;X_5S!WAR z3Fr~--AvwB1$;aAW=u6f*UqU0S9Lh6jK_5xypt5y99lZKHc`cc%=rz^j$bA(jPMX9?$`WO4X0;JN zW#TCm^poI6P9#ktNrEi<0AT|vTqq;u*Q&0l+wy97n%ZMgqCX>sH``31zO!o|H9z;_ z4B8m|4Bl7vuo=c|HcO66UJ5z-TCrFxrTv0z6un8JMNY>Anrx%-TV8E%OM~NS^83oG z#akMK$GQ71!JTZ3RzqILyxRGe#)N`iydl7+u*0%k`%idbm}&!VYgah9z^l24~YS{_Ueb!@=;|AX-? zt_+lFDVjN$(WV5#d4%z`HwYDwjjHXW%5mB)&}18fImfyC1deQ!dP({g zr$L~}=7V{b$b>q2=ibV7BOArn@p`fd7taec*?cf{Nb#)17I_*GP_Z7xFi{w64qVm+PIfEXP7qm6^ij6Sf}ndsm5NyKrWc r*b;7lKQ=rMgB#nT^V$-hD)H+}=a^5s`0eXhmDZzo(--lm{(|p6G}dD9 delta 1376 zcmY+Ee`p(J7{{MWa&2Q>ldfG;Tbo=olwzC=q(jD*#6rf24okObE!0)<4+|o-wWT;~ zGHo$OY0372&Hgffj9L&O|VZHIh9@b`!t4*sg(9}_P+ z_*ucz#PbfGdP)eBBxD>yi{RG8BM$x`Xf5<@^7lLV_ZA;7^CkzpBg{i&jym|VFdO`_ z=N!6S#YP762ZU)j+2^4fu~FC^h;g3gA7#6~kEi9>X;|704(7a9aXx}3HDIw%+AxE>k$+;|e z*5+9ZxK05N2_a((844)!QfswTa~l6ZRlBVjs&;N$OKwtmJV)|cS_$S z8LPzXckzeem+Ullv7C%iq^dSES*cX2)83?S4EmCSo)GegL#A)5@a9%FA8xIEpM1Xs z*cajU@JhhS*6*;>H)iW0mmXkdxIHq7E^9K;;2P;qZo}oE(M!g618gXAEQP~=@cj9L z8(>ND&B*99ag)F*0h@E2-~X#pvCi5&NqNK`>`>He&Zy@9N0t7ILT*Lzl@@^6tsq4HKG3nw{F_FQBAqTiovf{nN-VflvoT0it>;Op8&JP1ku z{PcMjbH$t7Q8><;<4?BH^^w7J34DJ#g$+J5KB2II_&`q@E6d9uW$Qpncmc9raOJ%? zt_Lvcv2OtA^?|hJ11L9v)Qjb;HDiAapwNPSK$mJ>q#Gwe&E>{x>7uI~(pS^poOR`6 zEVC61ti`|$`_!c40G_wTo&(c0I>y5Hy4bB!On-d)s8m~yqh3g`(>pi3`Iw?8BZ+dI zZtg6|J@yUwFfQANRi?2d?10Y0C#AuUWzo2^st;B5?&>%ZV(Z_2fU9CXMvU&r4~>^P F{srkpn27)Y diff --git a/simpleCalculator.cpp b/simpleCalculator.cpp index f5bc617..906a8b2 100644 --- a/simpleCalculator.cpp +++ b/simpleCalculator.cpp @@ -67,17 +67,24 @@ int main(){ std::cout << a << " " << oper << " " << b << " = " << result; } } + else if (oper == "+") + { + result = sum(a,b); + std::cout << "Result to your operation:"; + std::cout << a << " " << oper << " " << b << " = " << result; + } + else if(oper == "-") + { + result = subtract(a,b); + std::cout << "Result to your operation:"; + std::cout << a << " " << oper << " " << b << " = " << result; + } else { std::cout << "Invalid Operation!"; } - if (oper == "+"){ - result = sum(a,b); - } - else if(oper == "-"){ - result = subtract(a,b); - } + } \ No newline at end of file