From 3f42e257f465316c19bb23034ea99a650f1e4914 Mon Sep 17 00:00:00 2001 From: anubhavs Date: Thu, 26 Nov 2020 14:13:41 +0530 Subject: [PATCH 01/14] Create weight_conversion.py --- conversions/weight_conversion.py | 62 ++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 conversions/weight_conversion.py diff --git a/conversions/weight_conversion.py b/conversions/weight_conversion.py new file mode 100644 index 000000000000..f8a5966b1be2 --- /dev/null +++ b/conversions/weight_conversion.py @@ -0,0 +1,62 @@ +""" +Functions useful for conversion fo weight units +""" +def weightConversion(from_type:str, to_type:str, value:float)->any: + """ + Conversion of weight unit with the help of kilogram_chart + + "kilogram" : 1, + "gram" : pow(10, 3), + "milligram" : pow(10, 6), + "metric-ton" : pow(10, -3), + "long-ton" : 0.0009842073, + "short-ton" : 0.0011023122, + "pound" : 2.2046244202, + "ounce" : 35.273990723, + "carrat" : 5000, + "atomic-mass-unit" : 6.022136652E+26 + + Wikipedia reference: https://en.wikipedia.org/wiki/Conversion_of_units + + + >>> weightConversion("kilogram","kilogram",5) + 5 + >>> weightConversion("kilogram","carrat",5) + 25000 + >>> weightConversion("ounce","short-ton",3) + 9.37499991417e-05 + """ + kilogram_chart = { + "kilogram" : 1, + "gram" : pow(10, 3), + "milligram" : pow(10, 6), + "metric-ton" : pow(10, -3), + "long-ton" : 0.0009842073, + "short-ton" : 0.0011023122, + "pound" : 2.2046244202, + "ounce" : 35.273990723, + "carrat" : 5000, + "atomic-mass-unit" : 6.022136652E+26 + } + + weight_type_chart = { + "kilogram" : 1, + "gram" : pow(10,-3), + "milligram" : pow(10,-6), + "metric-ton" : pow(10,3), + "long-ton" : 1016.04608, + "short-ton" : 907.184, + "pound" : 0.453592, + "ounce" : 0.0283495, + "carrat" : 0.0002, + "atomic-mass-unit" : 1.660540199E-27, + } + + return value * kilogram_chart.get(to_type) * weight_type_chart.get(from_type) + +if __name__ == "__main__": + + import doctest + + doctest.testmod() + From 4cdeeb0ab5b5081f6697ea518ec144067f1765eb Mon Sep 17 00:00:00 2001 From: anubhavs Date: Thu, 26 Nov 2020 14:32:27 +0530 Subject: [PATCH 02/14] Update weight_conversion.py --- conversions/weight_conversion.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/conversions/weight_conversion.py b/conversions/weight_conversion.py index f8a5966b1be2..cb14de74c85d 100644 --- a/conversions/weight_conversion.py +++ b/conversions/weight_conversion.py @@ -58,5 +58,4 @@ def weightConversion(from_type:str, to_type:str, value:float)->any: import doctest - doctest.testmod() - + doctest.testmod() \ No newline at end of file From 4fcf4bbab8adfc98441282bea36e3cfdd1cec5b4 Mon Sep 17 00:00:00 2001 From: anubhavs Date: Thu, 26 Nov 2020 14:35:01 +0530 Subject: [PATCH 03/14] Update weight_conversion.py --- conversions/weight_conversion.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conversions/weight_conversion.py b/conversions/weight_conversion.py index cb14de74c85d..a247ebaa37af 100644 --- a/conversions/weight_conversion.py +++ b/conversions/weight_conversion.py @@ -58,4 +58,5 @@ def weightConversion(from_type:str, to_type:str, value:float)->any: import doctest - doctest.testmod() \ No newline at end of file + doctest.testmod() + \ No newline at end of file From 281e00e74812d211e5f5c4ec5699354f251fe6c9 Mon Sep 17 00:00:00 2001 From: anubhavs Date: Thu, 26 Nov 2020 14:38:32 +0530 Subject: [PATCH 04/14] Update weight_conversion.py --- conversions/weight_conversion.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conversions/weight_conversion.py b/conversions/weight_conversion.py index a247ebaa37af..f8a5966b1be2 100644 --- a/conversions/weight_conversion.py +++ b/conversions/weight_conversion.py @@ -59,4 +59,4 @@ def weightConversion(from_type:str, to_type:str, value:float)->any: import doctest doctest.testmod() - \ No newline at end of file + From 36a0918586e31f890b049f3a664af1100cd1cecc Mon Sep 17 00:00:00 2001 From: anubhavs Date: Thu, 26 Nov 2020 15:06:22 +0530 Subject: [PATCH 05/14] Update weight_conversion.py --- conversions/weight_conversion.py | 48 +++++++++++++++++--------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/conversions/weight_conversion.py b/conversions/weight_conversion.py index f8a5966b1be2..97ad1ffc54ab 100644 --- a/conversions/weight_conversion.py +++ b/conversions/weight_conversion.py @@ -1,7 +1,9 @@ """ Functions useful for conversion fo weight units """ -def weightConversion(from_type:str, to_type:str, value:float)->any: + + +def weightConversion(from_type: str, to_type: str, value: float) -> any: """ Conversion of weight unit with the help of kilogram_chart @@ -27,36 +29,36 @@ def weightConversion(from_type:str, to_type:str, value:float)->any: 9.37499991417e-05 """ kilogram_chart = { - "kilogram" : 1, - "gram" : pow(10, 3), - "milligram" : pow(10, 6), - "metric-ton" : pow(10, -3), - "long-ton" : 0.0009842073, - "short-ton" : 0.0011023122, - "pound" : 2.2046244202, - "ounce" : 35.273990723, - "carrat" : 5000, - "atomic-mass-unit" : 6.022136652E+26 + "kilogram": 1, + "gram": pow(10, 3), + "milligram": pow(10, 6), + "metric-ton": pow(10, -3), + "long-ton": 0.0009842073, + "short-ton": 0.0011023122, + "pound": 2.2046244202, + "ounce": 35.273990723, + "carrat": 5000, + "atomic-mass-unit": 6.022136652e26, } weight_type_chart = { - "kilogram" : 1, - "gram" : pow(10,-3), - "milligram" : pow(10,-6), - "metric-ton" : pow(10,3), - "long-ton" : 1016.04608, - "short-ton" : 907.184, - "pound" : 0.453592, - "ounce" : 0.0283495, - "carrat" : 0.0002, - "atomic-mass-unit" : 1.660540199E-27, + "kilogram": 1, + "gram": pow(10, -3), + "milligram": pow(10, -6), + "metric-ton": pow(10, 3), + "long-ton": 1016.04608, + "short-ton": 907.184, + "pound": 0.453592, + "ounce": 0.0283495, + "carrat": 0.0002, + "atomic-mass-unit": 1.660540199e-27, } return value * kilogram_chart.get(to_type) * weight_type_chart.get(from_type) + if __name__ == "__main__": import doctest - doctest.testmod() - + doctest.testmod() From 7473bad17a89891deda89449703d2c1b918facad Mon Sep 17 00:00:00 2001 From: anubhavs Date: Thu, 26 Nov 2020 15:30:39 +0530 Subject: [PATCH 06/14] Update weight_conversion.py --- conversions/weight_conversion.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/conversions/weight_conversion.py b/conversions/weight_conversion.py index 97ad1ffc54ab..170787d953d7 100644 --- a/conversions/weight_conversion.py +++ b/conversions/weight_conversion.py @@ -3,7 +3,7 @@ """ -def weightConversion(from_type: str, to_type: str, value: float) -> any: +def weight_conversion(from_type: str, to_type: str, value: float) -> any: """ Conversion of weight unit with the help of kilogram_chart @@ -21,11 +21,11 @@ def weightConversion(from_type: str, to_type: str, value: float) -> any: Wikipedia reference: https://en.wikipedia.org/wiki/Conversion_of_units - >>> weightConversion("kilogram","kilogram",5) + >>> weight_conversion("kilogram","kilogram",5) 5 - >>> weightConversion("kilogram","carrat",5) + >>> weight_conversion("kilogram","carrat",5) 25000 - >>> weightConversion("ounce","short-ton",3) + >>> weight_conversion("ounce","short-ton",3) 9.37499991417e-05 """ kilogram_chart = { From 1d73d84a61fa51c83d7cfdd62b73490ec59c5ebc Mon Sep 17 00:00:00 2001 From: anubhavs Date: Thu, 26 Nov 2020 17:43:48 +0530 Subject: [PATCH 07/14] Update weight_conversion.py --- conversions/weight_conversion.py | 280 +++++++++++++++++++++++++++---- 1 file changed, 244 insertions(+), 36 deletions(-) diff --git a/conversions/weight_conversion.py b/conversions/weight_conversion.py index 170787d953d7..c0885b0f2f5b 100644 --- a/conversions/weight_conversion.py +++ b/conversions/weight_conversion.py @@ -1,11 +1,50 @@ """ -Functions useful for conversion fo weight units +Conversion of weight units. + +USAGE : +-> Import this file into their respective project. +-> Use the function weight_conversion() for conversion of weight units. +-> Parameters : + -> from_type : From which type you want to convert + -> to_type : To which type you want to convert + -> value : the value which you want to convert + +REFERENCES : + +-> Wikipedia reference: https://en.wikipedia.org/wiki/Conversion_of_units + """ +KILOGRAM_CHART = { + "kilogram": 1, + "gram": pow(10, 3), + "milligram": pow(10, 6), + "metric-ton": pow(10, -3), + "long-ton": 0.0009842073, + "short-ton": 0.0011023122, + "pound": 2.2046244202, + "ounce": 35.273990723, + "carrat": 5000, + "atomic-mass-unit": 6.022136652e26, +} -def weight_conversion(from_type: str, to_type: str, value: float) -> any: +WEIGHT_TYPE_CHART = { + "kilogram": 1, + "gram": pow(10, -3), + "milligram": pow(10, -6), + "metric-ton": pow(10, 3), + "long-ton": 1016.04608, + "short-ton": 907.184, + "pound": 0.453592, + "ounce": 0.0283495, + "carrat": 0.0002, + "atomic-mass-unit": 1.660540199e-27, +} + + +def weight_conversion(from_type: str, to_type: str, value: float) -> float: """ - Conversion of weight unit with the help of kilogram_chart + Conversion of weight unit with the help of KILOGRAM_CHART "kilogram" : 1, "gram" : pow(10, 3), @@ -21,40 +60,209 @@ def weight_conversion(from_type: str, to_type: str, value: float) -> any: Wikipedia reference: https://en.wikipedia.org/wiki/Conversion_of_units - >>> weight_conversion("kilogram","kilogram",5) - 5 - >>> weight_conversion("kilogram","carrat",5) - 25000 - >>> weight_conversion("ounce","short-ton",3) - 9.37499991417e-05 + >>> weight_conversion("kilogram","kilogram",4) + 4 + >>> weight_conversion("kilogram","gram",1) + 1000 + >>> weight_conversion("kilogram","milligram",4) + 4000000 + >>> weight_conversion("kilogram","metric-ton",4) + 0.004 + >>> weight_conversion("kilogram","long-ton",3) + 0.0029526219 + >>> weight_conversion("kilogram","short-ton",1) + 0.0011023122 + >>> weight_conversion("kilogram","pound",4) + 8.8184976808 + >>> weight_conversion("kilogram","ounce",4) + 141.095962892 + >>> weight_conversion("kilogram","carrat",3) + 15000 + >>> weight_conversion("kilogram","atomic-mass-unit",1) + 6.022136652e+26 + >>> weight_conversion("gram","kilogram",1) + 0.001 + >>> weight_conversion("gram","gram",3) + 3.0 + >>> weight_conversion("gram","milligram",2) + 2000.0 + >>> weight_conversion("gram","metric-ton",4) + 4e-06 + >>> weight_conversion("gram","long-ton",3) + 2.9526219e-06 + >>> weight_conversion("gram","short-ton",3) + 3.3069366000000003e-06 + >>> weight_conversion("gram","pound",3) + 0.0066138732606 + >>> weight_conversion("gram","ounce",1) + 0.035273990723 + >>> weight_conversion("gram","carrat",2) + 10.0 + >>> weight_conversion("gram","atomic-mass-unit",1) + 6.022136652e+23 + >>> weight_conversion("milligram","kilogram",1) + 1e-06 + >>> weight_conversion("milligram","gram",2) + 0.002 + >>> weight_conversion("milligram","milligram",3) + 3.0 + >>> weight_conversion("milligram","metric-ton",3) + 3e-09 + >>> weight_conversion("milligram","long-ton",3) + 2.9526219e-09 + >>> weight_conversion("milligram","short-ton",1) + 1.1023122e-09 + >>> weight_conversion("milligram","pound",3) + 6.6138732605999995e-06 + >>> weight_conversion("milligram","ounce",2) + 7.054798144599999e-05 + >>> weight_conversion("milligram","carrat",1) + 0.005 + >>> weight_conversion("milligram","atomic-mass-unit",1) + 6.022136652e+20 + >>> weight_conversion("metric-ton","kilogram",2) + 2000 + >>> weight_conversion("metric-ton","gram",2) + 2000000 + >>> weight_conversion("metric-ton","milligram",3) + 3000000000 + >>> weight_conversion("metric-ton","metric-ton",2) + 2.0 + >>> weight_conversion("metric-ton","long-ton",3) + 2.9526219 + >>> weight_conversion("metric-ton","short-ton",2) + 2.2046244 + >>> weight_conversion("metric-ton","pound",3) + 6613.8732606 + >>> weight_conversion("metric-ton","ounce",4) + 141095.96289199998 + >>> weight_conversion("metric-ton","carrat",4) + 20000000 + >>> weight_conversion("metric-ton","atomic-mass-unit",1) + 6.022136652e+29 + >>> weight_conversion("long-ton","kilogram",4) + 4064.18432 + >>> weight_conversion("long-ton","gram",4) + 4064184.32 + >>> weight_conversion("long-ton","milligram",3) + 3048138240.0 + >>> weight_conversion("long-ton","metric-ton",4) + 4.06418432 + >>> weight_conversion("long-ton","long-ton",3) + 2.999999907217152 + >>> weight_conversion("long-ton","short-ton",1) + 1.119999989746176 + >>> weight_conversion("long-ton","pound",3) + 6720.000000049448 + >>> weight_conversion("long-ton","ounce",1) + 35840.000000060514 + >>> weight_conversion("long-ton","carrat",4) + 20320921.599999998 + >>> weight_conversion("long-ton","atomic-mass-unit",4) + 2.4475073353955697e+30 + >>> weight_conversion("short-ton","kilogram",3) + 2721.5519999999997 + >>> weight_conversion("short-ton","gram",3) + 2721552.0 + >>> weight_conversion("short-ton","milligram",1) + 907184000.0 + >>> weight_conversion("short-ton","metric-ton",4) + 3.628736 + >>> weight_conversion("short-ton","long-ton",3) + 2.6785713457296 + >>> weight_conversion("short-ton","short-ton",3) + 2.9999999725344 + >>> weight_conversion("short-ton","pound",2) + 4000.0000000294335 + >>> weight_conversion("short-ton","ounce",4) + 128000.00000021611 + >>> weight_conversion("short-ton","carrat",4) + 18143680.0 + >>> weight_conversion("short-ton","atomic-mass-unit",1) + 5.463186016507968e+29 + >>> weight_conversion("pound","kilogram",4) + 1.814368 + >>> weight_conversion("pound","gram",2) + 907.184 + >>> weight_conversion("pound","milligram",3) + 1360776.0 + >>> weight_conversion("pound","metric-ton",3) + 0.001360776 + >>> weight_conversion("pound","long-ton",2) + 0.0008928571152432 + >>> weight_conversion("pound","short-ton",1) + 0.0004999999954224 + >>> weight_conversion("pound","pound",3) + 3.0000000000220752 + >>> weight_conversion("pound","ounce",1) + 16.000000000027015 + >>> weight_conversion("pound","carrat",1) + 2267.96 + >>> weight_conversion("pound","atomic-mass-unit",4) + 1.0926372033015936e+27 + >>> weight_conversion("ounce","kilogram",3) + 0.0850485 + >>> weight_conversion("ounce","gram",3) + 85.0485 + >>> weight_conversion("ounce","milligram",4) + 113398.0 + >>> weight_conversion("ounce","metric-ton",4) + 0.000113398 + >>> weight_conversion("ounce","long-ton",4) + 0.0001116071394054 + >>> weight_conversion("ounce","short-ton",4) + 0.0001249999988556 + >>> weight_conversion("ounce","pound",1) + 0.0625000000004599 + >>> weight_conversion("ounce","ounce",2) + 2.000000000003377 + >>> weight_conversion("ounce","carrat",1) + 141.7475 + >>> weight_conversion("ounce","atomic-mass-unit",1) + 1.70724563015874e+25 + >>> weight_conversion("carrat","kilogram",1) + 0.0002 + >>> weight_conversion("carrat","gram",4) + 0.8 + >>> weight_conversion("carrat","milligram",2) + 400.0 + >>> weight_conversion("carrat","metric-ton",2) + 4.0000000000000003e-07 + >>> weight_conversion("carrat","long-ton",3) + 5.9052438e-07 + >>> weight_conversion("carrat","short-ton",4) + 8.818497600000002e-07 + >>> weight_conversion("carrat","pound",1) + 0.00044092488404000004 + >>> weight_conversion("carrat","ounce",2) + 0.0141095962892 + >>> weight_conversion("carrat","carrat",4) + 4.0 + >>> weight_conversion("carrat","atomic-mass-unit",4) + 4.8177093216e+23 + >>> weight_conversion("atomic-mass-unit","kilogram",4) + 6.642160796e-27 + >>> weight_conversion("atomic-mass-unit","gram",2) + 3.321080398e-24 + >>> weight_conversion("atomic-mass-unit","milligram",2) + 3.3210803980000002e-21 + >>> weight_conversion("atomic-mass-unit","metric-ton",3) + 4.9816205970000004e-30 + >>> weight_conversion("atomic-mass-unit","long-ton",3) + 4.9029473573977584e-30 + >>> weight_conversion("atomic-mass-unit","short-ton",1) + 1.830433719948128e-30 + >>> weight_conversion("atomic-mass-unit","pound",3) + 1.0982602420317504e-26 + >>> weight_conversion("atomic-mass-unit","ounce",2) + 1.1714775914938915e-25 + >>> weight_conversion("atomic-mass-unit","carrat",2) + 1.660540199e-23 + >>> weight_conversion("atomic-mass-unit","atomic-mass-unit",2) + 1.999999998903455 """ - kilogram_chart = { - "kilogram": 1, - "gram": pow(10, 3), - "milligram": pow(10, 6), - "metric-ton": pow(10, -3), - "long-ton": 0.0009842073, - "short-ton": 0.0011023122, - "pound": 2.2046244202, - "ounce": 35.273990723, - "carrat": 5000, - "atomic-mass-unit": 6.022136652e26, - } - - weight_type_chart = { - "kilogram": 1, - "gram": pow(10, -3), - "milligram": pow(10, -6), - "metric-ton": pow(10, 3), - "long-ton": 1016.04608, - "short-ton": 907.184, - "pound": 0.453592, - "ounce": 0.0283495, - "carrat": 0.0002, - "atomic-mass-unit": 1.660540199e-27, - } - - return value * kilogram_chart.get(to_type) * weight_type_chart.get(from_type) + + return value * KILOGRAM_CHART.get(to_type) * WEIGHT_TYPE_CHART.get(from_type) if __name__ == "__main__": From d024c52e16d354190a2ffca65c96004873d775b2 Mon Sep 17 00:00:00 2001 From: anubhavs Date: Thu, 26 Nov 2020 19:42:49 +0530 Subject: [PATCH 08/14] Update weight_conversion.py --- conversions/weight_conversion.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/conversions/weight_conversion.py b/conversions/weight_conversion.py index c0885b0f2f5b..c98e661d1b58 100644 --- a/conversions/weight_conversion.py +++ b/conversions/weight_conversion.py @@ -1,18 +1,13 @@ """ Conversion of weight units. -USAGE : +USAGE :- -> Import this file into their respective project. -> Use the function weight_conversion() for conversion of weight units. -> Parameters : -> from_type : From which type you want to convert -> to_type : To which type you want to convert -> value : the value which you want to convert - -REFERENCES : - --> Wikipedia reference: https://en.wikipedia.org/wiki/Conversion_of_units - """ KILOGRAM_CHART = { @@ -57,7 +52,16 @@ def weight_conversion(from_type: str, to_type: str, value: float) -> float: "carrat" : 5000, "atomic-mass-unit" : 6.022136652E+26 - Wikipedia reference: https://en.wikipedia.org/wiki/Conversion_of_units + Wikipedia reference: https://en.wikipedia.org/wiki/Kilogram + Wikipedia reference: https://en.wikipedia.org/wiki/Gram + Wikipedia reference: https://en.wikipedia.org/wiki/Millimetre + Wikipedia reference: https://en.wikipedia.org/wiki/Tonne + Wikipedia reference: https://en.wikipedia.org/wiki/Long_ton + Wikipedia reference: https://en.wikipedia.org/wiki/Short_ton + Wikipedia reference: https://en.wikipedia.org/wiki/Pound + Wikipedia reference: https://en.wikipedia.org/wiki/Ounce + Wikipedia reference: https://en.wikipedia.org/wiki/Fineness#Karat + Wikipedia reference: https://en.wikipedia.org/wiki/Dalton_(unit) >>> weight_conversion("kilogram","kilogram",4) From c8362e5173d95b27a10e4c5ad5b6cd4a45ff7956 Mon Sep 17 00:00:00 2001 From: anubhavs Date: Thu, 26 Nov 2020 22:37:01 +0530 Subject: [PATCH 09/14] Update weight_conversion.py --- conversions/weight_conversion.py | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/conversions/weight_conversion.py b/conversions/weight_conversion.py index c98e661d1b58..c575084fde38 100644 --- a/conversions/weight_conversion.py +++ b/conversions/weight_conversion.py @@ -1,13 +1,26 @@ """ Conversion of weight units. -USAGE :- +USAGE : -> Import this file into their respective project. -> Use the function weight_conversion() for conversion of weight units. -> Parameters : -> from_type : From which type you want to convert -> to_type : To which type you want to convert -> value : the value which you want to convert + +REFERENCES : + +-> Wikipedia reference: https://en.wikipedia.org/wiki/Kilogram +-> Wikipedia reference: https://en.wikipedia.org/wiki/Gram +-> Wikipedia reference: https://en.wikipedia.org/wiki/Millimetre +-> Wikipedia reference: https://en.wikipedia.org/wiki/Tonne +-> Wikipedia reference: https://en.wikipedia.org/wiki/Long_ton +-> Wikipedia reference: https://en.wikipedia.org/wiki/Short_ton +-> Wikipedia reference: https://en.wikipedia.org/wiki/Pound +-> Wikipedia reference: https://en.wikipedia.org/wiki/Ounce +-> Wikipedia reference: https://en.wikipedia.org/wiki/Fineness#Karat +-> Wikipedia reference: https://en.wikipedia.org/wiki/Dalton_(unit) """ KILOGRAM_CHART = { @@ -52,18 +65,6 @@ def weight_conversion(from_type: str, to_type: str, value: float) -> float: "carrat" : 5000, "atomic-mass-unit" : 6.022136652E+26 - Wikipedia reference: https://en.wikipedia.org/wiki/Kilogram - Wikipedia reference: https://en.wikipedia.org/wiki/Gram - Wikipedia reference: https://en.wikipedia.org/wiki/Millimetre - Wikipedia reference: https://en.wikipedia.org/wiki/Tonne - Wikipedia reference: https://en.wikipedia.org/wiki/Long_ton - Wikipedia reference: https://en.wikipedia.org/wiki/Short_ton - Wikipedia reference: https://en.wikipedia.org/wiki/Pound - Wikipedia reference: https://en.wikipedia.org/wiki/Ounce - Wikipedia reference: https://en.wikipedia.org/wiki/Fineness#Karat - Wikipedia reference: https://en.wikipedia.org/wiki/Dalton_(unit) - - >>> weight_conversion("kilogram","kilogram",4) 4 >>> weight_conversion("kilogram","gram",1) From e42849327e74bd6d6cc725338bb15e9a5eb3f35f Mon Sep 17 00:00:00 2001 From: anubhavs Date: Fri, 27 Nov 2020 20:22:41 +0530 Subject: [PATCH 10/14] Update weight_conversion.py --- conversions/weight_conversion.py | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/conversions/weight_conversion.py b/conversions/weight_conversion.py index c575084fde38..4f1fa69d2ce5 100644 --- a/conversions/weight_conversion.py +++ b/conversions/weight_conversion.py @@ -266,12 +266,28 @@ def weight_conversion(from_type: str, to_type: str, value: float) -> float: >>> weight_conversion("atomic-mass-unit","atomic-mass-unit",2) 1.999999998903455 """ + try: + return value * KILOGRAM_CHART[to_type] * WEIGHT_TYPE_CHART[from_type] + except: + return(''' + Error : Unknown weight unit or Value type is not float - return value * KILOGRAM_CHART.get(to_type) * WEIGHT_TYPE_CHART.get(from_type) + Currently known units are: + -> "kilogram", + -> "gram", + -> "milligram", + -> "metric-ton", + -> "long-ton", + -> "short-ton", + -> "pound", + -> "ounce", + -> "carrat", + -> "atomic-mass-unit", + ''') if __name__ == "__main__": import doctest - doctest.testmod() + doctest.testmod() \ No newline at end of file From 10f7804f35028794ee46d9819903db58f523e4d9 Mon Sep 17 00:00:00 2001 From: anubhavs Date: Fri, 27 Nov 2020 20:34:55 +0530 Subject: [PATCH 11/14] Update weight_conversion.py --- conversions/weight_conversion.py | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/conversions/weight_conversion.py b/conversions/weight_conversion.py index 4f1fa69d2ce5..4d22c1be7368 100644 --- a/conversions/weight_conversion.py +++ b/conversions/weight_conversion.py @@ -1,6 +1,12 @@ """ Conversion of weight units. +__author__ = "Anubhav Solanki" +__license__ = "MIT" +__version__ = "1.0.0" +__maintainer__ = "Anubhav Solanki" +__email__ = "anubhavsolanki0@gmail.com" + USAGE : -> Import this file into their respective project. -> Use the function weight_conversion() for conversion of weight units. @@ -268,23 +274,12 @@ def weight_conversion(from_type: str, to_type: str, value: float) -> float: """ try: return value * KILOGRAM_CHART[to_type] * WEIGHT_TYPE_CHART[from_type] - except: - return(''' - Error : Unknown weight unit or Value type is not float - - Currently known units are: + except TypeError: + return("Value Type is not Float") + except Exception as e: + return(str(e) + " is not known weight unit") + - -> "kilogram", - -> "gram", - -> "milligram", - -> "metric-ton", - -> "long-ton", - -> "short-ton", - -> "pound", - -> "ounce", - -> "carrat", - -> "atomic-mass-unit", - ''') if __name__ == "__main__": From 915bedccb5dbd8e76dd9c511eaf8050dbc12083c Mon Sep 17 00:00:00 2001 From: anubhavs Date: Fri, 27 Nov 2020 20:35:25 +0530 Subject: [PATCH 12/14] Update weight_conversion.py --- conversions/weight_conversion.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/conversions/weight_conversion.py b/conversions/weight_conversion.py index 4d22c1be7368..bea4158b82db 100644 --- a/conversions/weight_conversion.py +++ b/conversions/weight_conversion.py @@ -275,14 +275,13 @@ def weight_conversion(from_type: str, to_type: str, value: float) -> float: try: return value * KILOGRAM_CHART[to_type] * WEIGHT_TYPE_CHART[from_type] except TypeError: - return("Value Type is not Float") + return "Value Type is not Float" except Exception as e: - return(str(e) + " is not known weight unit") - + return str(e) + " is not known weight unit" if __name__ == "__main__": import doctest - doctest.testmod() \ No newline at end of file + doctest.testmod() From 40fe4b6027e56031f59e706649c89d35095d230a Mon Sep 17 00:00:00 2001 From: anubhavs Date: Fri, 27 Nov 2020 20:38:33 +0530 Subject: [PATCH 13/14] Update weight_conversion.py --- conversions/weight_conversion.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conversions/weight_conversion.py b/conversions/weight_conversion.py index bea4158b82db..f0eea9178aca 100644 --- a/conversions/weight_conversion.py +++ b/conversions/weight_conversion.py @@ -275,7 +275,7 @@ def weight_conversion(from_type: str, to_type: str, value: float) -> float: try: return value * KILOGRAM_CHART[to_type] * WEIGHT_TYPE_CHART[from_type] except TypeError: - return "Value Type is not Float" + return "Value type is not float" except Exception as e: return str(e) + " is not known weight unit" From b19e9be23a08e87102a3604bc8f8701cbc97583a Mon Sep 17 00:00:00 2001 From: Dhruv Manilawala Date: Fri, 27 Nov 2020 21:26:39 +0530 Subject: [PATCH 14/14] Update weight_conversion.py --- conversions/weight_conversion.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/conversions/weight_conversion.py b/conversions/weight_conversion.py index f0eea9178aca..85515f2f6f88 100644 --- a/conversions/weight_conversion.py +++ b/conversions/weight_conversion.py @@ -272,12 +272,12 @@ def weight_conversion(from_type: str, to_type: str, value: float) -> float: >>> weight_conversion("atomic-mass-unit","atomic-mass-unit",2) 1.999999998903455 """ - try: - return value * KILOGRAM_CHART[to_type] * WEIGHT_TYPE_CHART[from_type] - except TypeError: - return "Value type is not float" - except Exception as e: - return str(e) + " is not known weight unit" + if to_type not in KILOGRAM_CHART or from_type not in WEIGHT_TYPE_CHART: + raise ValueError( + f"Invalid 'from_type' or 'to_type' value: {from_type!r}, {to_type!r}\n" + f"Supported values are: {', '.join(WEIGHT_TYPE_CHART)}" + ) + return value * KILOGRAM_CHART[to_type] * WEIGHT_TYPE_CHART[from_type] if __name__ == "__main__":