Update and rename CST116F2021-Proj3.cpp to Project 3.cpp

2 files changed, 62 insertions, 20 deletions

diff --git a/CST116F2021-Proj3/CST116F2021-Proj3.cpp b/CST116F2021-Proj3/CST116F2021-Proj3.cpp
deleted file mode 100644
index 93999c0..0000000
--- a/CST116F2021-Proj3/CST116F2021-Proj3.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-// CST116F2021-Proj3.cpp : This file contains the 'main' function. Program execution begins and ends there.
-//
-
-#include <iostream>
-
-int main()
-{
-    std::cout << "Hello World!\n";
-}
-
-// Run program: Ctrl + F5 or Debug > Start Without Debugging menu
-// Debug program: F5 or Debug > Start Debugging menu
-
-// Tips for Getting Started: 
-//   1. Use the Solution Explorer window to add/manage files
-//   2. Use the Team Explorer window to connect to source control
-//   3. Use the Output window to see build output and other messages
-//   4. Use the Error List window to view errors
-//   5. Go to Project > Add New Item to create new code files, or Project > Add Existing Item to add existing code files to the project
-//   6. In the future, to open this project again, go to File > Open > Project and select the .sln file
diff --git a/CST116F2021-Proj3/Project 3.cpp b/CST116F2021-Proj3/Project 3.cpp
new file mode 100644
index 0000000..57cde22
--- /dev/null
+++ b/CST116F2021-Proj3/Project 3.cpp
@@ -0,0 +1,62 @@
+#include "Voids.h"
+#include <iostream>
+
+int main()
+{
+	int choice = 0;
+
+    int row1 = 0;
+    int column1 = 0;
+    int row2 = 0;
+    int column2 = 0;
+    int i = 0;
+    int j = 0;
+    int k = 0;
+
+    int rowa1 = 0;
+    int columna1 = 0;
+    int rowa2 = 0; 
+    int columna2 = 0;
+    int ia = 0; 
+    int ja = 0;
+    int ka = 0;
+
+    int rowM1 = 0;
+    int columnM1 = 0; 
+    int rowM2 = 0;
+    int columnM2 = 0;
+    int iM = 0;
+    int jM = 0;
+
+	ProcessChoice(choice);
+
+	if (choice == 1)
+	{
+        GetMatrix(rowM1, columnM1, rowM2, columnM2, iM, jM);
+        cout << "\n\nThe program is now finished, exitting\n\n\n\n";
+        return 0;
+	}
+	else if (choice == 2)
+	{
+	    MultiplyMatrix(row1, column1, row2, column2, i, j, k);
+        cout << "\n\nThe program is now finished, exitting\n\n\n\n";
+        return 0;
+	}
+    else if (choice == 3)
+    {
+       AddMatrix(rowa1, columna1, rowa2, columna2, ia, ja, ka);
+		cout << "\n\nThe program is now finished, exitting\n\n\n\n";
+		return 0;
+    }
+	else if (choice == 4)
+	{
+		cout << "\n\nYou have chosen to exit, now exitting\n\n\n\n";
+		return 0;
+	}
+	else
+	{
+		cout << "\n\nYou have inputted the wrong number, please run the program again\n\n\n\n";
+		return 0;
+	}
+
+}