Triangle cleanup#233
Merged
kytrinyx merged 2 commits intoexercism:masterfrom Jan 30, 2016
petertseng:triangle-cleanup
Merged
Conversation
Since they're sorted, if a == c, then this is an equilateral triangle. If not, then we only need to check whether a == b or b == c, which will make it isosceles, else it's scalene. This flattens the switch/case structure, and compresses two isosceles cases into one, so overall it seems easier to understand.
Member
Author
|
Strictly speaking this needn't conflict with #232 since they don't touch the same lines but I just tried to merge the two locally and git plays it safe and declares there is a merge conflict (since the edited lines are just one line apart). So if you care about merging both in quick succession you can deal with the conflict in the obvious way. I can deal with the rebase if it's OK to merge them a few hours apart, of course (and I argue that it's totally OK to merge this one later) |
Member
|
This is all good! Thanks for fixing :) |
ErikSchierboom
pushed a commit
to ErikSchierboom/go
that referenced
this pull request
Jan 26, 2021
* List of Go concepts needed to solve the v2 two fer exercise * Update languages/reference/exercise-concepts/two-fer.md Co-Authored-By: Gabriel Nelle <tehsphinx@web.de> * an vs. a when next word starts with vowel Co-Authored-By: John Arundel <john@bitfieldconsulting.com> * Update languages/reference/exercise-concepts/two-fer.md Co-Authored-By: Victor Goff <keeperotphones@gmail.com> * Update languages/reference/exercise-concepts/two-fer.md * Update languages/reference/exercise-concepts/two-fer.md Co-Authored-By: Victor Goff <keeperotphones@gmail.com> * Update languages/reference/exercise-concepts/two-fer.md Co-Authored-By: Victor Goff <keeperotphones@gmail.com> * Update languages/reference/exercise-concepts/two-fer.md Co-Authored-By: Victor Goff <keeperotphones@gmail.com> * Update languages/reference/exercise-concepts/two-fer.md Co-Authored-By: Victor Goff <keeperotphones@gmail.com> * Update languages/reference/exercise-concepts/two-fer.md Co-Authored-By: Victor Goff <keeperotphones@gmail.com> * Update languages/reference/exercise-concepts/two-fer.md Co-Authored-By: John Arundel <john@bitfieldconsulting.com> * Update languages/reference/exercise-concepts/two-fer.md Co-Authored-By: John Arundel <john@bitfieldconsulting.com> * apply change suggestion Co-authored-by: Victor Goff <keeperotphones@gmail.com> Co-authored-by: Gabriel Nelle <tehsphinx@web.de> Co-authored-by: John Arundel <john@bitfieldconsulting.com>
ErikSchierboom
pushed a commit
to ErikSchierboom/go
that referenced
this pull request
Jan 27, 2021
* List of Go concepts needed to solve the v2 two fer exercise * Update languages/reference/exercise-concepts/two-fer.md Co-Authored-By: Gabriel Nelle <tehsphinx@web.de> * an vs. a when next word starts with vowel Co-Authored-By: John Arundel <john@bitfieldconsulting.com> * Update languages/reference/exercise-concepts/two-fer.md Co-Authored-By: Victor Goff <keeperotphones@gmail.com> * Update languages/reference/exercise-concepts/two-fer.md * Update languages/reference/exercise-concepts/two-fer.md Co-Authored-By: Victor Goff <keeperotphones@gmail.com> * Update languages/reference/exercise-concepts/two-fer.md Co-Authored-By: Victor Goff <keeperotphones@gmail.com> * Update languages/reference/exercise-concepts/two-fer.md Co-Authored-By: Victor Goff <keeperotphones@gmail.com> * Update languages/reference/exercise-concepts/two-fer.md Co-Authored-By: Victor Goff <keeperotphones@gmail.com> * Update languages/reference/exercise-concepts/two-fer.md Co-Authored-By: Victor Goff <keeperotphones@gmail.com> * Update languages/reference/exercise-concepts/two-fer.md Co-Authored-By: John Arundel <john@bitfieldconsulting.com> * Update languages/reference/exercise-concepts/two-fer.md Co-Authored-By: John Arundel <john@bitfieldconsulting.com> * apply change suggestion Co-authored-by: Victor Goff <keeperotphones@gmail.com> Co-authored-by: Gabriel Nelle <tehsphinx@web.de> Co-authored-by: John Arundel <john@bitfieldconsulting.com>
ErikSchierboom
pushed a commit
to ErikSchierboom/go
that referenced
this pull request
Jan 28, 2021
* List of Go concepts needed to solve the v2 two fer exercise * Update languages/reference/exercise-concepts/two-fer.md Co-Authored-By: Gabriel Nelle <tehsphinx@web.de> * an vs. a when next word starts with vowel Co-Authored-By: John Arundel <john@bitfieldconsulting.com> * Update languages/reference/exercise-concepts/two-fer.md Co-Authored-By: Victor Goff <keeperotphones@gmail.com> * Update languages/reference/exercise-concepts/two-fer.md * Update languages/reference/exercise-concepts/two-fer.md Co-Authored-By: Victor Goff <keeperotphones@gmail.com> * Update languages/reference/exercise-concepts/two-fer.md Co-Authored-By: Victor Goff <keeperotphones@gmail.com> * Update languages/reference/exercise-concepts/two-fer.md Co-Authored-By: Victor Goff <keeperotphones@gmail.com> * Update languages/reference/exercise-concepts/two-fer.md Co-Authored-By: Victor Goff <keeperotphones@gmail.com> * Update languages/reference/exercise-concepts/two-fer.md Co-Authored-By: Victor Goff <keeperotphones@gmail.com> * Update languages/reference/exercise-concepts/two-fer.md Co-Authored-By: John Arundel <john@bitfieldconsulting.com> * Update languages/reference/exercise-concepts/two-fer.md Co-Authored-By: John Arundel <john@bitfieldconsulting.com> * apply change suggestion Co-authored-by: Victor Goff <keeperotphones@gmail.com> Co-authored-by: Gabriel Nelle <tehsphinx@web.de> Co-authored-by: John Arundel <john@bitfieldconsulting.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
I know examples don't need to be the best code, but