From 386ebb4e3ed451302c476ad5359184130553e454 Mon Sep 17 00:00:00 2001 From: = <=> Date: Mon, 28 Oct 2019 16:42:07 +0530 Subject: [PATCH 1/4] Fixed issue #1368, return values for large number now is fixed and does not return in scientific notation --- conversions/decimal_to_octal.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conversions/decimal_to_octal.py b/conversions/decimal_to_octal.py index 0b005429d9d7..9c54b39f0623 100644 --- a/conversions/decimal_to_octal.py +++ b/conversions/decimal_to_octal.py @@ -16,7 +16,7 @@ def decimal_to_octal(num): counter += 1 num = math.floor(num / 8) # basically /= 8 without remainder if any # This formatting removes trailing '.0' from `octal`. - return "{0:g}".format(float(octal)) + return int(octal) def main(): From c292f7f125bcdd3dc0d53a14c75d14bb3b6ed79e Mon Sep 17 00:00:00 2001 From: Jawpral <34590600+Jawpral@users.noreply.github.com> Date: Mon, 28 Oct 2019 15:32:26 +0530 Subject: [PATCH 2/4] Changed as suggested Now return in same format as oct() returns --- conversions/decimal_to_octal.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/conversions/decimal_to_octal.py b/conversions/decimal_to_octal.py index 9c54b39f0623..c1c047cd5417 100644 --- a/conversions/decimal_to_octal.py +++ b/conversions/decimal_to_octal.py @@ -6,8 +6,14 @@ # https://github.com/TheAlgorithms/Javascript/blob/master/Conversions/DecimalToOctal.js -def decimal_to_octal(num): - """Convert a Decimal Number to an Octal Number.""" +def decimal_to_octal(num: int) -> str: + + """Convert a Decimal Number to an Octal Number. + + >>> for i in (0, 2, 8, 64, 65, 216, 255, 256, 512): + ... decimal_to_octal(i) == oct(i) + True + """ octal = 0 counter = 0 while num > 0: @@ -16,7 +22,7 @@ def decimal_to_octal(num): counter += 1 num = math.floor(num / 8) # basically /= 8 without remainder if any # This formatting removes trailing '.0' from `octal`. - return int(octal) + return f"0o{int(octal)}" def main(): From 0d27490edd636a37024baec856b292e4dc589104 Mon Sep 17 00:00:00 2001 From: Jawpral <34590600+Jawpral@users.noreply.github.com> Date: Mon, 28 Oct 2019 15:38:30 +0530 Subject: [PATCH 3/4] Slight change --- conversions/decimal_to_octal.py | 1 - 1 file changed, 1 deletion(-) diff --git a/conversions/decimal_to_octal.py b/conversions/decimal_to_octal.py index c1c047cd5417..ae0deb384c3f 100644 --- a/conversions/decimal_to_octal.py +++ b/conversions/decimal_to_octal.py @@ -7,7 +7,6 @@ def decimal_to_octal(num: int) -> str: - """Convert a Decimal Number to an Octal Number. >>> for i in (0, 2, 8, 64, 65, 216, 255, 256, 512): From a4615375b5dc85d1ba0f6b2cdf1b3a9dea642f20 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sun, 8 Dec 2019 23:23:48 +0100 Subject: [PATCH 4/4] Update decimal_to_octal.py --- conversions/decimal_to_octal.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/conversions/decimal_to_octal.py b/conversions/decimal_to_octal.py index ae0deb384c3f..b1829f1a3973 100644 --- a/conversions/decimal_to_octal.py +++ b/conversions/decimal_to_octal.py @@ -9,8 +9,7 @@ def decimal_to_octal(num: int) -> str: """Convert a Decimal Number to an Octal Number. - >>> for i in (0, 2, 8, 64, 65, 216, 255, 256, 512): - ... decimal_to_octal(i) == oct(i) + >>> all(decimal_to_octal(i) == oct(i) for i in (0, 2, 8, 64, 65, 216, 255, 256, 512)) True """ octal = 0