Changes to come closer to spec

Author: Tyler Boyd

compile

@@ -0,0 +1 @@
+g++ source/* -o mark

include/student.h

@@ -8,7 +8,14 @@ using namespace std;
 class Student {
 public:
   vector<Mark> OAs;
-  Mark final_mark;
+  vector<Mark> Exams;
+  vector<Mark> Summatives;
+  Mark final_mark();
+  Mark final_mark(int units);
+  Mark term_mark(int units);
+  Mark term_mark();
+  Mark exam_mark();
+  Mark summative_mark();
   char* Type;
   char* a;
 };

mark

@@ -0,0 +1,25 @@
+
+
+last;first name;4;3;3;3-;4-;3+;79.1667
+last;first name;3;4+;4;4;4+;5;90.8333
+last;first name;2;4-;4-;4+;4+;3+;83.8333
+last;first name;4;4-;4;4+;4+;4+;91.6667
+last;first name;4+;4+;4;4+;4+;4-;92.5
+last;first name;4;2;3+;4-;4;4-;82.1667
+last;first name;4;4+;4+;4+;4+;5;95
+last;first name;4;4-;4+;4+;4+;4+;92.5
+last;first name;4;4+;4+;4+;4+;4+;94.1667
+last;first name;4-;4;4+;4+;4+;5;93.3333
+last;first name;4-;3+;4-;4;4+;4;87.1667
+last;first name;4;3;4-;4-;4;4;85.8333
+last;first name;4;3-;4;4;3+;3;82.5
+last;first name;R;4-;4-;4+;5;5;83.3333
+last;first name;5;4;4+;4+;4+;4+;95
+last;first name;3+;3;3+;4+;4+;4-;84.3333
+last;first name;2;4;4-;3+;3+;4;81
+last;first name;4+;4;4+;4+;4+;5;95
+last;first name;5;4+;5;5;4+;4+;97.5
+last;first name;5;3;4;4+;4+;5;92.5
+last;first name;4+;1-;3;1+;R;1-;61.1667
+last;first name;4+;4+;4+;4+;4+;5;95.8333
+last;first name;4+;3+;4+;4+;4+;5;93

output.csv

@@ -12,40 +12,10 @@ int main() {
   vector<vector<char*>*>* prows = csv->rows();
 
   int rows = prows->size();
-
-  rows = prows->size();
-  cout << "Rows: " << rows << endl;
-
-  if(rows == 0)
-  {
-    cout << "No rows found in CSV file...aborting" << endl;
-    return 1;
-  }
-
   int columns = prows->at(0)->size();
-  cout << "Columns: " << columns << endl;
 
-  if(columns == 0)
-  {
-    cout << "No columns found in CSV file...aborting" << endl;
-    return 2;
-  }
-
-  // PRINT ALL DATA IN MEMORY
-  // for(int row = 0; row < rows; row++)
-  // {
-  //   vector<char*>* columns = prows->at(row);
-  //   for(int column = 0; column < columns->size(); column++)
-  //   {
-  //     cout << columns->at(column);
-  //     if(column + 1 < columns->size())
-  //       cout << ";";
-  //   }
-  //   cout << endl;
-  // }
-
-  cout << "\n\nHeaders found:\n\n";
   vector<char*> *headers = csv->headers();
+
   for(int row = 0; row < prows->size(); row++)
   {
     Student *new_student = new Student;
@@ -60,22 +30,42 @@ int main() {
       {
         new_student->OAs.push_back(Mark(columns->at(col)));
       }
+      else if(strncmp(headers->at(col), "E", 1) == 0)
+      {
+        new_student->Exams.push_back(Mark(columns->at(col)));
+      }
+      else if(strncmp(headers->at(col), "S", 1) == 0)
+      {
+        new_student->Summatives.push_back(Mark(columns->at(col)));
+      }
     }
     students.push_back(new_student);
   }
 
   for(int i=0; i<students.size(); i++)
   {
     Student* student = students.at(i);
-    float sum = 0.0f;
+    // float sum = 0.0f;
     cout << "Student # " << i << endl;
     for(int ioa = 0; ioa < student->OAs.size(); ioa++)
     {
-      sum += student->OAs.at(ioa).to_int();
+      // sum += student->OAs.at(ioa).to_int();
       cout << "O.A: " << student->OAs.at(ioa).to_int() << endl;
     }
-    float average = sum / float(student->OAs.size());
-    cout << "Average mark: " << average << endl << endl << endl;
+    for(int ie = 0; ie < student->Exams.size(); ie++)
+    {
+      int exmark = student->Exams.at(ie).to_int();
+      if(exmark < 0)
+        cout << "Exam: Absent" << endl;
+      else
+        cout << "Exam: " << exmark << endl;
+    }
+    for(int is = 0; is < student->Summatives.size(); is++)
+    {
+      cout << "Summative: " << student->Summatives.at(is).to_int() << endl;
+    }
+    // float average = sum / float(student->OAs.size());
+    cout << "First 3 terms mark: " << student->term_mark(3).to_int() << endl << endl << endl;
   }
 
   ofstream outfile("output.csv");

source/main.cpp

@@ -0,0 +1,98 @@
+#include "../include/student.h"
+
+Mark Student::final_mark()
+{
+  float term_mark = this->term_mark().to_int();
+  float exam_mark = this->exam_mark().to_int();
+  float summative_mark = this->summative_mark().to_int();
+
+  float final = term_mark * 0.7f + exam_mark * 0.2f + summative_mark * 0.1f;
+  return Mark(int(final + 0.5f));
+}
+
+Mark Student::final_mark(int units)
+{
+
+}
+
+Mark Student::term_mark()
+{
+  int n_oas = OAs.size();
+  float term_mark = 0.0f;
+  if(n_oas > 0)
+  {
+    for(int i=0; i < n_oas; i++)
+    {
+      term_mark += float(OAs.at(i).to_int());
+    }
+    term_mark /= n_oas;
+  }
+  return Mark(int(term_mark + 0.5f));
+}
+
+Mark Student::term_mark(int units)
+{
+  int max_oas = OAs.size();
+  float term_mark = 0.0f;
+  for(int i=0; i<units && i<max_oas; i++)
+  {
+    term_mark += float(OAs.at(i).to_int());
+  }
+  if(units > max_oas)
+  {
+    if(max_oas > 0)
+      return Mark(int(term_mark/float(max_oas) + 0.5f));
+    else
+      return Mark(0);
+  }
+  if(units > 0)
+    return Mark(int(term_mark/float(units) + 0.5f));
+  else
+    return Mark(0);
+}
+
+Mark Student::exam_mark()
+{
+  float exam_mark = 0.0f;
+  int n_exams = Exams.size();
+  if(n_exams > 0)
+  {
+    int exams_present = 0;
+    for(int i=0; i < n_exams; i++)
+    {
+      if(Exams.at(i).to_int() >= 0)
+      {
+        exam_mark += float(Exams.at(i).to_int());
+        exams_present++;
+      }
+    }
+    if(exams_present > 0)
+      exam_mark /= float(exams_present);
+    else
+      exam_mark = 0;
+  }
+  return Mark(int(exam_mark + 0.5f));
+}
+
+Mark Student::summative_mark()
+{
+  float summative_mark = 0.0f;
+  int n_summatives = Summatives.size();
+  if(n_summatives > 0)
+  {
+    int summatives_present = 0;
+    for(int i=0; i < n_summatives; i++)
+    {
+      if(Summatives.at(i).to_int() >= 0)
+      {
+        summative_mark += float(Summatives.at(i).to_int());
+        summatives_present++;
+      }
+    }
+    if(summatives_present > 0)
+      summative_mark /= float(summatives_present);
+    else
+      summative_mark = 0;
+  }
+  return Mark(int(summative_mark + 0.5f));
+}