Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions .github/workflows/super-linter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# This workflow executes several linters on changed files based on languages used in your code base whenever
# you push a code or open a pull request.
#
# You can adjust the behavior by modifying this file.
# For more information, see:
# https://github.com/github/super-linter
name: Lint Code Base

on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Docker build
run: |
docker build -t cpp-container .
docker run -i cpp-container cpplint *.cpp *.h
8 changes: 4 additions & 4 deletions GameDie.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ GameDie::GameDie() {
srand(time(NULL));
roll_counter.resize(FACES);

for (int i = 0; i < FACES; i++ )
roll_counter[i] = 0;
for (int i = 0; i < FACES; i++)
roll_counter[i] = 0;
}

// overloaded constructor
Expand All @@ -29,13 +29,13 @@ GameDie::GameDie(unsigned int num) {
// generate a random number between 1-n where n is the counter size
// (inclusive) and return it
int GameDie::roll() {
int roll = rand_r() % roll_counter.size();
int roll = rand_r(seed) % roll_counter.size();
roll_counter[roll]++;
return roll + 1;
}

// return the count of how many times each face has been rolled, as a vector
// where each face's count is at index face-1 (i.e. Face 1 is at index 0)
vector <int> GameDie::get_distribution() {
vector<int> GameDie::get_distribution() {
return roll_counter;
}
8 changes: 5 additions & 3 deletions GameDie.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,18 @@

using std::vector;

class GameDie{
class GameDie {
public:
GameDie();
explicit GameDie(unsigned int);
int roll();
vector <int> get_distribution();
vector<int> get_distribution();

private:
vector <int> roll_counter;
vector<int> roll_counter;
static const int FACES = 6;
unsigned int a = 6;
unsigned int *seed = &a;
};

#endif // GAMEDIE_H_
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,5 @@ To check for your program's adoption of the style guide, within the docker
container (see above), run **cpplint**:

`cpplint *.cpp *.h`

[![Lint Code Base](https://github.com/hamsaraj7106/Roller/actions/workflows/super-linter.yml/badge.svg)](https://github.com/hamsaraj7106/Roller/actions/workflows/super-linter.yml)
5 changes: 2 additions & 3 deletions main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,15 @@ using std::cout;
using std::endl;

int main(int argc, char *argv[]) {
if ( argc != 2 || std::atoi(argv[1]) < 1 ){
if ( argc != 2 || std::atoi(argv[1]) < 1 ) {
cout << "Incorrect command.\n"
<< "Format: ./Roller <n>\n"
<< "--------------------\n"
<< "Arguments\n"
<< "--------------------\n"
<< "<n> - Required; a number 1 or greater representing the number\n"
<< " of faces on the die being rolled\n";
}
else {
} else {
int faces = std::atoi(argv[1]);
GameDie die(faces);
cout << die.roll() << endl;
Expand Down