Merge pull request #3 from array-in-a-matrix/beta

Beta
This commit is contained in:
array-in-a-matrix 2021-04-19 16:39:00 -04:00 committed by GitHub
commit ff218e15c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 17 deletions

View file

@ -1,19 +1,11 @@
#include <stdio.h>
#include <math.h>
double exponent(double par)
{
double raisedNum;
raisedNum = par * par;
return raisedNum;
};
double hypotenuse(double par, double par2)
{
double sideC;
sideC = sqrt(exponent(par) + exponent(par2));
sideC = sqrt(pow(par, 2) + pow(par2, 2));
return sideC;
};
@ -21,9 +13,9 @@ double hypotenuse(double par, double par2)
void quadratic(double numA, double numB, double numC, double *awn1ptr, double *awn2ptr)
{
double awn1 = (-numB) + sqrt(exponent(numB) - 4 * numA * numC);
double awn1 = (-numB) + sqrt(pow(numB, 2) - 4 * numA * numC);
double awn1F = awn1 / (2 * numA);
double awn2 = (-numB) - sqrt(exponent(numB) - 4 * numA * numC);
double awn2 = (-numB) - sqrt(pow(numB, 2) - 4 * numA * numC);
double awn2F = awn2 / (2 * numA);
*awn1ptr = awn1F;
@ -34,7 +26,7 @@ double areaOfCircle(double radius)
{
double area;
area = acos(-1) * exponent(radius);
area = acos(-1) * pow(radius, 2);
return area;
}

26
main.c
View file

@ -17,6 +17,8 @@ int main()
printf("\n 5. Matrix addition");
printf("\n 6. * Matrix multiplication *");
printf("\n 7. Scalar matrix multiplication");
printf("\n 8. Exponent");
printf("\n\n * Stared entries are not fully programmed.");
printf("\n Enter your choice here:_____");
printf("\033[D");
@ -39,14 +41,14 @@ int main()
printf(" /_____|\n\n");
printf(" b\n");
printf("\nPlease type the length of the triangle below:\n");
printf("\nPlease type the length of the triangle:\n");
double sideA;
scanf("%lf", &sideA);
printf("\nPlease type the width of the triangle:\n");
double sideB;
scanf("%lf", &sideB);
printf("The Hypotnuse is equal to %f.\n", hypotenuse(sideA, sideB));
printf("The Hypotnuse is equal to %lf.\n", hypotenuse(sideA, sideB));
break;
case 2:
@ -66,7 +68,7 @@ int main()
double awn1ptr, awn2ptr;
quadratic(numA, numB, numC, &awn1ptr, &awn2ptr);
printf("The zeros are: %f and %f!\n", awn1ptr, awn2ptr);
printf("The zeros are: %f and %f.\n", awn1ptr, awn2ptr);
break;
case 3:
@ -77,7 +79,7 @@ int main()
double radius;
scanf("%lf", &radius);
printf("The area is %f!\n", areaOfCircle(radius));
printf("The area is %f.\n", areaOfCircle(radius));
break;
case 4:
@ -86,7 +88,7 @@ int main()
printf("\n ~~ 2*2 Matrix determinant ~~\n\n");
int det;
det = determinant();
printf("\nThe determinant is %d!\n",det);
printf("\nThe determinant is %d.\n", det);
break;
case 5:
@ -126,6 +128,20 @@ int main()
scalarMultiplication(numRows, numColumns, scalar);
break;
case 8:
system("clear");
printf("\n ~~ Exponenet ~~\n\n");
double base;
double exp;
printf("\nPlease enter the base: ");
scanf("%lf", &base);
printf("\nPlease enter the exponent: ");
scanf("%lf", &exp);
double num = pow(base, exp);
printf("%lf to the power of %lf is equal to %lf.\n", base, exp, num);
break;
default: