260

1 files changed, 33 insertions, 15 deletions

diff --git a/CST116F2021-Lab5/CST116F2021-Lab5.cpp b/CST116F2021-Lab5/CST116F2021-Lab5.cpp
index d305c1e..7446117 100644
--- a/CST116F2021-Lab5/CST116F2021-Lab5.cpp
+++ b/CST116F2021-Lab5/CST116F2021-Lab5.cpp
@@ -3,6 +3,23 @@
 
 
 #include "Header1.h"
+
+int main()
+{
+	char firstName[FIRST_NAME]{};
+	char lastName[LAST_NAME]{};
+	char fullName[FULL_NAME]{};
+
+	GetFirst(firstName);
+	GetLast(lastName);
+	DispName(firstName, lastName, fullName)
+}
+
+
+
+
+
+
 //#include <iostream>
 //
 //using namespace std;
@@ -16,21 +33,22 @@
 //const int NUM_STUD = 5;
 //const int NUM_GRADE = 5;
 
-int main()
-{
-    float currStudent[NUM_SCORES]{ 0.0 };
-    char Grade[NUM_SCORES];
-    int numGrade[NUM_GRADE]{ 0 };
-    float avg = 0.0;
-
-    GetScores(currStudent);
-    CheckGrade(currStudent, Grade);
-    calcAvg(currStudent, avg);
-    CountScores(Grade, numGrade);
-
-
-    return 0;
-}
+//p.253
+//int main()
+//{
+//    float currStudent[NUM_SCORES]{ 0.0 };
+//    char Grade[NUM_SCORES];
+//    int numGrade[NUM_GRADE]{ 0 };
+//    float avg = 0.0;
+//
+//    GetScores(currStudent);
+//    CheckGrade(currStudent, Grade);
+//    calcAvg(currStudent, avg);
+//    CountScores(Grade, numGrade);
+//
+//
+//    return 0;
+//}
 
 //void GetScores(float score_input[])
 //{