diff --git a/Calculatrice/Calculatrice.vcxproj b/Calculatrice/Calculatrice.vcxproj index 158eb9e29c53a419cafa2486b5e28f98a57403a8..ec786fe1c8da1b6b98ae6563fc15b08568092ff7 100644 --- a/Calculatrice/Calculatrice.vcxproj +++ b/Calculatrice/Calculatrice.vcxproj @@ -142,6 +142,8 @@ <ClCompile Include="somme.cpp" /> <ClCompile Include="main.cpp" /> <ClCompile Include="multiplication.cpp" /> + <ClCompile Include="puissance.cpp" /> + <ClCompile Include="racine.cpp" /> <ClCompile Include="somme.cpp" /> <ClCompile Include="division.cpp" /> <ClCompile Include="soustraction.cpp" /> diff --git a/Calculatrice/Calculatrice.vcxproj.filters b/Calculatrice/Calculatrice.vcxproj.filters index d2415cc071f5010fa9c964af220899bc556152c4..aa3cb003ce65f19b128a2201c7cc071c9da9f83a 100644 --- a/Calculatrice/Calculatrice.vcxproj.filters +++ b/Calculatrice/Calculatrice.vcxproj.filters @@ -33,6 +33,12 @@ <ClCompile Include="multiplication.cpp"> <Filter>Fichiers sources</Filter> </ClCompile> + <ClCompile Include="puissance.cpp"> + <Filter>Fichiers sources</Filter> + </ClCompile> + <ClCompile Include="racine.cpp"> + <Filter>Fichiers sources</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="Fonctions.h"> diff --git a/Calculatrice/Fonctions.h b/Calculatrice/Fonctions.h index d864e907749facf4ed342c4b44b76fd0d563b504..9a946dc499000a2282c93dc2d19a53bc265a0a24 100644 --- a/Calculatrice/Fonctions.h +++ b/Calculatrice/Fonctions.h @@ -2,4 +2,7 @@ float soustraction(float a, float b); float addition(float a, float b); +float multiplication(float a, float b); float division(float a, float b); +float puissance(float a, float b); +float racine(float a, float b); \ No newline at end of file diff --git a/Calculatrice/puissance.cpp b/Calculatrice/puissance.cpp new file mode 100644 index 0000000000000000000000000000000000000000..ed92ffe52557dcab8a9c9a9a2a46b35ecb123119 --- /dev/null +++ b/Calculatrice/puissance.cpp @@ -0,0 +1,17 @@ +#include <stdio.h> +#include <stdlib.h> +#include <iostream> +#include <math.H> +#include "Fonctions.h" + + +float puissance(float a, float b) +{ + float interm = a; + for (int i = 0; i < b; i++) + { + a = a * interm; + } + printf("a puissance b = %f", a); + return(a); +} \ No newline at end of file diff --git a/Calculatrice/racine.cpp b/Calculatrice/racine.cpp new file mode 100644 index 0000000000000000000000000000000000000000..21e9f65f1bd21ba33abb523e735417ea1a4f96ce --- /dev/null +++ b/Calculatrice/racine.cpp @@ -0,0 +1,17 @@ +#include <stdio.h> +#include <stdlib.h> +#include <iostream> +#include <math.H> +#include "Fonctions.h" + + +float racine(float a, float b) +{ + float racinea; + float racineb; + racinea = sqrt(a); + racineb = sqrt(b); + printf("racine de a = %f", racinea); + printf("racine de b = %f", racineb); + return(racinea); +} \ No newline at end of file