From 1f64206075f187e4ac6960f02cff6317056f77ef Mon Sep 17 00:00:00 2001 From: kbuffardi Date: Sat, 25 Feb 2023 20:03:22 -0800 Subject: [PATCH 1/2] Add get_percentages function, resolves #106 --- GameDie.cpp | 18 ++++++++++++++++++ GameDie.h | 1 + 2 files changed, 19 insertions(+) diff --git a/GameDie.cpp b/GameDie.cpp index bb9cda8..e2e4b49 100644 --- a/GameDie.cpp +++ b/GameDie.cpp @@ -44,3 +44,21 @@ int GameDie::roll() vector GameDie::get_distribution(){ return roll_counter; } + +vector GameDie::get_percentages(){ + int total =0; + for( int i=0; i < counter.size(); i++){ + total += counter[i]; + } + vector percentages( counter.size() ); + + if( total == 0 ){ + return percentages; + } + else{ + for(int i=0; i < counter.size(); i++ ){ + percentages[i] = counter[i]*1.0 / total; + } + } + return percentages; +} diff --git a/GameDie.h b/GameDie.h index 54d69ba..e5bec0b 100644 --- a/GameDie.h +++ b/GameDie.h @@ -11,6 +11,7 @@ class GameDie GameDie(unsigned int); int roll(); vector get_distribution(); + vector get_percentages(); private: vector counter; From f2e38a7d7001c1a1ee86010712f87ecf27bd1e8f Mon Sep 17 00:00:00 2001 From: kbuffardi Date: Sat, 25 Feb 2023 20:07:58 -0800 Subject: [PATCH 2/2] Merged with with roll_counter refactoring --- GameDie.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/GameDie.cpp b/GameDie.cpp index 5f59b76..98b0922 100644 --- a/GameDie.cpp +++ b/GameDie.cpp @@ -47,18 +47,18 @@ vector GameDie::get_distribution(){ vector GameDie::get_percentages(){ int total =0; - for( int i=0; i < counter.size(); i++){ - total += counter[i]; + for( int i=0; i < roll_counter.size(); i++){ + total += roll_counter[i]; } - vector percentages( counter.size() ); + vector percentages( roll_counter.size() ); if( total == 0 ){ return percentages; } else{ - for(int i=0; i < counter.size(); i++ ){ - percentages[i] = counter[i]*1.0 / total; + for(int i=0; i < roll_counter.size(); i++ ){ + percentages[i] = roll_counter[i]*1.0 / total; } } - return percentages; + return percentages; }