aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Project1/Homework3.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/Project1/Homework3.cpp b/Project1/Homework3.cpp
index 812f88b..9d0f11e 100644
--- a/Project1/Homework3.cpp
+++ b/Project1/Homework3.cpp
@@ -49,24 +49,24 @@ int factorial(int f)
int fibonacci(int n)
{
int a = 0, b = 1, c, i;
- if (n == 0)
- return a;
- for (i = 2; i <= n; i++)
+ if (n == 0 || n == 1)
{
- c = a + b;
- a = b;
- b = c;
+ return n;
+ }
+ else
+ {
+ return(fibonacci(n - 1) + fibonacci(n - 2));
}
- return b;
}
int powerfunc(int m, int p)
{
- double t = 1;
-
- for (int k = 1; k <= p; k++)
- t = t * m;
-
-
- return t;
+ if(p != 0)
+ {
+ return(m * powerfunc(m, p - 1));
+ }
+ else
+ {
+ return 1;
+ }
} \ No newline at end of file