-
Notifications
You must be signed in to change notification settings - Fork 27
change my readme #34
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
mesbekmek
wants to merge
6
commits into
accesscode-2-2:master
Choose a base branch
from
mesbekmek:master
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
change my readme #34
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
41e67b2
change my readme
mesbekmek 2f7ae0d
changed main.m classes
mesbekmek a586d6d
Made Changes to all homework files
mesbekmek 63b30ad
Made additional changes
mesbekmek 3fc9759
Added voting simulator class
mesbekmek d0056fd
Added comments
mesbekmek 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 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
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 |
|---|---|---|
|
|
@@ -11,16 +11,18 @@ | |
| // forward declarations | ||
| @class Contender; | ||
| @class Election; | ||
| @class VotingSimulator; | ||
|
|
||
| // Contender class | ||
| @interface Contender : NSObject | ||
|
|
||
| - (instancetype)initWithName:(NSString *)name; | ||
|
|
||
| - (void)addVote; | ||
| - (NSInteger)votesReceived; | ||
| - (NSString *)name; | ||
|
|
||
|
|
||
| @end | ||
|
|
||
| @implementation Contender { | ||
|
|
@@ -87,9 +89,9 @@ - (instancetype)initWithElectionName:(NSString *)name { | |
| } | ||
|
|
||
| - (void)addContender:(Contender *)contender { | ||
| if (_listOfContenders == nil) { | ||
| _listOfContenders = [[NSMutableArray alloc] init]; | ||
| } | ||
| if (_listOfContenders == nil) { | ||
| _listOfContenders = [[NSMutableArray alloc] init]; | ||
| } | ||
| [_listOfContenders addObject:contender]; | ||
| } | ||
|
|
||
|
|
@@ -146,7 +148,7 @@ - (void)vote { | |
| printf("Contender does not exist...\n"); | ||
| } | ||
| } | ||
|
|
||
| } | ||
|
|
||
| @end | ||
|
|
@@ -201,10 +203,48 @@ - (BOOL)pollsOpen { | |
|
|
||
| @end | ||
|
|
||
| // Voting Simulator Class | ||
| @interface VotingSimulator : NSObject | ||
|
|
||
| -(void) simulate; | ||
|
|
||
| @end | ||
|
|
||
| @implementation VotingSimulator | ||
|
|
||
| -(void) simulate{ | ||
|
|
||
| Election* election = [[Election alloc]init]; | ||
| Contender* c = [[Contender alloc]init]; | ||
| Contender* c2 = [[Contender alloc]init]; | ||
| Contender* c3 = [[Contender alloc]init]; | ||
|
|
||
| [c initWithName:@"Carlos"]; | ||
| [c2 initWithName:@"Carl"]; | ||
| [c3 initWithName:@"Steven"]; | ||
|
|
||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 222 - 224 is reainitializing your 3 contenders. You should use this method on lines 218-220. |
||
|
|
||
| [election setElectionName:@"The Election"]; | ||
| [election addContender:c]; | ||
| [election addContender:c2]; | ||
| [election addContender:c3]; | ||
|
|
||
|
|
||
|
|
||
|
|
||
| ElectionManager *em = [[ElectionManager alloc]init]; | ||
| [em manage:election]; | ||
| [em initiatePolling]; | ||
|
|
||
| [em displayResults]; | ||
| } | ||
|
|
||
| @end | ||
|
|
||
| int main(int argc, const char * argv[]) { | ||
| @autoreleasepool { | ||
| VotingSimulator *vs = [[VotingSimulator alloc]init]; | ||
| [vs simulate]; | ||
|
|
||
| } | ||
| return 0; | ||
|
|
||
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
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 recommend getting used to YES and NO as the two bool values. 1 and 0 is fine, but not the objective-c way.