From 1e327e385db50a5a991f8078f40d3d7fdc6266fb Mon Sep 17 00:00:00 2001 From: Julia Date: Wed, 4 Dec 2024 16:42:32 +0100 Subject: [PATCH 1/9] Function conversion rectangular number to polar --- conversions/rec_to_pol.py | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 conversions/rec_to_pol.py diff --git a/conversions/rec_to_pol.py b/conversions/rec_to_pol.py new file mode 100644 index 000000000000..44cc23e239e7 --- /dev/null +++ b/conversions/rec_to_pol.py @@ -0,0 +1,33 @@ +import doctest +import math + + +def rec_to_pol(real: float, img: float) -> tuple: + """ + https://en.wikipedia.org/wiki/Polar_coordinate_system + + >>> rec_to_pol(5,-5) + (7.07, -45.0) + >>> rec_to_pol(-1,1) + (1.41, 135.0) + >>> rec_to_pol(-1,-1) + (1.41, -135.0) + >>> rec_to_pol(1e-10,1e-10) + (0.0, 45.0) + >>> rec_to_pol(-1e-10,1e-10) + (0.0, 135.0) + >>> rec_to_pol(9.75,5.93) + (11.41, 31.31) + >>> rec_to_pol(10000,99999) + (100497.76, 84.29) + + """ + + mod = round(math.sqrt((real**2) + (img**2)), 2) + + ang = round(math.degrees(math.atan2(img, real)), 2) + return (mod, ang) + + +if __name__ == "__main__": + doctest.testmod() From 23c7d30433664e499be77f18d5676fad879c8ae9 Mon Sep 17 00:00:00 2001 From: Julia Date: Sun, 15 Dec 2024 17:36:35 +0100 Subject: [PATCH 2/9] #9943 : adding test to elelectronics/electric_conductivity.py --- electronics/electric_conductivity.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/electronics/electric_conductivity.py b/electronics/electric_conductivity.py index 11f2a607d214..65bb6c5ceaf0 100644 --- a/electronics/electric_conductivity.py +++ b/electronics/electric_conductivity.py @@ -21,6 +21,26 @@ def electric_conductivity( ('conductivity', 5.12672e-14) >>> electric_conductivity(conductivity=1000, electron_conc=0, mobility=1200) ('electron_conc', 5.201506356240767e+18) + >>> electric_conductivity(conductivity=-10, electron_conc=100, mobility=0) + Traceback (most recent call last): + ... + ValueError: Conductivity cannot be negative + >>> electric_conductivity(conductivity=50, electron_conc=-10, mobility=0) + Traceback (most recent call last): + ... + ValueError: Electron concentration cannot be negative + >>> electric_conductivity(conductivity=50, electron_conc=0, mobility=-10) + Traceback (most recent call last): + ... + ValueError: mobility cannot be negative + >>> electric_conductivity(conductivity=50, electron_conc=0, mobility=0) + Traceback (most recent call last): + ... + ValueError: You cannot supply more or less than 2 values + >>> electric_conductivity(conductivity=50, electron_conc=200, mobility=300) + Traceback (most recent call last): + ... + ValueError: You cannot supply more or less than 2 values """ if (conductivity, electron_conc, mobility).count(0) != 1: raise ValueError("You cannot supply more or less than 2 values") From fcd1f685e2e9735df82d56da587bd15a9869dd2f Mon Sep 17 00:00:00 2001 From: juliaaragao Date: Sun, 15 Dec 2024 16:37:44 +0000 Subject: [PATCH 3/9] updating DIRECTORY.md --- DIRECTORY.md | 1 + 1 file changed, 1 insertion(+) diff --git a/DIRECTORY.md b/DIRECTORY.md index f0a34a553946..9af382c49d61 100644 --- a/DIRECTORY.md +++ b/DIRECTORY.md @@ -169,6 +169,7 @@ * [Prefix Conversions](conversions/prefix_conversions.py) * [Prefix Conversions String](conversions/prefix_conversions_string.py) * [Pressure Conversions](conversions/pressure_conversions.py) + * [Rec To Pol](conversions/rec_to_pol.py) * [Rgb Cmyk Conversion](conversions/rgb_cmyk_conversion.py) * [Rgb Hsv Conversion](conversions/rgb_hsv_conversion.py) * [Roman Numerals](conversions/roman_numerals.py) From fdfc92eb197568564cc7c52cc1deb07c7a766dad Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Mon, 30 Dec 2024 13:17:05 +0100 Subject: [PATCH 4/9] Apply suggestions from code review --- DIRECTORY.md | 1 - conversions/rec_to_pol.py | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/DIRECTORY.md b/DIRECTORY.md index 9af382c49d61..f0a34a553946 100644 --- a/DIRECTORY.md +++ b/DIRECTORY.md @@ -169,7 +169,6 @@ * [Prefix Conversions](conversions/prefix_conversions.py) * [Prefix Conversions String](conversions/prefix_conversions_string.py) * [Pressure Conversions](conversions/pressure_conversions.py) - * [Rec To Pol](conversions/rec_to_pol.py) * [Rgb Cmyk Conversion](conversions/rgb_cmyk_conversion.py) * [Rgb Hsv Conversion](conversions/rgb_hsv_conversion.py) * [Roman Numerals](conversions/roman_numerals.py) diff --git a/conversions/rec_to_pol.py b/conversions/rec_to_pol.py index 44cc23e239e7..395948fd3bf9 100644 --- a/conversions/rec_to_pol.py +++ b/conversions/rec_to_pol.py @@ -1,8 +1,7 @@ -import doctest import math -def rec_to_pol(real: float, img: float) -> tuple: +def rectangular_to_polar(real: float, img: float) -> tuple[float, float]: """ https://en.wikipedia.org/wiki/Polar_coordinate_system @@ -20,7 +19,6 @@ def rec_to_pol(real: float, img: float) -> tuple: (11.41, 31.31) >>> rec_to_pol(10000,99999) (100497.76, 84.29) - """ mod = round(math.sqrt((real**2) + (img**2)), 2) @@ -30,4 +28,6 @@ def rec_to_pol(real: float, img: float) -> tuple: if __name__ == "__main__": + import doctest + doctest.testmod() From 597eb1fc9714e4f06d0da7b954d071d25a523597 Mon Sep 17 00:00:00 2001 From: cclauss Date: Mon, 30 Dec 2024 12:17:19 +0000 Subject: [PATCH 5/9] updating DIRECTORY.md --- DIRECTORY.md | 1 + 1 file changed, 1 insertion(+) diff --git a/DIRECTORY.md b/DIRECTORY.md index f0a34a553946..9af382c49d61 100644 --- a/DIRECTORY.md +++ b/DIRECTORY.md @@ -169,6 +169,7 @@ * [Prefix Conversions](conversions/prefix_conversions.py) * [Prefix Conversions String](conversions/prefix_conversions_string.py) * [Pressure Conversions](conversions/pressure_conversions.py) + * [Rec To Pol](conversions/rec_to_pol.py) * [Rgb Cmyk Conversion](conversions/rgb_cmyk_conversion.py) * [Rgb Hsv Conversion](conversions/rgb_hsv_conversion.py) * [Roman Numerals](conversions/roman_numerals.py) From a6da39894f99e1df42ca0a4d99eab809028ab1fa Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Mon, 30 Dec 2024 13:17:32 +0100 Subject: [PATCH 6/9] Rename rec_to_pol.py to rectangular_to_polar.py --- conversions/{rec_to_pol.py => rectangular_to_polar.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename conversions/{rec_to_pol.py => rectangular_to_polar.py} (100%) diff --git a/conversions/rec_to_pol.py b/conversions/rectangular_to_polar.py similarity index 100% rename from conversions/rec_to_pol.py rename to conversions/rectangular_to_polar.py From 9fe019f7291fd87c25165f5f74449329b6e11008 Mon Sep 17 00:00:00 2001 From: cclauss Date: Mon, 30 Dec 2024 12:17:47 +0000 Subject: [PATCH 7/9] updating DIRECTORY.md --- DIRECTORY.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DIRECTORY.md b/DIRECTORY.md index 9af382c49d61..b3a9d0c1fb54 100644 --- a/DIRECTORY.md +++ b/DIRECTORY.md @@ -169,7 +169,7 @@ * [Prefix Conversions](conversions/prefix_conversions.py) * [Prefix Conversions String](conversions/prefix_conversions_string.py) * [Pressure Conversions](conversions/pressure_conversions.py) - * [Rec To Pol](conversions/rec_to_pol.py) + * [Rectangular To Polar](conversions/rectangular_to_polar.py) * [Rgb Cmyk Conversion](conversions/rgb_cmyk_conversion.py) * [Rgb Hsv Conversion](conversions/rgb_hsv_conversion.py) * [Roman Numerals](conversions/roman_numerals.py) From 67f713314afe18c0815605ea2d310c7bacfe37cb Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Mon, 30 Dec 2024 13:21:09 +0100 Subject: [PATCH 8/9] Update conversions/rectangular_to_polar.py --- conversions/rectangular_to_polar.py | 1 - 1 file changed, 1 deletion(-) diff --git a/conversions/rectangular_to_polar.py b/conversions/rectangular_to_polar.py index 395948fd3bf9..028661f8defb 100644 --- a/conversions/rectangular_to_polar.py +++ b/conversions/rectangular_to_polar.py @@ -22,7 +22,6 @@ def rectangular_to_polar(real: float, img: float) -> tuple[float, float]: """ mod = round(math.sqrt((real**2) + (img**2)), 2) - ang = round(math.degrees(math.atan2(img, real)), 2) return (mod, ang) From 58faf1d823932fe16d6eb14bdfa7adc8d7dd5c45 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Mon, 30 Dec 2024 13:27:56 +0100 Subject: [PATCH 9/9] Update conversions/rectangular_to_polar.py --- conversions/rectangular_to_polar.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/conversions/rectangular_to_polar.py b/conversions/rectangular_to_polar.py index 028661f8defb..bed97d7410ec 100644 --- a/conversions/rectangular_to_polar.py +++ b/conversions/rectangular_to_polar.py @@ -5,19 +5,19 @@ def rectangular_to_polar(real: float, img: float) -> tuple[float, float]: """ https://en.wikipedia.org/wiki/Polar_coordinate_system - >>> rec_to_pol(5,-5) + >>> rectangular_to_polar(5,-5) (7.07, -45.0) - >>> rec_to_pol(-1,1) + >>> rectangular_to_polar(-1,1) (1.41, 135.0) - >>> rec_to_pol(-1,-1) + >>> rectangular_to_polar(-1,-1) (1.41, -135.0) - >>> rec_to_pol(1e-10,1e-10) + >>> rectangular_to_polar(1e-10,1e-10) (0.0, 45.0) - >>> rec_to_pol(-1e-10,1e-10) + >>> rectangular_to_polar(-1e-10,1e-10) (0.0, 135.0) - >>> rec_to_pol(9.75,5.93) + >>> rectangular_to_polar(9.75,5.93) (11.41, 31.31) - >>> rec_to_pol(10000,99999) + >>> rectangular_to_polar(10000,99999) (100497.76, 84.29) """