Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Flood fill in Coconut #836

Merged
merged 4 commits into from
Sep 6, 2021
Merged

Flood fill in Coconut #836

merged 4 commits into from
Sep 6, 2021

Conversation

Amaras
Copy link
Member

@Amaras Amaras commented Aug 22, 2021

This replaces #743, because I merged the master branch, and thought it could have been a good idea.
Anyway, here's the good one, normally. It should have the code in the same state as the last commit from the previous PR.

I'm probably going to delete the old branch in a few days (if I remember it then)

@lazyprop
Copy link
Contributor

lazyprop commented Aug 22, 2021 •
edited by Amaras
Loading

@Amaras The inbounds check is already being done once in find_neighbours so it doesn't need to be done again in the color function. I made an issue (#765) regarding this. Just a friendly reminder :)
Also, I have already fixed it in the Python implementation so you might want to take a look at it

Yep, thanks for the catch, I'll do it when I have time. The point was just to have a clean PR so it can be merged properly when needed

@Amaras Amaras added the Implementation This provides an implementation for an algorithm. (Code and maybe md files are edited.) label Aug 23, 2021
@leios leios added the lang: coconut Coconut programming language label Aug 28, 2021
berquist
berquist requested changes Sep 6, 2021
View reviewed changes
Copy link
Member

@berquist berquist left a comment

Choose a reason for hiding this comment

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

I'm happy with the implementation and clarity, and confirmed it runs under --strict, just some minor cleanup stuff.

contents/flood_fill/code/coconut/flood_fill.coco Outdated Show resolved Hide resolved
contents/flood_fill/code/coconut/flood_fill.coco
pass_count += 1

print('')
print(TestResults(pass_count, failure_count))
Copy link
Member

Choose a reason for hiding this comment

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

This is a nice touch, but will probably have to be reworked when output standardization is done.

Copy link
Member Author

Choose a reason for hiding this comment

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

Definitely, I think we'll just have to remove the test function for standardization.

contents/flood_fill/code/coconut/flood_fill.coco Outdated Show resolved Hide resolved
@Amaras Amaras requested a review from berquist September 6, 2021 17:22
@lazyprop
Copy link
Contributor

lazyprop commented Sep 6, 2021

Also, the inbounds check that is being done in stack_fill, queue_fill and recursive_fill can be removed. This is because it is being done once in find_neighbors. It need not be checked again. The Julia and Python implementations have been changed accordingly.

@Amaras
Copy link
Member Author

Amaras commented Sep 6, 2021 •
edited
Loading

Also, the inbounds check that is being done in stack_fill, queue_fill and recursive_fill can be removed. This is because it is being done once in find_neighbors. It need not be checked again. The Julia and Python implementations have been changed accordingly.

You can't ensure the functions are called with a point that is already in bounds. The initial point is never checked otherwise.
I could agree for the recursive_fill, but the initial point is always an edge case

@berquist berquist changed the title Re-added flood fill in Coconut (without the stupid master merge) Flood fill in Coconut Sep 6, 2021
@berquist berquist merged commit 09168eb into algorithm-archivists:master Sep 6, 2021
@lazyprop
Copy link
Contributor

lazyprop commented Sep 6, 2021

@Amaras you're right. Should this be changed in the other two implementations also?

@Amaras Amaras deleted the coconut_flood_fill branch September 6, 2021 21:05
@Amaras
Copy link
Member Author

Amaras commented Sep 6, 2021

@Amaras you're right. Should this be changed in the other two implementations also?

I don't know, maybe we should rather open an issue for that, especially if an issue was opened to remove the checks.

leios added a commit that referenced this pull request Oct 25, 2021
@lazyprop @Amaras
@stormofice @jiegillet @leios @berquist @Trashtalk217 @PaddyKe @ShadowMitia @pillarxyz @ntindle @mahdisarikhani @henrikac @Neverik
Tree Traversal: Output Standardization (#857)
2000ab3 
* pep8ify python

* rename Tree_example.py

* standardize python output

* standardize c output

* standardize c++ output

* standardize rust output

* standardize javascript output

* standardize julia output

* Standardized Coconut output

* fix coconut

* standardize go output

* standardize common lisp output

* Verlet Integration: Output standardization (#855)

* Standardize julia output

* Standardize kotlin output

This also fixes a previous bug, which caused the time and velocity
values to not get printed correctly.

* Standardized c output

* Standardized cpp output

* Standardized lisp output

* Standardized fortran output

I was not able to prevent the preceding whitespaces, but they can
just be trimmed.

* Standardized go output

* Standardized java output

* Standardize javascript output

* Standardize nim output

* Standardize python output

* Standardize ruby output

As the original implementation only returned the time and not
the velocity, the code needed to be adjusted a bit. Now it returns
the two values as an array which gets deconstructed and printed.

* Standardize rust output

* Standardize swift output

* Standardized haskell output

* Standardized haskell output (no quote marks)

* attempt at fix for asm

Co-authored-by: Jérémie Gillet <jie.gillet@gmail.com>
Co-authored-by: James Schloss <jrs.schloss@gmail.com>

* standardize php output

* standardize swift output

* removed outdated comments in Coconut implementation

* standardize haskell output

* Fix asm exit codes (#858)

* standardize crystal output

* Flood fill in Coconut (#836)

* Added Barnsley fern in Coconut (+ .editorconfig for Coconut) (#814)

* Added the Jarvis march in Coconut (#734)

* Fix minor typo

* Change folder structure of convolutions (#861)

This puts every chapters' code into its own directory, which is
useful for automatic validation.

* standardize csharp output

* standardize java output

* fix php line numbers and python filename

* fix coconut and python line numbers

* fix minor bug in C

* fix labels and minor bug in go

* minor label fix in python

* Huffman encoding in Coconut (#732)

* Update README.md

Changing readme link to reflect change in twitch url

* Add C# implemenation for 1D Convolutions (#846)

* Add C# implemenation for 1D Convolutions

* Fix off by one error and julia line numbers

* Fix off by one error for linear convolutions

* Fix trailing zero

* Update contents/convolutions/code/csharp/1DConvolution.cs

Co-authored-by: Trashtalk217 <trashtalk217@gmail.com>

* Update contents/convolutions/code/csharp/1DConvolution.cs

Co-authored-by: Trashtalk217 <trashtalk217@gmail.com>

* Update contents/convolutions/code/csharp/1DConvolution.cs

Co-authored-by: Trashtalk217 <trashtalk217@gmail.com>

* Update contents/convolutions/code/csharp/1DConvolution.cs

Co-authored-by: Trashtalk217 <trashtalk217@gmail.com>

* Update contents/convolutions/code/csharp/1DConvolution.cs

Co-authored-by: Trashtalk217 <trashtalk217@gmail.com>

* Update contents/convolutions/code/csharp/1DConvolution.cs

Co-authored-by: Trashtalk217 <trashtalk217@gmail.com>

* Update contents/convolutions/code/csharp/1DConvolution.cs

Co-authored-by: Trashtalk217 <trashtalk217@gmail.com>

* Update contents/convolutions/code/csharp/1DConvolution.cs

Co-authored-by: Trashtalk217 <trashtalk217@gmail.com>

* Update contents/convolutions/code/csharp/1DConvolution.cs

Co-authored-by: Trashtalk217 <trashtalk217@gmail.com>

* Update contents/convolutions/code/csharp/1DConvolution.cs

Co-authored-by: Trashtalk217 <trashtalk217@gmail.com>

* Update contents/convolutions/code/csharp/1DConvolution.cs

Co-authored-by: Trashtalk217 <trashtalk217@gmail.com>

* Update contents/convolutions/code/csharp/1DConvolution.cs

Co-authored-by: Trashtalk217 <trashtalk217@gmail.com>

* Update contents/convolutions/code/csharp/1DConvolution.cs

Co-authored-by: Trashtalk217 <trashtalk217@gmail.com>

* Add trailing new line

Co-authored-by: Trashtalk217 <trashtalk217@gmail.com>

* IFS Common Lisp implementation (#722)

* first working version

* cleaned up the chaos-game function and added some helpfull comments

* changed the .md file and upped iterations

* Skeleton of the final solution

* Update contents/IFS/IFS.md

Co-authored-by: Eric Berquist <eric.berquist@gmail.com>

Co-authored-by: James Schloss <jrs.schloss@gmail.com>
Co-authored-by: Eric Berquist <eric.berquist@gmail.com>

* added MonteCarlo in PowerShell (#760)

* Add Rust implementation for The Barnsley Fern (#818)

* Add Rust implementation for The Barnsley Fern

* Change operators constants and add Cargo.toml

* Fix bug in matrix multiplication

Co-authored-by: James Schloss <jrs.schloss@gmail.com>

* changing barnsley.md to read the correct coconut file (#867)

* added approximate counting implementation in python (#866)

* added approximate counting implementation in python

* Update approximate_counting.py

* updating approximate_counting.py

* removed redundancies

* fixing linking issues in convolution chapter (#868)

* Add initial devcontainer (#862)

* small changes to convolutional theorem chapter and code to make things more reproduceable (#872)

* added convolutional theorem implementation in python (#869)

* added convolutional theorem implementation in python

* fixed chapter linking

* added comments to the code

* changed random distribution to sawtooth

* corrected previous commit

* fixed comments

Co-authored-by: James Schloss <jrs.schloss@gmail.com>

* Use `[#]\n` instead of `[#]` for human readable output (#873)

* Add approximate counting algorithm in C (#844)

* Add approximate counting algorithm in C

* Fix typo

Co-authored-by: stormofice <58337328+stormofice@users.noreply.github.com>

Co-authored-by: stormofice <58337328+stormofice@users.noreply.github.com>
Co-authored-by: James Schloss <jrs.schloss@gmail.com>

* added 1d convolution implementation in python (#874)

* added 1d convolution implementation in python

* fixed some mistakes in the code so it outputs correct results

* making the code look better

* spacing code properly for readability

* fixing 1d convolution markdown file (#879)

* Add racket setup to devcontainer (#875)

* Normalize inputs for scheme euclid algorithm (#878)

Change inputs to make it consistent with other examples.

* Add initial setup for Swift in devcontainer (#880)

* Add scheme setup to devcontainer (#876)

* Clean up Monte Carlo integration in Racket (#781)

* Clean up Monte Carlo integration in Racket

* Add blank lines in Monte Carlo integration in Clojure

* Change Racket lang include from lisp to racket

* Add C++ code for Flood Fill algorithm (#860)

* fixing chapter to use split-op code (#888)

* use [#]\n for readability

* Implemented stacks and queues in Java (#897)

* Java tree traversal: updated dfsRecursiveInOrderBinary (#899)

* Tree traversal in smalltalk (#453)

* fixed print statements (#901)

* Fixes in PATH that make dlang, emojicode and factor usable (#890)

* fixing huffman encoding for Julia and adding Test (#828)

* JavaScript tree traversal: updated dfsInorder (#902)

* julia: change printf to print

* pep8ify python

* rename Tree_example.py

* standardize python output

* standardize c output

* standardize c++ output

* standardize rust output

* standardize javascript output

Resolved conflict with master (by Amaras)

* standardize julia output

Resolved conflict with master (by Amaras)

* Standardized Coconut output

* fix coconut

* standardize go output

* standardize common lisp output

* standardize php output

* standardize swift output

* removed outdated comments in Coconut implementation

* standardize haskell output

* standardize crystal output

* standardize csharp output

* standardize java output

Resolved the conflict with fixing dfs

* fix php line numbers and python filename

* fix coconut and python line numbers

* fix minor bug in C

* fix labels and minor bug in go

* minor label fix in python

* use [#]\n for readability

* julia: change printf to print

* update Tree.java. remove MainClass.java

Co-authored-by: Sammy Plat <amaras@vivaldi.net>
Co-authored-by: stormofice <58337328+stormofice@users.noreply.github.com>
Co-authored-by: Jérémie Gillet <jie.gillet@gmail.com>
Co-authored-by: James Schloss <jrs.schloss@gmail.com>
Co-authored-by: Eric Berquist <eric.berquist@gmail.com>
Co-authored-by: Trashtalk217 <trashtalk217@gmail.com>
Co-authored-by: PaddyKe <34421580+PaddyKe@users.noreply.github.com>
Co-authored-by: Dimitri Belopopsky <ShadowMitia@users.noreply.github.com>
Co-authored-by: Ayman Lafaz <ayman.lafaz@um5r.ac.ma>
Co-authored-by: Nicholas Tindle <nicktindle@outlook.com>
Co-authored-by: Mahdi <24981501+mahdisarikhani@users.noreply.github.com>
Co-authored-by: Henrik Christensen <sensen1695@hotmail.com>
Co-authored-by: Neverik <neverliberty@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@berquist berquist berquist approved these changes

Assignees
No one assigned
Labels
Implementation This provides an implementation for an algorithm. (Code and maybe md files are edited.) lang: coconut Coconut programming language
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Amaras @lazyprop @berquist @leios