Commit 629eb86

tianyizheng02hugofollonigithub-actions

authored

Fix merge conflicts to merge change from TheAlgorithms#5080 (TheAlgorithms#8911)

* Input for user choose his Collatz sequence Now the user can tell the algorithm what number he wants to run on the Collatz Sequence. * updating DIRECTORY.md --------- Co-authored-by: Hugo Folloni <hugofollogua07@gmail.com> Co-authored-by: github-actions <${GITHUB_ACTOR}@users.noreply.github.com>

1 parent 384c407 commit 629eb86Copy full SHA for 629eb86

File tree

2 files changed

-1

lines changed

DIRECTORY.md
maths
- collatz_sequence.py

2 files changed

-1

lines changed

`‎DIRECTORY.md‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -740,6 +740,7 @@`
`740`	`740`	`* [Tower Of Hanoi](other/tower_of_hanoi.py)`
`741`	`741`
`742`	`742`	`## Physics`
	`743`	`+ * [Altitude Pressure](physics/altitude_pressure.py)`
`743`	`744`	`* [Archimedes Principle](physics/archimedes_principle.py)`
`744`	`745`	`* [Basic Orbital Capture](physics/basic_orbital_capture.py)`
`745`	`746`	`* [Casimir Effect](physics/casimir_effect.py)`

`‎maths/collatz_sequence.py‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ def collatz_sequence(n: int) -> Generator[int, None, None]:`
`57`	`57`
`58`	`58`
`59`	`59`	`def main():`
`60`		`- n = 43`
	`60`	`+ n = int(input("Your number: "))`
`61`	`61`	`sequence = tuple(collatz_sequence(n))`
`62`	`62`	`print(sequence)`
`63`	`63`	`print(f"Collatz sequence from {n} took {len(sequence)} steps.")`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 629eb86

File tree

2 files changed

2 files changed

`‎DIRECTORY.md‎`

`‎maths/collatz_sequence.py‎`

0 commit comments