summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author[email protected] <[email protected]>2021-11-07 20:35:47 -0800
committer[email protected] <[email protected]>2021-11-07 20:35:47 -0800
commit4ff4f55d9d5b537024dd696649ae700fcb7815f7 (patch)
tree7b33998027b77d2260d395334d2c14b0e95504f7
parentFirst code update (diff)
downloadcst116proj2-1-jordan-ht-and-rayyan-a-project-2-4ff4f55d9d5b537024dd696649ae700fcb7815f7.tar.xz
cst116proj2-1-jordan-ht-and-rayyan-a-project-2-4ff4f55d9d5b537024dd696649ae700fcb7815f7.zip
Populated Functions
-rw-r--r--.vs/VSWorkspaceState.json2
-rw-r--r--.vs/cst116proj2-1-jordan-ht-and-rayyan-a-project-2-v1/v16/.suobin0 -> 35840 bytes
-rw-r--r--.vs/cst116proj2-1-jordan-ht-and-rayyan-a-project-2-v1/v16/Browse.VC.dbbin0 -> 16494592 bytes
-rw-r--r--.vs/cst116proj2-1-jordan-ht-and-rayyan-a-project-2-v1/v16/ipch/AutoPCH/a963cebc021816a6/FUNCTIONS_ANSARI.ipchbin0 -> 35782656 bytes
-rw-r--r--.vs/cst116proj2-1-jordan-ht-and-rayyan-a-project-2-v1/v16/ipch/AutoPCH/ecfb7059edb94b9d/FUNCTIONS_HARRIS-TOOVY.ipchbin0 -> 35782656 bytes
-rw-r--r--.vs/cst116proj2-1-jordan-ht-and-rayyan-a-project-2-v1/v16/ipch/AutoPCH/f2e2ac3097c728dd/CST116_PROJECT2_HARRIS-TOOVY_ANSARI.ipchbin0 -> 35782656 bytes
-rw-r--r--.vs/slnx.sqlitebin339968 -> 339968 bytes
-rw-r--r--CST116_Project2_Harris-Toovy_Ansari/CST116_Project2_Harris-Toovy_Ansari/CST116_Project2_Harris-Toovy_Ansari.cpp3
-rw-r--r--CST116_Project2_Harris-Toovy_Ansari/CST116_Project2_Harris-Toovy_Ansari/functions_Ansari.cpp69
-rw-r--r--CST116_Project2_Harris-Toovy_Ansari/CST116_Project2_Harris-Toovy_Ansari/primaryHeader.h12
10 files changed, 79 insertions, 7 deletions
diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
index 68ca867..ef0e850 100644
--- a/.vs/VSWorkspaceState.json
+++ b/.vs/VSWorkspaceState.json
@@ -4,6 +4,6 @@
"\\CST116_Project2_Harris-Toovy_Ansari",
"\\CST116_Project2_Harris-Toovy_Ansari\\CST116_Project2_Harris-Toovy_Ansari"
],
- "SelectedNode": "\\CST116_Project2_Harris-Toovy_Ansari\\CST116_Project2_Harris-Toovy_Ansari\\primaryHeader.h",
+ "SelectedNode": "\\CST116_Project2_Harris-Toovy_Ansari\\CST116_Project2_Harris-Toovy_Ansari\\CST116_Project2_Harris-Toovy_Ansari.cpp",
"PreviewInSolutionExplorer": false
} \ No newline at end of file
diff --git a/.vs/cst116proj2-1-jordan-ht-and-rayyan-a-project-2-v1/v16/.suo b/.vs/cst116proj2-1-jordan-ht-and-rayyan-a-project-2-v1/v16/.suo
new file mode 100644
index 0000000..e52efc9
--- /dev/null
+++ b/.vs/cst116proj2-1-jordan-ht-and-rayyan-a-project-2-v1/v16/.suo
Binary files differ
diff --git a/.vs/cst116proj2-1-jordan-ht-and-rayyan-a-project-2-v1/v16/Browse.VC.db b/.vs/cst116proj2-1-jordan-ht-and-rayyan-a-project-2-v1/v16/Browse.VC.db
new file mode 100644
index 0000000..a27e472
--- /dev/null
+++ b/.vs/cst116proj2-1-jordan-ht-and-rayyan-a-project-2-v1/v16/Browse.VC.db
Binary files differ
diff --git a/.vs/cst116proj2-1-jordan-ht-and-rayyan-a-project-2-v1/v16/ipch/AutoPCH/a963cebc021816a6/FUNCTIONS_ANSARI.ipch b/.vs/cst116proj2-1-jordan-ht-and-rayyan-a-project-2-v1/v16/ipch/AutoPCH/a963cebc021816a6/FUNCTIONS_ANSARI.ipch
new file mode 100644
index 0000000..3d5b8b6
--- /dev/null
+++ b/.vs/cst116proj2-1-jordan-ht-and-rayyan-a-project-2-v1/v16/ipch/AutoPCH/a963cebc021816a6/FUNCTIONS_ANSARI.ipch
Binary files differ
diff --git a/.vs/cst116proj2-1-jordan-ht-and-rayyan-a-project-2-v1/v16/ipch/AutoPCH/ecfb7059edb94b9d/FUNCTIONS_HARRIS-TOOVY.ipch b/.vs/cst116proj2-1-jordan-ht-and-rayyan-a-project-2-v1/v16/ipch/AutoPCH/ecfb7059edb94b9d/FUNCTIONS_HARRIS-TOOVY.ipch
new file mode 100644
index 0000000..1673b45
--- /dev/null
+++ b/.vs/cst116proj2-1-jordan-ht-and-rayyan-a-project-2-v1/v16/ipch/AutoPCH/ecfb7059edb94b9d/FUNCTIONS_HARRIS-TOOVY.ipch
Binary files differ
diff --git a/.vs/cst116proj2-1-jordan-ht-and-rayyan-a-project-2-v1/v16/ipch/AutoPCH/f2e2ac3097c728dd/CST116_PROJECT2_HARRIS-TOOVY_ANSARI.ipch b/.vs/cst116proj2-1-jordan-ht-and-rayyan-a-project-2-v1/v16/ipch/AutoPCH/f2e2ac3097c728dd/CST116_PROJECT2_HARRIS-TOOVY_ANSARI.ipch
new file mode 100644
index 0000000..284a9c9
--- /dev/null
+++ b/.vs/cst116proj2-1-jordan-ht-and-rayyan-a-project-2-v1/v16/ipch/AutoPCH/f2e2ac3097c728dd/CST116_PROJECT2_HARRIS-TOOVY_ANSARI.ipch
Binary files differ
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
index 61b3eef..786044a 100644
--- a/.vs/slnx.sqlite
+++ b/.vs/slnx.sqlite
Binary files differ
diff --git a/CST116_Project2_Harris-Toovy_Ansari/CST116_Project2_Harris-Toovy_Ansari/CST116_Project2_Harris-Toovy_Ansari.cpp b/CST116_Project2_Harris-Toovy_Ansari/CST116_Project2_Harris-Toovy_Ansari/CST116_Project2_Harris-Toovy_Ansari.cpp
index 97b3cd2..5f214d5 100644
--- a/CST116_Project2_Harris-Toovy_Ansari/CST116_Project2_Harris-Toovy_Ansari/CST116_Project2_Harris-Toovy_Ansari.cpp
+++ b/CST116_Project2_Harris-Toovy_Ansari/CST116_Project2_Harris-Toovy_Ansari/CST116_Project2_Harris-Toovy_Ansari.cpp
@@ -7,6 +7,9 @@ int main()
//FOR INITIAL TESTING. REMOVE AFTER USE
int a = 0, b = 0;
+ int menuOption;
+ int number;
+
a = ansariTest(2);
b = HTTest(3);
cout << " " << a << " " << b << endl;
diff --git a/CST116_Project2_Harris-Toovy_Ansari/CST116_Project2_Harris-Toovy_Ansari/functions_Ansari.cpp b/CST116_Project2_Harris-Toovy_Ansari/CST116_Project2_Harris-Toovy_Ansari/functions_Ansari.cpp
index ba23f8a..c439ece 100644
--- a/CST116_Project2_Harris-Toovy_Ansari/CST116_Project2_Harris-Toovy_Ansari/functions_Ansari.cpp
+++ b/CST116_Project2_Harris-Toovy_Ansari/CST116_Project2_Harris-Toovy_Ansari/functions_Ansari.cpp
@@ -8,5 +8,70 @@ int ansariTest(int in)
return in * 2;
}
-// ------ NOTE TO RAYYAN: Since I apparently can't count, I did 4 and 6 instead of 5 and 7. I will do 5 and 7 if you do 8 and 9.
-//I also have not yet test these functions, but I will do that very soon. \ No newline at end of file
+
+void DisplayMenu(int menuOption) {
+
+ cout << "Which of the following choices would you like to choose: " << endl;
+ cout << " Option 1:Check if the number is positive or negative. \n Option 2: Check if the number is Odd or Even.";
+ cout << "\n Option 3: Find the amount of digits that are in the number. \n Option 4: Find the the position a digit in the number is located at";
+ cout << "\n Option 5: Display the addition table. \n Option 6: Display the muultiplication table.\n";
+
+
+}
+
+void IsPosNeg(int number) {
+ if (number > 0) {
+
+ cout << "The number is positive. \n";
+
+ }
+
+ else if (number < 0) {
+
+ cout << "The number is negative. \n";
+
+ }
+ else {
+
+ cout << "The number is Zero. \n";
+
+ }
+
+
+}
+
+int FindNumDigits(int number) {
+
+ int numDigits = 0;
+ if (number == 0) {
+
+ return 0;
+
+ }
+
+ while (number != 0) {
+
+ number = (int)(number / 10);
+ numDigits++;
+
+ }
+
+ return numDigits;
+
+
+}
+
+void DisplayAdditionTable() {
+
+ for (int i = 0; i <= 12; i++) {
+
+ for (int x = 0; x <= 12; x++) {
+
+ cout << i << " + " << x << " = " << i + x << endl;
+
+ }
+
+ }
+
+
+} \ No newline at end of file
diff --git a/CST116_Project2_Harris-Toovy_Ansari/CST116_Project2_Harris-Toovy_Ansari/primaryHeader.h b/CST116_Project2_Harris-Toovy_Ansari/CST116_Project2_Harris-Toovy_Ansari/primaryHeader.h
index 00edefd..5ac2395 100644
--- a/CST116_Project2_Harris-Toovy_Ansari/CST116_Project2_Harris-Toovy_Ansari/primaryHeader.h
+++ b/CST116_Project2_Harris-Toovy_Ansari/CST116_Project2_Harris-Toovy_Ansari/primaryHeader.h
@@ -17,8 +17,12 @@ int GetData(void);
//Calls functions based on the menu selection number. Input format: menu number, user number.
void ProcessMenuChoice(int, int&);
-//Displays if the input is positive, negative, or zero.
-void IsPosNeg(int);
-//Returns the number of digits (powers of 10).
-int FindNumDigits(int); \ No newline at end of file
+//Displays Menu
+void DisplayMenu(int menuOption = 0);
+//Determined whether number is positive, ngeative, or zero.
+void IsPosNeg(int number);
+//Displays the number of digits in the input
+int FindNumDigits(int number);
+//Display the addition table
+void DisplayAdditionTable(); \ No newline at end of file