Now iterating over a Frame object

include/Frame.h

@@ -0,0 +1,11 @@
+#ifndef FRAME_H
+#define FRAME_H
+
+#include <vector>
+using namespace std;
+
+struct Frame {
+    vector<int> Roll;
+};
+
+#endif

include/NumberHelper.h

@@ -3,6 +3,7 @@
 
 #include <string>
 #include <vector>
+#include "../include/Frame.h"
 
 using namespace std;
 
@@ -14,6 +15,12 @@ class NumberHelper {
         
         static vector<int> getRolls(string csv);
         static bool validateRolls(vector<int> rolls);
+        static vector<Frame> createFrames(vector<int> rolls);
+    
+    private:
+        static Frame CreateStrikeFrame(int i);
+        static Frame CreateFreeFrame(int i, int j);
+        static Frame CreateBonusFrame(int i, int j, int k);
 };
 
 

include/ScoreCalculator.h

@@ -3,6 +3,7 @@
 
 #include <string>
 #include <vector>
+#include "../include/Frame.h"
 
 using namespace std;
 
@@ -12,7 +13,7 @@ class ScoreCalculator {
         
         ~ScoreCalculator() = default;
         
-        static int getScore(vector<int> rolls);
+        static int getScore(vector<Frame> rolls);
 };
 
 #endif

rolls4.txt

@@ -0,0 +1 @@
+5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 10, 10, 10, 5, 5

src/NumberHelper.cpp

@@ -41,4 +41,91 @@ bool NumberHelper::validateRolls(vector<int> rolls){
     }
     
     return true;
+}
+
+vector<Frame> NumberHelper::createFrames(vector<int> rolls){
+    vector<Frame> frame;
+        
+    int roll = 0;
+    
+    while (roll != rolls.size())
+    {
+        // Strike
+        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]));
+                break;
+            }
+            
+            frame.push_back(CreateStrikeFrame(10));
+            
+            roll += 1;
+        }
+        
+        // Spare
+        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() && rolls[roll] + rolls[roll + 1] == 10)
+            {
+                frame.push_back(CreateBonusFrame(rolls[roll], rolls[roll + 1], rolls[roll + 2]));
+                break;
+            }
+            
+            frame.push_back(CreateFreeFrame(rolls[roll], rolls[roll + 1]));
+            
+            roll += 2;
+        }
+        
+        // Open Frame
+        else
+        {
+            frame.push_back(CreateFreeFrame(rolls[roll], rolls[roll + 1]));
+            
+            roll += 2;
+        }
+    }
+    
+    return frame;
+}
+
+Frame NumberHelper::CreateStrikeFrame(int i){
+    struct Frame frame = Frame();
+    
+    vector<int> rolls;
+    
+    rolls.push_back(i);
+    
+    frame.Roll = rolls;
+    
+    return frame;
+}
+
+Frame NumberHelper::CreateFreeFrame(int i, int j){
+    struct Frame frame = Frame();
+    
+    vector<int> rolls;
+    
+    rolls.push_back(i);
+    rolls.push_back(j);
+    
+    frame.Roll = rolls;
+    
+    return frame;
+}
+
+Frame NumberHelper::CreateBonusFrame(int i, int j, int k){
+    struct Frame frame = Frame();
+    
+    vector<int> rolls;
+    
+    rolls.push_back(i);
+    rolls.push_back(j);
+    rolls.push_back(k);
+    
+    frame.Roll = rolls;
+    
+    return frame;
 }

src/ScoreCalculator.cpp

@@ -1,45 +1,42 @@
 #include "../include/ScoreCalculator.h"
+#include "../include/Frame.h"
 
-int ScoreCalculator::getScore(vector<int> rolls) {
+int ScoreCalculator::getScore(vector<Frame> frames) {
     int score = 0;
-    int frame = 0;
     
-    while (true) {
+    // There can only be 10 frames.
+    for (int i = 0; i < 10; i++) {
         // Strike
-        if (rolls[frame] == 10) {
+        if (frames[i].Roll[0] == 10) {
-            // If we're on our last frame, and roll a strike, we're given two bonus rolls.
+            if (frames[i].Roll.size() == 3) {
-            if (frame + 3 == rolls.size() && rolls[frame - 3] == 10) {
+                score += frames[i].Roll[0] + frames[i].Roll[1] + frames[i].Roll[2];
-                score += 10 + rolls[frame + 1] + rolls[frame + 2];
+                continue;
-                break;
             }
             
-            score += 10 + rolls[frame + 1] + rolls[frame + 2];
+            // If the next frame has 3 or 2 rolls, then take those 2.
-            frame += 1;
+            if (frames[i + 1].Roll.size() > 1) {
+                score += frames[i].Roll[0] + frames[i + 1].Roll[0] + frames[i + 1].Roll[1];
+                continue;
+            }
+            
+            // [10] + [x] + [y]
+            score += frames[i].Roll[0] + frames[i + 1].Roll[0] + frames[i + 2].Roll[0];
+            continue;
         }
         
         // Spare
-        else if (rolls[frame] + rolls[frame + 1] == 10) {
+        if (frames[i].Roll[0] + frames[i].Roll[1] == 10) {
-            // If we're on our last frame, and roll a spare, we're given a bonus roll.
+            if (frames[i].Roll.size() == 3) {
-            if (frame + 3 == rolls.size() && rolls[frame] + rolls[frame + 1] == 10)
+                score += frames[i].Roll[0] + frames[i].Roll[1] + frames[i].Roll[2];
-            {
+                continue;
-                score += 10 + rolls[frame + 1];
-                break;
             }
             
-            score += 10 + rolls[frame + 2];
+            score += 10 + frames[i + 1].Roll[0];
-            frame += 2;
+            continue;
         }
         
-        // Open Frame
+        // Open frame
-        else {
+        score += frames[i].Roll[0] + frames[i].Roll[1];
-            score += rolls[frame] + rolls[frame + 1];
-            frame += 2;
-        }
-        
-        // No more frames
-        if (frame == rolls.size()) {
-            break;
-        }
     }
     
     return score;

src/main.cpp

@@ -29,7 +29,9 @@ int main(int argc, char *argv[]) {
     PrintFrames::printHeader(rolls);
     PrintFrames::printValue(rolls);
     
-    int score = ScoreCalculator::getScore(rolls);
+    vector<Frame> frames = NumberHelper::createFrames(rolls);
+    
+    int score = ScoreCalculator::getScore(frames);
     cout << "Score: " << score << endl;
     
     return 0;