Skip to content
This repository was archived by the owner on Aug 17, 2022. It is now read-only.

More Abstraction and Additional Clock Test Cases #20

Merged
merged 6 commits into from
Feb 2, 2017
Merged

More Abstraction and Additional Clock Test Cases #20

merged 6 commits into from
Feb 2, 2017

Conversation

juliand665
Copy link
Contributor

• I moved json-based result evaluation to a new protocol and made
BulletMatch and Clock use it.
• I generated more test cases for the clock challenge and made it use
json (see above). I believe these are correct, but I’m open to
criticism.

• I moved json-based result evaluation to a new protocol and made
BulletMatch and Clock use it.
• I generated more test cases for the clock challenge and made it use
json (see above). I believe these are correct, but I’m open to
criticism.

func generateDataset() -> [InputType] {
// Extract data from JSON file
let bundle = Bundle(for: BulletChallenge.self)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is just to get the 'current' bundle correct?
If so it might be better to add a private junk class to use in place of BulletChallenge here so this doesn't mysteriously break in the future?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, whoops. I just copy-pasted that code from the BulletMatch code. Will fix.

missed this one when copy-pasting code from BulletMatch
Trailing commas break auto-indentation :c
Also did some (very) minor cleanup
@aranasaurus
Copy link
Contributor

I'll leave it to @bugKrusha to merge since it is modifying his challenges a bit. But looks good to me! Thanks for the contribution!

Because apparently autocomplete doesn’t like closures here. This works
well for me
@aranasaurus
Copy link
Contributor

oh poop, I just merged another PR 'cause I thought this was already merged... gimme a min and I'll fix the conflicts

@bugKrusha bugKrusha merged commit e19f03e into iosdevelopershq:master Feb 2, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants