"
+ "When you visit the market, you are given three conversion "
+ "offers, and for each conversion offer you must decide which "
+ "direction to trade. A conversion offer is a pair of fruits, "
+ "and to buy the second fruit for the first fruit, the action is 'buy'."
+ "
"
+ "The opposite direction is 'sell'."
+ "
" + "If it is not possible to end up with the original kind " + "of fruit again after the three conversions, return \"ERROR\" " + "instead of the list of actions." + "
") + # pylint: enable-msg=R0801 + with allure.step(f"Enter test data: {market} " + f"and verify the expected result: {expected}."): + result: list = buy_or_sell(market, harvested_fruit) + print_log(market=market, + harvested_fruit=harvested_fruit, + expected=expected, + result=result) + self.assertEqual(expected, result) + + + From ff5a4cfaf4ee24598444dfe01773481490e86d91 Mon Sep 17 00:00:00 2001 From: Egor Kostan <20955183+ikostan@users.noreply.github.com> Date: Mon, 30 Dec 2024 06:04:42 -0800 Subject: [PATCH 02/25] Create kyu_7.pointless_farmer.rst --- docs/kyu_7.pointless_farmer.rst | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 docs/kyu_7.pointless_farmer.rst diff --git a/docs/kyu_7.pointless_farmer.rst b/docs/kyu_7.pointless_farmer.rst new file mode 100644 index 00000000000..0d37f7e894e --- /dev/null +++ b/docs/kyu_7.pointless_farmer.rst @@ -0,0 +1,32 @@ +kyu\_7.pointless\_farmer package +================================ + +Submodules +---------- + +kyu\_7.pointless\_farmer.solution module +---------------------------------------- + +.. automodule:: kyu_7.pointless_farmer.solution + :members: + :undoc-members: + :show-inheritance: + :private-members: + +kyu\_7.pointless\_farmer.test\_buy\_or\_sell module +--------------------------------------------------- + +.. automodule:: kyu_7.pointless_farmer.test_buy_or_sell + :members: + :undoc-members: + :show-inheritance: + :private-members: + +Module contents +--------------- + +.. automodule:: kyu_7.pointless_farmer + :members: + :undoc-members: + :show-inheritance: + :private-members: From f8f20d7c5ecaf233d066392047bfadd4049e3fde Mon Sep 17 00:00:00 2001 From: Egor Kostan <20955183+ikostan@users.noreply.github.com> Date: Mon, 30 Dec 2024 06:09:32 -0800 Subject: [PATCH 03/25] Updated docs --- docs/kyu_7/kyu_7.password_validator.module.rst | 4 ++-- docs/kyu_7/kyu_7.pointless_farmer.module.rst | 11 +++++++++++ docs/kyu_7/kyu_7.pointless_farmer.readme.rst | 5 +++++ docs/{ => kyu_7}/kyu_7.pointless_farmer.rst | 0 docs/kyu_7/kyu_7.rst | 1 + 5 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 docs/kyu_7/kyu_7.pointless_farmer.module.rst create mode 100644 docs/kyu_7/kyu_7.pointless_farmer.readme.rst rename docs/{ => kyu_7}/kyu_7.pointless_farmer.rst (100%) diff --git a/docs/kyu_7/kyu_7.password_validator.module.rst b/docs/kyu_7/kyu_7.password_validator.module.rst index 5b2bd79d7e0..5e7e80d06fc 100644 --- a/docs/kyu_7/kyu_7.password_validator.module.rst +++ b/docs/kyu_7/kyu_7.password_validator.module.rst @@ -1,5 +1,5 @@ -kyu\_7.password_validator.module package -======================================== +kyu\_7.password\_validator.module package +========================================= Subpackages ----------- diff --git a/docs/kyu_7/kyu_7.pointless_farmer.module.rst b/docs/kyu_7/kyu_7.pointless_farmer.module.rst new file mode 100644 index 00000000000..777bba80277 --- /dev/null +++ b/docs/kyu_7/kyu_7.pointless_farmer.module.rst @@ -0,0 +1,11 @@ +kyu\_7.pointless\_farmer.module package +======================================= + +Subpackages +----------- + +.. toctree:: + :maxdepth: 4 + + kyu_7.pointless_farmer.readme + kyu_7.pointless_farmer \ No newline at end of file diff --git a/docs/kyu_7/kyu_7.pointless_farmer.readme.rst b/docs/kyu_7/kyu_7.pointless_farmer.readme.rst new file mode 100644 index 00000000000..c90786f5020 --- /dev/null +++ b/docs/kyu_7/kyu_7.pointless_farmer.readme.rst @@ -0,0 +1,5 @@ +README +====== + +.. include:: ../../kyu_7/pointless_farmer/README.md + :parser: myst_parser.sphinx_ \ No newline at end of file diff --git a/docs/kyu_7.pointless_farmer.rst b/docs/kyu_7/kyu_7.pointless_farmer.rst similarity index 100% rename from docs/kyu_7.pointless_farmer.rst rename to docs/kyu_7/kyu_7.pointless_farmer.rst diff --git a/docs/kyu_7/kyu_7.rst b/docs/kyu_7/kyu_7.rst index 0542201924d..5f5b71943a5 100644 --- a/docs/kyu_7/kyu_7.rst +++ b/docs/kyu_7/kyu_7.rst @@ -26,6 +26,7 @@ Subpackages kyu_7.make_class.module kyu_7.maximum_multiple.module kyu_7.password_validator.module + kyu_7.pointless_farmer.module kyu_7.powers_of_3.module kyu_7.pull_your_words_together_man.module kyu_7.remove_the_minimum.module From 6ddff15c4ccdf377c77de1b5664cd4c1b8c69de2 Mon Sep 17 00:00:00 2001 From: Egor Kostan <20955183+ikostan@users.noreply.github.com> Date: Mon, 30 Dec 2024 06:12:33 -0800 Subject: [PATCH 04/25] Update test_buy_or_sell.py --- kyu_7/pointless_farmer/test_buy_or_sell.py | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/kyu_7/pointless_farmer/test_buy_or_sell.py b/kyu_7/pointless_farmer/test_buy_or_sell.py index 00bca6e78ee..12d72075735 100644 --- a/kyu_7/pointless_farmer/test_buy_or_sell.py +++ b/kyu_7/pointless_farmer/test_buy_or_sell.py @@ -32,21 +32,21 @@ class PointlessFarmerTestCase(unittest.TestCase): @parameterized.expand([ ([("apple", "orange"), ("orange", "pear"), ("apple", "pear")], - "apple", ["buy", "buy", "sell"]), + "apple", ["buy", "buy", "sell"]), ([("orange", "apple"), ("orange", "pear"), ("pear", "apple")], - "apple", ["sell", "buy", "buy"]), + "apple", ["sell", "buy", "buy"]), ([("apple", "orange"), ("pear", "orange"), ("apple", "pear")], - "apple", ["buy", "sell", "sell"]), + "apple", ["buy", "sell", "sell"]), ([("orange", "apple"), ("pear", "orange"), ("pear", "apple")], - "apple", ["sell", "sell", "buy"]), + "apple", ["sell", "sell", "buy"]), ([("orange", "apple"), ("orange", "pear"), ("apple", "pear")], - "apple", ["sell", "buy", "sell"]), + "apple", ["sell", "buy", "sell"]), ([("apple", "orange"), ("pear", "orange"), ("pear", "apple")], - "apple", ["buy", "sell", "buy"]), + "apple", ["buy", "sell", "buy"]), ([("apple", "orange"), ("orange", "pear"), ("pear", "apple")], - "apple", ["buy", "buy", "buy"]), + "apple", ["buy", "buy", "buy"]), ([("orange", "apple"), ("pear", "orange"), ("apple", "pear")], - "apple", ["sell", "sell", "sell"]), + "apple", ["sell", "sell", "sell"]), ([('Raspberry', 'Raspberry'), ('Jabuticaba', 'Raspberry'), ('Jabuticaba', 'Raspberry')], 'Raspberry', ['sell', 'sell', 'buy'])]) def test_buy_or_sell_positive(self, market, harvested_fruit, expected): @@ -84,18 +84,18 @@ def test_buy_or_sell_positive(self, market, harvested_fruit, expected): @parameterized.expand([ ([("orange", "apple"), ("pear", "orange"), ("apple", "paer")], - "apple", "ERROR"), + "apple", "ERROR"), ([('Jackfruit', 'Physalis'), ('Physalis', 'Prune'), ('Prune', 'Tamarind')], - 'Tamarind', 'ERROR'), + 'Tamarind', 'ERROR'), ([('Mulberry', 'Strawberry'), ('Passionfruit', 'Mulberry'), ('Strawberry', 'Mulberry')], - 'Strawberry', 'ERROR'), + 'Strawberry', 'ERROR'), ([('Cherry', 'Cucumber'), ('Cherry', 'Cherry'), ('Cucumber', 'Ugli fruit')], - 'Boysenberry', 'ERROR'), + 'Boysenberry', 'ERROR'), ([('Jackfruit', 'Purple mangosteen'), ('Purple mangosteen', 'Jackfruit'), ('Purple mangosteen', 'Jackfruit')], - 'Purple mangosteen', 'ERROR')]) + 'Purple mangosteen', 'ERROR')]) def test_buy_or_sell_negative(self, market, harvested_fruit, expected): """ Testing 'buy_or_sell' function, negative test case. From c84b223167891a644721cffaaeaa27a4a3fee3c5 Mon Sep 17 00:00:00 2001 From: Egor Kostan <20955183+ikostan@users.noreply.github.com> Date: Mon, 30 Dec 2024 06:15:01 -0800 Subject: [PATCH 05/25] Update test_buy_or_sell.py --- kyu_7/pointless_farmer/test_buy_or_sell.py | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/kyu_7/pointless_farmer/test_buy_or_sell.py b/kyu_7/pointless_farmer/test_buy_or_sell.py index 12d72075735..d7a826d42c3 100644 --- a/kyu_7/pointless_farmer/test_buy_or_sell.py +++ b/kyu_7/pointless_farmer/test_buy_or_sell.py @@ -32,21 +32,21 @@ class PointlessFarmerTestCase(unittest.TestCase): @parameterized.expand([ ([("apple", "orange"), ("orange", "pear"), ("apple", "pear")], - "apple", ["buy", "buy", "sell"]), + "apple", ["buy", "buy", "sell"]), ([("orange", "apple"), ("orange", "pear"), ("pear", "apple")], - "apple", ["sell", "buy", "buy"]), + "apple", ["sell", "buy", "buy"]), ([("apple", "orange"), ("pear", "orange"), ("apple", "pear")], - "apple", ["buy", "sell", "sell"]), + "apple", ["buy", "sell", "sell"]), ([("orange", "apple"), ("pear", "orange"), ("pear", "apple")], - "apple", ["sell", "sell", "buy"]), + "apple", ["sell", "sell", "buy"]), ([("orange", "apple"), ("orange", "pear"), ("apple", "pear")], - "apple", ["sell", "buy", "sell"]), + "apple", ["sell", "buy", "sell"]), ([("apple", "orange"), ("pear", "orange"), ("pear", "apple")], - "apple", ["buy", "sell", "buy"]), + "apple", ["buy", "sell", "buy"]), ([("apple", "orange"), ("orange", "pear"), ("pear", "apple")], - "apple", ["buy", "buy", "buy"]), + "apple", ["buy", "buy", "buy"]), ([("orange", "apple"), ("pear", "orange"), ("apple", "pear")], - "apple", ["sell", "sell", "sell"]), + "apple", ["sell", "sell", "sell"]), ([('Raspberry', 'Raspberry'), ('Jabuticaba', 'Raspberry'), ('Jabuticaba', 'Raspberry')], 'Raspberry', ['sell', 'sell', 'buy'])]) def test_buy_or_sell_positive(self, market, harvested_fruit, expected): @@ -84,18 +84,18 @@ def test_buy_or_sell_positive(self, market, harvested_fruit, expected): @parameterized.expand([ ([("orange", "apple"), ("pear", "orange"), ("apple", "paer")], - "apple", "ERROR"), + "apple", "ERROR"), ([('Jackfruit', 'Physalis'), ('Physalis', 'Prune'), ('Prune', 'Tamarind')], - 'Tamarind', 'ERROR'), + 'Tamarind', 'ERROR'), ([('Mulberry', 'Strawberry'), ('Passionfruit', 'Mulberry'), ('Strawberry', 'Mulberry')], - 'Strawberry', 'ERROR'), + 'Strawberry', 'ERROR'), ([('Cherry', 'Cucumber'), ('Cherry', 'Cherry'), ('Cucumber', 'Ugli fruit')], - 'Boysenberry', 'ERROR'), + 'Boysenberry', 'ERROR'), ([('Jackfruit', 'Purple mangosteen'), ('Purple mangosteen', 'Jackfruit'), ('Purple mangosteen', 'Jackfruit')], - 'Purple mangosteen', 'ERROR')]) + 'Purple mangosteen', 'ERROR')]) def test_buy_or_sell_negative(self, market, harvested_fruit, expected): """ Testing 'buy_or_sell' function, negative test case. From f500c8a877f29f7eda56a45c9fb49407f6907005 Mon Sep 17 00:00:00 2001 From: Egor Kostan <20955183+ikostan@users.noreply.github.com> Date: Mon, 30 Dec 2024 06:16:13 -0800 Subject: [PATCH 06/25] Update test_buy_or_sell.py --- kyu_7/pointless_farmer/test_buy_or_sell.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/kyu_7/pointless_farmer/test_buy_or_sell.py b/kyu_7/pointless_farmer/test_buy_or_sell.py index d7a826d42c3..79f9e25cc91 100644 --- a/kyu_7/pointless_farmer/test_buy_or_sell.py +++ b/kyu_7/pointless_farmer/test_buy_or_sell.py @@ -125,6 +125,3 @@ def test_buy_or_sell_negative(self, market, harvested_fruit, expected): expected=expected, result=result) self.assertEqual(expected, result) - - - From e478e15fa4eb1a517ff39499efb0b55c84599621 Mon Sep 17 00:00:00 2001 From: Egor Kostan <20955183+ikostan@users.noreply.github.com> Date: Mon, 30 Dec 2024 06:20:48 -0800 Subject: [PATCH 07/25] Update solution.py --- kyu_7/pointless_farmer/solution.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kyu_7/pointless_farmer/solution.py b/kyu_7/pointless_farmer/solution.py index 02e4ca5b35d..b3e2b7d27a4 100644 --- a/kyu_7/pointless_farmer/solution.py +++ b/kyu_7/pointless_farmer/solution.py @@ -6,7 +6,7 @@ """ -def buy_or_sell(pairs: list, harvested_fruit: str) -> list | str: +def buy_or_sell(pairs: list, harvested_fruit: str) -> list[str] | str: """ Decide which direction to trade. From 020da2bc84aaf96f2021e4442037dab99a04043a Mon Sep 17 00:00:00 2001 From: Egor Kostan <20955183+ikostan@users.noreply.github.com> Date: Mon, 30 Dec 2024 06:22:38 -0800 Subject: [PATCH 08/25] Update solution.py --- kyu_7/pointless_farmer/solution.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kyu_7/pointless_farmer/solution.py b/kyu_7/pointless_farmer/solution.py index b3e2b7d27a4..021fd35ca57 100644 --- a/kyu_7/pointless_farmer/solution.py +++ b/kyu_7/pointless_farmer/solution.py @@ -5,8 +5,10 @@ GitHub: https://github.com/ikostan """ +from typing import Tuple -def buy_or_sell(pairs: list, harvested_fruit: str) -> list[str] | str: + +def buy_or_sell(pairs: list, harvested_fruit: str) -> Tuple[list, str]: """ Decide which direction to trade. From 60ce175e4af4acacfa474d31ac0e98916064f8a6 Mon Sep 17 00:00:00 2001 From: Egor Kostan <20955183+ikostan@users.noreply.github.com> Date: Mon, 30 Dec 2024 06:23:10 -0800 Subject: [PATCH 09/25] Update solution.py --- kyu_7/pointless_farmer/solution.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/kyu_7/pointless_farmer/solution.py b/kyu_7/pointless_farmer/solution.py index 021fd35ca57..02e4ca5b35d 100644 --- a/kyu_7/pointless_farmer/solution.py +++ b/kyu_7/pointless_farmer/solution.py @@ -5,10 +5,8 @@ GitHub: https://github.com/ikostan """ -from typing import Tuple - -def buy_or_sell(pairs: list, harvested_fruit: str) -> Tuple[list, str]: +def buy_or_sell(pairs: list, harvested_fruit: str) -> list | str: """ Decide which direction to trade. From 4b117f3b14cf0fd622cc0cda769e2e1757fc37ff Mon Sep 17 00:00:00 2001 From: Egor Kostan <20955183+ikostan@users.noreply.github.com> Date: Mon, 30 Dec 2024 06:25:12 -0800 Subject: [PATCH 10/25] Update solution.py --- kyu_7/pointless_farmer/solution.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kyu_7/pointless_farmer/solution.py b/kyu_7/pointless_farmer/solution.py index 02e4ca5b35d..bca89d979da 100644 --- a/kyu_7/pointless_farmer/solution.py +++ b/kyu_7/pointless_farmer/solution.py @@ -5,8 +5,10 @@ GitHub: https://github.com/ikostan """ +from typing import Any -def buy_or_sell(pairs: list, harvested_fruit: str) -> list | str: + +def buy_or_sell(pairs: list, harvested_fruit: str) -> list[Any] | str: """ Decide which direction to trade. From 9a9d23d3d8874662e5baba482d8499d672ff05e7 Mon Sep 17 00:00:00 2001 From: Egor Kostan <20955183+ikostan@users.noreply.github.com> Date: Mon, 30 Dec 2024 06:28:17 -0800 Subject: [PATCH 11/25] Update solution.py --- kyu_7/pointless_farmer/solution.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/kyu_7/pointless_farmer/solution.py b/kyu_7/pointless_farmer/solution.py index bca89d979da..5659555e0dc 100644 --- a/kyu_7/pointless_farmer/solution.py +++ b/kyu_7/pointless_farmer/solution.py @@ -21,9 +21,7 @@ def buy_or_sell(pairs: list, harvested_fruit: str) -> list[Any] | str: for pair in pairs: # First item in pairs is for selling, second is for buying. - if pair[0] == currently_holding == pair[-1]: - results.append('sell') - elif pair[-1] == currently_holding: + if pair[0] == currently_holding == pair[-1] or pair[-1] == currently_holding: results.append('sell') currently_holding = pair[0] elif pair[0] == currently_holding: From 04bd4401314ae011beac7d05b218705dfe05282c Mon Sep 17 00:00:00 2001 From: Egor Kostan <20955183+ikostan@users.noreply.github.com> Date: Mon, 30 Dec 2024 06:31:06 -0800 Subject: [PATCH 12/25] Update solution.py --- kyu_7/pointless_farmer/solution.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kyu_7/pointless_farmer/solution.py b/kyu_7/pointless_farmer/solution.py index 5659555e0dc..afd865412ab 100644 --- a/kyu_7/pointless_farmer/solution.py +++ b/kyu_7/pointless_farmer/solution.py @@ -24,10 +24,12 @@ def buy_or_sell(pairs: list, harvested_fruit: str) -> list[Any] | str: if pair[0] == currently_holding == pair[-1] or pair[-1] == currently_holding: results.append('sell') currently_holding = pair[0] + continue elif pair[0] == currently_holding: results.append('buy') currently_holding = pair[-1] - else: - return "ERROR" + continue + + return "ERROR" return results if currently_holding == harvested_fruit else "ERROR" From f23183a40c8e09dcb30bc48f7f1b0d956210a00c Mon Sep 17 00:00:00 2001 From: Egor Kostan <20955183+ikostan@users.noreply.github.com> Date: Mon, 30 Dec 2024 06:32:54 -0800 Subject: [PATCH 13/25] Update solution.py --- kyu_7/pointless_farmer/solution.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kyu_7/pointless_farmer/solution.py b/kyu_7/pointless_farmer/solution.py index afd865412ab..b0426698072 100644 --- a/kyu_7/pointless_farmer/solution.py +++ b/kyu_7/pointless_farmer/solution.py @@ -21,7 +21,7 @@ def buy_or_sell(pairs: list, harvested_fruit: str) -> list[Any] | str: for pair in pairs: # First item in pairs is for selling, second is for buying. - if pair[0] == currently_holding == pair[-1] or pair[-1] == currently_holding: + if pair[-1] == currently_holding: results.append('sell') currently_holding = pair[0] continue From 2b8e71f85384f4f6b9fbfa28d21c681a0cf5e0d8 Mon Sep 17 00:00:00 2001 From: Egor Kostan <20955183+ikostan@users.noreply.github.com> Date: Mon, 30 Dec 2024 06:35:16 -0800 Subject: [PATCH 14/25] Update solution.py --- kyu_7/pointless_farmer/solution.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kyu_7/pointless_farmer/solution.py b/kyu_7/pointless_farmer/solution.py index b0426698072..ae98bb74fd4 100644 --- a/kyu_7/pointless_farmer/solution.py +++ b/kyu_7/pointless_farmer/solution.py @@ -32,4 +32,4 @@ def buy_or_sell(pairs: list, harvested_fruit: str) -> list[Any] | str: return "ERROR" - return results if currently_holding == harvested_fruit else "ERROR" + return "ERROR" if currently_holding != harvested_fruit else results From 4cf1a447bac0ed71d3a90f02b56b629a300adc76 Mon Sep 17 00:00:00 2001 From: Egor Kostan <20955183+ikostan@users.noreply.github.com> Date: Mon, 30 Dec 2024 06:36:49 -0800 Subject: [PATCH 15/25] Update solution.py --- kyu_7/pointless_farmer/solution.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kyu_7/pointless_farmer/solution.py b/kyu_7/pointless_farmer/solution.py index ae98bb74fd4..152e4ac7223 100644 --- a/kyu_7/pointless_farmer/solution.py +++ b/kyu_7/pointless_farmer/solution.py @@ -25,7 +25,8 @@ def buy_or_sell(pairs: list, harvested_fruit: str) -> list[Any] | str: results.append('sell') currently_holding = pair[0] continue - elif pair[0] == currently_holding: + + if pair[0] == currently_holding: results.append('buy') currently_holding = pair[-1] continue From 7eea164b98ce8f51af4e2116bdae459016f63b23 Mon Sep 17 00:00:00 2001 From: Egor Kostan <20955183+ikostan@users.noreply.github.com> Date: Mon, 30 Dec 2024 06:43:32 -0800 Subject: [PATCH 16/25] Update solution.py --- kyu_7/pointless_farmer/solution.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kyu_7/pointless_farmer/solution.py b/kyu_7/pointless_farmer/solution.py index 152e4ac7223..8cf2847b537 100644 --- a/kyu_7/pointless_farmer/solution.py +++ b/kyu_7/pointless_farmer/solution.py @@ -8,7 +8,7 @@ from typing import Any -def buy_or_sell(pairs: list, harvested_fruit: str) -> list[Any] | str: +def buy_or_sell(pairs: list, harvested_fruit: str) -> str | list: """ Decide which direction to trade. @@ -20,12 +20,12 @@ def buy_or_sell(pairs: list, harvested_fruit: str) -> list[Any] | str: results: list = [] for pair in pairs: - # First item in pairs is for selling, second is for buying. + # First item in pairs is for selling. if pair[-1] == currently_holding: results.append('sell') currently_holding = pair[0] continue - + # Second is for buying. if pair[0] == currently_holding: results.append('buy') currently_holding = pair[-1] From 6615dc559af268e60e1af8f9627c9221bb0578a6 Mon Sep 17 00:00:00 2001 From: Egor Kostan <20955183+ikostan@users.noreply.github.com> Date: Mon, 30 Dec 2024 06:45:37 -0800 Subject: [PATCH 17/25] Update solution.py --- kyu_7/pointless_farmer/solution.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/kyu_7/pointless_farmer/solution.py b/kyu_7/pointless_farmer/solution.py index 8cf2847b537..b4430c20550 100644 --- a/kyu_7/pointless_farmer/solution.py +++ b/kyu_7/pointless_farmer/solution.py @@ -5,8 +5,6 @@ GitHub: https://github.com/ikostan """ -from typing import Any - def buy_or_sell(pairs: list, harvested_fruit: str) -> str | list: """ From 1c2a2d90def79f8ee4020013584b997f21bc1785 Mon Sep 17 00:00:00 2001 From: Egor Kostan <20955183+ikostan@users.noreply.github.com> Date: Mon, 30 Dec 2024 06:58:03 -0800 Subject: [PATCH 18/25] Update solution.py --- kyu_7/pointless_farmer/solution.py | 35 +++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/kyu_7/pointless_farmer/solution.py b/kyu_7/pointless_farmer/solution.py index b4430c20550..d53421deb05 100644 --- a/kyu_7/pointless_farmer/solution.py +++ b/kyu_7/pointless_farmer/solution.py @@ -12,23 +12,38 @@ def buy_or_sell(pairs: list, harvested_fruit: str) -> str | list: :param pairs: list :param harvested_fruit: str - :return: list + :return: """ currently_holding: str = harvested_fruit results: list = [] for pair in pairs: - # First item in pairs is for selling. - if pair[-1] == currently_holding: - results.append('sell') - currently_holding = pair[0] - continue - # Second is for buying. - if pair[0] == currently_holding: - results.append('buy') - currently_holding = pair[-1] + currently_holding = make_deal(results, pair, currently_holding) + if currently_holding: continue return "ERROR" return "ERROR" if currently_holding != harvested_fruit else results + + +def make_deal(results: list, pair: tuple, currently_holding: str) -> str: + """ + Buy or sell. + + Return an empty string if no deal made. + :param results: list + :param pair: tuple + :param currently_holding: str + :return: str + """ + # First item in pairs is for selling. + if pair[-1] == currently_holding: + results.append('sell') + return pair[0] + # Second is for buying. + if pair[0] == currently_holding: + results.append('buy') + return pair[-1] + + return '' From a8f34ca451e7e166c97acccb5f2719a79a6b6955 Mon Sep 17 00:00:00 2001 From: Egor Kostan <20955183+ikostan@users.noreply.github.com> Date: Mon, 30 Dec 2024 06:59:49 -0800 Subject: [PATCH 19/25] Update solution.py --- kyu_7/pointless_farmer/solution.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kyu_7/pointless_farmer/solution.py b/kyu_7/pointless_farmer/solution.py index d53421deb05..e07f98b8800 100644 --- a/kyu_7/pointless_farmer/solution.py +++ b/kyu_7/pointless_farmer/solution.py @@ -5,8 +5,10 @@ GitHub: https://github.com/ikostan """ +from typing import Any -def buy_or_sell(pairs: list, harvested_fruit: str) -> str | list: + +def buy_or_sell(pairs: list, harvested_fruit: str) -> list[Any]: """ Decide which direction to trade. From 7dc66d6f51fcf9ee0cc0be5e6dc340d39a681a3f Mon Sep 17 00:00:00 2001 From: Egor Kostan <20955183+ikostan@users.noreply.github.com> Date: Mon, 30 Dec 2024 07:01:28 -0800 Subject: [PATCH 20/25] Update solution.py --- kyu_7/pointless_farmer/solution.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/kyu_7/pointless_farmer/solution.py b/kyu_7/pointless_farmer/solution.py index e07f98b8800..d53421deb05 100644 --- a/kyu_7/pointless_farmer/solution.py +++ b/kyu_7/pointless_farmer/solution.py @@ -5,10 +5,8 @@ GitHub: https://github.com/ikostan """ -from typing import Any - -def buy_or_sell(pairs: list, harvested_fruit: str) -> list[Any]: +def buy_or_sell(pairs: list, harvested_fruit: str) -> str | list: """ Decide which direction to trade. From c61d6ea35b8cc93545c80dcdb65b97e238bdca1d Mon Sep 17 00:00:00 2001 From: Egor Kostan <20955183+ikostan@users.noreply.github.com> Date: Mon, 30 Dec 2024 07:10:38 -0800 Subject: [PATCH 21/25] Update solution.py --- kyu_7/pointless_farmer/solution.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kyu_7/pointless_farmer/solution.py b/kyu_7/pointless_farmer/solution.py index d53421deb05..9fe073ca461 100644 --- a/kyu_7/pointless_farmer/solution.py +++ b/kyu_7/pointless_farmer/solution.py @@ -5,8 +5,12 @@ GitHub: https://github.com/ikostan """ +from typing import TypeVar -def buy_or_sell(pairs: list, harvested_fruit: str) -> str | list: + +T = TypeVar("T", bound=str|list) + +def buy_or_sell(pairs: list, harvested_fruit: str) -> T: """ Decide which direction to trade. From 22c66d5fe289a7a2bdda40eb5f10c04bb4d2635f Mon Sep 17 00:00:00 2001 From: Egor Kostan <20955183+ikostan@users.noreply.github.com> Date: Mon, 30 Dec 2024 07:12:24 -0800 Subject: [PATCH 22/25] Update solution.py --- kyu_7/pointless_farmer/solution.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kyu_7/pointless_farmer/solution.py b/kyu_7/pointless_farmer/solution.py index 9fe073ca461..bcfb5df8662 100644 --- a/kyu_7/pointless_farmer/solution.py +++ b/kyu_7/pointless_farmer/solution.py @@ -7,8 +7,8 @@ from typing import TypeVar +T = TypeVar("T", bound=str | list) -T = TypeVar("T", bound=str|list) def buy_or_sell(pairs: list, harvested_fruit: str) -> T: """ From 67975bbf3866c544c0a5d087595d81c029f69715 Mon Sep 17 00:00:00 2001 From: Egor Kostan <20955183+ikostan@users.noreply.github.com> Date: Mon, 30 Dec 2024 07:13:59 -0800 Subject: [PATCH 23/25] Update solution.py --- kyu_7/pointless_farmer/solution.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kyu_7/pointless_farmer/solution.py b/kyu_7/pointless_farmer/solution.py index bcfb5df8662..88151994cc9 100644 --- a/kyu_7/pointless_farmer/solution.py +++ b/kyu_7/pointless_farmer/solution.py @@ -5,9 +5,9 @@ GitHub: https://github.com/ikostan """ -from typing import TypeVar +from typing import TypeVar, Any -T = TypeVar("T", bound=str | list) +T = TypeVar("T", bound=str | list[Any]) def buy_or_sell(pairs: list, harvested_fruit: str) -> T: From 8890887c9259011701c4f199150222378c40c3c8 Mon Sep 17 00:00:00 2001 From: Egor Kostan <20955183+ikostan@users.noreply.github.com> Date: Mon, 30 Dec 2024 07:19:04 -0800 Subject: [PATCH 24/25] Update solution.py --- kyu_7/pointless_farmer/solution.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/kyu_7/pointless_farmer/solution.py b/kyu_7/pointless_farmer/solution.py index 88151994cc9..b2699542079 100644 --- a/kyu_7/pointless_farmer/solution.py +++ b/kyu_7/pointless_farmer/solution.py @@ -5,12 +5,8 @@ GitHub: https://github.com/ikostan """ -from typing import TypeVar, Any -T = TypeVar("T", bound=str | list[Any]) - - -def buy_or_sell(pairs: list, harvested_fruit: str) -> T: +def buy_or_sell(pairs: list, harvested_fruit: str): """ Decide which direction to trade. From c25cc6cb292cfad5ade573102a8b9c7a2c1fd631 Mon Sep 17 00:00:00 2001 From: Egor Kostan <20955183+ikostan@users.noreply.github.com> Date: Mon, 30 Dec 2024 07:26:34 -0800 Subject: [PATCH 25/25] Update solution.py --- kyu_7/pointless_farmer/solution.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kyu_7/pointless_farmer/solution.py b/kyu_7/pointless_farmer/solution.py index b2699542079..a5cba2c3e77 100644 --- a/kyu_7/pointless_farmer/solution.py +++ b/kyu_7/pointless_farmer/solution.py @@ -29,7 +29,7 @@ def buy_or_sell(pairs: list, harvested_fruit: str): def make_deal(results: list, pair: tuple, currently_holding: str) -> str: """ - Buy or sell. + Return the new currently_holding value on successful deals. Return an empty string if no deal made. :param results: list