diff --git a/__pycache__/die.cpython-311.pyc b/__pycache__/die.cpython-311.pyc new file mode 100644 index 0000000..a49112a Binary files /dev/null and b/__pycache__/die.cpython-311.pyc differ diff --git a/dice_stats.py b/dice_stats.py index 83a99cb..eec53ee 100644 --- a/dice_stats.py +++ b/dice_stats.py @@ -18,16 +18,54 @@ class FiveDice: if face != 1: return False return True + + def findn(self,nofakind): + """ dice.findn(n) determines whether there are at least n of a kind in the roll and returns true if so and returns false otherwise. """ + nmuch = {} # create an empty dictionary to associate each face rolled with its frequency + for die in dice.faces(): # go through each dice rolled + if die in nmuch: # check if the dictionary already has the face included, and if so increase its frequency by 1 + nmuch[die] += 1 + if nmuch[die]==nofakind: # each time the dictionary is updated, check if the desired frequency has been achieved, and if so return true + return True + else: + nmuch[die] = 1 # add the face to the dictionary with frequency 1 if it has not already been included + return False # if the desired frequency was never achieved, return false + + def is_three_of_a_kind(self): + """ I didn't read the assignment carefully... this should return the result of dice.findn(3) """ + return dice.findn(3) + + def is_four_of_a_kind(self): + """ same issue... returns the result of dice.findn(4) """ + return dice.findn(4) dice = FiveDice() successes = 0 trials = 1000000 + +print("THIS IS THE ORIGINAL SIMULATION:") for trial in tqdm(range(trials)): dice.roll() if dice.all_ones(): successes += 1 - print(successes/trials) - +print("\n") +print("THIS IS TO CHECK IF THERE ARE AT LEAST THREE OF A KIND:") +successes = 0 +for trial in tqdm(range(trials)): + dice.roll() +# if dice.findn(3): + if dice.is_three_of_a_kind(): + successes += 1 +print(successes/trials) +print("\n") +print("THIS IS TO CHECK IF THERE ARE AT LEAST FOUR OF A KIND:") +successes = 0 +for trial in tqdm(range(trials)): + dice.roll() +# if dice.findn(4): + if dice.is_four_of_a_kind(): + successes += 1 +print(successes/trials) diff --git a/poetry.lock b/poetry.lock index ab80980..14de7ad 100644 --- a/poetry.lock +++ b/poetry.lock @@ -2,13 +2,13 @@ [[package]] name = "click" -version = "8.1.6" +version = "8.1.7" description = "Composable command line interface toolkit" optional = false python-versions = ">=3.7" files = [ - {file = "click-8.1.6-py3-none-any.whl", hash = "sha256:fa244bb30b3b5ee2cae3da8f55c9e5e0c0e86093306301fb418eb9dc40fbded5"}, - {file = "click-8.1.6.tar.gz", hash = "sha256:48ee849951919527a045bfe3bf7baa8a959c423134e1a5b98c05c20ba75a1cbd"}, + {file = "click-8.1.7-py3-none-any.whl", hash = "sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28"}, + {file = "click-8.1.7.tar.gz", hash = "sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de"}, ] [package.dependencies]