Late night update!

data/19120338.csv

@@ -23,9 +23,16 @@ MTH00040,3,7.5
 BAA00103,2,8
 CSC10008,4,8.5
 ,,
-BAA00003,2,0
-CSC10003,4,0
-CSC10006,4,0
-CSC10009,2,0
-MTH00030,3,0
-MTH00050,4,0
+BAA00003,2,7
+CSC10003,4,10
+CSC10006,4,7
+CSC10009,2,8.5
+MTH00030,3,6.5
+MTH00050,4,8
+,,
+CSC10007,4,0
+CSC14003,4,0
+CSC14007,4,0
+CSC15005,4,0
+CSC15006,4,0
+MTH00035,4,0

src/OutputHelper.cpp

@@ -130,7 +130,7 @@ void OutputHelper::printTable(
    * If no data, don't print!
    *
    */
-  if (tableData.size() == 0) {
+  if (tableData.size() <= 1) {
     return;
   }
 
@@ -140,7 +140,7 @@ void OutputHelper::printTable(
    *
    */
   if (_outputType & OutputConstants::FORMAT_TABLE) {
-    printTableFormat(tableData, true);
+    printTableFormat(tableData);
   }
 
   /**
@@ -152,51 +152,13 @@ void OutputHelper::printTable(
   }
 }
 
-/**
- * Print table, with conclusion
- *
- * @param  const std::vector<std::vector<std::string>>&
- * @param  bool
- */
-void OutputHelper::printTable(
-    const std::vector<std::vector<std::string>>& tableData,
-    bool conclusionIgnored) {
-  /**
-   * If no data, don't print!
-   *
-   */
-  if (tableData.size() == 0) {
-    return;
-  }
-
-  /**
-   * Output in table format
-   * (without last conclusion row)
-   *
-   */
-  if (_outputType & OutputConstants::FORMAT_TABLE) {
-    printTableFormat(tableData, false);
-  }
-
-
-  /**
-   * Output in CSV format
-   *
-   */
-  if (_outputType & OutputConstants::FORMAT_CSV) {
-    printTableCSV(tableData);
-  }
-}
-
 /**
  * Print a table, with format.
  *
  * @param  const std::vector<std::vector<std::string>>&
- * @param  bool
  */
 void OutputHelper::printTableFormat(
-    const std::vector<std::vector<std::string>>& tableData,
-    bool hasConclusion) {
+    const std::vector<std::vector<std::string>>& tableData) {
   // Print table line (separator).
   printSeparator();
 
@@ -211,10 +173,8 @@ void OutputHelper::printTableFormat(
     printTableRow(tableData[i]);
   }
 
-  // Print conclusion row.
-  if (hasConclusion) {
-    printSeparator();
-  }
+  // Print conclusion separating line.
+  printSeparator();
 
   // Print last row.
   printTableRow(tableData[tableData.size() - 1]);

src/OutputHelper.h

@@ -71,9 +71,8 @@ class OutputHelper {
    * Print table in format.
    *
    * @param  const std::vector<std::vector<std::string>>&
-   * @param  bool (default = true: has conclusion)
    */
-  void printTableFormat(const std::vector<std::vector<std::string>>&, bool);
+  void printTableFormat(const std::vector<std::vector<std::string>>&);
 
 public:
   ~OutputHelper();
@@ -112,13 +111,5 @@ class OutputHelper {
    * @param  const std::vector<std::vector<std::string>>>&
    */
   void printTable(const std::vector<std::vector<std::string>>&);
-
-  /**
-   * Print the full table.
-   *
-   * @param  const std::vector<std::vector<std::string>>>&
-   * @param  bool (default = conclusion ignored)
-   */
-  void printTable(const std::vector<std::vector<std::string>>&, bool);
 };
 #endif

src/PersonalGPA.cpp

@@ -35,12 +35,21 @@ PersonalGPA::PersonalGPA(
 }
 
 /**
- * Return total credits
+ * Return total passed credits
  *
  * @return int
  */
-int PersonalGPA::sumCredits() {
-  return _sumCredits;
+int PersonalGPA::passedCredits() {
+  return _passedCredits;
+}
+
+/**
+ * Return total failed credits
+ *
+ * @return int
+ */
+int PersonalGPA::failedCredits() {
+  return _failedCredits;
 }
 
 /**
@@ -62,22 +71,39 @@ Grade PersonalGPA::resultGPA() {
 }
 
 /**
- * Convert class to string vector.
+ * Convert passed list to string vector.
  *
  * @return std::vector<std::string>
  */
-std::vector<std::string> PersonalGPA::toStringVector() {
+std::vector<std::string> PersonalGPA::passedListToStringVector() {
   std::vector<std::string> stringVector;
 
   stringVector.push_back("Overall");
-  stringVector.push_back(std::to_string(_sumCredits));
+  stringVector.push_back(std::to_string(_passedCredits));
   stringVector.push_back(_resultGPA.toString());
   stringVector.push_back(_resultGPA.to4Scale().toString());
   stringVector.push_back(_resultGPA.toAScale());
 
   return stringVector;
 }
 
+/**
+ * Convert failed list to string vector
+ *
+ * @return std::vector<std::string>
+ */
+std::vector<std::string> PersonalGPA::failedListToStringVector() {
+  std::vector<std::string> stringVector;
+
+  stringVector.push_back("Overall");
+  stringVector.push_back(std::to_string(_failedCredits));
+  stringVector.push_back("None");
+  stringVector.push_back("None");
+  stringVector.push_back("None");
+
+  return stringVector;
+}
+
 /**
  * Convert to vector of string vectors.
  *
@@ -91,7 +117,7 @@ std::vector<std::vector<std::string>> PersonalGPA::toPassedVector() {
   }
 
   // Push overall.
-  resultVector.push_back(toStringVector());
+  resultVector.push_back(passedListToStringVector());
 
   return resultVector;
 }
@@ -108,6 +134,8 @@ std::vector<std::vector<std::string>> PersonalGPA::toFailedVector() {
     resultVector.push_back(subject.toStringVector());
   }
 
+  resultVector.push_back(failedListToStringVector());
+
   return resultVector;
 }
 
@@ -170,15 +198,15 @@ void PersonalGPA::addSubject(const Subject& subject) {
   // If not passed, then insert into failed list.
   if (!subject.passed()) {
     _classesFailed.insert(subject);
+    _failedCredits += subject.credit();
     return;
   }
 
   // Calculate new GPA.
-  _sumCredits += subject.credit();
+  _passedCredits += subject.credit();
   _sumGrades += subject.grade() * subject.credit();
-  _resultGPA = _sumGrades / (1.0 * _sumCredits);
+  _resultGPA = _sumGrades / (1.0 * _passedCredits);
 
   // Insert to passed list.
   _classesPassed.insert(subject);
 }
-

src/PersonalGPA.h

@@ -24,17 +24,26 @@
 class PersonalGPA {
 protected:
   // Stores personal grades & credits.
-  int   _sumCredits = 0;
-  Grade _sumGrades  = 0.0;
-  Grade _resultGPA  = 0.0;
+  int   _passedCredits = 0;
+  int   _failedCredits = 0;
+  Grade _sumGrades = 0.0;
+  Grade _resultGPA = 0.0;
 
   // Stores classes passed / failed.
   std::multiset<Subject> _classesPassed;
   std::multiset<Subject> _classesFailed;
 
 public:
+  /**
+   * Constructor for PersonalGPA
+   *
+   */
   PersonalGPA();
 
+  /**
+   * Destructor for PersonalGPA
+   *
+   */
   ~PersonalGPA();
 
   /**
@@ -45,11 +54,18 @@ class PersonalGPA {
   PersonalGPA(const std::vector<Subject>&);
 
   /**
-   * Return total credits
+   * Return total passed credits
+   *
+   * @return int
+   */
+  int passedCredits();
+
+  /**
+   * Return total failed credits
    *
    * @return int
    */
-  int sumCredits();
+  int failedCredits();
 
   /**
    * Return sum grades.
@@ -66,11 +82,18 @@ class PersonalGPA {
   Grade resultGPA();
 
   /**
-   * Convert class to string vector.
+   * Convert passed list to string vector.
    *
    * @return std::vector<std::string>
    */
-  std::vector<std::string> toStringVector();
+  std::vector<std::string> passedListToStringVector();
+
+  /**
+   * Convert failed list to string vector.
+   *
+   * @return std::vector<std::string>>
+   */
+  std::vector<std::string> failedListToStringVector();
 
   /**
    * Convert to vector of string vectors.
@@ -86,6 +109,13 @@ class PersonalGPA {
    */
   std::vector<std::vector<std::string>> toFailedVector();
 
+  /**
+   * Return total credits
+   *
+   * @return int
+   */
+  int getTotalPassedCredits();
+
   /**
    * Return total classes.
    *

src/main.cpp

@@ -90,10 +90,7 @@ int main(int argc, char* argv[]) {
 
     // Print failed table.
     OutputHelper::instance()
-      ->printTable(
-        chumeochuixoong->toFailedVector(),
-        false
-      );
+      ->printTable(chumeochuixoong->toFailedVector());
   }
 
   // And catch exceptions

tests/output/0.out

@@ -44,3 +44,5 @@ Total failed classes: 6 (21.43%)
 |   BAA00003 |       2 |               0.00 |              0.00 |                 F |
 |   CSC10009 |       2 |               0.00 |              0.00 |                 F |
 +------------+---------+--------------------+-------------------+-------------------+
+|    Overall |      19 |               None |              None |              None |
++------------+---------+--------------------+-------------------+-------------------+

tests/output/1.out

@@ -44,3 +44,5 @@ Total failed classes: 6 (21.43%)
 |   BAA00003 |       2 |               0.00 |              0.00 |                 F |
 |   CSC10009 |       2 |               0.00 |              0.00 |                 F |
 +------------+---------+--------------------+-------------------+-------------------+
+|    Overall |      19 |               None |              None |              None |
++------------+---------+--------------------+-------------------+-------------------+

tests/output/2.out

@@ -24,3 +24,5 @@ Total failed classes: 3 (37.50%)
 |   CSC10006 |       4 |               0.00 |              0.00 |                 F |
 |   CSC10009 |       2 |               0.00 |              0.00 |                 F |
 +------------+---------+--------------------+-------------------+-------------------+
+|    Overall |      10 |               None |              None |              None |
++------------+---------+--------------------+-------------------+-------------------+

tests/output/3.out

@@ -41,3 +41,5 @@ Total failed classes: 3 (12.00%)
 |   MTH00030 |       3 |               0.00 |              0.00 |                 F |
 |   BAA00003 |       2 |               0.00 |              0.00 |                 F |
 +------------+---------+--------------------+-------------------+-------------------+
+|    Overall |       9 |               None |              None |              None |
++------------+---------+--------------------+-------------------+-------------------+

tests/output/4.out

@@ -35,3 +35,4 @@ MTH00050,4,0.00,0.00,F
 MTH00030,3,0.00,0.00,F
 BAA00003,2,0.00,0.00,F
 CSC10009,2,0.00,0.00,F
+Overall,19,None,None,None

tests/output/5.out

@@ -35,3 +35,4 @@ MTH00050,4,0.00,0.00,F
 MTH00030,3,0.00,0.00,F
 BAA00003,2,0.00,0.00,F
 CSC10009,2,0.00,0.00,F
+Overall,19,None,None,None

tests/output/6.out

@@ -15,3 +15,4 @@ class code,credits,grade (10 - scale),grade (4 - scale),grade (A - scale)
 CSC10003,4,0.00,0.00,F
 CSC10006,4,0.00,0.00,F
 CSC10009,2,0.00,0.00,F
+Overall,10,None,None,None

tests/output/7.out

@@ -32,3 +32,4 @@ class code,credits,grade (10 - scale),grade (4 - scale),grade (A - scale)
 MTH00050,4,0.00,0.00,F
 MTH00030,3,0.00,0.00,F
 BAA00003,2,0.00,0.00,F
+Overall,9,None,None,None