-
Notifications
You must be signed in to change notification settings - Fork 21
Initial cut #15
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
mlustig-cmm
wants to merge
6
commits into
paircolumbus:master
Choose a base branch
from
mlustig-cmm:mlustig_working
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Initial cut #15
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
f4d8437
Complete basic challenge.
mlustig-cmm e9c972a
Complete Bonus
mlustig-cmm 8ca684e
A little refactoring for the challenge
mlustig-cmm a20727b
Break people out of unnecessary hash
mlustig-cmm 6fae050
Factor out crime rate logic
mlustig-cmm 3e3b78e
Change to using accessor methods instead of direct references to inst…
mlustig-cmm File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| source 'https://rubygems.org' | ||
|
|
||
| gem 'rubocop', require: false | ||
| gem 'rspec' | ||
| gem 'rspec' |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| # This class represents the town of GemCity | ||
| # This is a town riddled with crime but we can find out how happy the town is | ||
| class GemCity | ||
| attr_reader :population | ||
| attr_accessor :thieves, :officers | ||
|
|
||
| def initialize | ||
| @thieves = 5 | ||
| @officers = 1 | ||
| @population = 50 | ||
| end | ||
|
|
||
| def happiness_of_town | ||
| # happiness is random... people don't know what they want! | ||
| happiness_vals = (1..@population).collect do | ||
| rand((100 - successful_crime_rate)..100) | ||
| end | ||
| happiness = happiness_vals.reduce(0, :+) | ||
| happiness / 100 | ||
| end | ||
|
|
||
| def no_crimes_can_occur? | ||
| @thieves <= 0 || @officers > @thieves | ||
| end | ||
|
|
||
| def crime_probability | ||
| (1 - @officers.to_f / @thieves.to_f) * 100 | ||
| end | ||
|
|
||
| def successful_crime_rate | ||
| no_crimes_can_occur? ? 0 : crime_probability | ||
| end | ||
|
|
||
| def percentage_of_population(group) | ||
| format('%.0f%', (group.to_f / @population.to_f) * 100.0) | ||
| end | ||
|
|
||
| def city_demographics | ||
| { thieves: percentage_of_population(@thieves), | ||
| officers: percentage_of_population(@officers), | ||
| civilians: percentage_of_population(@population - @thieves - @officers) } | ||
| end | ||
| end | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it is a little better to use the reader methods for instance variables even inside the class. In the off chance they get refactored into real methods someday, this line shouldn't need to change.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there a way to do that without angering rubocop?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What's it complaining about?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It was complaining about me not understanding the intent until just now. I think that I have it now.