|
@ -14,7 +14,10 @@ double combination(int n, int r); |
|
|
double pow(double num1, double num2); |
|
|
double pow(double num1, double num2); |
|
|
int mod(int num1,int num2); |
|
|
int mod(int num1,int num2); |
|
|
double log(num1); |
|
|
double log(num1); |
|
|
double sqrt(num1); |
|
|
|
|
|
|
|
|
double sqrt(double num1); |
|
|
|
|
|
double cbrt(num1); |
|
|
|
|
|
int multiply (int num1,int num2); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int calculator() { |
|
|
int calculator() { |
|
@ -102,7 +105,7 @@ double sqrt(num1); |
|
|
case 11: |
|
|
case 11: |
|
|
return num1 * num1 * num1; |
|
|
return num1 * num1 * num1; |
|
|
case 12: |
|
|
case 12: |
|
|
return 0;// cbrt(num1); |
|
|
|
|
|
|
|
|
return 0; cbrt(num1); |
|
|
case 13: |
|
|
case 13: |
|
|
return factorial(num1); |
|
|
return factorial(num1); |
|
|
case 14: |
|
|
case 14: |
|
@ -170,6 +173,14 @@ double log(double num1){ |
|
|
return result; |
|
|
return result; |
|
|
} |
|
|
} |
|
|
double sqrt(double num1){ |
|
|
double sqrt(double num1){ |
|
|
double result = num1; |
|
|
|
|
|
|
|
|
double result = num1; |
|
|
return result; |
|
|
return result; |
|
|
} |
|
|
} |
|
|
|
|
|
double cbrt(double num1){ |
|
|
|
|
|
double result = num1; |
|
|
|
|
|
return result; |
|
|
|
|
|
} |
|
|
|
|
|
int multiply(int num1,int num2){ |
|
|
|
|
|
int product = num1 * num2; |
|
|
|
|
|
return product; |
|
|
|
|
|
} |