Second test commit

32 files changed, 47 insertions, 28 deletions

diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
index fef0a7b..a153bdb 100644
--- a/.vs/VSWorkspaceState.json
+++ b/.vs/VSWorkspaceState.json
@@ -1,7 +1,8 @@
 {
   "ExpandedNodes": [
-    ""
+    "",
+    "\\Project2_Ansari_Harris-Toovy"
   ],
-  "SelectedNode": "\\Project2_Ansari_Harris-Toovy",
+  "SelectedNode": "\\Project2_Ansari_Harris-Toovy\\Project2_Ansari_Harris-Toovy.vcxproj",
   "PreviewInSolutionExplorer": false
 }
\ No newline at end of file
diff --git a/.vs/cst116proj2-1-jordan-ht-and-rayyan-a-project-2/v16/.suo b/.vs/cst116proj2-1-jordan-ht-and-rayyan-a-project-2/v16/.suo
index 44a44d9..425dc3b 100644
--- a/.vs/cst116proj2-1-jordan-ht-and-rayyan-a-project-2/v16/.suo
+++ b/.vs/cst116proj2-1-jordan-ht-and-rayyan-a-project-2/v16/.suo
diff --git a/.vs/cst116proj2-1-jordan-ht-and-rayyan-a-project-2/v16/Browse.VC.db b/.vs/cst116proj2-1-jordan-ht-and-rayyan-a-project-2/v16/Browse.VC.db
index adb11c8..299f7a9 100644
--- a/.vs/cst116proj2-1-jordan-ht-and-rayyan-a-project-2/v16/Browse.VC.db
+++ b/.vs/cst116proj2-1-jordan-ht-and-rayyan-a-project-2/v16/Browse.VC.db
diff --git a/.vs/cst116proj2-1-jordan-ht-and-rayyan-a-project-2/v16/ipch/AutoPCH/6645ecbbd5b00a1a/PROJECT2_ANSARI_HARRIS-TOOVY.ipch b/.vs/cst116proj2-1-jordan-ht-and-rayyan-a-project-2/v16/ipch/AutoPCH/6645ecbbd5b00a1a/PROJECT2_ANSARI_HARRIS-TOOVY.ipch
new file mode 100644
index 0000000..f722979
--- /dev/null
+++ b/.vs/cst116proj2-1-jordan-ht-and-rayyan-a-project-2/v16/ipch/AutoPCH/6645ecbbd5b00a1a/PROJECT2_ANSARI_HARRIS-TOOVY.ipch
diff --git a/.vs/cst116proj2-1-jordan-ht-and-rayyan-a-project-2/v16/ipch/AutoPCH/7cf3f29a6db531d3/SCORES_FUNCTIONS.ipch b/.vs/cst116proj2-1-jordan-ht-and-rayyan-a-project-2/v16/ipch/AutoPCH/7cf3f29a6db531d3/SCORES_FUNCTIONS.ipch
new file mode 100644
index 0000000..bd80c6b
--- /dev/null
+++ b/.vs/cst116proj2-1-jordan-ht-and-rayyan-a-project-2/v16/ipch/AutoPCH/7cf3f29a6db531d3/SCORES_FUNCTIONS.ipch
diff --git a/.vs/cst116proj2-1-jordan-ht-and-rayyan-a-project-2/v16/ipch/AutoPCH/e25261fe46d4a866/PRIMARYHEADER.ipch b/.vs/cst116proj2-1-jordan-ht-and-rayyan-a-project-2/v16/ipch/AutoPCH/e25261fe46d4a866/PRIMARYHEADER.ipch
new file mode 100644
index 0000000..10d0e45
--- /dev/null
+++ b/.vs/cst116proj2-1-jordan-ht-and-rayyan-a-project-2/v16/ipch/AutoPCH/e25261fe46d4a866/PRIMARYHEADER.ipch
diff --git a/.vs/cst116proj2-1-jordan-ht-and-rayyan-a-project-2/v16/ipch/AutoPCH/fc4601bc8b53b2f9/SCORES_FUNCTIONS.ipch b/.vs/cst116proj2-1-jordan-ht-and-rayyan-a-project-2/v16/ipch/AutoPCH/fc4601bc8b53b2f9/SCORES_FUNCTIONS.ipch
new file mode 100644
index 0000000..9575b84
--- /dev/null
+++ b/.vs/cst116proj2-1-jordan-ht-and-rayyan-a-project-2/v16/ipch/AutoPCH/fc4601bc8b53b2f9/SCORES_FUNCTIONS.ipch
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
index 67d5a6c..431b452 100644
--- a/.vs/slnx.sqlite
+++ b/.vs/slnx.sqlite
diff --git a/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/CL.read.1.tlog b/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/CL.read.1.tlog
index aae3dc7..afc668a 100644
--- a/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/CL.read.1.tlog
+++ b/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/CL.read.1.tlog
diff --git a/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link-cvtres.read.1.tlog b/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link-cvtres.read.1.tlog
new file mode 100644
index 0000000..46b134b
--- /dev/null
+++ b/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link-cvtres.read.1.tlog
@@ -0,0 +1 @@
+��
\ No newline at end of file
diff --git a/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link-cvtres.write.1.tlog b/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link-cvtres.write.1.tlog
new file mode 100644
index 0000000..46b134b
--- /dev/null
+++ b/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link-cvtres.write.1.tlog
@@ -0,0 +1 @@
+��
\ No newline at end of file
diff --git a/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link-rc.read.1.tlog b/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link-rc.read.1.tlog
new file mode 100644
index 0000000..46b134b
--- /dev/null
+++ b/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link-rc.read.1.tlog
@@ -0,0 +1 @@
+��
\ No newline at end of file
diff --git a/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link-rc.write.1.tlog b/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link-rc.write.1.tlog
new file mode 100644
index 0000000..46b134b
--- /dev/null
+++ b/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link-rc.write.1.tlog
@@ -0,0 +1 @@
+��
\ No newline at end of file
diff --git a/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link.11700-cvtres.read.1.tlog b/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link.11700-cvtres.read.1.tlog
new file mode 100644
index 0000000..46b134b
--- /dev/null
+++ b/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link.11700-cvtres.read.1.tlog
@@ -0,0 +1 @@
+��
\ No newline at end of file
diff --git a/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link.11700-cvtres.write.1.tlog b/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link.11700-cvtres.write.1.tlog
new file mode 100644
index 0000000..46b134b
--- /dev/null
+++ b/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link.11700-cvtres.write.1.tlog
@@ -0,0 +1 @@
+��
\ No newline at end of file
diff --git a/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link.11700-rc.read.1.tlog b/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link.11700-rc.read.1.tlog
new file mode 100644
index 0000000..46b134b
--- /dev/null
+++ b/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link.11700-rc.read.1.tlog
@@ -0,0 +1 @@
+��
\ No newline at end of file
diff --git a/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link.11700-rc.write.1.tlog b/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link.11700-rc.write.1.tlog
new file mode 100644
index 0000000..46b134b
--- /dev/null
+++ b/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link.11700-rc.write.1.tlog
@@ -0,0 +1 @@
+��
\ No newline at end of file
diff --git a/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link.11700.read.1.tlog b/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link.11700.read.1.tlog
new file mode 100644
index 0000000..46b134b
--- /dev/null
+++ b/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link.11700.read.1.tlog
@@ -0,0 +1 @@
+��
\ No newline at end of file
diff --git a/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link.11700.write.1.tlog b/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link.11700.write.1.tlog
new file mode 100644
index 0000000..46b134b
--- /dev/null
+++ b/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link.11700.write.1.tlog
@@ -0,0 +1 @@
+��
\ No newline at end of file
diff --git a/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link.command.1.tlog b/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link.command.1.tlog
index 2894151..46b134b 100644
--- a/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link.command.1.tlog
+++ b/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link.command.1.tlog
diff --git a/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link.read.1.tlog b/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link.read.1.tlog
index 026ae21..46b134b 100644
--- a/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link.read.1.tlog
+++ b/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link.read.1.tlog
diff --git a/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link.write.1.tlog b/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link.write.1.tlog
index f9cd4c6..46b134b 100644
--- a/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link.write.1.tlog
+++ b/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/link.write.1.tlog
diff --git a/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/unsuccessfulbuild b/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/unsuccessfulbuild
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Project2_Ansari_Harris-Toovy/Debug/Project2.e3771722.tlog/unsuccessfulbuild
diff --git a/Project2_Ansari_Harris-Toovy/Debug/Project2_Ansari_Harris-Toovy.exe b/Project2_Ansari_Harris-Toovy/Debug/Project2_Ansari_Harris-Toovy.exe
deleted file mode 100644
index 3d990aa..0000000
--- a/Project2_Ansari_Harris-Toovy/Debug/Project2_Ansari_Harris-Toovy.exe
+++ /dev/null
diff --git a/Project2_Ansari_Harris-Toovy/Debug/Project2_Ansari_Harris-Toovy.ilk b/Project2_Ansari_Harris-Toovy/Debug/Project2_Ansari_Harris-Toovy.ilk
deleted file mode 100644
index 66b7f70..0000000
--- a/Project2_Ansari_Harris-Toovy/Debug/Project2_Ansari_Harris-Toovy.ilk
+++ /dev/null
diff --git a/Project2_Ansari_Harris-Toovy/Debug/Project2_Ansari_Harris-Toovy.obj b/Project2_Ansari_Harris-Toovy/Debug/Project2_Ansari_Harris-Toovy.obj
index 6cfbf64..3722965 100644
--- a/Project2_Ansari_Harris-Toovy/Debug/Project2_Ansari_Harris-Toovy.obj
+++ b/Project2_Ansari_Harris-Toovy/Debug/Project2_Ansari_Harris-Toovy.obj
diff --git a/Project2_Ansari_Harris-Toovy/Debug/Project2_Ansari_Harris-Toovy.pdb b/Project2_Ansari_Harris-Toovy/Debug/Project2_Ansari_Harris-Toovy.pdb
index d58d950..7b74704 100644
--- a/Project2_Ansari_Harris-Toovy/Debug/Project2_Ansari_Harris-Toovy.pdb
+++ b/Project2_Ansari_Harris-Toovy/Debug/Project2_Ansari_Harris-Toovy.pdb
diff --git a/Project2_Ansari_Harris-Toovy/Debug/vc142.idb b/Project2_Ansari_Harris-Toovy/Debug/vc142.idb
index b31e164..66f5cec 100644
--- a/Project2_Ansari_Harris-Toovy/Debug/vc142.idb
+++ b/Project2_Ansari_Harris-Toovy/Debug/vc142.idb
diff --git a/Project2_Ansari_Harris-Toovy/Debug/vc142.pdb b/Project2_Ansari_Harris-Toovy/Debug/vc142.pdb
index b2a4a2f..34fb2d5 100644
--- a/Project2_Ansari_Harris-Toovy/Debug/vc142.pdb
+++ b/Project2_Ansari_Harris-Toovy/Debug/vc142.pdb
diff --git a/Project2_Ansari_Harris-Toovy/Project2_Ansari_Harris-Toovy.cpp b/Project2_Ansari_Harris-Toovy/Project2_Ansari_Harris-Toovy.cpp
index 4cccb3d..5970793 100644
--- a/Project2_Ansari_Harris-Toovy/Project2_Ansari_Harris-Toovy.cpp
+++ b/Project2_Ansari_Harris-Toovy/Project2_Ansari_Harris-Toovy.cpp
@@ -1,20 +1,16 @@
-// Project2_Ansari_Harris-Toovy.cpp : This file contains the 'main' function. Program execution begins and ends there.
-//
+//Code by Jordan Harris-Toovy and Rayyan Ansari for OIT's CST116-01P project 2, November 2021
 
-#include <iostream>
+#include "primaryHeader.h"
 
-int main()
+//void ReadScores(float[]);
+
+int main(void)
 {
-    std::cout << "Hello World!\n";
-}
+    float test[NUM_SCORES]{ 0 };
 
-// Run program: Ctrl + F5 or Debug > Start Without Debugging menu
-// Debug program: F5 or Debug > Start Debugging menu
+    ReadScores(test);
 
-// 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
+    cout << test[2];
+
+    return (0);
+}
diff --git a/Project2_Ansari_Harris-Toovy/primaryHeader.h b/Project2_Ansari_Harris-Toovy/primaryHeader.h
new file mode 100644
index 0000000..8750089
--- /dev/null
+++ b/Project2_Ansari_Harris-Toovy/primaryHeader.h
@@ -0,0 +1,12 @@
+#pragma once
+//Code by Jordan Harris-Toovy and Rayyan Ansari for OIT's CST116-01P project 2, November 2021
+
+#include <iostream>
+#include <iomanip>
+
+#define NUM_SCORES 5
+
+using namespace std;
+
+//Function 1 - Get scores 
+void ReadScores(float[]);
\ No newline at end of file
diff --git a/scores_functions.cpp b/Project2_Ansari_Harris-Toovy/scores_functions.cpp
index a7bc875..dcab22e 100644
--- a/scores_functions.cpp
+++ b/Project2_Ansari_Harris-Toovy/scores_functions.cpp
@@ -1,11 +1,11 @@
-

-

-void ReadScores(float cStu[])

-{

-    for (int i = 0; i < NUM_SCORES; i++)

-    {

-        cout << "Enter score #" << i + 1 << " of " << NUM_SCORES << ": ";

-        cin >> cStu[i];

-    }

-}

-

+#include "primaryHeader.h"
+
+void ReadScores(float cStu[])
+{
+    for (int i = 0; i < NUM_SCORES; i++)
+    {
+        cout << "Enter score #" << i + 1 << " of " << NUM_SCORES << ": ";
+        cin >> cStu[i];
+    }
+}
+