completedHEADmain

5 files changed, 40 insertions, 26 deletions

diff --git a/homework3/homework3/helper.h b/homework3/homework3/helper.h
deleted file mode 100644
index a939ca5..0000000
--- a/homework3/homework3/helper.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef HELPERS_H
-#define HELPERS_H
-
-long factorial(int n);
-long fibonacci(size_t n);
-long power(int A, size_t B);
-
-
-#endif
diff --git a/homework3/homework3/helpers.h b/homework3/homework3/helpers.h
new file mode 100644
index 0000000..e0f371d
--- /dev/null
+++ b/homework3/homework3/helpers.h
@@ -0,0 +1,9 @@
+#ifndef HELPERS_H
+#define HELPERS_H
+
+long Factorial(int e);
+int fibonacciSequence(int n);
+double powerFunction(double A, double b);
+
+
+#endif
\ No newline at end of file
diff --git a/homework3/homework3/homework3.vcxproj b/homework3/homework3/homework3.vcxproj
index c77fd4b..bb9d272 100644
--- a/homework3/homework3/homework3.vcxproj
+++ b/homework3/homework3/homework3.vcxproj
@@ -130,7 +130,7 @@
     <ClCompile Include="source.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="helper.h" />
+    <ClInclude Include="helpers.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/homework3/homework3/homework3.vcxproj.filters b/homework3/homework3/homework3.vcxproj.filters
index a0b5e84..526d697 100644
--- a/homework3/homework3/homework3.vcxproj.filters
+++ b/homework3/homework3/homework3.vcxproj.filters
@@ -20,7 +20,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="helper.h">
+    <ClInclude Include="helpers.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/homework3/homework3/source.cpp b/homework3/homework3/source.cpp
index 7b2e5cc..25878f5 100644
--- a/homework3/homework3/source.cpp
+++ b/homework3/homework3/source.cpp
@@ -4,8 +4,7 @@
 // Assignment: Homework 3
 
 
-#include "helper.h"
-
+#include "helpers.h"
 #include <iostream>
 
 using std::cout;
@@ -13,24 +12,39 @@ using std::cin;
 using std::endl;
 
 
+long Factorial(int e) {
+	if (e == 0 || e == 1) {
+		return 1;
+	}
+	else {
+		return static_cast<long>(e) * Factorial(e - 1);
+	}
+}
 
-int main()
-{
-
-	
-
-	int n_factorial = 5;
-	cout << n_factorial << "!=" << factorial(n_factorial) << endl;
-
-	size_t n_fibonacci = 6;
-	cout << "Fibonacci term " << n_fibonacci << ":" << fibonacci(n_fibonacci) << endl;
+int fibonacciSequence(int n) {
+	if (n <= 1) {
+		return n;
+	}
+	else {
+		return fibonacciSequence(n - 1) + fibonacciSequence(n - 2);
+	}
+}
 
-	int base = 2;
-	size_t exponent = 3;
-	cout << base << "^" << exponent << "=" << power(base, exponent) << endl;
+double powerFunction(double A, double b) {
+	return pow(A, b);
+}
 
 
+int main() {
+	long factorialInput = 5;
+	cout << "Factorial of " << factorialInput << " is: " << Factorial(factorialInput) << endl;
 
+	int fibonacciInput = 6;
+	cout << "Fibonacci term at position" << fibonacciInput << "is:" << fibonacciSequence(fibonacciInput) << endl;
+	
+	double base = 2.0;
+	double exponent = 3.0;
+	cout << base << "raised to the power of" << exponent << "is:" << powerFunction(base, exponent) << endl;