aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraustinsworld15 <[email protected]>2021-12-08 13:47:26 -0800
committerGitHub <[email protected]>2021-12-08 13:47:26 -0800
commite5b070c1f35a1a96cf6db8dbc79c18a636fda319 (patch)
tree4d9b98befe22cca3145090b4c84624610ba590f1
parentUpdate Project 3.cpp (diff)
downloadcst116-proj3-austinsworld15-e5b070c1f35a1a96cf6db8dbc79c18a636fda319.tar.xz
cst116-proj3-austinsworld15-e5b070c1f35a1a96cf6db8dbc79c18a636fda319.zip
Update Project 3.cpp
-rw-r--r--CST116F2021-Proj3/Project 3.cpp63
1 files changed, 31 insertions, 32 deletions
diff --git a/CST116F2021-Proj3/Project 3.cpp b/CST116F2021-Proj3/Project 3.cpp
index 790a2b0..f348ee0 100644
--- a/CST116F2021-Proj3/Project 3.cpp
+++ b/CST116F2021-Proj3/Project 3.cpp
@@ -5,51 +5,51 @@ 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 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 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;
+ int rowM1 = 0;
+ int columnM1 = 0;
+ int rowM2 = 0;
+ int columnM2 = 0;
+ int iM = 0;
+ int jM = 0;
Menu();
-
+
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;
+ 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;
+ 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);
+ 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";
@@ -60,5 +60,4 @@ int main()
cout << "\n\nYou have inputted the wrong number, please run the program again\n\n\n\n";
return 0;
}
-
}