Dockerfile

@@ -1,17 +1,11 @@
-FROM gcc:latest AS build
+FROM gcc:latest
-
-WORKDIR /app
-
-COPY include/* /app/include/
-COPY src/* /app/src/
 
 RUN g++ src/*.cpp -o Bowling
 
-FROM debian:sid-slim
-
 WORKDIR /app
 
-COPY --from=build /app/Bowling Bowling
 COPY rolls.txt /app/
 
+#RUN g++ src/*.cpp -o Bowling
+
 CMD ["./Bowling", "rolls.txt"]

include/FileHelper.h

@@ -0,0 +1,13 @@
+#ifndef FILEHELPER_H
+#define FILEHELPER_H
+
+class FileHelper {
+    public:
+        FileHelper() = default;
+        
+        ~FileHelper() = default;
+        
+        static bool fileExists(char *path);
+};
+
+#endif

include/FileReader.h

@@ -0,0 +1,18 @@
+#ifndef FILEREADER_H
+#define FILEREADER_H
+
+#include <string>
+#include <vector>
+
+using namespace std;
+
+class FileReader {
+    public:
+        FileReader() = default;
+        
+        ~FileReader() = default;
+        
+        static string getFile(char *path);
+};
+
+#endif

include/FileUtil.h

@@ -1,16 +1,16 @@
-#ifndef FILEUTILS_H
+#ifndef FILEUTIL_H
-#define FILEUTILS_H
+#define FILEUTIL_H
 
 #include <string>
 #include <vector>
 
 using namespace std;
 
-class FileUtils {
+class FileUtil {
     public:
-        FileUtils() = default;
+        FileUtil() = default;
         
-        ~FileUtils() = default;
+        ~FileUtil() = default;
         
         static string getFile(char *path);
         static bool fileExists(char *path);

include/NumberHelper.h

@@ -1,5 +1,5 @@
-#ifndef NUMBERUTILS_H
+#ifndef NUMBERHELPER_H
-#define NUMBERUTILS_H
+#define NUMBERHELPER_H
 
 #include <string>
 #include <vector>
@@ -7,15 +7,15 @@
 
 using namespace std;
 
-class NumberUtils {
+class NumberHelper {
     public:
-        NumberUtils() = default;
+        NumberHelper() = default;
         
-        ~NumberUtils() = default;
+        ~NumberHelper() = default;
         
-        static vector<int> getRolls(const string& csv);
+        static vector<int> getRolls(string csv);
-        static bool validateRolls(const vector<int>& rolls);
+        static bool validateRolls(vector<int> rolls);
-        static vector<Frame> createFrames(const vector<int>& rolls);
+        static vector<Frame> createFrames(vector<int> rolls);
     
     private:
         static Frame createStrikeFrame(int i);

include/PrintFrames.h

@@ -13,12 +13,9 @@ class PrintFrames {
         
         ~PrintFrames() = default;
         
-        
-        static void printResult(const vector<Frame>& frames);
-        
-    private:
         static void printHeader();
-        static string parseValue(const vector<Frame>& frames);
+        static void printValue(string values);
+        static string parseValue(vector<Frame> frames);
 };
 
 #endif

include/ScoreCalculator.h

@@ -13,7 +13,7 @@ class ScoreCalculator {
         
         ~ScoreCalculator() = default;
         
-        static int getScore(const vector<Frame>& frames);
+        static int getScore(vector<Frame> rolls);
 };
 
 #endif

src/FileHelper.cpp

@@ -0,0 +1,13 @@
+#include "../include/FileHelper.h"
+#include <sys/stat.h>
+
+bool FileHelper::fileExists(char *path){
+    struct stat s;
+    
+    // Check if file exists, and if it isn't a folder.
+    if (stat(path, &s) == 0 && !(s.st_mode & S_IFDIR)){
+        return true;
+    }
+    
+    return false;
+}

src/FileReader.cpp

@@ -0,0 +1,16 @@
+#include "../include/FileReader.h"
+#include <string>
+#include <fstream>
+
+string FileReader::getFile(char *path){
+    ifstream file(path);
+    
+    string line;
+    
+    // There is only one line in the file
+    getline(file, line);
+    
+    file.close();
+    
+    return line;
+}

src/FileUtil.cpp

@@ -1,9 +1,9 @@
-#include "../include/FileUtils.h"
+#include "../include/FileUtil.h"
 #include <string>
 #include <fstream>
 #include <sys/stat.h>
 
-bool FileUtils::fileExists(char *path){
+bool FileUtil::fileExists(char *path){
     struct stat s;
     
     // Check if file exists, and if it isn't a folder.
@@ -14,7 +14,7 @@ bool FileUtils::fileExists(char *path){
     return false;
 }
 
-string FileUtils::getFile(char *path){
+string FileUtil::getFile(char *path){
     ifstream file(path);
     
     string line;

src/NumberHelper.cpp

@@ -1,11 +1,11 @@
-#include "../include/NumberUtils.h"
+#include "../include/NumberHelper.h"
 #include <iostream>
 #include <string>
 #include <sstream>
 #include <vector>
 #include <cctype>
 
-vector<int> NumberUtils::getRolls(const string& csv){
+vector<int> NumberHelper::getRolls(string csv){
     vector<int> rolls;
     stringstream ss(csv);
     string number;
@@ -23,11 +23,11 @@ vector<int> NumberUtils::getRolls(const string& csv){
     return rolls;
 }
 
-bool NumberUtils::validateRolls(const vector<int>& rolls){
+bool NumberHelper::validateRolls(vector<int> rolls){
     int rollCount = rolls.size();
     
-    for (int i = 0; i < rollCount; ++i) {
+    for(int i = 0; i < rollCount; ++i) {
-        if (rolls[i] > 10 || rolls[i] < 0) {
+        if(rolls[i] > 10 || rolls[i] < 0) {
             cerr << "Number: " << rolls[i] << " is invalid.";
             return false;
         }
@@ -49,14 +49,16 @@ bool NumberUtils::validateRolls(const vector<int>& rolls){
     return true;
 }
 
-vector<Frame> NumberUtils::createFrames(const vector<int>& rolls){
+vector<Frame> NumberHelper::createFrames(vector<int> rolls){
     vector<Frame> frame;
         
     int roll = 0;
     
-    while (roll != rolls.size()) {
+    while (roll != rolls.size())
+    {
         // Strike
-        if (rolls[roll] == 10) {
+        if (rolls[roll] == 10)
+        {
             // If we're on our last frame, and roll a strike, we're given two bonus rolls.
             if (roll + 3 == rolls.size() && rolls[roll - 3] == 10) {
                 frame.push_back(createBonusFrame(rolls[roll], rolls[roll + 1], rolls[roll + 2]));
@@ -69,9 +71,11 @@ vector<Frame> NumberUtils::createFrames(const vector<int>& rolls){
         }
         
         // Spare
-        else if (rolls[roll] + rolls[roll + 1] == 10) {
+        else if (rolls[roll] + rolls[roll + 1] == 10)
+        {
             // If we're on our last frame, and roll a spare, we're given a bonus roll.
-            if (roll + 3 == rolls.size()) {
+            if (roll + 3 == rolls.size() && rolls[roll] + rolls[roll + 1] == 10)
+            {
                 frame.push_back(createBonusFrame(rolls[roll], rolls[roll + 1], rolls[roll + 2]));
                 break;
             }
@@ -82,7 +86,8 @@ vector<Frame> NumberUtils::createFrames(const vector<int>& rolls){
         }
         
         // Open Frame
-        else {
+        else
+        {
             frame.push_back(createFreeFrame(rolls[roll], rolls[roll + 1]));
             
             roll += 2;
@@ -92,7 +97,7 @@ vector<Frame> NumberUtils::createFrames(const vector<int>& rolls){
     return frame;
 }
 
-Frame NumberUtils::createStrikeFrame(int i){
+Frame NumberHelper::createStrikeFrame(int i){
     struct Frame frame = Frame();
     
     vector<int> rolls;
@@ -104,7 +109,7 @@ Frame NumberUtils::createStrikeFrame(int i){
     return frame;
 }
 
-Frame NumberUtils::createFreeFrame(int i, int j){
+Frame NumberHelper::createFreeFrame(int i, int j){
     struct Frame frame = Frame();
     
     vector<int> rolls;
@@ -117,7 +122,7 @@ Frame NumberUtils::createFreeFrame(int i, int j){
     return frame;
 }
 
-Frame NumberUtils::createBonusFrame(int i, int j, int k){
+Frame NumberHelper::createBonusFrame(int i, int j, int k){
     struct Frame frame = Frame();
     
     vector<int> rolls;
@@ -131,7 +136,7 @@ Frame NumberUtils::createBonusFrame(int i, int j, int k){
     return frame;
 }
 
-bool NumberUtils::isNumber(const std::string& str){
+bool NumberHelper::isNumber(const std::string& str){
     for (size_t i = 0; i < str.size(); ++i) {
         if (!isdigit(str[i]) && !isspace(str[i])) return false;
     }

src/PrintFrames.cpp

@@ -2,16 +2,15 @@
 #include <iostream>
 #include <sstream>
 
-void PrintFrames::printResult(const vector<Frame>& frames) {
-    printHeader();
-    cout << parseValue(frames);
-}
-
 void PrintFrames::printHeader() {
     cout << "| f1 | f2 | f3 | f4 | f5 | f6 | f7 | f8 | f9 | f10   |" << endl;
 }
 
-string PrintFrames::parseValue(const vector<Frame>& frames) {
+void PrintFrames::printValue(string value) {
+    cout << value;
+}
+
+string PrintFrames::parseValue(vector<Frame> frames) {
     stringstream ss;
     
     // There can only be 10 frames.
@@ -31,12 +30,14 @@ string PrintFrames::parseValue(const vector<Frame>& frames) {
                 else if (frames[i].Roll[1] == 10 && frames[i].Roll[2] != 10) {
                     ss << "X, " << frames[i].Roll[2] << "  ";
                 }
+                
                 else if (frames[i].Roll[1] == 10 && frames[i].Roll[2] == 0) {
                     ss << frames[i].Roll[1] << ", -  ";
                 }
                 else if (frames[i].Roll[1] == 0 && frames[i].Roll[2] == 10) {
                     ss << "-, " << frames[i].Roll[2] << "  ";
                 }
+                
                 else if (frames[i].Roll[1] != 10 && frames[i].Roll[2] == 0) {
                     ss << frames[i].Roll[1] << ", -  ";
                 }
@@ -58,12 +59,15 @@ string PrintFrames::parseValue(const vector<Frame>& frames) {
                     if (frames[i + 1].Roll[0] + frames[i + 1].Roll[1] == 10) {
                         ss << "X, " << frames[i + 1].Roll[0] << ", /";
                     }
+                    
                     else if (frames[i + 1].Roll[0] == 0 && frames[i + 1].Roll[1] != 0) {
                         ss << "X, " << "-, " << frames[i + 1].Roll[1];
                     }
                     else if (frames[i + 1].Roll[0] != 0 && frames[i + 1].Roll[1] == 0) {
                         ss << "X, " << frames[i + 1].Roll[0] << ", -";
-                    } else {
+                    }
+                    
+                    else {
                         ss << "X,  ";
                     }
                 }
@@ -97,9 +101,8 @@ string PrintFrames::parseValue(const vector<Frame>& frames) {
                 else if (frames[i].Roll[0] == 0 && frames[i].Roll[1] == 10 && frames[i].Roll[2] == 10) {
                     ss << "-, /, X";
                 } else {
-                    ss << frames[i].Roll[0] << ", /, " << frames[i].Roll[2];
+                    ss << frames[i].Roll[0] << ", /   ";
                 }
-                
                 continue;
             }
             
@@ -117,9 +120,12 @@ string PrintFrames::parseValue(const vector<Frame>& frames) {
             else if (frames[i].Roll[0] == 0 && frames[i].Roll[1] != 0) {
                 ss << "-, " << frames[i].Roll[1];
             }
+            
             else if (frames[i].Roll[0] != 0 && frames[i].Roll[1] == 0) {
                 ss << frames[i].Roll[0] << ", -";
-            } else {
+            }
+            
+            else {
                 ss << frames[i].Roll[0] << ", " << frames[i].Roll[1];
             }
         }

src/ScoreCalculator.cpp

@@ -1,7 +1,7 @@
 #include "../include/ScoreCalculator.h"
 #include "../include/Frame.h"
 
-int ScoreCalculator::getScore(const vector<Frame>& frames) {
+int ScoreCalculator::getScore(vector<Frame> frames) {
     int score = 0;
     
     // There can only be 10 frames.

src/main.cpp

@@ -1,7 +1,7 @@
 #include <iostream>
 #include <string>
-#include "../include/FileUtils.h"
+#include "../include/FileUtil.h"
-#include "../include/NumberUtils.h"
+#include "../include/NumberHelper.h"
 #include "../include/ScoreCalculator.h"
 #include "../include/PrintFrames.h"
 
@@ -13,21 +13,24 @@ int main(int argc, char *argv[]) {
         return 0;
     }
     
-    if (!FileUtils::fileExists(argv[1])) {
+    if (!FileUtil::fileExists(argv[1])) {
         cerr << "Filepath: " << argv[1] << " doesn't exist.";
         return 0;
     }
     
-    string file = FileUtils::getFile(argv[1]);
+    string file = FileUtil::getFile(argv[1]);
-    vector<int> rolls = NumberUtils::getRolls(file);
+    vector<int> rolls = NumberHelper::getRolls(file);
     
-    if (!NumberUtils::validateRolls(rolls)) {
+    if (!NumberHelper::validateRolls(rolls)) {
         return 0;
     }
     
-    vector<Frame> frames = NumberUtils::createFrames(rolls);
+    vector<Frame> frames = NumberHelper::createFrames(rolls);
     
-    PrintFrames::printResult(frames);
+    string values = PrintFrames::parseValue(frames);
+    
+    PrintFrames::printHeader();
+    PrintFrames::printValue(values);
     
     int score = ScoreCalculator::getScore(frames);
     cout << "Score: " << score << endl;